LADI
/
laditools
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Add a "starting" message to wmjackctl 

* Add tooltips to parameters for jackctl_conf
* Add a "JACK Starting" tooltip for the starting status to jackctl_trayicon


git-svn-id: svn+ssh://svn.marcochapeau.org/laditools/trunk@80 bfe161da-02ef-4cea-8c43-ae261ea21ac6
This commit is contained in:
marco 2008-01-08 19:04:31 +00:00
parent 203d3da49b
commit 3b7e3a7780
3 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
jackctl_conf
View File

@ -47,13 +47,12 @@ class jackctl_conf(gtk.glade.XML):
typestr = self.jack.get_driver_param_type(driver_param)
isset, default, value = self.jack.get_driver_param_value(driver_param)
short_descr = self.jack.get_driver_short_description(driver_param)
long_descr = self.jack.get_driver_long_description(driver_param)
if typestr == "bool":
self.driver_vbox_left.pack_start(self.make_checkbox(driver_param, value, self.driver_param_dict), False)
self.driver_vbox_left.pack_start(self.make_checkbox(driver_param, value, short_descr, self.driver_param_dict), False)
elif typestr == "str":
self.driver_vbox_right.pack_start(self.make_textentry(driver_param, value, self.driver_param_dict), False)
self.driver_vbox_right.pack_start(self.make_textentry(driver_param, value, short_descr, self.driver_param_dict), False)
elif typestr == "uint" or typestr == "sint":
self.driver_vbox_right.pack_start(self.make_spinbutton(driver_param, value, self.driver_param_dict), False)
self.driver_vbox_right.pack_start(self.make_spinbutton(driver_param, value, short_descr, self.driver_param_dict), False)
#Engine tab setup
self.engine_vbox_left = self.get_widget("engine_vbox_left")
self.engine_vbox_right = self.get_widget("engine_vbox_right")
@ -61,26 +60,28 @@ class jackctl_conf(gtk.glade.XML):
for engine_param in self.engine_params:
typestr = self.jack.get_engine_param_type(engine_param)
value = self.jack.get_engine_param_value(engine_param)
descr = self.jack.get_engine_short_description(engine_param)
short_descr = self.jack.get_engine_short_description(engine_param)
if typestr == "bool":
self.engine_vbox_left.pack_start(self.make_checkbox(engine_param, value, self.engine_param_dict), False)
self.engine_vbox_left.pack_start(self.make_checkbox(engine_param, value, short_descr, self.engine_param_dict), False)
elif typestr == "str":
self.engine_vbox_right.pack_start(self.make_textentry(engine_param, value, self.engine_param_dict), False)
self.engine_vbox_right.pack_start(self.make_textentry(engine_param, value, short_descr, self.engine_param_dict), False)
elif typestr == "uint" or typestr == "sint":
self.engine_vbox_right.pack_start(self.make_spinbutton(engine_param, value, self.engine_param_dict), False)
self.engine_vbox_right.pack_start(self.make_spinbutton(engine_param, value, short_descr, self.engine_param_dict), False)
def make_checkbox(self, param_name, value, storage_dict):
def make_checkbox(self, param_name, value, short_descr, storage_dict):
storage_dict[param_name] = gtk.CheckButton(param_name)
storage_dict[param_name].set_active(value)
storage_dict[param_name].set_tooltip_text(short_descr)
storage_dict[param_name].connect("toggled", self.on_param_update, param_name)
storage_dict[param_name].show()
return storage_dict[param_name]
def make_spinbutton(self, param_name, value, storage_dict):
def make_spinbutton(self, param_name, value, short_descr, storage_dict):
storage_dict[param_name] = gtk.SpinButton()
storage_dict[param_name].set_range(0, 100000)
storage_dict[param_name].set_increments(1, 1000)
storage_dict[param_name].set_value(value)
storage_dict[param_name].set_tooltip_text(short_descr)
param_label = gtk.Label(param_name)
param_label.set_alignment(1, 0.5)
param_label.set_padding(10, 0)
@ -92,8 +93,10 @@ class jackctl_conf(gtk.glade.XML):
param_widget.show_all()
return param_widget
def make_textentry(self, param_name, value, storage_dict):
def make_textentry(self, param_name, value, short_descr, storage_dict):
storage_dict[param_name] = gtk.Entry()
storage_dict[param_name].set_text(value)
storage_dict[param_name].set_tooltip_text(short_descr)
param_label = gtk.Label(param_name)
param_label.set_alignment(1, 0.5)
param_label.set_padding(10, 0)
@ -101,7 +104,6 @@ class jackctl_conf(gtk.glade.XML):
param_widget.set_homogeneous(True)
param_widget.pack_start(param_label)
param_widget.pack_start(storage_dict[param_name])
storage_dict[param_name].set_text(value)
param_widget.show_all()
storage_dict[param_name].connect("changed", self.on_param_update, param_name)
return param_widget

1
jackctl_trayicon
View File

@ -45,6 +45,7 @@ class jackctl_trayicon(gtk.StatusIcon, pyjackctl.jack_menu):
self.menu.reposition()
def set_starting_status(self):
self.set_tooltip("JACK is starting")
self.set_from_pixbuf(self.starting_pixbuf)
def update(self):

8
wmjackctl
View File

@ -53,8 +53,12 @@ class wmjackctl(wmoo.Application, pyjackctl.jack_menu):
return self.jack
def set_starting_status(self):
# TODO: make that a real starting status display... :-p
print "Jack is starting"
self.set_line(0, "JACK")
self.set_line(1, "Starting")
self.clear_line(2)
self.clear_line(3)
self.clear_line(4)
self.clear_line(5)
def on_button_release(self, event):
if event['button'] == 3: