icons, buttons

client/gui_qt.py

@@ -51,15 +51,21 @@ class ElectrumWindow(QMainWindow):
         if self.wallet.interface.is_connected:
             if self.wallet.interface.blocks == 0:
                 text = "Server not ready"
+                icon = QIcon("icons/status_disconnected.svg")
             elif not self.wallet.interface.was_polled:
                 text = "Synchronizing..."
+                icon = QIcon("icons/status_waiting.svg")
             else:
                 c, u = self.wallet.get_balance()
                 text =  "Balance: %s "%( format_satoshis(c) )
                 if u: text +=  "[%s unconfirmed]"%( format_satoshis(u,True) )
+                icon = QIcon("icons/status_connected.png")
         else:
             text = "Not connected"
+            icon = QIcon("icons/status_disconnected.svg")
+
         self.statusBar().showMessage(text)
+        self.status_button.setIcon( icon )
 
         if self.wallet.interface.was_updated:
             self.wallet.interface.was_updated = False
@@ -154,10 +160,12 @@ class ElectrumWindow(QMainWindow):
 
         vbox = QtGui.QVBoxLayout()
         vbox.setMargin(0)
+        vbox.setSpacing(0)
         vbox.addWidget(l)
 
         hbox = QtGui.QHBoxLayout()
         hbox.setMargin(0)
+        hbox.setSpacing(0)
         qrButton = QtGui.QPushButton("QR")
         copyButton = QtGui.QPushButton("Copy to Clipboard")
         hbox.addWidget(qrButton)
@@ -202,7 +210,7 @@ class ElectrumWindow(QMainWindow):
         self.contacts_list.clear()
         for alias, v in self.wallet.aliases.items():
             s, target = v
-            label = self.wallet.labels.get(alias)
+            label = self.wallet.labels.get(alias,'')
             item = QTreeWidgetItem( [ alias, label, '-'] )
             self.contacts_list.addTopLevelItem(item)
             
@@ -224,36 +232,42 @@ class ElectrumWindow(QMainWindow):
 
     def create_status_bar(self):
         sb = QStatusBar()
-        sb.setFixedHeight(30)
+        sb.setFixedHeight(35)
+
+        hbox = QtGui.QHBoxLayout()
+        hbox.setMargin(0)
+        buttons = QWidget()
+        buttons.setLayout(hbox)
 
         icon = QIcon("icons/lock.svg")
         b = QPushButton( icon, '' )
         b.setToolTip("Password")
         b.setFlat(True)
         b.setMaximumWidth(25)
-        sb.addPermanentWidget(b)
+        hbox.addWidget(b)
 
         icon = QIcon("icons/preferences.svg")
         b = QPushButton( icon, '' )
         b.setToolTip("Preferences")
         b.setFlat(True)
         b.setMaximumWidth(25)
-        sb.addPermanentWidget(b)
+        hbox.addWidget(b)
 
         icon = QIcon("icons/seed.png")
         b = QPushButton( icon, '' )
         b.setToolTip("Seed")
         b.setFlat(True)
-        b.setMaximumWidth(25)
+        b.setMaximumWidth(20)
-        sb.addPermanentWidget(b)
+        hbox.addWidget(b)
 
         icon = QIcon("icons/status_disconnected.svg")
-        b = QPushButton( icon, '' )
+        self.status_button = b = QPushButton( icon, '' )
         b.setToolTip("Network")
         b.setFlat(True)
         b.setMaximumWidth(25)
-        sb.addPermanentWidget(b)
+        hbox.addWidget(b)
 
+        sb.addPermanentWidget(buttons)
         self.setStatusBar(sb)
 
 

client/icons/status_connected.svg

@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   version="1.0"
-   width="22"
-   height="22"
-   id="svg2841">
-  <defs
-     id="defs2843">
-    <linearGradient
-       id="linearGradient5105-262-943-861">
-      <stop
-         id="stop2487"
-         style="stop-color:#0d0d0d;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop2489"
-         style="stop-color:#0d0d0d;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="11.25"
-       cy="19.03125"
-       r="8.0625"
-       fx="11.25"
-       fy="19.03125"
-       id="radialGradient4811"
-       xlink:href="#linearGradient5105-262-943-861"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.282946,0,13.64644)" />
-    <linearGradient
-       id="linearGradient2264">
-      <stop
-         id="stop2266"
-         style="stop-color:#d7e866;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop2268"
-         style="stop-color:#8cab2a;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="-86.12886"
-       y1="2.0690987"
-       x2="-93.088425"
-       y2="31.137911"
-       id="linearGradient4813"
-       xlink:href="#linearGradient2264"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.5112838,-0.1216744,0.12241,0.5082113,56.783012,-3.2077143)" />
-    <linearGradient
-       id="linearGradient3400">
-      <stop
-         id="stop3402"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3404"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="20.494444"
-       y1="6.0097799"
-       x2="20.494444"
-       y2="47.760197"
-       id="linearGradient3597"
-       xlink:href="#linearGradient3400"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.5025885,0,0,0.4995683,1.1940063,0.7665261)" />
-  </defs>
-  <g
-     transform="translate(-2,-2)"
-     id="layer1">
-    <path
-       d="m 19.3125,19.03125 a 8.0625,2.28125 0 1 1 -16.125,0 8.0625,2.28125 0 1 1 16.125,0 z"
-       transform="matrix(1.4883719,0,0,1.4465766,-4.7441839,-6.8301638)"
-       id="path4346"
-       style="opacity:0.16292138;fill:url(#radialGradient4811);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" />
-    <path
-       d="m 18.175045,3.5050734 c -0.281317,-0.028378 -0.561,0.1085751 -0.70554,0.3715025 L 11.311125,15.076693 7.3516838,11.94736 C 6.9989939,11.755797 6.5589582,11.879032 6.3662377,12.229603 l -1.7755804,2.265914 c -0.1927162,0.350565 -0.063069,0.787827 0.2896181,0.979387 0,0 7.2294426,5.935012 7.2383626,5.939402 0.08266,0.0449 0.169102,0.06749 0.256971,0.07853 0.28704,0.03605 0.58079,-0.098 0.728339,-0.3664 L 21.409341,6.0216833 c 0.192718,-0.350569 0.06307,-0.7878285 -0.289616,-0.9793887 L 18.454817,3.5886997 c -0.08817,-0.047891 -0.185999,-0.074167 -0.279772,-0.083626 z"
-       id="path1542"
-       style="fill:url(#linearGradient4813);fill-opacity:1;fill-rule:nonzero;stroke:#699536;stroke-width:1.00278974;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" />
-    <path
-       d="M 18.214219,4.6150802 11.621039,16.59425 7.0429763,12.993376 C 6.5430041,13.593 6.1940911,14.084983 5.6268868,14.793063 c 0,0 6.6812002,5.45065 6.7616742,5.534366 0.25102,-0.404598 7.891687,-14.3280177 8.003506,-14.540862 -0.167431,-0.1153442 -2.12007,-1.1251725 -2.177848,-1.1714868 z"
-       id="path1544"
-       style="opacity:0.4;fill:none;stroke:url(#linearGradient3597);stroke-width:1.00278974;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" />
-  </g>
-</svg>