anna/emmental
anna
/
emmental
1
0
Fork 0
Code Issues 11 Pull Requests Projects 1 Releases 12 Wiki Activity

rind: More icon and spacing changes 

I switch around the sidebar icons again, and also make the header bar
icons larger to make them easier to press with touchscreens

Signed-off-by: Anna Schumaker <Anna@NoWheyCreamery.com>
This commit is contained in:
Anna Schumaker 2019-03-20 09:43:44 -04:00
parent e1c52e33b7
commit c636b3fd5e
6 changed files with 12 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
curds/playlist/collection.py
View File

@ -4,7 +4,7 @@ from .. import notify
class CollectionPlaylist(playlist.Playlist):
def __init__(self):
playlist.Playlist.__init__(self, "Collection", "audio-x-generic")
playlist.Playlist.__init__(self, "Collection", "media-playback-start")
notify.Notify.notify_me("new-track", self.add)
self.loop = True

2
curds/playlist/manager.py
View File

@ -7,7 +7,7 @@ import os
class LibraryManager(list):
def __init__(self):
self.name = "Library"
self.icon = "folder-music"
self.icon = "folder"
def __str__(self):
return f"<big>{self.name}</big>"

2
curds/playlist/test_collection.py
View File

@ -14,7 +14,7 @@ class TestCollectionPlaylist(unittest.TestCase):
self.assertIsInstance(plist, collection.CollectionPlaylist)
self.assertIsInstance(plist, playlist.Playlist)
self.assertEqual(plist.name, "Collection")
self.assertEqual(plist.icon, "audio-x-generic")
self.assertEqual(plist.icon, "media-playback-start")
self.assertEqual(len(plist), 0)
track1 = tags.Track.lookup(os.path.join(test_album, "01 - Test Track.ogg"))

2
curds/playlist/test_manager.py
View File

@ -45,7 +45,7 @@ class TestPlaylistManager(unittest.TestCase):
self.assertEqual(self.cb_plist, plist)
self.assertEqual(str(playman["Library"]), "<big>Library</big>")
self.assertEqual(playman["Library"].name, "Library")
self.assertEqual(playman["Library"].icon, "folder-music")
self.assertEqual(playman["Library"].icon, "folder")
self.assertEqual(plist.name, test_library)
self.assertIsInstance(plist, library.LibraryPlaylist)

39
emmental.ui
View File

@ -6,33 +6,22 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="title" translatable="yes">Emmental</property>
<property name="default_width">1200</property>
<property name="default_height">750</property>
<property name="default_width">960</property>
<property name="default_height">600</property>
<child type="titlebar">
<object class="GtkHeaderBar" id="header">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="title" translatable="yes">Emmental</property>
<property name="subtitle" translatable="yes">The Cheesy Music Player</property>
<property name="has_subtitle">False</property>
<property name="show_close_button">True</property>
<child>
<object class="GtkButton" id="play_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="halign">start</property>
<property name="valign">center</property>
<child>
<object class="GtkImage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="valign">center</property>
<property name="margin_left">5</property>
<property name="margin_right">5</property>
<property name="margin_top">5</property>
<property name="margin_bottom">5</property>
<property name="icon_name">media-playback-start-symbolic</property>
<property name="icon_size">3</property>
</object>
@ -43,18 +32,10 @@
<object class="GtkButton" id="pause_button">
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="halign">start</property>
<property name="valign">center</property>
<child>
<object class="GtkImage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">center</property>
<property name="valign">center</property>
<property name="margin_left">5</property>
<property name="margin_right">5</property>
<property name="margin_top">5</property>
<property name="margin_bottom">5</property>
<property name="icon_name">media-playback-pause-symbolic</property>
<property name="icon_size">3</property>
</object>
@ -69,18 +50,12 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="halign">start</property>
<property name="valign">center</property>
<child>
<object class="GtkImage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">5</property>
<property name="margin_right">5</property>
<property name="margin_top">5</property>
<property name="margin_bottom">5</property>
<property name="icon_name">media-skip-forward-symbolic</property>
<property name="icon_size">2</property>
<property name="icon_size">3</property>
</object>
</child>
</object>
@ -94,7 +69,7 @@
<object class="GtkPaned">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="position">200</property>
<property name="position">150</property>
<property name="position_set">True</property>
<property name="wide_handle">True</property>
<child>
@ -205,7 +180,7 @@
<object class="GtkTreeViewColumn">
<property name="resizable">True</property>
<property name="sizing">fixed</property>
<property name="fixed_width">250</property>
<property name="fixed_width">150</property>
<property name="title" translatable="yes">Artist</property>
<child>
<object class="GtkCellRendererText"/>
@ -219,7 +194,7 @@
<object class="GtkTreeViewColumn">
<property name="resizable">True</property>
<property name="sizing">fixed</property>
<property name="fixed_width">250</property>
<property name="fixed_width">150</property>
<property name="title" translatable="yes">Album</property>
<child>
<object class="GtkCellRendererText"/>
@ -246,7 +221,7 @@
<object class="GtkTreeViewColumn">
<property name="resizable">True</property>
<property name="sizing">fixed</property>
<property name="fixed_width">250</property>
<property name="fixed_width">150</property>
<property name="title" translatable="yes">Genre</property>
<child>
<object class="GtkCellRendererText"/>

2
rind/test_manager.py
View File

@ -9,7 +9,7 @@ from gi.repository import Gtk, GObject
plist_mgr = curds.PlaylistManager
test_album = os.path.abspath("./trier/Test Library/Test Artist 02/Test Album 1")
toplevel_names = [ "Collection\n0 Tracks", "", "<big>Library</big>" ]
toplevel_icons = [ "audio-x-generic", "", "folder-music" ]
toplevel_icons = [ "media-playback-start", "", "folder" ]
toplevel_plist = [ plist_mgr["Collection"], None, plist_mgr["Library"] ]
class TestManager(unittest.TestCase):