From fb6c9305661b08816806edfde7ceb953bf0b362d Mon Sep 17 00:00:00 2001 From: Stephen Dranger Date: Wed, 23 Feb 2011 05:27:37 -0600 Subject: [PATCH] alpha 7 --- TODO | 1 - convo.py | 3 +-- memos.py | 4 ++++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/TODO b/TODO index bea106c..6dcff7e 100644 --- a/TODO +++ b/TODO @@ -1,6 +1,5 @@ Bugs: * import quirks from 2.5! -* edit quirks? * X and _ buttons move around all crazy like Features: diff --git a/convo.py b/convo.py index 3a5c672..4341c0b 100644 --- a/convo.py +++ b/convo.py @@ -304,7 +304,6 @@ class PesterText(QtGui.QTextEdit): def contextMenuEvent(self, event): textMenu = self.createStandardContextMenu() - print "self.textSelected is %s " %(self.textSelected) if self.textSelected: self.submitLogAction = QtGui.QAction("Submit to Pesterchum QDB", self) self.connect(self.submitLogAction, QtCore.SIGNAL('triggered()'), @@ -322,7 +321,7 @@ class PesterText(QtGui.QTextEdit): htmldata = img2smiley(mimedata.data("text/html")) textdoc = QtGui.QTextDocument() textdoc.setHtml(htmldata) - logdata = textdoc.toPlainText() + logdata = "%s\n%s" % (self.submitLogTitle(), textdoc.toPlainText()) self.sending = QtGui.QDialog(self) layout = QtGui.QVBoxLayout() self.sending.sendinglabel = QtGui.QLabel("S3ND1NG...", self.sending) diff --git a/memos.py b/memos.py index 2bf7f55..8ce1b70 100644 --- a/memos.py +++ b/memos.py @@ -237,6 +237,10 @@ class MemoText(PesterText): self.initTheme(theme) self.setReadOnly(True) self.setMouseTracking(True) + self.textSelected = False + self.connect(self, QtCore.SIGNAL('copyAvailable(bool)'), + self, QtCore.SLOT('textReady(bool)')) + def initTheme(self, theme): if theme.has_key("memos/scrollbar"): self.setStyleSheet("QTextEdit { %s } QScrollBar:vertical { %s } QScrollBar::handle:vertical { %s } QScrollBar::add-line:vertical { %s } QScrollBar::sub-line:vertical { %s } QScrollBar:up-arrow:vertical { %s } QScrollBar:down-arrow:vertical { %s }" % (theme["memos/textarea/style"], theme["memos/scrollbar/style"], theme["memos/scrollbar/handle"], theme["memos/scrollbar/downarrow"], theme["memos/scrollbar/uparrow"], theme["memos/scrollbar/uarrowstyle"], theme["memos/scrollbar/darrowstyle"] ))