light9 Changeset - d230824728aa

Changeset - d230824728aa

Parent rev.

Child rev.

[Not reviewed]

default

0 1 1

Drew Perttula - 13 years ago 2012-06-15 06:09:49
drewp@bigasterisk.com

drag submasters out of keyboardcomposer
Ignore-this: cbc405d57f6727db9690e527681202f3

2 files changed with 35 insertions and 0 deletions:

bin/keyboardcomposer

light9/tkdnd.py

0 comments (0 inline, 0 general)

bin/keyboardcomposer

➞

Show inline comments

@@ @@ -9,24 +9,25 @@ from twisted.internet import reactor, tk @@
 from twisted.web import xmlrpc, server, resource
 from Tix import *
 import Tix as tk
 import pickle
 import run_local
 from light9.Fadable import Fadable
 from light9.Submaster import Submasters, sub_maxes
 from light9.subclient import SubClient
 from light9 import dmxclient, showconfig, networking, prof
 from light9.uihelpers import toplevelat, bindkeys
 from light9.namespaces import L9
 from light9.tkdnd import initTkdnd, dragSourceRegister
 from bcf2000 import BCF2000
 nudge_keys = {
     'up'   : list('qwertyui'),
     'down' : list('asdfghjk')
+}
 class DummySliders:
     def valueOut(self, name, value):
         pass
     def close(self):
         pass
@@ @@ -64,24 +65,27 @@ class SubmasterTk(Frame): @@
         self.slider_var = DoubleVar()
         self.slider_var.set(current_level)
         self.scale = SubScale(self, variable=self.slider_var, width=20)
         namelabel = Label(self, text=sub.name, font="Arial 7", bg=darkBg,
             fg='white', pady=0)
         namelabel.pack(side=TOP)
         levellabel = Label(self, textvariable=self.slider_var, font="Arial 7",
             bg='black', fg='white', pady=0)
         levellabel.pack(side=TOP)
         self.scale.pack(side=BOTTOM, expand=1, fill=BOTH)
         bindkeys(self, "<Control-Key-l>", self.launch_subcomposer)
         for w in [self, namelabel, levellabel]:
             dragSourceRegister(w, 'copy', 'text/uri-list', sub.uri)
     def launch_subcomposer(self, *args):
         subprocess.Popen(["bin/subcomposer", "--no-geometry", self.name])
 class KeyboardComposer(Frame, SubClient):
     def __init__(self, root, graph, submasters, current_sub_levels=None,
                  hw_sliders=True):
         Frame.__init__(self, root, bg='black')
         SubClient.__init__(self)
         self.graph = graph
         self.submasters = submasters
         self.name_to_subtk = {}
         self.current_sub_levels = {}
@@ @@ -456,24 +460,26 @@ if __name__ == "__main__": @@
     parser.add_option('--no-sliders', action='store_true',
                       help="don't attach to hardware sliders")
     parser.add_option('-v', action='store_true', help="log info level")
     opts, args = parser.parse_args()
     logging.basicConfig(level=logging.INFO if opts.v else logging.WARN)
     log = logging.getLogger()
     graph = showconfig.getGraph()
     s = Submasters(graph)
     root = Tk()
     initTkdnd(root.tk, 'tkdnd/trunk/')
     tl = toplevelat("Keyboard Composer", existingtoplevel=root)
     startLevels = None
     if opts.nonpersistent:
         startLevels = {}
     kc = KeyboardComposer(tl, graph, s, startLevels,
                           hw_sliders=not opts.no_sliders)
     kc.pack(fill=BOTH, expand=1)
     for helpline in ["Bindings: B3 mute; C-l edit levels in subcomposer"]:
         tk.Label(root,text=helpline, font="Helvetica -12 italic",
                  anchor='w').pack(side='top',fill='x')

light9/tkdnd.py

➞

Show inline comments

@@ new file 100644 @@
 from glob import glob
 from os.path import join, basename
 def initTkdnd(tk, tkdndBuildDir):
     """
     pass the 'tk' attribute of any Tkinter object, and the top dir of
     your built tkdnd package
     """
     tk.call('source', join(tkdndBuildDir, 'library/tkdnd.tcl'))
     for dll in glob(join(tkdndBuildDir,
                          '*tkdnd*' + tk.call('info', 'sharedlibextension'))):
         tk.call('tkdnd::initialise',
                 join(tkdndBuildDir, 'library'),
                 join('..', basename(dll)),
                 'tkdnd')
 def dragSourceRegister(widget,
                        action='copy', datatype='text/uri-list', data=''):
     widget.tk.call('tkdnd::drag_source', 'register', widget._w)
     # with normal Tkinter bind(), the result of your handler isn't
     # actually returned so the drag doesn't get launched. This is a
     # corrected version of what bind() does when you pass a function,
     # but I don't block my tuple from getting returned (as a tcl list)
     funcId = widget._register(lambda: (action, datatype, data),
                               widget._substitute,
 # needscleanup
+                              )
     widget.bind("<<DragInitCmd>>", funcId)

0 comments (0 inline, 0 general)