diff options
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/gtkui/callbacks.c | 1 | ||||
-rw-r--r-- | plugins/gtkui/callbacks.h | 4 | ||||
-rw-r--r-- | plugins/gtkui/deadbeef.glade | 682 | ||||
-rw-r--r-- | plugins/gtkui/gtkui.c | 1 | ||||
-rw-r--r-- | plugins/gtkui/interface.c | 109 | ||||
-rw-r--r-- | plugins/gtkui/prefwin.c | 9 |
6 files changed, 475 insertions, 331 deletions
diff --git a/plugins/gtkui/callbacks.c b/plugins/gtkui/callbacks.c index 55eafd8d..42fb4dca 100644 --- a/plugins/gtkui/callbacks.c +++ b/plugins/gtkui/callbacks.c @@ -789,3 +789,4 @@ on_design_mode1_activate (GtkMenuItem *menuitem, w_set_design_mode (act ? 1 : 0); } + diff --git a/plugins/gtkui/callbacks.h b/plugins/gtkui/callbacks.h index 8cef5d47..2773cc65 100644 --- a/plugins/gtkui/callbacks.h +++ b/plugins/gtkui/callbacks.h @@ -1300,3 +1300,7 @@ gboolean on_searchwin_key_press_event (GtkWidget *widget, GdkEventKey *event, gpointer user_data); + +void +on_auto_size_columns_toggled (GtkToggleButton *togglebutton, + gpointer user_data); diff --git a/plugins/gtkui/deadbeef.glade b/plugins/gtkui/deadbeef.glade index 33d986c4..320292c8 100644 --- a/plugins/gtkui/deadbeef.glade +++ b/plugins/gtkui/deadbeef.glade @@ -3344,195 +3344,35 @@ Album</property> </child> <child> - <widget class="GtkVBox" id="vbox9"> + <widget class="GtkNotebook" id="notebook5"> <property name="border_width">12</property> <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">8</property> - - <child> - <widget class="GtkCheckButton" id="pref_close_send_to_tray"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Close minimizes to tray</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="clicked" handler="on_pref_close_send_to_tray_clicked" last_modification_time="Sat, 10 Oct 2009 18:52:15 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="mmb_delete_playlist"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Middle mouse button closes playlist</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_mmb_delete_playlist_toggled" last_modification_time="Fri, 02 Apr 2010 18:02:53 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="hide_tray_icon"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Hide system tray icon</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_hide_tray_icon_toggled" last_modification_time="Fri, 30 Jul 2010 18:27:34 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="embolden_current"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Use bold font for currently playing track</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_embolden_current_toggled" last_modification_time="Mon, 09 Aug 2010 19:39:55 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="hide_delete_from_disk"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Hide "Delete from disk" context menu item</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_hide_delete_from_disk_toggled" last_modification_time="Mon, 09 Aug 2010 20:50:29 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="auto_name_playlist_from_folder"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Auto-name playlists when adding a single folder</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_auto_name_playlist_from_folder_toggled" last_modification_time="Tue, 04 Jan 2011 20:49:15 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_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> + <property name="can_focus">True</property> + <property name="show_tabs">True</property> + <property name="show_border">True</property> + <property name="tab_pos">GTK_POS_TOP</property> + <property name="scrollable">False</property> + <property name="enable_popup">False</property> <child> - <widget class="GtkHBox" id="hbox102"> + <widget class="GtkVBox" id="vbox9"> + <property name="border_width">12</property> <property name="visible">True</property> <property name="homogeneous">False</property> <property name="spacing">8</property> <child> - <widget class="GtkLabel" id="label129"> + <widget class="GtkCheckButton" id="pref_close_send_to_tray"> <property name="visible">True</property> - <property name="label" translatable="yes">Interface refresh rate (times per second):</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Close minimizes to tray</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="clicked" handler="on_pref_close_send_to_tray_clicked" last_modification_time="Sat, 10 Oct 2009 18:52:15 GMT"/> </widget> <packing> <property name="padding">0</property> @@ -3542,54 +3382,37 @@ Album</property> </child> <child> - <widget class="GtkHScale" id="gui_fps"> + <widget class="GtkCheckButton" id="hide_tray_icon"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="draw_value">True</property> - <property name="value_pos">GTK_POS_RIGHT</property> - <property name="digits">0</property> - <property name="update_policy">GTK_UPDATE_CONTINUOUS</property> - <property name="inverted">False</property> - <property name="adjustment">10 1 30 0 0 0</property> - <signal name="value_changed" handler="on_gui_fps_value_changed" last_modification_time="Mon, 04 Apr 2011 20:11:49 GMT"/> + <property name="label" translatable="yes">Hide system tray icon</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_hide_tray_icon_toggled" last_modification_time="Fri, 30 Jul 2010 18:27:34 GMT"/> </widget> <packing> <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> + <property name="expand">False</property> + <property name="fill">False</property> </packing> </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkHBox" id="hbox64"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">8</property> <child> - <widget class="GtkLabel" id="label101"> + <widget class="GtkCheckButton" id="enable_cp1251_recoding"> <property name="visible">True</property> - <property name="label" translatable="yes">Titlebar text while playing:</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</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> @@ -3599,55 +3422,298 @@ Album</property> </child> <child> - <widget class="GtkEntry" id="titlebar_format_playing"> + <widget class="GtkCheckButton" id="enable_cp936_recoding"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="editable">True</property> - <property name="visibility">True</property> - <property name="max_length">0</property> - <property name="text" translatable="yes"></property> - <property name="has_frame">True</property> - <property name="invisible_char">•</property> - <property name="activates_default">False</property> - <signal name="changed" handler="on_titlebar_format_playing_changed" last_modification_time="Tue, 10 Aug 2010 17:20:07 GMT"/> + <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">True</property> - <property name="fill">True</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> + <property name="spacing">8</property> + + <child> + <widget class="GtkLabel" id="label129"> + <property name="visible">True</property> + <property name="label" translatable="yes">Interface refresh rate (times per second):</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkHScale" id="gui_fps"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="draw_value">True</property> + <property name="value_pos">GTK_POS_RIGHT</property> + <property name="digits">0</property> + <property name="update_policy">GTK_UPDATE_CONTINUOUS</property> + <property name="inverted">False</property> + <property name="adjustment">10 1 30 0 0 0</property> + <signal name="value_changed" handler="on_gui_fps_value_changed" last_modification_time="Mon, 04 Apr 2011 20:11:49 GMT"/> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkHBox" id="hbox64"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">8</property> + + <child> + <widget class="GtkLabel" id="label101"> + <property name="visible">True</property> + <property name="label" translatable="yes">Titlebar text while playing:</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkEntry" id="titlebar_format_playing"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="editable">True</property> + <property name="visibility">True</property> + <property name="max_length">0</property> + <property name="text" translatable="yes"></property> + <property name="has_frame">True</property> + <property name="invisible_char">•</property> + <property name="activates_default">False</property> + <signal name="changed" handler="on_titlebar_format_playing_changed" last_modification_time="Tue, 10 Aug 2010 17:20:07 GMT"/> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkHBox" id="hbox65"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">8</property> + + <child> + <widget class="GtkLabel" id="label102"> + <property name="visible">True</property> + <property name="label" translatable="yes">Titlebar text while stopped:</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkEntry" id="titlebar_format_stopped"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="editable">True</property> + <property name="visibility">True</property> + <property name="max_length">0</property> + <property name="text" translatable="yes"></property> + <property name="has_frame">True</property> + <property name="invisible_char">•</property> + <property name="activates_default">False</property> + <signal name="changed" handler="on_titlebar_format_stopped_changed" last_modification_time="Tue, 10 Aug 2010 17:20:19 GMT"/> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkHBox" id="hbox101"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">8</property> + + <child> + <widget class="GtkLabel" id="label128"> + <property name="visible">True</property> + <property name="label" translatable="yes">GUI Plugin (changing requires restart):</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkComboBox" id="gui_plugin"> + <property name="visible">True</property> + <property name="add_tearoffs">False</property> + <property name="focus_on_click">True</property> + <signal name="changed" handler="on_gui_plugin_changed" last_modification_time="Wed, 23 Mar 2011 20:30:20 GMT"/> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> </packing> </child> </widget> <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> + <property name="tab_expand">False</property> + <property name="tab_fill">True</property> </packing> </child> <child> - <widget class="GtkHBox" id="hbox65"> + <widget class="GtkLabel" id="label147"> + <property name="visible">True</property> + <property name="label" translatable="yes">Player</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="type">tab</property> + </packing> + </child> + + <child> + <widget class="GtkVBox" id="vbox44"> + <property name="border_width">12</property> <property name="visible">True</property> <property name="homogeneous">False</property> <property name="spacing">8</property> <child> - <widget class="GtkLabel" id="label102"> + <widget class="GtkCheckButton" id="mmb_delete_playlist"> <property name="visible">True</property> - <property name="label" translatable="yes">Titlebar text while stopped:</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Close playlists with middle mouse button</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_mmb_delete_playlist_toggled" last_modification_time="Fri, 02 Apr 2010 18:02:53 GMT"/> </widget> <packing> <property name="padding">0</property> @@ -3657,55 +3723,57 @@ Album</property> </child> <child> - <widget class="GtkEntry" id="titlebar_format_stopped"> + <widget class="GtkCheckButton" id="embolden_current"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="editable">True</property> - <property name="visibility">True</property> - <property name="max_length">0</property> - <property name="text" translatable="yes"></property> - <property name="has_frame">True</property> - <property name="invisible_char">•</property> - <property name="activates_default">False</property> - <signal name="changed" handler="on_titlebar_format_stopped_changed" last_modification_time="Tue, 10 Aug 2010 17:20:19 GMT"/> + <property name="label" translatable="yes">Draw playing track using bold font</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_embolden_current_toggled" last_modification_time="Mon, 09 Aug 2010 19:39:55 GMT"/> </widget> <packing> <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> + <property name="expand">False</property> + <property name="fill">False</property> </packing> </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - <child> - <widget class="GtkHBox" id="hbox101"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">8</property> + <child> + <widget class="GtkCheckButton" id="hide_delete_from_disk"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Hide "Delete from disk" context menu item</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_hide_delete_from_disk_toggled" last_modification_time="Mon, 09 Aug 2010 20:50:29 GMT"/> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> <child> - <widget class="GtkLabel" id="label128"> + <widget class="GtkCheckButton" id="auto_name_playlist_from_folder"> <property name="visible">True</property> - <property name="label" translatable="yes">GUI Plugin (changing requires restart):</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Auto-name playlists when adding a single folder</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_auto_name_playlist_from_folder_toggled" last_modification_time="Tue, 04 Jan 2011 20:49:15 GMT"/> </widget> <packing> <property name="padding">0</property> @@ -3715,23 +3783,51 @@ Album</property> </child> <child> - <widget class="GtkComboBox" id="gui_plugin"> + <widget class="GtkCheckButton" id="auto_size_columns"> <property name="visible">True</property> - <property name="add_tearoffs">False</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Auto-resize columns to fit the window</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> - <signal name="changed" handler="on_gui_plugin_changed" last_modification_time="Wed, 23 Mar 2011 20:30:20 GMT"/> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_auto_size_columns_toggled" last_modification_time="Sun, 27 Oct 2013 18:36:58 GMT"/> </widget> <packing> <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> + <property name="expand">False</property> + <property name="fill">False</property> </packing> </child> </widget> <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> + <property name="tab_expand">False</property> + <property name="tab_fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label148"> + <property name="visible">True</property> + <property name="label" translatable="yes">Playlist</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="type">tab</property> </packing> </child> </widget> diff --git a/plugins/gtkui/gtkui.c b/plugins/gtkui/gtkui.c index 5bf06308..cbf201fb 100644 --- a/plugins/gtkui/gtkui.c +++ b/plugins/gtkui/gtkui.c @@ -1655,7 +1655,6 @@ static const char settings_dlg[] = "property \"Custom status icon\" entry gtkui.custom_tray_icon \"" TRAY_ICON "\" ;\n" "property \"Run gtk_init with --sync (debug mode)\" checkbox gtkui.sync 0;\n" "property \"Add separators between plugin context menu items\" checkbox gtkui.action_separators 0;\n" - "property \"Auto-resize columns to fit the main window\" checkbox gtkui.autoresize_columns 0;\n" ; // define plugin interface diff --git a/plugins/gtkui/interface.c b/plugins/gtkui/interface.c index d2c133ae..9fb82c26 100644 --- a/plugins/gtkui/interface.c +++ b/plugins/gtkui/interface.c @@ -1645,13 +1645,10 @@ create_prefwin (void) GtkWidget *dsp_preset_save; GtkWidget *dsp_preset_load; GtkWidget *label110; + GtkWidget *notebook5; GtkWidget *vbox9; GtkWidget *pref_close_send_to_tray; - GtkWidget *mmb_delete_playlist; GtkWidget *hide_tray_icon; - GtkWidget *embolden_current; - GtkWidget *hide_delete_from_disk; - GtkWidget *auto_name_playlist_from_folder; GtkWidget *enable_cp1251_recoding; GtkWidget *enable_cp936_recoding; GtkWidget *hbox102; @@ -1666,6 +1663,14 @@ create_prefwin (void) GtkWidget *hbox101; GtkWidget *label128; GtkWidget *gui_plugin; + GtkWidget *label147; + GtkWidget *vbox44; + GtkWidget *mmb_delete_playlist; + GtkWidget *embolden_current; + GtkWidget *hide_delete_from_disk; + GtkWidget *auto_name_playlist_from_folder; + GtkWidget *auto_size_columns; + GtkWidget *label148; GtkWidget *label2; GtkWidget *notebook4; GtkWidget *vbox21; @@ -2026,35 +2031,24 @@ create_prefwin (void) gtk_widget_show (label110); gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), 2), label110); + notebook5 = gtk_notebook_new (); + gtk_widget_show (notebook5); + gtk_container_add (GTK_CONTAINER (notebook), notebook5); + gtk_container_set_border_width (GTK_CONTAINER (notebook5), 12); + vbox9 = gtk_vbox_new (FALSE, 8); gtk_widget_show (vbox9); - gtk_container_add (GTK_CONTAINER (notebook), vbox9); + gtk_container_add (GTK_CONTAINER (notebook5), vbox9); gtk_container_set_border_width (GTK_CONTAINER (vbox9), 12); pref_close_send_to_tray = gtk_check_button_new_with_mnemonic (_("Close minimizes to tray")); gtk_widget_show (pref_close_send_to_tray); gtk_box_pack_start (GTK_BOX (vbox9), pref_close_send_to_tray, FALSE, FALSE, 0); - mmb_delete_playlist = gtk_check_button_new_with_mnemonic (_("Middle mouse button closes playlist")); - gtk_widget_show (mmb_delete_playlist); - gtk_box_pack_start (GTK_BOX (vbox9), mmb_delete_playlist, FALSE, FALSE, 0); - hide_tray_icon = gtk_check_button_new_with_mnemonic (_("Hide system tray icon")); gtk_widget_show (hide_tray_icon); gtk_box_pack_start (GTK_BOX (vbox9), hide_tray_icon, FALSE, FALSE, 0); - embolden_current = gtk_check_button_new_with_mnemonic (_("Use bold font for currently playing track")); - gtk_widget_show (embolden_current); - gtk_box_pack_start (GTK_BOX (vbox9), embolden_current, FALSE, FALSE, 0); - - hide_delete_from_disk = gtk_check_button_new_with_mnemonic (_("Hide \"Delete from disk\" context menu item")); - gtk_widget_show (hide_delete_from_disk); - gtk_box_pack_start (GTK_BOX (vbox9), hide_delete_from_disk, FALSE, FALSE, 0); - - auto_name_playlist_from_folder = gtk_check_button_new_with_mnemonic (_("Auto-name playlists when adding a single folder")); - 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); @@ -2117,6 +2111,39 @@ create_prefwin (void) gtk_widget_show (gui_plugin); gtk_box_pack_start (GTK_BOX (hbox101), gui_plugin, TRUE, TRUE, 0); + label147 = gtk_label_new (_("Player")); + gtk_widget_show (label147); + gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook5), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook5), 0), label147); + + vbox44 = gtk_vbox_new (FALSE, 8); + gtk_widget_show (vbox44); + gtk_container_add (GTK_CONTAINER (notebook5), vbox44); + gtk_container_set_border_width (GTK_CONTAINER (vbox44), 12); + + mmb_delete_playlist = gtk_check_button_new_with_mnemonic (_("Close playlists with middle mouse button")); + gtk_widget_show (mmb_delete_playlist); + gtk_box_pack_start (GTK_BOX (vbox44), mmb_delete_playlist, FALSE, FALSE, 0); + + embolden_current = gtk_check_button_new_with_mnemonic (_("Draw playing track using bold font")); + gtk_widget_show (embolden_current); + gtk_box_pack_start (GTK_BOX (vbox44), embolden_current, FALSE, FALSE, 0); + + hide_delete_from_disk = gtk_check_button_new_with_mnemonic (_("Hide \"Delete from disk\" context menu item")); + gtk_widget_show (hide_delete_from_disk); + gtk_box_pack_start (GTK_BOX (vbox44), hide_delete_from_disk, FALSE, FALSE, 0); + + auto_name_playlist_from_folder = gtk_check_button_new_with_mnemonic (_("Auto-name playlists when adding a single folder")); + gtk_widget_show (auto_name_playlist_from_folder); + gtk_box_pack_start (GTK_BOX (vbox44), auto_name_playlist_from_folder, FALSE, FALSE, 0); + + auto_size_columns = gtk_check_button_new_with_mnemonic (_("Auto-resize columns to fit the window")); + gtk_widget_show (auto_size_columns); + gtk_box_pack_start (GTK_BOX (vbox44), auto_size_columns, FALSE, FALSE, 0); + + label148 = gtk_label_new (_("Playlist")); + gtk_widget_show (label148); + gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook5), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook5), 1), label148); + 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); @@ -2773,21 +2800,9 @@ create_prefwin (void) g_signal_connect ((gpointer) pref_close_send_to_tray, "clicked", G_CALLBACK (on_pref_close_send_to_tray_clicked), NULL); - g_signal_connect ((gpointer) mmb_delete_playlist, "toggled", - G_CALLBACK (on_mmb_delete_playlist_toggled), - NULL); g_signal_connect ((gpointer) hide_tray_icon, "toggled", G_CALLBACK (on_hide_tray_icon_toggled), NULL); - g_signal_connect ((gpointer) embolden_current, "toggled", - G_CALLBACK (on_embolden_current_toggled), - NULL); - g_signal_connect ((gpointer) hide_delete_from_disk, "toggled", - G_CALLBACK (on_hide_delete_from_disk_toggled), - NULL); - 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); @@ -2806,6 +2821,21 @@ create_prefwin (void) g_signal_connect ((gpointer) gui_plugin, "changed", G_CALLBACK (on_gui_plugin_changed), NULL); + g_signal_connect ((gpointer) mmb_delete_playlist, "toggled", + G_CALLBACK (on_mmb_delete_playlist_toggled), + NULL); + g_signal_connect ((gpointer) embolden_current, "toggled", + G_CALLBACK (on_embolden_current_toggled), + NULL); + g_signal_connect ((gpointer) hide_delete_from_disk, "toggled", + G_CALLBACK (on_hide_delete_from_disk_toggled), + NULL); + g_signal_connect ((gpointer) auto_name_playlist_from_folder, "toggled", + G_CALLBACK (on_auto_name_playlist_from_folder_toggled), + NULL); + g_signal_connect ((gpointer) auto_size_columns, "toggled", + G_CALLBACK (on_auto_size_columns_toggled), + NULL); g_signal_connect ((gpointer) override_bar_colors, "toggled", G_CALLBACK (on_override_bar_colors_toggled), NULL); @@ -2972,13 +3002,10 @@ create_prefwin (void) GLADE_HOOKUP_OBJECT (prefwin, dsp_preset_save, "dsp_preset_save"); GLADE_HOOKUP_OBJECT (prefwin, dsp_preset_load, "dsp_preset_load"); GLADE_HOOKUP_OBJECT (prefwin, label110, "label110"); + GLADE_HOOKUP_OBJECT (prefwin, notebook5, "notebook5"); GLADE_HOOKUP_OBJECT (prefwin, vbox9, "vbox9"); GLADE_HOOKUP_OBJECT (prefwin, pref_close_send_to_tray, "pref_close_send_to_tray"); - GLADE_HOOKUP_OBJECT (prefwin, mmb_delete_playlist, "mmb_delete_playlist"); GLADE_HOOKUP_OBJECT (prefwin, hide_tray_icon, "hide_tray_icon"); - 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"); @@ -2993,6 +3020,14 @@ 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, label147, "label147"); + GLADE_HOOKUP_OBJECT (prefwin, vbox44, "vbox44"); + GLADE_HOOKUP_OBJECT (prefwin, mmb_delete_playlist, "mmb_delete_playlist"); + 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, auto_size_columns, "auto_size_columns"); + GLADE_HOOKUP_OBJECT (prefwin, label148, "label148"); GLADE_HOOKUP_OBJECT (prefwin, label2, "label2"); GLADE_HOOKUP_OBJECT (prefwin, notebook4, "notebook4"); GLADE_HOOKUP_OBJECT (prefwin, vbox21, "vbox21"); diff --git a/plugins/gtkui/prefwin.c b/plugins/gtkui/prefwin.c index ca2c8883..bd48aec8 100644 --- a/plugins/gtkui/prefwin.c +++ b/plugins/gtkui/prefwin.c @@ -236,6 +236,8 @@ on_preferences_activate (GtkMenuItem *menuitem, // enable cp936 recoding gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (lookup_widget (w, "enable_cp936_recoding")), deadbeef->conf_get_int ("junk.enable_cp936_detection", 0)); + // enable auto-sizing of columns + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (lookup_widget (w, "auto_size_columns")), deadbeef->conf_get_int ("gtkui.autoresize_columns", 0)); // fill gui plugin list combobox = GTK_COMBO_BOX (lookup_widget (w, "gui_plugin")); @@ -1101,3 +1103,10 @@ on_useragent_changed (GtkEditable *editable, deadbeef->sendmessage (DB_EV_CONFIGCHANGED, 0, 0, 0); } +void +on_auto_size_columns_toggled (GtkToggleButton *togglebutton, + gpointer user_data) +{ + deadbeef->conf_set_int ("gtkui.autoresize_columns", gtk_toggle_button_get_active (togglebutton)); +} + |