From: Diane Trout <diane@caltech.edu>
Date: Wed, 13 Dec 2006 00:40:25 +0000 (+0000)
Subject: make mussawindow initialize icons
X-Git-Url: http://woldlab.caltech.edu/gitweb/?p=mussa.git;a=commitdiff_plain;h=e5f7a61f25fbd850dcd229eff7f79e47946eb322

make mussawindow initialize icons
this is also part of the useless try to stop qobject::moveToThread
warnings, but I decided it was a good idea for when qui/mussagl.cpp:main
isn't called because we were launched from a python extension.
---

diff --git a/qui/MussaWindow.cpp b/qui/MussaWindow.cpp
index 2342ee7..20c4a03 100644
--- a/qui/MussaWindow.cpp
+++ b/qui/MussaWindow.cpp
@@ -32,6 +32,14 @@ namespace fs = boost::filesystem;
 
 using namespace std;
 
+static void init_resources() {
+  static bool resources_loaded = false;
+  if (not resources_loaded) {
+    Q_INIT_RESOURCE(icons);
+    resources_loaded = true;
+  }
+}
+
 MussaWindow::MussaWindow(MussaRef analysis_, QWidget *parent) :
   QMainWindow(parent),
   analysis(analysis_),
@@ -60,6 +68,7 @@ MussaWindow::MussaWindow(MussaRef analysis_, QWidget *parent) :
   viewMussaAlignmentAction(0),
   manualAssistant(0)
 {
+  init_resources();
   setupWidgets();
   setupActions();
   setupAssistant();
diff --git a/qui/mussagl.cpp b/qui/mussagl.cpp
index 0795a9a..a5f9b48 100644
--- a/qui/mussagl.cpp
+++ b/qui/mussagl.cpp
@@ -51,7 +51,6 @@ int main(int argc, char **argv)
 #endif
   //opts.doc_dir = get_doc_dir();
   QApplication app(argc, argv, opts.useGUI);
-  Q_INIT_RESOURCE(icons);
 
   initialize_mussa(opts, argc, argv);
   if (opts.analysis == 0) {