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

add wdk changes to named branch

Browse Source
This commit is contained in:
berkeviktor@aol.com
2011-02-28 18:59:32 +01:00
parent ad7ea4b77e
commit d03d6e606b
152 changed files with 32939 additions and 529 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,14 +1,14 @@
/* Copyright (C) 2006-2007 Peter Zelezny. */
#include <string.h>
#include <unistd.h>
#include "../common/xchat-plugin.h"
#include "../../plugins/xchat-plugin.h"
#include "../common/xchat.h"
#include "../common/xchatc.h"
#include "../common/inbound.h"
#include "../common/server.h"
#include "../common/fe.h"
#include "../common/util.h"
#include "../common/wdkutil.h"
#include "fe-gtk.h"
#include "pixmaps.h"
#include "maingui.h"
@@ -297,10 +297,10 @@ tray_stop_flash (void)
nets = tray_count_networks ();
chans = tray_count_channels ();
if (nets)
tray_set_tipf (_("XChat: Connected to %u networks and %u channels"),
tray_set_tipf (_("XChat-WDK: Connected to %u networks and %u channels"),
nets, chans);
else
tray_set_tipf ("XChat: %s", _("Not connected."));
tray_set_tipf ("XChat-WDK: %s", _("Not connected."));
}
if (custom_icon1)
@@ -450,7 +450,7 @@ tray_toggle_visibility (gboolean force_hide)
/* ph may have an invalid context now */
xchat_set_context (ph, xchat_find_context (ph, NULL, NULL));
win = (GtkWindow *)xchat_get_info (ph, "win_ptr");
win = xchat_get_info (ph, "gtkwin_ptr");
tray_stop_flash ();
tray_reset_counts ();
@@ -585,11 +585,12 @@ tray_menu_cb (GtkWidget *widget, guint button, guint time, gpointer userdata)
/*gtk_menu_set_screen (GTK_MENU (menu), gtk_widget_get_screen (widget));*/
if (tray_get_window_status () == WS_HIDDEN)
tray_make_item (menu, _("_Restore"), tray_menu_restore_cb, NULL);
tray_make_item (menu, _("_Restore Window"), tray_menu_restore_cb, NULL);
else
tray_make_item (menu, _("_Hide"), tray_menu_restore_cb, NULL);
tray_make_item (menu, _("_Hide Window"), tray_menu_restore_cb, NULL);
tray_make_item (menu, NULL, tray_menu_quit_cb, NULL);
#if 0
submenu = mg_submenu (menu, _("_Blink on"));
blink_item (&prefs.input_tray_chans, submenu, _("Channel Message"));
blink_item (&prefs.input_tray_priv, submenu, _("Private Message"));
@@ -606,6 +607,7 @@ tray_menu_cb (GtkWidget *widget, guint button, guint time, gpointer userdata)
gtk_widget_set_sensitive (item, FALSE);
tray_make_item (menu, NULL, tray_menu_quit_cb, NULL);
#endif
mg_create_icon_item (_("_Quit"), GTK_STOCK_QUIT, menu, tray_menu_quit_cb, NULL);
menu_add_plugin_items (menu, "\x5$TRAY", NULL);
@@ -631,8 +633,8 @@ tray_init (void)
sticon = gtk_status_icon_new_from_pixbuf (ICON_NORMAL);
if (!sticon)
return;
g_signal_connect (G_OBJECT (sticon), "popup-menu",
G_CALLBACK (tray_menu_cb), sticon);
/* g_signal_connect (G_OBJECT (sticon), "popup-menu",
G_CALLBACK (tray_menu_cb), sticon); */
g_signal_connect (G_OBJECT (sticon), "activate",
G_CALLBACK (tray_menu_restore_cb), NULL);
}
@@ -650,15 +652,15 @@ tray_hilight_cb (char *word[], void *userdata)
/* FIXME: hides any previous private messages */
tray_hilight_count++;
if (tray_hilight_count == 1)
tray_set_tipf (_("XChat: Highlighted message from: %s (%s)"),
tray_set_tipf (_("XChat-WDK: Highlighted message from: %s (%s)"),
word[1], xchat_get_info (ph, "channel"));
else
tray_set_tipf (_("XChat: %u highlighted messages, latest from: %s (%s)"),
tray_set_tipf (_("XChat-WDK: %u highlighted messages, latest from: %s (%s)"),
tray_hilight_count, word[1], xchat_get_info (ph, "channel"));
}
if (prefs.input_balloon_hilight)
tray_set_balloonf (word[2], _("XChat: Highlighted message from: %s (%s)"),
tray_set_balloonf (word[2], _("XChat-WDK: Highlighted message from: %s (%s)"),
word[1], xchat_get_info (ph, "channel"));
return XCHAT_EAT_NONE;
@@ -676,14 +678,14 @@ tray_message_cb (char *word[], void *userdata)
tray_pub_count++;
if (tray_pub_count == 1)
tray_set_tipf (_("XChat: New public message from: %s (%s)"),
tray_set_tipf (_("XChat-WDK: New public message from: %s (%s)"),
word[1], xchat_get_info (ph, "channel"));
else
tray_set_tipf (_("XChat: %u new public messages."), tray_pub_count);
tray_set_tipf (_("XChat-WDK: %u new public messages."), tray_pub_count);
}
if (prefs.input_balloon_chans)
tray_set_balloonf (word[2], _("XChat: New public message from: %s (%s)"),
tray_set_balloonf (word[2], _("XChat-WDK: New public message from: %s (%s)"),
word[1], xchat_get_info (ph, "channel"));
return XCHAT_EAT_NONE;
@@ -705,14 +707,14 @@ tray_priv (char *from, char *text)
tray_priv_count++;
if (tray_priv_count == 1)
tray_set_tipf (_("XChat: Private message from: %s (%s)"),
tray_set_tipf (_("XChat-WDK: Private message from: %s (%s)"),
from, network);
else
tray_set_tipf (_("XChat: %u private messages, latest from: %s (%s)"),
tray_set_tipf (_("XChat-WDK: %u private messages, latest from: %s (%s)"),
tray_priv_count, from, network);
if (prefs.input_balloon_priv)
tray_set_balloonf (text, _("XChat: Private message from: %s (%s)"),
tray_set_balloonf (text, _("XChat-WDK: Private message from: %s (%s)"),
from, network);
}
@@ -758,15 +760,15 @@ tray_dcc_cb (char *word[], void *userdata)
tray_file_count++;
if (tray_file_count == 1)
tray_set_tipf (_("XChat: File offer from: %s (%s)"),
tray_set_tipf (_("XChat-WDK: File offer from: %s (%s)"),
word[1], network);
else
tray_set_tipf (_("XChat: %u file offers, latest from: %s (%s)"),
tray_set_tipf (_("XChat-WDK: %u file offers, latest from: %s (%s)"),
tray_file_count, word[1], network);
}
if (prefs.input_balloon_priv)
tray_set_balloonf ("", _("XChat: File offer from: %s (%s)"),
tray_set_balloonf ("", _("XChat-WDK: File offer from: %s (%s)"),
word[1], network);
return XCHAT_EAT_NONE;
@@ -802,7 +804,7 @@ tray_apply_setup (void)
}
else
{
if (prefs.gui_tray)
if (prefs.gui_tray && !xtray_mode ())
tray_init ();
}
}
@@ -834,7 +836,7 @@ tray_plugin_init (xchat_plugin *plugin_handle, char **plugin_name,
xchat_hook_print (ph, "Focus Window", -1, tray_focus_cb, NULL);
if (prefs.gui_tray)
if (prefs.gui_tray && !xtray_mode ())
tray_init ();
return 1; /* return 1 for success */