[GNUnet-SVN] r8455 - gnunet-qt/src/core

[gnunet]

Author: durner
Date: 2009-05-09 08:35:24 -0600 (Sat, 09 May 2009)
New Revision: 8455

Modified:
   gnunet-qt/src/core/wndMain.cc
   gnunet-qt/src/core/wndMain.h
   gnunet-qt/src/core/wndMain.ui
Log:
fix crash reported in Mantis #1471

Modified: gnunet-qt/src/core/wndMain.cc
===================================================================
--- gnunet-qt/src/core/wndMain.cc       2009-05-08 14:15:17 UTC (rev 8454)
+++ gnunet-qt/src/core/wndMain.cc       2009-05-09 14:35:24 UTC (rev 8455)
@@ -46,7 +46,6 @@
 
 GMainWindow::GMainWindow(QWidget *parent) : QMainWindow(parent)
 {
-  QHBoxLayout *lay;
   QMenu *trayMenu;
   QAction *trayShow, *trayExit;
 
@@ -67,25 +66,8 @@
   trayIcon->setContextMenu(trayMenu);
   trayIcon->show();
 
-  QStatusBar *bar = statusBar();
-  if (bar)
-  {
-    lay = new QHBoxLayout();
-
-    statusText.setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
-
-    bar->setSizeGripEnabled(false);
-
-    lay->addWidget(&statusIcon);
-    lay->addWidget(&statusText);
-    lay->addWidget(&networkIcon);
-    lay->addWidget(&networkText);
-    delete bar->layout();
-    bar->setLayout(lay);
-
-    networkIcon.setToolTip(tr("Number of connected peers"));
-    networkText.setToolTip(tr("Number of connected peers"));
-  }
+  networkIcon->setToolTip(tr("Number of connected peers"));
+  networkText->setToolTip(tr("Number of connected peers"));
 }
 
 void GMainWindow::loadMenuStruct(GMenuStruct &menuStruct)
@@ -209,8 +191,8 @@
   e = dynamic_cast<class GNetworkStatusEvent *> (event);
   if (e)
   {
-    networkIcon.setPixmap(e->icon);
-    networkText.setText(e->text);
+    networkIcon->setPixmap(e->icon);
+    networkText->setText(e->text);
     return true;
   }
   else
@@ -218,8 +200,8 @@
     e = dynamic_cast<class GStatusTextEvent *> (event);
     if (e)
     {
-      statusIcon.setPixmap(e->icon);
-      statusText.setText(e->text);
+      statusIcon->setPixmap(e->icon);
+      statusText->setText(e->text);
       return true;
     }
   }

Modified: gnunet-qt/src/core/wndMain.h
===================================================================
--- gnunet-qt/src/core/wndMain.h        2009-05-08 14:15:17 UTC (rev 8454)
+++ gnunet-qt/src/core/wndMain.h        2009-05-09 14:35:24 UTC (rev 8455)
@@ -46,7 +46,6 @@
   virtual void setVisible (bool visible);
 
 public:
-  QLabel statusIcon, statusText, networkIcon, networkText;
   QSystemTrayIcon *trayIcon;
   QAction *action_Context_help, *actionAbout, *actionExit;
 

Modified: gnunet-qt/src/core/wndMain.ui
===================================================================
--- gnunet-qt/src/core/wndMain.ui       2009-05-08 14:15:17 UTC (rev 8454)
+++ gnunet-qt/src/core/wndMain.ui       2009-05-09 14:35:24 UTC (rev 8455)
@@ -19,66 +19,104 @@
    <string>GNUnet, GNU's Peer-To-Peer Network</string>
   </property>
   <property name="windowIcon" >
-   <iconset resource="../../pixmaps/pixmaps.qrc" >
-    
<normaloff>:/pixmaps/gnunet-logo-small.png</normaloff>:/pixmaps/gnunet-logo-small.png</iconset>
+   <iconset resource="../../pixmaps/pixmaps.qrc" 
>:/pixmaps/gnunet-logo-small.png</iconset>
   </property>
   <widget class="QWidget" name="centralwidget" >
-   <property name="geometry" >
-    <rect>
-     <x>0</x>
-     <y>22</y>
-     <width>800</width>
-     <height>557</height>
-    </rect>
-   </property>
    <layout class="QVBoxLayout" >
     <property name="spacing" >
      <number>6</number>
     </property>
-    <property name="margin" >
+    <property name="leftMargin" >
      <number>9</number>
     </property>
+    <property name="topMargin" >
+     <number>9</number>
+    </property>
+    <property name="rightMargin" >
+     <number>9</number>
+    </property>
+    <property name="bottomMargin" >
+     <number>9</number>
+    </property>
     <item>
      <widget class="QTabWidget" name="tabWidget" >
       <property name="currentIndex" >
        <number>0</number>
       </property>
       <widget class="QWidget" name="tabRoot" >
-       <property name="geometry" >
-        <rect>
-         <x>0</x>
-         <y>0</y>
-         <width>776</width>
-         <height>512</height>
-        </rect>
-       </property>
        <attribute name="title" >
         <string>gnunet-qt</string>
        </attribute>
       </widget>
      </widget>
     </item>
+    <item>
+     <layout class="QHBoxLayout" >
+      <item>
+       <widget class="QLabel" name="statusIcon" >
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QLabel" name="statusText" >
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <spacer>
+        <property name="orientation" >
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" >
+         <size>
+          <width>40</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item>
+       <widget class="QLabel" name="networkIcon" >
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QLabel" name="networkText" >
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </item>
    </layout>
   </widget>
-  <widget class="QStatusBar" name="statusbar" >
+  <widget class="QMenuBar" name="menu_Bar" >
    <property name="geometry" >
     <rect>
      <x>0</x>
-     <y>579</y>
+     <y>0</y>
      <width>800</width>
      <height>21</height>
     </rect>
    </property>
   </widget>
-  <widget class="QMenuBar" name="menu_Bar" >
-   <property name="geometry" >
-    <rect>
-     <x>0</x>
-     <y>0</y>
-     <width>800</width>
-     <height>22</height>
-    </rect>
+  <widget class="QToolBar" name="toolBar" >
+   <property name="windowTitle" >
+    <string>toolBar</string>
    </property>
+   <attribute name="toolBarArea" >
+    <enum>TopToolBarArea</enum>
+   </attribute>
+   <attribute name="toolBarBreak" >
+    <bool>false</bool>
+   </attribute>
   </widget>
  </widget>
  <resources>