From 2f0d750480ed976e27694e6fc69a8c8a97603d83 Mon Sep 17 00:00:00 2001 From: Kiooeht Date: Mon, 9 May 2011 14:41:12 -0700 Subject: [PATCH] Fully controlable idle time + Changelog update --- CHANGELOG.mkdn | 2 ++ menus.py | 8 ++++---- pesterchum.py | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.mkdn b/CHANGELOG.mkdn index 375a0de..d5cdb99 100644 --- a/CHANGELOG.mkdn +++ b/CHANGELOG.mkdn @@ -23,6 +23,8 @@ CHANGELOG * Memo scrollbar thing - Kiooeht [evacipatedBox] * Time arrows in enamel - Kiooeht [evacipatedBox] * Quirk order actually works - Kiooeht [evacipatedBox] + * Stay in memos on profile switch - Kiooeht [evacipatedBox] + * Auto rejoin memos on reconnect - Kiooeht [evacipatedBox] ### 3.14.1 * Pesterchum 3.14 - illuminatedwax [ghostDunk] diff --git a/menus.py b/menus.py index 706ca44..829590d 100644 --- a/menus.py +++ b/menus.py @@ -695,10 +695,10 @@ class PesterOptions(QtGui.QDialog): self.logmemoscheck = QtGui.QCheckBox("Log all Memos", self) self.logmemoscheck.setChecked(self.config.logMemos()) - times = ["1", "5", "10", "15", "30"] - self.idleBox = QtGui.QComboBox(self) - self.idleBox.addItems(times) - self.idleBox.setCurrentIndex(self.idleBox.findText(str(self.config.idleTime()))) + self.idleBox = QtGui.QSpinBox(self) + self.idleBox.setStyleSheet("background:#FFFFFF") + self.idleBox.setRange(1, 1440) + self.idleBox.setValue(self.config.idleTime()) layout_5 = QtGui.QHBoxLayout() layout_5.addWidget(QtGui.QLabel("Minutes before Idle:")) layout_5.addWidget(self.idleBox) diff --git a/pesterchum.py b/pesterchum.py index 3ba4619..60015a1 100644 --- a/pesterchum.py +++ b/pesterchum.py @@ -2363,7 +2363,7 @@ class PesterWindow(MovingWindow): if linkssetting != curlinks: self.config.set('userLinks', not linkssetting) # idle time - idlesetting = int(unicode(self.optionmenu.idleBox.currentText())) + idlesetting = self.optionmenu.idleBox.value() curidle = self.config.idleTime() if idlesetting != curidle: self.config.set('idleTime', idlesetting)