...
 
Commits (3)
...@@ -25,7 +25,7 @@ gnome.compile_resources( ...@@ -25,7 +25,7 @@ gnome.compile_resources(
install_dir: PKGDATA_DIR, install_dir: PKGDATA_DIR,
install: true, install: true,
dependencies: configure_file( dependencies: configure_file(
input: 'AboutDialog.ui.in', input: 'ui/AboutDialog.ui.in',
output: 'AboutDialog.ui', output: 'AboutDialog.ui',
configuration: about_dialog_conf configuration: about_dialog_conf
) )
......
...@@ -2,28 +2,28 @@ ...@@ -2,28 +2,28 @@
<gresources> <gresources>
<gresource prefix="/org/gnome/Music"> <gresource prefix="/org/gnome/Music">
<file preprocess="xml-stripblanks">AboutDialog.ui</file> <file preprocess="xml-stripblanks">AboutDialog.ui</file>
<file alias="gtk/menus.ui" preprocess="xml-stripblanks">app-menu.ui</file> <file alias="gtk/menus.ui" preprocess="xml-stripblanks">ui/app-menu.ui</file>
<file alias="gtk/help-overlay.ui" preprocess="xml-stripblanks">help-overlay.ui</file> <file alias="gtk/help-overlay.ui" preprocess="xml-stripblanks">ui/help-overlay.ui</file>
<file>application.css</file> <file>org.gnome.Music.css</file>
<file>initial-state.png</file> <file>icons/initial-state.png</file>
<file preprocess="xml-stripblanks">AlbumCover.ui</file> <file preprocess="xml-stripblanks">ui/AlbumCover.ui</file>
<file preprocess="xml-stripblanks">AlbumWidget.ui</file> <file preprocess="xml-stripblanks">ui/AlbumWidget.ui</file>
<file preprocess="xml-stripblanks">ArtistAlbumWidget.ui</file> <file preprocess="xml-stripblanks">ui/ArtistAlbumWidget.ui</file>
<file preprocess="xml-stripblanks">ArtistAlbumsWidget.ui</file> <file preprocess="xml-stripblanks">ui/ArtistAlbumsWidget.ui</file>
<file preprocess="xml-stripblanks">DiscBox.ui</file> <file preprocess="xml-stripblanks">ui/DiscBox.ui</file>
<file preprocess="xml-stripblanks">DropDown.ui</file> <file preprocess="xml-stripblanks">ui/DropDown.ui</file>
<file preprocess="xml-stripblanks">EmptyView.ui</file> <file preprocess="xml-stripblanks">ui/EmptyView.ui</file>
<file preprocess="xml-stripblanks">FilterView.ui</file> <file preprocess="xml-stripblanks">ui/FilterView.ui</file>
<file preprocess="xml-stripblanks">PlayerToolbar.ui</file> <file preprocess="xml-stripblanks">ui/PlayerToolbar.ui</file>
<file preprocess="xml-stripblanks">Searchbar.ui</file> <file preprocess="xml-stripblanks">ui/Searchbar.ui</file>
<file preprocess="xml-stripblanks">SelectionBarMenuButton.ui</file> <file preprocess="xml-stripblanks">ui/SelectionBarMenuButton.ui</file>
<file preprocess="xml-stripblanks">SelectionToolbar.ui</file> <file preprocess="xml-stripblanks">ui/SelectionToolbar.ui</file>
<file preprocess="xml-stripblanks">SidebarRow.ui</file> <file preprocess="xml-stripblanks">ui/SidebarRow.ui</file>
<file preprocess="xml-stripblanks">SongWidget.ui</file> <file preprocess="xml-stripblanks">ui/SongWidget.ui</file>
<file preprocess="xml-stripblanks">HeaderBar.ui</file> <file preprocess="xml-stripblanks">ui/HeaderBar.ui</file>
<file preprocess="xml-stripblanks">PlaylistContextMenu.ui</file> <file preprocess="xml-stripblanks">ui/PlaylistContextMenu.ui</file>
<file preprocess="xml-stripblanks">PlaylistControls.ui</file> <file preprocess="xml-stripblanks">ui/PlaylistControls.ui</file>
<file preprocess="xml-stripblanks">PlaylistDialog.ui</file> <file preprocess="xml-stripblanks">ui/PlaylistDialog.ui</file>
<file preprocess="xml-stripblanks">TwoLineTip.ui</file> <file preprocess="xml-stripblanks">ui/TwoLineTip.ui</file>
</gresource> </gresource>
</gresources> </gresources>
...@@ -61,7 +61,7 @@ class Application(Gtk.Application): ...@@ -61,7 +61,7 @@ class Application(Gtk.Application):
def _init_style(self): def _init_style(self):
css_provider_file = Gio.File.new_for_uri( css_provider_file = Gio.File.new_for_uri(
'resource:///org/gnome/Music/application.css') 'resource:///org/gnome/Music/org.gnome.Music.css')
css_provider = Gtk.CssProvider() css_provider = Gtk.CssProvider()
css_provider.load_from_file(css_provider_file) css_provider.load_from_file(css_provider_file)
screen = Gdk.Screen.get_default() screen = Gdk.Screen.get_default()
......
...@@ -32,7 +32,7 @@ from gnomemusic.albumartcache import Art ...@@ -32,7 +32,7 @@ from gnomemusic.albumartcache import Art
from gnomemusic.query import Query from gnomemusic.query import Query
@Gtk.Template(resource_path="/org/gnome/Music/EmptyView.ui") @Gtk.Template(resource_path="/org/gnome/Music/ui/EmptyView.ui")
class EmptyView(Gtk.Stack): class EmptyView(Gtk.Stack):
"""Empty view when there is no music to display """Empty view when there is no music to display
...@@ -102,7 +102,7 @@ class EmptyView(Gtk.Stack): ...@@ -102,7 +102,7 @@ class EmptyView(Gtk.Stack):
self._main_label.props.label = _("Hey DJ") self._main_label.props.label = _("Hey DJ")
self._main_label.props.margin_bottom = 18 self._main_label.props.margin_bottom = 18
self._icon.props.resource = "/org/gnome/Music/initial-state.png" self._icon.props.resource = "/org/gnome/Music/icons/initial-state.png"
self._icon.props.margin_bottom = 32 self._icon.props.margin_bottom = 32
self._icon.props.height_request = Art.Size.LARGE.height self._icon.props.height_request = Art.Size.LARGE.height
self._icon.props.width_request = Art.Size.LARGE.width self._icon.props.width_request = Art.Size.LARGE.width
......
...@@ -32,7 +32,7 @@ from gnomemusic.albumartcache import Art ...@@ -32,7 +32,7 @@ from gnomemusic.albumartcache import Art
from gnomemusic.widgets.twolinetip import TwoLineTip from gnomemusic.widgets.twolinetip import TwoLineTip
@Gtk.Template(resource_path='/org/gnome/Music/AlbumCover.ui') @Gtk.Template(resource_path='/org/gnome/Music/ui/AlbumCover.ui')
class AlbumCover(Gtk.FlowBoxChild): class AlbumCover(Gtk.FlowBoxChild):
"""Cover tile as used in AlbumsView """Cover tile as used in AlbumsView
......
...@@ -35,7 +35,7 @@ from gnomemusic.widgets.songwidget import SongWidget ...@@ -35,7 +35,7 @@ from gnomemusic.widgets.songwidget import SongWidget
import gnomemusic.utils as utils import gnomemusic.utils as utils
@Gtk.Template(resource_path='/org/gnome/Music/AlbumWidget.ui') @Gtk.Template(resource_path='/org/gnome/Music/ui/AlbumWidget.ui')
class AlbumWidget(Gtk.EventBox): class AlbumWidget(Gtk.EventBox):
"""Album widget. """Album widget.
......
...@@ -34,7 +34,7 @@ from gnomemusic.widgets.songwidget import SongWidget ...@@ -34,7 +34,7 @@ from gnomemusic.widgets.songwidget import SongWidget
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@Gtk.Template(resource_path='/org/gnome/Music/ArtistAlbumsWidget.ui') @Gtk.Template(resource_path='/org/gnome/Music/ui/ArtistAlbumsWidget.ui')
class ArtistAlbumsWidget(Gtk.Box): class ArtistAlbumsWidget(Gtk.Box):
"""Widget containing all albums by an artist """Widget containing all albums by an artist
......
...@@ -32,7 +32,7 @@ from gnomemusic.widgets.disclistboxwidget import DiscBox ...@@ -32,7 +32,7 @@ from gnomemusic.widgets.disclistboxwidget import DiscBox
import gnomemusic.utils as utils import gnomemusic.utils as utils
@Gtk.Template(resource_path='/org/gnome/Music/ArtistAlbumWidget.ui') @Gtk.Template(resource_path='/org/gnome/Music/ui/ArtistAlbumWidget.ui')
class ArtistAlbumWidget(Gtk.Box): class ArtistAlbumWidget(Gtk.Box):
__gtype_name__ = 'ArtistAlbumWidget' __gtype_name__ = 'ArtistAlbumWidget'
......
...@@ -82,7 +82,7 @@ class DiscSongsFlowBox(Gtk.FlowBox): ...@@ -82,7 +82,7 @@ class DiscSongsFlowBox(Gtk.FlowBox):
self.props.min_children_per_line = max_per_line self.props.min_children_per_line = max_per_line
@Gtk.Template(resource_path='/org/gnome/Music/DiscBox.ui') @Gtk.Template(resource_path='/org/gnome/Music/ui/DiscBox.ui')
class DiscBox(Gtk.Box): class DiscBox(Gtk.Box):
"""A widget which compromises one disc """A widget which compromises one disc
......
...@@ -32,7 +32,7 @@ from gnomemusic.widgets.searchbar import Searchbar ...@@ -32,7 +32,7 @@ from gnomemusic.widgets.searchbar import Searchbar
from gnomemusic.utils import View from gnomemusic.utils import View
@Gtk.Template(resource_path="/org/gnome/Music/SelectionBarMenuButton.ui") @Gtk.Template(resource_path="/org/gnome/Music/ui/SelectionBarMenuButton.ui")
class SelectionBarMenuButton(Gtk.MenuButton): class SelectionBarMenuButton(Gtk.MenuButton):
"""Button for popup to select all or no items """Button for popup to select all or no items
...@@ -76,7 +76,7 @@ class SelectionBarMenuButton(Gtk.MenuButton): ...@@ -76,7 +76,7 @@ class SelectionBarMenuButton(Gtk.MenuButton):
self._menu_label.props.label = _("Click on items to select them") self._menu_label.props.label = _("Click on items to select them")
@Gtk.Template(resource_path="/org/gnome/Music/HeaderBar.ui") @Gtk.Template(resource_path="/org/gnome/Music/ui/HeaderBar.ui")
class HeaderBar(Gtk.HeaderBar): class HeaderBar(Gtk.HeaderBar):
"""Headerbar of the application""" """Headerbar of the application"""
......
...@@ -35,7 +35,7 @@ from gnomemusic.widgets.twolinetip import TwoLineTip ...@@ -35,7 +35,7 @@ from gnomemusic.widgets.twolinetip import TwoLineTip
import gnomemusic.utils as utils import gnomemusic.utils as utils
@Gtk.Template(resource_path='/org/gnome/Music/PlayerToolbar.ui') @Gtk.Template(resource_path='/org/gnome/Music/ui/PlayerToolbar.ui')
class PlayerToolbar(Gtk.ActionBar): class PlayerToolbar(Gtk.ActionBar):
"""Main Player widget object """Main Player widget object
......
...@@ -27,7 +27,7 @@ from gi.repository import Gtk ...@@ -27,7 +27,7 @@ from gi.repository import Gtk
from gnomemusic import log from gnomemusic import log
@Gtk.Template(resource_path='/org/gnome/Music/PlaylistContextMenu.ui') @Gtk.Template(resource_path='/org/gnome/Music/ui/PlaylistContextMenu.ui')
class PlaylistContextMenu(Gtk.Popover): class PlaylistContextMenu(Gtk.Popover):
__gtype_name__ = 'PlaylistContextMenu' __gtype_name__ = 'PlaylistContextMenu'
......
...@@ -30,7 +30,7 @@ from gnomemusic import log ...@@ -30,7 +30,7 @@ from gnomemusic import log
import gnomemusic.utils as utils import gnomemusic.utils as utils
@Gtk.Template(resource_path='/org/gnome/Music/PlaylistControls.ui') @Gtk.Template(resource_path='/org/gnome/Music/ui/PlaylistControls.ui')
class PlaylistControls(Gtk.Grid): class PlaylistControls(Gtk.Grid):
"""Widget holding the playlist controls""" """Widget holding the playlist controls"""
......
...@@ -30,7 +30,7 @@ from gnomemusic.playlists import Playlists ...@@ -30,7 +30,7 @@ from gnomemusic.playlists import Playlists
import gnomemusic.utils as utils import gnomemusic.utils as utils
@Gtk.Template(resource_path="/org/gnome/Music/PlaylistDialog.ui") @Gtk.Template(resource_path="/org/gnome/Music/ui/PlaylistDialog.ui")
class PlaylistDialog(Gtk.Dialog): class PlaylistDialog(Gtk.Dialog):
"""Dialog for adding items to a playlist""" """Dialog for adding items to a playlist"""
......
...@@ -160,7 +160,7 @@ class SourceManager(BaseManager): ...@@ -160,7 +160,7 @@ class SourceManager(BaseManager):
grilo.search_source = src grilo.search_source = src
@Gtk.Template(resource_path="/org/gnome/Music/FilterView.ui") @Gtk.Template(resource_path="/org/gnome/Music/ui/FilterView.ui")
class FilterView(Gtk.TreeView): class FilterView(Gtk.TreeView):
"""TreeView for search entry items """TreeView for search entry items
...@@ -254,7 +254,7 @@ class FilterView(Gtk.TreeView): ...@@ -254,7 +254,7 @@ class FilterView(Gtk.TreeView):
self.props.manager.entry.emit('changed') self.props.manager.entry.emit('changed')
@Gtk.Template(resource_path="/org/gnome/Music/DropDown.ui") @Gtk.Template(resource_path="/org/gnome/Music/ui/DropDown.ui")
class DropDown(Gtk.Revealer): class DropDown(Gtk.Revealer):
"""Dropdown source/option selection widget for search """Dropdown source/option selection widget for search
...@@ -314,7 +314,7 @@ class DropDown(Gtk.Revealer): ...@@ -314,7 +314,7 @@ class DropDown(Gtk.Revealer):
return grilo_id == "grl-tracker-source" return grilo_id == "grl-tracker-source"
@Gtk.Template(resource_path="/org/gnome/Music/Searchbar.ui") @Gtk.Template(resource_path="/org/gnome/Music/ui/Searchbar.ui")
class Searchbar(Gtk.SearchBar): class Searchbar(Gtk.SearchBar):
"""Widget containing the search entry """Widget containing the search entry
""" """
......
...@@ -27,7 +27,7 @@ from gi.repository import GObject, Gtk ...@@ -27,7 +27,7 @@ from gi.repository import GObject, Gtk
from gnomemusic import log from gnomemusic import log
@Gtk.Template(resource_path='/org/gnome/Music/SelectionToolbar.ui') @Gtk.Template(resource_path='/org/gnome/Music/ui/SelectionToolbar.ui')
class SelectionToolbar(Gtk.ActionBar): class SelectionToolbar(Gtk.ActionBar):
__gtype_name__ = 'SelectionToolbar' __gtype_name__ = 'SelectionToolbar'
......
...@@ -27,7 +27,7 @@ from gi.repository import GObject, Gtk ...@@ -27,7 +27,7 @@ from gi.repository import GObject, Gtk
from gnomemusic import log from gnomemusic import log
@Gtk.Template(resource_path='/org/gnome/Music/SidebarRow.ui') @Gtk.Template(resource_path='/org/gnome/Music/ui/SidebarRow.ui')
class SidebarRow(Gtk.ListBoxRow): class SidebarRow(Gtk.ListBoxRow):
"""Row for sidebars """Row for sidebars
......
...@@ -36,7 +36,7 @@ from gnomemusic.playlists import Playlists, StaticPlaylists ...@@ -36,7 +36,7 @@ from gnomemusic.playlists import Playlists, StaticPlaylists
from gnomemusic.widgets.starimage import StarImage # noqa: F401 from gnomemusic.widgets.starimage import StarImage # noqa: F401
@Gtk.Template(resource_path='/org/gnome/Music/SongWidget.ui') @Gtk.Template(resource_path='/org/gnome/Music/ui/SongWidget.ui')
class SongWidget(Gtk.EventBox): class SongWidget(Gtk.EventBox):
"""The single song widget used in DiscListBox """The single song widget used in DiscListBox
......
...@@ -27,7 +27,7 @@ from gi.repository import GObject, Gtk ...@@ -27,7 +27,7 @@ from gi.repository import GObject, Gtk
from gnomemusic import log from gnomemusic import log
@Gtk.Template(resource_path='/org/gnome/Music/TwoLineTip.ui') @Gtk.Template(resource_path='/org/gnome/Music/ui/TwoLineTip.ui')
class TwoLineTip(Gtk.Box): class TwoLineTip(Gtk.Box):
"""Tooltip with two lines of text """Tooltip with two lines of text
......
...@@ -30,14 +30,14 @@ gnomemusic/widgets/playlistdialog.py ...@@ -30,14 +30,14 @@ gnomemusic/widgets/playlistdialog.py
gnomemusic/widgets/searchbar.py gnomemusic/widgets/searchbar.py
gnomemusic/widgets/starhandlerwidget.py gnomemusic/widgets/starhandlerwidget.py
gnomemusic/window.py gnomemusic/window.py
data/AboutDialog.ui.in data/ui/AboutDialog.ui.in
data/AlbumWidget.ui data/ui/AlbumWidget.ui
data/app-menu.ui data/ui/app-menu.ui
data/HeaderBar.ui data/ui/HeaderBar.ui
data/help-overlay.ui data/ui/help-overlay.ui
data/PlayerToolbar.ui data/ui/PlayerToolbar.ui
data/PlaylistContextMenu.ui data/ui/PlaylistContextMenu.ui
data/PlaylistControls.ui data/ui/PlaylistControls.ui
data/PlaylistDialog.ui data/ui/PlaylistDialog.ui
data/SelectionBarMenuButton.ui data/ui/SelectionBarMenuButton.ui
data/SelectionToolbar.ui data/ui/SelectionToolbar.ui