coderkun/mcg
1
0
Fork 0
Code Issues 22 Pull requests Releases 25 Activity

Merge branch “issue-41-progress-bars” (close #41)

Browse source
This commit is contained in:
coderkun 2017-12-26 10:19:46 +01:00
commit 17990118c7
6 changed files with 156 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

140
data/gtk.glade
View file

@ -1399,49 +1399,125 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkRevealer" id="library-progress-revealer"> <placeholder/>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="transition_type">none</property>
<child>
<object class="GtkProgressBar" id="library-progress">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="fraction">0.5</property>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child> </child>
<child> <child>
<object class="GtkScrolledWindow" id="library-scroll"> <object class="GtkStack" id="library-stack">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">False</property>
<property name="transition_type">crossfade</property>
<child> <child>
<object class="GtkIconView" id="library-iconview"> <object class="GtkBox" id="library-progress-box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
<placeholder/>
</child>
<child type="center">
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
<placeholder/>
</child>
<child type="center">
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">center</property>
<property name="orientation">vertical</property>
<property name="spacing">10</property>
<child>
<object class="GtkImage" id="library-progress-image">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="icon_size">6</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="library-progress-label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">{} of {} images loaded</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkProgressBar" id="library-progress">
<property name="width_request">200</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="fraction">0.5</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="name">page1</property>
<property name="title">page1</property>
</packing>
</child>
<child>
<object class="GtkScrolledWindow" id="library-scroll">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="margin">0</property> <child>
<property name="item_orientation">horizontal</property> <object class="GtkIconView" id="library-iconview">
<property name="row_spacing">0</property> <property name="visible">True</property>
<property name="column_spacing">0</property> <property name="can_focus">True</property>
<property name="tooltip_column">1</property> <property name="margin">0</property>
<property name="item_padding">0</property> <property name="item_orientation">horizontal</property>
<property name="activate_on_single_click">True</property> <property name="row_spacing">0</property>
<signal name="item-activated" handler="on_library-iconview_item_activated" swapped="no"/> <property name="column_spacing">0</property>
<signal name="selection-changed" handler="on_library-iconview_selection_changed" swapped="no"/> <property name="tooltip_column">1</property>
<property name="item_padding">0</property>
<property name="activate_on_single_click">True</property>
<signal name="item-activated" handler="on_library-iconview_item_activated" swapped="no"/>
<signal name="selection-changed" handler="on_library-iconview_selection_changed" swapped="no"/>
<style>
<class name="no-bg"/>
</style>
</object>
</child>
<style> <style>
<class name="no-bg"/> <class name="no-bg"/>
</style> </style>
</object> </object>
<packing>
<property name="name">page0</property>
<property name="title">page0</property>
<property name="position">1</property>
</packing>
</child> </child>
<style>
<class name="no-bg"/>
</style>
</object> </object>
<packing> <packing>
<property name="expand">True</property> <property name="expand">True</property>

BIN
locale/de/LC_MESSAGES/mcg.mo
View file

Binary file not shown.

30
locale/de/LC_MESSAGES/mcg.po
View file

@ -1,8 +1,8 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: CoverGrid (mcg)\n" "Project-Id-Version: CoverGrid (mcg)\n"
"POT-Creation-Date: 2017-12-25 17:10+0100\n" "POT-Creation-Date: 2017-12-25 17:40+0100\n"
"PO-Revision-Date: 2017-12-25 17:10+0100\n" "PO-Revision-Date: 2017-12-25 17:40+0100\n"
"Last-Translator: coderkun <olli@coderkun.de>\n" "Last-Translator: coderkun <olli@coderkun.de>\n"
"Language-Team: \n" "Language-Team: \n"
"Language: de\n" "Language: de\n"
@ -158,47 +158,51 @@ msgstr "Wiedergabeliste"
msgid "search library" msgid "search library"
msgstr "Bibliothek durchsuchen" msgstr "Bibliothek durchsuchen"
#: data/gtk.glade:1545 data/gtk.menu.ui:42 #: data/gtk.glade:1444
msgid "{} of {} images loaded"
msgstr "{} von {} Bildern geladen"
#: data/gtk.glade:1621 data/gtk.menu.ui:42
msgid "Library" msgid "Library"
msgstr "Bibliothek" msgstr "Bibliothek"
#: data/gtk.glade:1624 data/gtk.shortcuts.ui:74 #: data/gtk.glade:1700 data/gtk.shortcuts.ui:74
msgid "Connect or disconnect" msgid "Connect or disconnect"
msgstr "Die Verbindung herstellen oder trennen" msgstr "Die Verbindung herstellen oder trennen"
#: data/gtk.glade:1646 data/gtk.shortcuts.ui:81 #: data/gtk.glade:1722 data/gtk.shortcuts.ui:81
msgid "Switch between play and pause" msgid "Switch between play and pause"
msgstr "Zwischen Abspielen und Pause wechseln" msgstr "Zwischen Abspielen und Pause wechseln"
#: data/gtk.glade:1666 #: data/gtk.glade:1742
msgid "Adjust the volume" msgid "Adjust the volume"
msgstr "Die Lautstärke anpassen" msgstr "Die Lautstärke anpassen"
#: data/gtk.glade:1710 #: data/gtk.glade:1786
msgid "Connect to MPD" msgid "Connect to MPD"
msgstr "Zu MPD verbinden" msgstr "Zu MPD verbinden"
#: data/gtk.glade:1752 data/gtk.shortcuts.ui:101 #: data/gtk.glade:1828 data/gtk.shortcuts.ui:101
msgid "Show the cover in fullscreen mode" msgid "Show the cover in fullscreen mode"
msgstr "Das Cover im Vollbildmodus anzeigen" msgstr "Das Cover im Vollbildmodus anzeigen"
#: data/gtk.glade:1775 data/gtk.glade:1924 #: data/gtk.glade:1851 data/gtk.glade:2000
msgid "Settings and actions" msgid "Settings and actions"
msgstr "Einstellungen und Aktionen" msgstr "Einstellungen und Aktionen"
#: data/gtk.glade:1823 data/gtk.glade:1902 #: data/gtk.glade:1899 data/gtk.glade:1978
msgid "Select multiple albums" msgid "Select multiple albums"
msgstr "Mehrere Alben auswählen" msgstr "Mehrere Alben auswählen"
#: data/gtk.glade:1845 data/gtk.shortcuts.ui:88 #: data/gtk.glade:1921 data/gtk.shortcuts.ui:88
msgid "Clear the playlist" msgid "Clear the playlist"
msgstr "Die Wiedergabeliste leeren" msgstr "Die Wiedergabeliste leeren"
#: data/gtk.glade:1879 data/gtk.shortcuts.ui:114 #: data/gtk.glade:1955 data/gtk.shortcuts.ui:114
msgid "Search the library" msgid "Search the library"
msgstr "Die Bibliothek durchsuchen" msgstr "Die Bibliothek durchsuchen"
#: data/gtk.glade:1969 #: data/gtk.glade:2045
msgid "" msgid ""
"CoverGrid is a client for the Music Player Daemon, focusing on albums " "CoverGrid is a client for the Music Player Daemon, focusing on albums "
"instead of single tracks." "instead of single tracks."

BIN
locale/en/LC_MESSAGES/mcg.mo
View file

Binary file not shown.

30
locale/en/LC_MESSAGES/mcg.po
View file

@ -1,8 +1,8 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: CoverGrid (mcg)\n" "Project-Id-Version: CoverGrid (mcg)\n"
"POT-Creation-Date: 2017-12-25 17:08+0100\n" "POT-Creation-Date: 2017-12-25 17:40+0100\n"
"PO-Revision-Date: 2017-12-25 17:08+0100\n" "PO-Revision-Date: 2017-12-25 17:40+0100\n"
"Last-Translator: coderkun <olli@coderkun.de>\n" "Last-Translator: coderkun <olli@coderkun.de>\n"
"Language-Team: \n" "Language-Team: \n"
"Language: en\n" "Language: en\n"
@ -157,47 +157,51 @@ msgstr "Playlist"
msgid "search library" msgid "search library"
msgstr "search library" msgstr "search library"
#: data/gtk.glade:1545 data/gtk.menu.ui:42 #: data/gtk.glade:1444
msgid "{} of {} images loaded"
msgstr "{} of {} images loaded"
#: data/gtk.glade:1621 data/gtk.menu.ui:42
msgid "Library" msgid "Library"
msgstr "Library" msgstr "Library"
#: data/gtk.glade:1624 data/gtk.shortcuts.ui:74 #: data/gtk.glade:1700 data/gtk.shortcuts.ui:74
msgid "Connect or disconnect" msgid "Connect or disconnect"
msgstr "Connect or disconnect" msgstr "Connect or disconnect"
#: data/gtk.glade:1646 data/gtk.shortcuts.ui:81 #: data/gtk.glade:1722 data/gtk.shortcuts.ui:81
msgid "Switch between play and pause" msgid "Switch between play and pause"
msgstr "Switch between play and pause" msgstr "Switch between play and pause"
#: data/gtk.glade:1666 #: data/gtk.glade:1742
msgid "Adjust the volume" msgid "Adjust the volume"
msgstr "Adjust the volume" msgstr "Adjust the volume"
#: data/gtk.glade:1710 #: data/gtk.glade:1786
msgid "Connect to MPD" msgid "Connect to MPD"
msgstr "Connect to MPD" msgstr "Connect to MPD"
#: data/gtk.glade:1752 data/gtk.shortcuts.ui:101 #: data/gtk.glade:1828 data/gtk.shortcuts.ui:101
msgid "Show the cover in fullscreen mode" msgid "Show the cover in fullscreen mode"
msgstr "Show the cover in fullscreen mode" msgstr "Show the cover in fullscreen mode"
#: data/gtk.glade:1775 data/gtk.glade:1924 #: data/gtk.glade:1851 data/gtk.glade:2000
msgid "Settings and actions" msgid "Settings and actions"
msgstr "Settings and actions" msgstr "Settings and actions"
#: data/gtk.glade:1823 data/gtk.glade:1902 #: data/gtk.glade:1899 data/gtk.glade:1978
msgid "Select multiple albums" msgid "Select multiple albums"
msgstr "Select multiple albums" msgstr "Select multiple albums"
#: data/gtk.glade:1845 data/gtk.shortcuts.ui:88 #: data/gtk.glade:1921 data/gtk.shortcuts.ui:88
msgid "Clear the playlist" msgid "Clear the playlist"
msgstr "Clear the playlist" msgstr "Clear the playlist"
#: data/gtk.glade:1879 data/gtk.shortcuts.ui:114 #: data/gtk.glade:1955 data/gtk.shortcuts.ui:114
msgid "Search the library" msgid "Search the library"
msgstr "Search the library" msgstr "Search the library"
#: data/gtk.glade:1969 #: data/gtk.glade:2045
msgid "" msgid ""
"CoverGrid is a client for the Music Player Daemon, focusing on albums " "CoverGrid is a client for the Music Player Daemon, focusing on albums "
"instead of single tracks." "instead of single tracks."

21
mcg/widgets.py
View file

@ -1563,8 +1563,14 @@ class LibraryPanel(GObject.GObject):
self._filter_bar = builder.get_object('library-filter-bar') self._filter_bar = builder.get_object('library-filter-bar')
self._filter_entry = builder.get_object('library-filter') self._filter_entry = builder.get_object('library-filter')
# Progress Bar # Progress Bar
self._progress_revealer = builder.get_object('library-progress-revealer') self._stack = builder.get_object('library-stack')
self._progress_box = builder.get_object('library-progress-box')
self._pgross_image = builder.get_object('library-progress-image')
self._pgross_image.set_from_pixbuf(self._get_default_image())
self._progress_label = builder.get_object('library-progress-label')
self._loading_text = self._progress_label.get_label()
self._progress_bar = builder.get_object('library-progress') self._progress_bar = builder.get_object('library-progress')
self._scroll = builder.get_object('library-scroll')
# Toolbar menu # Toolbar menu
self._toolbar_search_bar = builder.get_object('library-toolbar-search') self._toolbar_search_bar = builder.get_object('library-toolbar-search')
self._toolbar_popover = builder.get_object('library-toolbar-popover') self._toolbar_popover = builder.get_object('library-toolbar-popover')
@ -1859,7 +1865,7 @@ class LibraryPanel(GObject.GObject):
self._library_lock.acquire() self._library_lock.acquire()
self._library_stop.clear() self._library_stop.clear()
self._albums = albums self._albums = albums
GObject.idle_add(self._progress_revealer.set_reveal_child, True) GObject.idle_add(self._stack.set_visible_child, self._progress_box)
GObject.idle_add(self._progress_bar.set_fraction, 0.0) GObject.idle_add(self._progress_bar.set_fraction, 0.0)
GObject.idle_add(self._library_grid.set_item_padding, size / 100) GObject.idle_add(self._library_grid.set_item_padding, size / 100)
self._library_grid.set_model(None) self._library_grid.set_model(None)
@ -1897,6 +1903,7 @@ class LibraryPanel(GObject.GObject):
i += 1 i += 1
GObject.idle_add(self._progress_bar.set_fraction, i/n) GObject.idle_add(self._progress_bar.set_fraction, i/n)
GObject.idle_add(self._progress_label.set_markup, self._loading_text.format(i, n))
if self._library_stop.is_set(): if self._library_stop.is_set():
self._library_lock.release() self._library_lock.release()
return return
@ -1905,7 +1912,7 @@ class LibraryPanel(GObject.GObject):
self._library_grid.thaw_child_notify() self._library_grid.thaw_child_notify()
self._library_grid.set_item_width(-1) self._library_grid.set_item_width(-1)
self._library_lock.release() self._library_lock.release()
self._progress_revealer.set_reveal_child(False) self._stack.set_visible_child(self._scroll)
def _set_widget_grid_size(self, grid_widget, size, vertical): def _set_widget_grid_size(self, grid_widget, size, vertical):
@ -2020,6 +2027,14 @@ class LibraryPanel(GObject.GObject):
self._standalone_image.show() self._standalone_image.show()
def _get_default_image(self):
return self._icon_theme.load_icon(
Window.STOCK_ICON_DEFAULT,
64,
Gtk.IconLookupFlags.FORCE_SVG & Gtk.IconLookupFlags.FORCE_SIZE
)
class StackSwitcher(GObject.GObject): class StackSwitcher(GObject.GObject):