[pkg-fso-commits] [SCM] openmoko panel plugin branch, debian, updated. debian/0.7-4-2-gcb75d13
ohli (none)
ohli at workuta.
Wed Jan 28 19:09:53 UTC 2009
The following commit has been merged in the debian branch:
commit cb75d13df4b831b4087a1de2f5d25f44155e1a26
Merge: 094181f09b4c38959ff4b3a62dbf2e69ebc0f8ff bd158ebb214c471703a27d85601ab1d84ea0dd1c
Author: ohli <ohli at workuta.(none)>
Date: Wed Jan 28 19:49:49 2009 +0100
new upstream release entry
diff --combined debian/changelog
index 47d3169,0000000..ac690cf
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,171 -1,0 +1,180 @@@
++openmoko-panel-plugin (0.8-1) pkg-fso; urgency=low
++
++ * lots of fixes
++ * workaround for power handling on neo
++ * more config options
++ * more scripting
++
++ -- Sebastian Ohl <sebastian at ohl.name> Wed, 28 Jan 2009 19:44:36 +0100
++
+openmoko-panel-plugin (0.7-4) pkg-fso; urgency=low
+
+ * encoding stuff. no more degree sign problems
+
+ -- Sebastian Ohl <sebastian at ohl.name> Sat, 17 Jan 2009 18:55:36 +0100
+
+openmoko-panel-plugin (0.7-3) pkg-fso; urgency=low
+
+ * setting module python version to 2.5
+
+ -- Sebastian Ohl <sebastian at ohl.name> Thu, 01 Jan 2009 20:13:01 +0100
+
+openmoko-panel-plugin (0.7-2) pkg-fso; urgency=low
+
+ * adding again lost patch from 0.6-2.1
+ * correct handling of keyboard stoping
+
+ -- Sebastian Ohl <sebastian at ohl.name> Thu, 01 Jan 2009 12:34:06 +0100
+
+openmoko-panel-plugin (0.7-1) pkg-fso; urgency=low
+
+ * new upstream release
+ * modularization of panel icons
+ * usb icon working
+ * many more configuration options
+ * new icons for gps
+ * less memory hungry
+ * scripts for presuspend/postresume
+ * added toggles for bt and wifi in power-window
+ * many bugfixes
+
+ -- Sebastian Ohl <sebastian at ohl.name> Wed, 31 Dec 2008 17:50:26 +0100
+
+openmoko-panel-plugin (0.6-2.1) pkg-fso; urgency=low
+
+ * Non-maintainer upload.
+ * Make sure openmoko-panel-plugin starts even if not all resources are
+ available yet (slightly ugly hack)
+
+ -- Joachim Breitner <nomeata at debian.org> Mon, 24 Nov 2008 17:10:43 +0100
+
+openmoko-panel-plugin (0.6-2) pkg-fso; urgency=low
+
+ * do not vibrated if disabled in config
+
+ -- Sebastian Ohl <sebastian at ohl.name> Sat, 22 Nov 2008 12:17:06 +0100
+
+openmoko-panel-plugin (0.6-1) pkg-fso; urgency=low
+
+ * porting to fso milestone 4
+ * new upstream release
+
+ -- Sebastian Ohl <sebastian at ohl.name> Wed, 19 Nov 2008 22:57:05 +0100
+
+openmoko-panel-plugin (0.5-1.3) pkg-fso; urgency=low
+
+ * Next try at handling a missing notification daemon (patch by morlac)
+
+ -- Joachim Breitner <nomeata at debian.org> Thu, 06 Nov 2008 15:15:44 +0100
+
+openmoko-panel-plugin (0.5-1.2) pkg-fso; urgency=low
+
+ * Avoid traceback when no notification-daemon is installed
+
+ -- Joachim Breitner <nomeata at debian.org> Wed, 05 Nov 2008 18:01:52 +0100
+
+openmoko-panel-plugin (0.5-1.1) pkg-fso; urgency=low
+
+ * Fixing setup.py to ship all png files
+ * No need to recommend a dependency
+
+ -- Joachim Breitner <nomeata at debian.org> Tue, 04 Nov 2008 21:08:50 +0100
+
+openmoko-panel-plugin (0.5-1) unstable; urgency=low
+
+ * read the README file
+ * changed the distribution from unstable to pkg-fso
+ * new battery-icons
+ * extended suspend-behaviour:
+ * on suspend: turning off wifi, bt, gps and sending dbus.preparesuspend
+ * to gsm
+ * on resume: restoring previous power-state of wifi, bt, gps
+ * and sending dbus.prepareresume to gsm
+ * enabled shutdown-button in power-button-window
+ * new high-contrast version
+ * added configWriter to save changed configs to ~/.panel-pluginrc
+ * added config-area for selection of active icons
+ * (order of icons is planned but not implemented yet)
+ * added new 'icon' for button-handling:
+ * aux:
+ * on short press: keyboard-toggle
+ * on longer press (>2 sec) window (for now only with close-button) opens
+ * power:
+ * on short press: for now nothing happens
+ * on longer press (>2 sec) window with buttons opens:
+ * suspend (functional)
+ * shutdown (for now non-functional)
+ * close (closes window)
+ * added entries for buttons (aux, power)
+ * config-window
+ * some more gsmIcon updates:
+ * corrected dbus-callback-function-header
+ * added location area code (if available from dbus)
+ * now choosing right icon for gsm turned off
+ * corrections to gsmStatus-update work properly
+ * added some try-blocks around file-io to prevent IO-timeouts killing
+ * main-thread
+ * added battery-notification
+ * update to BatteryWindow to reduce resource-usage when BatteryWindow inactive
+ * extended BatteryIcon to show more battery-status in a window and setup
+ * chargingMode (100, 500, 1000mA)
+ * added BrightnessIcon and corrected some threading-related stuff
+ * hold the aux button for more than 2 seconds to enable/disable keyboard
+ * extended GSM-Icon to show network-status
+ * (un)registered
+ * provider
+ * signal-strength
+ * cellid
+ * for tooltip and notification
+ * made notification optional - when python-pynotify is installed
+ * keyboard icon
+
+ -- Sebastian Ohl <sebastian at ohl.name> Fri, 31 Oct 2008 11:55:02 +0100
+
+openmoko-panel-plugin (0.4-1.2) pkg-fso; urgency=low
+
+ * Avoid "TypeError: argument of type NoneType is not iterable"
+ * Ship all png files (Closes: 503411)
+
+ -- Joachim Breitner <nomeata at debian.org> Sat, 25 Oct 2008 23:11:37 +0200
+
+openmoko-panel-plugin (0.4-1.1) pkg-fso; urgency=low
+
+ * Non-maintainer upload, to do last fixes
+ * Changed distribution to pkg-fso
+ * Ship README via debaian/docs
+ * Depend on notification-daemon
+
+ -- Joachim Breitner <nomeata at debian.org> Thu, 02 Oct 2008 15:12:15 +0200
+
+openmoko-panel-plugin (0.4-1) unstable; urgency=low
+
+ * fixed many debianizing errors.
+ * adding more dependencies
+ * fixed problems with different versions on my laptop :-(
+ * the menu entry should reappear
+ * click opens a context menu to toggle the powerstate
+ * removed some icons until they are finaly working
+
+ -- Sebastian Ohl <sebastian at ohl.name> Wed, 24 Sep 2008 22:33:02 +0200
+
+openmoko-panel-plugin (0.3-1) unstable; urgency=low
+
+ * GSM strength icons
+ * USB status dialog and icon
+
+ -- Sebastian Ohl <sebastian at ohl.name> Sun, 18 Sep 2008 20:00:02 +0200
+
+openmoko-panel-plugin (0.2-1) unstable; urgency=low
+
+ * Added matchbox keyboard button
+ * nicer off-icons
+
+ -- Sebastian Ohl <sebastian at ohl.name> Sun, 07 Sep 2008 12:27:02 +0200
+
+openmoko-panel-plugin (0.1-1) unstable; urgency=low
+
+ * Initial release
+
+ -- Sebastian Ohl <sebastian at ohl.name> Sun, 24 Aug 2008 16:27:02 +0200
+
diff --combined panelplugin/PanelPlugin.py
index 32b8751,ee23aa7..0269458
--- a/panelplugin/PanelPlugin.py
+++ b/panelplugin/PanelPlugin.py
@@@ -22,6 -22,7 +22,7 @@@ class PanelPlugin()
self.iconpath = "/usr/share/pixmaps/openmoko-panel-plugin"
self.availableIcons = ["buttons", "usb", "gsm", "wifi", "gps", "keyboard", "brightness", "battery", "bluetooth"]
self.enabledIcons = self.availableIcons
+ self.iconOrder = []
self.icons = []
self.configWindowActiveIconsCheckBoxes = {}
self.runningUpdate = False
@@@ -47,6 -48,13 +48,13 @@@
for icon in self.enabledIcons:
self.appendIcon(icon)
+ self.iconOrder = self.enabledIcons[:]
+
+ for icon in self.availableIcons:
+ if (icon not in self.iconOrder):
+ self.iconOrder.append(icon)
+
+
def appendIcon(self, enabledIcon):
if (enabledIcon == "battery"):
from panelplugin.BatteryIcon import BatteryIcon
@@@ -83,7 -91,7 +91,7 @@@
self.panelConfig.set("main", "iconpath", self.iconpath)
self.enabledIcons = []
- for icon in self.availableIcons:
+ for icon in self.iconOrder:
checkBox = self.configWindowActiveIconsCheckBoxes[icon]
if (checkBox is not None):
if (checkBox.get_active()):
@@@ -131,6 -139,7 +139,7 @@@
dialog.show()
def updateIcons(self):
+ # get's called from Buttons.py
time.sleep(0.2) # really needed here ..
if (not self.runningUpdate): # should do this with a mutex ..
@@@ -194,18 -203,84 +203,94 @@@
self.configWriter()
else:
- pass
+ iconOrderChanged = False
+ iconNumber = 0
+ origIconOrder = self.iconOrder[:]
+
+ for icon in self.iconOrder:
+ if (data == "%s_up" % icon):
+ iconOrderChanged = True
+
+ tempIcon = origIconOrder[iconNumber - 1]
+ origIconOrder[iconNumber - 1] = origIconOrder[iconNumber]
+ origIconOrder[iconNumber] = tempIcon
+
+ elif (data == "%s_dn" % icon):
+ iconOrderChanged = True
+
+ tempIcon = origIconOrder[iconNumber + 1]
+ origIconOrder[iconNumber + 1] = origIconOrder[iconNumber]
+ origIconOrder[iconNumber] = tempIcon
+
+ iconNumber += 1
+
+ if (iconOrderChanged):
+ self.iconOrder = origIconOrder[:]
+
+ for icon in self.configWindowVBoxIcons.get_children():
+ self.configWindowVBoxIcons.remove(icon)
+
+ self.configWindowGetIconOrder()
+
+ self.configWindow.show_all()
+
+ for icon in self.iconOrder:
+ if (icon in self.enabledIcons):
+ self.signalTo(selectedIconName = icon, reorder = True)
+
+ if (windowClose):
+ self.configWindowDestroyer(None)
+
+ def configWindowDestroyer(self, widget, data = None):
+ self.configWindow.destroy()
+ self.configWindowActive = False
+
+ def configWindowDeleter(self, widget, event, data = None):
+ return False
+
+ def configWindowGetIconOrder(self):
+ self.configWindowActiveIconsCheckBoxes = {}
+ iconNumber = 0
+
+ for icon in self.iconOrder:
+ iconNumber += 1
+ iconRow = gtk.HBox(False, 0)
+
+ iconCheckBox = gtk.CheckButton("%s is Active" % icon)
+ iconCheckBox.set_active(True if (icon in self.enabledIcons) else False)
+
+ iconSpacer = gtk.Label()
+
+ iconButtonUp = gtk.Button()
+ iconButtonUpArrow = gtk.Arrow(gtk.ARROW_UP, gtk.SHADOW_OUT)
+ iconButtonUp.add(iconButtonUpArrow)
+ iconButtonUp.connect("clicked", self.configWindowCallback, "%s_up" % icon)
+ iconButtonUp.set_sensitive(True if (iconNumber != 1) else False)
+
+ iconButtonDn = gtk.Button()
+ iconButtonDnArrow = gtk.Arrow(gtk.ARROW_DOWN, gtk.SHADOW_OUT)
+ iconButtonDn.add(iconButtonDnArrow)
+ iconButtonDn.connect("clicked", self.configWindowCallback, "%s_dn" % icon)
+ iconButtonDn.set_sensitive(True if (iconNumber != len(self.iconOrder)) else False)
+
+ iconRow.pack_start(iconCheckBox, False, True)
+ iconRow.pack_start(iconSpacer, True, True)
+ iconRow.pack_start(iconButtonUp, False, True)
+ iconRow.pack_start(iconButtonDn, False, True)
+
+ self.configWindowActiveIconsCheckBoxes[icon] = iconCheckBox
+ self.configWindowVBoxIcons.pack_start(iconRow, True, True, 2)
+ if (windowClose):
+ self.configWindowDestroyer(None)
+
+ def configWindowDestroyer(self, widget, data = None):
+ self.configWindow.destroy()
+ self.configWindowActive = False
+
+ def configWindowDeleter(self, widget, event, data = None):
+ return False
+
def configWindowMaker(self, name=None):
if (self.configWindowActive):
self.configWindowDestroyer(None)
@@@ -241,13 -316,11 +326,11 @@@
self.configWindowVBox2.pack_start(self.configWindowIconpathLabel, True, True, 0)
self.configWindowVBox2.pack_start(self.configWindowIconpathText, True, True, 0)
- self.configWindowActiveIconsCheckBoxes = {}
- for icon in self.availableIcons:
- configWindowActiveIconCheckBox = gtk.CheckButton("%s is Active" % icon)
- configWindowActiveIconCheckBox.set_active(True if (icon in self.enabledIcons) else False)
+ self.configWindowVBoxIcons = gtk.VBox(False, 0)
+
+ self.configWindowGetIconOrder()
- self.configWindowActiveIconsCheckBoxes[icon] = configWindowActiveIconCheckBox
- self.configWindowVBox2.pack_start(configWindowActiveIconCheckBox, True, True, 0)
+ self.configWindowVBox2.pack_start(self.configWindowVBoxIcons)
self.configWindowChangesLabel = gtk.Label('(Changes require restart!)')
--
openmoko panel plugin
More information about the pkg-fso-commits
mailing list