deepend/zoitechat
1
0
Fork 0
mirror of https://github.com/ZoiteChat/zoitechat.git synced 2026-03-11 08:20:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

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);
/* 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 */

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

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

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

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

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

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

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

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

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

@@ -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 */

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

@@ -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

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

@@ -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);
}

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_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);

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_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

6
src/pixmaps/Makefile.am
View File

@@ -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)

BIN
src/pixmaps/hexchat.png Normal file
View File

Binary file not shown.
Side by Side

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

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

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

4
src/pixmaps/pixmaps.vcxproj
View File

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

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

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