banshee r3688 - in trunk/banshee: . build src/Core/Banshee.ThickClient src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui src/Core/Banshee.ThickClient/Banshee.Gui src/Core/Banshee.ThickClient/Banshee.Gui.Widgets src/Core/Banshee.ThickClient/Resources src/Core/Banshee.ThickClient/ThemeIcons src/Core/Banshee.ThickClient/ThemeIcons/16x16 src/Core/Banshee.ThickClient/ThemeIcons/16x16/actions src/Core/Banshee.Widgets src/Core/Banshee.Widgets/Banshee.Widgets

From: abock svn gnome org
To: svn-commits-list gnome org
Subject: banshee r3688 - in trunk/banshee: . build src/Core/Banshee.ThickClient src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui src/Core/Banshee.ThickClient/Banshee.Gui src/Core/Banshee.ThickClient/Banshee.Gui.Widgets src/Core/Banshee.ThickClient/Resources src/Core/Banshee.ThickClient/ThemeIcons src/Core/Banshee.ThickClient/ThemeIcons/16x16 src/Core/Banshee.ThickClient/ThemeIcons/16x16/actions src/Core/Banshee.Widgets src/Core/Banshee.Widgets/Banshee.Widgets
Date: Sun, 6 Apr 2008 18:37:17 +0100 (BST)
Author: abock
Date: Sun Apr  6 18:37:16 2008
New Revision: 3688
URL: http://svn.gnome.org/viewvc/banshee?rev=3688&view=rev

Log:
2008-04-06  Aaron Bockover  <abock gnome org>

    * src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/RepeatActionButton.cs:
    * src/Core/Banshee.ThickClient/Banshee.Gui/BansheeActionGroup.cs:
    * src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:
    * src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackRepeatActions.cs: Fixed
    some more icon theme issues relating to switching a lot of stuff from
    stock icons to theme icons

    * src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerLevelsBox.cs:
    * src/Core/Banshee.Widgets/Banshee.Widgets/DiscUsageDisplay.cs:
    * src/Core/Banshee.Widgets/Banshee.Widgets/SearchEntry.cs:
    * src/Core/Banshee.Widgets/Banshee.Widgets/Tile.cs: Updated to use some
    of the drawing utilites that moved into Hyena.Gui

    * src/Core/Banshee.Widgets/Banshee.Widgets/ActionButton.cs:
    * src/Core/Banshee.Widgets/Banshee.Widgets/CoverArtThumbnail.cs:
    * src/Core/Banshee.Widgets/Banshee.Widgets/CoverArtView.cs:
    * src/Core/Banshee.Widgets/Banshee.Widgets/DrawingUtilities.cs:
    * src/Core/Banshee.Widgets/Banshee.Widgets/EllipsizeLabel.cs:
    * src/Core/Banshee.Widgets/Banshee.Widgets/FadingAlignment.cs:
    * src/Core/Banshee.Widgets/Banshee.Widgets/LinearProgress.cs:
    * src/Core/Banshee.Widgets/Banshee.Widgets/MultiStateToggleButton.cs:
    * src/Core/Banshee.Widgets/Banshee.Widgets/RadialProgress.cs:
    * src/Core/Banshee.Widgets/Banshee.Widgets/ShadowContainer.cs:
    * src/Core/Banshee.Widgets/Banshee.Widgets/SimpleNotebook.cs:
    * src/Core/Banshee.Widgets/Banshee.Widgets/ToggleState.cs: Deleted these
    legacy widgets, hooray for bloat cut



Added:
   trunk/banshee/src/Core/Banshee.ThickClient/ThemeIcons/
   trunk/banshee/src/Core/Banshee.ThickClient/ThemeIcons/16x16/
   trunk/banshee/src/Core/Banshee.ThickClient/ThemeIcons/16x16/actions/
   trunk/banshee/src/Core/Banshee.ThickClient/ThemeIcons/16x16/actions/media-repeat-all.png
      - copied unchanged from r3686, /trunk/banshee/src/Core/Banshee.ThickClient/Resources/media-repeat-all.png
   trunk/banshee/src/Core/Banshee.ThickClient/ThemeIcons/16x16/actions/media-repeat-none.png
      - copied unchanged from r3686, /trunk/banshee/src/Core/Banshee.ThickClient/Resources/media-repeat-none.png
   trunk/banshee/src/Core/Banshee.ThickClient/ThemeIcons/16x16/actions/media-repeat-single.png
      - copied unchanged from r3686, /trunk/banshee/src/Core/Banshee.ThickClient/Resources/media-repeat-single.png
Removed:
   trunk/banshee/src/Core/Banshee.ThickClient/Resources/media-repeat-all.png
   trunk/banshee/src/Core/Banshee.ThickClient/Resources/media-repeat-none.png
   trunk/banshee/src/Core/Banshee.ThickClient/Resources/media-repeat-single.png
   trunk/banshee/src/Core/Banshee.Widgets/Banshee.Widgets/ActionButton.cs
   trunk/banshee/src/Core/Banshee.Widgets/Banshee.Widgets/CoverArtThumbnail.cs
   trunk/banshee/src/Core/Banshee.Widgets/Banshee.Widgets/CoverArtView.cs
   trunk/banshee/src/Core/Banshee.Widgets/Banshee.Widgets/DrawingUtilities.cs
   trunk/banshee/src/Core/Banshee.Widgets/Banshee.Widgets/EllipsizeLabel.cs
   trunk/banshee/src/Core/Banshee.Widgets/Banshee.Widgets/FadingAlignment.cs
   trunk/banshee/src/Core/Banshee.Widgets/Banshee.Widgets/MultiStateToggleButton.cs
   trunk/banshee/src/Core/Banshee.Widgets/Banshee.Widgets/RadialProgress.cs
   trunk/banshee/src/Core/Banshee.Widgets/Banshee.Widgets/ShadowContainer.cs
   trunk/banshee/src/Core/Banshee.Widgets/Banshee.Widgets/SimpleNotebook.cs
   trunk/banshee/src/Core/Banshee.Widgets/Banshee.Widgets/ToggleState.cs
Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/build/build.environment.mk
   trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerLevelsBox.cs
   trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/RepeatActionButton.cs
   trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/BansheeActionGroup.cs
   trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs
   trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackRepeatActions.cs
   trunk/banshee/src/Core/Banshee.ThickClient/Banshee.ThickClient.mdp
   trunk/banshee/src/Core/Banshee.ThickClient/Makefile.am
   trunk/banshee/src/Core/Banshee.Widgets/Banshee.Widgets.mdp
   trunk/banshee/src/Core/Banshee.Widgets/Banshee.Widgets/DiscUsageDisplay.cs
   trunk/banshee/src/Core/Banshee.Widgets/Banshee.Widgets/LinearProgress.cs
   trunk/banshee/src/Core/Banshee.Widgets/Banshee.Widgets/SearchEntry.cs
   trunk/banshee/src/Core/Banshee.Widgets/Banshee.Widgets/Tile.cs
   trunk/banshee/src/Core/Banshee.Widgets/Makefile.am

Modified: trunk/banshee/build/build.environment.mk
==============================================================================
--- trunk/banshee/build/build.environment.mk	(original)
+++ trunk/banshee/build/build.environment.mk	Sun Apr  6 18:37:16 2008
@@ -102,7 +102,7 @@
 LINK_BANSHEE_SERVICES = -r:$(DIR_BIN)/Banshee.Services.dll
 LINK_BANSHEE_SERVICES_DEPS = $(REF_BANSHEE_SERVICES) $(LINK_BANSHEE_SERVICES)
 
-REF_BANSHEE_WIDGETS = $(LINK_MONO_POSIX) $(LINK_CAIRO) $(LINK_GTK)
+REF_BANSHEE_WIDGETS = $(LINK_MONO_POSIX) $(LINK_HYENA_GUI_DEPS)
 LINK_BANSHEE_WIDGETS = -r:$(DIR_BIN)/Banshee.Widgets.dll
 LINK_BANSHEE_WIDGETS_DEPS = $(REF_BANSHEE_WIDGETS) $(LINK_BANSHEE_WIDGETS)
 

Modified: trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerLevelsBox.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerLevelsBox.cs	(original)
+++ trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerLevelsBox.cs	Sun Apr  6 18:37:16 2008
@@ -61,8 +61,8 @@
             Label label = new Label ();
             label.Xalign = 1.0f;
             label.Markup = String.Format ("<small>{0}</small>", GLib.Markup.EscapeText (value));
-            label.ModifyFg (StateType.Normal, DrawingUtilities.ColorBlend (
-                Style.Foreground (StateType.Normal), Style.Background (StateType.Normal), 0.5));
+            label.ModifyFg (StateType.Normal, Hyena.Gui.GtkUtilities.ColorBlend (
+                Style.Foreground (StateType.Normal), Style.Background (StateType.Normal)));
             label.Show ();
             return label;
         }

Modified: trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/RepeatActionButton.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/RepeatActionButton.cs	(original)
+++ trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/RepeatActionButton.cs	Sun Apr  6 18:37:16 2008
@@ -70,7 +70,7 @@
                 return;
             }
 
-            image.Stock = action.StockId;
+            image.IconName = action.IconName;
             label.TextWithMnemonic = action.Label;
             box.Sensitive = action.Sensitive && action.Visible;
         }

Modified: trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/BansheeActionGroup.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/BansheeActionGroup.cs	(original)
+++ trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/BansheeActionGroup.cs	Sun Apr  6 18:37:16 2008
@@ -86,7 +86,7 @@
                 string icon = source.Properties.GetString (String.Format ("{0}IconName", action_name));
                 action.Label = String.IsNullOrEmpty (label) ? labels[action_name] : label;
                 if (!String.IsNullOrEmpty (icon)) {
-                    action.StockId = icon;
+                    action.IconName = icon;
                 }
                 //Console.WriteLine ("for source {0} and action {1} got label {2}, so set action.Label = {3}", source.Name, action_name, label, action.Label);
             }

Modified: trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs	(original)
+++ trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs	Sun Apr  6 18:37:16 2008
@@ -186,13 +186,13 @@
         private void ShowPause ()
         {
             play_pause_action.Label = Catalog.GetString ("_Pause");
-            play_pause_action.StockId = "media-playback-pause";
+            play_pause_action.IconName = "media-playback-pause";
         }
         
         private void ShowPlay ()
         {
             play_pause_action.Label = Catalog.GetString ("_Play");
-            play_pause_action.StockId = "media-playback-start";
+            play_pause_action.IconName = "media-playback-start";
         }
                 
         private void OnPlayPauseAction (object o, EventArgs args)

Modified: trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackRepeatActions.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackRepeatActions.cs	(original)
+++ trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackRepeatActions.cs	Sun Apr  6 18:37:16 2008
@@ -65,25 +65,30 @@
             actionService.AddActionGroup (this);
 
             Add (new RadioActionEntry [] {
-                new RadioActionEntry ("RepeatNoneAction", "media-repeat-none", 
+                new RadioActionEntry ("RepeatNoneAction", null, 
                     Catalog.GetString ("Repeat N_one"), null,
                     Catalog.GetString ("Do not repeat playlist"), 0),
                     
-                new RadioActionEntry ("RepeatAllAction", "media-repeat-all",
+                new RadioActionEntry ("RepeatAllAction", null,
                     Catalog.GetString ("Repeat _All"), null,
                     Catalog.GetString ("Play all songs before repeating playlist"), 1),
                     
-                new RadioActionEntry ("RepeatSingleAction", "media-repeat-single",
+                new RadioActionEntry ("RepeatSingleAction", null,
                     Catalog.GetString ("Repeat Singl_e"), null,
                     Catalog.GetString ("Repeat the current playing song"), 2)
             }, 0, OnChanged);
 
+            this["RepeatNoneAction"].IconName = "media-repeat-none";
+            this["RepeatAllAction"].IconName = "media-repeat-all";
+            this["RepeatSingleAction"].IconName = "media-repeat-single";
+
             Gtk.Action action = this[ConfigIdToActionName (RepeatMode.Get ())];
             if (action is RadioAction) {
                 active_action = (RadioAction)action;
             } else {
                 Active = (RadioAction)this["RepeatNoneAction"];
             }
+            
             Active.Activate ();
         }
 

Modified: trunk/banshee/src/Core/Banshee.ThickClient/Banshee.ThickClient.mdp
==============================================================================
--- trunk/banshee/src/Core/Banshee.ThickClient/Banshee.ThickClient.mdp	(original)
+++ trunk/banshee/src/Core/Banshee.ThickClient/Banshee.ThickClient.mdp	Sun Apr  6 18:37:16 2008
@@ -1,4 +1,4 @@
-<Project name="Banshee.ThickClient" fileversion="2.0" UseParentDirectoryAsNamespace="True" language="C#" clr-version="Net_2_0" ctype="DotNetProject">
+<Project name="Banshee.ThickClient" fileversion="2.0" language="C#" clr-version="Net_2_0" UseParentDirectoryAsNamespace="True" ctype="DotNetProject">
   <Configurations active="Debug">
     <Configuration name="Debug" ctype="DotNetProjectConfiguration">
       <Output directory="../../../bin" assembly="Banshee.ThickClient" />
@@ -94,9 +94,6 @@
     <File name="Banshee.Sources.Gui/ISourceContents.cs" subtype="Code" buildaction="Compile" />
     <File name="Banshee.Sources.Gui/ObjectListSourceContents.cs" subtype="Code" buildaction="Compile" />
     <File name="Banshee.Playlist.Gui/PlaylistExportDialog.cs" subtype="Code" buildaction="Compile" />
-    <File name="Resources/media-repeat-all.png" subtype="Code" buildaction="EmbedAsResource" />
-    <File name="Resources/media-repeat-none.png" subtype="Code" buildaction="EmbedAsResource" />
-    <File name="Resources/media-repeat-single.png" subtype="Code" buildaction="EmbedAsResource" />
     <File name="Banshee.Gui.Widgets/RepeatActionButton.cs" subtype="Code" buildaction="Compile" />
     <File name="Banshee.Gui/PlaybackRepeatActions.cs" subtype="Code" buildaction="Compile" />
     <File name="Banshee.Gui/BansheeDbFormatMigratorMonitor.cs" subtype="Code" buildaction="Compile" />

Modified: trunk/banshee/src/Core/Banshee.ThickClient/Makefile.am
==============================================================================
--- trunk/banshee/src/Core/Banshee.ThickClient/Makefile.am	(original)
+++ trunk/banshee/src/Core/Banshee.ThickClient/Makefile.am	Sun Apr  6 18:37:16 2008
@@ -91,9 +91,6 @@
 	Resources/banshee-logo.png \
 	Resources/browser-album-cover.png \
 	Resources/core-ui-actions-layout.xml \
-	Resources/media-repeat-all.png \
-	Resources/media-repeat-none.png \
-	Resources/media-repeat-single.png \
 	Resources/source-cd-audio.png \
 	Resources/source-library.png \
 	Resources/source-localqueue.png \

Modified: trunk/banshee/src/Core/Banshee.Widgets/Banshee.Widgets.mdp
==============================================================================
--- trunk/banshee/src/Core/Banshee.Widgets/Banshee.Widgets.mdp	(original)
+++ trunk/banshee/src/Core/Banshee.Widgets/Banshee.Widgets.mdp	Sun Apr  6 18:37:16 2008
@@ -1,4 +1,4 @@
-<Project name="Banshee.Widgets" fileversion="2.0" UseParentDirectoryAsNamespace="True" language="C#" clr-version="Net_2_0" ctype="DotNetProject">
+<Project name="Banshee.Widgets" fileversion="2.0" language="C#" clr-version="Net_2_0" UseParentDirectoryAsNamespace="True" ctype="DotNetProject">
   <Configurations active="Debug">
     <Configuration name="Debug" ctype="DotNetProjectConfiguration">
       <Output directory="../../../bin" assembly="Banshee.Widgets" />
@@ -10,34 +10,23 @@
   <Contents>
     <File name="Resources/rating-rated.png" subtype="Code" buildaction="EmbedAsResource" />
     <File name="Resources/rating-unrated.png" subtype="Code" buildaction="EmbedAsResource" />
-    <File name="Banshee.Widgets/ActionButton.cs" subtype="Code" buildaction="Compile" />
     <File name="Banshee.Widgets/ComplexMenuItem.cs" subtype="Code" buildaction="Compile" />
-    <File name="Banshee.Widgets/CoverArtThumbnail.cs" subtype="Code" buildaction="Compile" />
-    <File name="Banshee.Widgets/CoverArtView.cs" subtype="Code" buildaction="Compile" />
     <File name="Banshee.Widgets/DateButton.cs" subtype="Code" buildaction="Compile" />
     <File name="Banshee.Widgets/DictionaryComboBox.cs" subtype="Code" buildaction="Compile" />
     <File name="Banshee.Widgets/DiscUsageDisplay.cs" subtype="Code" buildaction="Compile" />
-    <File name="Banshee.Widgets/DrawingUtilities.cs" subtype="Code" buildaction="Compile" />
-    <File name="Banshee.Widgets/EllipsizeLabel.cs" subtype="Code" buildaction="Compile" />
-    <File name="Banshee.Widgets/FadingAlignment.cs" subtype="Code" buildaction="Compile" />
     <File name="Banshee.Widgets/HigMessageDialog.cs" subtype="Code" buildaction="Compile" />
     <File name="Banshee.Widgets/HoverImageButton.cs" subtype="Code" buildaction="Compile" />
     <File name="Banshee.Widgets/LinearProgress.cs" subtype="Code" buildaction="Compile" />
     <File name="Banshee.Widgets/LinkLabel.cs" subtype="Code" buildaction="Compile" />
     <File name="Banshee.Widgets/MessagePane.cs" subtype="Code" buildaction="Compile" />
-    <File name="Banshee.Widgets/MultiStateToggleButton.cs" subtype="Code" buildaction="Compile" />
     <File name="Banshee.Widgets/PropertyTable.cs" subtype="Code" buildaction="Compile" />
-    <File name="Banshee.Widgets/RadialProgress.cs" subtype="Code" buildaction="Compile" />
     <File name="Banshee.Widgets/RatingEntry.cs" subtype="Code" buildaction="Compile" />
     <File name="Banshee.Widgets/RatingMenuItem.cs" subtype="Code" buildaction="Compile" />
     <File name="Banshee.Widgets/SearchEntry.cs" subtype="Code" buildaction="Compile" />
     <File name="Banshee.Widgets/SeekSlider.cs" subtype="Code" buildaction="Compile" />
-    <File name="Banshee.Widgets/ShadowContainer.cs" subtype="Code" buildaction="Compile" />
-    <File name="Banshee.Widgets/SimpleNotebook.cs" subtype="Code" buildaction="Compile" />
     <File name="Banshee.Widgets/StreamPositionLabel.cs" subtype="Code" buildaction="Compile" />
     <File name="Banshee.Widgets/Tile.cs" subtype="Code" buildaction="Compile" />
     <File name="Banshee.Widgets/TileView.cs" subtype="Code" buildaction="Compile" />
-    <File name="Banshee.Widgets/ToggleState.cs" subtype="Code" buildaction="Compile" />
     <File name="Banshee.Widgets/VolumeButton.cs" subtype="Code" buildaction="Compile" />
     <File name="Banshee.Widgets/GenericToolItem.cs" subtype="Code" buildaction="Compile" />
     <File name="Banshee.Widgets/CustomActionProxy.cs" subtype="Code" buildaction="Compile" />
@@ -52,6 +41,8 @@
     <ProjectReference type="Gac" localcopy="True" refto="gnome-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="gdk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="pango-sharp, Version=2.10.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <ProjectReference type="Project" localcopy="True" refto="Hyena.Gui" />
+    <ProjectReference type="Project" localcopy="True" refto="Hyena" />
   </References>
   <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="Makefile.am">
     <BuildFilesVar Sync="True" Name="SOURCES" />

Modified: trunk/banshee/src/Core/Banshee.Widgets/Banshee.Widgets/DiscUsageDisplay.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Widgets/Banshee.Widgets/DiscUsageDisplay.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Widgets/Banshee.Widgets/DiscUsageDisplay.cs	Sun Apr  6 18:37:16 2008
@@ -31,6 +31,8 @@
 using Gtk;
 using Cairo;
 
+using Hyena.Gui;
+
 namespace Banshee.Widgets
 {
     public class DiscUsageDisplay : Gtk.DrawingArea
@@ -67,13 +69,13 @@
         
         protected override void OnStyleSet(Gtk.Style style)
         {
-            fill_color_a = DrawingUtilities.GdkColorToCairoColor(Style.Background(StateType.Selected));
-            fill_color_b = DrawingUtilities.GdkColorToCairoColor(Style.Foreground(StateType.Selected));
-            fill_color_c = DrawingUtilities.GdkColorToCairoColor(Style.Background(StateType.Normal));
-            stroke_color = DrawingUtilities.GdkColorToCairoColor(Style.Foreground(StateType.Normal), 0.6);
-            inner_stroke_color = DrawingUtilities.GdkColorToCairoColor(Style.Foreground(StateType.Normal), 0.4);
-            text_color = DrawingUtilities.GdkColorToCairoColor(Style.Foreground(StateType.Normal), 0.8);
-            text_bg_color = DrawingUtilities.GdkColorToCairoColor(Style.Background(StateType.Normal), 0.6);
+            fill_color_a = CairoExtensions.GdkColorToCairoColor(Style.Background(StateType.Selected));
+            fill_color_b = CairoExtensions.GdkColorToCairoColor(Style.Foreground(StateType.Selected));
+            fill_color_c = CairoExtensions.GdkColorToCairoColor(Style.Background(StateType.Normal));
+            stroke_color = CairoExtensions.GdkColorToCairoColor(Style.Foreground(StateType.Normal), 0.6);
+            inner_stroke_color = CairoExtensions.GdkColorToCairoColor(Style.Foreground(StateType.Normal), 0.4);
+            text_color = CairoExtensions.GdkColorToCairoColor(Style.Foreground(StateType.Normal), 0.8);
+            text_bg_color = CairoExtensions.GdkColorToCairoColor(Style.Background(StateType.Normal), 0.6);
         }
         
         protected override void OnSizeAllocated(Gdk.Rectangle rect)

Modified: trunk/banshee/src/Core/Banshee.Widgets/Banshee.Widgets/LinearProgress.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Widgets/Banshee.Widgets/LinearProgress.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Widgets/Banshee.Widgets/LinearProgress.cs	Sun Apr  6 18:37:16 2008
@@ -48,8 +48,8 @@
         {
             if(bar_gc == null) {
                 bar_gc = new Gdk.GC(GdkWindow);
-                Gdk.Color color = DrawingUtilities.ColorBlend(Style.Background(StateType.Normal), 
-                    Style.Foreground(StateType.Normal), 0.2);
+                Gdk.Color color = Hyena.Gui.GtkUtilities.ColorBlend(Style.Background(StateType.Normal), 
+                    Style.Foreground(StateType.Normal));
                 bar_gc.Background = color;
                 bar_gc.Foreground = color;
             }

Modified: trunk/banshee/src/Core/Banshee.Widgets/Banshee.Widgets/SearchEntry.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Widgets/Banshee.Widgets/SearchEntry.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Widgets/Banshee.Widgets/SearchEntry.cs	Sun Apr  6 18:37:16 2008
@@ -440,7 +440,7 @@
                 text_gc.Copy(Style.TextGC(StateType.Normal));
                 Gdk.Color color_a = parent.Style.Base(StateType.Normal);
                 Gdk.Color color_b = parent.Style.Text(StateType.Normal);
-                text_gc.RgbFgColor = DrawingUtilities.ColorBlend(color_a, color_b, 0.5);
+                text_gc.RgbFgColor = Hyena.Gui.GtkUtilities.ColorBlend(color_a, color_b);
             }
 
             protected override bool OnExposeEvent(Gdk.EventExpose evnt)

Modified: trunk/banshee/src/Core/Banshee.Widgets/Banshee.Widgets/Tile.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Widgets/Banshee.Widgets/Tile.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Widgets/Banshee.Widgets/Tile.cs	Sun Apr  6 18:37:16 2008
@@ -66,8 +66,8 @@
             secondary_label.Xalign = 0.0f;
             secondary_label.Yalign = 0.0f;
             
-            secondary_label.ModifyFg(StateType.Normal, DrawingUtilities.ColorBlend(
-                Style.Foreground(StateType.Normal), Style.Background(StateType.Normal), 0.5));
+            secondary_label.ModifyFg(StateType.Normal, Hyena.Gui.GtkUtilities.ColorBlend(
+                Style.Foreground(StateType.Normal), Style.Background(StateType.Normal)));
                 
             Relief = ReliefStyle.None;
         }

Modified: trunk/banshee/src/Core/Banshee.Widgets/Makefile.am
==============================================================================
--- trunk/banshee/src/Core/Banshee.Widgets/Makefile.am	(original)
+++ trunk/banshee/src/Core/Banshee.Widgets/Makefile.am	Sun Apr  6 18:37:16 2008
@@ -3,17 +3,11 @@
 ASSEMBLY_BUILD_FLAGS = -unsafe
 LINK = $(REF_BANSHEE_WIDGETS)
 SOURCES =  \
-	Banshee.Widgets/ActionButton.cs \
 	Banshee.Widgets/ComplexMenuItem.cs \
-	Banshee.Widgets/CoverArtThumbnail.cs \
-	Banshee.Widgets/CoverArtView.cs \
 	Banshee.Widgets/CustomActionProxy.cs \
 	Banshee.Widgets/DateButton.cs \
 	Banshee.Widgets/DictionaryComboBox.cs \
 	Banshee.Widgets/DiscUsageDisplay.cs \
-	Banshee.Widgets/DrawingUtilities.cs \
-	Banshee.Widgets/EllipsizeLabel.cs \
-	Banshee.Widgets/FadingAlignment.cs \
 	Banshee.Widgets/GenericToolItem.cs \
 	Banshee.Widgets/HigMessageDialog.cs \
 	Banshee.Widgets/HoverImageButton.cs \
@@ -21,20 +15,15 @@
 	Banshee.Widgets/LinkLabel.cs \
 	Banshee.Widgets/MenuTile.cs \
 	Banshee.Widgets/MessagePane.cs \
-	Banshee.Widgets/MultiStateToggleButton.cs \
 	Banshee.Widgets/PropertyTable.cs \
-	Banshee.Widgets/RadialProgress.cs \
 	Banshee.Widgets/RatingActionProxy.cs \
 	Banshee.Widgets/RatingEntry.cs \
 	Banshee.Widgets/RatingMenuItem.cs \
 	Banshee.Widgets/SearchEntry.cs \
 	Banshee.Widgets/SeekSlider.cs \
-	Banshee.Widgets/ShadowContainer.cs \
-	Banshee.Widgets/SimpleNotebook.cs \
 	Banshee.Widgets/StreamPositionLabel.cs \
 	Banshee.Widgets/Tile.cs \
 	Banshee.Widgets/TileView.cs \
-	Banshee.Widgets/ToggleState.cs \
 	Banshee.Widgets/VolumeButton.cs  
 
 RESOURCES =  \
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]