mbk/pesterchum
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Option to view pesterlog from conversation window

Browse source
This commit is contained in:
Kiooeht 2011-04-15 02:45:10 -07:00
parent 45d6922ddd
commit fd0375f14f
2 changed files with 28 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
convo.py
View file

@ -449,8 +449,12 @@ class PesterConvo(QtGui.QFrame):
self.reportchum = QtGui.QAction(self.mainwindow.theme["main/menus/rclickchumlist/report"], self) self.reportchum = QtGui.QAction(self.mainwindow.theme["main/menus/rclickchumlist/report"], self)
self.connect(self.reportchum, QtCore.SIGNAL('triggered()'), self.connect(self.reportchum, QtCore.SIGNAL('triggered()'),
self, QtCore.SLOT('reportThisChum()')) self, QtCore.SLOT('reportThisChum()'))
self.logchum = QtGui.QAction(self.mainwindow.theme["main/menus/rclickchumlist/viewlog"], self)
self.connect(self.logchum, QtCore.SIGNAL('triggered()'),
self, QtCore.SLOT('openChumLogs()'))
self.optionsMenu.addAction(self.quirksOff) self.optionsMenu.addAction(self.quirksOff)
self.optionsMenu.addAction(self.logchum)
self.optionsMenu.addAction(self.addChumAction) self.optionsMenu.addAction(self.addChumAction)
self.optionsMenu.addAction(self.blockAction) self.optionsMenu.addAction(self.blockAction)
self.optionsMenu.addAction(self.reportchum) self.optionsMenu.addAction(self.reportchum)
@ -634,6 +638,15 @@ class PesterConvo(QtGui.QFrame):
@QtCore.pyqtSlot(bool) @QtCore.pyqtSlot(bool)
def toggleQuirks(self, toggled): def toggleQuirks(self, toggled):
self.applyquirks = not toggled self.applyquirks = not toggled
@QtCore.pyqtSlot()
def openChumLogs(self):
currentChum = self.chum.handle
self.mainwindow.chumList.pesterlogviewer = PesterLogViewer(currentChum, self.mainwindow.config, self.mainwindow.theme, self.mainwindow)
self.connect(self.mainwindow.chumList.pesterlogviewer, QtCore.SIGNAL('rejected()'),
self.mainwindow.chumList, QtCore.SLOT('closeActiveLog()'))
self.mainwindow.chumList.pesterlogviewer.show()
self.mainwindow.chumList.pesterlogviewer.raise_()
self.mainwindow.chumList.pesterlogviewer.activateWindow()
messageSent = QtCore.pyqtSignal(QtCore.QString, QtCore.QString) messageSent = QtCore.pyqtSignal(QtCore.QString, QtCore.QString)
windowClosed = QtCore.pyqtSignal(QtCore.QString) windowClosed = QtCore.pyqtSignal(QtCore.QString)
@ -644,3 +657,6 @@ class PesterConvo(QtGui.QFrame):
"v": {"center": QtCore.Qt.AlignVCenter, "v": {"center": QtCore.Qt.AlignVCenter,
"top": QtCore.Qt.AlignTop, "top": QtCore.Qt.AlignTop,
"bottom": QtCore.Qt.AlignBottom } } "bottom": QtCore.Qt.AlignBottom } }
# the import is way down here to avoid recursive imports
from logviewer import PesterLogViewer

12
logviewer.py
View file

@ -234,3 +234,15 @@ class PesterLogText(PesterText):
self.viewport().setCursor(QtGui.QCursor(QtCore.Qt.PointingHandCursor)) self.viewport().setCursor(QtGui.QCursor(QtCore.Qt.PointingHandCursor))
else: else:
self.viewport().setCursor(QtGui.QCursor(QtCore.Qt.IBeamCursor)) self.viewport().setCursor(QtGui.QCursor(QtCore.Qt.IBeamCursor))
def contextMenuEvent(self, event):
textMenu = self.createStandardContextMenu()
if self.textSelected:
self.submitLogAction = QtGui.QAction("Submit to Pesterchum QDB", self)
self.connect(self.submitLogAction, QtCore.SIGNAL('triggered()'),
self, QtCore.SLOT('submitLog()'))
textMenu.addAction(self.submitLogAction)
a = textMenu.actions()
a[0].setText("Copy Plain Text")
a[0].setShortcut(self.tr("Ctrl+C"))
textMenu.exec_(event.globalPos())