From a7d588ecb54ce6b7a48388bc114a932915e1990c Mon Sep 17 00:00:00 2001 From: daniel g. siegel Date: Mon, 12 Oct 2009 22:43:56 +0200 Subject: [PATCH] beautify muine features the following: - remove muine-playing and muine-paused icons and replaced them with the stock icons - removed the empty icon, when no album art is available with the stock icon for cds - removed the relief of the buttons on the main window --- data/glade/PlaylistWindow.glade | 967 +++++++++++++++------------------------ data/images/Makefile.am | 2 - src/AddAlbumWindow.cs | 10 +- src/Makefile.am | 2 - src/PlaylistWindow.cs | 3 +- src/StockIcons.cs | 8 +- 6 files changed, 380 insertions(+), 612 deletions(-) diff --git a/data/glade/PlaylistWindow.glade b/data/glade/PlaylistWindow.glade index aff7ea1..c6cd73b 100644 --- a/data/glade/PlaylistWindow.glade +++ b/data/glade/PlaylistWindow.glade @@ -1,601 +1,370 @@ - - - + - - - - True - window12 - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - True - False - True - False - False - GDK_WINDOW_TYPE_HINT_NORMAL - GDK_GRAVITY_NORTH_WEST - True - - - - True - False - 0 - - - - True - False - 0 - - - - - - - 0 - False - False - - - - - - True - False - 0 - - - - 6 - True - False - 18 - - - - True - False - 6 - - - - True - False - 6 - - - - True - True - GTK_RELIEF_NORMAL - True - False - False - - - - True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 - - - - True - False - 6 - - - - True - 3 - stock_media-play - 0.5 - 0.5 - 0 - 0 - - - 0 - True - True - - - - - - True - 3 - stock_media-pause - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - - - - 0 - False - False - - - - - - True - True - GTK_RELIEF_NORMAL - True - - - - True - 3 - stock_media-prev - 0.5 - 0.5 - 0 - 0 - - - - - 0 - False - False - - - - - - True - True - GTK_RELIEF_NORMAL - True - - - - True - 3 - stock_media-next - 0.5 - 0.5 - 0 - 0 - - - - - 0 - False - False - - - - - 0 - True - True - - - - - 0 - False - False - - - - - - True - False - 0 - - - - - - - 0 - False - True - - - - - - True - False - 6 - - - - True - True - GTK_RELIEF_NORMAL - True - - - - True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 - - - - True - False - 2 - - - - True - gtk-add - 3 - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - Play Song - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - - - - 0 - False - False - - - - - - True - True - GTK_RELIEF_NORMAL - True - - - - True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 - - - - True - False - 2 - - - - True - 3 - stock_music-library - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - Play Album - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - - - - 0 - False - False - - - - - 0 - False - True - GTK_PACK_END - - - - - 0 - False - True - - - - - - 6 - True - False - 11 - - - - True - False - 0 - - - - - - - 0 - False - True - - - - - - True - False - 0 - - - - True - True - - False - False - GTK_JUSTIFY_LEFT - False - True - 0 - 0 - 0 - 0 - PANGO_ELLIPSIZE_END - -1 - False - 0 - - - 0 - False - False - - - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - GTK_PACK_END - - - - - 0 - True - True - - - - - 0 - False - True - - - - - - 6 - True - False - 6 - - - - True - True - False - - - - True - - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - - - 0 - False - False - - - - - - True - False - 0 - - - - True - False - 6 - - - - True - True - GTK_POLICY_NEVER - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - - - - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - True - True - - - - - - + + True + window12 + + + True + + + True + + + + + + False + False + + + + + True + + + True + 6 + 18 + + + True + 6 + + + True + 6 + + + True + True + GTK_RELIEF_NONE + 0 + + + True + 0 + 0 + + + True + 6 + + + True + 3 + stock_media-play + + + + + True + 3 + stock_media-pause + + + False + False + 1 + + + + + + + + + False + False + + + + + True + True + GTK_RELIEF_NONE + 0 + + + True + 3 + stock_media-prev + + + + + False + False + 1 + + + + + True + True + GTK_RELIEF_NONE + 0 + + + True + 3 + stock_media-next + + + + + False + False + 2 + + + + + + + False + False + + + + + True + + + + + + False + 1 + + + + + True + 6 + + + True + True + GTK_RELIEF_NONE + 0 + + + True + 0 + 0 + + + True + 2 + + + True + gtk-add + 3 + + + False + False + + + + + True + Play Song + True + + + False + False + 1 + + + + + + + + + False + False + + + + + True + True + GTK_RELIEF_NONE + 0 + + + True + 0 + 0 + + + True + 2 + + + True + 3 + media-optical + + + False + False + + + + + True + Play Album + True + + + False + False + 1 + + + + + + + + + False + False + 1 + + + + + False + GTK_PACK_END + 2 + + + + + False + + + + + True + 6 + 11 + + + True + + + + + + False + + + + + True + + + True + True + 0 + 0 + True + PANGO_ELLIPSIZE_END + + + False + False + + + + + True + 0 + + + False + False + GTK_PACK_END + 1 + + + + + 1 + + + + + False + 1 + + + + + True + 6 + 6 + + + True + + + True + 0 + True + + + + + False + False + + + + + True + + + True + 6 + + + True + True + GTK_POLICY_NEVER + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + + + + + + + + + + 1 + + + + + 2 + + + + + 1 + + + + + diff --git a/data/images/Makefile.am b/data/images/Makefile.am index 91ce71a..4dbb756 100644 --- a/data/images/Makefile.am +++ b/data/images/Makefile.am @@ -1,7 +1,5 @@ noinst_DATA = \ muine-about.png \ - muine-playing.png \ - muine-paused.png \ muine-nothing.png \ muine-default-cover.png \ muine-cover-downloading.png diff --git a/src/AddAlbumWindow.cs b/src/AddAlbumWindow.cs index efa0d0b..24caa95 100644 --- a/src/AddAlbumWindow.cs +++ b/src/AddAlbumWindow.cs @@ -21,6 +21,7 @@ using System; using System.Collections; using Mono.Unix; +using Gtk; using Gnome.Vfs; namespace Muine @@ -58,13 +59,12 @@ namespace Muine private Gtk.CellRenderer pixbuf_renderer = new Gtk.CellRendererPixbuf (); - private Gdk.Pixbuf nothing_pixbuf = - new Gdk.Pixbuf (null, "muine-nothing.png"); - // Variables private bool drag_dest_enabled = false; private int pixbuf_column_width = CoverDatabase.CoverSize + (5 * 2); + private Gdk.Pixbuf nothing_pixbuf; + private Gtk.IconTheme icontheme; // Constructor @@ -73,6 +73,8 @@ namespace Muine public AddAlbumWindow () { base.Title = string_title; + icontheme = IconTheme.GetForScreen(Screen); + nothing_pixbuf = icontheme.LoadIcon("media-optical", CoverDatabase.CoverSize, 0); base.SetGConfSize (GConfKeyWidth , GConfDefaultWidth, @@ -193,7 +195,7 @@ namespace Muine if (Global.CoverDB.Loading) return Global.CoverDB.DownloadingPixbuf; - return nothing_pixbuf; + return nothing_pixbuf; } // Methods :: Private :: GetPerformers diff --git a/src/Makefile.am b/src/Makefile.am index b2269b1..800d516 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -76,8 +76,6 @@ MUINE_RESOURCES = \ -resource:$(top_srcdir)/data/glade/AddWindow.glade,AddWindow.glade \ -resource:$(top_srcdir)/data/glade/ProgressWindow.glade,ProgressWindow.glade \ -resource:$(top_srcdir)/data/ui/PlaylistWindow.xml,PlaylistWindow.xml \ - -resource:$(top_srcdir)/data/images/muine-playing.png,muine-playing.png \ - -resource:$(top_srcdir)/data/images/muine-paused.png,muine-paused.png \ -resource:$(top_srcdir)/data/images/muine-nothing.png,muine-nothing.png \ -resource:$(top_srcdir)/data/images/muine-default-cover.png,muine-default-cover.png \ -resource:$(top_srcdir)/data/images/muine-cover-downloading.png,muine-cover-downloading.png \ diff --git a/src/PlaylistWindow.cs b/src/PlaylistWindow.cs index fb2b3b7..41c06ba 100644 --- a/src/PlaylistWindow.cs +++ b/src/PlaylistWindow.cs @@ -878,6 +878,7 @@ namespace Muine volume_button = new Bacon.VolumeButton (); volume_button_container.Add (volume_button); volume_button.Visible = true; + volume_button.Relief = ReliefStyle.None; volume_button.VolumeChanged += OnVolumeChanged; // Tooltips @@ -2273,7 +2274,7 @@ namespace Muine IntPtr handle = playlist.Model.HandleFromIter (iter); if (handle == playlist.Model.Playing) { - string icon = (player.Playing) ? "muine-playing" : "muine-paused"; + string icon = (player.Playing) ? "player_play" : "player_pause"; r.Pixbuf = playlist.RenderIcon (icon, IconSize.Menu, null); } else { diff --git a/src/StockIcons.cs b/src/StockIcons.cs index f0f6904..f13ba45 100644 --- a/src/StockIcons.cs +++ b/src/StockIcons.cs @@ -34,9 +34,7 @@ namespace Muine // Variables :: Stock Icons private static readonly string [] stock_icons = { "muine-default-cover", - "muine-cover-downloading", - "muine-playing", - "muine-paused" + "muine-cover-downloading" }; // Variables :: Themed Icons @@ -53,7 +51,9 @@ namespace Muine "stock_volume-max", "stock_shuffle", "stock_timer", - "gnome-mime-audio" + "gnome-mime-audio", + "player_play", + "player_pause" }; // Properties -- 1.6.5