From b59b2a2dafbb0843d223344c1f5dbd5837da4adb Mon Sep 17 00:00:00 2001 From: Anna Schumaker Date: Sat, 14 May 2016 08:59:54 -0400 Subject: [PATCH] gui/audio: Remove old pause after configuration code And rearrange UI widgets a bit Signed-off-by: Anna Schumaker --- gui/audio.c | 19 - include/tests/gui.h | 2 - share/ocarina/ocarina6.glade | 1038 ++++++++++++++++------------------ tests/gui/audio.c | 29 +- 4 files changed, 490 insertions(+), 598 deletions(-) diff --git a/gui/audio.c b/gui/audio.c index e06aa299..3758dd6b 100644 --- a/gui/audio.c +++ b/gui/audio.c @@ -50,29 +50,10 @@ static void __audio_change_state(GstState state) static void __audio_config_pause(int n) { - GtkToggleButton *enabled = GTK_TOGGLE_BUTTON(gui_builder_widget("o_pause_enabled")); GtkComboBox *combo = GTK_COMBO_BOX(gui_builder_widget("o_pause_after")); - - if (n >= 0) - gtk_spin_button_set_value(GTK_SPIN_BUTTON(gui_builder_widget("o_pause_count")), n); - gtk_toggle_button_set_active(enabled, n >= 0); gtk_combo_box_set_active(combo, n + 1); } -void __audio_pause_count(GtkSpinButton *count) -{ - audio_pause_after(gtk_spin_button_get_value(count)); -} - -void __audio_pause_enabled(GtkToggleButton *enabled, GtkSpinButton *count) -{ - int val = -1; - - if (gtk_toggle_button_get_active(enabled)) - val = gtk_spin_button_get_value(count); - audio_pause_after(val); -} - void __audio_pause_changed(GtkComboBox *combo, gpointer data) { int val = gtk_combo_box_get_active(combo) - 1; diff --git a/include/tests/gui.h b/include/tests/gui.h index 2eac127c..7cb08c32 100644 --- a/include/tests/gui.h +++ b/include/tests/gui.h @@ -7,8 +7,6 @@ #ifdef TEST_NEED_AUDIO void __audio_can_accel() {} void __audio_pause_changed() {} -void __audio_pause_count() {} -void __audio_pause_enabled() {} void __audio_seek() {} #endif diff --git a/share/ocarina/ocarina6.glade b/share/ocarina/ocarina6.glade index 396f6246..ebd2b428 100644 --- a/share/ocarina/ocarina6.glade +++ b/share/ocarina/ocarina6.glade @@ -287,523 +287,510 @@ - - = + True False - vertical + True - + True False - True + start + center + 5 + start - + True False - start + False + True + Previous track + center center - 5 - start + + - + True False - False - True - Previous track center center - - - - - True - False - center - center - 5 - 5 - 5 - 5 - media-skip-backward - - - - + 5 + 5 + 5 + 5 + media-skip-backward - - False - False - 0 - True - - - - - True - False - False - True - Start playback - center - center - - - - - True - False - center - center - 5 - 5 - 5 - 5 - media-playback-start - 5 - - - - - - - False - False - 1 - True - - - - - False - False - True - Pause playback - center - center - - - - - True - False - center - center - 5 - 5 - 5 - 5 - media-playback-pause - 5 - - - - - - - False - False - 2 - True - - - - - True - False - False - True - Next track - center - center - - - - - True - False - center - center - 5 - 5 - 5 - 5 - media-skip-forward - - - - - - - False - False - 4 - True - + + - 0 - 0 - 2 - 2 + False + False + 0 + True - - True - True - never - - - True - False - - - True - False - start - 5 - True - - - True - False - start - True - <span size='xx-large'></span> - True - - - 0 - 0 - 2 - - - - - True - False - start - True - <span size='x-large'></span> - True - - - 1 - 1 - - - - - True - False - start - True - <span size='x-large'></span> - True - - - 1 - 2 - - - - - True - False - start - system-users - - - 0 - 1 - - - - - True - False - start - media-optical - - - 0 - 2 - - - - - - - - - 2 - 0 - 4 - - - - + True False - 5 - - - True - False - True - center - <span size='large'>0:00</span> - True - - - False - True - 0 - - - - - True - False - center - o_progress - 0 - False - left - - - - True - True - 1 - - - - - True - False - center - <span size='large'>0:00</span> - True - - - False - True - 2 - - - - - 2 - 1 - 3 - - - - - True - False - end + False + True + Start playback + center center - 5 + + - + True False - end - Pause after - - - False - False - 0 - - - - - True - False - end + center center - 8 - 0 - - (disabled) - current track - next track - 2 tracks - 3 tracks - 4 tracks - 5 tracks - 6 tracks - 7 tracks - 8 tracks - 9 tracks - 10 tracks - 11 tracks - 12 tracks - 13 tracks - 14 tracks - 15 tracks - 16 tracks - 17 tracks - 18 tracks - 19 tracks - 20 tracks - 21 tracks - 22 tracks - 23 tracks - 24 tracks - 25 tracks - 26 tracks - 27 tracks - 28 tracks - 29 tracks - 30 tracks - 31 tracks - 32 tracks - 33 tracks - 34 tracks - 35 tracks - 36 tracks - 37 tracks - 38 tracks - 39 tracks - 40 tracks - 41 tracks - 42 tracks - 43 tracks - 44 tracks - 45 tracks - 46 tracks - 47 tracks - 48 tracks - 49 tracks - 50 tracks - 51 tracks - 52 tracks - 53 tracks - 54 tracks - 55 tracks - 56 tracks - 57 tracks - 58 tracks - 59 tracks - 60 tracks - 61 tracks - 62 tracks - 63 tracks - 64 tracks - 65 tracks - 66 tracks - 67 tracks - 68 tracks - 69 tracks - 70 tracks - 71 tracks - 72 tracks - 73 tracks - 74 tracks - 75 tracks - 76 tracks - 77 tracks - 78 tracks - 79 tracks - 80 tracks - 81 tracks - 82 tracks - 83 tracks - 84 tracks - 85 tracks - 86 tracks - 87 tracks - 88 tracks - 89 tracks - 90 tracks - 91 tracks - 92 tracks - 93 tracks - 94 tracks - 95 tracks - 96 tracks - 97 tracks - 98 tracks - 99 tracks - - + 5 + 5 + 5 + 5 + media-playback-start + 5 - - False - False - 1 - + + - 5 - 1 - 2 + False + False + 1 + True - - True + False - end - start - 5 - 10 - end + False + True + Pause playback + center + center + + - + True - True - True - Randomly pick tracks + False center center - image9 - + 5 + 5 + 5 + 5 + media-playback-pause + 5 - - False - False - 0 - True - - - - - True - True - True - Repeat tracks - center - center - image10 - - - - False - False - 1 - True - + + - 6 - 0 + False + False + 2 + True + + + + + True + False + False + True + Next track + center + center + + + + + True + False + center + center + 5 + 5 + 5 + 5 + media-skip-forward + + + + + + + False + False + 4 + True - False - True - 0 + 0 + 0 + 2 + 2 + + + + + True + True + never + + + True + False + + + True + False + start + 5 + True + + + True + False + start + True + <span size='xx-large'></span> + True + + + 0 + 0 + 2 + + + + + True + False + start + True + <span size='x-large'></span> + True + + + 1 + 1 + + + + + True + False + start + True + <span size='x-large'></span> + True + + + 1 + 2 + + + + + True + False + start + system-users + + + 0 + 1 + + + + + True + False + start + media-optical + + + 0 + 2 + + + + + + + + + 2 + 0 + 4 + + + + + True + False + 5 + + + True + False + True + center + <span size='large'>0:00</span> + True + + + False + True + 0 + + + + + True + False + center + o_progress + 0 + False + left + + + + True + True + 1 + + + + + True + False + center + <span size='large'>0:00</span> + True + + + False + True + 2 + + + + + 2 + 1 + 3 + + + + + True + False + end + center + 5 + + + True + False + end + Pause after + + + False + False + 0 + + + + + True + False + end + center + 8 + 0 + + (disabled) + current track + next track + 2 tracks + 3 tracks + 4 tracks + 5 tracks + 6 tracks + 7 tracks + 8 tracks + 9 tracks + 10 tracks + 11 tracks + 12 tracks + 13 tracks + 14 tracks + 15 tracks + 16 tracks + 17 tracks + 18 tracks + 19 tracks + 20 tracks + 21 tracks + 22 tracks + 23 tracks + 24 tracks + 25 tracks + 26 tracks + 27 tracks + 28 tracks + 29 tracks + 30 tracks + 31 tracks + 32 tracks + 33 tracks + 34 tracks + 35 tracks + 36 tracks + 37 tracks + 38 tracks + 39 tracks + 40 tracks + 41 tracks + 42 tracks + 43 tracks + 44 tracks + 45 tracks + 46 tracks + 47 tracks + 48 tracks + 49 tracks + 50 tracks + 51 tracks + 52 tracks + 53 tracks + 54 tracks + 55 tracks + 56 tracks + 57 tracks + 58 tracks + 59 tracks + 60 tracks + 61 tracks + 62 tracks + 63 tracks + 64 tracks + 65 tracks + 66 tracks + 67 tracks + 68 tracks + 69 tracks + 70 tracks + 71 tracks + 72 tracks + 73 tracks + 74 tracks + 75 tracks + 76 tracks + 77 tracks + 78 tracks + 79 tracks + 80 tracks + 81 tracks + 82 tracks + 83 tracks + 84 tracks + 85 tracks + 86 tracks + 87 tracks + 88 tracks + 89 tracks + 90 tracks + 91 tracks + 92 tracks + 93 tracks + 94 tracks + 95 tracks + 96 tracks + 97 tracks + 98 tracks + 99 tracks + + + + + False + False + 1 + + + + + 5 + 1 + 2 + + + + + True + False + end + start + 5 + 10 + end + + + True + True + True + Randomly pick tracks + center + center + image9 + + + + False + False + 0 + True + + + + + True + True + True + Repeat tracks + center + center + image10 + + + + False + False + 1 + True + + + + + 6 + 0 @@ -1204,51 +1191,42 @@ True False - 2 + True - - True + False - 5 - songs + start + center - False + True True - end + 5 0 - + True - True - False - adjustment1 - True - + False + end - False + True True - end 1 - - Pause after + True False - False - False - True - + end - False + True True - end + 5 2 @@ -1267,74 +1245,9 @@ - True - True - 1 - - - - - True - False - - - False - True - 2 - 3 - - - - - True - False - True - - - False - start - center - - - True - True - 5 - 0 - - - - - True - False - end - - - False - True - 5 - end - 1 - - - - - True - False - end - - - False - True - end - 3 - - - - - False - False - 1 - 4 + 0 + 2 + 7 @@ -1342,10 +1255,9 @@ - vertical - - + + diff --git a/tests/gui/audio.c b/tests/gui/audio.c index 8c9e8414..e12583a8 100644 --- a/tests/gui/audio.c +++ b/tests/gui/audio.c @@ -26,9 +26,15 @@ static inline bool test_get_toggle_state(const gchar *name) return gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gui_builder_widget(name))); } -static inline int test_spin_button_value(const gchar *name) +static inline gchar *test_get_pause_text() { - return gtk_spin_button_get_value(GTK_SPIN_BUTTON(gui_builder_widget(name))); + return gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(gui_builder_widget("o_pause_after"))); +} + +static inline void test_set_pause_after(unsigned int n) +{ + GtkComboBox *combo = GTK_COMBO_BOX(gui_builder_widget("o_pause_after")); + gtk_combo_box_set_active(combo, n + 1); } static inline void test_click_button(const gchar *name) @@ -58,8 +64,7 @@ static void test_audio() test_equal(gtk_widget_is_visible(gui_builder_widget("o_play")), true); test_equal(gtk_widget_is_visible(gui_builder_widget("o_pause")), false); - test_equal(test_get_toggle_state("o_pause_enabled"), (bool)false); - test_equal(test_spin_button_value("o_pause_count"), 0); + test_str_equal(test_get_pause_text(), "(disabled)"); test_equal(test_get_toggle_state("o_favorite"), (bool)false); test_equal(test_get_toggle_state("o_hide"), (bool)false); @@ -90,30 +95,26 @@ static void test_audio() test_equal(gtk_widget_is_visible(gui_builder_widget("o_play")), true); test_equal(gtk_widget_is_visible(gui_builder_widget("o_pause")), false); - test_click_button("o_pause_enabled"); - test_equal(test_get_toggle_state("o_pause_enabled"), (bool)true); + test_set_pause_after(0); audio_eos(); test_equal(audio_cur_track()->tr_track, 1); - test_equal(test_get_toggle_state("o_pause_enabled"), (bool)false); + test_str_equal(test_get_pause_text(), "(disabled)"); test_click_button("o_next"); test_equal(audio_cur_track()->tr_track, 2); test_equal(test_get_toggle_state("o_favorite"), (bool)false); test_equal(test_get_toggle_state("o_hide"), (bool)false); - gtk_spin_button_set_value( - GTK_SPIN_BUTTON(gui_builder_widget("o_pause_count")), 1); - test_equal(test_get_toggle_state("o_pause_enabled"), (bool)true); - test_equal(test_spin_button_value("o_pause_count"), 1); + test_set_pause_after(1); + test_str_equal(test_get_pause_text(), "next track"); audio_eos(); test_equal(audio_cur_track()->tr_track, 3); - test_equal(test_get_toggle_state("o_pause_enabled"), (bool)true); - test_equal(test_spin_button_value("o_pause_count"), 0); + test_str_equal(test_get_pause_text(), "current track"); audio_eos(); test_equal(audio_cur_track()->tr_track, 4); - test_equal(test_get_toggle_state("o_pause_enabled"), (bool)false); + test_str_equal(test_get_pause_text(), "(disabled)"); test_click_button("o_prev"); test_equal(audio_cur_track()->tr_track, 3);