Mercurial > code > home > repos > light9
comparison bin/keyboardcomposer @ 377:c58e781829a3
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 |
comparison
equal
deleted
inserted
replaced
| 376:b74c50018564 | 377:c58e781829a3 |
|---|---|
| 173 self.unhighlight_row(old_row) | 173 self.unhighlight_row(old_row) |
| 174 self.highlight_row(self.current_row) | 174 self.highlight_row(self.current_row) |
| 175 row = self.rows[self.current_row] | 175 row = self.rows[self.current_row] |
| 176 self.keyhints.pack_configure(before=row) | 176 self.keyhints.pack_configure(before=row) |
| 177 | 177 |
| 178 | |
| 179 for col in range(8): | 178 for col in range(8): |
| 180 try: | 179 try: |
| 181 subtk = self.slider_table[(self.current_row, col)] | 180 subtk = self.slider_table[(self.current_row, col)] |
| 182 self.sliders.valueOut("button-upper%d" % (col + 1), 127) | 181 self.sliders.valueOut("button-upper%d" % (col + 1), 127) |
| 183 except KeyError: | 182 except KeyError: |
| 184 # unfilled bottom row has holes (plus rows with incomplete | 183 # unfilled bottom row has holes (plus rows with incomplete |
| 185 # groups | 184 # groups |
| 186 self.sliders.valueOut("button-upper%d" % (col + 1), 0) | 185 self.sliders.valueOut("button-upper%d" % (col + 1), 0) |
| 187 continue | 186 continue |
| 188 self.send_to_hw(subtk.name, col + 1) | 187 self.send_to_hw(subtk.name, col + 1) |
| 189 | |
| 190 | 188 |
| 191 def got_nudger(self, number, direction, full=0): | 189 def got_nudger(self, number, direction, full=0): |
| 192 subtk = self.slider_table[(self.current_row, number)] | 190 subtk = self.slider_table[(self.current_row, number)] |
| 193 if direction == 'up': | 191 if direction == 'up': |
| 194 if full: | 192 if full: |
| 214 | 212 |
| 215 rowcount = -1 | 213 rowcount = -1 |
| 216 col = 0 | 214 col = 0 |
| 217 last_group = None | 215 last_group = None |
| 218 graph = showconfig.getGraph() | 216 graph = showconfig.getGraph() |
| 219 withgroups = sorted((graph.value(sub.uri, L9['group']), sub) | 217 withgroups = sorted((graph.value(sub.uri, L9['group']), |
| 218 graph.value(sub.uri, L9['order']), | |
| 219 sub) | |
| 220 for sub in self.submasters.get_all_subs()) | 220 for sub in self.submasters.get_all_subs()) |
| 221 | 221 |
| 222 for group, sub in withgroups: | 222 for group, order, sub in withgroups: |
| 223 group = graph.value(sub.uri, L9['group']) | 223 group = graph.value(sub.uri, L9['group']) |
| 224 | 224 |
| 225 if col == 0 or group != last_group: # make new row | 225 if col == 0 or group != last_group: # make new row |
| 226 row = self.make_row() | 226 row = self.make_row() |
| 227 rowcount += 1 | 227 rowcount += 1 |