Move .png files into binary

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@4658 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/src/qt-console/bat.pro.in b/bacula/src/qt-console/bat.pro.in
index f781f18f3f0a0a8de742d9e373f2e116db3a49b0..64a1e937953d9b63c571d1b1187db09d764fc0e4 100644 (file)
--- a/bacula/src/qt-console/bat.pro.in
+++ b/bacula/src/qt-console/bat.pro.in
@@ -29,7 +29,8 @@ UI_DIR = ui
 
 # Main window
 FORMS += main.ui
-FORMS += label/label.ui mount/mount.ui
+FORMS += label/label.ui 
+FORMS += mount/mount.ui
 FORMS += console/console.ui
 FORMS += restore/restore.ui restore/prerestore.ui restore/brestore.ui
 FORMS += run/run.ui run/runcmd.ui

diff --git a/bacula/src/qt-console/clients/clients.ui b/bacula/src/qt-console/clients/clients.ui
index bb08890e65b3c389a5e52a2a464f41c39e77c3b8..d8bb76a20f113db04c68afa0dc73dc536be796d5 100644 (file)
--- a/bacula/src/qt-console/clients/clients.ui
+++ b/bacula/src/qt-console/clients/clients.ui
@@ -25,7 +25,7 @@
   </layout>
   <action name="actionRefreshClients" >
    <property name="icon" >
-    <iconset>../images/run.png</iconset>
+    <iconset>:images/run.png</iconset>
    </property>
    <property name="text" >
     <string>Refresh Client List</string>
@@ -36,7 +36,7 @@
   </action>
   <action name="actionListJobsofClient" >
    <property name="icon" >
-    <iconset>../images/unmark.png</iconset>
+    <iconset>:images/unmark.png</iconset>
    </property>
    <property name="text" >
     <string>List Jobs of Client</string>
@@ -44,7 +44,7 @@
   </action>
   <action name="actionStatusClientInConsole" >
    <property name="icon" >
-    <iconset>../images/status.png</iconset>
+    <iconset>:images/status.png</iconset>
    </property>
    <property name="text" >
     <string>Status Client In Console</string>

diff --git a/bacula/src/qt-console/console/console.cpp b/bacula/src/qt-console/console/console.cpp
index 474c626a4c532135a9b15a18d7c206e60643ac9e..fffc2c947292d717fcc921a1485ecf3a96e1f0be 100644 (file)
--- a/bacula/src/qt-console/console/console.cpp
+++ b/bacula/src/qt-console/console/console.cpp
@@ -51,7 +51,7 @@ Console::Console(QStackedWidget *parent)
    m_at_prompt = false;
    m_textEdit = textEdit;   /* our console screen */
    m_cursor = new QTextCursor(m_textEdit->document());
-   mainWin->actionConnect->setIcon(QIcon(QString::fromUtf8("images/disconnected.png")));
+   mainWin->actionConnect->setIcon(QIcon(":images/disconnected.png"));
 
    /* Check for messages every 5 seconds */
 // m_timer = new QTimer(this);
@@ -127,7 +127,7 @@ void Console::connect()
       return;
    } else {
       /* Update page selector to green to indicate that Console is connected */
-      mainWin->actionConnect->setIcon(QIcon(QString::fromUtf8("images/connected.png")));
+      mainWin->actionConnect->setIcon(QIcon(":images/connected.png"));
       QBrush greenBrush(Qt::green);
       QTreeWidgetItem *item = mainWin->getFromHash(this);
       item->setForeground(0, greenBrush);
@@ -369,7 +369,7 @@ const QFont Console::get_font()
 void Console::status_dir()
 {
    QString cmd("status dir");
-        consoleCommand(cmd);
+         consoleCommand(cmd);
 }
 
 /*
@@ -427,7 +427,7 @@ void Console::write_dir(const char *msg)
       write(msg);
    } else {
       mainWin->set_status(" Director not connected. Click on connect button.");
-      mainWin->actionConnect->setIcon(QIcon(QString::fromUtf8("images/disconnected.png")));
+      mainWin->actionConnect->setIcon(QIcon(":images/disconnected.png"));
       QBrush redBrush(Qt::red);
       QTreeWidgetItem *item = mainWin->getFromHash(this);
       item->setForeground(0, redBrush);
@@ -582,7 +582,7 @@ int Console::read()
       if (is_bnet_stop(m_sock)) {         /* error or term request */
          m_sock->close();
          m_sock = NULL;
-         mainWin->actionConnect->setIcon(QIcon(QString::fromUtf8("images/disconnected.png")));
+         mainWin->actionConnect->setIcon(QIcon(":images/disconnected.png"));
          QBrush redBrush(Qt::red);
          QTreeWidgetItem *item = mainWin->getFromHash(this);
          item->setForeground(0, redBrush);

diff --git a/bacula/src/qt-console/fileset/fileset.ui b/bacula/src/qt-console/fileset/fileset.ui
index 863a370533ef0a9e18d98f85e22294266aa671d1..ecb51a803dcaadff942353ba8587284905275c2f 100644 (file)
--- a/bacula/src/qt-console/fileset/fileset.ui
+++ b/bacula/src/qt-console/fileset/fileset.ui
@@ -25,7 +25,7 @@
   </layout>
   <action name="actionRefreshFileSet" >
    <property name="icon" >
-    <iconset>../images/run.png</iconset>
+    <iconset>:images/run.png</iconset>
    </property>
    <property name="text" >
     <string>Refresh FileSet List</string>
@@ -36,7 +36,7 @@
   </action>
   <action name="actionStatusFileSetInConsole" >
    <property name="icon" >
-    <iconset>../images/status.png</iconset>
+    <iconset>:images/status.png</iconset>
    </property>
    <property name="text" >
     <string>Status FileSet In Console</string>

diff --git a/bacula/src/qt-console/joblist/joblist.ui b/bacula/src/qt-console/joblist/joblist.ui
index b19baa9931d146a2e0478314bc5833fd575b162a..f9b94fd41768aaaf8e5ee598b0ec6368fbdcd758 100644 (file)
--- a/bacula/src/qt-console/joblist/joblist.ui
+++ b/bacula/src/qt-console/joblist/joblist.ui
@@ -25,7 +25,7 @@
   </layout>
   <action name="actionRefreshJobList" >
    <property name="icon" >
-    <iconset>../images/run.png</iconset>
+    <iconset>:images/run.png</iconset>
    </property>
    <property name="text" >
     <string>Refresh Job List</string>
@@ -36,7 +36,7 @@
   </action>
   <action name="actionListJobid" >
    <property name="icon" >
-    <iconset>../images/unmark.png</iconset>
+    <iconset>:images/unmark.png</iconset>
    </property>
    <property name="text" >
     <string>ListJobid</string>
@@ -44,7 +44,7 @@
   </action>
   <action name="actionListFilesOnJob" >
    <property name="icon" >
-    <iconset>../images/unmark.png</iconset>
+    <iconset>:images/unmark.png</iconset>
    </property>
    <property name="text" >
     <string>List Files On Job</string>
@@ -52,7 +52,7 @@
   </action>
   <action name="actionListJobMedia" >
    <property name="icon" >
-    <iconset>../images/unmark.png</iconset>
+    <iconset>:images/unmark.png</iconset>
    </property>
    <property name="text" >
     <string>ListJobMedia</string>
@@ -60,7 +60,7 @@
   </action>
   <action name="actionListVolumes" >
    <property name="icon" >
-    <iconset>../images/unmark.png</iconset>
+    <iconset>:images/unmark.png</iconset>
    </property>
    <property name="text" >
     <string>ListVolumes</string>
@@ -68,7 +68,7 @@
   </action>
   <action name="actionLongListJob" >
    <property name="icon" >
-    <iconset>../images/unmark.png</iconset>
+    <iconset>:images/unmark.png</iconset>
    </property>
    <property name="text" >
     <string>LongListJob</string>
@@ -76,7 +76,7 @@
   </action>
   <action name="actionDeleteJob" >
    <property name="icon" >
-    <iconset>../images/unmark.png</iconset>
+    <iconset>:images/unmark.png</iconset>
    </property>
    <property name="text" >
     <string>DeleteJob</string>
@@ -84,7 +84,7 @@
   </action>
   <action name="actionPurgeFiles" >
    <property name="icon" >
-    <iconset>../images/unmark.png</iconset>
+    <iconset>:images/unmark.png</iconset>
    </property>
    <property name="text" >
     <string>PurgeFiles</string>

diff --git a/bacula/src/qt-console/medialist/medialist.ui b/bacula/src/qt-console/medialist/medialist.ui
index df0b106bd93c4495620f4a3121eaf8fab7eae955..77ff35c27a364ec9bb4be0e6da7aa7b9f7f85eb5 100644 (file)
--- a/bacula/src/qt-console/medialist/medialist.ui
+++ b/bacula/src/qt-console/medialist/medialist.ui
@@ -25,7 +25,7 @@
   </layout>
   <action name="actionRefreshMediaList" >
    <property name="icon" >
-    <iconset>../images/run.png</iconset>
+    <iconset>:images/run.png</iconset>
    </property>
    <property name="text" >
     <string>Refresh Media List</string>
@@ -36,7 +36,7 @@
   </action>
   <action name="actionEditVolume" >
    <property name="icon" >
-    <iconset>../images/status.png</iconset>
+    <iconset>:images/status.png</iconset>
    </property>
    <property name="text" >
     <string>Edit Volume</string>
@@ -44,7 +44,7 @@
   </action>
   <action name="actionListJobsOnVolume" >
    <property name="icon" >
-    <iconset>../images/unmark.png</iconset>
+    <iconset>:images/unmark.png</iconset>
    </property>
    <property name="text" >
     <string>List Jobs On Volume</string>
@@ -52,7 +52,7 @@
   </action>
   <action name="actionDeleteVolume" >
    <property name="icon" >
-    <iconset>../images/unmark.png</iconset>
+    <iconset>:images/unmark.png</iconset>
    </property>
    <property name="text" >
     <string>Delete Volume</string>
@@ -60,7 +60,7 @@
   </action>
   <action name="actionPurgeVolume" >
    <property name="icon" >
-    <iconset>../images/unmark.png</iconset>
+    <iconset>:images/unmark.png</iconset>
    </property>
    <property name="text" >
     <string>Purge Volume</string>

diff --git a/bacula/src/qt-console/restore/restore.ui b/bacula/src/qt-console/restore/restore.ui
index f98c8d2338bc6769587d245cad550076cbbf2d51..4353f2f61f1b15dbed3691009bf3b8e956502f8c 100644 (file)
--- a/bacula/src/qt-console/restore/restore.ui
+++ b/bacula/src/qt-console/restore/restore.ui
@@ -179,7 +179,7 @@
             <string>Up</string>
            </property>
            <property name="icon" >
-            <iconset>../images/up.png</iconset>
+            <iconset>:images/up.png</iconset>
            </property>
           </widget>
          </item>
@@ -213,7 +213,7 @@
             <string>Mark</string>
            </property>
            <property name="icon" >
-            <iconset>../images/mark.png</iconset>
+            <iconset>:images/mark.png</iconset>
            </property>
           </widget>
          </item>
@@ -247,7 +247,7 @@
             <string>Unmark</string>
            </property>
            <property name="icon" >
-            <iconset>../images/unmark.png</iconset>
+            <iconset>:images/unmark.png</iconset>
            </property>
           </widget>
          </item>
@@ -490,7 +490,7 @@
   </layout>
   <action name="actionUp" >
    <property name="icon" >
-    <iconset>../images/up.png</iconset>
+    <iconset>:images/up.png</iconset>
    </property>
    <property name="text" >
     <string>Up</string>
@@ -498,7 +498,7 @@
   </action>
   <action name="actionMark" >
    <property name="icon" >
-    <iconset>../images/mark.png</iconset>
+    <iconset>:images/mark.png</iconset>
    </property>
    <property name="text" >
     <string>Mark</string>
@@ -506,7 +506,7 @@
   </action>
   <action name="actionUnmark" >
    <property name="icon" >
-    <iconset>../images/unmark.png</iconset>
+    <iconset>:images/unmark.png</iconset>
    </property>
    <property name="text" >
     <string>Unmark</string>

diff --git a/bacula/src/qt-console/storage/storage.cpp b/bacula/src/qt-console/storage/storage.cpp
index b08b53db5679139b9751e36273537bb48830e15b..6b8549cbed052ffec7f5527994f7f6ca9353a51f 100644 (file)
--- a/bacula/src/qt-console/storage/storage.cpp
+++ b/bacula/src/qt-console/storage/storage.cpp
@@ -38,8 +38,8 @@
 #include <QAbstractEventDispatcher>
 #include <QMenu>
 #include "bat.h"
-#include "storage/storage.h"
-#include "mount/mount.h"
+#include "storage.h"
+#include "../mount/mount.h"
 
 Storage::Storage()
 {

diff --git a/bacula/src/qt-console/storage/storage.ui b/bacula/src/qt-console/storage/storage.ui
index f359e634e7e1af3d321c59a3b41682cd894075e3..a5182dae2d54fba4f42e3edf9895e848ceda780e 100644 (file)
--- a/bacula/src/qt-console/storage/storage.ui
+++ b/bacula/src/qt-console/storage/storage.ui
@@ -25,7 +25,7 @@
   </layout>
   <action name="actionRefreshStorage" >
    <property name="icon" >
-    <iconset>../images/run.png</iconset>
+    <iconset>:images/run.png</iconset>
    </property>
    <property name="text" >
     <string>Refresh Storage List</string>
@@ -36,7 +36,7 @@
   </action>
   <action name="actionStatusStorageInConsole" >
    <property name="icon" >
-    <iconset>../images/status.png</iconset>
+    <iconset>:images/status.png</iconset>
    </property>
    <property name="text" >
     <string>Status Storage In Console</string>
@@ -44,7 +44,7 @@
   </action>
   <action name="actionLabelStorage" >
    <property name="icon" >
-    <iconset>../images/unmark.png</iconset>
+    <iconset>:images/unmark.png</iconset>
    </property>
    <property name="text" >
     <string>Label Storage</string>
@@ -52,7 +52,7 @@
   </action>
   <action name="actionMountStorage" >
    <property name="icon" >
-    <iconset>../images/unmark.png</iconset>
+    <iconset>:images/unmark.png</iconset>
    </property>
    <property name="text" >
     <string>MountStorage</string>
@@ -60,7 +60,7 @@
   </action>
   <action name="actionUnMountStorage" >
    <property name="icon" >
-    <iconset>../images/unmark.png</iconset>
+    <iconset>:images/unmark.png</iconset>
    </property>
    <property name="text" >
     <string>UnMount Storage</string>