gui/audio: Add new GtkComboBox for controlling automatic pausing
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
This commit is contained in:
Anna Schumaker
parent
ac468ec3de
commit
bf73685098
|
|
@ -1,4 +1,5 @@
|
|||
6.4.12:
|
||||
- Control automatic pausing with a GtkComboBox
|
||||
- Move current position slider into the top section
|
||||
- Tooltip updates
|
||||
- Swap position of random/repeat and favorite/hide buttons
|
||||
|
|
|
|||
|
|
@ -51,10 +51,12 @@ 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)
|
||||
|
|
@ -71,6 +73,12 @@ void __audio_pause_enabled(GtkToggleButton *enabled, GtkSpinButton *count)
|
|||
audio_pause_after(val);
|
||||
}
|
||||
|
||||
void __audio_pause_changed(GtkComboBox *combo, gpointer data)
|
||||
{
|
||||
int val = gtk_combo_box_get_active(combo) - 1;
|
||||
audio_pause_after(val);
|
||||
}
|
||||
|
||||
void __audio_seek(GtkRange *range, GtkScrollType type, double value, gpointer data)
|
||||
{
|
||||
audio_seek(value * GST_SECOND);
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@
|
|||
|
||||
#ifdef TEST_NEED_AUDIO
|
||||
void __audio_can_accel() {}
|
||||
void __audio_pause_changed() {}
|
||||
void __audio_pause_count() {}
|
||||
void __audio_pause_enabled() {}
|
||||
void __audio_seek() {}
|
||||
|
|
|
|||
|
|
@ -541,59 +541,7 @@
|
|||
<packing>
|
||||
<property name="left_attach">2</property>
|
||||
<property name="top_attach">0</property>
|
||||
<property name="width">3</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkButtonBox" id="buttonbox4">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="halign">end</property>
|
||||
<property name="valign">start</property>
|
||||
<property name="margin_right">5</property>
|
||||
<property name="margin_top">10</property>
|
||||
<property name="layout_style">end</property>
|
||||
<child>
|
||||
<object class="GtkToggleButton" id="o_random">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="receives_default">True</property>
|
||||
<property name="tooltip_text" translatable="yes">Randomly pick tracks</property>
|
||||
<property name="halign">center</property>
|
||||
<property name="valign">center</property>
|
||||
<property name="image">image9</property>
|
||||
<signal name="toggled" handler="__queue_random" swapped="no"/>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">False</property>
|
||||
<property name="position">0</property>
|
||||
<property name="non_homogeneous">True</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkToggleButton" id="o_repeat">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="receives_default">True</property>
|
||||
<property name="tooltip_text" translatable="yes">Repeat tracks</property>
|
||||
<property name="halign">center</property>
|
||||
<property name="valign">center</property>
|
||||
<property name="image">image10</property>
|
||||
<signal name="toggled" handler="__queue_repeat" swapped="no"/>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">False</property>
|
||||
<property name="position">1</property>
|
||||
<property name="non_homogeneous">True</property>
|
||||
</packing>
|
||||
</child>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="left_attach">5</property>
|
||||
<property name="top_attach">0</property>
|
||||
<property name="height">2</property>
|
||||
<property name="width">4</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
|
|
@ -654,6 +602,203 @@
|
|||
<property name="width">3</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkBox">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="halign">end</property>
|
||||
<property name="valign">center</property>
|
||||
<property name="spacing">5</property>
|
||||
<child>
|
||||
<object class="GtkLabel">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="halign">end</property>
|
||||
<property name="label" translatable="yes">Pause after</property>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">False</property>
|
||||
<property name="position">0</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkComboBoxText" id="o_pause_after">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="halign">end</property>
|
||||
<property name="valign">center</property>
|
||||
<property name="margin_right">8</property>
|
||||
<property name="active">0</property>
|
||||
<items>
|
||||
<item translatable="yes">(disabled)</item>
|
||||
<item translatable="yes">current track</item>
|
||||
<item translatable="yes">next track</item>
|
||||
<item translatable="yes">2 tracks</item>
|
||||
<item translatable="yes">3 tracks</item>
|
||||
<item translatable="yes">4 tracks</item>
|
||||
<item translatable="yes">5 tracks</item>
|
||||
<item translatable="yes">6 tracks</item>
|
||||
<item translatable="yes">7 tracks</item>
|
||||
<item translatable="yes">8 tracks</item>
|
||||
<item translatable="yes">9 tracks</item>
|
||||
<item translatable="yes">10 tracks</item>
|
||||
<item translatable="yes">11 tracks</item>
|
||||
<item translatable="yes">12 tracks</item>
|
||||
<item translatable="yes">13 tracks</item>
|
||||
<item translatable="yes">14 tracks</item>
|
||||
<item translatable="yes">15 tracks</item>
|
||||
<item translatable="yes">16 tracks</item>
|
||||
<item translatable="yes">17 tracks</item>
|
||||
<item translatable="yes">18 tracks</item>
|
||||
<item translatable="yes">19 tracks</item>
|
||||
<item translatable="yes">20 tracks</item>
|
||||
<item translatable="yes">21 tracks</item>
|
||||
<item translatable="yes">22 tracks</item>
|
||||
<item translatable="yes">23 tracks</item>
|
||||
<item translatable="yes">24 tracks</item>
|
||||
<item translatable="yes">25 tracks</item>
|
||||
<item translatable="yes">26 tracks</item>
|
||||
<item translatable="yes">27 tracks</item>
|
||||
<item translatable="yes">28 tracks</item>
|
||||
<item translatable="yes">29 tracks</item>
|
||||
<item translatable="yes">30 tracks</item>
|
||||
<item translatable="yes">31 tracks</item>
|
||||
<item translatable="yes">32 tracks</item>
|
||||
<item translatable="yes">33 tracks</item>
|
||||
<item translatable="yes">34 tracks</item>
|
||||
<item translatable="yes">35 tracks</item>
|
||||
<item translatable="yes">36 tracks</item>
|
||||
<item translatable="yes">37 tracks</item>
|
||||
<item translatable="yes">38 tracks</item>
|
||||
<item translatable="yes">39 tracks</item>
|
||||
<item translatable="yes">40 tracks</item>
|
||||
<item translatable="yes">41 tracks</item>
|
||||
<item translatable="yes">42 tracks</item>
|
||||
<item translatable="yes">43 tracks</item>
|
||||
<item translatable="yes">44 tracks</item>
|
||||
<item translatable="yes">45 tracks</item>
|
||||
<item translatable="yes">46 tracks</item>
|
||||
<item translatable="yes">47 tracks</item>
|
||||
<item translatable="yes">48 tracks</item>
|
||||
<item translatable="yes">49 tracks</item>
|
||||
<item translatable="yes">50 tracks</item>
|
||||
<item translatable="yes">51 tracks</item>
|
||||
<item translatable="yes">52 tracks</item>
|
||||
<item translatable="yes">53 tracks</item>
|
||||
<item translatable="yes">54 tracks</item>
|
||||
<item translatable="yes">55 tracks</item>
|
||||
<item translatable="yes">56 tracks</item>
|
||||
<item translatable="yes">57 tracks</item>
|
||||
<item translatable="yes">58 tracks</item>
|
||||
<item translatable="yes">59 tracks</item>
|
||||
<item translatable="yes">60 tracks</item>
|
||||
<item translatable="yes">61 tracks</item>
|
||||
<item translatable="yes">62 tracks</item>
|
||||
<item translatable="yes">63 tracks</item>
|
||||
<item translatable="yes">64 tracks</item>
|
||||
<item translatable="yes">65 tracks</item>
|
||||
<item translatable="yes">66 tracks</item>
|
||||
<item translatable="yes">67 tracks</item>
|
||||
<item translatable="yes">68 tracks</item>
|
||||
<item translatable="yes">69 tracks</item>
|
||||
<item translatable="yes">70 tracks</item>
|
||||
<item translatable="yes">71 tracks</item>
|
||||
<item translatable="yes">72 tracks</item>
|
||||
<item translatable="yes">73 tracks</item>
|
||||
<item translatable="yes">74 tracks</item>
|
||||
<item translatable="yes">75 tracks</item>
|
||||
<item translatable="yes">76 tracks</item>
|
||||
<item translatable="yes">77 tracks</item>
|
||||
<item translatable="yes">78 tracks</item>
|
||||
<item translatable="yes">79 tracks</item>
|
||||
<item translatable="yes">80 tracks</item>
|
||||
<item translatable="yes">81 tracks</item>
|
||||
<item translatable="yes">82 tracks</item>
|
||||
<item translatable="yes">83 tracks</item>
|
||||
<item translatable="yes">84 tracks</item>
|
||||
<item translatable="yes">85 tracks</item>
|
||||
<item translatable="yes">86 tracks</item>
|
||||
<item translatable="yes">87 tracks</item>
|
||||
<item translatable="yes">88 tracks</item>
|
||||
<item translatable="yes">89 tracks</item>
|
||||
<item translatable="yes">90 tracks</item>
|
||||
<item translatable="yes">91 tracks</item>
|
||||
<item translatable="yes">92 tracks</item>
|
||||
<item translatable="yes">93 tracks</item>
|
||||
<item translatable="yes">94 tracks</item>
|
||||
<item translatable="yes">95 tracks</item>
|
||||
<item translatable="yes">96 tracks</item>
|
||||
<item translatable="yes">97 tracks</item>
|
||||
<item translatable="yes">98 tracks</item>
|
||||
<item translatable="yes">99 tracks</item>
|
||||
</items>
|
||||
<signal name="changed" handler="__audio_pause_changed" swapped="no"/>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">False</property>
|
||||
<property name="position">1</property>
|
||||
</packing>
|
||||
</child>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="left_attach">5</property>
|
||||
<property name="top_attach">1</property>
|
||||
<property name="width">2</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkButtonBox" id="buttonbox4">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="halign">end</property>
|
||||
<property name="valign">start</property>
|
||||
<property name="margin_right">5</property>
|
||||
<property name="margin_top">10</property>
|
||||
<property name="layout_style">end</property>
|
||||
<child>
|
||||
<object class="GtkToggleButton" id="o_random">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="receives_default">True</property>
|
||||
<property name="tooltip_text" translatable="yes">Randomly pick tracks</property>
|
||||
<property name="halign">center</property>
|
||||
<property name="valign">center</property>
|
||||
<property name="image">image9</property>
|
||||
<signal name="toggled" handler="__queue_random" swapped="no"/>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">False</property>
|
||||
<property name="position">0</property>
|
||||
<property name="non_homogeneous">True</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkToggleButton" id="o_repeat">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="receives_default">True</property>
|
||||
<property name="tooltip_text" translatable="yes">Repeat tracks</property>
|
||||
<property name="halign">center</property>
|
||||
<property name="valign">center</property>
|
||||
<property name="image">image10</property>
|
||||
<signal name="toggled" handler="__queue_repeat" swapped="no"/>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">False</property>
|
||||
<property name="position">1</property>
|
||||
<property name="non_homogeneous">True</property>
|
||||
</packing>
|
||||
</child>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="left_attach">6</property>
|
||||
<property name="top_attach">0</property>
|
||||
</packing>
|
||||
</child>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="expand">False</property>
|
||||
|
|
|
|||
Loading…
Reference in New Issue