From d9351978958dcf137cdf2979d7614ac7a63da367 Mon Sep 17 00:00:00 2001 From: Chase Patterson Date: Fri, 15 Sep 2017 05:05:46 -0400 Subject: Change windows from starting with "Hexchat: " to ending with " - Hexchat" --- src/fe-gtk/banlist.c | 4 ++-- src/fe-gtk/chanlist.c | 2 +- src/fe-gtk/dccgui.c | 4 ++-- src/fe-gtk/fkeys.c | 2 +- src/fe-gtk/ignoregui.c | 2 +- src/fe-gtk/joind.c | 2 +- src/fe-gtk/maingui.c | 10 +++++----- src/fe-gtk/menu.c | 16 ++++++++-------- src/fe-gtk/notifygui.c | 2 +- src/fe-gtk/plugin-tray.c | 20 ++++++++++---------- src/fe-gtk/plugingui.c | 2 +- src/fe-gtk/rawlog.c | 2 +- src/fe-gtk/servlistgui.c | 4 ++-- src/fe-gtk/setup.c | 2 +- src/fe-gtk/urlgrab.c | 2 +- 15 files changed, 38 insertions(+), 38 deletions(-) (limited to 'src') diff --git a/src/fe-gtk/banlist.c b/src/fe-gtk/banlist.c index 5d0d6862..99a99277 100644 --- a/src/fe-gtk/banlist.c +++ b/src/fe-gtk/banlist.c @@ -436,7 +436,7 @@ banlist_do_refresh (banlist_info *banl) { GtkListStore *store; - g_snprintf (tbuf, sizeof tbuf, DISPLAY_NAME": Ban List (%s, %s)", + g_snprintf (tbuf, sizeof tbuf, "Ban List (%s, %s) - ", sess->channel, sess->server->servername); mg_set_title (banl->window, tbuf); @@ -805,7 +805,7 @@ banlist_opengui (struct session *sess) /* Force on the checkmark in the "Bans" box */ banl->checked = 1<server->servername); banl->window = mg_create_generic_tab ("BanList", tbuf, FALSE, diff --git a/src/fe-gtk/chanlist.c b/src/fe-gtk/chanlist.c index f6ef46f3..12dba53e 100644 --- a/src/fe-gtk/chanlist.c +++ b/src/fe-gtk/chanlist.c @@ -717,7 +717,7 @@ chanlist_opengui (server *serv, int do_refresh) return; } - g_snprintf (tbuf, sizeof tbuf, _(DISPLAY_NAME": Channel List (%s)"), + g_snprintf (tbuf, sizeof tbuf, _("Channel List (%s) - "DISPLAY_NAME), server_get_network (serv, TRUE)); serv->gui->chanlist_pending_rows = NULL; diff --git a/src/fe-gtk/dccgui.c b/src/fe-gtk/dccgui.c index 5ad6451d..9126694a 100644 --- a/src/fe-gtk/dccgui.c +++ b/src/fe-gtk/dccgui.c @@ -799,7 +799,7 @@ fe_dcc_open_recv_win (int passive) mg_bring_tofront (dccfwin.window); return TRUE; } - dccfwin.window = mg_create_generic_tab ("Transfers", _(DISPLAY_NAME": Uploads and Downloads"), + dccfwin.window = mg_create_generic_tab ("Transfers", _("Uploads and Downloads - "DISPLAY_NAME), FALSE, TRUE, close_dcc_file_window, NULL, win_width, win_height, &vbox, 0); gtkutil_destroy_on_esc (dccfwin.window); @@ -1046,7 +1046,7 @@ fe_dcc_open_chat_win (int passive) } dcccwin.window = - mg_create_generic_tab ("DCCChat", _(DISPLAY_NAME": DCC Chat List"), + mg_create_generic_tab ("DCCChat", _("DCC Chat List - "DISPLAY_NAME), FALSE, TRUE, dcc_chat_close_cb, NULL, 550, 180, &vbox, 0); gtkutil_destroy_on_esc (dcccwin.window); gtk_container_set_border_width (GTK_CONTAINER (dcccwin.window), 3); diff --git a/src/fe-gtk/fkeys.c b/src/fe-gtk/fkeys.c index 2bb4a061..bc33a772 100644 --- a/src/fe-gtk/fkeys.c +++ b/src/fe-gtk/fkeys.c @@ -808,7 +808,7 @@ key_dialog_show () return; } - key_dialog = mg_create_generic_tab ("editkeys", _(DISPLAY_NAME": Keyboard Shortcuts"), + key_dialog = mg_create_generic_tab ("editkeys", _("Keyboard Shortcuts - "DISPLAY_NAME), TRUE, FALSE, key_dialog_close, NULL, 600, 360, &vbox, 0); view = key_dialog_treeview_new (vbox); diff --git a/src/fe-gtk/ignoregui.c b/src/fe-gtk/ignoregui.c index 07840e8b..d935822b 100644 --- a/src/fe-gtk/ignoregui.c +++ b/src/fe-gtk/ignoregui.c @@ -347,7 +347,7 @@ ignore_gui_open () } ignorewin = - mg_create_generic_tab ("IgnoreList", _(DISPLAY_NAME": Ignore list"), + mg_create_generic_tab ("IgnoreList", _("Ignore list - "DISPLAY_NAME), FALSE, TRUE, close_ignore_gui_callback, NULL, 700, 300, &vbox, 0); gtkutil_destroy_on_esc (ignorewin); diff --git a/src/fe-gtk/joind.c b/src/fe-gtk/joind.c index 86101395..26ca7738 100644 --- a/src/fe-gtk/joind.c +++ b/src/fe-gtk/joind.c @@ -130,7 +130,7 @@ joind_show_dialog (server *serv) char buf2[256]; serv->gui->joind_win = dialog1 = gtk_dialog_new (); - gtk_window_set_title (GTK_WINDOW (dialog1), _(DISPLAY_NAME": Connection Complete")); + gtk_window_set_title (GTK_WINDOW (dialog1), _("Connection Complete - "DISPLAY_NAME)); gtk_window_set_type_hint (GTK_WINDOW (dialog1), GDK_WINDOW_TYPE_HINT_DIALOG); gtk_window_set_position (GTK_WINDOW (dialog1), GTK_WIN_POS_CENTER_ON_PARENT); gtk_window_set_transient_for (GTK_WINDOW(dialog1), GTK_WINDOW(serv->front_session->gui->window)); diff --git a/src/fe-gtk/maingui.c b/src/fe-gtk/maingui.c index 145f4096..b11a9f79 100644 --- a/src/fe-gtk/maingui.c +++ b/src/fe-gtk/maingui.c @@ -382,11 +382,11 @@ fe_set_title (session *sess) switch (type) { case SESS_DIALOG: - g_snprintf (tbuf, sizeof (tbuf), DISPLAY_NAME": %s %s @ %s", + g_snprintf (tbuf, sizeof (tbuf), "%s %s @ %s - "DISPLAY_NAME, _("Dialog with"), sess->channel, server_get_network (sess->server, TRUE)); break; case SESS_SERVER: - g_snprintf (tbuf, sizeof (tbuf), DISPLAY_NAME": %s @ %s", + g_snprintf (tbuf, sizeof (tbuf), "%s @ %s - "DISPLAY_NAME, sess->server->nick, server_get_network (sess->server, TRUE)); break; case SESS_CHANNEL: @@ -394,14 +394,14 @@ fe_set_title (session *sess) if (prefs.hex_gui_win_modes) { g_snprintf (tbuf, sizeof (tbuf), - DISPLAY_NAME": %s @ %s / %s (%s)", + "%s @ %s / %s (%s) - "DISPLAY_NAME, sess->server->nick, server_get_network (sess->server, TRUE), sess->channel, sess->current_modes ? sess->current_modes : ""); } else { g_snprintf (tbuf, sizeof (tbuf), - DISPLAY_NAME": %s @ %s / %s", + "%s @ %s / %s - "DISPLAY_NAME, sess->server->nick, server_get_network (sess->server, TRUE), sess->channel); } @@ -412,7 +412,7 @@ fe_set_title (session *sess) break; case SESS_NOTICES: case SESS_SNOTICES: - g_snprintf (tbuf, sizeof (tbuf), DISPLAY_NAME": %s @ %s (notices)", + g_snprintf (tbuf, sizeof (tbuf), "%s @ %s (notices) - "DISPLAY_NAME, sess->server->nick, server_get_network (sess->server, TRUE)); break; default: diff --git a/src/fe-gtk/menu.c b/src/fe-gtk/menu.c index fd652699..966b6f8f 100644 --- a/src/fe-gtk/menu.c +++ b/src/fe-gtk/menu.c @@ -1134,7 +1134,7 @@ menu_settings (GtkWidget * wid, gpointer none) static void menu_usermenu (void) { - editlist_gui_open (NULL, NULL, usermenu_list, _(DISPLAY_NAME": User menu"), + editlist_gui_open (NULL, NULL, usermenu_list, _("User menu - "DISPLAY_NAME), "usermenu", "usermenu.conf", 0); } @@ -1524,28 +1524,28 @@ menu_noplugin_info (void) static void menu_usercommands (void) { - editlist_gui_open (NULL, NULL, command_list, _(DISPLAY_NAME": User Defined Commands"), + editlist_gui_open (NULL, NULL, command_list, _("User Defined Commands - "DISPLAY_NAME), "commands", "commands.conf", usercommands_help); } static void menu_ulpopup (void) { - editlist_gui_open (NULL, NULL, popup_list, _(DISPLAY_NAME": Userlist Popup menu"), "popup", + editlist_gui_open (NULL, NULL, popup_list, _("Userlist Popup menu - "DISPLAY_NAME), "popup", "popup.conf", ulbutton_help); } static void menu_rpopup (void) { - editlist_gui_open (_("Text"), _("Replace with"), replace_list, _(DISPLAY_NAME": Replace"), "replace", + editlist_gui_open (_("Text"), _("Replace with"), replace_list, _("Replace - "DISPLAY_NAME), "replace", "replace.conf", 0); } static void menu_urlhandlers (void) { - editlist_gui_open (NULL, NULL, urlhandler_list, _(DISPLAY_NAME": URL Handlers"), "urlhandlers", + editlist_gui_open (NULL, NULL, urlhandler_list, _("URL Handlers - "DISPLAY_NAME), "urlhandlers", "urlhandlers.conf", url_help); } @@ -1564,21 +1564,21 @@ menu_keypopup (void) static void menu_ulbuttons (void) { - editlist_gui_open (NULL, NULL, button_list, _(DISPLAY_NAME": Userlist buttons"), "buttons", + editlist_gui_open (NULL, NULL, button_list, _("Userlist buttons - "DISPLAY_NAME), "buttons", "buttons.conf", ulbutton_help); } static void menu_dlgbuttons (void) { - editlist_gui_open (NULL, NULL, dlgbutton_list, _(DISPLAY_NAME": Dialog buttons"), "dlgbuttons", + editlist_gui_open (NULL, NULL, dlgbutton_list, _("Dialog buttons - "DISPLAY_NAME), "dlgbuttons", "dlgbuttons.conf", dlgbutton_help); } static void menu_ctcpguiopen (void) { - editlist_gui_open (NULL, NULL, ctcp_list, _(DISPLAY_NAME": CTCP Replies"), "ctcpreply", + editlist_gui_open (NULL, NULL, ctcp_list, _("CTCP Replies - "DISPLAY_NAME), "ctcpreply", "ctcpreply.conf", ctcp_help); } diff --git a/src/fe-gtk/notifygui.c b/src/fe-gtk/notifygui.c index ed16f44f..a919b1cb 100644 --- a/src/fe-gtk/notifygui.c +++ b/src/fe-gtk/notifygui.c @@ -406,7 +406,7 @@ notify_opengui (void) } notify_window = - mg_create_generic_tab ("Notify", _(DISPLAY_NAME": Friends List"), FALSE, TRUE, + mg_create_generic_tab ("Notify", _("Friends List - "DISPLAY_NAME), FALSE, TRUE, notify_closegui, NULL, 400, 250, &vbox, 0); gtkutil_destroy_on_esc (notify_window); diff --git a/src/fe-gtk/plugin-tray.c b/src/fe-gtk/plugin-tray.c index b5f1624a..c2e54929 100644 --- a/src/fe-gtk/plugin-tray.c +++ b/src/fe-gtk/plugin-tray.c @@ -174,10 +174,10 @@ tray_stop_flash (void) nets = tray_count_networks (); chans = tray_count_channels (); if (nets) - tray_set_tipf (_(DISPLAY_NAME": Connected to %u networks and %u channels"), + tray_set_tipf (_("Connected to %u networks and %u channels - "DISPLAY_NAME), nets, chans); else - tray_set_tipf (DISPLAY_NAME": %s", _("Not connected.")); + tray_set_tipf ("%s - "DISPLAY_NAME, _("Not connected.")); } if (custom_icon1) @@ -628,10 +628,10 @@ tray_hilight_cb (char *word[], void *userdata) /* FIXME: hides any previous private messages */ tray_hilight_count++; if (tray_hilight_count == 1) - tray_set_tipf (_(DISPLAY_NAME": Highlighted message from: %s (%s)"), + tray_set_tipf (_("Highlighted message from: %s (%s) - "DISPLAY_NAME), word[1], hexchat_get_info (ph, "channel")); else - tray_set_tipf (_(DISPLAY_NAME": %u highlighted messages, latest from: %s (%s)"), + tray_set_tipf (_("%u highlighted messages, latest from: %s (%s) - "DISPLAY_NAME), tray_hilight_count, word[1], hexchat_get_info (ph, "channel")); } @@ -650,10 +650,10 @@ tray_message_cb (char *word[], void *userdata) tray_pub_count++; if (tray_pub_count == 1) - tray_set_tipf (_(DISPLAY_NAME": Channel message from: %s (%s)"), + tray_set_tipf (_("Channel message from: %s (%s) - "DISPLAY_NAME), word[1], hexchat_get_info (ph, "channel")); else - tray_set_tipf (_(DISPLAY_NAME": %u channel messages."), tray_pub_count); + tray_set_tipf (_("%u channel messages. - "DISPLAY_NAME), tray_pub_count); } return HEXCHAT_EAT_NONE; @@ -677,10 +677,10 @@ tray_priv (char *from, char *text) tray_priv_count++; if (tray_priv_count == 1) - tray_set_tipf (_(DISPLAY_NAME": Private message from: %s (%s)"), + tray_set_tipf (_("Private message from: %s (%s) - "DISPLAY_NAME), from, network); else - tray_set_tipf (_(DISPLAY_NAME": %u private messages, latest from: %s (%s)"), + tray_set_tipf (_("%u private messages, latest from: %s (%s) - "DISPLAY_NAME), tray_priv_count, from, network); } } @@ -720,10 +720,10 @@ tray_dcc_cb (char *word[], void *userdata) tray_file_count++; if (tray_file_count == 1) - tray_set_tipf (_(DISPLAY_NAME": File offer from: %s (%s)"), + tray_set_tipf (_("File offer from: %s (%s) - "DISPLAY_NAME), word[1], network); else - tray_set_tipf (_(DISPLAY_NAME": %u file offers, latest from: %s (%s)"), + tray_set_tipf (_("%u file offers, latest from: %s (%s) - "DISPLAY_NAME), tray_file_count, word[1], network); } diff --git a/src/fe-gtk/plugingui.c b/src/fe-gtk/plugingui.c index 4172c616..1f24e2f6 100644 --- a/src/fe-gtk/plugingui.c +++ b/src/fe-gtk/plugingui.c @@ -237,7 +237,7 @@ plugingui_open (void) return; } - plugin_window = mg_create_generic_tab ("Addons", _(DISPLAY_NAME": Plugins and Scripts"), + plugin_window = mg_create_generic_tab ("Addons", _("Plugins and Scripts - "DISPLAY_NAME), FALSE, TRUE, plugingui_close, NULL, 700, 300, &vbox, 0); gtkutil_destroy_on_esc (plugin_window); diff --git a/src/fe-gtk/rawlog.c b/src/fe-gtk/rawlog.c index 1d4bf9fd..9fa25d8b 100644 --- a/src/fe-gtk/rawlog.c +++ b/src/fe-gtk/rawlog.c @@ -109,7 +109,7 @@ open_rawlog (struct server *serv) return; } - g_snprintf (tbuf, sizeof tbuf, _(DISPLAY_NAME": Raw Log (%s)"), serv->servername); + g_snprintf (tbuf, sizeof tbuf, _("Raw Log (%s) - "DISPLAY_NAME), serv->servername); serv->gui->rawlog_window = mg_create_generic_tab ("RawLog", tbuf, FALSE, TRUE, close_rawlog, serv, 640, 320, &vbox, serv); diff --git a/src/fe-gtk/servlistgui.c b/src/fe-gtk/servlistgui.c index 9c360306..dc19ab8f 100644 --- a/src/fe-gtk/servlistgui.c +++ b/src/fe-gtk/servlistgui.c @@ -1707,7 +1707,7 @@ servlist_open_edit (GtkWidget *parent, ircnet *net) editwindow = gtk_window_new (GTK_WINDOW_TOPLEVEL); gtk_container_set_border_width (GTK_CONTAINER (editwindow), 4); - g_snprintf (buf, sizeof (buf), _(DISPLAY_NAME": Edit %s"), net->name); + g_snprintf (buf, sizeof (buf), _("Edit %s - "DISPLAY_NAME), net->name); gtk_window_set_title (GTK_WINDOW (editwindow), buf); gtk_window_set_default_size (GTK_WINDOW (editwindow), netedit_win_width, netedit_win_height); gtk_window_set_transient_for (GTK_WINDOW (editwindow), GTK_WINDOW (parent)); @@ -1973,7 +1973,7 @@ servlist_open_networks (void) servlist = gtk_window_new (GTK_WINDOW_TOPLEVEL); gtk_container_set_border_width (GTK_CONTAINER (servlist), 4); - gtk_window_set_title (GTK_WINDOW (servlist), _(DISPLAY_NAME": Network List")); + gtk_window_set_title (GTK_WINDOW (servlist), _("Network List - "DISPLAY_NAME)); gtk_window_set_default_size (GTK_WINDOW (servlist), netlist_win_width, netlist_win_height); gtk_window_set_role (GTK_WINDOW (servlist), "servlist"); gtk_window_set_type_hint (GTK_WINDOW (servlist), GDK_WINDOW_TYPE_HINT_DIALOG); diff --git a/src/fe-gtk/setup.c b/src/fe-gtk/setup.c index 309db53a..a54ea602 100644 --- a/src/fe-gtk/setup.c +++ b/src/fe-gtk/setup.c @@ -2289,7 +2289,7 @@ setup_window_open (void) { GtkWidget *wid, *win, *vbox, *hbox, *hbbox; - win = gtkutil_window_new (_(DISPLAY_NAME": Preferences"), "prefs", 0, 600, 2); + win = gtkutil_window_new (_("Preferences - "DISPLAY_NAME), "prefs", 0, 600, 2); vbox = gtk_vbox_new (FALSE, 5); gtk_container_set_border_width (GTK_CONTAINER (vbox), 6); diff --git a/src/fe-gtk/urlgrab.c b/src/fe-gtk/urlgrab.c index 79a6d5f5..c2eb3b5b 100644 --- a/src/fe-gtk/urlgrab.c +++ b/src/fe-gtk/urlgrab.c @@ -195,7 +195,7 @@ url_opengui () } urlgrabberwindow = - mg_create_generic_tab ("UrlGrabber", _(DISPLAY_NAME": URL Grabber"), FALSE, + mg_create_generic_tab ("UrlGrabber", _("URL Grabber - "DISPLAY_NAME), FALSE, TRUE, url_closegui, NULL, 400, 256, &vbox, 0); gtkutil_destroy_on_esc (urlgrabberwindow); view = url_treeview_new (vbox); -- cgit 1.4.1