diff options
Diffstat (limited to 'plugins/gtkui/interface.c')
| -rw-r--r-- | plugins/gtkui/interface.c | 219 |
1 files changed, 203 insertions, 16 deletions
diff --git a/plugins/gtkui/interface.c b/plugins/gtkui/interface.c index 7ccc50de..2b9f06ef 100644 --- a/plugins/gtkui/interface.c +++ b/plugins/gtkui/interface.c @@ -35,12 +35,21 @@ create_mainwin (void) GtkWidget *File; GtkWidget *File_menu; GtkWidget *open; +<<<<<<< HEAD GtkWidget *image563; GtkWidget *separator2; GtkWidget *add_files; GtkWidget *image564; GtkWidget *add_folders; GtkWidget *image565; +======= + GtkWidget *image587; + GtkWidget *separator2; + GtkWidget *add_files; + GtkWidget *image588; + GtkWidget *add_folders; + GtkWidget *image589; +>>>>>>> master GtkWidget *add_location1; GtkWidget *separatormenuitem1; GtkWidget *new_playlist1; @@ -48,18 +57,30 @@ create_mainwin (void) GtkWidget *playlist_save_as; GtkWidget *separator8; GtkWidget *quit; +<<<<<<< HEAD GtkWidget *image566; GtkWidget *Edit; GtkWidget *Edit_menu; GtkWidget *clear1; GtkWidget *image567; +======= + GtkWidget *image590; + GtkWidget *Edit; + GtkWidget *Edit_menu; + GtkWidget *clear1; + GtkWidget *image591; +>>>>>>> master GtkWidget *select_all1; GtkWidget *deselect_all1; GtkWidget *invert_selection1; GtkWidget *Selection; GtkWidget *Selection_menu; GtkWidget *remove1; +<<<<<<< HEAD GtkWidget *image568; +======= + GtkWidget *image592; +>>>>>>> master GtkWidget *crop1; GtkWidget *find1; GtkWidget *sort_by1; @@ -103,16 +124,26 @@ create_mainwin (void) GtkWidget *Help; GtkWidget *Help_menu; GtkWidget *help1; +<<<<<<< HEAD GtkWidget *image569; +======= + GtkWidget *image593; +>>>>>>> master GtkWidget *changelog1; GtkWidget *separator10; GtkWidget *gpl1; GtkWidget *lgpl1; GtkWidget *separator9; GtkWidget *about1; +<<<<<<< HEAD GtkWidget *image570; GtkWidget *translators1; GtkWidget *image571; +======= + GtkWidget *image594; + GtkWidget *translators1; + GtkWidget *image595; +>>>>>>> master GtkWidget *hbox2; GtkWidget *hbox3; GtkWidget *stopbtn; @@ -127,6 +158,11 @@ create_mainwin (void) GtkWidget *image5; GtkWidget *seekbar; GtkWidget *volumebar; +<<<<<<< HEAD +======= + GtkWidget *tabstrip; + GtkWidget *playlist; +>>>>>>> master GtkWidget *plugins_bottom_vbox; GtkWidget *statusbar; GtkAccelGroup *accel_group; @@ -160,9 +196,15 @@ create_mainwin (void) GDK_O, (GdkModifierType) GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE); +<<<<<<< HEAD image563 = gtk_image_new_from_stock ("gtk-open", GTK_ICON_SIZE_MENU); gtk_widget_show (image563); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (open), image563); +======= + image587 = gtk_image_new_from_stock ("gtk-open", GTK_ICON_SIZE_MENU); + gtk_widget_show (image587); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (open), image587); +>>>>>>> master separator2 = gtk_separator_menu_item_new (); gtk_widget_show (separator2); @@ -173,17 +215,29 @@ create_mainwin (void) gtk_widget_show (add_files); gtk_container_add (GTK_CONTAINER (File_menu), add_files); +<<<<<<< HEAD image564 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); gtk_widget_show (image564); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_files), image564); +======= + image588 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image588); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_files), image588); +>>>>>>> master add_folders = gtk_image_menu_item_new_with_mnemonic (_("Add folder(s)")); gtk_widget_show (add_folders); gtk_container_add (GTK_CONTAINER (File_menu), add_folders); +<<<<<<< HEAD image565 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); gtk_widget_show (image565); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_folders), image565); +======= + image589 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image589); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_folders), image589); +>>>>>>> master add_location1 = gtk_menu_item_new_with_mnemonic (_("Add location")); gtk_widget_show (add_location1); @@ -221,9 +275,15 @@ create_mainwin (void) GDK_Q, (GdkModifierType) GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE); +<<<<<<< HEAD image566 = gtk_image_new_from_stock ("gtk-quit", GTK_ICON_SIZE_MENU); gtk_widget_show (image566); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (quit), image566); +======= + image590 = gtk_image_new_from_stock ("gtk-quit", GTK_ICON_SIZE_MENU); + gtk_widget_show (image590); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (quit), image590); +>>>>>>> master Edit = gtk_menu_item_new_with_mnemonic (_("_Edit")); gtk_widget_show (Edit); @@ -236,9 +296,15 @@ create_mainwin (void) gtk_widget_show (clear1); gtk_container_add (GTK_CONTAINER (Edit_menu), clear1); +<<<<<<< HEAD image567 = gtk_image_new_from_stock ("gtk-clear", GTK_ICON_SIZE_MENU); gtk_widget_show (image567); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (clear1), image567); +======= + image591 = gtk_image_new_from_stock ("gtk-clear", GTK_ICON_SIZE_MENU); + gtk_widget_show (image591); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (clear1), image591); +>>>>>>> master select_all1 = gtk_menu_item_new_with_mnemonic (_("Select all")); gtk_widget_show (select_all1); @@ -269,9 +335,15 @@ create_mainwin (void) gtk_widget_show (remove1); gtk_container_add (GTK_CONTAINER (Selection_menu), remove1); +<<<<<<< HEAD image568 = gtk_image_new_from_stock ("gtk-remove", GTK_ICON_SIZE_MENU); gtk_widget_show (image568); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (remove1), image568); +======= + image592 = gtk_image_new_from_stock ("gtk-remove", GTK_ICON_SIZE_MENU); + gtk_widget_show (image592); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (remove1), image592); +>>>>>>> master crop1 = gtk_menu_item_new_with_mnemonic (_("Crop")); gtk_widget_show (crop1); @@ -284,7 +356,7 @@ create_mainwin (void) GDK_F, (GdkModifierType) GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE); - sort_by1 = gtk_menu_item_new_with_mnemonic (_("Sort By")); + sort_by1 = gtk_menu_item_new_with_mnemonic (_("Sort by")); gtk_widget_show (sort_by1); gtk_container_add (GTK_CONTAINER (Edit_menu), sort_by1); @@ -400,19 +472,19 @@ create_mainwin (void) Looping_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (Looping), Looping_menu); - loop_all = gtk_radio_menu_item_new_with_mnemonic (loop_all_group, _("Loop All")); + loop_all = gtk_radio_menu_item_new_with_mnemonic (loop_all_group, _("Loop all")); loop_all_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (loop_all)); gtk_widget_show (loop_all); gtk_container_add (GTK_CONTAINER (Looping_menu), loop_all); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (loop_all), TRUE); - loop_single = gtk_radio_menu_item_new_with_mnemonic (loop_all_group, _("Loop Single Song")); + loop_single = gtk_radio_menu_item_new_with_mnemonic (loop_all_group, _("Loop single song")); loop_all_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (loop_single)); gtk_widget_show (loop_single); gtk_container_add (GTK_CONTAINER (Looping_menu), loop_single); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (loop_single), TRUE); - loop_disable = gtk_radio_menu_item_new_with_mnemonic (loop_all_group, _("Don't Loop")); + loop_disable = gtk_radio_menu_item_new_with_mnemonic (loop_all_group, _("Don't loop")); loop_all_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (loop_disable)); gtk_widget_show (loop_disable); gtk_container_add (GTK_CONTAINER (Looping_menu), loop_disable); @@ -457,9 +529,15 @@ create_mainwin (void) gtk_widget_show (help1); gtk_container_add (GTK_CONTAINER (Help_menu), help1); +<<<<<<< HEAD image569 = gtk_image_new_from_stock ("gtk-help", GTK_ICON_SIZE_MENU); gtk_widget_show (image569); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (help1), image569); +======= + image593 = gtk_image_new_from_stock ("gtk-help", GTK_ICON_SIZE_MENU); + gtk_widget_show (image593); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (help1), image593); +>>>>>>> master changelog1 = gtk_menu_item_new_with_mnemonic (_("_ChangeLog")); gtk_widget_show (changelog1); @@ -487,17 +565,29 @@ create_mainwin (void) gtk_widget_show (about1); gtk_container_add (GTK_CONTAINER (Help_menu), about1); +<<<<<<< HEAD image570 = gtk_image_new_from_stock ("gtk-about", GTK_ICON_SIZE_MENU); gtk_widget_show (image570); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (about1), image570); +======= + image594 = gtk_image_new_from_stock ("gtk-about", GTK_ICON_SIZE_MENU); + gtk_widget_show (image594); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (about1), image594); +>>>>>>> master translators1 = gtk_image_menu_item_new_with_mnemonic (_("_Translators")); gtk_widget_show (translators1); gtk_container_add (GTK_CONTAINER (Help_menu), translators1); +<<<<<<< HEAD image571 = gtk_image_new_from_stock ("gtk-about", GTK_ICON_SIZE_MENU); gtk_widget_show (image571); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (translators1), image571); +======= + image595 = gtk_image_new_from_stock ("gtk-about", GTK_ICON_SIZE_MENU); + gtk_widget_show (image595); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (translators1), image595); +>>>>>>> master hbox2 = gtk_hbox_new (FALSE, 0); gtk_widget_show (hbox2); @@ -530,6 +620,9 @@ create_mainwin (void) gtk_widget_add_accelerator (playbtn, "activate", accel_group, GDK_Return, (GdkModifierType) 0, GTK_ACCEL_VISIBLE); + gtk_widget_add_accelerator (playbtn, "activate", accel_group, + GDK_KP_Enter, (GdkModifierType) 0, + GTK_ACCEL_VISIBLE); gtk_button_set_relief (GTK_BUTTON (playbtn), GTK_RELIEF_NONE); image2 = gtk_image_new_from_stock ("gtk-media-play", GTK_ICON_SIZE_BUTTON); @@ -592,6 +685,22 @@ create_mainwin (void) gtk_widget_set_can_focus(volumebar, FALSE); gtk_widget_set_can_default(volumebar, FALSE); +<<<<<<< HEAD +======= + tabstrip = create_tabstrip_widget ("tabstrip", "", "", 0, 0); + gtk_widget_show (tabstrip); + gtk_box_pack_start (GTK_BOX (vbox1), tabstrip, FALSE, TRUE, 0); + gtk_widget_set_size_request (tabstrip, -1, 24); + gtk_widget_set_can_focus(tabstrip, FALSE); + gtk_widget_set_can_default(tabstrip, FALSE); + + playlist = create_ddb_listview_widget ("playlist", "", "", 0, 0); + gtk_widget_show (playlist); + gtk_box_pack_start (GTK_BOX (vbox1), playlist, TRUE, TRUE, 0); + gtk_widget_set_can_focus(playlist, FALSE); + gtk_widget_set_can_default(playlist, FALSE); + +>>>>>>> master plugins_bottom_vbox = gtk_vbox_new (FALSE, 0); gtk_widget_show (plugins_bottom_vbox); gtk_box_pack_start (GTK_BOX (vbox1), plugins_bottom_vbox, TRUE, TRUE, 0); @@ -785,12 +894,21 @@ create_mainwin (void) GLADE_HOOKUP_OBJECT (mainwin, File, "File"); GLADE_HOOKUP_OBJECT (mainwin, File_menu, "File_menu"); GLADE_HOOKUP_OBJECT (mainwin, open, "open"); +<<<<<<< HEAD GLADE_HOOKUP_OBJECT (mainwin, image563, "image563"); GLADE_HOOKUP_OBJECT (mainwin, separator2, "separator2"); GLADE_HOOKUP_OBJECT (mainwin, add_files, "add_files"); GLADE_HOOKUP_OBJECT (mainwin, image564, "image564"); GLADE_HOOKUP_OBJECT (mainwin, add_folders, "add_folders"); GLADE_HOOKUP_OBJECT (mainwin, image565, "image565"); +======= + GLADE_HOOKUP_OBJECT (mainwin, image587, "image587"); + GLADE_HOOKUP_OBJECT (mainwin, separator2, "separator2"); + GLADE_HOOKUP_OBJECT (mainwin, add_files, "add_files"); + GLADE_HOOKUP_OBJECT (mainwin, image588, "image588"); + GLADE_HOOKUP_OBJECT (mainwin, add_folders, "add_folders"); + GLADE_HOOKUP_OBJECT (mainwin, image589, "image589"); +>>>>>>> master GLADE_HOOKUP_OBJECT (mainwin, add_location1, "add_location1"); GLADE_HOOKUP_OBJECT (mainwin, separatormenuitem1, "separatormenuitem1"); GLADE_HOOKUP_OBJECT (mainwin, new_playlist1, "new_playlist1"); @@ -798,18 +916,30 @@ create_mainwin (void) GLADE_HOOKUP_OBJECT (mainwin, playlist_save_as, "playlist_save_as"); GLADE_HOOKUP_OBJECT (mainwin, separator8, "separator8"); GLADE_HOOKUP_OBJECT (mainwin, quit, "quit"); +<<<<<<< HEAD GLADE_HOOKUP_OBJECT (mainwin, image566, "image566"); GLADE_HOOKUP_OBJECT (mainwin, Edit, "Edit"); GLADE_HOOKUP_OBJECT (mainwin, Edit_menu, "Edit_menu"); GLADE_HOOKUP_OBJECT (mainwin, clear1, "clear1"); GLADE_HOOKUP_OBJECT (mainwin, image567, "image567"); +======= + GLADE_HOOKUP_OBJECT (mainwin, image590, "image590"); + GLADE_HOOKUP_OBJECT (mainwin, Edit, "Edit"); + GLADE_HOOKUP_OBJECT (mainwin, Edit_menu, "Edit_menu"); + GLADE_HOOKUP_OBJECT (mainwin, clear1, "clear1"); + GLADE_HOOKUP_OBJECT (mainwin, image591, "image591"); +>>>>>>> master GLADE_HOOKUP_OBJECT (mainwin, select_all1, "select_all1"); GLADE_HOOKUP_OBJECT (mainwin, deselect_all1, "deselect_all1"); GLADE_HOOKUP_OBJECT (mainwin, invert_selection1, "invert_selection1"); GLADE_HOOKUP_OBJECT (mainwin, Selection, "Selection"); GLADE_HOOKUP_OBJECT (mainwin, Selection_menu, "Selection_menu"); GLADE_HOOKUP_OBJECT (mainwin, remove1, "remove1"); +<<<<<<< HEAD GLADE_HOOKUP_OBJECT (mainwin, image568, "image568"); +======= + GLADE_HOOKUP_OBJECT (mainwin, image592, "image592"); +>>>>>>> master GLADE_HOOKUP_OBJECT (mainwin, crop1, "crop1"); GLADE_HOOKUP_OBJECT (mainwin, find1, "find1"); GLADE_HOOKUP_OBJECT (mainwin, sort_by1, "sort_by1"); @@ -851,16 +981,26 @@ create_mainwin (void) GLADE_HOOKUP_OBJECT (mainwin, Help, "Help"); GLADE_HOOKUP_OBJECT (mainwin, Help_menu, "Help_menu"); GLADE_HOOKUP_OBJECT (mainwin, help1, "help1"); +<<<<<<< HEAD GLADE_HOOKUP_OBJECT (mainwin, image569, "image569"); +======= + GLADE_HOOKUP_OBJECT (mainwin, image593, "image593"); +>>>>>>> master GLADE_HOOKUP_OBJECT (mainwin, changelog1, "changelog1"); GLADE_HOOKUP_OBJECT (mainwin, separator10, "separator10"); GLADE_HOOKUP_OBJECT (mainwin, gpl1, "gpl1"); GLADE_HOOKUP_OBJECT (mainwin, lgpl1, "lgpl1"); GLADE_HOOKUP_OBJECT (mainwin, separator9, "separator9"); GLADE_HOOKUP_OBJECT (mainwin, about1, "about1"); +<<<<<<< HEAD GLADE_HOOKUP_OBJECT (mainwin, image570, "image570"); GLADE_HOOKUP_OBJECT (mainwin, translators1, "translators1"); GLADE_HOOKUP_OBJECT (mainwin, image571, "image571"); +======= + GLADE_HOOKUP_OBJECT (mainwin, image594, "image594"); + GLADE_HOOKUP_OBJECT (mainwin, translators1, "translators1"); + GLADE_HOOKUP_OBJECT (mainwin, image595, "image595"); +>>>>>>> master GLADE_HOOKUP_OBJECT (mainwin, hbox2, "hbox2"); GLADE_HOOKUP_OBJECT (mainwin, hbox3, "hbox3"); GLADE_HOOKUP_OBJECT (mainwin, stopbtn, "stopbtn"); @@ -875,6 +1015,11 @@ create_mainwin (void) GLADE_HOOKUP_OBJECT (mainwin, image5, "image5"); GLADE_HOOKUP_OBJECT (mainwin, seekbar, "seekbar"); GLADE_HOOKUP_OBJECT (mainwin, volumebar, "volumebar"); +<<<<<<< HEAD +======= + GLADE_HOOKUP_OBJECT (mainwin, tabstrip, "tabstrip"); + GLADE_HOOKUP_OBJECT (mainwin, playlist, "playlist"); +>>>>>>> master GLADE_HOOKUP_OBJECT (mainwin, plugins_bottom_vbox, "plugins_bottom_vbox"); GLADE_HOOKUP_OBJECT (mainwin, statusbar, "statusbar"); @@ -889,7 +1034,6 @@ create_searchwin (void) GtkWidget *searchwin; GtkWidget *vbox4; GtkWidget *searchentry; - GtkWidget *frame2; GtkWidget *searchlist; searchwin = gtk_window_new (GTK_WINDOW_TOPLEVEL); @@ -898,10 +1042,9 @@ create_searchwin (void) gtk_window_set_skip_taskbar_hint (GTK_WINDOW (searchwin), TRUE); gtk_window_set_skip_pager_hint (GTK_WINDOW (searchwin), TRUE); - vbox4 = gtk_vbox_new (FALSE, 0); + vbox4 = gtk_vbox_new (FALSE, 4); gtk_widget_show (vbox4); gtk_container_add (GTK_CONTAINER (searchwin), vbox4); - gtk_container_set_border_width (GTK_CONTAINER (vbox4), 4); searchentry = gtk_entry_new (); gtk_widget_show (searchentry); @@ -909,13 +1052,9 @@ create_searchwin (void) gtk_entry_set_invisible_char (GTK_ENTRY (searchentry), 8226); gtk_entry_set_activates_default (GTK_ENTRY (searchentry), TRUE); - frame2 = gtk_frame_new (NULL); - gtk_widget_show (frame2); - gtk_box_pack_start (GTK_BOX (vbox4), frame2, TRUE, TRUE, 0); - searchlist = create_ddb_listview_widget ("searchlist", "", "", 0, 0); gtk_widget_show (searchlist); - gtk_container_add (GTK_CONTAINER (frame2), searchlist); + gtk_box_pack_start (GTK_BOX (vbox4), searchlist, TRUE, TRUE, 0); gtk_widget_set_can_focus(searchlist, FALSE); gtk_widget_set_can_default(searchlist, FALSE); @@ -939,7 +1078,6 @@ create_searchwin (void) GLADE_HOOKUP_OBJECT_NO_REF (searchwin, searchwin, "searchwin"); GLADE_HOOKUP_OBJECT (searchwin, vbox4, "vbox4"); GLADE_HOOKUP_OBJECT (searchwin, searchentry, "searchentry"); - GLADE_HOOKUP_OBJECT (searchwin, frame2, "frame2"); GLADE_HOOKUP_OBJECT (searchwin, searchlist, "searchlist"); return searchwin; @@ -1604,6 +1742,9 @@ create_editcolumndlg (void) gtk_widget_show (label85); gtk_box_pack_start (GTK_BOX (hbox49), label85, FALSE, FALSE, 0); + g_signal_connect ((gpointer) title, "changed", + G_CALLBACK (on_editcolumn_title_changed), + NULL); g_signal_connect ((gpointer) id, "changed", G_CALLBACK (on_column_id_changed), NULL); @@ -1703,6 +1844,8 @@ create_prefwin (void) GtkWidget *embolden_current; GtkWidget *hide_delete_from_disk; GtkWidget *auto_name_playlist_from_folder; + GtkWidget *enable_cp1251_recoding; + GtkWidget *enable_cp936_recoding; GtkWidget *hbox102; GtkWidget *label129; GtkWidget *gui_fps; @@ -1773,6 +1916,10 @@ create_prefwin (void) GtkWidget *hbox62; GtkWidget *label98; GtkWidget *proxypassword; + GtkWidget *hseparator1; + GtkWidget *hbox104; + GtkWidget *label131; + GtkWidget *useragent; GtkWidget *label16; GtkWidget *hpaned1; GtkWidget *scrolledwindow2; @@ -2067,6 +2214,14 @@ create_prefwin (void) gtk_widget_show (auto_name_playlist_from_folder); gtk_box_pack_start (GTK_BOX (vbox9), auto_name_playlist_from_folder, FALSE, FALSE, 0); + enable_cp1251_recoding = gtk_check_button_new_with_mnemonic (_("Enable Russian CP1251 detection and recoding")); + gtk_widget_show (enable_cp1251_recoding); + gtk_box_pack_start (GTK_BOX (vbox9), enable_cp1251_recoding, FALSE, FALSE, 0); + + enable_cp936_recoding = gtk_check_button_new_with_mnemonic (_("Enable Chinese CP936 detection and recoding")); + gtk_widget_show (enable_cp936_recoding); + gtk_box_pack_start (GTK_BOX (vbox9), enable_cp936_recoding, FALSE, FALSE, 0); + hbox102 = gtk_hbox_new (FALSE, 8); gtk_widget_show (hbox102); gtk_box_pack_start (GTK_BOX (vbox9), hbox102, FALSE, FALSE, 0); @@ -2121,7 +2276,7 @@ create_prefwin (void) gtk_widget_show (gui_plugin); gtk_box_pack_start (GTK_BOX (hbox101), gui_plugin, TRUE, TRUE, 0); - label2 = gtk_label_new (_("GUI")); + label2 = gtk_label_new (_("GUI/Misc")); gtk_widget_show (label2); gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), 3), label2); @@ -2441,6 +2596,23 @@ create_prefwin (void) gtk_entry_set_visibility (GTK_ENTRY (proxypassword), FALSE); gtk_entry_set_invisible_char (GTK_ENTRY (proxypassword), 9679); + hseparator1 = gtk_hseparator_new (); + gtk_widget_show (hseparator1); + gtk_box_pack_start (GTK_BOX (vbox11), hseparator1, FALSE, TRUE, 0); + + hbox104 = gtk_hbox_new (FALSE, 8); + gtk_widget_show (hbox104); + gtk_box_pack_start (GTK_BOX (vbox11), hbox104, FALSE, TRUE, 0); + + label131 = gtk_label_new (_("HTTP User Agent:")); + gtk_widget_show (label131); + gtk_box_pack_start (GTK_BOX (hbox104), label131, FALSE, FALSE, 0); + + useragent = gtk_entry_new (); + gtk_widget_show (useragent); + gtk_box_pack_start (GTK_BOX (hbox104), useragent, TRUE, TRUE, 0); + gtk_entry_set_invisible_char (GTK_ENTRY (useragent), 8226); + label16 = gtk_label_new (_("Network")); gtk_widget_show (label16); gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), 5), label16); @@ -2641,6 +2813,12 @@ create_prefwin (void) g_signal_connect ((gpointer) auto_name_playlist_from_folder, "toggled", G_CALLBACK (on_auto_name_playlist_from_folder_toggled), NULL); + g_signal_connect ((gpointer) enable_cp1251_recoding, "toggled", + G_CALLBACK (on_enable_cp1251_recoding_toggled), + NULL); + g_signal_connect ((gpointer) enable_cp936_recoding, "toggled", + G_CALLBACK (on_enable_cp936_recoding_toggled), + NULL); g_signal_connect ((gpointer) gui_fps, "value_changed", G_CALLBACK (on_gui_fps_value_changed), NULL); @@ -2719,6 +2897,9 @@ create_prefwin (void) g_signal_connect ((gpointer) proxypassword, "changed", G_CALLBACK (on_proxypassword_changed), NULL); + g_signal_connect ((gpointer) useragent, "changed", + G_CALLBACK (on_useragent_changed), + NULL); g_signal_connect ((gpointer) pref_pluginlist, "cursor_changed", G_CALLBACK (on_pref_pluginlist_cursor_changed), NULL); @@ -2789,6 +2970,8 @@ create_prefwin (void) GLADE_HOOKUP_OBJECT (prefwin, embolden_current, "embolden_current"); GLADE_HOOKUP_OBJECT (prefwin, hide_delete_from_disk, "hide_delete_from_disk"); GLADE_HOOKUP_OBJECT (prefwin, auto_name_playlist_from_folder, "auto_name_playlist_from_folder"); + GLADE_HOOKUP_OBJECT (prefwin, enable_cp1251_recoding, "enable_cp1251_recoding"); + GLADE_HOOKUP_OBJECT (prefwin, enable_cp936_recoding, "enable_cp936_recoding"); GLADE_HOOKUP_OBJECT (prefwin, hbox102, "hbox102"); GLADE_HOOKUP_OBJECT (prefwin, label129, "label129"); GLADE_HOOKUP_OBJECT (prefwin, gui_fps, "gui_fps"); @@ -2859,6 +3042,10 @@ create_prefwin (void) GLADE_HOOKUP_OBJECT (prefwin, hbox62, "hbox62"); GLADE_HOOKUP_OBJECT (prefwin, label98, "label98"); GLADE_HOOKUP_OBJECT (prefwin, proxypassword, "proxypassword"); + GLADE_HOOKUP_OBJECT (prefwin, hseparator1, "hseparator1"); + GLADE_HOOKUP_OBJECT (prefwin, hbox104, "hbox104"); + GLADE_HOOKUP_OBJECT (prefwin, label131, "label131"); + GLADE_HOOKUP_OBJECT (prefwin, useragent, "useragent"); GLADE_HOOKUP_OBJECT (prefwin, label16, "label16"); GLADE_HOOKUP_OBJECT (prefwin, hpaned1, "hpaned1"); GLADE_HOOKUP_OBJECT (prefwin, scrolledwindow2, "scrolledwindow2"); @@ -3140,7 +3327,7 @@ create_groupbydlg (void) GtkWidget *label83; groupbydlg = gtk_dialog_new (); - gtk_window_set_title (GTK_WINDOW (groupbydlg), _("Group By")); + gtk_window_set_title (GTK_WINDOW (groupbydlg), _("Group By ...")); gtk_window_set_type_hint (GTK_WINDOW (groupbydlg), GDK_WINDOW_TYPE_HINT_DIALOG); dialog_vbox5 = gtk_dialog_get_content_area (GTK_DIALOG (groupbydlg)); @@ -3264,7 +3451,7 @@ create_sortbydlg (void) GtkWidget *okbutton5; sortbydlg = gtk_dialog_new (); - gtk_window_set_title (GTK_WINDOW (sortbydlg), _("Sort by...")); + gtk_window_set_title (GTK_WINDOW (sortbydlg), _("Sort by ...")); gtk_window_set_modal (GTK_WINDOW (sortbydlg), TRUE); gtk_window_set_type_hint (GTK_WINDOW (sortbydlg), GDK_WINDOW_TYPE_HINT_DIALOG); |