Only use the svg files for the generation of the png files.

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

diff --git a/bacula/src/qt-console/clients/clients.cpp b/bacula/src/qt-console/clients/clients.cpp
index 267820a2a6461265a671609097790d5a3bc76dd6..93cfa7a51a1d14cd2dbd4a27871f45c82cc0ae2d 100644 (file)
--- a/bacula/src/qt-console/clients/clients.cpp
+++ b/bacula/src/qt-console/clients/clients.cpp
@@ -47,7 +47,7 @@ Clients::Clients()
    m_name = "Clients";
    pgInitialize();
    QTreeWidgetItem* thisitem = mainWin->getFromHash(this);
-   thisitem->setIcon(0,QIcon(QString::fromUtf8(":images/network-server.svg")));
+   thisitem->setIcon(0,QIcon(QString::fromUtf8(":images/network-server.png")));
 
    /* mp_treeWidget, Storage Tree Tree Widget inherited from ui_client.h */
    m_populated = false;

diff --git a/bacula/src/qt-console/clients/clients.ui b/bacula/src/qt-console/clients/clients.ui
index 888aab5a8d9d9411d8c1cccea06dbc1dfd422828..0f69dbc51d0f89dd8ad0da6557ba5fd4f28b94c9 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 resource="../main.qrc" >:/images/view-refresh.svg</iconset>
+    <iconset resource="../main.qrc" >:/images/view-refresh.png</iconset>
    </property>
    <property name="text" >
     <string>Refresh Client List</string>
@@ -36,7 +36,7 @@
   </action>
   <action name="actionListJobsofClient" >
    <property name="icon" >
-    <iconset resource="../main.qrc" >:/images/emblem-system.svg</iconset>
+    <iconset resource="../main.qrc" >:/images/emblem-system.png</iconset>
    </property>
    <property name="text" >
     <string>List Jobs of Client</string>
@@ -58,7 +58,7 @@
   </action>
   <action name="actionPurgeJobs" >
    <property name="icon" >
-    <iconset resource="../main.qrc" >:/images/weather-severe-alert.svg</iconset>
+    <iconset resource="../main.qrc" >:/images/weather-severe-alert.png</iconset>
    </property>
    <property name="text" >
     <string>Purge Jobs</string>

diff --git a/bacula/src/qt-console/console/console.ui b/bacula/src/qt-console/console/console.ui
index e29de7d36cd130806daba05070698499230cd62e..6d8bcd92a0415b613f420a571326e19a6359c6cd 100644 (file)
--- a/bacula/src/qt-console/console/console.ui
+++ b/bacula/src/qt-console/console/console.ui
@@ -87,7 +87,7 @@
   </action>
   <action name="actionConsoleHelp" >
    <property name="icon" >
-    <iconset resource="../main.qrc" >:/images/utilities-terminal.svg</iconset>
+    <iconset resource="../main.qrc" >:/images/utilities-terminal.png</iconset>
    </property>
    <property name="text" >
     <string>Console Help</string>
@@ -95,7 +95,7 @@
   </action>
   <action name="actionRequestMessages" >
    <property name="icon" >
-    <iconset resource="../main.qrc" >:/images/utilities-terminal.svg</iconset>
+    <iconset resource="../main.qrc" >:/images/utilities-terminal.png</iconset>
    </property>
    <property name="text" >
     <string>Request Messages</string>
@@ -103,7 +103,7 @@
   </action>
   <action name="actionConsoleReload" >
    <property name="icon" >
-    <iconset resource="../main.qrc" >:/images/utilities-terminal.svg</iconset>
+    <iconset resource="../main.qrc" >:/images/utilities-terminal.png</iconset>
    </property>
    <property name="text" >
     <string>Reload bacula-dir.conf</string>

diff --git a/bacula/src/qt-console/fileset/fileset.cpp b/bacula/src/qt-console/fileset/fileset.cpp
index e74092b946abee46eb4049b3dedf17f141ddb51a..2ce029af6162c023b3b25c1fd7c3169bf2f558a9 100644 (file)
--- a/bacula/src/qt-console/fileset/fileset.cpp
+++ b/bacula/src/qt-console/fileset/fileset.cpp
@@ -46,7 +46,7 @@ FileSet::FileSet()
    m_name = "FileSets";
    pgInitialize();
    QTreeWidgetItem* thisitem = mainWin->getFromHash(this);
-   thisitem->setIcon(0,QIcon(QString::fromUtf8(":images/system-file-manager.svg")));
+   thisitem->setIcon(0,QIcon(QString::fromUtf8(":images/system-file-manager.png")));
 
    /* mp_treeWidget, FileSet Tree Tree Widget inherited from ui_fileset.h */
    m_populated = false;

diff --git a/bacula/src/qt-console/fileset/fileset.ui b/bacula/src/qt-console/fileset/fileset.ui
index edabb21dac015a9e97ff7c245dd93c033ddd99d3..7df6809b304bdd3277213d677523e49f4983f442 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 resource="../main.qrc" >:/images/view-refresh.svg</iconset>
+    <iconset resource="../main.qrc" >:/images/view-refresh.png</iconset>
    </property>
    <property name="text" >
     <string>Refresh FileSet List</string>
@@ -44,7 +44,7 @@
   </action>
   <action name="actionShowJobs" >
    <property name="icon" >
-    <iconset resource="../main.qrc" >:/images/emblem-system.svg</iconset>
+    <iconset resource="../main.qrc" >:/images/emblem-system.png</iconset>
    </property>
    <property name="text" >
     <string>ShowJobs</string>

diff --git a/bacula/src/qt-console/images/cartridge-edit.png b/bacula/src/qt-console/images/cartridge-edit.png
new file mode 100644 (file)
index 0000000..e686ca1
Binary files /dev/null and b/bacula/src/qt-console/images/cartridge-edit.png differ

diff --git a/bacula/src/qt-console/images/cartridge.png b/bacula/src/qt-console/images/cartridge.png
new file mode 100644 (file)
index 0000000..8df920a
Binary files /dev/null and b/bacula/src/qt-console/images/cartridge.png differ

diff --git a/bacula/src/qt-console/images/edit-delete.png b/bacula/src/qt-console/images/edit-delete.png
new file mode 100644 (file)
index 0000000..ba2e237
Binary files /dev/null and b/bacula/src/qt-console/images/edit-delete.png differ

diff --git a/bacula/src/qt-console/images/emblem-system.png b/bacula/src/qt-console/images/emblem-system.png
new file mode 100644 (file)
index 0000000..89082da
Binary files /dev/null and b/bacula/src/qt-console/images/emblem-system.png differ

diff --git a/bacula/src/qt-console/images/emblem-system.svg b/bacula/src/qt-console/images/emblem-system.svg
index 3aba321ceae7246b79eb2331a2bfd2c2c4227482..1d2b5bb9f3d5c3f0747f3f4020d514ba289d28b3 100644 (file)
--- a/bacula/src/qt-console/images/emblem-system.svg
+++ b/bacula/src/qt-console/images/emblem-system.svg
@@ -11,7 +11,7 @@
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    inkscape:export-ydpi="90.000000"
    inkscape:export-xdpi="90.000000"
-   inkscape:export-filename="/home/jimmac/Desktop/wi-fi.png"
+   inkscape:export-filename="/home/dbartley/src/bacula/src/qt-console/images/emblem-system.png"
    width="48px"
    height="48px"
    id="svg11300"

diff --git a/bacula/src/qt-console/images/estimate-job.png b/bacula/src/qt-console/images/estimate-job.png
new file mode 100644 (file)
index 0000000..b47d13c
Binary files /dev/null and b/bacula/src/qt-console/images/estimate-job.png differ

diff --git a/bacula/src/qt-console/images/estimate-job.svg b/bacula/src/qt-console/images/estimate-job.svg
index ed8792d1171f6cf5bc98bf609970bc33a7c7892a..16326edf4af2555dcdacb136251393ca8bbc22ce 100644 (file)
--- a/bacula/src/qt-console/images/estimate-job.svg
+++ b/bacula/src/qt-console/images/estimate-job.svg
@@ -9,9 +9,9 @@
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:export-ydpi="90.000000"
-   inkscape:export-xdpi="90.000000"
-   inkscape:export-filename="/home/jimmac/Desktop/wi-fi.png"
+   inkscape:export-ydpi="60"
+   inkscape:export-xdpi="60"
+   inkscape:export-filename="/home/dbartley/src/bacula/src/qt-console/images/estimate-job.png"
    width="48px"
    height="48px"
    id="svg11300"

diff --git a/bacula/src/qt-console/images/help-browser.png b/bacula/src/qt-console/images/help-browser.png
new file mode 100644 (file)
index 0000000..e712112
Binary files /dev/null and b/bacula/src/qt-console/images/help-browser.png differ

diff --git a/bacula/src/qt-console/images/help-browser.svg b/bacula/src/qt-console/images/help-browser.svg
index 669dda345f81e568e4366f4c157e3daea4b9e562..cc80f77687bb337ce660d783bdf91903580b954f 100644 (file)
--- a/bacula/src/qt-console/images/help-browser.svg
+++ b/bacula/src/qt-console/images/help-browser.svg
@@ -13,10 +13,12 @@
    height="48.000000px"
    id="svg6361"
    sodipodi:version="0.32"
-   inkscape:version="0.43+devel"
-   sodipodi:docbase="/home/tigert/cvs/freedesktop.org/tango-icon-theme/scalable/apps"
+   inkscape:version="0.43"
+   sodipodi:docbase="/home/dbartley/src/bacula/src/qt-console/images"
    sodipodi:docname="help-browser.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+   inkscape:export-filename="/home/dbartley/src/bacula/src/qt-console/images/help-browser.png"
+   inkscape:export-xdpi="30"
+   inkscape:export-ydpi="30">
   <defs
      id="defs3">
     <linearGradient

diff --git a/bacula/src/qt-console/images/mail-message-new.png b/bacula/src/qt-console/images/mail-message-new.png
new file mode 100644 (file)
index 0000000..2588cbb
Binary files /dev/null and b/bacula/src/qt-console/images/mail-message-new.png differ

diff --git a/bacula/src/qt-console/images/mail-message-new.svg b/bacula/src/qt-console/images/mail-message-new.svg
index b81147fe7be0cf231310c23a78b20ceb1f3b8501..4bad1cadac873e42172cd52bbcc5d4d767502a3f 100644 (file)
--- a/bacula/src/qt-console/images/mail-message-new.svg
+++ b/bacula/src/qt-console/images/mail-message-new.svg
@@ -15,7 +15,10 @@
    sodipodi:version="0.32"
    id="svg5816"
    height="48px"
-   width="48px">
+   width="48px"
+   inkscape:export-filename="/home/dbartley/src/bacula/src/qt-console/images/mail-message-new.png"
+   inkscape:export-xdpi="60"
+   inkscape:export-ydpi="60">
   <defs
      id="defs3">
     <radialGradient

diff --git a/bacula/src/qt-console/images/network-server.png b/bacula/src/qt-console/images/network-server.png
new file mode 100644 (file)
index 0000000..c22fbb0
Binary files /dev/null and b/bacula/src/qt-console/images/network-server.png differ

diff --git a/bacula/src/qt-console/images/network-server.svg b/bacula/src/qt-console/images/network-server.svg
index 47837c05bb9c452c7f1257fa12eee63681a19164..cd1515e34e941c025d2dbc2495707d4d4320b160 100644 (file)
--- a/bacula/src/qt-console/images/network-server.svg
+++ b/bacula/src/qt-console/images/network-server.svg
@@ -7,15 +7,18 @@
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    sodipodi:docname="network-server.svg"
-   sodipodi:docbase="/home/jimmac/src/cvs/tango-icon-theme/scalable/places"
-   inkscape:version="0.43+devel"
+   sodipodi:docbase="/home/dbartley/src/bacula/src/qt-console/images"
+   inkscape:version="0.43"
    sodipodi:version="0.32"
    id="svg1288"
    height="48px"
-   width="48px">
+   width="48px"
+   inkscape:export-filename="/home/dbartley/src/bacula/src/qt-console/images/network-server.png"
+   inkscape:export-xdpi="30"
+   inkscape:export-ydpi="30">
   <defs
      id="defs3">
     <radialGradient

diff --git a/bacula/src/qt-console/images/system-file-manager.png b/bacula/src/qt-console/images/system-file-manager.png
new file mode 100644 (file)
index 0000000..97513c1
Binary files /dev/null and b/bacula/src/qt-console/images/system-file-manager.png differ

diff --git a/bacula/src/qt-console/images/system-file-manager.svg b/bacula/src/qt-console/images/system-file-manager.svg
index 9a837827a0f1d516c69347857905d2794d66453e..4af259b13123d39f07b74642fd2349c7bba1358c 100644 (file)
--- a/bacula/src/qt-console/images/system-file-manager.svg
+++ b/bacula/src/qt-console/images/system-file-manager.svg
@@ -7,15 +7,18 @@
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="48px"
    height="48px"
    id="svg1288"
    sodipodi:version="0.32"
-   inkscape:version="0.43+devel"
-   sodipodi:docbase="/home/jimmac/src/cvs/tango-icon-theme/scalable/apps"
-   sodipodi:docname="system-file-manager.svg">
+   inkscape:version="0.43"
+   sodipodi:docbase="/home/dbartley/src/bacula/src/qt-console/images"
+   sodipodi:docname="system-file-manager.svg"
+   inkscape:export-filename="/home/dbartley/src/bacula/src/qt-console/images/system-file-manager.png"
+   inkscape:export-xdpi="30"
+   inkscape:export-ydpi="30">
   <defs
      id="defs3">
     <radialGradient

diff --git a/bacula/src/qt-console/images/utilities-terminal.png b/bacula/src/qt-console/images/utilities-terminal.png
new file mode 100644 (file)
index 0000000..c76370f
Binary files /dev/null and b/bacula/src/qt-console/images/utilities-terminal.png differ

diff --git a/bacula/src/qt-console/images/utilities-terminal.svg b/bacula/src/qt-console/images/utilities-terminal.svg
index 2197700fe09c271a92b709f0ffde0a51565f1d36..45b2e7e33b35189d6ab6e42ee9592de927438c1c 100644 (file)
--- a/bacula/src/qt-console/images/utilities-terminal.svg
+++ b/bacula/src/qt-console/images/utilities-terminal.svg
@@ -7,18 +7,18 @@
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="48px"
    height="48px"
    id="svg1306"
    sodipodi:version="0.32"
-   inkscape:version="0.43+devel"
-   sodipodi:docbase="/home/jimmac/src/cvs/tango-icon-theme/scalable/apps"
+   inkscape:version="0.43"
+   sodipodi:docbase="/home/dbartley/src/bacula/src/qt-console/images"
    sodipodi:docname="utilities-terminal.svg"
-   inkscape:export-filename="/home/andreas/projekt/bild/tango/terminal4.png"
-   inkscape:export-xdpi="240.00000"
-   inkscape:export-ydpi="240.00000">
+   inkscape:export-filename="/home/dbartley/src/bacula/src/qt-console/images/utilities-terminal.png"
+   inkscape:export-xdpi="30"
+   inkscape:export-ydpi="30">
   <defs
      id="defs1308">
     <radialGradient

diff --git a/bacula/src/qt-console/images/view-refresh.png b/bacula/src/qt-console/images/view-refresh.png
new file mode 100644 (file)
index 0000000..b6ae9bb
Binary files /dev/null and b/bacula/src/qt-console/images/view-refresh.png differ

diff --git a/bacula/src/qt-console/images/view-refresh.svg b/bacula/src/qt-console/images/view-refresh.svg
index 8b63d9c94324030cdc0a98de656783e77c18bea5..2209874b8944a6951e64ee426e60640f89b8e337 100644 (file)
--- a/bacula/src/qt-console/images/view-refresh.svg
+++ b/bacula/src/qt-console/images/view-refresh.svg
@@ -11,13 +11,13 @@
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    inkscape:export-ydpi="90.000000"
    inkscape:export-xdpi="90.000000"
-   inkscape:export-filename="/home/jimmac/Desktop/wi-fi.png"
+   inkscape:export-filename="/home/dbartley/src/bacula/src/qt-console/images/view-refresh.png"
    width="48px"
    height="48px"
    id="svg11300"
    sodipodi:version="0.32"
-   inkscape:version="0.43+devel"
-   sodipodi:docbase="/home/jimmac/src/cvs/tango-icon-theme/scalable/actions"
+   inkscape:version="0.43"
+   sodipodi:docbase="/home/dbartley/src/bacula/src/qt-console/images"
    sodipodi:docname="view-refresh.svg">
   <defs
      id="defs3">

diff --git a/bacula/src/qt-console/images/weather-severe-alert.png b/bacula/src/qt-console/images/weather-severe-alert.png
new file mode 100644 (file)
index 0000000..7670df3
Binary files /dev/null and b/bacula/src/qt-console/images/weather-severe-alert.png differ

diff --git a/bacula/src/qt-console/images/weather-severe-alert.svg b/bacula/src/qt-console/images/weather-severe-alert.svg
index 15061208217e80cf92d28ca571bf7eb00cbe6ea9..2e96850da97e647c4cd5bd76e263795ff77132f1 100644 (file)
--- a/bacula/src/qt-console/images/weather-severe-alert.svg
+++ b/bacula/src/qt-console/images/weather-severe-alert.svg
@@ -7,15 +7,18 @@
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="48px"
    height="48px"
    id="svg1306"
    sodipodi:version="0.32"
-   inkscape:version="0.44"
-   sodipodi:docbase="/home/jimmac/src/cvs/tango-icon-theme/scalable/status"
-   sodipodi:docname="weather-severe-alert.svg">
+   inkscape:version="0.43"
+   sodipodi:docbase="/home/dbartley/src/bacula/src/qt-console/images"
+   sodipodi:docname="weather-severe-alert.svg"
+   inkscape:export-filename="/home/dbartley/src/bacula/src/qt-console/images/weather-severe-alert.png"
+   inkscape:export-xdpi="30"
+   inkscape:export-ydpi="30">
   <defs
      id="defs1308">
     <linearGradient

diff --git a/bacula/src/qt-console/jobgraphs/jobplotcontrols.ui b/bacula/src/qt-console/jobgraphs/jobplotcontrols.ui
index 0c338bac2465a94584e3b5d5aaae519967b7321c..65e072edf140707aafe33db28361735b9644891d 100644 (file)
--- a/bacula/src/qt-console/jobgraphs/jobplotcontrols.ui
+++ b/bacula/src/qt-console/jobgraphs/jobplotcontrols.ui
@@ -147,7 +147,7 @@
         <string>Refresh</string>
        </property>
        <property name="icon" >
-        <iconset resource="../main.qrc" >:/images/view-refresh.svg</iconset>
+        <iconset resource="../main.qrc" >:/images/view-refresh.png</iconset>
        </property>
       </widget>
      </item>

diff --git a/bacula/src/qt-console/joblist/joblist.cpp b/bacula/src/qt-console/joblist/joblist.cpp
index 159ba120fec00e01e7497ac62ebe96982f8dcb6b..376b5c48a64b7b62a2929efaef58476ea125eb9e 100644 (file)
--- a/bacula/src/qt-console/joblist/joblist.cpp
+++ b/bacula/src/qt-console/joblist/joblist.cpp
@@ -54,7 +54,7 @@ JobList::JobList(const QString &mediaName, const QString &clientName,
    m_filesetName = filesetName;
    pgInitialize(parentTreeWidgetItem);
    QTreeWidgetItem* thisitem = mainWin->getFromHash(this);
-   thisitem->setIcon(0,QIcon(QString::fromUtf8(":images/emblem-system.svg")));
+   thisitem->setIcon(0,QIcon(QString::fromUtf8(":images/emblem-system.png")));
 
    m_resultCount = 0;
    m_populated = false;

diff --git a/bacula/src/qt-console/joblist/joblist.ui b/bacula/src/qt-console/joblist/joblist.ui
index c0ee9eb989959a985d404b40e3c9389cf35d5672..172d2325ff8d36d8e92fdb4712bff414f8be6e07 100644 (file)
--- a/bacula/src/qt-console/joblist/joblist.ui
+++ b/bacula/src/qt-console/joblist/joblist.ui
@@ -318,7 +318,7 @@
            <string>Refresh</string>
           </property>
           <property name="icon" >
-           <iconset resource="../main.qrc" >:/images/view-refresh.svg</iconset>
+           <iconset resource="../main.qrc" >:/images/view-refresh.png</iconset>
           </property>
          </widget>
         </item>
@@ -362,7 +362,7 @@
   </widget>
   <action name="actionRefreshJobList" >
    <property name="icon" >
-    <iconset resource="../main.qrc" >:/images/view-refresh.svg</iconset>
+    <iconset resource="../main.qrc" >:/images/view-refresh.png</iconset>
    </property>
    <property name="text" >
     <string>Refresh Job List</string>
@@ -373,7 +373,7 @@
   </action>
   <action name="actionListJobid" >
    <property name="icon" >
-    <iconset resource="../main.qrc" >:/images/utilities-terminal.svg</iconset>
+    <iconset resource="../main.qrc" >:/images/utilities-terminal.png</iconset>
    </property>
    <property name="text" >
     <string>ListJobid</string>
@@ -381,7 +381,7 @@
   </action>
   <action name="actionListFilesOnJob" >
    <property name="icon" >
-    <iconset resource="../main.qrc" >:/images/utilities-terminal.svg</iconset>
+    <iconset resource="../main.qrc" >:/images/utilities-terminal.png</iconset>
    </property>
    <property name="text" >
     <string>List Files On Job</string>
@@ -389,7 +389,7 @@
   </action>
   <action name="actionListJobMedia" >
    <property name="icon" >
-    <iconset resource="../main.qrc" >:/images/utilities-terminal.svg</iconset>
+    <iconset resource="../main.qrc" >:/images/utilities-terminal.png</iconset>
    </property>
    <property name="text" >
     <string>ListJobMedia</string>
@@ -397,7 +397,7 @@
   </action>
   <action name="actionListVolumes" >
    <property name="icon" >
-    <iconset resource="../main.qrc" >:/images/utilities-terminal.svg</iconset>
+    <iconset resource="../main.qrc" >:/images/utilities-terminal.png</iconset>
    </property>
    <property name="text" >
     <string>ListVolumes</string>
@@ -405,7 +405,7 @@
   </action>
   <action name="actionDeleteJob" >
    <property name="icon" >
-    <iconset resource="../main.qrc" >:/images/weather-severe-alert.svg</iconset>
+    <iconset resource="../main.qrc" >:/images/weather-severe-alert.png</iconset>
    </property>
    <property name="text" >
     <string>DeleteJob</string>
@@ -413,7 +413,7 @@
   </action>
   <action name="actionPurgeFiles" >
    <property name="icon" >
-    <iconset resource="../main.qrc" >:/images/weather-severe-alert.svg</iconset>
+    <iconset resource="../main.qrc" >:/images/weather-severe-alert.png</iconset>
    </property>
    <property name="text" >
     <string>PurgeFiles</string>
@@ -453,7 +453,7 @@
   </action>
   <action name="actionListJobTotals" >
    <property name="icon" >
-    <iconset resource="../main.qrc" >:/images/utilities-terminal.svg</iconset>
+    <iconset resource="../main.qrc" >:/images/utilities-terminal.png</iconset>
    </property>
    <property name="text" >
     <string>List Job Totals in Console</string>

diff --git a/bacula/src/qt-console/jobs/jobs.ui b/bacula/src/qt-console/jobs/jobs.ui
index 21d25d83d06ab41e713646551d32c7bf50bfde58..e245948deb43d8149f253798bf372be6ecbf7953 100644 (file)
--- a/bacula/src/qt-console/jobs/jobs.ui
+++ b/bacula/src/qt-console/jobs/jobs.ui
@@ -25,7 +25,7 @@
   </layout>
   <action name="actionRefreshJobs" >
    <property name="icon" >
-    <iconset resource="../main.qrc" >:/images/view-refresh.svg</iconset>
+    <iconset resource="../main.qrc" >:/images/view-refresh.png</iconset>
    </property>
    <property name="text" >
     <string>Refresh Jobs List</string>
@@ -36,7 +36,7 @@
   </action>
   <action name="actionConsoleListFiles" >
    <property name="icon" >
-    <iconset resource="../main.qrc" >:/images/utilities-terminal.svg</iconset>
+    <iconset resource="../main.qrc" >:/images/utilities-terminal.png</iconset>
    </property>
    <property name="text" >
     <string>List Files Command</string>
@@ -53,7 +53,7 @@
   </action>
   <action name="actionConsoleListVolumes" >
    <property name="icon" >
-    <iconset resource="../main.qrc" >:/images/utilities-terminal.svg</iconset>
+    <iconset resource="../main.qrc" >:/images/utilities-terminal.png</iconset>
    </property>
    <property name="text" >
     <string>List Volumes Command</string>
@@ -70,7 +70,7 @@
   </action>
   <action name="actionConsoleListNextVolume" >
    <property name="icon" >
-    <iconset resource="../main.qrc" >:/images/utilities-terminal.svg</iconset>
+    <iconset resource="../main.qrc" >:/images/utilities-terminal.png</iconset>
    </property>
    <property name="text" >
     <string>List Next Volume Command</string>
@@ -87,7 +87,7 @@
   </action>
   <action name="actionConsoleEnableJob" >
    <property name="icon" >
-    <iconset resource="../main.qrc" >:/images/utilities-terminal.svg</iconset>
+    <iconset resource="../main.qrc" >:/images/utilities-terminal.png</iconset>
    </property>
    <property name="text" >
     <string>Enable Job Command</string>
@@ -104,7 +104,7 @@
   </action>
   <action name="actionConsoleDisableJob" >
    <property name="icon" >
-    <iconset resource="../main.qrc" >:/images/utilities-terminal.svg</iconset>
+    <iconset resource="../main.qrc" >:/images/utilities-terminal.png</iconset>
    </property>
    <property name="text" >
     <string>Disable Job Command</string>
@@ -121,7 +121,7 @@
   </action>
   <action name="actionJobListQuery" >
    <property name="icon" >
-    <iconset resource="../main.qrc" >:/images/emblem-system.svg</iconset>
+    <iconset resource="../main.qrc" >:/images/emblem-system.png</iconset>
    </property>
    <property name="text" >
     <string>Open JobList on Job</string>
@@ -138,7 +138,7 @@
   </action>
   <action name="actionConsoleCancel" >
    <property name="icon" >
-    <iconset resource="../main.qrc" >:/images/utilities-terminal.svg</iconset>
+    <iconset resource="../main.qrc" >:/images/utilities-terminal.png</iconset>
    </property>
    <property name="text" >
     <string>Cancel Job Command</string>

diff --git a/bacula/src/qt-console/main.qrc b/bacula/src/qt-console/main.qrc
index 2681725652a2a5dbf8ba3c8dbe94c43ce21f9bf3..31646d07853ce17b9eb1225ce3bba9552cec33df 100644 (file)
--- a/bacula/src/qt-console/main.qrc
+++ b/bacula/src/qt-console/main.qrc
@@ -5,30 +5,30 @@
         <file>images/bat_icon.png</file>
         <file>images/big-server.png</file>
         <file>images/browse.png</file>
-        <file>images/cartridge-edit.svg</file>
-        <file>images/cartridge.svg</file>
+        <file>images/cartridge-edit.png</file>
+        <file>images/cartridge.png</file>
         <file>images/check.png</file>
         <file>images/connected.png</file>
         <file>images/copy.png</file>
         <file>images/cut.png</file>
         <file>images/disconnected.png</file>
         <file>images/edit-cut.png</file>
-        <file>images/edit-delete.svg</file>
-        <file>images/emblem-system.svg</file>
-        <file>images/estimate-job.svg</file>
+        <file>images/edit-delete.png</file>
+        <file>images/emblem-system.png</file>
+        <file>images/estimate-job.png</file>
+        <file>images/folder.png</file>
         <file>images/folder.png</file>
-        <file>images/folder.svg</file>
         <file>images/folderchecked.png</file>
         <file>images/folderunchecked.png</file>
         <file>images/folderbothchecked.png</file>
         <file>images/graph1.png</file>
-        <file>images/help-browser.svg</file>
+        <file>images/help-browser.png</file>
         <file>images/home.png</file>
         <file>images/joblog.png</file>
         <file>images/label.png</file>
-        <file>images/mail-message-new.svg</file>
+        <file>images/mail-message-new.png</file>
         <file>images/mark.png</file>
-        <file>images/network-server.svg</file>
+        <file>images/network-server.png</file>
         <file>images/new.png</file>
         <file>images/next.png</file>
         <file>images/open.png</file>
@@ -39,13 +39,13 @@
         <file>images/run.png</file>
         <file>images/save.png</file>
         <file>images/status.png</file>
-        <file>images/system-file-manager.svg</file>
+        <file>images/system-file-manager.png</file>
         <file>images/unchecked.png</file>
         <file>images/undo.png</file>
         <file>images/unmark.png</file>
         <file>images/up.png</file>
-        <file>images/utilities-terminal.svg</file>
-        <file>images/view-refresh.svg</file>
-        <file>images/weather-severe-alert.svg</file>
+        <file>images/utilities-terminal.png</file>
+        <file>images/view-refresh.png</file>
+        <file>images/weather-severe-alert.png</file>
     </qresource>
 </RCC>

diff --git a/bacula/src/qt-console/main.ui b/bacula/src/qt-console/main.ui
index 83b05f83482fa306a34d0065714c61537b9948e8..95e09894a156b37c120384b29a09530960ea7cbd 100644 (file)
--- a/bacula/src/qt-console/main.ui
+++ b/bacula/src/qt-console/main.ui
@@ -438,7 +438,7 @@
     <bool>false</bool>
    </property>
    <property name="icon" >
-    <iconset resource="main.qrc" >:/images/estimate-job.svg</iconset>
+    <iconset resource="main.qrc" >:/images/estimate-job.png</iconset>
    </property>
    <property name="text" >
     <string>Estimate Job</string>
@@ -516,7 +516,7 @@
   </action>
   <action name="actionMessages" >
    <property name="icon" >
-    <iconset resource="main.qrc" >:/images/mail-message-new.svg</iconset>
+    <iconset resource="main.qrc" >:/images/mail-message-new.png</iconset>
    </property>
    <property name="text" >
     <string>Messages</string>
@@ -541,7 +541,7 @@
   </action>
   <action name="actionBat_Help" >
    <property name="icon" >
-    <iconset resource="main.qrc" >:/images/help-browser.svg</iconset>
+    <iconset resource="main.qrc" >:/images/help-browser.png</iconset>
    </property>
    <property name="text" >
     <string>bat &amp;Help</string>

diff --git a/bacula/src/qt-console/mainwin.cpp b/bacula/src/qt-console/mainwin.cpp
index 4f073cf1a539ca231c5d04971719fd88ef88c2f3..189b5e34533bfc3d23834db9df6ea93f311ec9c6 100644 (file)
--- a/bacula/src/qt-console/mainwin.cpp
+++ b/bacula/src/qt-console/mainwin.cpp
@@ -122,7 +122,7 @@ void MainWin::createPages()
       item = new QTreeWidgetItem(topItem);
       item->setText(0, "Console");
       if (!m_firstItem){ m_firstItem = item; }
-      item->setIcon(0,QIcon(QString::fromUtf8(":images/utilities-terminal.svg")));
+      item->setIcon(0,QIcon(QString::fromUtf8(":images/utilities-terminal.png")));
 
       /* insert the cosole and tree widget item into the hashes */
       hashInsert(item, m_currentConsole);

diff --git a/bacula/src/qt-console/mediaedit/mediaedit.cpp b/bacula/src/qt-console/mediaedit/mediaedit.cpp
index 89ac90c64abfb793225fabd7a2a87da052c2ffd8..3022a6f5c1da7ac3567ad1865d8b01bbcc9bbb7f 100644 (file)
--- a/bacula/src/qt-console/mediaedit/mediaedit.cpp
+++ b/bacula/src/qt-console/mediaedit/mediaedit.cpp
@@ -47,7 +47,7 @@ MediaEdit::MediaEdit(QTreeWidgetItem *parentWidget, QString &mediaId)
    m_name = "Media Edit";
    pgInitialize(parentWidget);
    QTreeWidgetItem* thisitem = mainWin->getFromHash(this);
-   thisitem->setIcon(0,QIcon(QString::fromUtf8(":images/cartridge-edit.svg")));
+   thisitem->setIcon(0,QIcon(QString::fromUtf8(":images/cartridge-edit.png")));
    m_closeable = true;
    dockPage();
    setCurrent();

diff --git a/bacula/src/qt-console/medialist/medialist.cpp b/bacula/src/qt-console/medialist/medialist.cpp
index dc062c731e9e420b13b2944acd365bc1723993d1..b7b3367213a98bb22213730abee103bbb28e3ac4 100644 (file)
--- a/bacula/src/qt-console/medialist/medialist.cpp
+++ b/bacula/src/qt-console/medialist/medialist.cpp
@@ -50,7 +50,7 @@ MediaList::MediaList()
    m_name = "Media";
    pgInitialize();
    QTreeWidgetItem* thisitem = mainWin->getFromHash(this);
-   thisitem->setIcon(0,QIcon(QString::fromUtf8(":images/cartridge.svg")));
+   thisitem->setIcon(0,QIcon(QString::fromUtf8(":images/cartridge.png")));
 
    /* mp_treeWidget, Storage Tree Tree Widget inherited from ui_medialist.h */
    m_populated = false;

diff --git a/bacula/src/qt-console/medialist/medialist.ui b/bacula/src/qt-console/medialist/medialist.ui
index 422fe8dceb5dc5f6f546dafde714ae5d5a47de77..b4117bb5f419cdd2503b0da0f1fe894f281ded66 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 resource="../main.qrc" >:/images/view-refresh.svg</iconset>
+    <iconset resource="../main.qrc" >:/images/view-refresh.png</iconset>
    </property>
    <property name="text" >
     <string>Refresh Media List</string>
@@ -36,7 +36,7 @@
   </action>
   <action name="actionEditVolume" >
    <property name="icon" >
-    <iconset resource="../main.qrc" >:/images/cartridge-edit.svg</iconset>
+    <iconset resource="../main.qrc" >:/images/cartridge-edit.png</iconset>
    </property>
    <property name="text" >
     <string>Edit Volume</string>
@@ -44,7 +44,7 @@
   </action>
   <action name="actionListJobsOnVolume" >
    <property name="icon" >
-    <iconset resource="../main.qrc" >:/images/emblem-system.svg</iconset>
+    <iconset resource="../main.qrc" >:/images/emblem-system.png</iconset>
    </property>
    <property name="text" >
     <string>List Jobs On Volume</string>
@@ -52,7 +52,7 @@
   </action>
   <action name="actionDeleteVolume" >
    <property name="icon" >
-    <iconset resource="../main.qrc" >:/images/edit-delete.svg</iconset>
+    <iconset resource="../main.qrc" >:/images/edit-delete.png</iconset>
    </property>
    <property name="text" >
     <string>Delete Volume</string>
@@ -68,7 +68,7 @@
   </action>
   <action name="actionPurgeVolume" >
    <property name="icon" >
-    <iconset resource="../main.qrc" >:/images/weather-severe-alert.svg</iconset>
+    <iconset resource="../main.qrc" >:/images/weather-severe-alert.png</iconset>
    </property>
    <property name="text" >
     <string>Purge Volume</string>
@@ -84,7 +84,7 @@
   </action>
   <action name="actionAllVolumesFromPool" >
    <property name="icon" >
-    <iconset resource="../main.qrc" >:/images/cartridge-edit.svg</iconset>
+    <iconset resource="../main.qrc" >:/images/cartridge-edit.png</iconset>
    </property>
    <property name="text" >
     <string>Update all Volumes From Pool</string>
@@ -101,7 +101,7 @@
   </action>
   <action name="actionVolumeFromPool" >
    <property name="icon" >
-    <iconset resource="../main.qrc" >:/images/cartridge-edit.svg</iconset>
+    <iconset resource="../main.qrc" >:/images/cartridge-edit.png</iconset>
    </property>
    <property name="text" >
     <string>Volume From Pool</string>

diff --git a/bacula/src/qt-console/restore/restore.cpp b/bacula/src/qt-console/restore/restore.cpp
index f4527e2572ac37d19617014371553e9cec75c421..26114225dbe0a8f5e360329d1ef3902d046836e5 100644 (file)
--- a/bacula/src/qt-console/restore/restore.cpp
+++ b/bacula/src/qt-console/restore/restore.cpp
@@ -195,7 +195,7 @@ void restorePage::addDirectory(QString &newdirr)
    /* add unix '/' directory first */
    if (m_dirPaths.empty() && (regex.indexIn(fullpath,0) == -1)) {
       QTreeWidgetItem *item = new QTreeWidgetItem(directoryWidget);
-      item->setIcon(0,QIcon(QString::fromUtf8(":images/folder.svg")));
+      item->setIcon(0,QIcon(QString::fromUtf8(":images/folder.png")));
       
       QString text("/");
       item->setText(0, text.toUtf8().data());
@@ -222,14 +222,14 @@ void restorePage::addDirectory(QString &newdirr)
          /* this is the base widget */
          item = new QTreeWidgetItem(directoryWidget);
          item->setText(0, fullpath.toUtf8().data());
-         item->setIcon(0,QIcon(QString::fromUtf8(":images/folder.svg")));
+         item->setIcon(0,QIcon(QString::fromUtf8(":images/folder.png")));
       } else {
          QTreeWidgetItem *parent = m_dirPaths.value(m_cwd);
          if (parent) {
             /* new directories to add */
             item = new QTreeWidgetItem(parent);
             item->setText(0, newdir.toUtf8().data());
-            item->setIcon(0,QIcon(QString::fromUtf8(":images/folder.svg")));
+            item->setIcon(0,QIcon(QString::fromUtf8(":images/folder.png")));
             directoryWidget->expandItem(parent);
          } else {
             ok = false;

diff --git a/bacula/src/qt-console/restore/restoretree.cpp b/bacula/src/qt-console/restore/restoretree.cpp
index 17b1e8f8e40dfbb008412ed9208c64e87e12913f..3ced6dd76510128d3356ace6573c2dda609a79e2 100644 (file)
--- a/bacula/src/qt-console/restore/restoretree.cpp
+++ b/bacula/src/qt-console/restore/restoretree.cpp
@@ -657,7 +657,7 @@ void restoreTree::readSettings()
 /*
  * This is a funcion to accomplish the one thing I struggled to figure out what
  * was taking so long.  It add the icons, but after the tree is made.  Seemed to
- * work fast after changing from svg to png file for graphic.
+ * work fast after changing from png to png file for graphic.
  */
 void restoreTree::directoryItemExpanded(QTreeWidgetItem *item)
 {

diff --git a/bacula/src/qt-console/restore/restoretree.ui b/bacula/src/qt-console/restore/restoretree.ui
index eb25ce2e5076927159bde311d2d68deb4f8a9715..9362ac0ea559d2e5bb8cea8d3fd8a12a0123e7ec 100644 (file)
--- a/bacula/src/qt-console/restore/restoretree.ui
+++ b/bacula/src/qt-console/restore/restoretree.ui
@@ -195,7 +195,7 @@
            <string>Refresh</string>
           </property>
           <property name="icon" >
-           <iconset resource="../main.qrc" >:/images/view-refresh.svg</iconset>
+           <iconset resource="../main.qrc" >:/images/view-refresh.png</iconset>
           </property>
          </widget>
         </item>

diff --git a/bacula/src/qt-console/run/estimate.cpp b/bacula/src/qt-console/run/estimate.cpp
index c2906b2fa5a5116e67920013a5561c3f522d5076..9ce3ced5788e5e6f3dbf22041a15e789818002a0 100644 (file)
--- a/bacula/src/qt-console/run/estimate.cpp
+++ b/bacula/src/qt-console/run/estimate.cpp
@@ -59,7 +59,7 @@ estimatePage::estimatePage()
    connect(okButton, SIGNAL(pressed()), this, SLOT(okButtonPushed()));
    connect(cancelButton, SIGNAL(pressed()), this, SLOT(cancelButtonPushed()));
    QTreeWidgetItem* thisitem = mainWin->getFromHash(this);
-   thisitem->setIcon(0,QIcon(QString::fromUtf8(":images/estimate-job.svg")));
+   thisitem->setIcon(0,QIcon(QString::fromUtf8(":images/estimate-job.png")));
 
    dockPage();
    setCurrent();

diff --git a/bacula/src/qt-console/storage/storage.ui b/bacula/src/qt-console/storage/storage.ui
index 8acac961c8cd5d8dcd56ec32ca182f68c23eb9d7..d4e2261be3b0c22a5a475c5c3b085283460f9d1a 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 resource="../main.qrc" >:/images/view-refresh.svg</iconset>
+    <iconset resource="../main.qrc" >:/images/view-refresh.png</iconset>
    </property>
    <property name="text" >
     <string>Refresh Storage List</string>
@@ -58,7 +58,7 @@
   </action>
   <action name="actionMountStorage" >
    <property name="icon" >
-    <iconset resource="../main.qrc" >:/images/cartridge.svg</iconset>
+    <iconset resource="../main.qrc" >:/images/cartridge.png</iconset>
    </property>
    <property name="text" >
     <string>MountStorage</string>
@@ -69,7 +69,7 @@
   </action>
   <action name="actionUnMountStorage" >
    <property name="icon" >
-    <iconset resource="../main.qrc" >:/images/cartridge.svg</iconset>
+    <iconset resource="../main.qrc" >:/images/cartridge.png</iconset>
    </property>
    <property name="text" >
     <string>UnMount Storage</string>
@@ -102,7 +102,7 @@
   </action>
   <action name="actionRelease" >
    <property name="icon" >
-    <iconset resource="../main.qrc" >:/images/cartridge.svg</iconset>
+    <iconset resource="../main.qrc" >:/images/cartridge.png</iconset>
    </property>
    <property name="text" >
     <string>Release</string>