From 4e974a0ce625748ab116771ff0166f72412bf356 Mon Sep 17 00:00:00 2001
From: Kern Sibbald <kern@sibbald.com>
Date: Sun, 29 Apr 2007 16:52:19 +0000
Subject: [PATCH] kes  Correct incorrect installation of LICENSE in Win32
 installer. kes  Display LICENSE at the beginning of the Win32 install. kes 
 Attempt to correct the need for the png files to be installed      for bat.

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@4657 91ce42f0-d328-0410-95d8-f526ca767f89
---
 bacula/src/qt-console/main.qrc           | 24 ++++++++++++-----
 bacula/src/qt-console/main.ui            | 34 ++++++++++++------------
 bacula/src/qt-console/mainwin.cpp        |  2 +-
 bacula/src/win32/installer/winbacula.nsi |  3 ++-
 bacula/technotes-2.1                     |  4 +++
 5 files changed, 41 insertions(+), 26 deletions(-)

diff --git a/bacula/src/qt-console/main.qrc b/bacula/src/qt-console/main.qrc
index 3573c5c5ea..862d71edfb 100644
--- a/bacula/src/qt-console/main.qrc
+++ b/bacula/src/qt-console/main.qrc
@@ -1,18 +1,28 @@
 <!DOCTYPE RCC><RCC version="1.0">
 <qresource>
+   <file>images/backup.png</file>
+   <file>images/bat_icon.png</file>
+   <file>images/bat.png</file>
+   <file>images/big-server.png</file>
+   <file>images/connected.png</file>
    <file>images/copy.png</file>
    <file>images/cut.png</file>
+   <file>images/disconnected.png</file>
+   <file>images/home.png</file>
+   <file>images/label.png</file>
+   <file>images/mark.png</file>
    <file>images/new.png</file>
+   <file>images/next.png</file>
    <file>images/open.png</file>
    <file>images/paste.png</file>
-   <file>images/save.png</file>
-   <file>images/bat.png</file>
-   <file>images/connected.png</file>
-   <file>images/disconnected.png</file>
-   <file>images/run.png</file>
+   <file>images/print.png</file>
    <file>images/restore.png</file>
+   <file>images/run.png</file>
+   <file>images/save.png</file>
    <file>images/server.png</file>
-   <file>images/label.png</file>
-   <file>images/big-server.png</file>
+   <file>images/status.png</file>
+   <file>images/undo.png</file>
+   <file>images/unmark.png</file>
+   <file>images/up.png</file>
 </qresource>
 </RCC>
diff --git a/bacula/src/qt-console/main.ui b/bacula/src/qt-console/main.ui
index 4f2b988734..be034cff77 100644
--- a/bacula/src/qt-console/main.ui
+++ b/bacula/src/qt-console/main.ui
@@ -14,7 +14,7 @@
    <string>bat - Bacula Admin Tool</string>
   </property>
   <property name="windowIcon" >
-   <iconset>images/bat.png</iconset>
+   <iconset>:images/bat.png</iconset>
   </property>
   <property name="toolTip" >
    <string/>
@@ -303,7 +303,7 @@
   </action>
   <action name="actionAbout_bat" >
    <property name="icon" >
-    <iconset>images/bat.png</iconset>
+    <iconset>:images/bat.png</iconset>
    </property>
    <property name="text" >
     <string>&amp;About bat</string>
@@ -311,7 +311,7 @@
   </action>
   <action name="actionCopy" >
    <property name="icon" >
-    <iconset>images/copy.png</iconset>
+    <iconset>:images/copy.png</iconset>
    </property>
    <property name="text" >
     <string>&amp;Copy</string>
@@ -319,7 +319,7 @@
   </action>
   <action name="actionCut" >
    <property name="icon" >
-    <iconset>images/cut.png</iconset>
+    <iconset>:images/cut.png</iconset>
    </property>
    <property name="text" >
     <string>Cu&amp;t</string>
@@ -327,7 +327,7 @@
   </action>
   <action name="actionNew" >
    <property name="icon" >
-    <iconset>images/new.png</iconset>
+    <iconset>:images/new.png</iconset>
    </property>
    <property name="text" >
     <string>new</string>
@@ -335,7 +335,7 @@
   </action>
   <action name="actionOpen" >
    <property name="icon" >
-    <iconset>images/open.png</iconset>
+    <iconset>:images/open.png</iconset>
    </property>
    <property name="text" >
     <string>open</string>
@@ -343,7 +343,7 @@
   </action>
   <action name="actionPaste" >
    <property name="icon" >
-    <iconset>images/paste.png</iconset>
+    <iconset>:images/paste.png</iconset>
    </property>
    <property name="text" >
     <string>&amp;Paste</string>
@@ -351,7 +351,7 @@
   </action>
   <action name="actionPrint" >
    <property name="icon" >
-    <iconset>images/print.png</iconset>
+    <iconset>:images/print.png</iconset>
    </property>
    <property name="text" >
     <string>&amp;Print</string>
@@ -362,7 +362,7 @@
   </action>
   <action name="actionSave" >
    <property name="icon" >
-    <iconset>images/save.png</iconset>
+    <iconset>:images/save.png</iconset>
    </property>
    <property name="text" >
     <string>&amp;Save</string>
@@ -373,7 +373,7 @@
   </action>
   <action name="actionConnect" >
    <property name="icon" >
-    <iconset>images/disconnected.png</iconset>
+    <iconset>:images/disconnected.png</iconset>
    </property>
    <property name="text" >
     <string>Connect</string>
@@ -384,7 +384,7 @@
   </action>
   <action name="actionLabel" >
    <property name="icon" >
-    <iconset>images/label.png</iconset>
+    <iconset>:images/label.png</iconset>
    </property>
    <property name="text" >
     <string>Label</string>
@@ -398,7 +398,7 @@
   </action>
   <action name="actionRestore" >
    <property name="icon" >
-    <iconset>images/restore.png</iconset>
+    <iconset>:images/restore.png</iconset>
    </property>
    <property name="text" >
     <string>Restore</string>
@@ -412,7 +412,7 @@
     <bool>false</bool>
    </property>
    <property name="icon" >
-    <iconset>images/run.png</iconset>
+    <iconset>:images/run.png</iconset>
    </property>
    <property name="text" >
     <string>Run Job</string>
@@ -429,7 +429,7 @@
   </action>
   <action name="actionStatusDir" >
    <property name="icon" >
-    <iconset>images/status.png</iconset>
+    <iconset>:images/status.png</iconset>
    </property>
    <property name="text" >
     <string>StatusDir</string>
@@ -448,7 +448,7 @@
   </action>
   <action name="actionUndock" >
    <property name="icon" >
-    <iconset>images/up.png</iconset>
+    <iconset>:images/up.png</iconset>
    </property>
    <property name="text" >
     <string>Undock Window</string>
@@ -456,7 +456,7 @@
   </action>
   <action name="actionToggleDock" >
    <property name="icon" >
-    <iconset>images/unmark.png</iconset>
+    <iconset>:images/unmark.png</iconset>
    </property>
    <property name="text" >
     <string>ToggleDock</string>
@@ -464,7 +464,7 @@
   </action>
   <action name="actionClosePage" >
    <property name="icon" >
-    <iconset>images/unmark.png</iconset>
+    <iconset>:images/unmark.png</iconset>
    </property>
    <property name="text" >
     <string>Close Page</string>
diff --git a/bacula/src/qt-console/mainwin.cpp b/bacula/src/qt-console/mainwin.cpp
index 3472cbbf46..d4349dfc31 100644
--- a/bacula/src/qt-console/mainwin.cpp
+++ b/bacula/src/qt-console/mainwin.cpp
@@ -88,7 +88,7 @@ void MainWin::createPages()
 
       /* The top tree item representing the director */
       topItem = createTopPage(dir->name());
-      topItem->setIcon(0, QIcon(QString::fromUtf8("images/server.png")));
+      topItem->setIcon(0, QIcon(":images/server.png"));
       /* Set background to grey for ease of identification of inactive dirfector */
       QBrush greyBrush(Qt::lightGray);
       topItem->setBackground(0, greyBrush);
diff --git a/bacula/src/win32/installer/winbacula.nsi b/bacula/src/win32/installer/winbacula.nsi
index 767bca0f29..1621273740 100644
--- a/bacula/src/win32/installer/winbacula.nsi
+++ b/bacula/src/win32/installer/winbacula.nsi
@@ -76,7 +76,7 @@ ${StrTrimNewLines}
 !define      MUI_HEADERIMAGE_BITMAP     "bacula-logo.bmp"
 
 !InsertMacro MUI_PAGE_WELCOME
-;  !InsertMacro MUI_PAGE_LICENSE "..\..\LICENSE"
+!InsertMacro MUI_PAGE_LICENSE "..\..\..\LICENSE"
 Page custom EnterInstallType
 !define      MUI_PAGE_CUSTOMFUNCTION_SHOW PageComponentsShow
 !InsertMacro MUI_PAGE_COMPONENTS
@@ -414,6 +414,7 @@ Section "-Initialize"
   CreateDirectory "$APPDATA\Bacula\Work"
   CreateDirectory "$APPDATA\Bacula\Spool"
 
+  SetOutPath "$INSTDIR"
   File "..\..\..\LICENSE"
   Delete /REBOOTOK "$INSTDIR\bin\License.txt"
 
diff --git a/bacula/technotes-2.1 b/bacula/technotes-2.1
index 1fd75de59a..e5095d2da1 100644
--- a/bacula/technotes-2.1
+++ b/bacula/technotes-2.1
@@ -2,6 +2,10 @@
 
 General:
 29Apr07 
+kes  Correct incorrect installation of LICENSE in Win32 installer.
+kes  Display LICENSE at the beginning of the Win32 install.
+kes  Attempt to correct the need for the png files to be installed 
+     for bat.
 kes  Reapply my bat.conf install script in qt-console. I think I 
      editted bat.pro instead of bat.pro.in and it was lost.
 kes  Apply CentOS patches someone sent me. Checks for /var/run/subsys,
-- 
2.39.5