app icons

configure.in

@@ -270,6 +270,23 @@ AC_SUBST(ANTLR_INCLUDEPATH)
 
 dnl ********************************************************************
 
+
+if test "x$with_docdir" != "x"; then
+  DOCDIR="${with_docdir}"
+else
+  DOCDIR="${PREFIX}/share/doc/fwbuilder-${VERSION}"
+fi
+DOCDIRPATH=`dirname ${DOCDIR}`
+
+if test "x$with_datadir" != "x"; then
+  DATADIR="${with_datadir}"
+else
+  DATADIR="${PREFIX}/share/"
+fi
+
+
+ICONSDIR=""
+
 if test -z ${RELEASE_NUM}; then
   RPMRELEASE="1"
 else
@@ -361,6 +378,7 @@ case ${host} in
 	DISTRO="Unknown"
     fi
     MANDIR="${PREFIX}/share/man/"
+    ICONSDIR="${DATADIR}/icons/hicolor/"
     AC_MSG_RESULT($DISTRO Linux)
     ;;
 
@@ -383,20 +401,6 @@ fi
 AC_DEFINE_UNQUOTED(RES_DIR, "$RES_DIR", [res_dir])
 AC_SUBST(RES_DIR)
 
-
-if test "x$with_docdir" != "x"; then
-  DOCDIR="${with_docdir}"
-else
-  DOCDIR="${PREFIX}/share/doc/fwbuilder-${VERSION}"
-fi
-DOCDIRPATH=`dirname ${DOCDIR}`
-
-if test "x$with_datadir" != "x"; then
-  DATADIR="${with_datadir}"
-else
-  DATADIR="${PREFIX}/share/"
-fi
-
 AC_SUBST(OS)
 AC_DEFINE_UNQUOTED(OS, "${OS}", [os])
 test -n "$OS_CYGWIN" && AC_DEFINE_UNQUOTED(OS_CYGWIN, "${OS_CYGWIN}", [cygwin])
@@ -419,6 +423,7 @@ AC_DEFINE_UNQUOTED(DOCDIR, "${DOCDIR}", [docdir])
 
 AC_SUBST(DATADIR)
 AC_SUBST(MANDIR)
+AC_SUBST(ICONSDIR)
 
 AC_PATH_PROG(CCACHE, ccache, , )
 

doc/ChangeLog

@@ -1,6 +1,8 @@
 2008-08-03  Vadim Kurland  <vadim@vk.crocodile.org>
 
-	* res.pro: Now installing fwbuilder.desktop file on Linux.
+	* res.pro: Now installing fwbuilder.desktop file on Linux and
+	application icons under $DATADIR/icons/hicolor/ (sizes 128x128
+	16x16 24x24 256x256 32x32 48x48 512x512 72x72)
 
 	* bug #2036912 "fwbuilder b442 does not build". Added missing
 	forward declarations and #include for gcc 4.3

qmake.inc

@@ -11,8 +11,8 @@ SO_VERSION    = @LIBFWBUILDER_SOLIB_VERSION@
 DEFINES      += $$(DEFINES)
 LANGUAGE      = C++
 UI_DIR        = ui
-MANDIR        = /home/vadim/src/fwb3-branch-v3/install_root/share/man/
+MANDIR        = /home/vadim/src/fwb3-branch-v3/install_root//share/man/
-DOCDIR        = /home/vadim/src/fwb3-branch-v3/install_root/share/doc/fwbuilder-3.0.0
+DOCDIR        = /home/vadim/src/fwb3-branch-v3/install_root//share/doc/fwbuilder-3.0.0
 
 HAVE_ANTLR_RUNTIME = 1
 HAVE_EXTERNAL_ANTLR = 0
@@ -30,9 +30,10 @@ unix {
 	MOC_DIR = .moc
 	OBJECTS_DIR = .obj
 
-	PREFIX                  = /home/vadim/src/fwb3-branch-v3/install_root
+	PREFIX                  = /home/vadim/src/fwb3-branch-v3/install_root/
 	exec_prefix             = @EXEC_PREFIX@
 	DESTDIR                 =
+	ICONSDIR                = /home/vadim/src/fwb3-branch-v3/install_root//share//icons/hicolor/
 
     INCLUDEPATH  += .. ../.. $$(INCLUDEPATH) /home/vadim/src/fwb3-branch-v3/install_root/include/ /home/vadim/src/fwb3-branch-v3/install_root/include/fwb-3 /usr/include/libxml2
 
@@ -42,18 +43,19 @@ unix {
 	target.path             = $$PREFIX/bin
 	dtd.path                = @TEMPLATE_DIR@/
 	migration.path          = @TEMPLATE_DIR@/migration
-	doc.path                = /home/vadim/src/fwb3-branch-v3/install_root/share/doc/fwbuilder-3.0.0
+	doc.path                = /home/vadim/src/fwb3-branch-v3/install_root//share/doc/fwbuilder-3.0.0
-	datadir.path		    = /home/vadim/src/fwb3-branch-v3/install_root/share/
+	datadir.path		    = /home/vadim/src/fwb3-branch-v3/install_root//share/
+
 
 #	win32:target.path    = $$PREFIX/
 #	unix:target.path     = $$PREFIX/share/fwbuilder/
 #	macx:target.path     = $$PREFIX/
 
-	res.path			= /home/vadim/src/fwb3-branch-v3/install_root/share/fwbuilder-3.0.0
+	res.path			= /home/vadim/src/fwb3-branch-v3/install_root//share/fwbuilder-3.0.0
-	res_os.path 		= /home/vadim/src/fwb3-branch-v3/install_root/share/fwbuilder-3.0.0/os/
+	res_os.path 		= /home/vadim/src/fwb3-branch-v3/install_root//share/fwbuilder-3.0.0/os/
-	res_platform.path 	= /home/vadim/src/fwb3-branch-v3/install_root/share/fwbuilder-3.0.0/platform/
+	res_platform.path 	= /home/vadim/src/fwb3-branch-v3/install_root//share/fwbuilder-3.0.0/platform/
-	res_help.path 	    = /home/vadim/src/fwb3-branch-v3/install_root/share/fwbuilder-3.0.0/help/
+	res_help.path 	    = /home/vadim/src/fwb3-branch-v3/install_root//share/fwbuilder-3.0.0/help/
-	res_desktop.path	= /home/vadim/src/fwb3-branch-v3/install_root/share//applications/
+	res_desktop.path	= /home/vadim/src/fwb3-branch-v3/install_root//share//applications/
 
     INSTALLS		   += res 
     INSTALLS		   += res_os

qmake.inc.in

@@ -33,6 +33,7 @@ unix {
 	PREFIX                  = @PREFIX@
 	exec_prefix             = @EXEC_PREFIX@
 	DESTDIR                 =
+	ICONSDIR                = @ICONSDIR@
 
     INCLUDEPATH  += .. ../.. $$(INCLUDEPATH) @LIBFWBUILDER_INCLUDEPATH@
 
@@ -45,6 +46,7 @@ unix {
 	doc.path                = @DOCDIR@
 	datadir.path		    = @DATADIR@
 
+
 #	win32:target.path    = $$PREFIX/
 #	unix:target.path     = $$PREFIX/share/fwbuilder/
 #	macx:target.path     = $$PREFIX/

src/gui/gui.pro

@@ -336,3 +336,4 @@ ru.path = $$PKGLOCALEDIR
 ru.files = fwbuilder_ru.qm
 
 INSTALLS += ru
+

src/res/res.pro

@@ -40,5 +40,41 @@ unix {
 !macx {
 	res_desktop.files = fwbuilder.desktop
 	INSTALLS += res_desktop
+
+	app_icon_16x16.files = Icons/16x16/fwbuilder.png
+	app_icon_16x16.path = $$ICONSDIR/16x16/apps
+	INSTALLS += app_icon_16x16
+
+	app_icon_24x24.files = Icons/24x24/fwbuilder.png
+	app_icon_24x24.path = $$ICONSDIR/24x24/apps
+	INSTALLS += app_icon_24x24
+
+	app_icon_32x32.files = Icons/32x32/fwbuilder.png
+	app_icon_32x32.path = $$ICONSDIR/32x32/apps
+	INSTALLS += app_icon_32x32
+
+	app_icon_48x48.files = Icons/48x48/fwbuilder.png
+	app_icon_48x48.path = $$ICONSDIR/48x48/apps
+	INSTALLS += app_icon_48x48
+
+	app_icon_72x72.files = Icons/72x72/fwbuilder.png
+	app_icon_72x72.path = $$ICONSDIR/72x72/apps
+	INSTALLS += app_icon_72x72
+
+	app_icon_128x128.files = Icons/128x128/fwbuilder.png
+	app_icon_128x128.path = $$ICONSDIR/128x128/apps
+	INSTALLS += app_icon_128x128
+
+	app_icon_256x256.files = Icons/256x256/fwbuilder.png
+	app_icon_256x256.path = $$ICONSDIR/256x256/apps
+	INSTALLS += app_icon_256x256
+
+	app_icon_512x512.files = Icons/512x512/fwbuilder.png
+	app_icon_512x512.path = $$ICONSDIR/512x512/apps
+	INSTALLS += app_icon_512x512
+
 }
 }
+
+
+