Changeset 902 for branch/k0p/umitGUI/ProfileManager.py

Timestamp:

06/30/07 15:07:29 (6 years ago)

Author:

kop-labs

Message:

fix of visual

Files:

• branch/k0p/umitGUI/ProfileManager.py (modified) (12 diffs)

branch/k0p/umitGUI/ProfileManager.py

@@ -65 +65 @@
         
         self.main_frame = HIGFrame("Profiles")
-        self.main_frame.set_shadow_type(gtk.SHADOW_ETCHED_OUT)
-        
-        
+        #self.main_frame.set_shadow_type(gtk.SHADOW_ETCHED_OUT)
+
+        self.align = gtk.Alignment(0.0, 0.0, 1.0, 1.0)
+        self.align.set_padding(0,0,12,0)
+        
         self.vbox = HIGVBox()
         self.profiles_sw = HIGScrolledWindow()
         #TreeView
-        self.hbox_aux_tv = HIGHBox()
-        self.model = gtk.TreeStore(gobject.TYPE_STRING)
+        self.model = gtk.TreeStore(gobject.TYPE_STRING, gobject.TYPE_STRING)
         self.profiles_tv = gtk.TreeView(self.model)
         renderer = gtk.CellRendererText()
         column = gtk.TreeViewColumn("Name", renderer, text=0)
         self.profiles_tv.append_column(column)
+        renderer_hint = gtk.CellRendererText()
+        column_hint = gtk.TreeViewColumn("Hint", renderer_hint, text=1)
+        self.profiles_tv.append_column(column_hint)
         
 
@@ -87 +91 @@
         #Buttons
         self.hbox_buttons = HIGHBox()
-        self.edit_button = HIGButton(stock='gtk-edit')
+
+        self.wiz_button = HIGButton(title='Wizard', stock='gtk-convert')
+        self.wiz_button.connect("clicked", self.new_wiz)
+
+        self.edit_button = HIGButton(stock='gtk-edit')
         self.edit_button.connect("clicked", self.open_peditor)
         self.new_button = HIGButton(stock='gtk-new')
-        self.new_button.connect("clicked", self.new_wiz)
+        self.new_button.connect("clicked", self.open_peditor)
         self.copy_button = HIGButton(stock='gtk-copy')
         self.copy_button.connect("clicked", self.copy_profiles)
         self.delete_button = HIGButton(stock=gtk.STOCK_DELETE)
         self.delete_button.connect('clicked', self.delete_profile)      
-        
+        
         #Apply Buttons
-        self.hbox_apply = HIGHBox()
-        self.cancel_button = HIGButton(stock='gtk-cancel')
+        self.cancel_button = HIGButton(stock='gtk-close')
         self.cancel_button.connect("clicked", self.quit)
-        self.ok_button = HIGButton(stock='gtk-ok')
-        self.ok_button.connect("clicked", self.apply_modifications)
 
     def __fill_widgets(self):
@@ -107 +112 @@
                 
         self.profiles = CommandProfile()
-        profiles = self.profiles.sections()
-        profiles.sort()
-        
-       
-        for command in profiles:
-            myiter = self.model.insert_after(None, None)
-            self.model.set_value(myiter, 0, command)
-            
+
+
+        self._reload_profile_list()
+
         #selection = self.profiles_tv.get_selection()
         #selection.connect("changed", self.change_nmap_command)
@@ -125 +126 @@
         Pack all widgets of windows 
         """
-        self.vbox_main.pack_start(self.main_frame)
-        self.main_frame.add(self.vbox)
+        self.vbox_main.pack_start(self.main_frame, True, True)
+        self.main_frame.add(self.align)
+        self.align.add(self.vbox)
+        self.vbox.set_border_width(6)
         
         self.vbox.pack_start(self.profiles_sw, True, True, 0)
@@ -132 +135 @@
         self.hbox_info.pack_start(self.command_label, False,False,0)
         self.hbox_info.pack_start(self.command_entry, True, True, 0)
-        self.vbox.pack_start(self.hbox_info, True, True,0)
-        
-        self.vbox.pack_start(self.hbox_buttons, False, True, 0)
-        
-        self.hbox_buttons.pack_end(self.copy_button, False, True)
-        self.hbox_buttons.pack_end(self.edit_button, False, True)
-        self.hbox_buttons.pack_end(self.delete_button, False, True)
-        self.hbox_buttons.pack_end(self.new_button, False, True)
-
-        
-        #self.hbox_aux_tv .pack_start(self.profiles_tv,False, False)
+        self.vbox.pack_start(self.hbox_info, False,False,0)
+        
+
+
+        self.hbox_buttons.pack_end(self.cancel_button)    
+        self.hbox_buttons.pack_end(self.copy_button, True, True)
+        self.hbox_buttons.pack_end(self.edit_button, True, True)
+        self.hbox_buttons.pack_end(self.delete_button, True, True)
+        self.hbox_buttons.pack_end(self.new_button, True, True)
+        self.hbox_buttons.pack_end(self.wiz_button, True, True)
+        self.hbox_buttons.set_spacing(6)
+        self.vbox_main.pack_start(self.hbox_buttons, False, False)
+        
         self.profiles_sw.set_size_request(400,170)
         self.profiles_sw.add_with_viewport(self.profiles_tv) 
 
-        self.hbox_apply.pack_end(self.ok_button)
-        self.hbox_apply.pack_end(self.cancel_button)
-        self.vbox_main.pack_start(self.hbox_apply)
+
         
     def get_selected_profile(self):
@@ -164 +167 @@
         """
         assert widget_tv != None
-        
-        self.command_entry.set_text(self.profiles.get_command(self.get_selected_profile()))     
+        # it call __init__ because when wizard or profile are open,  
+        # need update profiles
+        self.profiles.__init__()
+        # update text entry of command
+        self.command_entry.set_text(self.profiles.get_command(
+            self.get_selected_profile()))       
     
     def new_wiz(self,widget):
         w = Wizard()
         w.set_notebook(None)
-        
+        w.set_profilemanager(self.model)
         w.show_all()
+        
 
     def open_peditor(self, widget):
@@ -189 +197 @@
             # New Profile
             pe = ProfileEditor()
+            pe.set_profilemanager(self.model)
             pe.show_all()
+            self._reload_profile_list()
     
     def copy_profiles(self, widget):
@@ -195 +205 @@
         Copy selected Profile
         """
-
 
         d = ProfileName(_("Insert a profile name"))
@@ -213 +222 @@
 
         self.profiles.add_profile(profile_name,\
-                                  save = False,\
                                   command=command,\
                                   hint=hint,\
@@ -220 +228 @@
                                   options=options.get_options())
         
-        myiter = self.model.insert_after(None, None)
+        
+        
+        myiter = self.model.insert_before(None, None)
         self.model.set_value(myiter, 0, profile_name)
+        self.model.set_value(myiter,1, self.profiles.get_hint(profile_name))
         
 
@@ -228 +239 @@
         delete profile only at treeview 
         """
-        #self.profiles.remove_profile()
+        self.profiles.remove_profile(self.get_selected_profile())
         #Update treeview
         treeselection = self.profiles_tv.get_selection()
         (model,iter) = treeselection.get_selected()
-        model.remove(iter)      
+        model.remove(iter)
+        
+        
+        
         
     def _reload_profile_list(self):
@@ -238 +252 @@
         Reload a list of profiles
         """
-        
-        
-    
-    def apply_modifications(self, widget):
-        """
-        Apply changes when clicked ok. Save based on treeview. 
-        """
-        
-        self.profiles.save_changes()
-        
-        
+        profiles = self.profiles.sections()
+        profiles.sort()
+        self.model.clear()
+        
+       
+        for command in profiles:
+            myiter = self.model.insert_before(None, None)
+            self.model.set_value(myiter, 0, command)
+            self.model.set_value(myiter,1, self.profiles.get_hint(command))
+