Changeset 3046

Timestamp:

06/27/08 18:15:16 (5 years ago)

Author:

luis

Message:

Added fill colour to pixbuf

Location:

branch/PreferencesWindow

Files:

• share/pixmaps/umit/Preferences/expose-bw.svg (added)
• share/pixmaps/umit/Preferences/fonts-bw.svg (added)
• share/pixmaps/umit/Preferences/general-bw.svg (added)
• share/pixmaps/umit/Preferences/network-bw.svg (added)
• share/pixmaps/umit/Preferences/network.svg (modified) (2 diffs)
• umitPreferences/PreferencesWindow.py (modified) (5 diffs)
• umitPreferences/TabsWidget.py (modified) (3 diffs)

branch/PreferencesWindow/share/pixmaps/umit/Preferences/network.svg

@@ -36 +36 @@
      inkscape:zoom="3.4263824"
      inkscape:cx="-30.548629"
-     inkscape:cy="53.550691"
+     inkscape:cy="30.202451"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
-     inkscape:window-width="1024"
-     inkscape:window-height="768"
-     inkscape:window-x="0"
-     inkscape:window-y="0" />
+     inkscape:window-width="768"
+     inkscape:window-height="722"
+     inkscape:window-x="4"
+     inkscape:window-y="25" />
   <metadata
      id="metadata7">
@@ -123 +123 @@
        transform="translate(2.8543262,-1.0590396)" />
     <rect
-       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:2.34952950000000005px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:2.3495295px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        id="rect3166"
        width="36.007656"
        height="34.840244"
-       x="4.4046502"
-       y="-0.23834826" />
+       x="4.1127973"
+       y="0.053504746" />
     <text
        xml:space="preserve"
        style="font-size:8.61121845px;font-style:normal;font-weight:bold;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans;-inkscape-font-specification:Sans Bold"
-       x="8.6196966"
-       y="5.0014243"
+       x="12.289488"
+       y="2.4946759"
        id="text3168"
        transform="scale(1.4315132,0.6985615)"><tspan
          sodipodi:role="line"
          id="tspan3170"
-         x="-10.306305"
-         y="23.927425"
+         x="8.6712151"
+         y="6.1129479"
          style="font-size:5.9616127px;writing-mode:tb-rl;fill:#ffffff;fill-opacity:1">proxy</tspan></text>
     <text
        xml:space="preserve"
-       style="font-size:8.59194278999999916px;font-style:normal;font-weight:bold;fill:#00ec00;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans;-inkscape-font-specification:Sans Bold"
-       x="20.409737"
-       y="6.2287245"
+       style="font-size:8.59194279px;font-style:normal;font-weight:bold;fill:#00ec00;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans;-inkscape-font-specification:Sans Bold"
+       x="26.910929"
+       y="4.8137159"
        id="text3172"
        transform="scale(1.2120904,0.825021)"><tspan
          sodipodi:role="line"
          id="tspan3174"
-         x="0.45572183"
-         y="26.182739"
-         style="font-size:6.60918712999999958px;writing-mode:tb-rl;fill:#00ec00;fill-opacity:1">net</tspan></text>
+         x="12.729916"
+         y="18.994728"
+         style="font-size:6.60918713px;writing-mode:tb-rl;fill:#00ec00;fill-opacity:1">net</tspan></text>
     <rect
        style="fill:#76f564;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"

branch/PreferencesWindow/umitPreferences/PreferencesWindow.py

@@ -24 +24 @@
 from higwidgets.higframe import HIGFrame
 
+
 from umitCore.UmitLogging import log
 from umitCore.I18N import _
@@ -44 +45 @@
         self.set_title("Preferences")
         self.set_position(gtk.WIN_POS_CENTER_ALWAYS)
-        self.resize(600,300)
+        self.resize(500,400)
         self.__create()
         self.__pack()
         self.__frame = None
+        self.__list = {
+            'General settings':'general.svg',
+            'Fonts':'fonts.svg',
+            'Expose/Interface':'expose.svg',
+            'Network':'network.svg'
+            }
+        self.__list_bw = {
+            'General settings':'general-bw.svg',
+            'Fonts':'fonts-bw.svg',
+            'Expose/Interface':'expose-bw.svg',
+            'Network':'network-bw.svg'
+            }
+        
+                
+
         
         self.connect("destroy", lambda w: gtk.main_quit())
         self.connect("delete_event", lambda w, e: gtk.main_quit())
-        self._create_frame("General")
+        self._create_frame("General Settings")
+        self.__general_settings()
 
         self.show_all()
-    def on_select(self,icon_view, model=None):
+    def on_select(self,icon_view, model=None, current=None):
         selected = icon_view.get_selected_items()
+        
+
+        
+        
+        # Frame changes 
         if len(selected) == 0: return
         i = selected[0][0]
+        
+        
+        # Put Black and White the last selected item
+
+        if (current[0] != None and current[0] != i ):
+            cat = category = model[current[0]][0]
+            model.remove(model.get_iter(current[0]))
+            if (current[0]>model.get_n_columns()):
+                current[0]=current[0]-1
+                iter_bw = None 
+            else:
+                iter_bw = model.get_iter(current[0])
+            self.__t.add_item(category, self.__list_bw.get(category), \
+                          iter_bw)
+            current[0] = i
+        
+        
         category = model[i][0]
         self._create_frame(category)
+
+        model.remove(model.get_iter(i))
+
+        if (i>model.get_n_columns()):
+            i=i-1
+            iter = None 
+        else:
+            iter = model.get_iter(i)
+
+        
+            
+        
+        self.__t.add_item(category, self.__list.get(category), \
+                          iter)
+        
     def __create(self):
         """ Create mainly widgets"""
@@ -69 +123 @@
         
         self.__t.add_item("General settings", "general.svg")
-        self.__t.add_item("Fonts", "fonts.svg")
-        self.__t.add_item("Expose/Interface", "expose.svg")
-        self.__t.add_item("Network", "network.svg")
+        self.__t.add_item("Fonts", "fonts-bw.svg")
+        self.__t.add_item("Expose/Interface", "expose-bw.svg")
+        self.__t.add_item("Network", "network-bw.svg")
 
 
@@ -105 +159 @@
         
         ### Network - Proxy
+        
+        
+    def __general_settings(self):
+        self.__framebox = HIGVBox()
+        self.__check_splash = gtk.CheckButton(_('Enable Splash on start'))
+        self.__frame.add(self.__framebox)
+        self.__framebox.pack_start(self.__check_splash, False,False)
+        
     
     def _create_frame(self, name):
@@ -121 +183 @@
         """ Organize widgets  """
         #self.__box.pack_start(self.__treeview, True, True)
-        self.__box.pack_start(self.__t, False, True)
+        self.__box.pack_start(self.__t, False, False)
         self.add(self.__box)
     def close(self):

branch/PreferencesWindow/umitPreferences/TabsWidget.py

@@ -61 +61 @@
         self._icons_list = []
         self._tabstruct = TabStruct()
-        
+        self.__current = [0]
         self.__model = gtk.ListStore(str, gtk.gdk.Pixbuf)
+        #self.__model = gtk.ListStore(str, HIGHBox)
         self.__pixmap_d = Path.pixmaps_dir
 
@@ -75 +76 @@
 
         # Change background color -- FIXME 
-        self.__icon.set_name("icon tabs")
-        gtk.rc_parse_string( 
-"""
-style "iconview"
-{
-  bg[PRELIGHT] = { 0.75, 3, 1 }
-}
-class 'GtkIconView' style 'iconview'
+        #self.__icon.set_name("icon tabs")
+        #gtk.rc_parse_string( 
+#"""
+#style "iconview"
+#{
+  #bg[PRELIGHT] = { 0.75, 3, 1 }
+#}
+#class 'GtkIconView' style 'iconview'
 
-""")
+#""")
         map = self.__icon.get_colormap()
-        colour = map.alloc_color("red") # light red
-        colour = map.alloc_color("#FF9999") # light red
+
+        colour = map.alloc_color("#FFF9E9") # light red
+        
+        style = self.__icon.get_style().copy()
+        style.base[gtk.STATE_NORMAL] = colour
+        self.__icon.set_style(style)
 
 
-        self.cellpb = gtk.CellRendererPixbuf()
-        self.cell = gtk.CellRendererText()
-        
+        #self.cellpb = gtk.CellRendererPixbuf()
+        #self.cellpb.set_property('cell-background', 'yellow')
+
+        #self.__icon.pack_start(self.cellpb, False)
+        #self.__icon.set_attributes(self.cellpb, pixbuf=0)
         self.pack_start(self.scroll, True, True)
         self.scroll.add(self.__icon)
@@ -100 +107 @@
         
         self.on_select = func
-        self.__icon.connect('selection-changed', self.on_select, self.__model)
+        self.__icon.connect('selection-changed', self.on_select, self.__model, self.__current)
+        self.__icon.connect('selection-changed', self.on_select, self.__model, self.__current)
 
 
-    def add_item(self, name, image):
+    def add_item(self, name, image, iter=None):
         """
         @name: str with name of option
         @image: str with name of image (e.g. sample.svg)
         """
+        
         pixmap_file = os.path.join(self.__pixmap_d, "Preferences" ,image)
+        
+        
+        # FIXME: only put the color when is selected
         pixbuf = gtk.gdk.pixbuf_new_from_file (pixmap_file)
-       
-        self.__model.append([name, pixbuf])
+        pixbuf2 = gtk.gdk.Pixbuf(gtk.gdk.COLORSPACE_RGB,0,8,40,40)
+        pixbuf2.fill(0xAAEEEEFF)
+        pixbuf2.composite(pixbuf,0,0,35,35,0,0,1,1,gtk.gdk.INTERP_NEAREST,50)
+        
+        
+        self.__model.insert_before(iter,[name, pixbuf])
         
         #self.__icon.modify_bg(gtk.STATE_PRELIGHT, gtk.gdk.color_parse("blue"))
-    
+    def remove_item(self, name):
+        self.__model.remove(name)
     ### Private Functions ####