[f-spot] Kill the f-spot Glade-iator.
- From: Ruben Vermeersch <rubenv src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [f-spot] Kill the f-spot Glade-iator.
- Date: Thu, 12 Aug 2010 14:39:40 +0000 (UTC)
commit d32de3849706389bd51698dabc354cb29386b5bb
Author: Paul Lange <palango gmx de>
Date: Thu Aug 12 16:21:35 2010 +0200
Kill the f-spot Glade-iator.
Some extensions still need to be ported but f-spot.glade is gone!
https://bugzilla.gnome.org/show_bug.cgi?id=620846
po/POTFILES.in | 2 +-
src/Clients/MainApp/FSpot.Editors/CropEditor.cs | 2 +-
src/Clients/MainApp/FSpot.UI.Dialog/GladeDialog.cs | 61 -----
.../FSpot.UI.Dialog/SelectionRatioDialog.cs | 18 +-
.../FSpot.UI.Dialog/ui/SelectionRatioDialog.ui | 158 +++++++++++++
src/Clients/MainApp/MainApp.csproj | 7 +-
src/Clients/MainApp/Makefile.am | 3 +-
src/Clients/MainApp/f-spot.glade | 244 --------------------
8 files changed, 173 insertions(+), 322 deletions(-)
---
diff --git a/po/POTFILES.in b/po/POTFILES.in
index bd69c5c..4ef68e5 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -21,7 +21,6 @@ src/Clients/MainApp/FSpot.Editors/SepiaEditor.cs
src/Clients/MainApp/FSpot.Editors/SoftFocusEditor.cs
src/Clients/MainApp/FSpot.Editors/TiltEditor.cs
src/Clients/MainApp/FSpot/FullScreenView.cs
-[type: gettext/glade]src/Clients/MainApp/f-spot.glade
src/Clients/MainApp/FSpot/GroupSelector.cs
src/Clients/MainApp/FSpot.Import/ImportController.cs
src/Clients/MainApp/FSpot.Import/MetadataImporter.cs
@@ -63,6 +62,7 @@ src/Clients/MainApp/FSpot.UI.Dialog/ThreadProgressDialog.cs
[type: gettext/glade]src/Clients/MainApp/FSpot.UI.Dialog/ui/PreferenceDialog.ui
[type: gettext/glade]src/Clients/MainApp/FSpot.UI.Dialog/ui/RatingFilterDialog.ui
[type: gettext/glade]src/Clients/MainApp/FSpot.UI.Dialog/ui/RepairDialog.ui
+[type: gettext/glade]src/Clients/MainApp/FSpot.UI.Dialog/ui/SelectionRatioDialog.ui
src/Clients/MainApp/FSpot.Widgets/EditorPage.cs
src/Clients/MainApp/FSpot.Widgets/Filmstrip.cs
src/Clients/MainApp/FSpot.Widgets/FindBar.cs
diff --git a/src/Clients/MainApp/FSpot.Editors/CropEditor.cs b/src/Clients/MainApp/FSpot.Editors/CropEditor.cs
index c124ca0..7d4737a 100644
--- a/src/Clients/MainApp/FSpot.Editors/CropEditor.cs
+++ b/src/Clients/MainApp/FSpot.Editors/CropEditor.cs
@@ -137,7 +137,7 @@ namespace FSpot.Editors {
break;
case ConstraintType.AddCustom:
SelectionRatioDialog dialog = new SelectionRatioDialog ();
- dialog.Dialog.Run ();
+ dialog.Run ();
break;
case ConstraintType.SameAsPhoto:
try {
diff --git a/src/Clients/MainApp/FSpot.UI.Dialog/SelectionRatioDialog.cs b/src/Clients/MainApp/FSpot.UI.Dialog/SelectionRatioDialog.cs
index 254e68d..9a75795 100644
--- a/src/Clients/MainApp/FSpot.UI.Dialog/SelectionRatioDialog.cs
+++ b/src/Clients/MainApp/FSpot.UI.Dialog/SelectionRatioDialog.cs
@@ -18,7 +18,7 @@ using Mono.Unix;
using Hyena;
namespace FSpot.UI.Dialog {
- public class SelectionRatioDialog : GladeDialog
+ public class SelectionRatioDialog : BuilderDialog
{
[Serializable]
public struct SelectionConstraint {
@@ -40,17 +40,17 @@ namespace FSpot.UI.Dialog {
}
}
- [Glade.Widget] Button close_button;
- [Glade.Widget] Button add_button;
- [Glade.Widget] Button delete_button;
- [Glade.Widget] Button up_button;
- [Glade.Widget] Button down_button;
- [Glade.Widget] TreeView content_treeview;
+ [GtkBeans.Builder.Object] Button close_button;
+ [GtkBeans.Builder.Object] Button add_button;
+ [GtkBeans.Builder.Object] Button delete_button;
+ [GtkBeans.Builder.Object] Button up_button;
+ [GtkBeans.Builder.Object] Button down_button;
+ [GtkBeans.Builder.Object] TreeView content_treeview;
private ListStore constraints_store;
- public SelectionRatioDialog () : base ("customratio_dialog")
+ public SelectionRatioDialog () : base ("SelectionRatioDialog.ui", "customratio_dialog")
{
- close_button.Clicked += delegate (object o, EventArgs e) {SavePrefs (); this.Dialog.Destroy (); };
+ close_button.Clicked += delegate (object o, EventArgs e) {SavePrefs (); this.Destroy (); };
add_button.Clicked += delegate (object o, EventArgs e) {constraints_store.AppendValues ("New Selection", 1.0);};
delete_button.Clicked += DeleteSelectedRows;
up_button.Clicked += MoveUp;
diff --git a/src/Clients/MainApp/FSpot.UI.Dialog/ui/SelectionRatioDialog.ui b/src/Clients/MainApp/FSpot.UI.Dialog/ui/SelectionRatioDialog.ui
new file mode 100644
index 0000000..7e75994
--- /dev/null
+++ b/src/Clients/MainApp/FSpot.UI.Dialog/ui/SelectionRatioDialog.ui
@@ -0,0 +1,158 @@
+<?xml version="1.0"?>
+<interface>
+ <!-- interface-requires gtk+ 2.12 -->
+ <!-- interface-naming-policy toplevel-contextual -->
+ <object class="GtkDialog" id="customratio_dialog">
+ <property name="border_width">5</property>
+ <property name="title" translatable="yes">Selection Constraints</property>
+ <property name="type_hint">normal</property>
+ <property name="has_separator">False</property>
+ <child internal-child="vbox">
+ <object class="GtkVBox" id="dialog-vbox26">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkVBox" id="vbox6">
+ <property name="visible">True</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkLabel" id="label6">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="xpad">6</property>
+ <property name="label" translatable="yes">Manage your custom selection ratios</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="padding">6</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="hbox7">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkTreeView" id="content_treeview">
+ <property name="visible">True</property>
+ </object>
+ <packing>
+ <property name="padding">6</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVButtonBox" id="vbuttonbox1">
+ <property name="visible">True</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <property name="layout_style">start</property>
+ <child>
+ <object class="GtkButton" id="add_button">
+ <property name="label">gtk-add</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="receives_default">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="delete_button">
+ <property name="label">gtk-delete</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="receives_default">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="up_button">
+ <property name="label">gtk-go-up</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="receives_default">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="down_button">
+ <property name="label">gtk-go-down</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="receives_default">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="padding">6</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child internal-child="action_area">
+ <object class="GtkHButtonBox" id="dialog-action_area26">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="close_button">
+ <property name="label">gtk-close</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="receives_default">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="0">close_button</action-widget>
+ </action-widgets>
+ </object>
+</interface>
diff --git a/src/Clients/MainApp/MainApp.csproj b/src/Clients/MainApp/MainApp.csproj
index ccf5333..6e17449 100644
--- a/src/Clients/MainApp/MainApp.csproj
+++ b/src/Clients/MainApp/MainApp.csproj
@@ -145,7 +145,6 @@
<Compile Include="FSpot.UI.Dialog\EditExceptionDialog.cs" />
<Compile Include="FSpot.UI.Dialog\EditTagDialog.cs" />
<Compile Include="FSpot.UI.Dialog\EditTagIconDialog.cs" />
- <Compile Include="FSpot.UI.Dialog\GladeDialog.cs" />
<Compile Include="FSpot.UI.Dialog\ImportDialog.cs" />
<Compile Include="FSpot.UI.Dialog\ImportFailureDialog.cs" />
<Compile Include="FSpot.UI.Dialog\LastRollDialog.cs" />
@@ -217,9 +216,6 @@
<EmbeddedResource Include="..\..\..\icons\flower.png">
<LogicalName>flower.png</LogicalName>
</EmbeddedResource>
- <EmbeddedResource Include="f-spot.glade">
- <LogicalName>f-spot.glade</LogicalName>
- </EmbeddedResource>
<EmbeddedResource Include="ui\import.ui">
<LogicalName>import.ui</LogicalName>
</EmbeddedResource>
@@ -274,6 +270,9 @@
<EmbeddedResource Include="ui\color_editor_prefs_window.ui">
<LogicalName>color_editor_prefs_window.ui</LogicalName>
</EmbeddedResource>
+ <EmbeddedResource Include="FSpot.UI.Dialog\ui\SelectionRatioDialog.ui">
+ <LogicalName>SelectionRatioDialog.ui</LogicalName>
+ </EmbeddedResource>
</ItemGroup>
<ProjectExtensions>
<MonoDevelop>
diff --git a/src/Clients/MainApp/Makefile.am b/src/Clients/MainApp/Makefile.am
index 1c45e7e..469673b 100644
--- a/src/Clients/MainApp/Makefile.am
+++ b/src/Clients/MainApp/Makefile.am
@@ -76,7 +76,6 @@ SOURCES = \
FSpot.UI.Dialog/EditExceptionDialog.cs \
FSpot.UI.Dialog/EditTagDialog.cs \
FSpot.UI.Dialog/EditTagIconDialog.cs \
- FSpot.UI.Dialog/GladeDialog.cs \
FSpot.UI.Dialog/ImportDialog.cs \
FSpot.UI.Dialog/ImportFailureDialog.cs \
FSpot.UI.Dialog/LastRollDialog.cs \
@@ -180,7 +179,6 @@ RESOURCES = \
../../../icons/f-spot-128.png \
../../../icons/f-spot-not.png \
FSpot.addin.xml \
- f-spot.glade \
FSpot.UI.Dialog/ui/AdjustTimeDialog.ui \
FSpot.UI.Dialog/ui/CreateTagDialog.ui \
FSpot.UI.Dialog/ui/DateRangeDialog.ui \
@@ -190,6 +188,7 @@ RESOURCES = \
FSpot.UI.Dialog/ui/PreferenceDialog.ui \
FSpot.UI.Dialog/ui/RatingFilterDialog.ui \
FSpot.UI.Dialog/ui/RepairDialog.ui \
+ FSpot.UI.Dialog/ui/SelectionRatioDialog.ui \
ui/color_editor_prefs_window.ui \
ui/import.ui \
ui/mail_dialog.ui \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
