Changeset 1241

Timestamp:

08/04/07 09:55:37 (6 years ago)

Author:

kop-labs

Message:

Move Pages

Location:

branch/k0p/umitInterfaceEditor

Files:

• Changelog (modified) (1 diff)
• Profile.py (modified) (9 diffs)
• TODO (modified) (1 diff)
• Tools.py (modified) (3 diffs)
• umitInterfaceEditor.py (modified) (3 diffs)

branch/k0p/umitInterfaceEditor/Changelog

@@ -1 +1 @@
 # Umit Interface Editor v0.1 Changelog
 #
+04:07:2007
+
+
+
+
+
+03:07:2007:
+        - Bug fixed of resize windows (draw and voidplace)
+        - Bux fixed: grab focus
+        - Added functions move down and move up at ProfileCore
+        - Fixed bugs with move and resize on the NotebookLabel
+        - Began add ProfileCore at Profile Edit Mode (move down, move up commands)
+        - Fixed bug when delete tabs
+        
+
 
 02:07:2007:
         - Fixed bug around allocation of SpecialHBox Wrapper
-        - Add Command to Move items 
+        - Added Command to Move items 
         - Fixed a bug related of signals fo Command to Move items
         - Auto-update ToolBar Items
+        - Began with functions to move in ProfileCore
 
 01:07:2007:

branch/k0p/umitInterfaceEditor/Profile.py

@@ -144 +144 @@
     
 
+class CommandPageNotebook(TwiceCommand, Command):
+    '''
+    Add Page at Notebook or Remove
+    '''
+    def __init__(self, notebook, page, number, profilecore, state):
+        TwiceCommand.__init__(self, state)
+        Command.__init__(self, _('Add/Remove Page'))
+        self._notebook = notebook
+        self._page = page
+        self._number = number
+        self._profilecore = profilecore
+    def _create_label(self):
+        pass
+    
+    def _add_page(self):
+        label = self._create_label()
+        self._notebook.insert_page(self._page, label, self._number)
+        
+    _execute_1 = _add_page
+    def _remove_page(self):
+        self._notebook.remove_page(self._number)
+    
+    _execute_2 = _remove_page
+    
+class CommandMovePage(CommandPageNotebook):
+    def __init__(self, notebook, page, number,profilecore, state):
+        CommandPageNotebook.__init__(notebook, page, number, profilecore, state)
+    def _move_left(self):
+        print "move left "
+    _execute_1 = _move_left
+    def _move_right(self):
+        print "move right"
+    _execute_2 = _move_right
+
+
 
 class CommandMove(TwiceCommand, Command):
@@ -256 +291 @@
 
 
-
-
-
 class CommandAddRemoveOption(TwiceCommand, Command):
     ''' 
@@ -292 +324 @@
             widget.remove(i)
         t = gtk.Label('-')
+        t.set_size_request(-1, 23)
         t.show()
         
@@ -339 +372 @@
         self._y = 0 
         
-
+        self.connect('button-press-event', self._bp)
     #Private API 
+    def _bp(self, widget,event):
+        print "other"
     def _fill_table(self):
         k = 0
@@ -419 +454 @@
         
     def _button_press_event(self,widget, event):
-        #XXX: See, may be this is import for bug of assertation GObject
         widget.set_select(True) 
         self._parent.select(False)
@@ -539 +573 @@
         HIGNotebook.__init__(self)
         self.sections_widgets = {}
+        self.sections_widgets_list = []
         self.connect('key-press-event', self.on_key_press)
         self.connect('switch-page', self.on_switch_page)
@@ -578 +613 @@
         label.show_all()
         self.sections_widgets[label] = number
+        self.sections_widgets_list.append(label)
         self.append_page(box, label)
+        self.set_tab_reorderable(label, True)
     
     def select(self, value):
         if self._old_select!=None:
             self._old_select.set_select(value)
+            self._old_select=None
     
     def on_button_press(self, widget, event):
@@ -590 +628 @@
         widget.set_select(True)
         self._old_select = widget
+        
         self.set_current_page(self.sections_widgets[widget])
         #XXX - this focus owns drag-n-drop received :( 
@@ -606 +645 @@
             if self._old_select.is_voidplace():
                 self._old_select.unload_voidplace()
+                label_tmp =self.get_tab_label(self.get_nth_page(
+                    self.get_current_page()))
+                num = self.sections_widgets[label_tmp]
+                del self.sections_widgets[label_tmp]
+                for i in range(num, len(self.sections_widgets)):
+                    print i
+                    widget_tmp = self.sections_widgets_list[i+1]
+                    self.sections_widgets[widget_tmp] = self.sections_widgets[widget_tmp] - 1 
+                
+                self.sections_widgets_list.pop(num)
                 self.remove_page(self.get_current_page())
+                
+
+                
             else: 
                 cmd = CommandAddRemoveLabel(self._old_select, 

branch/k0p/umitInterfaceEditor/TODO

@@ -4 +4 @@
         option_check,option_list and others 
 - Profile.py - review targets 
+
+
+
+
+#TODO 03/07/2007
+
+- Write ProfileCore ( Support Move and fix eventuals bugs with Add!!)
+- Integration of ProfileCore in Moves options and Sections
+
+
 
 #TODO 01/07/2007

branch/k0p/umitInterfaceEditor/Tools.py

@@ -136 +136 @@
             ('Remove Section', gtk.STOCK_REMOVE, _('_Remove Section'), 
              None, _('Remove Section'), self.np),
+            ('Add Place', gtk.STOCK_ADD, _('Add Place'), 
+             None, _('Add Place'), self.np),
             ('Remove Option', gtk.STOCK_DELETE, _('Remove Option'), 
              None, _('Remove Option'), self.np),
@@ -144 +146 @@
             <toolitem action='Move up'/>
             <toolitem action='Move down'/>
-            <separator/>
+            <toolitem action='Add Place'/>
+            <toolitem action='Remove Option'/>    
+            <separator/>
             <toolitem action='Move Section Left'/>
             <toolitem action='Move Section Right'/>
-            <separator/>
             <toolitem action='Add Section'/>
             <toolitem action='Remove Section'/>
             <separator/>
-            <toolitem action='Remove Option'/>         
+     
         </toolbar>
         """
@@ -226 +229 @@
         self._table = HIGTable()
         
+        
+        #Name
         self._label_name  = HIGEntryLabel(_('Name'))
         self._entry_name = HIGTextEntry()
+
+        #Type 
+        self._label_type = HIGEntryLabel(_('Type'))     
+        self._combo_type = gtk.combo_box_new_text()
+        self._combo_type.append_text('')
+        self._combo_type.append_text('Option List')
+        self._combo_type.append_text('Option Check')
+        self._combo_type.set_active(0)
+        self._combo_type.connect('changed', self.change_combo)
+        
+        #For option list open a dialog to add/remove options
+        self._button_list = HIGButton('Edit Option List')
+        img = gtk.Image()
+        img.set_from_file('share/icons/combo.png')
+        self._button_list.set_image(img)
+        
+        
         
         self._table.attach(self._label_name, 0,1,0, 1)
         self._table.attach(self._entry_name, 1,2,0,1)
+        self._table.attach(self._label_type, 0,1,1,2)
+        self._table.attach(self._combo_type, 1,2,1, 2)
+        self._table.attach(self._button_list, 0,2, 3,4)
         
         self._box.pack_start(self._table, False, False)
-        
+    def change_combo(self,combo):
+        model = combo.get_model()
+        index = combo.get_active()
+        if index:
+            if model[index][0]=='Option List':
+                
+                log.debug('Show Button List ')
+                self._button_list.show()
+            else:
+                print model[index][0]
+                log.debug('Hide Button List ')
+                self._button_list.hide()
+        return
     def disable_all(self):
         pass 

branch/k0p/umitInterfaceEditor/umitInterfaceEditor.py

@@ -73 +73 @@
         self._current_edit_mode = None 
         
-        
+        self.connect("delete_event", gtk.main_quit)
 
     def create_profile_edit(self):
@@ -352 +352 @@
     def save(self, widget):
         self.list_options_box.save()
-        
+    def quit(self, widget):
+        gtk.main_quit()
     def np(self, widget):
         print "Don't work yet"
@@ -367 +368 @@
             ('Save all', gtk.STOCK_SAVE, _('_Save all'), None, _('Save all'),
              self.np),
-            ('Quit', gtk.STOCK_QUIT, _('_Quit'), None, _('Quit'), self.np),
+            ('Quit', gtk.STOCK_QUIT, _('_Quit'), None, _('Quit'), self.quit),
             ('Edit', None, _('Edit'), None),
             ('Undo', gtk.STOCK_UNDO, _('_Undo'), None, _('Undo'), self._undo_cb),