Changeset 4300

Timestamp:

03/06/09 17:00:48 (4 years ago)

Author:

gpolo

Message:

Merged revisions 4291-4299 via svnmerge from
http://svn.umitproject.org/svnroot/umit/trunk

........

r4291 | gpolo | 2009-03-05 22:10:12 -0300 (Thu, 05 Mar 2009) | 1 line

Added classifier for python 2.4

........

r4292 | gpolo | 2009-03-05 22:12:32 -0300 (Thu, 05 Mar 2009) | 1 line

Added missing commas.

........

r4293 | gpolo | 2009-03-06 13:03:40 -0300 (Fri, 06 Mar 2009) | 1 line

typo fix.

........

r4294 | gpolo | 2009-03-06 13:07:45 -0300 (Fri, 06 Mar 2009) | 3 lines

Avoiding a "GtkWarning?: gtk_label_set_label: assertion `str != NULL'
failed" when not giving a value to text.

........

r4295 | gpolo | 2009-03-06 13:10:00 -0300 (Fri, 06 Mar 2009) | 1 line

Adjusted example to work with the current paths.

........

r4296 | gpolo | 2009-03-06 13:11:51 -0300 (Fri, 06 Mar 2009) | 1 line

Removed bad sys.exit (which didn't even work since sys was never imported here).

........

r4297 | gpolo | 2009-03-06 13:17:37 -0300 (Fri, 06 Mar 2009) | 1 line

Fixed bad widget packing.

........

r4298 | gpolo | 2009-03-06 13:38:11 -0300 (Fri, 06 Mar 2009) | 1 line

Misc tweaks, also removed the broken example.

........

r4299 | gpolo | 2009-03-06 13:50:40 -0300 (Fri, 06 Mar 2009) | 1 line

read_file is gone for more than one year, removed its use here. This code doesn't replace the previous read_file func.

........

Location:

branch/NetworkInventory

Files:

• . (modified) (1 prop)
• higwidgets/higlabels.py (modified) (1 diff)
• setup.py (modified) (1 diff)
• umit/gui/CrashReport.py (modified) (1 diff)
• umit/gui/NmapOutputViewer.py (modified) (1 diff)
• umit/gui/OptionBuilder.py (modified) (29 diffs)
• umit/gui/ProfileWizardEditor.py (modified) (3 diffs)
• umit/gui/Search.py (modified) (2 diffs)
• umit/gui/Splash.py (modified) (1 diff)

branch/NetworkInventory/higwidgets/higlabels.py

@@ -131 +131 @@
     """
     def __init__(self, text=None, underline=False):
-        gtk.Label.__init__(self, text)
+        gtk.Label.__init__(self)
+        if text is not None:
+            self.set_text(text)
         self.set_justify(gtk.JUSTIFY_LEFT)
         self.set_alignment(0, 0.50)

branch/NetworkInventory/setup.py

@@ -390 +390 @@
             'License :: OSI Approved :: GNU General Public License (GPL)',
             'Programming Language :: Python :: 2',
-            'Programming Language :: Python :: 2.5'
+            'Programming Language :: Python :: 2.4',
+            'Programming Language :: Python :: 2.5',
             'Programming Language :: Python :: 2.6',
             'Topic :: System :: Networking',

branch/NetworkInventory/umit/gui/CrashReport.py

@@ -174 +174 @@
         self.destroy()
         gtk.main_quit()
-        sys.exit(0)
 
     def get_description(self):

branch/NetworkInventory/umit/gui/NmapOutputViewer.py

@@ -417 +417 @@
 
     buff = n.text_view.get_buffer()
-    buff.set_text(read_file("file_with_encoding_issues.txt"))
-    
+    buff.set_text(open("file_with_encoding_issues.txt", 'rb').read())
+
     gtk.main()

branch/NetworkInventory/umit/gui/OptionBuilder.py

@@ -1 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
@@ -21 +20 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
+import os
+import sys
 import gtk
-
 from xml.dom import minidom
 
@@ -29 +29 @@
 from higwidgets.higbuttons import HIGButton
 
-from umit.gui.ScriptManager import ScriptChooserDialog #MAX
+from umit.gui.ScriptManager import ScriptChooserDialog
 from umit.gui.FileChoosers import AllFilesFileChooserDialog
-
-#from umit.core.UmitConf import is_maemo
 
 from umit.core.NmapOptions import NmapOptions
 from umit.core.I18N import _
+from umit.core.Utils import amiroot
 from umit.core.OptionsConf import options_file
-import os, sys
-
-## Integration 
-#class OptionTab(object):
-    #def __init__(self, root_tab, options, constructor, update_func):
-        #actions = {'option_list':self.__parse_option_list,\
-                   #'option_check':self.__parse_option_check}
-
-#<<<<<<< .working
+
+
 class OptionTab(object):
     def __init__(self, root_tab, options, constructor, update_func):
-        actions = {'option_list':self.__parse_option_list,\
-                   'option_check':self.__parse_option_check}
+        actions = {
+                'option_list':self.__parse_option_list,
+                'option_check':self.__parse_option_check}
 
         self.options = options
@@ -57 +50 @@
 
         options_used = self.constructor.get_options()
-        
+
         # Cannot use list comprehhension because text nodes raise exception
         # when tagName is called
@@ -65 +58 @@
             else:
                 if option_element.tagName in actions.keys():
-                    self.widgets_list.append(actions[option_element.tagName](option_element, options_used))
+                    self.widgets_list.append(
+                            actions[option_element.tagName](option_element,
+                                options_used))
 
     def __parse_option_list(self, option_list, options_used):
         options = option_list.getElementsByTagName(u'option')
-        
+
         label = HIGEntryLabel(option_list.getAttribute(u'label'))
         opt_list = OptionList()
-        
+
         for opt in options:
             opt_list.append(self.options.get_option(opt.getAttribute(u'name')))
-        
+
         for i, row in enumerate(opt_list.list):
             if row[0] in options_used:
                 opt_list.set_active(i)
-                
+
         return label, opt_list
-    
-    def is_root(self):
-        """
-        Returns if is a root users
-        """
-        
-        root = False
-        try:
-            if sys.platform == 'win32': root = True
-            elif os.getuid() == 0: root = True
-        except: pass
-        return root
-    
+
     def _disable_option(self, need_root):
         """
         enable / disable option if non-root user.
         """
-        is_root = self.is_root()
-
-        return not is_root and need_root
-    
-    
+        return not amiroot() and need_root
+
+
     def __with_icon(self, hint):
         """
@@ -108 +89 @@
         """
         return hint!=""
-    
+
     def __parse_option_check(self, option_check, options_used):
-        #arg_type = option_check.getAttribute(u'arg_type')
-        
         option = option_check.getAttribute(u'option')
         arg_type = self.options.get_arg_type(option)
@@ -124 +103 @@
         else:
             check = OptionCheck(label, opt_parse)
-        check.set_active(option in options_used)  
+        check.set_active(option in options_used)
         if self._disable_option(need_root):
             check.disable_widget()
-        type_mapping = { 
-            "str": OptionEntry,
-            "int": OptionIntSpin,
-            "float": OptionFloatSpin,
-            "level": OptionLevelSpin, 
-            "path": OptionFile,
-            "interface": OptionInterface, 
-            "scriptlist": OptionScriptList
-            }
+        type_mapping = {
+                "str": OptionEntry,
+                "int": OptionIntSpin,
+                "float": OptionFloatSpin,
+                "level": OptionLevelSpin,
+                "path": OptionFile,
+                "interface": OptionInterface,
+                "scriptlist": OptionScriptList}
 
         additional = None
@@ -171 +149 @@
             elif te == type(OptionInterface()):
                 widget[1].child.connect('changed', self.update_entry, widget[0])
-            
+
     def update_check(self, check, extra):
         if check.get_active():
@@ -191 +169 @@
 
         self.update_command()
-        
+
     def update_entry(self, widget, check):
         if not check.get_active():
@@ -198 +176 @@
         self.constructor.remove_option(check.option['name'])
         self.constructor.add_option(check.option['name'], widget.get_text())
-        
+
         self.update_command()
-    
+
     def update_level(self, widget, check):
         if not check.get_active():
             check.set_active(True)
-        
+
         try:
             self.constructor.remove_option(check.option['name'])
@@ -210 +188 @@
                 check.set_active(False)
             else:
-                self.constructor.add_option(check.option['name'],\
-                                        level=int(widget.get_text()))
+                self.constructor.add_option(
+                        check.option['name'],
+                        level=int(widget.get_text()))
         except:pass
-        
+
         self.update_command()
 
@@ -221 +200 @@
         else:
             self.constructor.remove_option(widget.last_selected)
-        
+
         option_name = widget.options[widget.get_active()]['name']
-      
+
         self.constructor.add_option(option_name)
         widget.last_selected = option_name
-        
+
         self.update_command()
 
@@ -232 +211 @@
         if self.update_func:
             self.update_func()
-    
-                 
+
+
 class OptionBuilder(object):
     def __init__(self, xml_file, constructor, update_func):
@@ -248 +227 @@
         self.constructor = constructor
         self.update_func = update_func
-        
+
         self.root_tag = "interface"
-        
+
         self.xml = self.xml.getElementsByTagName(self.root_tag)[0]
         self.options = NmapOptions(options_file)
-        
+
         self.groups = self.__parse_groups()
         self.section_names = self.__parse_section_names()
         self.tabs = self.__parse_tabs()
-    
+
 
     def __parse_section_names(self):
@@ -265 +244 @@
             dic[group] = grp.getAttribute(u'label')
         return dic
-    
+
     def __parse_groups(self):
         return [g_name.getAttribute(u'name') for g_name in \
@@ -274 +253 @@
         dic = {}
         for tab_name in self.groups:
-            dic[tab_name] = OptionTab(self.xml.getElementsByTagName(tab_name)[0],
-                                      self.options,
-                                      self.constructor,
-                                      self.update_func)
+            dic[tab_name] = OptionTab(
+                    self.xml.getElementsByTagName(tab_name)[0],
+                    self.options,
+                    self.constructor,
+                    self.update_func)
         return dic
 
@@ -284 +264 @@
     def enable_widget(self):
         self.set_sensitive(True)
-    
+
     def disable_widget(self):
         self.set_sensitive(False)
@@ -292 +272 @@
         self.list = gtk.ListStore(str)
         gtk.ComboBoxEntry.__init__(self, self.list)
-        
+
         cell = gtk.CellRendererText()
         self.pack_start(cell, True)
@@ -301 +281 @@
         self.list = gtk.ListStore(str)
         gtk.ComboBox.__init__(self, self.list)
-        
+
         cell = gtk.CellRendererText()
         self.pack_start(cell, True)
         self.add_attribute(cell, 'text', 0)
-        
+
         self.options = []
-    
+
     def append(self, option):
         self.list.append([option[u'name']])
@@ -314 +294 @@
 class OptionCheckIcon(HIGHBox, OptionWidget):
     def __init__(self, label=None, option=None, hint=None):
-        
+
         HIGHBox.__init__(self)
-        
+
         self.cbutton = OptionCheck(label,option)
         self.option = option
@@ -322 +302 @@
         self.pack_start(self.cbutton, False, False)
         self.pack_start(self.hint, False, False, 5)
-    
+
     def connect(self, action, func, additional):
         """
-        connect checkbox 
+        connect checkbox
         """
         self.cbutton.connect(action, func, additional)
-    
+
     def set_active(self, value):
         """
@@ -334 +314 @@
         """
         self.cbutton.set_active(value)
-        
+
     def get_active(self):
         return self.cbutton.get_active()
-    
+
     def get_checkbox(self):
         """
-        Returns checkbox 
+        Returns checkbox
         example, to do connection
         """
         return self.cbutton
-    
+
     def get_option(self):
         return self.cbutton.get_option()
 
 class OptionScriptList(HIGHBox, OptionWidget, object):
-    # From MAX
     def __init__(self):
         HIGHBox.__init__(self)
-        
+
         self.entry = OptionEntry()
         self.button = HIGButton(stock=gtk.STOCK_EDIT)
-        
+
         self._pack_expand_fill(self.entry)
         self._pack_noexpand_nofill(self.button)
-        
+
         self.button.connect('clicked', self.open_dialog_cb)
+
     def open_dialog_cb(self, widget):
         dialog = ScriptChooserDialog(self.entry.get_text())
@@ -369 +349 @@
     def __init__(self, label=None, option=None):
         gtk.CheckButton.__init__(self, label)
-        
+
         self.option = option
-    
+
     def get_option(self):
         return self.option
@@ -400 +380 @@
     def __init__(self, param=""):
         HIGHBox.__init__(self)
-        
+
         self.entry = OptionEntry()
         self.button = HIGButton(stock=gtk.STOCK_OPEN)
-        
+
         self._pack_expand_fill(self.entry)
         self._pack_noexpand_nofill(self.button)
@@ -409 +389 @@
         self.entry.set_text(param)
         self.button.connect('clicked', self.open_dialog_cb)
-    
+
     def open_dialog_cb(self, widget):
         dialog = AllFilesFileChooserDialog(_("Choose file"))
@@ -429 +409 @@
 
         self.hint_image = gtk.Image()
-        self.hint_image.set_from_stock(gtk.STOCK_DIALOG_INFO, gtk.ICON_SIZE_SMALL_TOOLBAR)
+        self.hint_image.set_from_stock(
+                gtk.STOCK_DIALOG_INFO,
+                gtk.ICON_SIZE_SMALL_TOOLBAR)
 
         self.add(self.hint_image)
         self.add_events(gtk.gdk.BUTTON_MOTION_MASK)
         self.connect("button-press-event", self.show_hint)
-        #self.connect("enter-notify-event", self.show_hint)
-         
+
 
     def show_hint(self, widget, event=None):
@@ -441 +422 @@
         hint_window.show_all()
 
-    
+
 class HintWindow(gtk.Window):
-    
+
     def __init__(self, hint):
         gtk.Window.__init__(self, gtk.WINDOW_POPUP)
         self.set_position(gtk.WIN_POS_MOUSE)
         bg_color = gtk.gdk.color_parse("#fbff99")
-        
+
         self.modify_bg(gtk.STATE_NORMAL, bg_color)
 
@@ -455 +436 @@
         self.event.set_border_width(10)
         self.event.connect("button-press-event", self.close)
-        #self.event.connect("leave-notify-event", self.close)        
         self.hint_label = gtk.Label(hint)
         self.hint_label.set_use_markup(True)
         self.hint_label.set_line_wrap(True)
-        
+
         self.event.add(self.hint_label)
         self.add(self.event)
@@ -465 +445 @@
     def close(self, widget, event=None):
         self.destroy()
-        
-if __name__ == '__main__':
-    o = OptionBuilder('profile_editor.xml')
-
-    ol = OptionFile()
-    w = gtk.Window()
-    w.add(ol)
-    w.show_all()
-    w.connect('delete-event', lambda x,y,z=None: gtk.main_quit())
-    gtk.main()

branch/NetworkInventory/umit/gui/ProfileWizardEditor.py

@@ -194 +194 @@
         box = HIGHBox()
         box._pack_expand_fill(self.treeview)
-        self.profile_group_sw.add(box)
+        self.profile_group_sw.add_with_viewport(box)
         
         
@@ -290 +290 @@
         column = gtk.TreeViewColumn("Name", renderer, text=0)
         treeview.append_column(column)
-        self.prop_frame_option.add(treeview)
+        prop_sw.add(treeview)
         self.prop_frame_option.add(prop_sw)
         
@@ -306 +306 @@
         self.prop_exp = HIGExpander("Proprieties")
 
-        label = gtk.Label('s')
-        self.prop_exp.add(label)
-        self.prop_frame.add(self.prop_exp)    
-        
+        self.prop_frame.add(self.prop_exp)
+
 
 

branch/NetworkInventory/umit/gui/Search.py

@@ -86 +86 @@
             self.fraction
         except:
-            self.fraction = 0.2        
+            self.fraction = 0.2
         self.progress.set_fraction(self.fraction + self.progress.get_fraction())
 
@@ -92 +92 @@
     filename = property(get_filename,
                         set_filename,
-                        doc=_("File name been searched"))
+                        doc=_("File's name being searched"))
     path = property(get_path,
                     set_path,
-                    doc=_("Path been scanned"))
+                    doc=_("Path being scanned"))
     fraction = property(get_fraction,
                         set_fraction,

branch/NetworkInventory/umit/gui/Splash.py

@@ -76 +76 @@
 
 if __name__ == "__main__":
-    from os.path import join
-    s = Splash(join(".", "share", "pixmaps", "splash.png"))
+    import os
+    s = Splash(os.path.join(".", "share", "pixmaps", "umit", "splash.png"))
     gtk.main()