summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'plugins')
-rw-r--r--plugins/gtkui/deadbeef.glade80
-rw-r--r--plugins/gtkui/interface.c36
2 files changed, 58 insertions, 58 deletions
diff --git a/plugins/gtkui/deadbeef.glade b/plugins/gtkui/deadbeef.glade
index 6057e378..18f7b6e9 100644
--- a/plugins/gtkui/deadbeef.glade
+++ b/plugins/gtkui/deadbeef.glade
@@ -3451,6 +3451,46 @@ Album</property>
</child>
<child>
+ <widget class="GtkCheckButton" id="enable_cp1251_recoding">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Enable Russian CP1251 detection and recoding</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <property name="active">False</property>
+ <property name="inconsistent">False</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="on_enable_cp1251_recoding_toggled" last_modification_time="Mon, 03 Sep 2012 16:36:19 GMT"/>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkCheckButton" id="enable_cp936_recoding">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Enable Chinese CP936 detection and recoding</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <property name="active">False</property>
+ <property name="inconsistent">False</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="on_enable_cp936_recoding_toggled" last_modification_time="Mon, 03 Sep 2012 16:36:16 GMT"/>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
<widget class="GtkHBox" id="hbox102">
<property name="visible">True</property>
<property name="homogeneous">False</property>
@@ -3674,46 +3714,6 @@ Album</property>
<property name="fill">False</property>
</packing>
</child>
-
- <child>
- <widget class="GtkCheckButton" id="enable_cp1251_recoding">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Enable Russian CP1251 detection and recoding</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <property name="active">False</property>
- <property name="inconsistent">False</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_enable_cp1251_recoding_toggled" last_modification_time="Mon, 03 Sep 2012 16:36:19 GMT"/>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkCheckButton" id="enable_cp936_recoding">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Enable Chinese CP936 detection and recoding</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <property name="active">False</property>
- <property name="inconsistent">False</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_enable_cp936_recoding_toggled" last_modification_time="Mon, 03 Sep 2012 16:36:16 GMT"/>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
</widget>
<packing>
<property name="tab_expand">False</property>
diff --git a/plugins/gtkui/interface.c b/plugins/gtkui/interface.c
index 8d8753fd..8c38adf7 100644
--- a/plugins/gtkui/interface.c
+++ b/plugins/gtkui/interface.c
@@ -1710,6 +1710,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;
@@ -1722,8 +1724,6 @@ create_prefwin (void)
GtkWidget *hbox101;
GtkWidget *label128;
GtkWidget *gui_plugin;
- GtkWidget *enable_cp1251_recoding;
- GtkWidget *enable_cp936_recoding;
GtkWidget *label2;
GtkWidget *notebook4;
GtkWidget *vbox21;
@@ -2080,6 +2080,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);
@@ -2134,14 +2142,6 @@ create_prefwin (void)
gtk_widget_show (gui_plugin);
gtk_box_pack_start (GTK_BOX (hbox101), gui_plugin, TRUE, TRUE, 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);
-
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);
@@ -2679,6 +2679,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);
@@ -2691,12 +2697,6 @@ create_prefwin (void)
g_signal_connect ((gpointer) gui_plugin, "changed",
G_CALLBACK (on_gui_plugin_changed),
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) override_bar_colors, "toggled",
G_CALLBACK (on_override_bar_colors_toggled),
NULL);
@@ -2836,6 +2836,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");
@@ -2848,8 +2850,6 @@ create_prefwin (void)
GLADE_HOOKUP_OBJECT (prefwin, hbox101, "hbox101");
GLADE_HOOKUP_OBJECT (prefwin, label128, "label128");
GLADE_HOOKUP_OBJECT (prefwin, gui_plugin, "gui_plugin");
- GLADE_HOOKUP_OBJECT (prefwin, enable_cp1251_recoding, "enable_cp1251_recoding");
- GLADE_HOOKUP_OBJECT (prefwin, enable_cp936_recoding, "enable_cp936_recoding");
GLADE_HOOKUP_OBJECT (prefwin, label2, "label2");
GLADE_HOOKUP_OBJECT (prefwin, notebook4, "notebook4");
GLADE_HOOKUP_OBJECT (prefwin, vbox21, "vbox21");