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

Bug fixes: Don't show profile delete on first run, don't show advanced box in non-advanced mode

Browse source
This commit is contained in:
Kiooeht 2011-05-13 07:37:36 -07:00
parent 25eff0d34f
commit 6b1ade8c4a
2 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
menus.py
View file

@ -517,7 +517,7 @@ class PesterChooseProfile(QtGui.QDialog):
self.cancel = QtGui.QPushButton("CANCEL", self) self.cancel = QtGui.QPushButton("CANCEL", self)
self.connect(self.cancel, QtCore.SIGNAL('clicked()'), self.connect(self.cancel, QtCore.SIGNAL('clicked()'),
self, QtCore.SLOT('reject()')) self, QtCore.SLOT('reject()'))
if not collision: if not collision and avail_profiles:
self.delete = QtGui.QPushButton("DELETE", self) self.delete = QtGui.QPushButton("DELETE", self)
self.connect(self.delete, QtCore.SIGNAL('clicked()'), self.connect(self.delete, QtCore.SIGNAL('clicked()'),
self, QtCore.SLOT('deleteProfile()')) self, QtCore.SLOT('deleteProfile()'))
@ -537,7 +537,7 @@ class PesterChooseProfile(QtGui.QDialog):
layout_0.addWidget(profileLabel) layout_0.addWidget(profileLabel)
layout_0.addWidget(self.profileBox) layout_0.addWidget(self.profileBox)
layout_0.addLayout(layout_ok) layout_0.addLayout(layout_ok)
if not collision: if not collision and avail_profiles:
layout_0.addWidget(self.delete) layout_0.addWidget(self.delete)
layout_0.addLayout(layout_2) layout_0.addLayout(layout_2)
self.errorMsg = QtGui.QLabel(self) self.errorMsg = QtGui.QLabel(self)
@ -598,7 +598,6 @@ class PesterChooseProfile(QtGui.QDialog):
problem.setInformativeText("There was a problem deleting the profile: %s" % (handle)) problem.setInformativeText("There was a problem deleting the profile: %s" % (handle))
problem.setStandardButtons(QtGui.QMessageBox.Ok) problem.setStandardButtons(QtGui.QMessageBox.Ok)
problem.exec_() problem.exec_()
self.reject()
class PesterOptions(QtGui.QDialog): class PesterOptions(QtGui.QDialog):
def __init__(self, config, theme, parent): def __init__(self, config, theme, parent):
@ -737,10 +736,11 @@ class PesterOptions(QtGui.QDialog):
layout_close.addWidget(QtGui.QLabel("Close")) layout_close.addWidget(QtGui.QLabel("Close"))
layout_close.addWidget(self.closeBox) layout_close.addWidget(self.closeBox)
self.modechange = QtGui.QLineEdit(self) if parent.advanced:
layout_change = QtGui.QHBoxLayout() self.modechange = QtGui.QLineEdit(self)
layout_change.addWidget(QtGui.QLabel("Change:")) layout_change = QtGui.QHBoxLayout()
layout_change.addWidget(self.modechange) layout_change.addWidget(QtGui.QLabel("Change:"))
layout_change.addWidget(self.modechange)
self.ok = QtGui.QPushButton("OK", self) self.ok = QtGui.QPushButton("OK", self)
self.ok.setDefault(True) self.ok.setDefault(True)

7
pesterchum.py
View file

@ -2474,9 +2474,10 @@ class PesterWindow(MovingWindow):
self.config.set('opvMessages', opvmesssetting) self.config.set('opvMessages', opvmesssetting)
# advanced # advanced
## user mode ## user mode
newmodes = self.optionmenu.modechange.text() if self.advanced:
if newmodes: newmodes = self.optionmenu.modechange.text()
self.setChannelMode.emit(self.profile().handle, newmodes, "") if newmodes:
self.setChannelMode.emit(self.profile().handle, newmodes, "")
self.optionmenu = None self.optionmenu = None
def setButtonAction(self, button, setting, old): def setButtonAction(self, button, setting, old):