diff --git a/Makefile.am b/Makefile.am index ac45769b..40ed64e9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,9 +2,9 @@ SUBDIRS = po intl src plugins man -EXTRA_DIST = autogen.sh hexchat.png hexchat.ico +EXTRA_DIST = autogen.sh -icon_DATA = hexchat.png +icon_DATA = src/pixmaps/hexchat.png icondir = $(datadir)/pixmaps util_DATA = share/misc/hexchat.desktop diff --git a/hexchat.ico b/share/icons/hexchat.ico similarity index 100% rename from hexchat.ico rename to share/icons/hexchat.ico diff --git a/src/fe-gtk/about.c b/src/fe-gtk/about.c index 156306bf..48136d13 100644 --- a/src/fe-gtk/about.c +++ b/src/fe-gtk/about.c @@ -154,7 +154,7 @@ menu_about (GtkWidget * wid, gpointer sess) gtk_box_pack_start (GTK_BOX (hbox_main), vbox_logo, 0, 0, 10); /* the actual image */ - wid = gtk_image_new_from_pixbuf (pix_xchat); + wid = gtk_image_new_from_pixbuf (pix_hexchat); gtk_box_pack_start (GTK_BOX (vbox_logo), wid, 0, 0, 10); /* our close button on the bottom right */ diff --git a/src/fe-gtk/fe-gtk-xp.vcxproj b/src/fe-gtk/fe-gtk-xp.vcxproj index 4610e189..e7ddca14 100644 --- a/src/fe-gtk/fe-gtk-xp.vcxproj +++ b/src/fe-gtk/fe-gtk-xp.vcxproj @@ -169,7 +169,7 @@ - + diff --git a/src/fe-gtk/fe-gtk-xp.vcxproj.filters b/src/fe-gtk/fe-gtk-xp.vcxproj.filters index 75a213c7..a319babd 100644 --- a/src/fe-gtk/fe-gtk-xp.vcxproj.filters +++ b/src/fe-gtk/fe-gtk-xp.vcxproj.filters @@ -212,7 +212,7 @@ - + Resource Files diff --git a/src/fe-gtk/fe-gtk.vcxproj b/src/fe-gtk/fe-gtk.vcxproj index c69059f1..3a331374 100644 --- a/src/fe-gtk/fe-gtk.vcxproj +++ b/src/fe-gtk/fe-gtk.vcxproj @@ -166,7 +166,7 @@ - + diff --git a/src/fe-gtk/fe-gtk.vcxproj.filters b/src/fe-gtk/fe-gtk.vcxproj.filters index 75a213c7..a319babd 100644 --- a/src/fe-gtk/fe-gtk.vcxproj.filters +++ b/src/fe-gtk/fe-gtk.vcxproj.filters @@ -212,7 +212,7 @@ - + Resource Files diff --git a/src/fe-gtk/gtkutil.c b/src/fe-gtk/gtkutil.c index 4c34f41d..08abebc4 100644 --- a/src/fe-gtk/gtkutil.c +++ b/src/fe-gtk/gtkutil.c @@ -820,7 +820,7 @@ show_and_unfocus (GtkWidget * wid) void gtkutil_set_icon (GtkWidget *win) { - gtk_window_set_icon (GTK_WINDOW (win), pix_xchat); + gtk_window_set_icon (GTK_WINDOW (win), pix_hexchat); } extern GtkWidget *parent_window; /* maingui.c */ diff --git a/src/fe-gtk/hexchat.rc b/src/fe-gtk/hexchat.rc index da88747a..9b1018e0 100644 --- a/src/fe-gtk/hexchat.rc +++ b/src/fe-gtk/hexchat.rc @@ -2,7 +2,7 @@ #include "../../config-win32.h" #include "../../resource.h" -XC_ICON ICON "../../hexchat.ico" +XC_ICON ICON "../../share/icons/hexchat.ico" VS_VERSION_INFO VERSIONINFO FILEVERSION COMMA_VERSION diff --git a/src/fe-gtk/pixmaps.c b/src/fe-gtk/pixmaps.c index a1fa9842..24439219 100644 --- a/src/fe-gtk/pixmaps.c +++ b/src/fe-gtk/pixmaps.c @@ -31,9 +31,6 @@ #include "../pixmaps/inline_pngs.h" -GdkPixbuf *pix_xchat; -GdkPixbuf *pix_book; - GdkPixbuf *pix_ulist_voice; GdkPixbuf *pix_ulist_halfop; GdkPixbuf *pix_ulist_op; @@ -41,7 +38,6 @@ GdkPixbuf *pix_ulist_owner; GdkPixbuf *pix_ulist_founder; GdkPixbuf *pix_ulist_netop; - GdkPixbuf *pix_tray_msg; GdkPixbuf *pix_tray_hilight; GdkPixbuf *pix_tray_file; @@ -51,6 +47,8 @@ GdkPixbuf *pix_dialog; GdkPixbuf *pix_server; GdkPixbuf *pix_util; +GdkPixbuf *pix_book; +GdkPixbuf *pix_hexchat; static GdkPixmap * pixmap_load_from_file_real (char *file) @@ -122,11 +120,6 @@ load_pixmap (const char *filename, const char *name, int has_inline) void pixmaps_init (void) { - pix_book = gdk_pixbuf_new_from_inline (-1, bookpng, FALSE, 0); - - /* used in About window, tray icon and WindowManager icon. */ - pix_xchat = load_pixmap ("hexchat", hexchatpng, 1); - /* userlist icons, with inlined defaults */ pix_ulist_voice = load_pixmap ("ulist_voice", png_ulist_voice, 1); pix_ulist_halfop = load_pixmap ("ulist_halfop", png_ulist_halfop, 1); @@ -152,4 +145,9 @@ pixmaps_init (void) pix_dialog = load_pixmap ("dialog", dialogpng, 1); pix_server = load_pixmap ("server", serverpng, 1); pix_util = load_pixmap ("util", utilpng, 1); + + /* non-replaceable book pixmap */ + pix_book = gdk_pixbuf_new_from_inline (-1, png_book, FALSE, 0); + /* used in About window, tray icon and WindowManager icon. */ + pix_hexchat = load_pixmap ("hexchat", png_hexchat, 1); } diff --git a/src/fe-gtk/pixmaps.h b/src/fe-gtk/pixmaps.h index d5e60642..8a364264 100644 --- a/src/fe-gtk/pixmaps.h +++ b/src/fe-gtk/pixmaps.h @@ -5,9 +5,6 @@ extern GdkPixbuf *pix_ulist_owner; extern GdkPixbuf *pix_ulist_founder; extern GdkPixbuf *pix_ulist_netop; -extern GdkPixbuf *pix_book; -extern GdkPixbuf *pix_xchat; - extern GdkPixbuf *pix_tray_msg; extern GdkPixbuf *pix_tray_hilight; extern GdkPixbuf *pix_tray_file; @@ -17,5 +14,8 @@ extern GdkPixbuf *pix_dialog; extern GdkPixbuf *pix_server; extern GdkPixbuf *pix_util; +extern GdkPixbuf *pix_book; +extern GdkPixbuf *pix_hexchat; + extern GdkPixmap *pixmap_load_from_file (char *file); extern void pixmaps_init (void); diff --git a/src/fe-gtk/plugin-tray.c b/src/fe-gtk/plugin-tray.c index b9113804..489b4822 100644 --- a/src/fe-gtk/plugin-tray.c +++ b/src/fe-gtk/plugin-tray.c @@ -51,7 +51,7 @@ typedef GdkPixbuf* TrayIcon; #define tray_icon_from_file(f) gdk_pixbuf_new_from_file(f,NULL) #define tray_icon_free(i) g_object_unref(i) -#define ICON_NORMAL pix_xchat +#define ICON_NORMAL pix_hexchat #define ICON_MSG pix_tray_msg #define ICON_HILIGHT pix_tray_hilight #define ICON_FILE pix_tray_file diff --git a/src/pixmaps/Makefile.am b/src/pixmaps/Makefile.am index 6e3e5ab0..3658c5d7 100644 --- a/src/pixmaps/Makefile.am +++ b/src/pixmaps/Makefile.am @@ -9,14 +9,14 @@ LIST = png_ulist_voice $(srcdir)/ulist_voice.png \ traymsgpng $(srcdir)/message.png \ trayhilightpng $(srcdir)/highlight.png \ trayfilepng $(srcdir)/fileoffer.png \ - bookpng $(srcdir)/book.png \ channelpng $(srcdir)/channel.png \ dialogpng $(srcdir)/dialog.png \ serverpng $(srcdir)/server.png \ utilpng $(srcdir)/util.png \ - hexchatpng $(srcdir)/../../hexchat.png + png_book $(srcdir)/book.png \ + png_hexchat $(srcdir)/hexchat.png -PNGS = ulist_voice.png ulist_halfop.png ulist_op.png ulist_owner.png ulist_founder.png ulist_netop.png message.png highlight.png fileoffer.png book.png channel.png dialog.png server.png util.png +PNGS = ulist_voice.png ulist_halfop.png ulist_op.png ulist_owner.png ulist_founder.png ulist_netop.png message.png highlight.png fileoffer.png channel.png dialog.png server.png util.png book.png noinst_HEADERS = inline_pngs.h CLEANFILES = $(noinst_HEADERS) EXTRA_DIST = $(PNGS) diff --git a/hexchat.png b/src/pixmaps/hexchat.png similarity index 100% rename from hexchat.png rename to src/pixmaps/hexchat.png diff --git a/src/pixmaps/pixmaps-xp.vcxproj b/src/pixmaps/pixmaps-xp.vcxproj index a177822b..06a6615e 100644 --- a/src/pixmaps/pixmaps-xp.vcxproj +++ b/src/pixmaps/pixmaps-xp.vcxproj @@ -98,8 +98,6 @@ - - @@ -107,6 +105,8 @@ + + diff --git a/src/pixmaps/pixmaps-xp.vcxproj.filters b/src/pixmaps/pixmaps-xp.vcxproj.filters index 661d5b49..bfc9366d 100644 --- a/src/pixmaps/pixmaps-xp.vcxproj.filters +++ b/src/pixmaps/pixmaps-xp.vcxproj.filters @@ -25,9 +25,6 @@ Resource Files - - Resource Files - Resource Files @@ -37,9 +34,6 @@ Resource Files - - Resource Files - Resource Files @@ -52,5 +46,11 @@ Resource Files + + Resource Files + + + Resource Files + diff --git a/src/pixmaps/pixmaps.vcxproj b/src/pixmaps/pixmaps.vcxproj index 623724d7..b3943bce 100644 --- a/src/pixmaps/pixmaps.vcxproj +++ b/src/pixmaps/pixmaps.vcxproj @@ -95,8 +95,6 @@ - - @@ -104,6 +102,8 @@ + + diff --git a/src/pixmaps/pixmaps.vcxproj.filters b/src/pixmaps/pixmaps.vcxproj.filters index 661d5b49..bfc9366d 100644 --- a/src/pixmaps/pixmaps.vcxproj.filters +++ b/src/pixmaps/pixmaps.vcxproj.filters @@ -25,9 +25,6 @@ Resource Files - - Resource Files - Resource Files @@ -37,9 +34,6 @@ Resource Files - - Resource Files - Resource Files @@ -52,5 +46,11 @@ Resource Files + + Resource Files + + + Resource Files + diff --git a/win32/hexchat-xp.props b/win32/hexchat-xp.props index 7f4f9e50..5d6f7e48 100644 --- a/win32/hexchat-xp.props +++ b/win32/hexchat-xp.props @@ -34,7 +34,7 @@ hcpython $(DepsRoot)\include\glib-2.0;$(DepsRoot)\lib\glib-2.0\include;$(DepsRoot)\include\libxml2 $(DepsRoot)\include\gtk-2.0;$(DepsRoot)\lib\gtk-2.0\include;$(DepsRoot)\include\atk-1.0;$(DepsRoot)\include\cairo;$(DepsRoot)\include\pango-1.0;$(DepsRoot)\include\gdk-pixbuf-2.0 - png_ulist_voice "$(SolutionDir)\..\src\pixmaps\ulist_voice.png" png_ulist_halfop "$(SolutionDir)\..\src\pixmaps\ulist_halfop.png" png_ulist_op "$(SolutionDir)\..\src\pixmaps\ulist_op.png" png_ulist_owner "$(SolutionDir)\..\src\pixmaps\ulist_owner.png" png_ulist_founder "$(SolutionDir)\..\src\pixmaps\ulist_founder.png" png_ulist_netop "$(SolutionDir)\..\src\pixmaps\ulist_netop.png" bookpng "$(SolutionDir)\..\src\pixmaps\book.png" trayfilepng "$(SolutionDir)\..\src\pixmaps\fileoffer.png" trayhilightpng "$(SolutionDir)\..\src\pixmaps\highlight.png" traymsgpng "$(SolutionDir)\..\src\pixmaps\message.png" channelpng "$(SolutionDir)\..\src\pixmaps\channel.png" dialogpng "$(SolutionDir)\..\src\pixmaps\dialog.png" serverpng "$(SolutionDir)\..\src\pixmaps\server.png" utilpng "$(SolutionDir)\..\src\pixmaps\util.png" hexchatpng "$(SolutionDir)\..\hexchat.png" + png_ulist_voice "$(SolutionDir)\..\src\pixmaps\ulist_voice.png" png_ulist_halfop "$(SolutionDir)\..\src\pixmaps\ulist_halfop.png" png_ulist_op "$(SolutionDir)\..\src\pixmaps\ulist_op.png" png_ulist_owner "$(SolutionDir)\..\src\pixmaps\ulist_owner.png" png_ulist_founder "$(SolutionDir)\..\src\pixmaps\ulist_founder.png" png_ulist_netop "$(SolutionDir)\..\src\pixmaps\ulist_netop.png" trayfilepng "$(SolutionDir)\..\src\pixmaps\fileoffer.png" trayhilightpng "$(SolutionDir)\..\src\pixmaps\highlight.png" traymsgpng "$(SolutionDir)\..\src\pixmaps\message.png" channelpng "$(SolutionDir)\..\src\pixmaps\channel.png" dialogpng "$(SolutionDir)\..\src\pixmaps\dialog.png" serverpng "$(SolutionDir)\..\src\pixmaps\server.png" utilpng "$(SolutionDir)\..\src\pixmaps\util.png" png_book "$(SolutionDir)\..\src\pixmaps\book.png" png_hexchat "$(SolutionDir)\..\src\pixmaps\hexchat.png" gtk-win32-2.0.lib;gdk-win32-2.0.lib;atk-1.0.lib;gio-2.0.lib;gdk_pixbuf-2.0.lib;pangowin32-1.0.lib;pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;gobject-2.0.lib;gmodule-2.0.lib;glib-2.0.lib;intl.lib;libxml2.lib;libeay32.lib;ssleay32.lib;wininet.lib;winmm.lib;ws2_32.lib $(SolutionDir)build-xp $(HexChatBuild)\$(PlatformName)\bin\ diff --git a/win32/hexchat.props b/win32/hexchat.props index 4613116e..947db34c 100644 --- a/win32/hexchat.props +++ b/win32/hexchat.props @@ -36,7 +36,7 @@ hcpython $(DepsRoot)\include\glib-2.0;$(DepsRoot)\lib\glib-2.0\include;$(DepsRoot)\include\libxml2 $(DepsRoot)\include\gtk-2.0;$(DepsRoot)\lib\gtk-2.0\include;$(DepsRoot)\include\atk-1.0;$(DepsRoot)\include\cairo;$(DepsRoot)\include\pango-1.0;$(DepsRoot)\include\gdk-pixbuf-2.0 - png_ulist_voice "$(SolutionDir)\..\src\pixmaps\ulist_voice.png" png_ulist_halfop "$(SolutionDir)\..\src\pixmaps\ulist_halfop.png" png_ulist_op "$(SolutionDir)\..\src\pixmaps\ulist_op.png" png_ulist_owner "$(SolutionDir)\..\src\pixmaps\ulist_owner.png" png_ulist_founder "$(SolutionDir)\..\src\pixmaps\ulist_founder.png" png_ulist_netop "$(SolutionDir)\..\src\pixmaps\ulist_netop.png" bookpng "$(SolutionDir)\..\src\pixmaps\book.png" trayfilepng "$(SolutionDir)\..\src\pixmaps\fileoffer.png" trayhilightpng "$(SolutionDir)\..\src\pixmaps\highlight.png" traymsgpng "$(SolutionDir)\..\src\pixmaps\message.png" channelpng "$(SolutionDir)\..\src\pixmaps\channel.png" dialogpng "$(SolutionDir)\..\src\pixmaps\dialog.png" serverpng "$(SolutionDir)\..\src\pixmaps\server.png" utilpng "$(SolutionDir)\..\src\pixmaps\util.png" hexchatpng "$(SolutionDir)\..\hexchat.png" + png_ulist_voice "$(SolutionDir)\..\src\pixmaps\ulist_voice.png" png_ulist_halfop "$(SolutionDir)\..\src\pixmaps\ulist_halfop.png" png_ulist_op "$(SolutionDir)\..\src\pixmaps\ulist_op.png" png_ulist_owner "$(SolutionDir)\..\src\pixmaps\ulist_owner.png" png_ulist_founder "$(SolutionDir)\..\src\pixmaps\ulist_founder.png" png_ulist_netop "$(SolutionDir)\..\src\pixmaps\ulist_netop.png" trayfilepng "$(SolutionDir)\..\src\pixmaps\fileoffer.png" trayhilightpng "$(SolutionDir)\..\src\pixmaps\highlight.png" traymsgpng "$(SolutionDir)\..\src\pixmaps\message.png" channelpng "$(SolutionDir)\..\src\pixmaps\channel.png" dialogpng "$(SolutionDir)\..\src\pixmaps\dialog.png" serverpng "$(SolutionDir)\..\src\pixmaps\server.png" utilpng "$(SolutionDir)\..\src\pixmaps\util.png" png_book "$(SolutionDir)\..\src\pixmaps\book.png" png_hexchat "$(SolutionDir)\..\src\pixmaps\hexchat.png" gtk-win32-2.0.lib;gdk-win32-2.0.lib;atk-1.0.lib;gio-2.0.lib;gdk_pixbuf-2.0.lib;pangowin32-1.0.lib;pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;gobject-2.0.lib;gmodule-2.0.lib;glib-2.0.lib;libintl.lib;libxml2.lib;libeay32.lib;ssleay32.lib;wininet.lib;winmm.lib;ws2_32.lib $(SolutionDir)build $(HexChatBuild)\$(PlatformName)\bin\ diff --git a/win32/installer/installer-xp.vcxproj b/win32/installer/installer-xp.vcxproj index 3870825f..5efac280 100644 --- a/win32/installer/installer-xp.vcxproj +++ b/win32/installer/installer-xp.vcxproj @@ -69,7 +69,7 @@ echo WizardSmallImageFile="$(ProjectDir)\wizardsmallimage.bmp" >> "$(OutDi "$(OutDir)\version" -v >> "$(OutDir)\hexchat-xp-x86.iss" "$(OutDir)\version" -i >> "$(OutDir)\hexchat-xp-x86.iss" "$(OutDir)\version" -o >> "$(OutDir)\hexchat-xp-x86.iss" -echo SetupIconFile="$(SolutionDir)\..\hexchat.ico" >> "$(OutDir)\hexchat-xp-x86.iss" +echo SetupIconFile="$(SolutionDir)\..\share\icons\hexchat.ico" >> "$(OutDir)\hexchat-xp-x86.iss" type hexchat-xp-x86.skel.iss >> "$(OutDir)\hexchat-xp-x86.iss" "$(ProgramFiles)\Inno Setup 5\compil32" /cc "$(OutDir)\hexchat-xp-x86.iss" @@ -93,7 +93,7 @@ echo WizardSmallImageFile="$(ProjectDir)\wizardsmallimage.bmp" >> "$(OutDi "$(OutDir)\version" -v >> "$(OutDir)\hexchat-xp-x64.iss" "$(OutDir)\version" -i >> "$(OutDir)\hexchat-xp-x64.iss" "$(OutDir)\version" -o >> "$(OutDir)\hexchat-xp-x64.iss" -echo SetupIconFile="$(SolutionDir)\..\hexchat.ico" >> "$(OutDir)\hexchat-xp-x64.iss" +echo SetupIconFile="$(SolutionDir)\..\share\icons\hexchat.ico" >> "$(OutDir)\hexchat-xp-x64.iss" type hexchat-xp-x64.skel.iss >> "$(OutDir)\hexchat-xp-x64.iss" "$(ProgramFiles)\Inno Setup 5\compil32" /cc "$(OutDir)\hexchat-xp-x64.iss" diff --git a/win32/installer/installer.vcxproj b/win32/installer/installer.vcxproj index ea707d26..442cc654 100644 --- a/win32/installer/installer.vcxproj +++ b/win32/installer/installer.vcxproj @@ -66,7 +66,7 @@ echo WizardSmallImageFile="$(ProjectDir)\wizardsmallimage.bmp" >> "$(OutDi "$(OutDir)\version" -v >> "$(OutDir)\hexchat-x86.iss" "$(OutDir)\version" -i >> "$(OutDir)\hexchat-x86.iss" "$(OutDir)\version" -o >> "$(OutDir)\hexchat-x86.iss" -echo SetupIconFile="$(SolutionDir)\..\hexchat.ico" >> "$(OutDir)\hexchat-x86.iss" +echo SetupIconFile="$(SolutionDir)\..\share\icons\hexchat.ico" >> "$(OutDir)\hexchat-x86.iss" type hexchat-x86.skel.iss >> "$(OutDir)\hexchat-x86.iss" "$(ProgramFiles)\Inno Setup 5\compil32" /cc "$(OutDir)\hexchat-x86.iss" @@ -90,7 +90,7 @@ echo WizardSmallImageFile="$(ProjectDir)\wizardsmallimage.bmp" >> "$(OutDi "$(OutDir)\version" -v >> "$(OutDir)\hexchat-x64.iss" "$(OutDir)\version" -i >> "$(OutDir)\hexchat-x64.iss" "$(OutDir)\version" -o >> "$(OutDir)\hexchat-x64.iss" -echo SetupIconFile="$(SolutionDir)\..\hexchat.ico" >> "$(OutDir)\hexchat-x64.iss" +echo SetupIconFile="$(SolutionDir)\..\share\icons\hexchat.ico" >> "$(OutDir)\hexchat-x64.iss" type hexchat-x64.skel.iss >> "$(OutDir)\hexchat-x64.iss" "$(ProgramFiles)\Inno Setup 5\compil32" /cc "$(OutDir)\hexchat-x64.iss" diff --git a/win32/spelling/build-spelling.bat b/win32/spelling/build-spelling.bat index db83ef12..1c58574e 100644 --- a/win32/spelling/build-spelling.bat +++ b/win32/spelling/build-spelling.bat @@ -12,8 +12,9 @@ cd .. echo [Setup] > build\spelling\hexchat-spelling.iss echo WizardImageFile=%cd%\installer\wizardimage.bmp >> build\spelling\hexchat-spelling.iss echo WizardSmallImageFile=%cd%\installer\wizardsmallimage.bmp >> build\spelling\hexchat-spelling.iss -cd .. +cd ..\share\icons echo SetupIconFile=%cd%\hexchat.ico >> win32\build\spelling\hexchat-spelling.iss +cd ..\.. type win32\spelling\hexchat-spelling.skel.iss >> win32\build\spelling\hexchat-spelling.iss set PATH=%PROGRAMFILES(X86)%\Inno Setup 5 compil32 /cc win32\build\spelling\hexchat-spelling.iss