[GNUnet-SVN] r8496 - in gnunet-qt/src: core plugins/about plugins/fs plugins/general plugins/stats

[gnunet]

Author: durner
Date: 2009-06-09 12:20:23 -0600 (Tue, 09 Jun 2009)
New Revision: 8496

Modified:
   gnunet-qt/src/core/main.cc
   gnunet-qt/src/core/wndMain.cc
   gnunet-qt/src/core/wndMain.h
   gnunet-qt/src/plugins/about/about.h
   gnunet-qt/src/plugins/fs/fs.cc
   gnunet-qt/src/plugins/fs/fs.h
   gnunet-qt/src/plugins/general/general.cc
   gnunet-qt/src/plugins/general/general.h
   gnunet-qt/src/plugins/stats/statsPlugin.cc
   gnunet-qt/src/plugins/stats/statsPlugin.h
Log:
load pixmaps in main thread (fixes crash on Windows 7)

Modified: gnunet-qt/src/core/main.cc
===================================================================
--- gnunet-qt/src/core/main.cc  2009-06-08 21:02:20 UTC (rev 8495)
+++ gnunet-qt/src/core/main.cc  2009-06-09 18:20:23 UTC (rev 8496)
@@ -149,7 +149,7 @@
   }
 #endif
 
-static QPixmap *logIcons;
+static QString *logIcons;
 
 typedef struct
 {
@@ -161,7 +161,7 @@
 {
   Q_UNUSED(date)
 
-  QPixmap *icon;
+  QString *icon;
 
   if (kind & GNUNET_GE_DEBUG)
     icon = logIcons;
@@ -313,13 +313,13 @@
 
   app = new GApplication(argc, (char **) argv, cfg);
 
-  logIcons = new QPixmap[6];
-  logIcons[0].load(":/pixmaps/debug.png");
-  logIcons[1].load(":/pixmaps/stats.png");
-  logIcons[2].load(":/pixmaps/info.png");
-  logIcons[3].load(":/pixmaps/warning.png");
-  logIcons[4].load(":/pixmaps/error.png");
-  logIcons[5].load(":/pixmaps/fatal.png");
+  logIcons = new QString[6];
+  logIcons[0] = ":/pixmaps/debug.png";
+  logIcons[1] = ":/pixmaps/stats.png";
+  logIcons[2] = ":/pixmaps/info.png";
+  logIcons[3] = ":/pixmaps/warning.png";
+  logIcons[4] = ":/pixmaps/error.png";
+  logIcons[5] = ":/pixmaps/fatal.png";
 
   logCls.mainWnd = app->getWindow();
   // FIXME: make mask configurable

Modified: gnunet-qt/src/core/wndMain.cc
===================================================================
--- gnunet-qt/src/core/wndMain.cc       2009-06-08 21:02:20 UTC (rev 8495)
+++ gnunet-qt/src/core/wndMain.cc       2009-06-09 18:20:23 UTC (rev 8496)
@@ -34,7 +34,7 @@
 public:
   GStatusTextEvent(QEvent::Type t) : QEvent(t){};
 
-  QPixmap icon;
+  QString icon;
   QString text;
 };
 
@@ -150,10 +150,10 @@
 void GMainWindow::addApplication(QWidget *wnd, const QIcon &icon, const 
QString &label)
 {
   tabWidget->addTab(wnd, icon, label);
-  connect(wnd, SIGNAL(setStatusText(const QPixmap &, const QString)),
-    this, SLOT(setStatusText(const QPixmap &, const QString)));
-  connect(wnd, SIGNAL(setNetworkStatus(const QPixmap &, const QString)),
-    this, SLOT(setNetworkStatus(const QPixmap &, const QString)));
+  connect(wnd, SIGNAL(setStatusText(const QString &, const QString &)),
+    this, SLOT(setStatusText(const QString &, const QString &)));
+  connect(wnd, SIGNAL(setNetworkStatus(const QString &, const QString &)),
+    this, SLOT(setNetworkStatus(const QString &, const QString &)));
 }
 
 void GMainWindow::setVisible(bool visible)
@@ -162,23 +162,23 @@
   QMainWindow::setVisible(visible);
 }
 
-void GMainWindow::setStatusText(const QPixmap &icon, const QString strText)
+void GMainWindow::setStatusText(const QString &strIcon, const QString &strText)
 {
   GStatusTextEvent *e;
 
   e = new GStatusTextEvent(QEvent::User);
-  e->icon = icon;
+  e->icon = strIcon;
   e->text = strText;
 
   qApp->postEvent(this, e);
 }
 
-void GMainWindow::setNetworkStatus(const QPixmap &icon, const QString strText)
+void GMainWindow::setNetworkStatus(const QString &strIcon, const QString 
&strText)
 {
   GNetworkStatusEvent *e;
 
   e = new GNetworkStatusEvent(QEvent::User);
-  e->icon = icon;
+  e->icon = strIcon;
   e->text = strText;
 
   qApp->postEvent(this, e);
@@ -191,7 +191,10 @@
   e = dynamic_cast<class GNetworkStatusEvent *> (event);
   if (e)
   {
-    networkIcon->setPixmap(e->icon);
+    QPixmap icon;
+
+    icon.load(e->icon);
+    networkIcon->setPixmap(icon);
     networkText->setText(e->text);
     return true;
   }
@@ -200,7 +203,10 @@
     e = dynamic_cast<class GStatusTextEvent *> (event);
     if (e)
     {
-      statusIcon->setPixmap(e->icon);
+      QPixmap icon;
+
+      icon.load(e->icon);
+      statusIcon->setPixmap(icon);
       statusText->setText(e->text);
       return true;
     }

Modified: gnunet-qt/src/core/wndMain.h
===================================================================
--- gnunet-qt/src/core/wndMain.h        2009-06-08 21:02:20 UTC (rev 8495)
+++ gnunet-qt/src/core/wndMain.h        2009-06-09 18:20:23 UTC (rev 8496)
@@ -54,8 +54,8 @@
   virtual bool event(QEvent *event);
 
 public slots:
-  void setStatusText(const QPixmap &icon, const QString strText);
-  void setNetworkStatus(const QPixmap &icon, const QString strText);
+  void setStatusText(const QString &strIcon, const QString &strText);
+  void setNetworkStatus(const QString &strIcon, const QString &strText);
 protected slots:
   void contextHelp();
   void about();

Modified: gnunet-qt/src/plugins/about/about.h
===================================================================
--- gnunet-qt/src/plugins/about/about.h 2009-06-08 21:02:20 UTC (rev 8495)
+++ gnunet-qt/src/plugins/about/about.h 2009-06-09 18:20:23 UTC (rev 8496)
@@ -34,14 +34,14 @@
 class GAboutPlugin : public GPlugin, public Ui::WndAbout
 {
   Q_OBJECT
-  
+
 public:
   GAboutPlugin();
 
 // unused
 signals:
-    int setStatusText(const QPixmap &icon, const QString strStatus);
-    int setNetworkStatus(const QPixmap &icon, const QString strStatus);
+    int setStatusText(const QString &strIcon, const QString &strText);
+    int setNetworkStatus(const QString &strIcon, const QString &strText);
 
 protected:
   QString header();

Modified: gnunet-qt/src/plugins/fs/fs.cc
===================================================================
--- gnunet-qt/src/plugins/fs/fs.cc      2009-06-08 21:02:20 UTC (rev 8495)
+++ gnunet-qt/src/plugins/fs/fs.cc      2009-06-09 18:20:23 UTC (rev 8496)
@@ -256,7 +256,7 @@
   dialog = new GFSOpenURIDialog(this);
   if (dialog->exec() == QDialog::Accepted)
   {
-    QPixmap icon;
+    QString strIcon;
 
     uri = dialog->uriInput->toPlainText();
     ecrsUri = uri;
@@ -264,8 +264,8 @@
         md, "", dialog->file->text(), "", dialog->anon->value(),
         dialog->recursive->isChecked());
 
-    icon.load(":/pixmaps/download.png");
-    emit setStatusText(icon, tr("Download of \"%0\" 
queued.").arg(ecrsUri.toString().left(16)));
+    strIcon = ":/pixmaps/download.png";
+    emit setStatusText(strIcon, tr("Download of \"%0\" 
queued.").arg(ecrsUri.toString().left(16)));
   }
 }
 
@@ -496,7 +496,7 @@
 void GFSPlugin::uploadClicked()
 {
   QString strPath;
-  QPixmap icon;
+  QString strIcon;
 
   strPath = editName->text();
   if (strPath == "")
@@ -510,8 +510,8 @@
   if (uploadCntrl->start(this, strPath, rbIndex->isChecked(),
     spinPrio->value(), spinUploadAnon->value()))
   {
-    icon.load(":/pixmaps/upload.png");
-    emit setStatusText(icon, tr("Publication of \"%0\" queued.").arg(strPath));
+    strIcon = ":/pixmaps/upload.png";
+    emit setStatusText(strIcon, tr("Publication of \"%0\" 
queued.").arg(strPath));
   }
 }
 
@@ -519,13 +519,13 @@
   struct GNUNET_FSUI_SearchList *handle, GFSEcrsUri &uri, GFSEcrsMetaData 
&meta,
   QString gnPath, QString &file, int anonymity, bool recurse)
 {
-  QPixmap icon;
+  QString strIcon;
 
   downloadCntrl->start(searchIdx, handle, uri, meta, gnPath, file, "",
     anonymity, recurse);
 
-  icon.load(":/pixmaps/download.png");
-  emit setStatusText(icon, tr("Download of \"%0\" queued.").arg(file));
+  strIcon = ":/pixmaps/download.png";
+  emit setStatusText(strIcon, tr("Download of \"%0\" queued.").arg(file));
 }
 
 void GFSPlugin::clearDLClicked()

Modified: gnunet-qt/src/plugins/fs/fs.h
===================================================================
--- gnunet-qt/src/plugins/fs/fs.h       2009-06-08 21:02:20 UTC (rev 8495)
+++ gnunet-qt/src/plugins/fs/fs.h       2009-06-09 18:20:23 UTC (rev 8496)
@@ -85,8 +85,8 @@
 
 public:
 signals:
-  int setStatusText(const QPixmap &icon, const QString strStatus);
-  int setNetworkStatus(const QPixmap &icon, const QString strStatus);
+  int setStatusText(const QString &strIcon, const QString &strText);
+  int setNetworkStatus(const QString &strIcon, const QString &strText);
 
 protected slots:
   void openURI();

Modified: gnunet-qt/src/plugins/general/general.cc
===================================================================
--- gnunet-qt/src/plugins/general/general.cc    2009-06-08 21:02:20 UTC (rev 
8495)
+++ gnunet-qt/src/plugins/general/general.cc    2009-06-09 18:20:23 UTC (rev 
8496)
@@ -96,7 +96,7 @@
 void GGeneralPlugin::startStopDone(bool success, QString msg)
 {
   QString strStatus;
-  QPixmap icon;
+  QString icon;
 
   if (success)
   {
@@ -105,7 +105,7 @@
     else
       strStatus = tr("Launching server...");
 
-    icon.load(":/pixmaps/clock.png");
+    icon = ":/pixmaps/clock.png";
     pbStartStop->setEnabled(false);
 
     pending = true;
@@ -117,7 +117,7 @@
     else
       strStatus = tr("Launching server failed: %1").arg(msg);
 
-    icon.load(":/pixmaps/error.png");
+    icon = ":/pixmaps/error.png";
   }
 
   emit setStatusText(icon, strStatus);
@@ -160,10 +160,10 @@
   {
     if (pending)
     {
-      QPixmap icon;
+      QString icon;
 
       pending = false;
-      icon.load(":/pixmaps/gnunet-logo-small.png");
+      icon = ":/pixmaps/gnunet-logo-small.png";
 
       emit setStatusText(icon, isRunning ? tr("Server launched") :
         tr("Server terminated"));

Modified: gnunet-qt/src/plugins/general/general.h
===================================================================
--- gnunet-qt/src/plugins/general/general.h     2009-06-08 21:02:20 UTC (rev 
8495)
+++ gnunet-qt/src/plugins/general/general.h     2009-06-09 18:20:23 UTC (rev 
8496)
@@ -44,8 +44,8 @@
   virtual ~GGeneralPlugin();
 
 signals:
-  int setStatusText(const QPixmap &icon, const QString strStatus);
-  int setNetworkStatus(const QPixmap &icon, const QString strStatus);
+  int setStatusText(const QString &strIcon, const QString &strText);
+  int setNetworkStatus(const QString &strIcon, const QString &strText);
 
 
 protected:

Modified: gnunet-qt/src/plugins/stats/statsPlugin.cc
===================================================================
--- gnunet-qt/src/plugins/stats/statsPlugin.cc  2009-06-08 21:02:20 UTC (rev 
8495)
+++ gnunet-qt/src/plugins/stats/statsPlugin.cc  2009-06-09 18:20:23 UTC (rev 
8496)
@@ -100,16 +100,14 @@
     /* display # of connected peers in status bar */
     if (strName == "# of connected peers")
     {
-      QPixmap icon;
+      QString strIcon;
 
       if (value == 0)
-        icon.load(":/pixmaps/network-status-offline.png");
+        strIcon = ":/pixmaps/network-status-offline.png";
       else
-      {
-        icon.load(":/pixmaps/network-status-online.png");
-      }
+        strIcon = ":/pixmaps/network-status-online.png";
 
-      emit setNetworkStatus(icon, QString::number(value));
+      emit setNetworkStatus(strIcon, QString::number(value));
     }
 }
 

Modified: gnunet-qt/src/plugins/stats/statsPlugin.h
===================================================================
--- gnunet-qt/src/plugins/stats/statsPlugin.h   2009-06-08 21:02:20 UTC (rev 
8495)
+++ gnunet-qt/src/plugins/stats/statsPlugin.h   2009-06-09 18:20:23 UTC (rev 
8496)
@@ -35,13 +35,13 @@
 class GStatsPlugin : public GPlugin, public Ui::WndStats
 {
   Q_OBJECT
-  
+
 public:
        GStatsPlugin(struct GNUNET_GC_Configuration *config, struct 
GNUNET_GE_Context *errorContext);
        virtual ~GStatsPlugin();
 signals:
-  int setStatusText(const QPixmap &icon, const QString strStatus);
-  int setNetworkStatus(const QPixmap &icon, const QString strStatus);
+  int setStatusText(const QString &strIcon, const QString &strText);
+  int setNetworkStatus(const QString &strIcon, const QString &strText);
 
 protected slots:
   void processStat(QString strName, qulonglong value);