anna
/
ocarina
1
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity

gui: Swap positions of random/repeat and favorite/hide buttons 

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
This commit is contained in:
Anna Schumaker 2016-05-14 07:50:28 -04:00
parent b6488b6c39
commit e5711c26f0
2 changed files with 56 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG
View File

@ -1,3 +1,6 @@
6.4.12:
- Swap position of random/repeat and favorite/hide buttons
6.4.12-rc: 6.4.12-rc:
- Rewrite our custom GtkTreeModel and add tests - Rewrite our custom GtkTreeModel and add tests
- Move shuffle and repeat buttons into the sidebar - Move shuffle and repeat buttons into the sidebar

106
share/ocarina/ocarina6.glade
View File

@ -27,8 +27,8 @@
<object class="GtkImage" id="image10"> <object class="GtkImage" id="image10">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="xpad">10</property> <property name="margin_left">10</property>
<property name="ypad">2</property> <property name="margin_right">10</property>
<property name="icon_name">media-playlist-repeat</property> <property name="icon_name">media-playlist-repeat</property>
</object> </object>
<object class="GtkImage" id="image11"> <object class="GtkImage" id="image11">
@ -207,21 +207,11 @@
</object> </object>
</child> </child>
</object> </object>
<object class="GtkImage" id="image6">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="icon_name">emblem-favorite</property>
</object>
<object class="GtkImage" id="image7">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="icon_name">window-close</property>
</object>
<object class="GtkImage" id="image9"> <object class="GtkImage" id="image9">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="xpad">10</property> <property name="margin_left">10</property>
<property name="ypad">2</property> <property name="margin_right">10</property>
<property name="icon_name">media-playlist-shuffle</property> <property name="icon_name">media-playlist-shuffle</property>
</object> </object>
<object class="GtkMenu" id="o_collection_rc"> <object class="GtkMenu" id="o_collection_rc">
@ -237,7 +227,7 @@
</object> </object>
</child> </child>
</object> </object>
<object class="GtkTreeStore" id="o_collection_store"> <object class="GtkTreeStore" id="o_collection_store">
<columns> <columns>
<!-- column-name Image --> <!-- column-name Image -->
<column type="gchararray"/> <column type="gchararray"/>
@ -553,45 +543,45 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkButtonBox" id="buttonbox2"> <object class="GtkButtonBox" id="buttonbox4">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="halign">end</property> <property name="halign">end</property>
<property name="valign">center</property> <property name="valign">start</property>
<property name="orientation">vertical</property> <property name="margin_top">5</property>
<property name="spacing">5</property> <property name="layout_style">end</property>
<property name="layout_style">spread</property>
<child> <child>
<object class="GtkToggleButton" id="o_favorite"> <object class="GtkToggleButton" id="o_random">
<property name="label" translatable="yes">Favorite</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">True</property>
<property name="focus_on_click">False</property>
<property name="receives_default">True</property> <property name="receives_default">True</property>
<property name="tooltip_text" translatable="yes">Add track to Favorites playlist</property> <property name="halign">center</property>
<property name="image">image6</property> <property name="valign">center</property>
<property name="inconsistent">True</property> <property name="image">image9</property>
<signal name="toggled" handler="__queue_random" swapped="no"/>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">False</property>
<property name="position">0</property> <property name="position">0</property>
<property name="non_homogeneous">True</property>
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkToggleButton" id="o_hide"> <object class="GtkToggleButton" id="o_repeat">
<property name="label" translatable="yes">Hide</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">True</property>
<property name="focus_on_click">False</property>
<property name="receives_default">True</property> <property name="receives_default">True</property>
<property name="tooltip_text" translatable="yes">Hide track from Collection</property> <property name="halign">center</property>
<property name="image">image7</property> <property name="valign">center</property>
<property name="image">image10</property>
<signal name="toggled" handler="__queue_repeat" swapped="no"/>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">False</property>
<property name="position">1</property> <property name="position">1</property>
<property name="non_homogeneous">True</property>
</packing> </packing>
</child> </child>
</object> </object>
@ -621,43 +611,53 @@
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<child> <child>
<object class="GtkButtonBox" id="buttonbox4"> <object class="GtkButtonBox" id="buttonbox2">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="halign">center</property>
<property name="valign">center</property> <property name="valign">center</property>
<property name="spacing">5</property> <property name="spacing">5</property>
<property name="layout_style">spread</property> <property name="layout_style">expand</property>
<child> <child>
<object class="GtkToggleButton" id="o_random"> <object class="GtkToggleButton" id="o_favorite">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">False</property>
<property name="focus_on_click">False</property>
<property name="receives_default">True</property> <property name="receives_default">True</property>
<property name="valign">center</property> <property name="tooltip_text" translatable="yes">Add track to Favorites playlist</property>
<property name="image">image9</property> <property name="inconsistent">True</property>
<signal name="toggled" handler="__queue_random" swapped="no"/> <child>
<object class="GtkImage" id="image6">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="icon_name">emblem-favorite</property>
</object>
</child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">False</property> <property name="fill">True</property>
<property name="position">0</property> <property name="position">0</property>
<property name="non_homogeneous">True</property>
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkToggleButton" id="o_repeat"> <object class="GtkToggleButton" id="o_hide">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">False</property>
<property name="focus_on_click">False</property>
<property name="receives_default">True</property> <property name="receives_default">True</property>
<property name="valign">center</property> <property name="tooltip_text" translatable="yes">Hide track from Collection</property>
<property name="image">image10</property> <child>
<signal name="toggled" handler="__queue_repeat" swapped="no"/> <object class="GtkImage" id="image7">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="icon_name">window-close</property>
</object>
</child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">False</property> <property name="fill">True</property>
<property name="position">1</property> <property name="position">1</property>
<property name="non_homogeneous">True</property>
</packing> </packing>
</child> </child>
</object> </object>
@ -1182,7 +1182,7 @@
<object class="GtkSizeGroup" id="sizegroup1"> <object class="GtkSizeGroup" id="sizegroup1">
<property name="mode">vertical</property> <property name="mode">vertical</property>
<widgets> <widgets>
<widget name="buttonbox4"/> <widget name="buttonbox2"/>
<widget name="box10"/> <widget name="box10"/>
</widgets> </widgets>
</object> </object>