GNOME.org
 

f-spot r4560 - in trunk: . src src/Core src/Widgets

Author: sdelcroix
Date: Mon Nov  3 13:43:30 2008
New Revision: 4560
URL: http://svn.gnome.org/viewvc/f-spot?rev=4560&view=rev

Log:
2008-10-30  Stephane Delcroix  <sdelcroix novell com>

	* configure.in: bump the gtk/gtk-sharp dependency to 2.10

	* src/PrintDialog.cs: obsolete: removed

	* src/Core/Global.cs:
	* src/FullScreenView.cs:
	* src/ItemAction.cs:
	* src/MainWindow.cs:
	* src/Makefile.am:
	* src/PrintOperation.cs: remove the GTK_2_10 ifdefs

Removed:
   trunk/src/PrintDialog.cs
Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/src/Core/Global.cs
   trunk/src/FullScreenView.cs
   trunk/src/ItemAction.cs
   trunk/src/MainWindow.cs
   trunk/src/Makefile.am
   trunk/src/PrintOperation.cs
   trunk/src/Widgets/CustomPrintWidget.cs

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Mon Nov  3 13:43:30 2008
@@ -58,9 +58,9 @@
 LIBGNOMEUI_REQUIRED=2.2
 LIBEXIF_REQUIRED_MIN=0.5.7
 LIBEXIF_REQUIRED_MAX=0.7.0
-GTKSHARP_REQUIRED=2.8
+GTKSHARP_REQUIRED=2.10
 MONO_REQUIRED=1.2.4
-GTK_REQUIRED=2.6
+GTK_REQUIRED=2.10
 BEAGLE_REQUIRED=0.3.0
 NDESK_DBUS_REQUIRED=0.4.2
 NDESK_DBUS_GLIB_REQUIRED=0.3.0
@@ -99,9 +99,6 @@
 AC_SUBST(DIR_GIO)
 AC_SUBST(PATH_GIO)
 
-if pkg-config --atleast-version=2.10 gtk-sharp-2.0; then
-   CSC_DEFINES="$CSC_DEFINES -d:GTK_2_10"
-fi
 if pkg-config --atleast-version=2.10.3 gtk-sharp-2.0; then
    CSC_DEFINES="$CSC_DEFINES -d:GTK_2_10_3"
 fi

Modified: trunk/src/Core/Global.cs
==============================================================================
--- trunk/src/Core/Global.cs	(original)
+++ trunk/src/Core/Global.cs	Mon Nov  3 13:43:30 2008
@@ -68,12 +68,10 @@
 		}
 #endif
 
-#if GTK_2_10
 		private static Gtk.PageSetup page_setup = null;
 		public static Gtk.PageSetup PageSetup {
 			get { return page_setup; }
 			set { page_setup = value; }
 		}
-#endif
 	}
 }

Modified: trunk/src/FullScreenView.cs
==============================================================================
--- trunk/src/FullScreenView.cs	(original)
+++ trunk/src/FullScreenView.cs	Mon Nov  3 13:43:30 2008
@@ -73,9 +73,7 @@
 					Catalog.GetString ("Exit fullscreen"),
 					null,
 					null);
-#if GTK_2_10
 				exit_full_screen.IconName = "view-restore";
-#endif
 				exit_full_screen.Activated += ExitAction;
 				actions.Add (exit_full_screen);
 
@@ -83,9 +81,7 @@
 					Catalog.GetString ("Slideshow"),
 					Catalog.GetString ("Start slideshow"),
 					null);
-#if GTK_2_10
 				slide_show.IconName = "media-playback-start";
-#endif
 				slide_show.Activated += SlideShowAction;
 				actions.Add (slide_show);
 
@@ -119,31 +115,14 @@
 
 				Gtk.Action action = new PreviousPictureAction (view.Item);
 				actions.Add (action);
-#if GTK_2_10
 				tbar.Insert (action.CreateToolItem () as ToolItem, -1);
-#else
-				t_item = action.CreateToolItem () as ToolItem;
-				(t_item as ToolButton).IconName = "gtk-go-back-ltr"; 
-				tbar.Insert (t_item, -1);
-#endif
 
 				play_pause_button = (actions [SlideShow]).CreateToolItem () as ToolButton;
-#if GTK_2_10
-				tbar.Insert (play_pause_button, -1);
-#else
-				play_pause_button.IconName = "media-playback-start";
 				tbar.Insert (play_pause_button, -1);
-#endif
 
 				action = new NextPictureAction (view.Item);
 				actions.Add (action);
-#if GTK_2_10
 				tbar.Insert (action.CreateToolItem () as ToolItem, -1);
-#else
-				t_item = action.CreateToolItem () as ToolItem;
-				(t_item as ToolButton).IconName = "gtk-go-forward-ltr"; 
-				tbar.Insert (t_item, -1);
-#endif
 
 				t_item = new ToolItem ();
 				t_item.Child = new Label (Catalog.GetString ("Slide transition:"));
@@ -161,23 +140,11 @@
 
 				action = new RotateLeftAction (view.Item);
 				actions.Add (action);
-#if GTK_2_10
 				tbar.Insert (action.CreateToolItem () as ToolItem, -1);
-#else
-				t_item = action.CreateToolItem () as ToolItem;
-				(t_item as ToolButton).IconName = "object-rotate-left"; 
-				tbar.Insert (t_item, -1);
-#endif
 
 				action = new RotateRightAction (view.Item);
 				actions.Add (action);
-#if GTK_2_10
 				tbar.Insert (action.CreateToolItem () as ToolItem, -1);
-#else
-				t_item = action.CreateToolItem () as ToolItem;
-				(t_item as ToolButton).IconName = "object-rotate-right"; 
-				tbar.Insert (t_item, -1);
-#endif
 
 				info_button = (ToggleToolButton) ((actions [Info]).CreateToolItem () as ToolItem);
 				tbar.Insert (info_button, -1);

Modified: trunk/src/ItemAction.cs
==============================================================================
--- trunk/src/ItemAction.cs	(original)
+++ trunk/src/ItemAction.cs	Mon Nov  3 13:43:30 2008
@@ -26,9 +26,7 @@
 				   string icon_name) : base (name, label)
 		{
 			Tooltip = tooltip;
-#if GTK_2_10
 			IconName = icon_name;
-#endif
 			item = pointer;
 			item.Changed += ItemChanged;
 		}

Modified: trunk/src/MainWindow.cs
==============================================================================
--- trunk/src/MainWindow.cs	(original)
+++ trunk/src/MainWindow.cs	Mon Nov  3 13:43:30 2008
@@ -268,11 +268,8 @@
  		LoadPreference (Preferences.COLOR_MANAGEMENT_USE_X_PROFILE);
  		FSpot.ColorManagement.LoadSettings();
 	
-#if GTK_2_10
 		pagesetup_menu_item.Activated += HandlePageSetupActivated;
-#else
-		pagesetup_menu_item.Visible = false;
-#endif
+
 		toolbar = new Gtk.Toolbar ();
 		toolbar_vbox.PackStart (toolbar);
 
@@ -1724,21 +1721,15 @@
 			cam.ReleaseGPhotoResources ();
 		}
 	}
-#if GTK_2_10
 	void HandlePageSetupActivated (object o, EventArgs e)
 	{
 		FSpot.Global.PageSetup = Print.RunPageSetupDialog (this.Window, FSpot.Global.PageSetup, null);
 	}
-#endif
 	
 	void HandlePrintCommand (object sender, EventArgs e)
 	{
-#if !GTK_2_10
-		new FSpot.PrintDialog (SelectedPhotos ());
-#else
 		FSpot.PrintOperation print = new FSpot.PrintOperation (SelectedPhotos ());
 		print.Run (PrintOperationAction.PrintDialog, null);
-#endif
 	}
 
 	private Gtk.Dialog info_display_window;

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Mon Nov  3 13:43:30 2008
@@ -203,7 +203,6 @@
 	$(srcdir)/PixbufCache.cs		\
 	$(srcdir)/PixelBuffer.cs		\
 	$(srcdir)/Preferences.cs 		\
-	$(srcdir)/PrintDialog.cs		\
 	$(srcdir)/PrintOperation.cs		\
 	$(srcdir)/ProgressDialog.cs		\
 	$(srcdir)/RatingFilter.cs		\

Modified: trunk/src/PrintOperation.cs
==============================================================================
--- trunk/src/PrintOperation.cs	(original)
+++ trunk/src/PrintOperation.cs	Mon Nov  3 13:43:30 2008
@@ -7,7 +7,6 @@
  * This is free software. See COPYING for details.
  */
 
-#if GTK_2_10
 using Cairo;
 using System;
 using System.Runtime.InteropServices;
@@ -236,4 +235,3 @@
 		}
 	}
 }
-#endif

Modified: trunk/src/Widgets/CustomPrintWidget.cs
==============================================================================
--- trunk/src/Widgets/CustomPrintWidget.cs	(original)
+++ trunk/src/Widgets/CustomPrintWidget.cs	Mon Nov  3 13:43:30 2008
@@ -14,7 +14,6 @@
 
 namespace FSpot.Widgets
 {
-#if GTK_2_10
 	public class CustomPrintWidget : VBox
 	{
 		public delegate void ChangedHandler (Gtk.Widget widget);
@@ -162,5 +161,4 @@
 			TriggerChanged (this, null);
 		}
 	}
-#endif
 }
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]