[f-spot] Fix the build
- From: Stephane Delcroix <sdelcroix src gnome org>
- To: svn-commits-list gnome org
- Subject: [f-spot] Fix the build
- Date: Wed, 24 Jun 2009 06:40:09 +0000 (UTC)
commit d2f8e1e83ddc21674792af58a78b71553dd73ea9
Author: Mike Gemünde <mike gemuende de>
Date: Tue Jun 23 22:11:53 2009 +0200
Fix the build
-r: basically all the assemblies so we workaround that gmcs issue. Re-add the removed TagSelectionDialog
extensions/Exporters/CDExport/Makefile.am | 4 +-
extensions/Exporters/FacebookExport/Makefile.am | 3 +
extensions/Exporters/FlickrExport/Makefile.am | 4 +-
extensions/Exporters/FolderExport/Makefile.am | 4 +-
extensions/Exporters/GalleryExport/Makefile.am | 4 +-
extensions/Exporters/PicasaWebExport/Makefile.am | 2 +
extensions/Exporters/SmugMugExport/Makefile.am | 4 +-
.../Exporters/TabbloExport/FSpotUploadProgress.cs | 1 +
extensions/Exporters/TabbloExport/Makefile.am | 3 +
extensions/Exporters/ZipExport/Makefile.am | 5 +-
extensions/Services/BeagleService/Makefile.am | 1 +
extensions/Services/DBusService/Makefile.am | 5 +-
extensions/Tools/ChangePhotoPath/Makefile.am | 5 +-
extensions/Tools/DevelopInUFraw/Makefile.am | 3 +-
extensions/Tools/HashJob/Makefile.am | 5 +-
extensions/Tools/MergeDb/Makefile.am | 5 +-
extensions/Tools/RawPlusJpeg/Makefile.am | 3 +-
src/Makefile.am | 1 +
src/UI.Dialog/TagSelectionDialog.cs | 40 +++++
src/f-spot.glade | 180 ++++++++++++++++++++
20 files changed, 269 insertions(+), 13 deletions(-)
---
diff --git a/extensions/Exporters/CDExport/Makefile.am b/extensions/Exporters/CDExport/Makefile.am
index b8ec614..0ed39ce 100644
--- a/extensions/Exporters/CDExport/Makefile.am
+++ b/extensions/Exporters/CDExport/Makefile.am
@@ -13,7 +13,9 @@ REFS = \
-r:$(top_builddir)/src/f-spot.exe \
-r:$(top_builddir)/src/FSpot.Core.dll \
-r:$(top_builddir)/src/FSpot.Utils.dll \
- $(LINK_SEMWEB) \
+ $(LINK_MONO_ADDINS) \
+ $(LINK_SEMWEB) \
+ $(LINK_GPHOTO2) \
-r:Mono.Posix
PKGS = \
diff --git a/extensions/Exporters/FacebookExport/Makefile.am b/extensions/Exporters/FacebookExport/Makefile.am
index 30188d4..228d353 100644
--- a/extensions/Exporters/FacebookExport/Makefile.am
+++ b/extensions/Exporters/FacebookExport/Makefile.am
@@ -35,6 +35,9 @@ REFS = \
-r:$(top_builddir)/src/FSpot.Platform.dll \
$(LINK_GTKSHARPBEANS) \
$(LINK_KEYRING) \
+ $(LINK_MONO_ADDINS) \
+ $(LINK_SEMWEB) \
+ $(LINK_GPHOTO2) \
-r:Mono.Posix
PKGS = \
diff --git a/extensions/Exporters/FlickrExport/Makefile.am b/extensions/Exporters/FlickrExport/Makefile.am
index 3888a2e..b4d5f7a 100644
--- a/extensions/Exporters/FlickrExport/Makefile.am
+++ b/extensions/Exporters/FlickrExport/Makefile.am
@@ -14,7 +14,9 @@ REFS = \
-r:$(top_builddir)/src/f-spot.exe \
-r:$(top_builddir)/src/FSpot.Core.dll \
-r:$(top_builddir)/src/FSpot.Utils.dll \
- $(LINK_SEMWEB) \
+ $(LINK_SEMWEB) \
+ $(LINK_MONO_ADDINS) \
+ $(LINK_GPHOTO2) \
$(LINK_GTKSHARPBEANS) \
-r:FlickrNet/FlickrNet.dll \
-r:Mono.Posix
diff --git a/extensions/Exporters/FolderExport/Makefile.am b/extensions/Exporters/FolderExport/Makefile.am
index 2edf2a3..9cb4b52 100644
--- a/extensions/Exporters/FolderExport/Makefile.am
+++ b/extensions/Exporters/FolderExport/Makefile.am
@@ -13,7 +13,9 @@ REFS = \
-r:$(top_builddir)/src/f-spot.exe \
-r:$(top_builddir)/src/FSpot.Core.dll \
-r:$(top_builddir)/src/FSpot.Utils.dll \
- $(LINK_SEMWEB) \
+ $(LINK_SEMWEB) \
+ $(LINK_MONO_ADDINS) \
+ $(LINK_GPHOTO2) \
$(LINK_GTKSHARPBEANS) \
-r:System.Web \
-r:ICSharpCode.SharpZipLib \
diff --git a/extensions/Exporters/GalleryExport/Makefile.am b/extensions/Exporters/GalleryExport/Makefile.am
index d1b4a1b..e6a5876 100644
--- a/extensions/Exporters/GalleryExport/Makefile.am
+++ b/extensions/Exporters/GalleryExport/Makefile.am
@@ -14,7 +14,9 @@ REFS = \
-r:$(top_builddir)/src/f-spot.exe \
-r:$(top_builddir)/src/FSpot.Core.dll \
-r:$(top_builddir)/src/FSpot.Utils.dll \
- $(LINK_SEMWEB) \
+ $(LINK_SEMWEB) \
+ $(LINK_MONO_ADDINS) \
+ $(LINK_GPHOTO2) \
$(LINK_GTKSHARPBEANS) \
-r:Mono.Posix
diff --git a/extensions/Exporters/PicasaWebExport/Makefile.am b/extensions/Exporters/PicasaWebExport/Makefile.am
index 3b00484..39554b7 100644
--- a/extensions/Exporters/PicasaWebExport/Makefile.am
+++ b/extensions/Exporters/PicasaWebExport/Makefile.am
@@ -16,6 +16,8 @@ REFS = \
$(LINK_SEMWEB) \
-r:google-sharp/Mono.Google.dll \
$(LINK_KEYRING) \
+ $(LINK_MONO_ADDINS) \
+ $(LINK_GPHOTO2) \
-r:System.Web \
-r:Mono.Posix
diff --git a/extensions/Exporters/SmugMugExport/Makefile.am b/extensions/Exporters/SmugMugExport/Makefile.am
index 8c796c5..db827f7 100644
--- a/extensions/Exporters/SmugMugExport/Makefile.am
+++ b/extensions/Exporters/SmugMugExport/Makefile.am
@@ -13,7 +13,9 @@ REFS = \
-r:$(top_builddir)/src/f-spot.exe \
-r:$(top_builddir)/src/FSpot.Core.dll \
-r:$(top_builddir)/src/FSpot.Utils.dll \
- $(LINK_SEMWEB) \
+ $(LINK_SEMWEB) \
+ $(LINK_MONO_ADDINS) \
+ $(LINK_GPHOTO2) \
-r:SmugMugNet/SmugMugNet.dll \
$(LINK_GTKSHARPBEANS) \
$(LINK_KEYRING) \
diff --git a/extensions/Exporters/TabbloExport/FSpotUploadProgress.cs b/extensions/Exporters/TabbloExport/FSpotUploadProgress.cs
index 8c551ad..d30893e 100644
--- a/extensions/Exporters/TabbloExport/FSpotUploadProgress.cs
+++ b/extensions/Exporters/TabbloExport/FSpotUploadProgress.cs
@@ -31,6 +31,7 @@ using Mono.Tabblo;
using Mono.Unix;
using System;
using FSpot.UI.Dialog;
+using FSpot.Utils;
namespace FSpotTabbloExport {
diff --git a/extensions/Exporters/TabbloExport/Makefile.am b/extensions/Exporters/TabbloExport/Makefile.am
index fc949d2..d9d9a4f 100644
--- a/extensions/Exporters/TabbloExport/Makefile.am
+++ b/extensions/Exporters/TabbloExport/Makefile.am
@@ -24,6 +24,9 @@ REFS = \
-r:$(top_builddir)/src/FSpot.Utils.dll \
-r:Tabblo/Mono.Tabblo.dll \
$(LINK_KEYRING) \
+ $(LINK_MONO_ADDINS) \
+ $(LINK_SEMWEB) \
+ $(LINK_GPHOTO2) \
-r:Mono.Posix.dll
PKGS = \
diff --git a/extensions/Exporters/ZipExport/Makefile.am b/extensions/Exporters/ZipExport/Makefile.am
index bc06a44..facd006 100644
--- a/extensions/Exporters/ZipExport/Makefile.am
+++ b/extensions/Exporters/ZipExport/Makefile.am
@@ -13,8 +13,9 @@ REFS = \
-r:$(top_builddir)/src/f-spot.exe \
-r:$(top_builddir)/src/FSpot.Core.dll \
-r:$(top_builddir)/src/FSpot.Utils.dll \
- $(LINK_SEMWEB) \
- $(LINK_MONO_ADDINS) \
+ $(LINK_SEMWEB) \
+ $(LINK_MONO_ADDINS) \
+ $(LINK_GPHOTO2) \
-r:System.Web \
-r:ICSharpCode.SharpZipLib \
-r:Mono.Posix
diff --git a/extensions/Services/BeagleService/Makefile.am b/extensions/Services/BeagleService/Makefile.am
index a6f2f49..f62b0e3 100644
--- a/extensions/Services/BeagleService/Makefile.am
+++ b/extensions/Services/BeagleService/Makefile.am
@@ -17,6 +17,7 @@ REFS = \
-r:$(top_builddir)/src/FSpot.Utils.dll \
$(LINK_MONO_ADDINS) \
$(LINK_SEMWEB) \
+ $(LINK_GPHOTO2) \
$(LINK_BEAGLE)
PKGS =
diff --git a/extensions/Services/DBusService/Makefile.am b/extensions/Services/DBusService/Makefile.am
index 4be1441..d09c556 100644
--- a/extensions/Services/DBusService/Makefile.am
+++ b/extensions/Services/DBusService/Makefile.am
@@ -17,7 +17,10 @@ REFS = \
-r:$(top_builddir)/src/FSpot.Core.dll \
-r:$(top_builddir)/src/FSpot.Utils.dll \
-r:$(top_builddir)/src/FSpot.Query.dll \
- $(LINK_DBUS)
+ $(LINK_DBUS) \
+ $(LINK_MONO_ADDINS) \
+ $(LINK_SEMWEB) \
+ $(LINK_GPHOTO2)
PKGS =
diff --git a/extensions/Tools/ChangePhotoPath/Makefile.am b/extensions/Tools/ChangePhotoPath/Makefile.am
index fffb3f9..b6a9ba3 100755
--- a/extensions/Tools/ChangePhotoPath/Makefile.am
+++ b/extensions/Tools/ChangePhotoPath/Makefile.am
@@ -16,7 +16,10 @@ REFS = \
-r:$(top_builddir)/src/f-spot.exe \
-r:$(top_builddir)/src/FSpot.Core.dll \
-r:$(top_builddir)/src/FSpot.Utils.dll \
- -r:$(top_builddir)/src/FSpot.Query.dll
+ -r:$(top_builddir)/src/FSpot.Query.dll \
+ $(LINK_SEMWEB) \
+ $(LINK_MONO_ADDINS) \
+ $(LINK_GPHOTO2)
PKGS = \
-pkg:gtk-sharp-2.0 \
diff --git a/extensions/Tools/DevelopInUFraw/Makefile.am b/extensions/Tools/DevelopInUFraw/Makefile.am
index 6b4d378..1868c82 100644
--- a/extensions/Tools/DevelopInUFraw/Makefile.am
+++ b/extensions/Tools/DevelopInUFraw/Makefile.am
@@ -15,8 +15,9 @@ REFS = \
-r:$(top_builddir)/src/FSpot.Core.dll \
-r:$(top_builddir)/src/FSpot.Utils.dll \
-r:$(top_builddir)/src/FSpot.Query.dll \
+ $(LINK_SEMWEB) \
$(LINK_MONO_ADDINS) \
- $(LINK_SEMWEB)
+ $(LINK_GPHOTO2)
PKGS = \
-pkg:gnome-vfs-sharp-2.0 \
diff --git a/extensions/Tools/HashJob/Makefile.am b/extensions/Tools/HashJob/Makefile.am
index 1242133..feb104c 100644
--- a/extensions/Tools/HashJob/Makefile.am
+++ b/extensions/Tools/HashJob/Makefile.am
@@ -15,7 +15,10 @@ REFS = \
-r:$(top_builddir)/src/FSpot.Core.dll \
-r:$(top_builddir)/src/FSpot.Utils.dll \
-r:$(top_builddir)/src/FSpot.Query.dll \
- -r:Mono.Data.SqliteClient
+ -r:Mono.Data.SqliteClient \
+ $(LINK_SEMWEB) \
+ $(LINK_MONO_ADDINS) \
+ $(LINK_GPHOTO2)
PKGS = \
-pkg:gtk-sharp-2.0
diff --git a/extensions/Tools/MergeDb/Makefile.am b/extensions/Tools/MergeDb/Makefile.am
index 51c3175..7ba80c2 100644
--- a/extensions/Tools/MergeDb/Makefile.am
+++ b/extensions/Tools/MergeDb/Makefile.am
@@ -16,7 +16,10 @@ REFS = \
-r:$(top_builddir)/src/f-spot.exe \
-r:$(top_builddir)/src/FSpot.Core.dll \
-r:$(top_builddir)/src/FSpot.Utils.dll \
- -r:$(top_builddir)/src/FSpot.Query.dll
+ -r:$(top_builddir)/src/FSpot.Query.dll \
+ $(LINK_MONO_ADDINS) \
+ $(LINK_SEMWEB) \
+ $(LINK_GPHOTO2)
PKGS = \
-pkg:gtk-sharp-2.0 \
diff --git a/extensions/Tools/RawPlusJpeg/Makefile.am b/extensions/Tools/RawPlusJpeg/Makefile.am
index 42c8c3d..c4cb3e9 100644
--- a/extensions/Tools/RawPlusJpeg/Makefile.am
+++ b/extensions/Tools/RawPlusJpeg/Makefile.am
@@ -15,8 +15,9 @@ REFS = \
-r:$(top_builddir)/src/FSpot.Core.dll \
-r:$(top_builddir)/src/FSpot.Utils.dll \
-r:$(top_builddir)/src/FSpot.Query.dll \
+ $(LINK_SEMWEB) \
$(LINK_MONO_ADDINS) \
- $(LINK_SEMWEB)
+ $(LINK_GPHOTO2)
PKGS = \
$(LINK_GIOSHARP) \
diff --git a/src/Makefile.am b/src/Makefile.am
index 17276f6..c0d3100 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -257,6 +257,7 @@ F_SPOT_CSDISTFILES = \
$(srcdir)/UI.Dialog/ProgressDialog.cs \
$(srcdir)/UI.Dialog/RepairDbDialog.cs \
$(srcdir)/UI.Dialog/SelectionRatioDialog.cs \
+ $(srcdir)/UI.Dialog/TagSelectionDialog.cs \
$(srcdir)/UI.Dialog/ThreadProgressDialog.cs \
$(srcdir)/Updater.cs \
$(srcdir)/UriCollection.cs \
diff --git a/src/UI.Dialog/TagSelectionDialog.cs b/src/UI.Dialog/TagSelectionDialog.cs
new file mode 100644
index 0000000..5ef7061
--- /dev/null
+++ b/src/UI.Dialog/TagSelectionDialog.cs
@@ -0,0 +1,40 @@
+using System;
+using Gdk;
+using Gtk;
+using Glade;
+using FSpot.Gui;
+
+namespace FSpot.UI.Dialog {
+ public class TagSelectionDialog : GladeDialog
+ {
+ [Widget] Gtk.ScrolledWindow tag_selection_scrolled;
+ [Widget] Gtk.VBox selection_vbox;
+ [Widget] Gtk.Button ok_button;
+ [Widget] Gtk.Button cancel_button;
+
+ TagSelectionWidget tag_selection_widget;
+
+ public TagSelectionDialog (TagStore tags) : base ("tag_selection_dialog")
+ {
+ tag_selection_widget = new TagSelectionWidget (tags);
+ tag_selection_scrolled.Add (tag_selection_widget);
+ tag_selection_widget.Show ();
+ }
+
+ public Tag[] Run ()
+ {
+ int response = this.Dialog.Run ();
+ if ((ResponseType) response == ResponseType.Ok)
+ return tag_selection_widget.TagHighlight;
+
+ return null;
+ }
+
+ public void Hide ()
+ {
+ this.Dialog.Hide ();
+ }
+ }
+}
+
+
diff --git a/src/f-spot.glade b/src/f-spot.glade
index cf4cd8f..6c12c33 100644
--- a/src/f-spot.glade
+++ b/src/f-spot.glade
@@ -1158,6 +1158,186 @@
</widget>
</child>
</widget>
+ <widget class="GtkDialog" id="tag_selection_dialog">
+ <property name="width_request">300</property>
+ <property name="height_request">300</property>
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">Select a Tag...</property>
+ <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+ <child internal-child="vbox">
+ <widget class="GtkVBox" id="selection_vbox">
+ <property name="visible">True</property>
+ <child>
+ <widget class="GtkScrolledWindow" id="tag_selection_scrolled">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="shadow_type">GTK_SHADOW_IN</property>
+ <child>
+ <placeholder/>
+ </child>
+ </widget>
+ <packing>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child internal-child="action_area">
+ <widget class="GtkHButtonBox" id="dialog-action_area9">
+ <property name="visible">True</property>
+ <property name="layout_style">GTK_BUTTONBOX_END</property>
+ <child>
+ <widget class="GtkButton" id="cancel_button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="label">gtk-cancel</property>
+ <property name="use_stock">True</property>
+ <property name="response_id">-6</property>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkButton" id="ok_button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="label">gtk-ok</property>
+ <property name="use_stock">True</property>
+ <property name="response_id">-5</property>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="pack_type">GTK_PACK_END</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <widget class="GtkDialog" id="tag_selection_dialog">
+ <property name="width_request">300</property>
+ <property name="height_request">300</property>
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">Select a Tag...</property>
+ <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+ <child internal-child="vbox">
+ <widget class="GtkVBox" id="selection_vbox">
+ <property name="visible">True</property>
+ <child>
+ <widget class="GtkScrolledWindow" id="tag_selection_scrolled">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="shadow_type">GTK_SHADOW_IN</property>
+ <child>
+ <placeholder/>
+ </child>
+ </widget>
+ <packing>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child internal-child="action_area">
+ <widget class="GtkHButtonBox" id="dialog-action_area9">
+ <property name="visible">True</property>
+ <property name="layout_style">GTK_BUTTONBOX_END</property>
+ <child>
+ <widget class="GtkButton" id="cancel_button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="label">gtk-cancel</property>
+ <property name="use_stock">True</property>
+ <property name="response_id">-6</property>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkButton" id="ok_button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="label">gtk-ok</property>
+ <property name="use_stock">True</property>
+ <property name="response_id">-5</property>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="pack_type">GTK_PACK_END</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <widget class="GtkDialog" id="tag_selection_dialog">
+ <property name="width_request">300</property>
+ <property name="height_request">300</property>
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">Select a Tag...</property>
+ <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+ <child internal-child="vbox">
+ <widget class="GtkVBox" id="selection_vbox">
+ <property name="visible">True</property>
+ <child>
+ <widget class="GtkScrolledWindow" id="tag_selection_scrolled">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="shadow_type">GTK_SHADOW_IN</property>
+ <child>
+ <placeholder/>
+ </child>
+ </widget>
+ <packing>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child internal-child="action_area">
+ <widget class="GtkHButtonBox" id="dialog-action_area9">
+ <property name="visible">True</property>
+ <property name="layout_style">GTK_BUTTONBOX_END</property>
+ <child>
+ <widget class="GtkButton" id="cancel_button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="label">gtk-cancel</property>
+ <property name="use_stock">True</property>
+ <property name="response_id">-6</property>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkButton" id="ok_button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="label">gtk-ok</property>
+ <property name="use_stock">True</property>
+ <property name="response_id">-5</property>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="pack_type">GTK_PACK_END</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
<widget class="GtkDialog" id="vfs_export_dialog">
<property name="title" translatable="yes">Export</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]