Changeset 281:c9e392a0a8b1

Timestamp:

07/07/12 12:23:21 (12 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Using icons instead of a drawing for the connection state

Files:

• conn_green.png (added)
• conn_grey.png (added)
• conn_red.png (added)
• connled.xcf (added)
• makesdist.sh (modified) (1 diff)
• setup.py (modified) (1 diff)
• src/mlx/gui/gui.py (modified) (1 diff)
• src/mlx/gui/statusbar.py (modified) (3 diffs)

makesdist.sh

@@ -1 +1 @@
 #!/bin/sh
 
+make
 python setup.py sdist

setup.py

@@ -17 +17 @@
 data_files.append((os.path.join("doc", "manual", "hu"),
                    glob(os.path.join("doc", "manual", "en", "*.*"))))
-data_files.append(("", ["logo.png"]))
+data_files.append(("", ["logo.png",
+                        "conn_grey.png", "conn_red.png", "conn_green.png"]))
 if os.name=="nt":
     import py2exe

src/mlx/gui/gui.py

@@ -141 +141 @@
         mainVBox.pack_start(gtk.HSeparator(), False, False, 0)
 
-        self._statusbar = Statusbar()
+        self._statusbar = Statusbar(iconDirectory)
         mainVBox.pack_start(self._statusbar, False, False, 0)
 

src/mlx/gui/statusbar.py

@@ -15 +15 @@
 class Statusbar(gtk.Frame, FlightStatusHandler):
     """A status bar for the logger."""
-    def __init__(self):
+    def __init__(self, iconDirectory):
         """Construct the status bar."""
         gtk.Frame.__init__(self)
@@ -35 +35 @@
         frameAlignment.add(statusBox)
 
+        iconPath = os.path.join(iconDirectory, "conn_grey.png")
+        self._connGreyIcon = pixbuf_new_from_file(iconPath)
+
+        iconPath = os.path.join(iconDirectory, "conn_red.png")
+        self._connRedIcon = pixbuf_new_from_file(iconPath)
+
+        iconPath = os.path.join(iconDirectory, "conn_green.png")
+        self._connGreenIcon = pixbuf_new_from_file(iconPath)
+
         self._connStateArea = gtk.DrawingArea()
-        self._connStateArea.set_size_request(16, 16)
+        self._connStateArea.set_size_request(18, 18)
         self._connStateArea.set_tooltip_markup(xstr("statusbar_conn_tooltip"))
 
@@ -105 +114 @@
 
     def _drawConnState(self, connStateArea, eventOrContext):
-        """Draw the connection state."""        
-        context = eventOrContext if pygobject else connStateArea.window.cairo_create()
-
+        """Draw the connection state."""
         if self._connecting:
             if self._connected:
-                context.set_source_rgb(0.0, 1.0, 0.0)
+                icon = self._connGreenIcon
             else:
-                context.set_source_rgb(1.0, 0.0, 0.0)
+                icon = self._connRedIcon
         else:
-            context.set_source_rgb(0.75, 0.75, 0.75)
+            icon = self._connGreyIcon
 
-        width = connStateArea.get_allocated_width() if pygobject \
-                else connStateArea.allocation.width
-        height = connStateArea.get_allocated_height() if pygobject \
-                 else connStateArea.allocation.height
-        context.arc(width/2, height/2, width/2, 0, 2*math.pi)
-
-        context.fill()
+        if pygobject:
+            gdk.cairo_set_source_pixbuf(eventOrContext, icon, 0, 0)
+            eventOrContext.paint()
+        else:
+            gc = connStateArea.get_style().fg_gc[gtk.STATE_NORMAL]
+            drawable = connStateArea.get_window()
+            drawable.draw_pixbuf(gc, icon, 0, 0, 0, 0)
 
     def _updateFlightStatus(self):