Add icons and fileinfo to windows executables

Updated the icons fileinfo for windows executables

Fixes #154: Add icon and file info to windows executables

Conflicts:
	src/win32/console/consoleres.rc

src/qt-console/main.ui

@@ -16,7 +16,7 @@
   </property>
   <property name="windowIcon">
    <iconset resource="main.qrc">
-    <normaloff>:/images/bat.png</normaloff>:/images/bat.png</iconset>
+    <normaloff>:/images/bareos_1.png</normaloff>:/images/bareos_1.png</iconset>
   </property>
   <property name="toolTip">
    <string/>
@@ -239,7 +239,7 @@
   <action name="actionAbout_bat">
    <property name="icon">
     <iconset resource="main.qrc">
-     <normaloff>:/images/bat.png</normaloff>:/images/bat.png</iconset>
+     <normaloff>:/images/bareos_1.png</normaloff>:/images/bareos_1.png</iconset>
    </property>
    <property name="text">
     <string>&amp;About bat</string>

src/qt-console/prefs.ui

@@ -19,7 +19,7 @@
    <string>Preferences</string>
   </property>
   <property name="windowIcon" >
-   <iconset>images/bat.png</iconset>
+   <iconset>images/bareos_1.png</iconset>
   </property>
   <layout class="QGridLayout" >
    <property name="leftMargin" >

src/win32/console/Makefile

@@ -34,11 +34,14 @@ LDLIBS = ../lib/libbareos.a \
 CONSSRCS = console.c console_conf.c authenticate.c
 CONSOBJS = $(CONSSRCS:.c=.o)
 
+WINDRESSRCS = consoleres.rc
+WINDRESOBJS = $(WINDRESSRCS:.rc=.o)
+
 all: bconsole.exe
 
 bconsole.exe: DLL_USAGE = -DUSING_DLL
-bconsole.exe: $(CONSOBJS)
-	$(CXX) $(LDFLAGS_CONS) $(CONSOBJS) $(LDLIBS) -o $@
+bconsole.exe: $(CONSOBJS) $(WINDRESOBJS)
+	$(CXX) $(LDFLAGS_CONS) $(CONSOBJS) $(LDLIBS) $(WINDRESOBJS) -o $@
 
 clean:
 	rm -f *.o
@@ -50,3 +53,8 @@ distclean:: clean
 .c.o:
 	@echo "Compiling $<"
 	$(CXX) $(DLL_USAGE) $(CXXFLAGS) -c -o $@ $<
+
+%.o : %.rc
+	@echo "Ressource Compiling $^"
+	$(WINDRES) $^ -o $@
+

src/win32/console/consoleres.rc

@@ -0,0 +1,26 @@
+id ICON "../../../platforms/win32/bareos.ico"
+1 VERSIONINFO
+FILEVERSION     1,0,0,0
+PRODUCTVERSION  1,0,0,0
+BEGIN
+  BLOCK "StringFileInfo"
+  BEGIN
+    BLOCK "080904E4"
+    BEGIN
+      VALUE "CompanyName", "Bareos GmbH & Co. KG"
+      VALUE "FileDescription", "Bareos Console"
+      VALUE "FileVersion", "12.4.2"
+      VALUE "InternalName", "bconsole.exe"
+      VALUE "LegalCopyright", "See LICENSE File"
+      VALUE "OriginalFilename", "bconsole"
+      VALUE "ProductName", "Bareos Console"
+      VALUE "ProductVersion", "12.4.2"
+    END
+  END
+
+  BLOCK "VarFileInfo"
+  BEGIN
+    VALUE "Translation", 0x809, 1252
+  END
+END
+

src/win32/filed/Makefile

@@ -36,7 +36,7 @@ SVRSRCS = accurate.c authenticate.c backup.c compression.c \
 	  service.c main.c
 SVROBJS = $(SVRSRCS:.c=.o)
 
-WINDRESSRCS = icon.rc
+WINDRESSRCS = filedres.rc
 WINDRESOBJS = $(WINDRESSRCS:.rc=.o)
 
 

src/win32/filed/icon.rc → src/win32/filed/filedres.rc

@@ -23,3 +23,4 @@ BEGIN
     VALUE "Translation", 0x809, 1252
   END
 END
+

src/win32/qt-console/bat.pro

@@ -160,3 +160,6 @@ INSTALLS += confs
 QMAKE_EXTRA_TARGETS += depend
 
 TRANSLATIONS += ts/bat_fr.ts ts/bat_de.ts
+
+# Windows Icon and App Info
+win32:RC_FILE = batres.rc

src/win32/qt-console/batres.rc

@@ -0,0 +1,26 @@
+id ICON "../../../platforms/win32/bareos.ico"
+1 VERSIONINFO
+FILEVERSION     1,0,0,0
+PRODUCTVERSION  1,0,0,0
+BEGIN
+  BLOCK "StringFileInfo"
+  BEGIN
+    BLOCK "080904E4"
+    BEGIN
+      VALUE "CompanyName", "Bareos GmbH & Co. KG"
+      VALUE "FileDescription", "Bareos Admin Tool"
+      VALUE "FileVersion", "12.4.2"
+      VALUE "InternalName", "bat.exe"
+      VALUE "LegalCopyright", "See LICENSE File"
+      VALUE "OriginalFilename", "bat.exe"
+      VALUE "ProductName", "Bareos Admin Tool"
+      VALUE "ProductVersion", "12.4.2"
+    END
+  END
+
+  BLOCK "VarFileInfo"
+  BEGIN
+    VALUE "Translation", 0x809, 1252
+  END
+END
+

src/win32/qt-tray-monitor/tray-monitor.pro

@@ -37,3 +37,7 @@ SOURCES += authenticate.cpp tray_conf.cpp tray-monitor.cpp \
            monitoritemthread.cpp
 
 FORMS += mainwindow.ui
+
+# Application icon and info
+win32:RC_FILE = traymon.rc
+

src/win32/qt-tray-monitor/traymon.rc

@@ -0,0 +1,26 @@
+id ICON "../../../platforms/win32/bareos.ico"
+1 VERSIONINFO
+FILEVERSION     1,0,0,0
+PRODUCTVERSION  1,0,0,0
+BEGIN
+  BLOCK "StringFileInfo"
+  BEGIN
+    BLOCK "080904E4"
+    BEGIN
+      VALUE "CompanyName", "Bareos GmbH & Co. KG"
+      VALUE "FileDescription", "Bareos Tray Monitor"
+      VALUE "FileVersion", "12.4.2"
+      VALUE "InternalName", "bareos-tray-monitor.exe"
+      VALUE "LegalCopyright", "See LICENSE File"
+      VALUE "OriginalFilename", "bareos-tray-monitor.exe"
+      VALUE "ProductName", "Bareos Admin Tool"
+      VALUE "ProductVersion", "12.4.2"
+    END
+  END
+
+  BLOCK "VarFileInfo"
+  BEGIN
+    VALUE "Translation", 0x809, 1252
+  END
+END
+