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

Varname consolidation for the rest of pixmaps

This commit is contained in:
Berke Viktor 2012-11-03 02:57:24 +01:00
parent c65e16fd00
commit 98ef77406d
18 changed files with 73 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/fe-gtk/maingui.c
View File

@ -1737,13 +1737,13 @@ mg_add_chan (session *sess)
switch (sess->type)
{
case SESS_CHANNEL:
icon = pix_channel;
icon = pix_tree_channel;
break;
case SESS_SERVER:
icon = pix_server;
icon = pix_tree_server;
break;
default:
icon = pix_dialog;
icon = pix_tree_dialog;
}
sess->res->tab = chanview_add (sess->gui->chanview, name, sess->server, sess,
@ -2923,7 +2923,7 @@ mg_create_tabs (session_gui *gui)
/* if any one of these PNGs exist, the chanview will create
* the extra column for icons. */
if (prefs.hex_gui_tab_icons && (pix_channel || pix_dialog || pix_server || pix_util))
if (prefs.hex_gui_tab_icons && (pix_tree_channel || pix_tree_dialog || pix_tree_server || pix_tree_util))
{
use_icons = TRUE;
}
@ -3187,7 +3187,7 @@ mg_add_generic_tab (char *name, char *title, void *family, GtkWidget *box)
gtk_notebook_append_page (GTK_NOTEBOOK (mg_gui->note_book), box, NULL);
gtk_widget_show (box);
ch = chanview_add (mg_gui->chanview, name, NULL, box, TRUE, TAG_UTIL, pix_util);
ch = chanview_add (mg_gui->chanview, name, NULL, box, TRUE, TAG_UTIL, pix_tree_util);
chan_set_color (ch, plain_list);
/* FIXME: memory leak */
g_object_set_data (G_OBJECT (box), "title", strdup (title));

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

@ -38,14 +38,14 @@ GdkPixbuf *pix_ulist_owner;
GdkPixbuf *pix_ulist_founder;
GdkPixbuf *pix_ulist_netop;
GdkPixbuf *pix_tray_msg;
GdkPixbuf *pix_tray_hilight;
GdkPixbuf *pix_tray_file;
GdkPixbuf *pix_tray_fileoffer;
GdkPixbuf *pix_tray_highlight;
GdkPixbuf *pix_tray_message;
GdkPixbuf *pix_channel;
GdkPixbuf *pix_dialog;
GdkPixbuf *pix_server;
GdkPixbuf *pix_util;
GdkPixbuf *pix_tree_channel;
GdkPixbuf *pix_tree_dialog;
GdkPixbuf *pix_tree_server;
GdkPixbuf *pix_tree_util;
GdkPixbuf *pix_book;
GdkPixbuf *pix_hexchat;
@ -129,22 +129,22 @@ pixmaps_init (void)
pix_ulist_netop = load_pixmap ("ulist_netop", png_ulist_netop, 1);
/* tray icons, with inlined defaults */
pix_tray_msg = load_pixmap ("message", traymsgpng, 1);
pix_tray_hilight = load_pixmap ("highlight", trayhilightpng, 1);
pix_tray_file = load_pixmap ("fileoffer", trayfilepng, 1);
pix_tray_fileoffer = load_pixmap ("tray_fileoffer", png_tray_fileoffer, 1);
pix_tray_highlight = load_pixmap ("highlight", png_tray_highlight, 1);
pix_tray_message = load_pixmap ("message", png_tray_message, 1);
#if 0
/* treeview icons, no defaults, load from disk only */
pix_channel = load_pixmap ("channel", NULL, 0);
pix_dialog = load_pixmap ("dialog", NULL, 0);
pix_server = load_pixmap ("server", NULL, 0);
pix_util = load_pixmap ("util", NULL, 0);
pix_tree_channel = load_pixmap ("tree_channel", NULL, 0);
pix_tree_dialog = load_pixmap ("tree_dialog", NULL, 0);
pix_tree_server = load_pixmap ("tree_server", NULL, 0);
pix_tree_util = load_pixmap ("tree_util", NULL, 0);
#endif
/* provide inline defaults for these coz they are nice! */
pix_channel = load_pixmap ("channel", channelpng, 1);
pix_dialog = load_pixmap ("dialog", dialogpng, 1);
pix_server = load_pixmap ("server", serverpng, 1);
pix_util = load_pixmap ("util", utilpng, 1);
pix_tree_channel = load_pixmap ("tree_channel", png_tree_channel, 1);
pix_tree_dialog = load_pixmap ("tree_dialog", png_tree_dialog, 1);
pix_tree_server = load_pixmap ("tree_server", png_tree_server, 1);
pix_tree_util = load_pixmap ("tree_util", png_tree_util, 1);
/* non-replaceable book pixmap */
pix_book = gdk_pixbuf_new_from_inline (-1, png_book, FALSE, 0);

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

@ -5,14 +5,14 @@ extern GdkPixbuf *pix_ulist_owner;
extern GdkPixbuf *pix_ulist_founder;
extern GdkPixbuf *pix_ulist_netop;
extern GdkPixbuf *pix_tray_msg;
extern GdkPixbuf *pix_tray_hilight;
extern GdkPixbuf *pix_tray_file;
extern GdkPixbuf *pix_tray_fileoffer;
extern GdkPixbuf *pix_tray_highlight;
extern GdkPixbuf *pix_tray_message;
extern GdkPixbuf *pix_channel;
extern GdkPixbuf *pix_dialog;
extern GdkPixbuf *pix_server;
extern GdkPixbuf *pix_util;
extern GdkPixbuf *pix_tree_channel;
extern GdkPixbuf *pix_tree_dialog;
extern GdkPixbuf *pix_tree_server;
extern GdkPixbuf *pix_tree_util;
extern GdkPixbuf *pix_book;
extern GdkPixbuf *pix_hexchat;

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

@ -52,9 +52,9 @@ typedef GdkPixbuf* TrayIcon;
#define tray_icon_free(i) g_object_unref(i)
#define ICON_NORMAL pix_hexchat
#define ICON_MSG pix_tray_msg
#define ICON_HILIGHT pix_tray_hilight
#define ICON_FILE pix_tray_file
#define ICON_MSG pix_tray_message
#define ICON_HILIGHT pix_tray_highlight
#define ICON_FILE pix_tray_fileoffer
#define TIMEOUT 500
static GtkStatusIcon *sticon;

16
src/pixmaps/Makefile.am
View File

@ -6,17 +6,17 @@ LIST = png_ulist_voice $(srcdir)/ulist_voice.png \
png_ulist_owner $(srcdir)/ulist_owner.png \
png_ulist_founder $(srcdir)/ulist_founder.png \
png_ulist_netop $(srcdir)/ulist_netop.png \
traymsgpng $(srcdir)/message.png \
trayhilightpng $(srcdir)/highlight.png \
trayfilepng $(srcdir)/fileoffer.png \
channelpng $(srcdir)/channel.png \
dialogpng $(srcdir)/dialog.png \
serverpng $(srcdir)/server.png \
utilpng $(srcdir)/util.png \
png_tray_fileoffer $(srcdir)/tray_fileoffer.png \
png_tray_highlight $(srcdir)/tray_highlight.png \
png_tray_message $(srcdir)/tray_message.png \
png_tree_channel $(srcdir)/tree_channel.png \
png_tree_dialog $(srcdir)/tree_dialog.png \
png_tree_server $(srcdir)/tree_server.png \
png_tree_util $(srcdir)/tree_util.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 channel.png dialog.png server.png util.png book.png
PNGS = ulist_voice.png ulist_halfop.png ulist_op.png ulist_owner.png ulist_founder.png ulist_netop.png tray_fileoffer.png tray_highlight.png tray_message.png tree_channel.png tree_dialog.png tree_server.png tree_util.png book.png
noinst_HEADERS = inline_pngs.h
CLEANFILES = $(noinst_HEADERS)
EXTRA_DIST = $(PNGS)

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

@ -92,19 +92,19 @@
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
<None Include="user_voice.png" />
<None Include="ulist_voice.png" />
<None Include="ulist_halfop.png" />
<None Include="ulist_op.png" />
<None Include="ulist_owner.png" />
<None Include="ulist_founder.png" />
<None Include="ulist_netop.png" />
<None Include="channel.png" />
<None Include="dialog.png" />
<None Include="fileoffer.png" />
<None Include="highlight.png" />
<None Include="message.png" />
<None Include="server.png" />
<None Include="util.png" />
<None Include="tray_fileoffer.png" />
<None Include="tray_highlight.png" />
<None Include="tray_message.png" />
<None Include="tree_channel.png" />
<None Include="tree_dialog.png" />
<None Include="tree_server.png" />
<None Include="tree_util.png" />
<None Include="book.png" />
<None Include="hexchat.png" />
</ItemGroup>

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

@ -25,25 +25,25 @@
<None Include="ulist_netop.png">
<Filter>Resource Files</Filter>
</None>
<None Include="fileoffer.png">
<None Include="tray_fileoffer.png">
<Filter>Resource Files</Filter>
</None>
<None Include="highlight.png">
<None Include="tray_highlight.png">
<Filter>Resource Files</Filter>
</None>
<None Include="message.png">
<None Include="tray_message.png">
<Filter>Resource Files</Filter>
</None>
<None Include="channel.png">
<None Include="tree_channel.png">
<Filter>Resource Files</Filter>
</None>
<None Include="dialog.png">
<None Include="tree_dialog.png">
<Filter>Resource Files</Filter>
</None>
<None Include="server.png">
<None Include="tree_server.png">
<Filter>Resource Files</Filter>
</None>
<None Include="util.png">
<None Include="tree_util.png">
<Filter>Resource Files</Filter>
</None>
<None Include="book.png">

16
src/pixmaps/pixmaps.vcxproj
View File

@ -89,19 +89,19 @@
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
<None Include="user_voice.png" />
<None Include="ulist_voice.png" />
<None Include="ulist_halfop.png" />
<None Include="ulist_op.png" />
<None Include="ulist_owner.png" />
<None Include="ulist_founder.png" />
<None Include="ulist_netop.png" />
<None Include="channel.png" />
<None Include="dialog.png" />
<None Include="fileoffer.png" />
<None Include="highlight.png" />
<None Include="message.png" />
<None Include="server.png" />
<None Include="util.png" />
<None Include="tray_fileoffer.png" />
<None Include="tray_highlight.png" />
<None Include="tray_message.png" />
<None Include="tree_channel.png" />
<None Include="tree_dialog.png" />
<None Include="tree_server.png" />
<None Include="tree_util.png" />
<None Include="book.png" />
<None Include="hexchat.png" />
</ItemGroup>

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

@ -25,25 +25,25 @@
<None Include="ulist_netop.png">
<Filter>Resource Files</Filter>
</None>
<None Include="fileoffer.png">
<None Include="tray_fileoffer.png">
<Filter>Resource Files</Filter>
</None>
<None Include="highlight.png">
<None Include="tray_highlight.png">
<Filter>Resource Files</Filter>
</None>
<None Include="message.png">
<None Include="tray_message.png">
<Filter>Resource Files</Filter>
</None>
<None Include="channel.png">
<None Include="tree_channel.png">
<Filter>Resource Files</Filter>
</None>
<None Include="dialog.png">
<None Include="tree_dialog.png">
<Filter>Resource Files</Filter>
</None>
<None Include="server.png">
<None Include="tree_server.png">
<Filter>Resource Files</Filter>
</None>
<None Include="util.png">
<None Include="tree_util.png">
<Filter>Resource Files</Filter>
</None>
<None Include="book.png">

0
src/pixmaps/fileoffer.png → src/pixmaps/tray_fileoffer.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.0 KiB

After

Width:  |  Height:  |  Size: 5.0 KiB

0
src/pixmaps/highlight.png → src/pixmaps/tray_highlight.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.7 KiB

After

Width:  |  Height:  |  Size: 4.7 KiB

0
src/pixmaps/message.png → src/pixmaps/tray_message.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.6 KiB

After

Width:  |  Height:  |  Size: 4.6 KiB

0
src/pixmaps/channel.png → src/pixmaps/tree_channel.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 422 B

After

Width:  |  Height:  |  Size: 422 B

0
src/pixmaps/dialog.png → src/pixmaps/tree_dialog.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 911 B

After

Width:  |  Height:  |  Size: 911 B

0
src/pixmaps/server.png → src/pixmaps/tree_server.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 568 B

After

Width:  |  Height:  |  Size: 568 B

0
src/pixmaps/util.png → src/pixmaps/tree_util.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 611 B

After

Width:  |  Height:  |  Size: 611 B

2
win32/hexchat-xp.props
View File

@ -34,7 +34,7 @@
<PythonOutput>hcpython</PythonOutput>
<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>
<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>
<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" png_tray_fileoffer "$(SolutionDir)\..\src\pixmaps\tray_fileoffer.png" png_tray_highlight "$(SolutionDir)\..\src\pixmaps\tray_highlight.png" png_tray_message "$(SolutionDir)\..\src\pixmaps\tray_message.png" png_tree_channel "$(SolutionDir)\..\src\pixmaps\tree_channel.png" png_tree_dialog "$(SolutionDir)\..\src\pixmaps\tree_dialog.png" png_tree_server "$(SolutionDir)\..\src\pixmaps\tree_server.png" png_tree_util "$(SolutionDir)\..\src\pixmaps\tree_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>
<HexChatBuild>$(SolutionDir)build-xp</HexChatBuild>
<HexChatBin>$(HexChatBuild)\$(PlatformName)\bin\</HexChatBin>

2
win32/hexchat.props
View File

@ -36,7 +36,7 @@
<PythonOutput>hcpython</PythonOutput>
<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>
<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>
<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" png_tray_fileoffer "$(SolutionDir)\..\src\pixmaps\tray_fileoffer.png" png_tray_highlight "$(SolutionDir)\..\src\pixmaps\tray_highlight.png" png_tray_message "$(SolutionDir)\..\src\pixmaps\tray_message.png" png_tree_channel "$(SolutionDir)\..\src\pixmaps\tree_channel.png" png_tree_dialog "$(SolutionDir)\..\src\pixmaps\tree_dialog.png" png_tree_server "$(SolutionDir)\..\src\pixmaps\tree_server.png" png_tree_util "$(SolutionDir)\..\src\pixmaps\tree_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>
<HexChatBuild>$(SolutionDir)build</HexChatBuild>
<HexChatBin>$(HexChatBuild)\$(PlatformName)\bin\</HexChatBin>