GNOME.org
 

r7054 - in bigboard/trunk: bigboard bigboard/stocks/self data

Author: walters
Date: 2007-12-14 10:35:41 -0600 (Fri, 14 Dec 2007)
New Revision: 7054

Added:
   bigboard/trunk/data/bigboard-info.png
Modified:
   bigboard/trunk/bigboard/slideout.py
   bigboard/trunk/bigboard/stocks/self/SelfStock.py
   bigboard/trunk/data/Makefile.am
Log:
New info icon.  Theme self slideout too.



Modified: bigboard/trunk/bigboard/slideout.py
===================================================================
--- bigboard/trunk/bigboard/slideout.py	2007-12-13 20:45:51 UTC (rev 7053)
+++ bigboard/trunk/bigboard/slideout.py	2007-12-14 16:35:41 UTC (rev 7054)
@@ -1,6 +1,8 @@
 import hippo
 import gtk
 
+from bigboard.big_widgets import ThemedWidgetMixin
+
 class Slideout(hippo.CanvasWindow):
     def __init__(self, widget=None):
         super(Slideout, self).__init__(gtk.WINDOW_TOPLEVEL)
@@ -39,3 +41,12 @@
         self.move(x, y)
         self.present_with_time(gtk.get_current_event_time())
     
+class ThemedSlideout(Slideout, ThemedWidgetMixin):
+    def __init__(self, theme_hints=[], **kwargs):
+        Slideout.__init__(self, **kwargs)
+        ThemedWidgetMixin.__init__(self, theme_hints=theme_hints)
+        
+    def _on_theme_changed(self, theme):
+        self.modify_bg(gtk.STATE_NORMAL, gtk.gdk.color_parse("#%6X" % (theme.background >> 8,)))
+        self.queue_draw_area(0,0,-1,-1)
+                
\ No newline at end of file

Modified: bigboard/trunk/bigboard/stocks/self/SelfStock.py
===================================================================
--- bigboard/trunk/bigboard/stocks/self/SelfStock.py	2007-12-13 20:45:51 UTC (rev 7053)
+++ bigboard/trunk/bigboard/stocks/self/SelfStock.py	2007-12-14 16:35:41 UTC (rev 7054)
@@ -112,9 +112,9 @@
         self.__personal_box_right = CanvasVBox()
         self.__personal_box.append(self.__personal_box_right, hippo.PACK_EXPAND)
         
-        self.__name = hippo.CanvasText(font="14px Bold",
-                                       xalign=hippo.ALIGNMENT_START,
-                                       size_mode=hippo.CANVAS_SIZE_ELLIPSIZE_END)
+        self.__name = ThemedText(font="14px Bold",
+                                 xalign=hippo.ALIGNMENT_START,
+                                 size_mode=hippo.CANVAS_SIZE_ELLIPSIZE_END)
         
         self.__personal_box_right.append(self.__name)
 
@@ -122,20 +122,20 @@
 
         self.__personalization_box = CanvasVBox(spacing=2)
         self.append(self.__personalization_box)
-        self.__personalization_box.append(hippo.CanvasText(text='Personalization',
-                                                           font='12px Bold',
-                                                           xalign=hippo.ALIGNMENT_START))
+        self.__personalization_box.append(ThemedText(text='Personalization',
+                                                     font='12px Bold',
+                                                     xalign=hippo.ALIGNMENT_START))
 
-        self.__mugshot_link = IconLink(img_scale_width=22, img_scale_height=22, xalign=hippo.ALIGNMENT_START)
+        self.__mugshot_link = IconLink(img_scale_width=22, img_scale_height=22, xalign=hippo.ALIGNMENT_START, themed=True)
         self.__mugshot_link.link.connect("activated", self.__show_mugshot_link)
         self.__mugshot_link.img.set_property('image-name', '/usr/share/icons/gnome/22x22/apps/web-browser.png')
         self.__personalization_box.append(self.__mugshot_link)
 
-        link = IconLink(text='Desktop Preferences...', img_scale_width=22, img_scale_height=22, xalign=hippo.ALIGNMENT_START)
+        link = IconLink(text='Desktop Preferences...', img_scale_width=22, img_scale_height=22, xalign=hippo.ALIGNMENT_START, themed=True)
         link.link.connect("activated", self.__on_system_preferences)
         link.img.set_property('image-name', '/usr/share/icons/gnome/22x22/categories/preferences-system.png')
         self.__personalization_box.append(link)    
-        link = IconLink(text='Sidebar Preferences...', img_scale_width=22, img_scale_height=22, xalign=hippo.ALIGNMENT_START)
+        link = IconLink(text='Sidebar Preferences...', img_scale_width=22, img_scale_height=22, xalign=hippo.ALIGNMENT_START, themed=True)
         link.link.connect("activated", self.__on_sidebar_controls)
         link.img.set_property('image-name', '/usr/share/icons/gnome/22x22/categories/preferences-desktop.png')
         self.__personalization_box.append(link)
@@ -154,7 +154,7 @@
             self.__fus_users_box = CanvasVBox()
             self.__fus_box.append(self.__fus_users_box)
             
-            link = IconLink(text='Log in as Another User...', img_scale_width=22, img_scale_height=22, xalign=hippo.ALIGNMENT_START)
+            link = IconLink(text='Log in as Another User...', img_scale_width=22, img_scale_height=22, xalign=hippo.ALIGNMENT_START, themed=True)
             link.link.connect("activated", self.__do_fus_login_other_user)
             link.img.set_property('image-name', '/usr/share/icons/gnome/22x22/apps/system-users.png')
             self.__fus_box.append(link)
@@ -164,7 +164,7 @@
         self.__logout_controls_box = CanvasVBox()
         self.append(self.__logout_controls_box)
 
-        link = IconLink(text='Logout or Shutdown...', img_scale_width=22, img_scale_height=22, xalign=hippo.ALIGNMENT_START)
+        link = IconLink(text='Logout or Shutdown...', img_scale_width=22, img_scale_height=22, xalign=hippo.ALIGNMENT_START, themed=True)
         link.link.connect("activated", self.__on_logout)
         link.img.set_property('image-name', '/usr/share/icons/gnome/22x22/apps/gnome-shutdown.png')
         self.__logout_controls_box.append(link)
@@ -250,8 +250,7 @@
 
         self._namephoto_box = PhotoContentItem()
         self._namephoto_box.set_themed()
-        self._namephoto_box.set_clickable(True)
-        self._namephoto_box.set_sync_prelight_callback(self.__on_sync_prelight)        
+        self._namephoto_box.set_clickable(True) 
         self._namephoto_box.connect("button-press-event", lambda button, event: self.__on_activate())
         
         self._photo = CanvasMugshotURLImage(scale_width=48, scale_height=48)
@@ -263,8 +262,8 @@
         self._name.set_property("font", "14px Bold")
         self._namephoto_box_child.append(self._name)  
 
-        self._bulb = hippo.CanvasImage(scale_width=17, scale_height=22, xalign=hippo.ALIGNMENT_END, yalign=hippo.ALIGNMENT_CENTER)
-        self._bulb.set_property("image-name", 'bigboard-bulb-bw')
+        self._bulb = hippo.CanvasImage(xalign=hippo.ALIGNMENT_END, yalign=hippo.ALIGNMENT_CENTER)
+        self._bulb.set_property("image-name", 'bigboard-info')
         self._namephoto_box_child.append(self._bulb, hippo.PACK_EXPAND)
         
         self._namephoto_box.set_child(self._namephoto_box_child)      
@@ -299,12 +298,6 @@
 
         if self._model.ready:
             self.__on_ready()
-            
-    def __on_sync_prelight(self, prelighted):
-        if prelighted:
-            self._bulb.set_property("image-name", 'bigboard-bulb')
-        else:
-            self._bulb.set_property("image-name", 'bigboard-bulb-bw')
 
     def __idle_first_time_signin_check(self):
         ws = dbus.SessionBus().get_object('org.freedesktop.od.Engine', '/org/gnome/web_services')
@@ -368,7 +361,7 @@
         self._box.set_child_visible(self._signin, not auth)
             
     def __do_slideout(self, display, widget=None):
-        slideout = bigboard.slideout.Slideout()        
+        slideout = bigboard.slideout.ThemedSlideout()        
         widget_src = widget or self._box
         (box_x, box_y) = self._box.get_context().translate_to_screen(self._box)
         (src_x, src_y) = widget_src.get_context().translate_to_screen(widget_src)

Modified: bigboard/trunk/data/Makefile.am
===================================================================
--- bigboard/trunk/data/Makefile.am	2007-12-13 20:45:51 UTC (rev 7053)
+++ bigboard/trunk/data/Makefile.am	2007-12-14 16:35:41 UTC (rev 7054)
@@ -1,4 +1,4 @@
-icon_DATA = bigboard-bulb.png bigboard-bulb-bw.png bigboard-collapse.png bigboard-document.png bigboard-down-arrow-disabled.png bigboard-down-arrow-enabled.png bigboard-expand.png bigboard-left-button.png bigboard-music.png bigboard-presentation.png bigboard-right-button.png bigboard-spreadsheet.png bigboard-today-disabled.png bigboard-today-enabled.png bigboard-up-arrow-disabled.png bigboard-up-arrow-enabled.png windows_key.png ctrl_esc_keys.png
+icon_DATA = bigboard-bulb.png bigboard-bulb-bw.png bigboard-collapse.png bigboard-document.png bigboard-down-arrow-disabled.png bigboard-down-arrow-enabled.png bigboard-expand.png bigboard-info.png bigboard-left-button.png bigboard-music.png bigboard-presentation.png bigboard-right-button.png bigboard-spreadsheet.png bigboard-today-disabled.png bigboard-today-enabled.png bigboard-up-arrow-disabled.png bigboard-up-arrow-enabled.png windows_key.png ctrl_esc_keys.png
 icondir = $(datadir)/bigboard
 
 EXTRA_DIST= $(icon_DATA)

Added: bigboard/trunk/data/bigboard-info.png
===================================================================
(Binary files differ)


Property changes on: bigboard/trunk/data/bigboard-info.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]