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

Varname consolidation for the rest of pixmaps

Browse Source
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
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;