light9 Changeset - 37199cea3a2a

Changeset - 37199cea3a2a

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

drewp@bigasterisk.com - 11 years ago 2014-06-15 18:21:16
drewp@bigasterisk.com

KC fix sortin
Ignore-this: 70ff3a7c177d1c60e4a2181639b91a6f

1 file changed with 7 insertions and 4 deletions:

bin/keyboardcomposer

0 comments (0 inline, 0 general)

bin/keyboardcomposer

➞

Show inline comments

@@ @@ -212,31 +212,34 @@ class KeyboardComposer(Frame, SubClient) @@
         self.tk_focusFollowsMouse()
         self.submasters.findSubs() # trigger graph load, but we read
                                    # from get_all_subs, below
         rowcount = -1
         col = 0
         last_group = None
         # there are unlikely to be any subs at startup because we
         # probably haven't been called back with the graph data yet
         withgroups = sorted((self.graph.value(sub.uri, L9['group']),
                              self.graph.value(sub.uri, L9['order']),
                              sub)
         withgroups = sorted(
             (self.graph.value(sub.uri, L9['group']),
              self.graph.value(sub.uri, L9['order']),
              self.graph.label(sub), # todo: split numbers into ints so they sort right
              sub.uri,
              sub)
             for sub in self.submasters.get_all_subs())
         log.info("withgroups %s", withgroups)
         for group, order, sub in withgroups:
+        for group, order, _sortLabel, _sortUri, sub in withgroups:
             group = self.graph.value(sub.uri, L9['group'])
             if col == 0 or group != last_group:
                 row = self.make_row(group)
                 rowcount += 1
                 col = 0
             subbox = SubmasterBox(row, sub, self.session, col, rowcount)
             subbox.place(relx=col / 8, rely=0, relwidth=1 / 8, relheight=1)
             self.subbox[sub.uri] = self.slider_table[(rowcount, col)] = subbox
             self.setup_key_nudgers(subbox.scale)

0 comments (0 inline, 0 general)