GNOME.org
 

banshee r3421 - in trunk/banshee: . src/Core/Banshee.Services src/Core/Banshee.ThickClient src/Core/Banshee.ThickClient/Banshee.Collection.Gui src/Core/Banshee.ThickClient/Banshee.Gui.Widgets src/Extensions/Banshee.Lastfm src/Libraries/Hyena src/Libraries/Hyena.Gui src/Libraries/Hyena.Gui/Hyena.Data.Gui src/Libraries/Hyena.Gui/Hyena.Data.Gui/ListView src/Libraries/Hyena.Gui/Hyena.Gui tests

Author: abock
Date: Tue Mar 11 20:55:00 2008
New Revision: 3421
URL: http://svn.gnome.org/viewvc/banshee?rev=3421&view=rev

Log:
2008-03-11  Aaron Bockover  <abock gnome org>

    * src/Libraries/Hyena.Gui/Hyena.Gui/PangoCairoHelper.cs: Wrap the
    Pango Cairo calls we care about so we'll build and run on GTK 2.8 again,
    which is quite important (yay SLED)

    * src/Core/Banshee.ThickClient/Banshee.Collection.Gui/BetaReleaseViewOverlay.cs:
    * src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:
    * src/Libraries/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Rendering.cs:
    * src/Libraries/Hyena.Gui/Hyena.Data.Gui/ColumnCellText.cs: Use the new
    Hyena.Gui.PangoCairoHelper API

    * src/Libraries/Hyena.Gui/Hyena.Data.Gui/CairoHelper.cs: Nuked



Added:
   trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Gui/PangoCairoHelper.cs
Removed:
   trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Data.Gui/CairoHelper.cs
Modified:
   trunk/banshee/   (props changed)
   trunk/banshee/ChangeLog
   trunk/banshee/src/Core/Banshee.Services/Banshee.Services.mdp
   trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/BetaReleaseViewOverlay.cs
   trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs
   trunk/banshee/src/Core/Banshee.ThickClient/Banshee.ThickClient.mdp
   trunk/banshee/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.mdp
   trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Data.Gui/ColumnCellText.cs
   trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Rendering.cs
   trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Gui.mdp
   trunk/banshee/src/Libraries/Hyena.Gui/Makefile.am
   trunk/banshee/src/Libraries/Hyena/Hyena.mdp
   trunk/banshee/tests/tests.mdp

Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.Services.mdp
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.Services.mdp	(original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.Services.mdp	Tue Mar 11 20:55:00 2008
@@ -126,6 +126,7 @@
     <File name="Banshee.Library/ThreadPoolImportSource.cs" subtype="Code" buildaction="Compile" />
     <File name="Banshee.ServiceStack/IInitializeService.cs" subtype="Code" buildaction="Compile" />
     <File name="Banshee.Query/PlaylistQueryValue.cs" subtype="Code" buildaction="Compile" />
+    <File name="Banshee.Collection/SelectAllSelection.cs" subtype="Code" buildaction="Compile" />
   </Contents>
   <References>
     <ProjectReference type="Gac" localcopy="True" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />

Modified: trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/BetaReleaseViewOverlay.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/BetaReleaseViewOverlay.cs	(original)
+++ trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/BetaReleaseViewOverlay.cs	Tue Mar 11 20:55:00 2008
@@ -195,7 +195,7 @@
             theme.DrawFrame (cr, rect, true);
             cr.MoveTo (layout_x, layout_y);
             cr.Color = theme.Colors.GetWidgetColor (GtkColorClass.Text, StateType.Normal);
-            Pango.CairoHelper.ShowLayout (cr, layout);
+            PangoCairoHelper.ShowLayout (cr, layout);
 
             int x = rect.X + padding;
             int y = rect.Y + padding;

Modified: trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs	(original)
+++ trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs	Tue Mar 11 20:55:00 2008
@@ -357,7 +357,7 @@
             int fl_width, fl_height, sl_width, sl_height;
 
             // Set up the text layouts
-            Pango.Layout first_line_layout = Pango.CairoHelper.CreateLayout (cr);
+            Pango.Layout first_line_layout = PangoCairoHelper.CreateLayout (cr);
             first_line_layout.Width = (int)(width * Pango.Scale.PangoScale);
             first_line_layout.Ellipsize = Pango.EllipsizeMode.End;
             first_line_layout.FontDescription = PangoContext.FontDescription.Copy ();
@@ -377,7 +377,7 @@
             
             if (renderTrack) {
                 cr.MoveTo (x, y);
-                Pango.CairoHelper.LayoutPath (cr, first_line_layout);
+                PangoCairoHelper.LayoutPath (cr, first_line_layout);
                 cr.Color = text_color;
                 cr.Fill ();
             }
@@ -387,7 +387,7 @@
             }
             
             cr.MoveTo (x, y + fl_height);
-            Pango.CairoHelper.ShowLayout (cr, second_line_layout);
+            PangoCairoHelper.ShowLayout (cr, second_line_layout);
         }
         
         public new void QueueDraw ()

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	Tue Mar 11 20:55:00 2008
@@ -116,6 +116,7 @@
     <ProjectReference type="Gac" localcopy="True" refto="glib-sharp, Version=2.10.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="pango-sharp, Version=2.10.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
   </References>
+  <Deployment.LinuxDeployData generateScript="False" />
   <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="Makefile.am">
     <BuildFilesVar Sync="True" Name="SOURCES" />
     <DeployFilesVar />
@@ -125,5 +126,4 @@
     <AsmRefVar />
     <ProjectRefVar />
   </MonoDevelop.Autotools.MakefileInfo>
-  <Deployment.LinuxDeployData generateScript="False" />
 </Project>
\ No newline at end of file

Modified: trunk/banshee/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.mdp
==============================================================================
--- trunk/banshee/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.mdp	(original)
+++ trunk/banshee/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.mdp	Tue Mar 11 20:55:00 2008
@@ -25,6 +25,9 @@
     <File name="Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs" subtype="Code" buildaction="Compile" />
     <File name="Banshee.Lastfm.Audioscrobbler/Queue.cs" subtype="Code" buildaction="Compile" />
     <File name="Resources/AudioscrobblerMenu.xml" subtype="Code" buildaction="EmbedAsResource" />
+    <File name="Resources/neighbour.png" subtype="Code" buildaction="EmbedAsResource" />
+    <File name="Resources/personal.png" subtype="Code" buildaction="EmbedAsResource" />
+    <File name="Resources/tag.png" subtype="Code" buildaction="EmbedAsResource" />
   </Contents>
   <References>
     <ProjectReference type="Gac" localcopy="True" refto="gtk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />

Modified: trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Data.Gui/ColumnCellText.cs
==============================================================================
--- trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Data.Gui/ColumnCellText.cs	(original)
+++ trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Data.Gui/ColumnCellText.cs	Tue Mar 11 20:55:00 2008
@@ -30,6 +30,7 @@
 using Gtk;
 using Cairo;
 
+using Hyena.Gui;
 using Hyena.Gui.Theming;
 
 namespace Hyena.Data.Gui
@@ -60,7 +61,7 @@
             
             if (use_cairo_pango) {
                 context.Context.MoveTo (4, ((int)cellHeight - text_height) / 2);
-                Pango.CairoHelper.LayoutPath (context.Context, context.Layout);
+                PangoCairoHelper.LayoutPath (context.Context, context.Layout);
                 context.Context.Color = context.Theme.Colors.GetWidgetColor (GtkColorClass.Text, state);
                 context.Context.Fill ();
             } else {

Modified: trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Rendering.cs
==============================================================================
--- trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Rendering.cs	(original)
+++ trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Rendering.cs	Tue Mar 11 20:55:00 2008
@@ -81,14 +81,14 @@
                 
         private void PaintRegion (Gdk.EventExpose evnt, Gdk.Rectangle clip)
         {
-            Cairo.Context cr = CairoHelper.CreateCairoDrawable (evnt.Window);
+            Cairo.Context cr = Gdk.CairoHelper.Create (evnt.Window);
             cr.Rectangle (clip.X, clip.Y, clip.Width, clip.Height);
             cr.Clip ();
 
             if (evnt.Window == header_window) {
                 header_cr = cr;
                 if (header_pango_layout == null) {
-                    header_pango_layout = Pango.CairoHelper.CreateLayout (header_cr);
+                    header_pango_layout = PangoCairoHelper.CreateLayout (header_cr);
                 }
                 PaintHeader (evnt.Area);
             } else if (evnt.Window == footer_window) {
@@ -103,7 +103,7 @@
             } else if (evnt.Window == list_window) {
                 list_cr = cr;
                 if (list_pango_layout == null) {
-                    list_pango_layout = Pango.CairoHelper.CreateLayout (list_cr);
+                    list_pango_layout = PangoCairoHelper.CreateLayout (list_cr);
                 }
                 PaintList (evnt, clip);
             }

Modified: trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Gui.mdp
==============================================================================
--- trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Gui.mdp	(original)
+++ trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Gui.mdp	Tue Mar 11 20:55:00 2008
@@ -17,7 +17,6 @@
     <File name="Hyena.Gui/CleanRoomStartup.cs" subtype="Code" buildaction="Compile" />
     <File name="Hyena.Gui.Dialogs/ExceptionDialog.cs" subtype="Code" buildaction="Compile" />
     <File name="Hyena.Gui.Dialogs/VersionInformationDialog.cs" subtype="Code" buildaction="Compile" />
-    <File name="Hyena.Data.Gui/CairoHelper.cs" subtype="Code" buildaction="Compile" />
     <File name="Hyena.Gui/CairoExtensions.cs" subtype="Code" buildaction="Compile" />
     <File name="Hyena.Data.Gui/ObjectListView.cs" subtype="Code" buildaction="Compile" />
     <File name="Hyena.Gui/EntryEraseAction.cs" subtype="Code" buildaction="Compile" />
@@ -54,6 +53,7 @@
     <File name="Hyena.Gui.Theming/ThemeContext.cs" subtype="Code" buildaction="Compile" />
     <File name="Hyena.Gui.Theming/GtkTheme.cs" subtype="Code" buildaction="Compile" />
     <File name="Hyena.Data.Gui/ListView/ListView_DragAndDrop.cs" subtype="Code" buildaction="Compile" />
+    <File name="Hyena.Gui/PangoCairoHelper.cs" subtype="Code" buildaction="Compile" />
   </Contents>
   <References>
     <ProjectReference type="Gac" localcopy="True" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />

Added: trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Gui/PangoCairoHelper.cs
==============================================================================
--- (empty file)
+++ trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Gui/PangoCairoHelper.cs	Tue Mar 11 20:55:00 2008
@@ -0,0 +1,63 @@
+//
+// CairoHelper.cs
+//
+// Author:
+//   Aaron Bockover <abockover novell com>
+//
+// Copyright (C) 2007 Novell, Inc.
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using System.Runtime.InteropServices;
+
+namespace Hyena.Gui
+{
+    public static class PangoCairoHelper
+    {
+        [DllImport ("libpangocairo-1.0.so.0")]
+        private static extern void pango_cairo_show_layout (IntPtr cr, IntPtr layout);
+        
+        public static void ShowLayout (Cairo.Context cr, Pango.Layout layout)
+        {
+            pango_cairo_show_layout (cr == null ? IntPtr.Zero : cr.Handle, 
+                layout == null ? IntPtr.Zero : layout.Handle);
+        }
+        
+        [DllImport ("libpangocairo-1.0.so.0")]
+        private static extern IntPtr pango_cairo_create_layout (IntPtr cr);
+
+        public static Pango.Layout CreateLayout (Cairo.Context cr) 
+        {
+            IntPtr raw_ret = pango_cairo_create_layout (cr == null ? IntPtr.Zero : cr.Handle);
+            return GLib.Object.GetObject (raw_ret) as Pango.Layout;
+        }
+        
+        [DllImport ("libpangocairo-1.0.so.0")]
+        private static extern void pango_cairo_layout_path (IntPtr cr, IntPtr layout);
+
+        public static void LayoutPath (Cairo.Context cr, Pango.Layout layout) 
+        {
+            pango_cairo_layout_path (cr == null ? IntPtr.Zero : cr.Handle, 
+                layout == null ? IntPtr.Zero : layout.Handle);
+        }
+    }
+}

Modified: trunk/banshee/src/Libraries/Hyena.Gui/Makefile.am
==============================================================================
--- trunk/banshee/src/Libraries/Hyena.Gui/Makefile.am	(original)
+++ trunk/banshee/src/Libraries/Hyena.Gui/Makefile.am	Tue Mar 11 20:55:00 2008
@@ -2,7 +2,6 @@
 TARGET = library
 LINK = $(REF_HYENA_GUI)
 SOURCES =  \
-	Hyena.Data.Gui/CairoHelper.cs \
 	Hyena.Data.Gui/CellContext.cs \
 	Hyena.Data.Gui/Column.cs \
 	Hyena.Data.Gui/ColumnCell.cs \
@@ -35,6 +34,7 @@
 	Hyena.Gui/EntryInsertAction.cs \
 	Hyena.Gui/EntryUndoAdapter.cs \
 	Hyena.Gui/GtkUtilities.cs \
+	Hyena.Gui/PangoCairoHelper.cs \
 	Hyena.Query.Gui/DateQueryValueEntry.cs \
 	Hyena.Query.Gui/FileSizeQueryValueEntry.cs \
 	Hyena.Query.Gui/IntegerQueryValueEntry.cs \

Modified: trunk/banshee/src/Libraries/Hyena/Hyena.mdp
==============================================================================
--- trunk/banshee/src/Libraries/Hyena/Hyena.mdp	(original)
+++ trunk/banshee/src/Libraries/Hyena/Hyena.mdp	Tue Mar 11 20:55:00 2008
@@ -82,6 +82,8 @@
     <File name="Hyena/CryptoUtil.cs" subtype="Code" buildaction="Compile" />
     <File name="Hyena.Query/IntegerKeyedObjectQueryValue.cs" subtype="Code" buildaction="Compile" />
     <File name="Hyena/ConsoleCrayon.cs" subtype="Code" buildaction="Compile" />
+    <File name="Hyena.Data.Sqlite/ICacheableItem.cs" subtype="Code" buildaction="Compile" />
+    <File name="Hyena.Data/ISelectable.cs" subtype="Code" buildaction="Compile" />
   </Contents>
   <References>
     <ProjectReference type="Gac" localcopy="True" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />

Modified: trunk/banshee/tests/tests.mdp
==============================================================================
--- trunk/banshee/tests/tests.mdp	(original)
+++ trunk/banshee/tests/tests.mdp	Tue Mar 11 20:55:00 2008
@@ -7,14 +7,6 @@
       <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
     </Configuration>
   </Configurations>
-  <Contents>
-    <File name="Banshee.Core/FileNamePatternTests.cs" subtype="Code" buildaction="Compile" />
-    <File name="Banshee.Core/KernelTests.cs" subtype="Code" buildaction="Compile" />
-    <File name="Banshee.Services/Xspf/Xspf.cs" subtype="Code" buildaction="Compile" />
-    <File name="Banshee.Services/PlaylistFormatTests.cs" subtype="Code" buildaction="Compile" />
-    <File name="Hyena/RangeCollectionTests.cs" subtype="Code" buildaction="Compile" />
-    <File name="Hyena/CryptoUtilTests.cs" subtype="Code" buildaction="Compile" />
-  </Contents>
   <References>
     <ProjectReference type="Project" localcopy="False" refto="Banshee.Core" />
     <ProjectReference type="Project" localcopy="False" refto="Banshee.Services" />
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]