Mercurial > code > home > repos > light9

changeset 377:c58e781829a3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
keyboardcomposer: sort subs by group, then order, then name
author David McClosky <dmcc@bigasterisk.com>
date Fri, 15 Jun 2007 20:45:35 +0000
parents b74c50018564
children a4c294b8c9c2
files bin/keyboardcomposer
diffstat 1 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/bin/keyboardcomposer	Fri Jun 15 20:36:41 2007 +0000
+++ b/bin/keyboardcomposer	Fri Jun 15 20:45:35 2007 +0000
@@ -175,7 +175,6 @@
         row = self.rows[self.current_row]
         self.keyhints.pack_configure(before=row)
 
-        
         for col in range(8):
             try:
                 subtk = self.slider_table[(self.current_row, col)]
@@ -186,7 +185,6 @@
                 self.sliders.valueOut("button-upper%d" % (col + 1), 0)
                 continue
             self.send_to_hw(subtk.name, col + 1)
-
             
     def got_nudger(self, number, direction, full=0):
         subtk = self.slider_table[(self.current_row, number)]
@@ -216,10 +214,12 @@
         col = 0
         last_group = None
         graph = showconfig.getGraph()
-        withgroups = sorted((graph.value(sub.uri, L9['group']), sub)
+        withgroups = sorted((graph.value(sub.uri, L9['group']), 
+                             graph.value(sub.uri, L9['order']), 
+                             sub)
             for sub in self.submasters.get_all_subs())
 
-        for group, sub in withgroups:
+        for group, order, sub in withgroups:
             group = graph.value(sub.uri, L9['group'])
 
             if col == 0 or group != last_group: # make new row