GNOME.org
 

[f-spot] Drop F-Spot's HigMessageDialog in favour of Hyena's one.

commit e6bcc0dd376bd809802f37d62e604025f3b647cd
Author: Paul Lange <palango gmx de>
Date:   Mon Jun 21 21:24:30 2010 +0200

    Drop F-Spot's HigMessageDialog in favour of Hyena's one.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=621452

 build/build.environment.mk                         |    2 +-
 .../Exporters/FacebookExport/FacebookExport.cs     |    1 +
 .../FacebookExport/FacebookExportDialog.cs         |    3 +-
 extensions/Exporters/FlickrExport/FlickrExport.cs  |    1 +
 .../Exporters/GalleryExport/GalleryExport.cs       |    1 +
 .../Exporters/GalleryExport/GalleryRemote.cs       |    1 +
 .../Exporters/PicasaWebExport/PicasaWebExport.cs   |    1 +
 extensions/Exporters/ZipExport/ZipExport.cs        |    1 +
 .../Tools/ChangePhotoPath/ChangePhotoPathGui.cs    |    1 +
 extensions/Tools/MergeDb/MergeDb.cs                |    1 +
 extensions/Tools/RawPlusJpeg/RawPlusJpeg.cs        |    1 +
 src/MainWindow.cs                                  |    7 +-
 src/Makefile.am                                    |    1 -
 src/PhotoVersionCommands.cs                        |    1 +
 src/RotateCommand.cs                               |    1 +
 src/SendEmail.cs                                   |    3 +-
 src/Sharpener.cs                                   |    1 +
 src/TagSelectionWidget.cs                          |    1 +
 src/UI.Dialog/EditExceptionDialog.cs               |    1 +
 src/UI.Dialog/EditTagIconDialog.cs                 |    5 +-
 src/UI.Dialog/HigMessageDialog.cs                  |  187 --------------------
 src/UI.Dialog/RepairDbDialog.cs                    |    1 +
 src/Widgets/EditorPage.cs                          |    3 +-
 23 files changed, 29 insertions(+), 197 deletions(-)
---
diff --git a/build/build.environment.mk b/build/build.environment.mk
index 763fcf0..865be84 100644
--- a/build/build.environment.mk
+++ b/build/build.environment.mk
@@ -119,7 +119,7 @@ LINK_FSPOT_PLATFORM_DEPS = $(REF_FSPOT_PLATFORM) $(LINK_FSPOT_PLATFORM)
 # FSpot.Widgets
 REF_FSPOT_WIDGETS = $(LINK_FSPOT_CORE_DEPS) $(LINK_FSPOT_BLING_DEPS)
 LINK_FSPOT_WIDGETS = -r:$(DIR_BIN)/FSpot.Widgets.dll
-LINK_FSPOT_WIDGETS_DEPS = $(REF_FSPOT_WIDGETS) $(LINK_FSPOT_WIDGETS)
+LINK_FSPOT_WIDGETS_DEPS = $(REF_FSPOT_WIDGETS) $(LINK_FSPOT_WIDGETS) $(LINK_HENA_GUI_DEPS)
 
 # FSpot (executable)
 REF_FSPOT = $(LINK_FSPOT_WIDGETS_DEPS) $(LINK_FSPOT_PLATFORM_DEPS) $(LINK_FSPOT_QUERY_DEPS) \
diff --git a/extensions/Exporters/FacebookExport/FacebookExport.cs b/extensions/Exporters/FacebookExport/FacebookExport.cs
index 0f65bd8..5b97690 100644
--- a/extensions/Exporters/FacebookExport/FacebookExport.cs
+++ b/extensions/Exporters/FacebookExport/FacebookExport.cs
@@ -29,6 +29,7 @@ using GtkBeans;
 
 using FSpot;
 using Hyena;
+using Hyena.Widgets;
 using FSpot.UI.Dialog;
 using FSpot.Extensions;
 using FSpot.Filters;
diff --git a/extensions/Exporters/FacebookExport/FacebookExportDialog.cs b/extensions/Exporters/FacebookExport/FacebookExportDialog.cs
index b4ea505..cf6d6e2 100644
--- a/extensions/Exporters/FacebookExport/FacebookExportDialog.cs
+++ b/extensions/Exporters/FacebookExport/FacebookExportDialog.cs
@@ -23,6 +23,7 @@ using Gtk;
 using GtkBeans;
 
 using Hyena;
+using Hyena.Widgets;
 using FSpot.Utils;
 using FSpot.Platform;
 using FSpot.UI.Dialog;
@@ -48,7 +49,7 @@ namespace FSpot.Exporter.Facebook
 		[GtkBeans.Builder.Object] Entry album_name_entry;
 		[GtkBeans.Builder.Object] Entry album_location_entry;
 		[GtkBeans.Builder.Object] Entry album_description_entry;
-		[GtkBeans.Builder.Object] ScrolledWindow thumbnails_scrolled_window;
+		[GtkBeans.Builder.Object] Gtk.ScrolledWindow thumbnails_scrolled_window;
 		[GtkBeans.Builder.Object] TextView caption_textview;
 		[GtkBeans.Builder.Object] TreeView tag_treeview;
 		[GtkBeans.Builder.Object] EventBox tag_image_eventbox;
diff --git a/extensions/Exporters/FlickrExport/FlickrExport.cs b/extensions/Exporters/FlickrExport/FlickrExport.cs
index 2d228fb..2daab9c 100644
--- a/extensions/Exporters/FlickrExport/FlickrExport.cs
+++ b/extensions/Exporters/FlickrExport/FlickrExport.cs
@@ -11,6 +11,7 @@ using FSpot.Widgets;
 using FSpot.Utils;
 using FSpot.UI.Dialog;
 using Hyena;
+using Hyena.Widgets;
 
 namespace FSpotFlickrExport {
 	public class TwentyThreeHQExport : FlickrExport
diff --git a/extensions/Exporters/GalleryExport/GalleryExport.cs b/extensions/Exporters/GalleryExport/GalleryExport.cs
index daff764..5e16cc5 100644
--- a/extensions/Exporters/GalleryExport/GalleryExport.cs
+++ b/extensions/Exporters/GalleryExport/GalleryExport.cs
@@ -16,6 +16,7 @@ using FSpot.Extensions;
 
 using GalleryRemote;
 using Hyena;
+using Hyena.Widgets;
 
 namespace G2Export {
 	public class GalleryAccount {
diff --git a/extensions/Exporters/GalleryExport/GalleryRemote.cs b/extensions/Exporters/GalleryExport/GalleryRemote.cs
index cc4b2ff..146000e 100644
--- a/extensions/Exporters/GalleryExport/GalleryRemote.cs
+++ b/extensions/Exporters/GalleryExport/GalleryRemote.cs
@@ -9,6 +9,7 @@ using Mono.Unix;
 using FSpot;
 using FSpot.UI.Dialog;
 using Hyena;
+using Hyena.Widgets;
 
 /* These classes are based off the documentation at
  *
diff --git a/extensions/Exporters/PicasaWebExport/PicasaWebExport.cs b/extensions/Exporters/PicasaWebExport/PicasaWebExport.cs
index 71f57a9..1702461 100644
--- a/extensions/Exporters/PicasaWebExport/PicasaWebExport.cs
+++ b/extensions/Exporters/PicasaWebExport/PicasaWebExport.cs
@@ -16,6 +16,7 @@ using System.Collections.Specialized;
 using System.Web;
 using Mono.Unix;
 using Hyena;
+using Hyena.Widgets;
 
 using FSpot;
 using FSpot.Filters;
diff --git a/extensions/Exporters/ZipExport/ZipExport.cs b/extensions/Exporters/ZipExport/ZipExport.cs
index 6c73aae..62cd97e 100644
--- a/extensions/Exporters/ZipExport/ZipExport.cs
+++ b/extensions/Exporters/ZipExport/ZipExport.cs
@@ -17,6 +17,7 @@ using FSpot.UI.Dialog;
 using FSpot.Extensions;
 using FSpot.Filters;
 using Hyena;
+using Hyena.Widgets;
 using System;
 using System.IO;
 using System.Collections;
diff --git a/extensions/Tools/ChangePhotoPath/ChangePhotoPathGui.cs b/extensions/Tools/ChangePhotoPath/ChangePhotoPathGui.cs
index 351aeb3..39b21a5 100644
--- a/extensions/Tools/ChangePhotoPath/ChangePhotoPathGui.cs
+++ b/extensions/Tools/ChangePhotoPath/ChangePhotoPathGui.cs
@@ -13,6 +13,7 @@ using System;
 //using Gnome.Vfs;
 using Gtk;
 using Hyena;
+using Hyena.Widgets;
 
 namespace ChangePhotoPath
 {
diff --git a/extensions/Tools/MergeDb/MergeDb.cs b/extensions/Tools/MergeDb/MergeDb.cs
index b1a4c66..4b2589d 100644
--- a/extensions/Tools/MergeDb/MergeDb.cs
+++ b/extensions/Tools/MergeDb/MergeDb.cs
@@ -19,6 +19,7 @@ using FSpot.Query;
 using FSpot.UI.Dialog;
 using Mono.Unix;
 using Hyena;
+using Hyena.Widgets;
 
 namespace MergeDbExtension
 {
diff --git a/extensions/Tools/RawPlusJpeg/RawPlusJpeg.cs b/extensions/Tools/RawPlusJpeg/RawPlusJpeg.cs
index 92fbb02..906050b 100644
--- a/extensions/Tools/RawPlusJpeg/RawPlusJpeg.cs
+++ b/extensions/Tools/RawPlusJpeg/RawPlusJpeg.cs
@@ -17,6 +17,7 @@ using FSpot.UI.Dialog;
 using FSpot.Extensions;
 
 using Hyena;
+using Hyena.Widgets;
 
 namespace RawPlusJpegExtension
 {
diff --git a/src/MainWindow.cs b/src/MainWindow.cs
index 79740cc..4a6cff8 100644
--- a/src/MainWindow.cs
+++ b/src/MainWindow.cs
@@ -18,6 +18,7 @@ using Mono.Addins;
 using Mono.Unix;
 
 using Hyena;
+using Hyena.Widgets;
 using Banshee.Kernel;
 
 using FSpot;
@@ -46,11 +47,11 @@ namespace FSpot
 	
 		[GtkBeans.Builder.Object] Gtk.VBox toolbar_vbox;
 	
-		[GtkBeans.Builder.Object] ScrolledWindow icon_view_scrolled;
+		[GtkBeans.Builder.Object] Gtk.ScrolledWindow icon_view_scrolled;
 		[GtkBeans.Builder.Object] Box photo_box;
 		[GtkBeans.Builder.Object] Notebook view_notebook;
 		
-		ScrolledWindow tag_selection_scrolled;
+		Gtk.ScrolledWindow tag_selection_scrolled;
 	
 		[GtkBeans.Builder.Object] Label status_label;
 	
@@ -339,7 +340,7 @@ namespace FSpot
 			ViewModeChanged += Sidebar.HandleMainWindowViewModeChanged;
 			sidebar_vbox.Add (Sidebar);
 	
-			tag_selection_scrolled = new ScrolledWindow ();
+			tag_selection_scrolled = new Gtk.ScrolledWindow ();
 			tag_selection_scrolled.ShadowType = ShadowType.In;
 			
 			tag_selection_widget = new TagSelectionWidget (Database.Tags);
diff --git a/src/Makefile.am b/src/Makefile.am
index 77bb930..94e5eac 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -156,7 +156,6 @@ SOURCES = \
 	UI.Dialog/EditTagIconDialog.cs \
 	UI.Dialog/ExceptionDialog.cs \
 	UI.Dialog/GladeDialog.cs \
-	UI.Dialog/HigMessageDialog.cs \
 	UI.Dialog/ImportDialog.cs \
 	UI.Dialog/LastRollDialog.cs \
 	UI.Dialog/PreferenceDialog.cs \
diff --git a/src/PhotoVersionCommands.cs b/src/PhotoVersionCommands.cs
index d2e3eda..8ebdd05 100644
--- a/src/PhotoVersionCommands.cs
+++ b/src/PhotoVersionCommands.cs
@@ -4,6 +4,7 @@ using System;
 using Mono.Unix;
 using FSpot;
 using Hyena;
+using Hyena.Widgets;
 using FSpot.UI.Dialog;
 
 public class PhotoVersionCommands
diff --git a/src/RotateCommand.cs b/src/RotateCommand.cs
index 23afa4c..c890ff0 100644
--- a/src/RotateCommand.cs
+++ b/src/RotateCommand.cs
@@ -19,6 +19,7 @@ using FSpot.Png;
 using FSpot.UI.Dialog;
 
 using Hyena;
+using Hyena.Widgets;
 using FSpot.Utils;
 
 using Mono.Unix;
diff --git a/src/SendEmail.cs b/src/SendEmail.cs
index aae8ffb..b22d945 100644
--- a/src/SendEmail.cs
+++ b/src/SendEmail.cs
@@ -18,6 +18,7 @@ using FSpot.Filters;
 using FSpot.UI.Dialog;
 
 using Hyena;
+using Hyena.Widgets;
 using Mono.Unix;
 
 namespace FSpot
@@ -27,7 +28,7 @@ namespace FSpot
 		Window parent_window;
 
 #pragma warning disable 0649
-		[GtkBeans.Builder.Object] private ScrolledWindow   tray_scrolled;
+		[GtkBeans.Builder.Object] private Gtk.ScrolledWindow   tray_scrolled;
 		[GtkBeans.Builder.Object] private Label 		NumberOfPictures, TotalOriginalSize, ApproxNewSize;
 		[GtkBeans.Builder.Object] private RadioButton 	tiny_size, small_size, medium_size,
 														large_size, x_large_size, original_size;
diff --git a/src/Sharpener.cs b/src/Sharpener.cs
index d38b435..e25e9eb 100644
--- a/src/Sharpener.cs
+++ b/src/Sharpener.cs
@@ -17,6 +17,7 @@ using System.Runtime.InteropServices;
 using Mono.Unix;
 using FSpot.Widgets;
 using FSpot.UI.Dialog;
+using Hyena.Widgets;
 
 namespace FSpot.Widgets {
 	public class Sharpener : Loupe {
diff --git a/src/TagSelectionWidget.cs b/src/TagSelectionWidget.cs
index 502c0da..e096833 100644
--- a/src/TagSelectionWidget.cs
+++ b/src/TagSelectionWidget.cs
@@ -24,6 +24,7 @@ using FSpot;
 using FSpot.Utils;
 using FSpot.Widgets;
 using FSpot.UI.Dialog;
+using Hyena.Widgets;
 
 
 
diff --git a/src/UI.Dialog/EditExceptionDialog.cs b/src/UI.Dialog/EditExceptionDialog.cs
index 6c79e01..2ce147a 100644
--- a/src/UI.Dialog/EditExceptionDialog.cs
+++ b/src/UI.Dialog/EditExceptionDialog.cs
@@ -11,6 +11,7 @@ using System;
 using Mono.Unix;
 using Gtk;
 using Hyena;
+using Hyena.Widgets;
 
 namespace FSpot.UI.Dialog
 {
diff --git a/src/UI.Dialog/EditTagIconDialog.cs b/src/UI.Dialog/EditTagIconDialog.cs
index d454257..663da78 100644
--- a/src/UI.Dialog/EditTagIconDialog.cs
+++ b/src/UI.Dialog/EditTagIconDialog.cs
@@ -17,6 +17,7 @@ using Gtk;
 using FSpot.Widgets;
 using FSpot.Utils;
 using Hyena;
+using Hyena.Widgets;
 
 namespace FSpot.UI.Dialog
 {
@@ -29,8 +30,8 @@ namespace FSpot.UI.Dialog
 		Gtk.FileChooserButton external_photo_chooser;
 
 		[GtkBeans.Builder.Object] Gtk.Image preview_image;
-		[GtkBeans.Builder.Object] ScrolledWindow photo_scrolled_window;
-		[GtkBeans.Builder.Object] ScrolledWindow icon_scrolled_window;
+		[GtkBeans.Builder.Object] Gtk.ScrolledWindow photo_scrolled_window;
+		[GtkBeans.Builder.Object] Gtk.ScrolledWindow icon_scrolled_window;
 		[GtkBeans.Builder.Object] Label photo_label;
 		[GtkBeans.Builder.Object] Label from_photo_label;
 		[GtkBeans.Builder.Object] SpinButton photo_spin_button;
diff --git a/src/UI.Dialog/RepairDbDialog.cs b/src/UI.Dialog/RepairDbDialog.cs
index c4ed9b7..28cbab0 100644
--- a/src/UI.Dialog/RepairDbDialog.cs
+++ b/src/UI.Dialog/RepairDbDialog.cs
@@ -11,6 +11,7 @@ using System;
 using Gtk;
 using Mono.Unix;
 using Hyena;
+using Hyena.Widgets;
 
 namespace FSpot.UI.Dialog
 {
diff --git a/src/Widgets/EditorPage.cs b/src/Widgets/EditorPage.cs
index 4db5672..8f0ee94 100644
--- a/src/Widgets/EditorPage.cs
+++ b/src/Widgets/EditorPage.cs
@@ -21,6 +21,7 @@ using Mono.Unix;
 using System;
 using System.Collections.Generic;
 using Hyena;
+using Hyena.Widgets;
 
 namespace FSpot.Widgets {
 	public class EditorPage : SidebarPage {
@@ -48,7 +49,7 @@ namespace FSpot.Widgets {
 		}
 	}
 
-	public class EditorPageWidget : ScrolledWindow {
+	public class EditorPageWidget : Gtk.ScrolledWindow {
 		private VBox widgets;
 		private VButtonBox buttons;
 		private Widget active_editor;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]