[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

gEDA-cvs: geda_manager.git: branch: master updated (7e2cfec1315a4e44c4cbe7b990dea67c3cc43545)



The branch, master has been updated
       via  7e2cfec1315a4e44c4cbe7b990dea67c3cc43545 (commit)
      from  58d0432aef00eb322a1e560b97fb670d8183eece (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


=========
 Summary
=========

 src/gedamanager.py |   42 +++++++++++++++++++++++++++++++++++-------
 src/menu.xml       |    2 +-
 src/utils.py       |   41 ++++-------------------------------------
 3 files changed, 40 insertions(+), 45 deletions(-)


=================
 Commit Messages
=================

commit 7e2cfec1315a4e44c4cbe7b990dea67c3cc43545
Author: Newell Jensen <jensen@xxxxxxxxxxxxxxx>
Date:   Sat Aug 9 00:40:51 2008 -0700

    Fixed some bugs.

:100644 100644 cf31ef6... 5bad900... M	src/gedamanager.py
:100644 100644 8996e59... 555f505... M	src/menu.xml
:100644 100644 8aae6a0... b3cc946... M	src/utils.py

=========
 Changes
=========

commit 7e2cfec1315a4e44c4cbe7b990dea67c3cc43545
Author: Newell Jensen <jensen@xxxxxxxxxxxxxxx>
Date:   Sat Aug 9 00:40:51 2008 -0700

    Fixed some bugs.

diff --git a/src/gedamanager.py b/src/gedamanager.py
index cf31ef6..5bad900 100644
--- a/src/gedamanager.py
+++ b/src/gedamanager.py
@@ -110,21 +110,49 @@ class gEDAManager:
          self.cb_url_geda_wiki),
         ('gEDA Documentation', None, 'gEDA _Documentation', None,
          'Opens link in browser', self.cb_url_geda_documentation),
-        ('gEDA Manager', None, 'gEDA _Manager', None, 'Opens link in browser',
-         self.cb_url_geda_manager),
+        ('gEDA Manager Documentation', None, 'gEDA _Manager', None, 'Opens link in browser', self.cb_url_geda_manager),
         ('Web Resources', None, '_Web Resources'),
-        ('About', gtk.STOCK_ABOUT, '_About', None, None,
-         self.cb_show_about_dialog),]
+        ('About', gtk.STOCK_ABOUT, '_About', None, 'Extra Information about gEDA and the gEDA Manager', self.cb_show_about_dialog),]
 
         actiongroup0.add_actions(actiongroup0_list)
         self.menu_uimanager.insert_action_group(actiongroup0, 0)
         merge_id = self.menu_uimanager.add_ui_from_file('menu.xml')
         menubar = self.menu_uimanager.get_widget('/MenuBar')
-        
         self.vbox1 = gtk.VBox()
         self.vbox1.show()
         self.window.add(self.vbox1)
         self.vbox1.pack_start(menubar, False, False, 0)
+        
+        # Set up tooltips
+        tooltips = gtk.Tooltips()
+        widget = self.menu_uimanager.get_widget('/MenuBar/File/New Project')
+        action = self.menu_uimanager.get_action('/MenuBar/File/New Project')
+        tooltips.set_tip(widget, action.get_property('tooltip'))
+        widget = self.menu_uimanager.get_widget('/MenuBar/File/Open Project')
+        action = self.menu_uimanager.get_action('/MenuBar/File/Open Project')
+        tooltips.set_tip(widget, action.get_property('tooltip'))        
+        widget = self.menu_uimanager.get_widget('/MenuBar/File/Close Project')
+        action = self.menu_uimanager.get_action('/MenuBar/File/Close Project')
+        tooltips.set_tip(widget, action.get_property('tooltip'))        
+        widget = self.menu_uimanager.get_widget('/MenuBar/File/Exit')
+        action = self.menu_uimanager.get_action('/MenuBar/File/Exit')
+        tooltips.set_tip(widget, action.get_property('tooltip'))        
+        widget = self.menu_uimanager.get_widget('/MenuBar/Edit/Preferences...')
+        action = self.menu_uimanager.get_action('/MenuBar/Edit/Preferences...')
+        tooltips.set_tip(widget, action.get_property('tooltip'))
+        widget = self.menu_uimanager.get_widget('/MenuBar/Help/Web Resources/gEDA Manager Documentation')
+        action = self.menu_uimanager.get_action('/MenuBar/Help/Web Resources/gEDA Manager Documentation')
+        tooltips.set_tip(widget, action.get_property('tooltip'))
+        widget = self.menu_uimanager.get_widget('/MenuBar/Help/Web Resources/gEDA Documentation')
+        action = self.menu_uimanager.get_action('/MenuBar/Help/Web Resources/gEDA Documentation')
+        tooltips.set_tip(widget, action.get_property('tooltip'))
+        widget = self.menu_uimanager.get_widget('/MenuBar/Help/Web Resources/gEDA Wiki')
+        action = self.menu_uimanager.get_action('/MenuBar/Help/Web Resources/gEDA Wiki')
+        tooltips.set_tip(widget, action.get_property('tooltip'))
+        widget = self.menu_uimanager.get_widget('/MenuBar/Help/About')
+        action = self.menu_uimanager.get_action('/MenuBar/Help/About')
+        tooltips.set_tip(widget, action.get_property('tooltip'))
+        
 
 
     def __init_gui_sections__(self):
@@ -1063,14 +1091,14 @@ class gEDAManager:
                 # Logic to call function to find what type of file it is
                 # and then to populate the according tree view
                 ext = name.split('.')[-1]
-                self.utils.get_processes_tree(self, ext)
+                self.utils.get_processes_tree(self, ext, None, True)
                 # Update 'Processes: ' for the 'Processes' tree
                 column = self.processes_tree.get_column(0)
                 column.set_title('Processes for: ' + name)
             else: # We have a folder
                 # Logic to call the functions to populate the 'Processes' tree
                 # view.
-                self.utils.get_processes_tree(self, None, True)
+                self.utils.get_processes_tree(self, None, True, True)
                 # Update 'Processes: ' for the 'Processes' tree
                 column = self.processes_tree.get_column(0)
                 column.set_title('Processes for all files in: ' + name)
diff --git a/src/menu.xml b/src/menu.xml
index 8996e59..555f505 100644
--- a/src/menu.xml
+++ b/src/menu.xml
@@ -14,7 +14,7 @@
       <menu action="Web Resources">
 	<menuitem action="gEDA Wiki"/>
 	<menuitem action="gEDA Documentation"/>
-	<menuitem action="gEDA Manager"/>
+	<menuitem action="gEDA Manager Documentation"/>
       </menu>
       <separator/>
       <menuitem action="About"/>
diff --git a/src/utils.py b/src/utils.py
index 8aae6a0..b3cc946 100644
--- a/src/utils.py
+++ b/src/utils.py
@@ -35,41 +35,6 @@ class Utils:
     """
     Utility class for the gEDA Manager.
     """
-    # Look Up Table used to look up static resources
-
-##     icon_lut = {'project': '../images/bitmaps/pn-project.bmp',
-##                 'sch': '../images/bitmaps/geda-gschem22.png',
-##                 'gm': '../images/bitmaps/document.bmp',
-##                 'pcb': '../images/bitmaps/pcb22.png',
-##                 'v': '../images/bitmaps/verilog-module.bmp',
-##                 'vhd': '../images/bitmaps/vhdl-module.bmp',
-##                 'log': '../images/bitmaps/page_white.png',
-##                 'gbr': '../images/bitmaps/gerbv-icon26.png',
-##                 'cnc': '',
-##                 'gerbv': '',
-##                 'g2p': '../images/bitmaps/geda-xgsch2pcb-26.png',
-##                 'gafrc': '',
-##                 'gschemrc': '',
-##                 'gnetlistrc': '',
-##                 'gattribrc': '../images/bitmaps/geda-gattrib22.png',
-##                 'attribs': '',
-##                 'net': '',
-##                 'cmd': '',
-##                 'new.pcb': '../images/bitmaps/application-x-pcb-layout-22.png',
-##                 'scm': '',
-##                 'drc': '',
-##                 'sym': '../images/bitmaps/schematic-module.bmp',
-##                 'ps': '',
-##                 'png': '../images/bitmaps/image.png',
-##                 'bom': '../images/bitmaps/money.png',
-##                 'bom2': '../images/bitmaps/money_add.png',
-##                 'tex': '',
-##                 'gnumeric': '',
-##                 'spice': '../images/bitmaps/plot_singleplot.png',
-##                 'dwg': '',
-##                 'other': '../images/bitmaps/page_white_error.png',}
-
-
     def __init__(self):
         """ Constructor. """
         self.directory = os.getcwd()
@@ -247,7 +212,7 @@ class Utils:
 
 
     @exceptions
-    def get_processes_tree(self, gedamanager, ext=None, folder=None):
+    def get_processes_tree(self, gedamanager, ext=None, folder=None, clear=None):
         """!
         Method to populate the 'Processes' tree view in the gEDA Manager.
         @param gedamanager is the current gEDAManager instance.        
@@ -255,11 +220,13 @@ class Utils:
         in the 'Sources' tree view.
         @param folder is a flag used to let the method know whether or not a
         folder has been selected.
+        @param clear is a paramater that is used to force a clearing of the
+        processes model.
         """
         g = gedamanager
         current_directory = os.getcwd()
         os.chdir(self.directory)
-        if folder == None:
+        if clear:
             g.processes.clear()
         icon = gtk.IconTheme()
         




_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs