diff options
| author |  waker <wakeroid@gmail.com> | 2012-04-09 16:29:23 +0200 |
|---|---|---|
| committer | waker <wakeroid@gmail.com> | 2012-04-09 16:29:23 +0200 |
| commit | 516f25073a726709abb83c3b73bd1e53404514c9 (patch) | |
| tree | 68113731910c0df756717191a9cfaf55be514130 /plugins/gtkui/prefwin.c | |
| parent | 6502057510696ea575a1cf0143dec02acb7cf01c (diff) | |
| parent | 1ed51a80ec0979bc0be453f75548c59965fbd6f5 (diff) | |
Merge branch 'master' into devel
Conflicts:
plugins/gtkui/callbacks.c
plugins/gtkui/callbacks.h
plugins/gtkui/gtkui.h
Diffstat (limited to 'plugins/gtkui/prefwin.c')
| -rw-r--r-- | plugins/gtkui/prefwin.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/plugins/gtkui/prefwin.c b/plugins/gtkui/prefwin.c index bfcc80c9..81bb49e1 100644 --- a/plugins/gtkui/prefwin.c +++ b/plugins/gtkui/prefwin.c @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko <waker@users.sourceforge.net> + Copyright (C) 2009-2012 Alexey Yakovenko <waker@users.sourceforge.net> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -533,6 +533,10 @@ on_preferences_activate (GtkMenuItem *menuitem, // add from archives gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (lookup_widget (w, "ignore_archives")), deadbeef->conf_get_int ("ignore_archives", 1)); + + // reset autostop + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (lookup_widget (w, "reset_autostop")), deadbeef->conf_get_int ("playlist.stop_after_current_reset", 0)); + // titlebar text gtk_entry_set_text (GTK_ENTRY (lookup_widget (w, "titlebar_format_playing")), deadbeef->conf_get_str_fast ("gtkui.titlebar_playing", "%a - %t - DeaDBeeF-%V")); gtk_entry_set_text (GTK_ENTRY (lookup_widget (w, "titlebar_format_stopped")), deadbeef->conf_get_str_fast ("gtkui.titlebar_stopped", "DeaDBeeF-%V")); @@ -1361,6 +1365,13 @@ on_ignore_archives_toggled (GtkToggleButton *togglebutton, deadbeef->conf_set_int ("ignore_archives", gtk_toggle_button_get_active (togglebutton)); } +void +on_reset_autostop_toggled (GtkToggleButton *togglebutton, + gpointer user_data) +{ + deadbeef->conf_set_int ("playlist.stop_after_current_reset", gtk_toggle_button_get_active (togglebutton)); +} + void |