- move server filter submenu to top level

- remove rarely used buttons from toolbar


git-svn-id: http://svn.code.sf.net/p/xqf/code/trunk@430 d2ac09be-c843-0410-8b1f-f8a84130e0ec
This commit is contained in:
Ludwig Nussel 2003-02-04 21:48:24 +00:00 committed by l-n
parent 105dd966a5
commit 2f130473f4
4 changed files with 161 additions and 144 deletions

View File

@ -1,3 +1,7 @@
Feb 04, 2003: Ludwig Nussel <l-n@users.sourceforge.net>
- move server filter submenu to top level
- remove rarely used buttons from toolbar
Feb 03, 2003: Ludwig Nussel <l-n@users.sourceforge.net>
- merge patch from Jochen Baier to allow filtering for map and server name
- update German translation

View File

@ -5,8 +5,8 @@
msgid ""
msgstr ""
"Project-Id-Version: de\n"
"POT-Creation-Date: 2003-02-03 13:00+0100\n"
"PO-Revision-Date: 2003-02-03 13:01GMT\n"
"POT-Creation-Date: 2003-02-03 20:14+0100\n"
"PO-Revision-Date: 2003-02-03 20:31GMT\n"
"Last-Translator: Ludwig Nussel <l-n@users.sourceforge.net>>\n"
"Language-Team: Deutsch <xqf-developer@lists.sourceforge.net>\n"
"MIME-Version: 1.0\n"
@ -49,7 +49,7 @@ msgstr "Master Adresse"
#: src/addmaster.c:515 src/addserver.c:209 src/dialogs.c:410 src/filter.c:1315
#: src/game.c:2280 src/game.c:2443 src/game.c:2534 src/launch.c:325
#: src/pref.c:4368 src/psearch.c:224 src/redial.c:228 src/srv-prop.c:686
#: src/xqf.c:989 src/xqf.c:1013 src/xqf.c:1709
#: src/xqf.c:992 src/xqf.c:1016 src/xqf.c:1712
msgid "Cancel"
msgstr "Abbrechen"
@ -80,7 +80,7 @@ msgstr "Ja"
msgid "No"
msgstr "Nein"
#: src/dialogs.c:315 src/xqf.c:1013
#: src/dialogs.c:315 src/xqf.c:1016
msgid "Redial"
msgstr "Wahlwiederholung"
@ -134,7 +134,7 @@ msgid "Rename"
msgstr "Umbenennen"
#. FIXME: plural
#: src/filter.c:1052 src/flt-player.c:823 src/pref.c:2447 src/xqf.c:1709
#: src/filter.c:1052 src/flt-player.c:823 src/pref.c:2447 src/xqf.c:1712
msgid "Delete"
msgstr "Löschen"
@ -365,7 +365,7 @@ msgstr ""
#. passwords file could not be written
#: src/game.c:2280 src/game.c:2443 src/game.c:2534 src/launch.c:325
#: src/xqf.c:989 src/xqf.c:1013
#: src/xqf.c:992 src/xqf.c:1016
msgid "Launch"
msgstr "Starten"
@ -982,7 +982,7 @@ msgid "Refresh Done"
msgstr "Auffrischen fertig"
#. Sound Stop
#: src/pref.c:4096 src/xqf.c:2715
#: src/pref.c:4096 src/xqf.c:2727
msgid "Stop"
msgstr "Stop"
@ -1270,7 +1270,7 @@ msgstr "Zuschauer Passwort"
msgid "RCon Password"
msgstr "RCon Passwort"
#: src/srv-prop.c:621 src/xqf.c:2287 src/xqf.c:2401
#: src/srv-prop.c:621 src/xqf.c:2290 src/xqf.c:2404
msgid "Properties"
msgstr "Einstellungen"
@ -1385,64 +1385,64 @@ msgstr "Wert"
msgid "Source"
msgstr "Quelle"
#: src/xqf.c:406
#: src/xqf.c:405
#, c-format
msgid "%d server"
msgstr "%d Server"
#: src/xqf.c:406
#: src/xqf.c:405
#, c-format
msgid "%d servers"
msgstr "%d Server"
#. server filter
#: src/xqf.c:645
#: src/xqf.c:648
msgid "None <--"
msgstr "Keiner <--"
#: src/xqf.c:647 src/xqf.c:2835 src/xqf.c:2889 src/xqf.c:2999
#: src/xqf.c:650 src/xqf.c:2851 src/xqf.c:2909 src/xqf.c:3010
msgid "None"
msgstr "Keiner"
#: src/xqf.c:661
#: src/xqf.c:664
#, c-format
msgid "Filter %d <--"
msgstr "Filter %d <--"
#: src/xqf.c:663
#: src/xqf.c:666
#, c-format
msgid "Filter %d"
msgstr "Filter %d"
#: src/xqf.c:685
#: src/xqf.c:688
msgid "No Server Filter Active"
msgstr "Kein Server Filter aktiv"
#: src/xqf.c:692
#: src/xqf.c:695
#, c-format
msgid "Server Filter: %s"
msgstr "Server Filter: %s"
#: src/xqf.c:696
#: src/xqf.c:699
#, c-format
msgid "Server Filter: %d"
msgstr "Server Filter: %d"
#: src/xqf.c:852
#: src/xqf.c:855
msgid "Updating lists..."
msgstr "Aktualisiere Listen ..."
#: src/xqf.c:856
#: src/xqf.c:859
#, c-format
msgid "Resolving host names: %d/%d"
msgstr "Löse Hostnamen auf: %d/%d"
#: src/xqf.c:860
#: src/xqf.c:863
#, c-format
msgid "Refreshing: %d/%d"
msgstr "Aktualisiere: %d/%d"
#: src/xqf.c:864
#: src/xqf.c:867
#, c-format
msgid "Resolving host addresses: %d/%d"
msgstr "Löse Hostnamen auf: %d/%d"
@ -1452,11 +1452,11 @@ msgstr "L
#. print_status (main_status_bar, _("Waiting to redial server(s)..."));
#. else
#.
#: src/xqf.c:893 src/xqf.c:1824
#: src/xqf.c:896 src/xqf.c:1827
msgid "Done."
msgstr "Fertig."
#: src/xqf.c:990
#: src/xqf.c:993
#, c-format
msgid ""
"Server %s:%d is %s.\n"
@ -1467,7 +1467,7 @@ msgstr ""
"\n"
"Spiel trotzdem starten?"
#: src/xqf.c:1014
#: src/xqf.c:1017
#, c-format
msgid ""
"Server %s:%d is full.\n"
@ -1478,41 +1478,41 @@ msgstr ""
"\n"
"Spiel trotzdem starten?"
#: src/xqf.c:1081 src/xqf.c:1101 src/xqf.c:1845
#: src/xqf.c:1084 src/xqf.c:1104 src/xqf.c:1848
msgid "Save Password"
msgstr "Passwort Speichern"
#: src/xqf.c:1081
#: src/xqf.c:1084
msgid "Spectator Password:"
msgstr "Zuschauer Passwort:"
#: src/xqf.c:1101 src/xqf.c:1845
#: src/xqf.c:1104 src/xqf.c:1848
msgid "Server Password:"
msgstr "Server Passwort:"
#: src/xqf.c:1249
#: src/xqf.c:1252
msgid "Spectator"
msgstr "Zuschauer"
#: src/xqf.c:1250 src/xqf.c:1253
#: src/xqf.c:1253 src/xqf.c:1256
msgid "Demo name:"
msgstr "Demo Name:"
#: src/xqf.c:1463
#: src/xqf.c:1466
#, c-format
msgid "Host %s not found"
msgstr "Host %s nicht gefunden"
#: src/xqf.c:1493
#: src/xqf.c:1496
#, c-format
msgid "\"%s\" is not valid host[:port] combination."
msgstr "\"%s\" ist keine zulässige host[:port] Kombination"
#: src/xqf.c:1704
#: src/xqf.c:1707
msgid "You have to select the server you want to delete"
msgstr "Sie müssen den Server auswählen den sie löschen möchten"
#: src/xqf.c:1710
#: src/xqf.c:1713
#, c-format
msgid ""
"Master%s to delete:\n"
@ -1523,16 +1523,16 @@ msgstr ""
"\n"
"%s"
#: src/xqf.c:1733
#: src/xqf.c:1736
#, c-format
msgid "Find Player: %s"
msgstr "Spieler suchen: %s"
#: src/xqf.c:2171
#: src/xqf.c:2174
msgid "X11 Quake/QuakeWorld/Quake2/Quake3 Front-End\n"
msgstr "X11 Quake/QuakeWorld/Quake2/Quake3 Front-End\n"
#: src/xqf.c:2172
#: src/xqf.c:2175
#, c-format
msgid ""
"Version %s\n"
@ -1542,7 +1542,7 @@ msgstr ""
"\n"
#. 8859-1 translators can use the copyright symbol © instead of (C)
#: src/xqf.c:2175
#: src/xqf.c:2178
msgid ""
"Copyright (C) 1998-2002 Roman Pozlevich <roma@botik.ru>\n"
"\n"
@ -1550,7 +1550,7 @@ msgstr ""
"Copyright © 1998-2002 Roman Pozlevich <roma@botik.ru>\n"
"\n"
#: src/xqf.c:2176
#: src/xqf.c:2179
msgid ""
"http://www.linuxgames.com/xqf\n"
"http://sourceforge.net/projects/xqf\n"
@ -1560,7 +1560,7 @@ msgstr ""
"http://sourceforge.net/projects/xqf/\n"
"\n"
#: src/xqf.c:2178
#: src/xqf.c:2181
msgid ""
"Significant Contributors:\n"
"\n"
@ -1578,7 +1578,7 @@ msgstr ""
"Ludwig Nussel <l-n@users.sourceforge.net>\n"
"\n"
#: src/xqf.c:2183
#: src/xqf.c:2186
msgid ""
"Other Contributors:\n"
"\n"
@ -1590,7 +1590,7 @@ msgstr ""
"Jochen Baier <email@jochen-baier.de>\n"
"\n"
#: src/xqf.c:2185
#: src/xqf.c:2188
msgid ""
"Bug reports:\n"
"\n"
@ -1602,7 +1602,7 @@ msgstr ""
"http://sourceforge.net/projects/xqf\n"
"\n"
#: src/xqf.c:2187
#: src/xqf.c:2190
msgid ""
"Feature requests:\n"
"\n"
@ -1612,280 +1612,284 @@ msgstr ""
"\n"
"http://www.linuxgames.com/xqf in den Foren\n"
#: src/xqf.c:2189
#: src/xqf.c:2192
msgid "About XQF"
msgstr "Über XQF"
#: src/xqf.c:2209 src/xqf.c:2725
#: src/xqf.c:2212 src/xqf.c:2737
msgid "Connect"
msgstr "Verbinden"
#: src/xqf.c:2214 src/xqf.c:2733
#: src/xqf.c:2217 src/xqf.c:2746
msgid "Observe"
msgstr "Beobachten"
#: src/xqf.c:2219 src/xqf.c:2741
#: src/xqf.c:2222 src/xqf.c:2754
msgid "Record Demo"
msgstr "Demo aufnehmen"
#: src/xqf.c:2233
#: src/xqf.c:2236
msgid "Add new Server"
msgstr "Hinzufügen"
#: src/xqf.c:2238
#: src/xqf.c:2241
msgid "Add to Favorites"
msgstr "Zu Favoriten hinzufügen"
#: src/xqf.c:2243
#: src/xqf.c:2246
msgid "Remove from Favorites"
msgstr "Aus Favoriten löschen"
#: src/xqf.c:2248
#: src/xqf.c:2251
msgid "Copy"
msgstr "Kopieren"
#: src/xqf.c:2253
#: src/xqf.c:2256
msgid "Copy+"
msgstr "Kopieren+"
#: src/xqf.c:2261 src/xqf.c:2699
#: src/xqf.c:2264 src/xqf.c:2711
msgid "Refresh"
msgstr "Auffrischen"
#: src/xqf.c:2266
#: src/xqf.c:2269
msgid "Refresh Selected"
msgstr "Ausgewählten auffrischen"
#: src/xqf.c:2274
#: src/xqf.c:2277
msgid "DNS Lookup"
msgstr "DNS auflösen"
#: src/xqf.c:2282
#: src/xqf.c:2285
msgid "RCon"
msgstr "RCon"
#: src/xqf.c:2297
#: src/xqf.c:2300
msgid "_Statistics"
msgstr "_Statistiken"
#: src/xqf.c:2305
#: src/xqf.c:2308
msgid "_Exit"
msgstr "Be_enden"
#: src/xqf.c:2316 src/xqf.c:2370
#: src/xqf.c:2319 src/xqf.c:2373
msgid "Add _Master"
msgstr "_Master hinzufügen "
#: src/xqf.c:2321 src/xqf.c:2375
#: src/xqf.c:2324 src/xqf.c:2378
msgid "_Rename Master"
msgstr "Master _umbenennen "
#: src/xqf.c:2326 src/xqf.c:2380
#: src/xqf.c:2329 src/xqf.c:2383
msgid "D_elete Master"
msgstr "_Master löschen"
#: src/xqf.c:2336 src/xqf.c:2483
#: src/xqf.c:2339 src/xqf.c:2488
msgid "_Add new Server"
msgstr "_Neuen Server hinzufügen"
#: src/xqf.c:2341 src/xqf.c:2488
#: src/xqf.c:2344 src/xqf.c:2493
msgid "Add to _Favorites"
msgstr "Zu Favoriten hin_zufügen"
#: src/xqf.c:2346 src/xqf.c:2493
#: src/xqf.c:2349 src/xqf.c:2498
msgid "_Remove from Favorites"
msgstr "Aus Favoriten _löschen"
#: src/xqf.c:2351
#: src/xqf.c:2354
msgid "_Copy"
msgstr "_Kopieren"
#: src/xqf.c:2356
#: src/xqf.c:2359
msgid "_Copy+"
msgstr "Kopieren+"
#: src/xqf.c:2364
#: src/xqf.c:2367
msgid "Add Default Masters"
msgstr "Standard Master hinzufügen"
#: src/xqf.c:2388
#: src/xqf.c:2391
msgid "_Find Player"
msgstr "S_pieler suchen"
#: src/xqf.c:2393
#: src/xqf.c:2396
msgid "Find A_gain"
msgstr "_Nochmal suchen"
#: src/xqf.c:2411
#: src/xqf.c:2414
msgid "_Refresh"
msgstr "_Auffrischen"
#: src/xqf.c:2416
#: src/xqf.c:2419
msgid "Refresh _Selected"
msgstr "A_usgewählte auffrischen"
#: src/xqf.c:2421
#: src/xqf.c:2424
msgid "_Update From Master"
msgstr "Vom Master a_ktualisieren"
#: src/xqf.c:2429
#: src/xqf.c:2432
msgid "Show _Host Names"
msgstr "_Hostnamen anzeigen"
#: src/xqf.c:2434
#: src/xqf.c:2437
msgid "Show Default _Port"
msgstr "Standard_port anzeigen"
#: src/xqf.c:2453
msgid "_Server Filters"
msgstr "Server_filter"
#: src/xqf.c:2458
#: src/xqf.c:2463
msgid "_Connect"
msgstr "_Verbinden"
#: src/xqf.c:2463
#: src/xqf.c:2468
msgid "_Observe"
msgstr "_Beobachten"
#: src/xqf.c:2468
#: src/xqf.c:2473
msgid "Record _Demo"
msgstr "_Demo aufnehmen"
#: src/xqf.c:2499
#: src/xqf.c:2504
msgid "DNS _Lookup"
msgstr "DNS _auflösen"
#: src/xqf.c:2507
#: src/xqf.c:2512
msgid "_RCon"
msgstr "_RCon"
#: src/xqf.c:2512
#: src/xqf.c:2517
msgid "_Properties"
msgstr "_Eigenschaften"
# src/xqf.c
#: src/xqf.c:2522
#: src/xqf.c:2527
msgid "_General"
msgstr "_Allgemein"
#: src/xqf.c:2528
#: src/xqf.c:2533
msgid "_Games"
msgstr "_Spiele "
#: src/xqf.c:2534
#: src/xqf.c:2539
msgid "_Appearance"
msgstr "Erscheinungs_bild"
#: src/xqf.c:2540
#: src/xqf.c:2545
msgid "_QStat Options"
msgstr "_QStat Optionen"
#: src/xqf.c:2546
#: src/xqf.c:2551
msgid "_Sound Options"
msgstr "_Sound Optionen"
#: src/xqf.c:2555
#: src/xqf.c:2560
msgid "_Server Filter"
msgstr "_Server Filter"
#: src/xqf.c:2560
#: src/xqf.c:2565
msgid "Player _Filter"
msgstr "Spieler _Filter"
#: src/xqf.c:2570
#: src/xqf.c:2575
msgid "_About"
msgstr "_Über "
#: src/xqf.c:2581
#: src/xqf.c:2586
msgid "_File"
msgstr "_Datei"
#: src/xqf.c:2586
#: src/xqf.c:2591
msgid "_Edit"
msgstr "_Bearbeiten"
#: src/xqf.c:2591
#: src/xqf.c:2596
msgid "_View"
msgstr "_Ansicht"
#: src/xqf.c:2596
#: src/xqf.c:2601
msgid "_Server"
msgstr "_Server"
#: src/xqf.c:2601
#: src/xqf.c:2606
msgid "_Preferences"
msgstr "_Einstellungen"
#: src/xqf.c:2606
#: src/xqf.c:2612
msgid "_Server Filters"
msgstr "Server_filter"
#: src/xqf.c:2618
msgid "_Help"
msgstr "_Hilfe"
#: src/xqf.c:2649
#: src/xqf.c:2661
msgid "Mark as Red"
msgstr "Rot Markieren"
#: src/xqf.c:2656
#: src/xqf.c:2668
msgid "Mark as Green"
msgstr "Grün Markieren"
#: src/xqf.c:2663
#: src/xqf.c:2675
msgid "Mark as Blue"
msgstr "Blau Markieren"
#: src/xqf.c:2670
#: src/xqf.c:2682
msgid "Add to Player Filter"
msgstr "Zu Spielerfilter hinzufügen"
#: src/xqf.c:2691
#: src/xqf.c:2703
msgid "Update"
msgstr "Aktualisieren"
#: src/xqf.c:2691
#: src/xqf.c:2703
msgid "Update from master"
msgstr "Vom Master aktualisieren"
#: src/xqf.c:2699
#: src/xqf.c:2711
msgid "Refresh current list"
msgstr "Aktuelle Liste auffrischen"
#: src/xqf.c:2707
#: src/xqf.c:2719
msgid "Ref.Sel."
msgstr "Ausg.Auffr."
#: src/xqf.c:2707
#: src/xqf.c:2719
msgid "Refresh selected servers"
msgstr "Ausgewählte Server auffrischen"
#: src/xqf.c:2741
#: src/xqf.c:2754
msgid "Record"
msgstr "Aufnehmen"
#. Translators: e.g. Server Filter
#: src/xqf.c:2753
#: src/xqf.c:2766
#, c-format
msgid "%s Filter Enable / Disable"
msgstr "%s Filter (De)Aktivieren"
#. Translators: e.g. Server Filter Configuration
#: src/xqf.c:2774
#: src/xqf.c:2788
#, c-format
msgid "%s Filter Configuration"
msgstr "%s Filter Konfiguration"
#: src/xqf.c:2979
#: src/xqf.c:2891
msgid "Configure"
msgstr "Konfigurieren"
#: src/xqf.c:2990
msgid "Filters"
msgstr "Filter"
#: src/xqf.c:3376
#: src/xqf.c:3387
msgid "Reading server lists"
msgstr "Lese Serverlisten"
#: src/xqf.c:3378
#: src/xqf.c:3389
msgid "Starting ..."
msgstr "Starten ..."
#: src/xqf.c:3406
#: src/xqf.c:3417
#, c-format
msgid "You need at least qstat version %s for xqf to function properly"
msgstr "Sie benötigen mindestens qstat Version %s damit xqf richtig funktioniert"

View File

@ -1,4 +1,4 @@
EXTRA_DIST=$(wildcard *.xpm)
EXTRA_DIST=$(wildcard *.xpm) $(pixmaps_DATA)
pixmapsdir = $(pkgdatadir)/pixmaps
pixmaps_DATA = xqflogo.png

View File

@ -166,14 +166,13 @@ static GtkWidget *refrsel_button = NULL;
static GtkWidget *stop_button = NULL;
static GtkWidget *connect_button = NULL;
static GtkWidget *observe_button = NULL;
static GtkWidget *record_button = NULL;
//static GtkWidget *observe_button = NULL;
//static GtkWidget *record_button = NULL;
static GtkWidget *filter_buttons[FILTERS_TOTAL];
static GtkWidget *filter_buttons[FILTERS_TOTAL] = {0};
/*filter widgtet for toolbar*/
static GtkWidget *filter_option_menu_toolbar;
static GtkWidget *filter_toolbar_label;
static GtkWidget *player_skin_popup = NULL;
static GtkWidget *player_skin_popup_preview = NULL;
@ -454,8 +453,8 @@ void set_widgets_sensitivity (void) {
gtk_widget_set_sensitive (observe_menu_item, sens);
gtk_widget_set_sensitive (server_observe_menu_item, sens);
gtk_widget_set_state (observe_button, GTK_STATE_NORMAL);
gtk_widget_set_sensitive (observe_button, sens);
// gtk_widget_set_state (observe_button, GTK_STATE_NORMAL);
// gtk_widget_set_sensitive (observe_button, sens);
sens = (!stat_process && cur_server &&
(games[cur_server->type].flags & GAME_RECORD) != 0);
@ -463,8 +462,8 @@ void set_widgets_sensitivity (void) {
gtk_widget_set_sensitive (record_menu_item, sens);
gtk_widget_set_sensitive (server_record_menu_item, sens);
gtk_widget_set_state (record_button, GTK_STATE_NORMAL);
gtk_widget_set_sensitive (record_button, sens);
// gtk_widget_set_state (record_button, GTK_STATE_NORMAL);
// gtk_widget_set_sensitive (record_button, sens);
sens = (!stat_process && cur_server &&
(games[cur_server->type].flags & GAME_RCON) != 0);
@ -548,7 +547,7 @@ void set_widgets_sensitivity (void) {
for (i = 0; i < FILTERS_TOTAL; i++) {
gtk_widget_set_state(filter_buttons[ i ],GTK_STATE_NORMAL);
gtk_widget_set_sensitive (filter_buttons[i], sens);
if(GTK_TOGGLE_BUTTON(filter_buttons[ i ])->active)
if(GTK_IS_TOGGLE_BUTTON(filter_buttons[i]) && GTK_TOGGLE_BUTTON(filter_buttons[i])->active)
gtk_widget_set_state(filter_buttons[ i ],GTK_STATE_ACTIVE);
}
#if 0
@ -623,8 +622,10 @@ static void filter_menu_activate_current()
void set_filter_option_menu_toolbar (void) {
/*
gtk_option_menu_set_menu (GTK_OPTION_MENU (filter_option_menu_toolbar), create_filter_menu_toolbar());
gtk_option_menu_set_history(GTK_OPTION_MENU(filter_option_menu_toolbar), current_server_filter);
*/
}
@ -2449,11 +2450,13 @@ static const struct menuitem view_menu_items[] = {
*/
static const struct menuitem server_menu_items[] = {
/*
{
MENU_ITEM, N_("_Server Filters"), 0, 0,
NULL, 0,
&server_serverfilter_menu_item
},
*/
{
MENU_ITEM, N_("_Connect"), 0, 0,
GTK_SIGNAL_FUNC (launch_callback), (gpointer) LAUNCH_NORMAL,
@ -2602,6 +2605,13 @@ static const struct menuitem menubar_menu_items[] = {
NULL, &preferences_menu_items,
NULL
},
{
MENU_ITEM, N_("_Server Filters"), 0, 0,
NULL, 0,
&server_serverfilter_menu_item
},
{
MENU_LAST_BRANCH, N_("_Help"), 0, 0,
NULL, &help_menu_items,
@ -2726,6 +2736,7 @@ static void populate_main_toolbar (void) {
pixmap,
GTK_SIGNAL_FUNC (launch_callback), (gpointer) LAUNCH_NORMAL);
#if 0
pixmap = gtk_pixmap_new (observe_pix.pix, observe_pix.mask);
gtk_widget_show (pixmap);
@ -2741,9 +2752,9 @@ static void populate_main_toolbar (void) {
_("Record"), _("Record Demo"), NULL,
pixmap,
GTK_SIGNAL_FUNC (launch_callback), (gpointer) LAUNCH_RECORD);
#endif
gtk_toolbar_append_space (GTK_TOOLBAR (main_toolbar));
/*
* Filter buttons
*/
@ -2767,6 +2778,7 @@ static void populate_main_toolbar (void) {
}
#if 0
gtk_toolbar_append_space (GTK_TOOLBAR (main_toolbar));
for (i = 0, mask = 1; i < FILTERS_TOTAL; i++, mask <<= 1) {
@ -2781,6 +2793,7 @@ static void populate_main_toolbar (void) {
pixmap,
GTK_SIGNAL_FUNC (start_filters_cfg_dialog), (gpointer) i);
}
gtk_toolbar_append_space (GTK_TOOLBAR (main_toolbar));
@ -2806,6 +2819,7 @@ static void populate_main_toolbar (void) {
gtk_widget_show (filter_option_menu_toolbar);
#endif
set_toolbar_appearance (GTK_TOOLBAR (main_toolbar),
default_toolbar_style, default_toolbar_tips);
@ -2865,20 +2879,24 @@ static GtkWidget* create_filter_menu()
unsigned int i;
GtkWidget *menu;
GtkWidget *menu_item;
// GtkWidget *radiobutton;
struct server_filter_vars* filter = NULL;
GSList* rbgroup = NULL;
filter_menu_radio_buttons = NULL;
menu = gtk_menu_new();
// menu_item = gtk_menu_item_new_with_label(_("None"));
// menu_item = gtk_check_menu_item_new_with_label(_("None"));
// gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu_item), (current_server_filter == 0));
// gtk_menu_append (GTK_MENU (menu), menu_item);
// gtk_widget_show (menu_item);
// gtk_signal_connect (GTK_OBJECT (menu_item), "activate",
// GTK_SIGNAL_FUNC (server_filter_select_callback), 0);
menu_item = gtk_menu_item_new_with_label (_("Configure"));
gtk_menu_append (GTK_MENU (menu), menu_item);
gtk_widget_show (menu_item);
gtk_signal_connect (GTK_OBJECT (menu_item), "activate",
GTK_SIGNAL_FUNC (start_filters_cfg_dialog), (gpointer) FILTER_SERVER);
menu_item = gtk_menu_item_new ();
gtk_widget_set_sensitive (menu_item, FALSE);
gtk_menu_append (GTK_MENU (menu), menu_item);
gtk_widget_show (menu_item);
for (i = 0;i<=server_filters->len;i++)
{
@ -2893,17 +2911,6 @@ static GtkWidget* create_filter_menu()
filter = g_array_index (server_filters, struct server_filter_vars*, i-1);
name = filter->filter_name;
}
// menu_item = gtk_menu_item_new_with_label(name);
// menu_item = gtk_menu_item_new();
// radiobutton = gtk_radio_button_new_with_label(rbgroup,name);
// rbgroup = gtk_radio_button_group(GTK_RADIO_BUTTON(radiobutton));
// gtk_container_add(GTK_CONTAINER(menu_item),radiobutton);
// gtk_widget_show(radiobutton);
// menu_item = gtk_check_menu_item_new_with_label(name);
// gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu_item), (current_server_filter == i));
// that doesn't do what the docu says, right?
// gtk_check_menu_item_set_show_toggle ( GTK_CHECK_MENU_ITEM (menu_item), FALSE);
menu_item = gtk_radio_menu_item_new_with_label(rbgroup,name);
rbgroup = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (menu_item));
@ -2916,6 +2923,7 @@ static GtkWidget* create_filter_menu()
gtk_signal_connect (GTK_OBJECT (menu_item), "activate",
GTK_SIGNAL_FUNC (server_filter_select_callback), (gpointer)i); // array starts from zero but filters from 1
/*
// add separator
if(i == 0)
{
@ -2924,6 +2932,7 @@ static GtkWidget* create_filter_menu()
gtk_menu_append (GTK_MENU (menu), menu_item);
gtk_widget_show (menu_item);
}
*/
}
// filter_menu = menu;
@ -3212,7 +3221,7 @@ void create_main_window (void) {
gtk_widget_set_usize (main_filter_status_bar, 100, -1);
gtk_box_pack_start (GTK_BOX (hbox), main_filter_status_bar, TRUE, TRUE, 0);
gtk_widget_show (main_filter_status_bar);
main_progress_bar = create_progress_bar ();
gtk_widget_set_usize (main_progress_bar, 200, -1);
gtk_box_pack_end (GTK_BOX (hbox), main_progress_bar, FALSE, FALSE, 0);