[tuxdroid-svn] r661 - in software/gadgets/settings/trunk: . settings settings/Scripts/Python/GUI/wi
Status: Beta
Brought to you by:
ks156
Menu
▾
▴
[tuxdroid-svn] r661 - in software/gadgets/settings/trunk: . settings settings/Scripts/Python/GUI/widget
|
From: Paul_R <c2m...@c2...> - 2007-11-06 20:29:02
|
Author: Paul_R
Date: 2007-11-06 21:28:52 +0100 (Tue, 06 Nov 2007)
New Revision: 661
Modified:
software/gadgets/settings/trunk/settings.tgf
software/gadgets/settings/trunk/settings/Scripts/Python/GUI/widget/other.pyp
software/gadgets/settings/trunk/settings/about.xml
software/gadgets/settings/trunk/settings/strings.xml
Log:
* Added expanders on the version treeviews
Modified: software/gadgets/settings/trunk/settings/Scripts/Python/GUI/widget/other.pyp
===================================================================
--- software/gadgets/settings/trunk/settings/Scripts/Python/GUI/widget/other.pyp 2007-11-06 15:40:31 UTC (rev 660)
+++ software/gadgets/settings/trunk/settings/Scripts/Python/GUI/widget/other.pyp 2007-11-06 20:28:52 UTC (rev 661)
@@ -36,57 +36,41 @@
self.FileTreeviewUpdate()
def VersionTreeviewUpdate(self):
- #Create the treeview
- self.prog_column = gtk.TreeViewColumn(_me.string('treeVersionProg'))
- self.prog_column.set_min_width(200)
- self.prog_cell = gtk.CellRendererText()
- self.prog_column.pack_start(self.prog_cell, True)
- self.prog_column.add_attribute(self.prog_cell, 'text', 0)
-
- self.version_column = gtk.TreeViewColumn(_me.string('treeVersionVer'))
- self.version_column.set_min_width(200)
- self.version_cell = gtk.CellRendererText()
- self.version_column.pack_start(self.version_cell, True)
- self.version_column.add_attribute(self.version_cell, 'text', 1)
-
- self.ver_value_list = gtk.TreeStore(str, str)
- self.ver_gadget_viewer = gtk.TreeView(self.ver_value_list)
- self.ver_gadget_viewer.append_column(self.prog_column)
- self.ver_gadget_viewer.append_column(self.version_column)
- self.ver_gadget_viewer.set_rules_hint(True)
- self.ver_gadget_viewer.get_selection().connect("changed",self.on_row_selected_version)
- self.get_widget("scrolledwindow2").add(self.ver_gadget_viewer)
- self.get_widget("scrolledwindow2").show_all()
-
+ self.cpu_tree_store = gtk.TreeStore( str, str )
+ self.cpu_view = gtk.TreeView(self.cpu_tree_store)
+ self.cpu_renderer = gtk.CellRendererText()
+ self.cpu_column = gtk.TreeViewColumn(_me.string('treeVersionProg'), self.cpu_renderer, text=0)
+ self.cpu_column.set_min_width(300)
+ self.cpu_column.add_attribute(self.cpu_renderer, 'text', 0)
+ self.cpu_ver_renderer = gtk.CellRendererText()
+ self.cpu_ver_column = gtk.TreeViewColumn(_me.string('treeVersionVer'), self.cpu_ver_renderer )
+ self.cpu_ver_column.set_min_width(300)
+ self.cpu_ver_column.add_attribute(self.cpu_ver_renderer, 'text', 1)
+ self.cpu_view.append_column( self.cpu_column )
+ self.cpu_view.append_column( self.cpu_ver_column )
+ self.cpu_view.set_rules_hint(True)
+ self.get_widget("scrolledwindow2").add(self.cpu_view)
+ self.get_widget("scrolledwindow2").show_all()
self.refresh_version()
def FileTreeviewUpdate(self):
- self.firmware_column = gtk.TreeViewColumn(_me.string('treeVersionProg'))
- self.firmware_column.set_min_width(300)
- self.firmware_cell = gtk.CellRendererText()
- self.firmware_column.pack_start(self.firmware_cell, True)
- self.firmware_column.add_attribute(self.firmware_cell, 'text', 0)
-
- self.fversion_column = gtk.TreeViewColumn(_me.string('treeVersionVer'))
- self.fversion_column.set_min_width(200)
- self.fversion_cell = gtk.CellRendererText()
- self.fversion_column.pack_start(self.fversion_cell, True)
- self.fversion_column.add_attribute(self.fversion_cell, 'text', 1)
-
- self.f_value_list = gtk.TreeStore(str, str)
- self.f_gadget_viewer = gtk.TreeView(self.f_value_list)
- self.f_gadget_viewer.append_column(self.firmware_column)
- self.f_gadget_viewer.append_column(self.fversion_column)
- self.f_gadget_viewer.set_rules_hint(True)
- self.f_gadget_viewer.get_selection().connect("changed",self.on_row_selected_firmware)
- self.f_gadget_viewer.connect("button_press_event", self.on_tree_button_pressed)
- self.get_widget("scrolledwindow3").add(self.f_gadget_viewer)
- self.get_widget("scrolledwindow3").show_all()
-
+ self.file_tree_store = gtk.TreeStore( str, str )
+ self.file_view = gtk.TreeView(self.file_tree_store)
+ self.file_renderer = gtk.CellRendererText()
+ self.file_column = gtk.TreeViewColumn(_me.string('treeVersionProg'), self.file_renderer, text=0)
+ self.file_column.set_min_width(300)
+ self.file_column.add_attribute(self.file_renderer, 'text', 0)
+ self.file_ver_renderer = gtk.CellRendererText()
+ self.file_ver_column = gtk.TreeViewColumn(_me.string('treeVersionVer'), self.file_ver_renderer )
+ self.file_ver_column.set_min_width(300)
+ self.file_ver_column.add_attribute(self.file_ver_renderer, 'text', 1)
+ self.file_view.append_column( self.file_column )
+ self.file_view.append_column( self.file_ver_column )
+ self.file_view.connect("button_press_event", self.on_tree_button_pressed)
+ self.get_widget("scrolledwindow3").add(self.file_view)
+ self.get_widget("scrolledwindow3").show_all()
self.searchFiles()
- self.refresh_files()
-
def SoundLabelUpdate(self):
self.get_widget('btnSoundAdd').set_label(_me.string('btnSoundAdd'))
self.get_widget('btnSoundClear').set_label(_me.string('btnSoundClear'))
@@ -138,34 +122,24 @@
# VERSION TAB
#
#---------------------------------------------------------------------------
- def on_row_selected_version(self, obj):
- path = obj.get_selected_rows()
- if path[1]!= []:
- if path[1][0][0] == 2 and self.prev == False:
- self.ver_value_list.clear()
- self.prev = True
- for i in range(len(self.version_table)):
- self.ver_value_list.append(None,self.version_table[i])
- elif self.prev == True and path[1][0][0] == 2:
- self.prev = False
- self.ver_value_list.clear()
- for i in range(3):
- self.ver_value_list.append(None,self.version_table[i])
-
- def on_row_selected_firmware(self, obj):
- print 'row selected'
-
+
+ #--------------------------------------------------------------------------
+ # Search for local files
+ #--------------------------------------------------------------------------
def searchFiles(self):
filelist = os.listdir('/opt/tuxdroid/firmware')
tmppath = []
+ flag = -1
for file in filelist:
if file.lower().find('.tar.gz') != -1:
tmppath.append([file, ''])
+ flag = 1
self.filepath = tmppath
- print self.filepath
+ if flag != -1:
+ self.refresh_files()
def refresh_files(self):
- self.f_value_list.clear()
+ self.file_tree_store.clear()
for i in range(len(self.filepath)):
proc = subprocess.Popen("tar -C '/tmp' -xvf '/opt/tuxdroid/firmware/%s'"%self.filepath[i][0], shell = True, stdout = subprocess.PIPE)
proc.wait()
@@ -174,36 +148,11 @@
print self.filepath
os.system('rm -rf /tmp/tuxdroid-firmware*')
- self.f_value_list.clear()
for i in range(len(self.filepath)):
- self.f_value_list.append(None, self.filepath[i])
-
- def on_tree_button_pressed(self, widget, event):
- def show_popup(p, button, time):
- tux.sys.wait(0.1)
- self.show_gadget_popup(p, button, time)
- if event.button == 3: # right click
- thread.start_new_thread(show_popup, (None, event.button, event.time))
+ tmp = 0
+ tmp = self.file_tree_store.append(None, (self.filepath[i][0], self.filepath[i][1]))
+ self.file_tree_store.append(tmp, (self.filepath[i][0],self.filepath[i][1]))
- def show_gadget_popup(self, status_icon, button, activate_time):
- menu = gtk.Menu()
- item = gtk.CheckMenuItem(_me.string('itemChangeLog'))
- item.connect("activate", self.showChangeLog)
- menu.append(item)
-
- item = gtk.CheckMenuItem(_me.string('itemCPU'))
- item.connect("activate", self.flashCPU)
- menu.append(item)
-
- menu.show_all()
- menu.popup(None, None, None, button, activate_time)
-
- def showChangeLog(self, widget):
- print 'show ChangeLog'
-
- def flashCPU(self, widget):
- print 'flash CPU'
-
def get_new_version_infos(self):
filelist = os.listdir('/tmp')
tmppath = ''
@@ -216,52 +165,92 @@
version = racine[0].getElementsByTagName('version')
ver = version[0].attributes['tuxdroid_firmware_version'].nodeValue
return ver
-
-
+
+ #--------------------------------------------------------------------------
+ # Retreive tux HW and SW versions
+ #--------------------------------------------------------------------------
def refresh_version(self):
+
+ self.cpu_tree_store.clear()
version_table = []
+
name = 'Daemon'
version = tux.daemon.get_version()
version_table.append([name,version])
+ self.cpu_tree_store.append(None, (name, version))
name = 'API'
version = tux.api_version
version_table.append([name,version])
+ self.cpu_tree_store.append( None,(name, version))
name = 'Firmware'
version = 'Get the general firmware version'
version_table.append([name,version])
+ tmp = self.cpu_tree_store.append( None,(name, version))
- name = ' Tuxcore'
+ name = 'Tuxcore'
version = tux.hw.behavior_get_version()
version = str(version[0])+'.'+str(version[1])+'.'+str(version[2])
version_table.append([name,version])
+ self.cpu_tree_store.append( tmp,(name, version))
- name = ' Tuxaudio'
+ name = 'Tuxaudio'
version = tux.hw.audio_get_version()
version = str(version[0])+'.'+str(version[1])+'.'+str(version[2])
version_table.append([name,version])
+ self.cpu_tree_store.append( tmp,(name, version))
- name = ' Tux RF'
+ name = 'Tux RF'
version = tux.hw.tuxrf_get_version()
version = str(version[0])+'.'+str(version[1])+'.'+str(version[2])
version_table.append([name,version])
-
- name = ' Fux RF'
+ self.cpu_tree_store.append( tmp,(name, version))
+
+ name = 'Fux RF'
version = tux.hw.donglerf_get_version()
version = str(version[0])+'.'+str(version[1])+'.'+str(version[2])
version_table.append([name,version])
+ self.cpu_tree_store.append( tmp,(name, version))
- name = ' Fux USB'
+ name = 'Fux USB'
version = 'Get the USB version'
version_table.append([name,version])
+ self.cpu_tree_store.append( tmp,(name, version))
+
+ #--------------------------------------------------------------------------
+ # On right click & Menu functions
+ #--------------------------------------------------------------------------
+ def on_tree_button_pressed(self, widget, event):
+ def show_popup(p, button, time):
+ tux.sys.wait(0.1)
+ self.show_gadget_popup(p, button, time)
+ if event.button == 3: # right click
+ thread.start_new_thread(show_popup, (None, event.button, event.time))
+
+ def show_gadget_popup(self, status_icon, button, activate_time):
+ menu = gtk.Menu()
+ item = gtk.CheckMenuItem(_me.string('itemChangeLog'))
+ item.connect("activate", self.showChangeLog)
+ menu.append(item)
+
+ item = gtk.CheckMenuItem(_me.string('itemCPU'))
+ item.connect("activate", self.flashCPU)
+ menu.append(item)
- self.ver_value_list.clear()
- for i in range(3):
- self.ver_value_list.append(None,version_table[i])
- self.version_table = version_table
+ menu.show_all()
+ menu.popup(None, None, None, button, activate_time)
+
+
+ def showChangeLog(self, widget):
+ print 'show ChangeLog'
+
+ def flashCPU(self, widget):
+ print 'flash CPU'
+
+
#---------------------------------------------------------------------------
#
# SOUND TAB
Modified: software/gadgets/settings/trunk/settings/about.xml
===================================================================
(Binary files differ)
Modified: software/gadgets/settings/trunk/settings/strings.xml
===================================================================
--- software/gadgets/settings/trunk/settings/strings.xml 2007-11-06 15:40:31 UTC (rev 660)
+++ software/gadgets/settings/trunk/settings/strings.xml 2007-11-06 20:28:52 UTC (rev 661)
@@ -21,7 +21,7 @@
<gui_conf_about_title type='str'>About</gui_conf_about_title>
<chkSoundOriginal type='str'>Include originals</chkSoundOriginal>
<btnSoundClear type='str'>Clear list</btnSoundClear>
- <speaker_name type='str'>Ryan8k</speaker_name>
+ <lblSoundMic type='str'>Microphone</lblSoundMic>
<itemChangeLog type='str'>Show ChangeLog</itemChangeLog>
<lblSoundLocalSelect type='str'>Select sound</lblSoundLocalSelect>
<lblSoundExternal type='str'>Play external wave file</lblSoundExternal>
@@ -31,7 +31,7 @@
<treeVersionProg type='str'>Component</treeVersionProg>
<lblSoundExternalPlay type='str'>Play</lblSoundExternalPlay>
<gui_conf_current_bind_lb type='str'>Current</gui_conf_current_bind_lb>
- <lblSoundMic type='str'>Microphone</lblSoundMic>
+ <speaker_name type='str'>Ryan8k</speaker_name>
<gui_conf_remote_set_bt type='str'>Set</gui_conf_remote_set_bt>
<name_to_read type='str'>Tux settings</name_to_read>
<gui_conf_window_title type='str'>Parameters</gui_conf_window_title>
Modified: software/gadgets/settings/trunk/settings.tgf
===================================================================
(Binary files differ)
|
