SoniEx2
/
c.sexchat
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Relocate hexchat.png and hexchat.ico and some more varname cleanup

This commit is contained in:
Berke Viktor 2012-11-03 02:33:44 +01:00
parent 259ed9644d
commit c65e16fd00
23 changed files with 47 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.am
View File

@ -2,9 +2,9 @@
SUBDIRS = po intl src plugins man 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 icondir = $(datadir)/pixmaps
util_DATA = share/misc/hexchat.desktop util_DATA = share/misc/hexchat.desktop

0
hexchat.ico → share/icons/hexchat.ico
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 17 KiB

2
src/fe-gtk/about.c
View File

@ -154,7 +154,7 @@ menu_about (GtkWidget * wid, gpointer sess)
gtk_box_pack_start (GTK_BOX (hbox_main), vbox_logo, 0, 0, 10); gtk_box_pack_start (GTK_BOX (hbox_main), vbox_logo, 0, 0, 10);
/* the actual image */ /* 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); gtk_box_pack_start (GTK_BOX (vbox_logo), wid, 0, 0, 10);
/* our close button on the bottom right */ /* our close button on the bottom right */

2
src/fe-gtk/fe-gtk-xp.vcxproj
View File

@ -169,7 +169,7 @@
<ResourceCompile Include="hexchat.rc" /> <ResourceCompile Include="hexchat.rc" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="..\..\hexchat.ico" /> <None Include="..\..\share\icons\hexchat.ico" />
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">

2
src/fe-gtk/fe-gtk-xp.vcxproj.filters
View File

@ -212,7 +212,7 @@
</ResourceCompile> </ResourceCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="..\..\hexchat.ico"> <None Include="..\..\share\icons\hexchat.ico">
<Filter>Resource Files</Filter> <Filter>Resource Files</Filter>
</None> </None>
</ItemGroup> </ItemGroup>

2
src/fe-gtk/fe-gtk.vcxproj
View File

@ -166,7 +166,7 @@
<ResourceCompile Include="hexchat.rc" /> <ResourceCompile Include="hexchat.rc" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="..\..\hexchat.ico" /> <None Include="..\..\share\icons\hexchat.ico" />
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">

2
src/fe-gtk/fe-gtk.vcxproj.filters
View File

@ -212,7 +212,7 @@
</ResourceCompile> </ResourceCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="..\..\hexchat.ico"> <None Include="..\..\share\icons\hexchat.ico">
<Filter>Resource Files</Filter> <Filter>Resource Files</Filter>
</None> </None>
</ItemGroup> </ItemGroup>

2
src/fe-gtk/gtkutil.c
View File

@ -820,7 +820,7 @@ show_and_unfocus (GtkWidget * wid)
void void
gtkutil_set_icon (GtkWidget *win) 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 */ extern GtkWidget *parent_window; /* maingui.c */

2
src/fe-gtk/hexchat.rc
View File

@ -2,7 +2,7 @@
#include "../../config-win32.h" #include "../../config-win32.h"
#include "../../resource.h" #include "../../resource.h"
XC_ICON ICON "../../hexchat.ico" XC_ICON ICON "../../share/icons/hexchat.ico"
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION COMMA_VERSION FILEVERSION COMMA_VERSION

16
src/fe-gtk/pixmaps.c
View File

@ -31,9 +31,6 @@
#include "../pixmaps/inline_pngs.h" #include "../pixmaps/inline_pngs.h"
GdkPixbuf *pix_xchat;
GdkPixbuf *pix_book;
GdkPixbuf *pix_ulist_voice; GdkPixbuf *pix_ulist_voice;
GdkPixbuf *pix_ulist_halfop; GdkPixbuf *pix_ulist_halfop;
GdkPixbuf *pix_ulist_op; GdkPixbuf *pix_ulist_op;
@ -41,7 +38,6 @@ GdkPixbuf *pix_ulist_owner;
GdkPixbuf *pix_ulist_founder; GdkPixbuf *pix_ulist_founder;
GdkPixbuf *pix_ulist_netop; GdkPixbuf *pix_ulist_netop;
GdkPixbuf *pix_tray_msg; GdkPixbuf *pix_tray_msg;
GdkPixbuf *pix_tray_hilight; GdkPixbuf *pix_tray_hilight;
GdkPixbuf *pix_tray_file; GdkPixbuf *pix_tray_file;
@ -51,6 +47,8 @@ GdkPixbuf *pix_dialog;
GdkPixbuf *pix_server; GdkPixbuf *pix_server;
GdkPixbuf *pix_util; GdkPixbuf *pix_util;
GdkPixbuf *pix_book;
GdkPixbuf *pix_hexchat;
static GdkPixmap * static GdkPixmap *
pixmap_load_from_file_real (char *file) pixmap_load_from_file_real (char *file)
@ -122,11 +120,6 @@ load_pixmap (const char *filename, const char *name, int has_inline)
void void
pixmaps_init (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 */ /* userlist icons, with inlined defaults */
pix_ulist_voice = load_pixmap ("ulist_voice", png_ulist_voice, 1); pix_ulist_voice = load_pixmap ("ulist_voice", png_ulist_voice, 1);
pix_ulist_halfop = load_pixmap ("ulist_halfop", png_ulist_halfop, 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_dialog = load_pixmap ("dialog", dialogpng, 1);
pix_server = load_pixmap ("server", serverpng, 1); pix_server = load_pixmap ("server", serverpng, 1);
pix_util = load_pixmap ("util", utilpng, 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);
} }

6
src/fe-gtk/pixmaps.h
View File

@ -5,9 +5,6 @@ extern GdkPixbuf *pix_ulist_owner;
extern GdkPixbuf *pix_ulist_founder; extern GdkPixbuf *pix_ulist_founder;
extern GdkPixbuf *pix_ulist_netop; extern GdkPixbuf *pix_ulist_netop;
extern GdkPixbuf *pix_book;
extern GdkPixbuf *pix_xchat;
extern GdkPixbuf *pix_tray_msg; extern GdkPixbuf *pix_tray_msg;
extern GdkPixbuf *pix_tray_hilight; extern GdkPixbuf *pix_tray_hilight;
extern GdkPixbuf *pix_tray_file; extern GdkPixbuf *pix_tray_file;
@ -17,5 +14,8 @@ extern GdkPixbuf *pix_dialog;
extern GdkPixbuf *pix_server; extern GdkPixbuf *pix_server;
extern GdkPixbuf *pix_util; extern GdkPixbuf *pix_util;
extern GdkPixbuf *pix_book;
extern GdkPixbuf *pix_hexchat;
extern GdkPixmap *pixmap_load_from_file (char *file); extern GdkPixmap *pixmap_load_from_file (char *file);
extern void pixmaps_init (void); extern void pixmaps_init (void);

2
src/fe-gtk/plugin-tray.c
View File

@ -51,7 +51,7 @@ typedef GdkPixbuf* TrayIcon;
#define tray_icon_from_file(f) gdk_pixbuf_new_from_file(f,NULL) #define tray_icon_from_file(f) gdk_pixbuf_new_from_file(f,NULL)
#define tray_icon_free(i) g_object_unref(i) #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_MSG pix_tray_msg
#define ICON_HILIGHT pix_tray_hilight #define ICON_HILIGHT pix_tray_hilight
#define ICON_FILE pix_tray_file #define ICON_FILE pix_tray_file

6
src/pixmaps/Makefile.am
View File

@ -9,14 +9,14 @@ LIST = png_ulist_voice $(srcdir)/ulist_voice.png \
traymsgpng $(srcdir)/message.png \ traymsgpng $(srcdir)/message.png \
trayhilightpng $(srcdir)/highlight.png \ trayhilightpng $(srcdir)/highlight.png \
trayfilepng $(srcdir)/fileoffer.png \ trayfilepng $(srcdir)/fileoffer.png \
bookpng $(srcdir)/book.png \
channelpng $(srcdir)/channel.png \ channelpng $(srcdir)/channel.png \
dialogpng $(srcdir)/dialog.png \ dialogpng $(srcdir)/dialog.png \
serverpng $(srcdir)/server.png \ serverpng $(srcdir)/server.png \
utilpng $(srcdir)/util.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 noinst_HEADERS = inline_pngs.h
CLEANFILES = $(noinst_HEADERS) CLEANFILES = $(noinst_HEADERS)
EXTRA_DIST = $(PNGS) EXTRA_DIST = $(PNGS)

0
hexchat.png → src/pixmaps/hexchat.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 3.1 KiB

4
src/pixmaps/pixmaps-xp.vcxproj
View File

@ -98,8 +98,6 @@
<None Include="ulist_owner.png" /> <None Include="ulist_owner.png" />
<None Include="ulist_founder.png" /> <None Include="ulist_founder.png" />
<None Include="ulist_netop.png" /> <None Include="ulist_netop.png" />
<None Include="..\..\hexchat.png" />
<None Include="book.png" />
<None Include="channel.png" /> <None Include="channel.png" />
<None Include="dialog.png" /> <None Include="dialog.png" />
<None Include="fileoffer.png" /> <None Include="fileoffer.png" />
@ -107,6 +105,8 @@
<None Include="message.png" /> <None Include="message.png" />
<None Include="server.png" /> <None Include="server.png" />
<None Include="util.png" /> <None Include="util.png" />
<None Include="book.png" />
<None Include="hexchat.png" />
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">

12
src/pixmaps/pixmaps-xp.vcxproj.filters
View File

@ -25,9 +25,6 @@
<None Include="ulist_netop.png"> <None Include="ulist_netop.png">
<Filter>Resource Files</Filter> <Filter>Resource Files</Filter>
</None> </None>
<None Include="book.png">
<Filter>Resource Files</Filter>
</None>
<None Include="fileoffer.png"> <None Include="fileoffer.png">
<Filter>Resource Files</Filter> <Filter>Resource Files</Filter>
</None> </None>
@ -37,9 +34,6 @@
<None Include="message.png"> <None Include="message.png">
<Filter>Resource Files</Filter> <Filter>Resource Files</Filter>
</None> </None>
<None Include="..\..\hexchat.png">
<Filter>Resource Files</Filter>
</None>
<None Include="channel.png"> <None Include="channel.png">
<Filter>Resource Files</Filter> <Filter>Resource Files</Filter>
</None> </None>
@ -52,5 +46,11 @@
<None Include="util.png"> <None Include="util.png">
<Filter>Resource Files</Filter> <Filter>Resource Files</Filter>
</None> </None>
<None Include="book.png">
<Filter>Resource Files</Filter>
</None>
<None Include="hexchat.png">
<Filter>Resource Files</Filter>
</None>
</ItemGroup> </ItemGroup>
</Project> </Project>

4
src/pixmaps/pixmaps.vcxproj
View File

@ -95,8 +95,6 @@
<None Include="ulist_owner.png" /> <None Include="ulist_owner.png" />
<None Include="ulist_founder.png" /> <None Include="ulist_founder.png" />
<None Include="ulist_netop.png" /> <None Include="ulist_netop.png" />
<None Include="..\..\hexchat.png" />
<None Include="book.png" />
<None Include="channel.png" /> <None Include="channel.png" />
<None Include="dialog.png" /> <None Include="dialog.png" />
<None Include="fileoffer.png" /> <None Include="fileoffer.png" />
@ -104,6 +102,8 @@
<None Include="message.png" /> <None Include="message.png" />
<None Include="server.png" /> <None Include="server.png" />
<None Include="util.png" /> <None Include="util.png" />
<None Include="book.png" />
<None Include="hexchat.png" />
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">

12
src/pixmaps/pixmaps.vcxproj.filters
View File

@ -25,9 +25,6 @@
<None Include="ulist_netop.png"> <None Include="ulist_netop.png">
<Filter>Resource Files</Filter> <Filter>Resource Files</Filter>
</None> </None>
<None Include="book.png">
<Filter>Resource Files</Filter>
</None>
<None Include="fileoffer.png"> <None Include="fileoffer.png">
<Filter>Resource Files</Filter> <Filter>Resource Files</Filter>
</None> </None>
@ -37,9 +34,6 @@
<None Include="message.png"> <None Include="message.png">
<Filter>Resource Files</Filter> <Filter>Resource Files</Filter>
</None> </None>
<None Include="..\..\hexchat.png">
<Filter>Resource Files</Filter>
</None>
<None Include="channel.png"> <None Include="channel.png">
<Filter>Resource Files</Filter> <Filter>Resource Files</Filter>
</None> </None>
@ -52,5 +46,11 @@
<None Include="util.png"> <None Include="util.png">
<Filter>Resource Files</Filter> <Filter>Resource Files</Filter>
</None> </None>
<None Include="book.png">
<Filter>Resource Files</Filter>
</None>
<None Include="hexchat.png">
<Filter>Resource Files</Filter>
</None>
</ItemGroup> </ItemGroup>
</Project> </Project>

2
win32/hexchat-xp.props
View File

@ -34,7 +34,7 @@
<PythonOutput>hcpython</PythonOutput> <PythonOutput>hcpython</PythonOutput>
<Glib>$(DepsRoot)\include\glib-2.0;$(DepsRoot)\lib\glib-2.0\include;$(DepsRoot)\include\libxml2</Glib> <Glib>$(DepsRoot)\include\glib-2.0;$(DepsRoot)\lib\glib-2.0\include;$(DepsRoot)\include\libxml2</Glib>
<Gtk>$(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</Gtk> <Gtk>$(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</Gtk>
<Pixmaps>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"</Pixmaps> <Pixmaps>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"</Pixmaps>
<DepLibs>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</DepLibs> <DepLibs>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</DepLibs>
<HexChatBuild>$(SolutionDir)build-xp</HexChatBuild> <HexChatBuild>$(SolutionDir)build-xp</HexChatBuild>
<HexChatBin>$(HexChatBuild)\$(PlatformName)\bin\</HexChatBin> <HexChatBin>$(HexChatBuild)\$(PlatformName)\bin\</HexChatBin>

2
win32/hexchat.props
View File

@ -36,7 +36,7 @@
<PythonOutput>hcpython</PythonOutput> <PythonOutput>hcpython</PythonOutput>
<Glib>$(DepsRoot)\include\glib-2.0;$(DepsRoot)\lib\glib-2.0\include;$(DepsRoot)\include\libxml2</Glib> <Glib>$(DepsRoot)\include\glib-2.0;$(DepsRoot)\lib\glib-2.0\include;$(DepsRoot)\include\libxml2</Glib>
<Gtk>$(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</Gtk> <Gtk>$(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</Gtk>
<Pixmaps>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"</Pixmaps> <Pixmaps>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"</Pixmaps>
<DepLibs>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</DepLibs> <DepLibs>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</DepLibs>
<HexChatBuild>$(SolutionDir)build</HexChatBuild> <HexChatBuild>$(SolutionDir)build</HexChatBuild>
<HexChatBin>$(HexChatBuild)\$(PlatformName)\bin\</HexChatBin> <HexChatBin>$(HexChatBuild)\$(PlatformName)\bin\</HexChatBin>

4
win32/installer/installer-xp.vcxproj
View File

@ -69,7 +69,7 @@ echo WizardSmallImageFile="$(ProjectDir)\wizardsmallimage.bmp" &gt;&gt; "$(OutDi
"$(OutDir)\version" -v &gt;&gt; "$(OutDir)\hexchat-xp-x86.iss" "$(OutDir)\version" -v &gt;&gt; "$(OutDir)\hexchat-xp-x86.iss"
"$(OutDir)\version" -i &gt;&gt; "$(OutDir)\hexchat-xp-x86.iss" "$(OutDir)\version" -i &gt;&gt; "$(OutDir)\hexchat-xp-x86.iss"
"$(OutDir)\version" -o &gt;&gt; "$(OutDir)\hexchat-xp-x86.iss" "$(OutDir)\version" -o &gt;&gt; "$(OutDir)\hexchat-xp-x86.iss"
echo SetupIconFile="$(SolutionDir)\..\hexchat.ico" &gt;&gt; "$(OutDir)\hexchat-xp-x86.iss" echo SetupIconFile="$(SolutionDir)\..\share\icons\hexchat.ico" &gt;&gt; "$(OutDir)\hexchat-xp-x86.iss"
type hexchat-xp-x86.skel.iss &gt;&gt; "$(OutDir)\hexchat-xp-x86.iss" type hexchat-xp-x86.skel.iss &gt;&gt; "$(OutDir)\hexchat-xp-x86.iss"
"$(ProgramFiles)\Inno Setup 5\compil32" /cc "$(OutDir)\hexchat-xp-x86.iss"</Command> "$(ProgramFiles)\Inno Setup 5\compil32" /cc "$(OutDir)\hexchat-xp-x86.iss"</Command>
</PreBuildEvent> </PreBuildEvent>
@ -93,7 +93,7 @@ echo WizardSmallImageFile="$(ProjectDir)\wizardsmallimage.bmp" &gt;&gt; "$(OutDi
"$(OutDir)\version" -v &gt;&gt; "$(OutDir)\hexchat-xp-x64.iss" "$(OutDir)\version" -v &gt;&gt; "$(OutDir)\hexchat-xp-x64.iss"
"$(OutDir)\version" -i &gt;&gt; "$(OutDir)\hexchat-xp-x64.iss" "$(OutDir)\version" -i &gt;&gt; "$(OutDir)\hexchat-xp-x64.iss"
"$(OutDir)\version" -o &gt;&gt; "$(OutDir)\hexchat-xp-x64.iss" "$(OutDir)\version" -o &gt;&gt; "$(OutDir)\hexchat-xp-x64.iss"
echo SetupIconFile="$(SolutionDir)\..\hexchat.ico" &gt;&gt; "$(OutDir)\hexchat-xp-x64.iss" echo SetupIconFile="$(SolutionDir)\..\share\icons\hexchat.ico" &gt;&gt; "$(OutDir)\hexchat-xp-x64.iss"
type hexchat-xp-x64.skel.iss &gt;&gt; "$(OutDir)\hexchat-xp-x64.iss" type hexchat-xp-x64.skel.iss &gt;&gt; "$(OutDir)\hexchat-xp-x64.iss"
"$(ProgramFiles)\Inno Setup 5\compil32" /cc "$(OutDir)\hexchat-xp-x64.iss"</Command> "$(ProgramFiles)\Inno Setup 5\compil32" /cc "$(OutDir)\hexchat-xp-x64.iss"</Command>
</PreBuildEvent> </PreBuildEvent>

4
win32/installer/installer.vcxproj
View File

@ -66,7 +66,7 @@ echo WizardSmallImageFile="$(ProjectDir)\wizardsmallimage.bmp" &gt;&gt; "$(OutDi
"$(OutDir)\version" -v &gt;&gt; "$(OutDir)\hexchat-x86.iss" "$(OutDir)\version" -v &gt;&gt; "$(OutDir)\hexchat-x86.iss"
"$(OutDir)\version" -i &gt;&gt; "$(OutDir)\hexchat-x86.iss" "$(OutDir)\version" -i &gt;&gt; "$(OutDir)\hexchat-x86.iss"
"$(OutDir)\version" -o &gt;&gt; "$(OutDir)\hexchat-x86.iss" "$(OutDir)\version" -o &gt;&gt; "$(OutDir)\hexchat-x86.iss"
echo SetupIconFile="$(SolutionDir)\..\hexchat.ico" &gt;&gt; "$(OutDir)\hexchat-x86.iss" echo SetupIconFile="$(SolutionDir)\..\share\icons\hexchat.ico" &gt;&gt; "$(OutDir)\hexchat-x86.iss"
type hexchat-x86.skel.iss &gt;&gt; "$(OutDir)\hexchat-x86.iss" type hexchat-x86.skel.iss &gt;&gt; "$(OutDir)\hexchat-x86.iss"
"$(ProgramFiles)\Inno Setup 5\compil32" /cc "$(OutDir)\hexchat-x86.iss"</Command> "$(ProgramFiles)\Inno Setup 5\compil32" /cc "$(OutDir)\hexchat-x86.iss"</Command>
</PreBuildEvent> </PreBuildEvent>
@ -90,7 +90,7 @@ echo WizardSmallImageFile="$(ProjectDir)\wizardsmallimage.bmp" &gt;&gt; "$(OutDi
"$(OutDir)\version" -v &gt;&gt; "$(OutDir)\hexchat-x64.iss" "$(OutDir)\version" -v &gt;&gt; "$(OutDir)\hexchat-x64.iss"
"$(OutDir)\version" -i &gt;&gt; "$(OutDir)\hexchat-x64.iss" "$(OutDir)\version" -i &gt;&gt; "$(OutDir)\hexchat-x64.iss"
"$(OutDir)\version" -o &gt;&gt; "$(OutDir)\hexchat-x64.iss" "$(OutDir)\version" -o &gt;&gt; "$(OutDir)\hexchat-x64.iss"
echo SetupIconFile="$(SolutionDir)\..\hexchat.ico" &gt;&gt; "$(OutDir)\hexchat-x64.iss" echo SetupIconFile="$(SolutionDir)\..\share\icons\hexchat.ico" &gt;&gt; "$(OutDir)\hexchat-x64.iss"
type hexchat-x64.skel.iss &gt;&gt; "$(OutDir)\hexchat-x64.iss" type hexchat-x64.skel.iss &gt;&gt; "$(OutDir)\hexchat-x64.iss"
"$(ProgramFiles)\Inno Setup 5\compil32" /cc "$(OutDir)\hexchat-x64.iss"</Command> "$(ProgramFiles)\Inno Setup 5\compil32" /cc "$(OutDir)\hexchat-x64.iss"</Command>
</PreBuildEvent> </PreBuildEvent>

3
win32/spelling/build-spelling.bat
View File

@ -12,8 +12,9 @@ cd ..
echo [Setup] > build\spelling\hexchat-spelling.iss echo [Setup] > build\spelling\hexchat-spelling.iss
echo WizardImageFile=%cd%\installer\wizardimage.bmp >> 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 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 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 type win32\spelling\hexchat-spelling.skel.iss >> win32\build\spelling\hexchat-spelling.iss
set PATH=%PROGRAMFILES(X86)%\Inno Setup 5 set PATH=%PROGRAMFILES(X86)%\Inno Setup 5
compil32 /cc win32\build\spelling\hexchat-spelling.iss compil32 /cc win32\build\spelling\hexchat-spelling.iss