[f-spot/taglib-metadata] Remove OrientationFilter.
- From: Ruben Vermeersch <rubenv src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [f-spot/taglib-metadata] Remove OrientationFilter.
- Date: Fri, 2 Jul 2010 19:17:32 +0000 (UTC)
commit 80158aa0f180b6970d51bdd0722a7d38f95c91e8
Author: Ruben Vermeersch <ruben savanne be>
Date: Fri Jul 2 21:16:32 2010 +0200
Remove OrientationFilter.
We write correct Orientation metadata now. Export destinations should
support this, unless they're stuck in the 90s.
https://bugzilla.gnome.org/show_bug.cgi?id=621369
extensions/Exporters/CDExport/CDExport.cs | 10 -
extensions/Exporters/CDExport/CDExport.ui | 69 ++++---
extensions/Exporters/FolderExport/FolderExport.cs | 23 ---
.../Exporters/FolderExport/FolderExport.glade | 120 ++++++-------
.../Exporters/GalleryExport/GalleryExport.cs | 14 --
.../Exporters/GalleryExport/GalleryExport.glade | 187 +++++++++++--------
.../Exporters/PicasaWebExport/PicasaWebExport.cs | 27 ---
.../PicasaWebExport/PicasaWebExport.glade | 194 ++++++++++++--------
.../Exporters/SmugMugExport/SmugMugExport.cs | 22 ---
.../Exporters/SmugMugExport/SmugMugExport.glade | 175 +++++++++++-------
.../Tools/LiveWebGallery/PhotoRequestHandler.cs | 1 -
extensions/Tools/MetaPixel/MetaPixel.cs | 2 -
extensions/Tools/PictureTile/PictureTile.cs | 1 -
src/Filters/OrientationFilter.cs | 73 --------
src/Makefile.am | 1 -
src/SendEmail.cs | 12 --
src/ui/mail_dialog.ui | 34 +----
17 files changed, 431 insertions(+), 534 deletions(-)
---
diff --git a/extensions/Exporters/CDExport/CDExport.cs b/extensions/Exporters/CDExport/CDExport.cs
index a35c66f..725196d 100644
--- a/extensions/Exporters/CDExport/CDExport.cs
+++ b/extensions/Exporters/CDExport/CDExport.cs
@@ -35,7 +35,6 @@ namespace FSpotCDExport {
[GtkBeans.Builder.Object] ScrolledWindow thumb_scrolledwindow;
[GtkBeans.Builder.Object] CheckButton remove_check;
- [GtkBeans.Builder.Object] CheckButton rotate_check;
[GtkBeans.Builder.Object] Label size_label;
[GtkBeans.Builder.Object] Frame previous_frame;
@@ -43,10 +42,6 @@ namespace FSpotCDExport {
get { return remove_check.Active; }
}
- public bool Rotate {
- get { return rotate_check.Active; }
- }
-
public CDExportDialog (IBrowsableCollection selection, System.Uri dest) : base (Assembly.GetExecutingAssembly (), "CDExport.ui", "cd_export_dialog")
{
this.selection = selection;
@@ -134,7 +129,6 @@ namespace FSpotCDExport {
int photo_index;
bool clean;
- bool rotate;
CDExportDialog dialog;
ThreadProgressDialog progress_dialog;
@@ -156,7 +150,6 @@ namespace FSpotCDExport {
}
clean = dialog.Clean;
- rotate = dialog.Rotate;
command_thread = new System.Threading.Thread (new System.Threading.ThreadStart (Transfer));
command_thread.Name = Catalog.GetString ("Transferring Pictures");
@@ -208,9 +201,6 @@ namespace FSpotCDExport {
//FIXME need to implement the uniquename as a filter
using (FilterRequest request = new FilterRequest (photo.DefaultVersion.Uri)) {
- if (rotate)
- new OrientationFilter ().Convert (request);
-
GLib.File source = FileFactory.NewForUri (request.Current.ToString ());
GLib.File target = UniqueName (dest, photo.Name);
FileProgressCallback cb = Progress;
diff --git a/extensions/Exporters/CDExport/CDExport.ui b/extensions/Exporters/CDExport/CDExport.ui
index c147543..391d858 100644
--- a/extensions/Exporters/CDExport/CDExport.ui
+++ b/extensions/Exporters/CDExport/CDExport.ui
@@ -1,21 +1,25 @@
<?xml version="1.0"?>
-<!--*- mode: xml -*-->
<interface>
+ <!-- interface-requires gtk+ 2.12 -->
+ <!-- interface-naming-policy toplevel-contextual -->
<object class="GtkDialog" id="cd_export_dialog">
<property name="visible">True</property>
<property name="title" translatable="yes">Create CD</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+ <property name="type_hint">dialog</property>
<property name="has_separator">False</property>
<child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox13">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<child>
<object class="GtkVBox" id="vbox42">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<child>
<object class="GtkFrame" id="frame33">
<property name="visible">True</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment37">
<property name="visible">True</property>
@@ -23,6 +27,7 @@
<child>
<object class="GtkVBox" id="vbox43">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkScrolledWindow" id="thumb_scrolledwindow">
@@ -30,17 +35,21 @@
<property name="height_request">350</property>
<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="hscrollbar_policy">automatic</property>
+ <property name="vscrollbar_policy">automatic</property>
<child>
<placeholder/>
</child>
</object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<object class="GtkFrame" id="previous_frame">
<property name="visible">True</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment1">
<property name="visible">True</property>
@@ -51,23 +60,26 @@
<property name="spacing">12</property>
<child>
<object class="GtkCheckButton" id="remove_check">
- <property name="can_focus">True</property>
<property name="label" translatable="yes">_Write only these photos to CD</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">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="browse_button">
+ <property name="label" translatable="yes">_Browse Previously Scheduled Files</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">_Browse Previously Scheduled Files</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
- <signal handler="HandleBrowseExisting" name="clicked"/>
+ <signal name="clicked" handler="HandleBrowseExisting"/>
</object>
<packing>
<property name="expand">False</property>
@@ -95,20 +107,6 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="rotate_check">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Autorotate</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
<object class="GtkHBox" id="hbox85">
<property name="visible">True</property>
<child>
@@ -119,6 +117,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -137,7 +136,7 @@
</child>
</object>
<packing>
- <property name="position">3</property>
+ <property name="position">2</property>
</packing>
</child>
</object>
@@ -152,6 +151,9 @@
</object>
</child>
</object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
</object>
<packing>
@@ -161,38 +163,47 @@
<child internal-child="action_area">
<object class="GtkHButtonBox" id="dialog-action_area13">
<property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
+ <property name="layout_style">end</property>
<child>
<object class="GtkButton" id="cancelbutton6">
+ <property name="label">gtk-cancel</property>
<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="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="export_button">
+ <property name="label" translatable="yes">_Export</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
- <property name="label" translatable="yes">_Export</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
</object>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
- <property name="pack_type">GTK_PACK_END</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
</packing>
</child>
</object>
</child>
<action-widgets>
- <action-widget response="0">browse_button</action-widget>
<action-widget response="-6">cancelbutton6</action-widget>
<action-widget response="-5">export_button</action-widget>
</action-widgets>
diff --git a/extensions/Exporters/FolderExport/FolderExport.cs b/extensions/Exporters/FolderExport/FolderExport.cs
index 538bf3b..65fa113 100644
--- a/extensions/Exporters/FolderExport/FolderExport.cs
+++ b/extensions/Exporters/FolderExport/FolderExport.cs
@@ -50,7 +50,6 @@ namespace FSpotFolderExport {
//[Glade.Widget] Gtk.CheckButton meta_check;
[Glade.Widget] Gtk.CheckButton scale_check;
- [Glade.Widget] Gtk.CheckButton rotate_check;
[Glade.Widget] Gtk.CheckButton export_tags_check;
[Glade.Widget] Gtk.CheckButton export_tag_icons_check;
[Glade.Widget] Gtk.CheckButton open_check;
@@ -67,7 +66,6 @@ namespace FSpotFolderExport {
public const string SCALE_KEY = Preferences.APP_FSPOT_EXPORT + EXPORT_SERVICE + "scale";
public const string SIZE_KEY = Preferences.APP_FSPOT_EXPORT + EXPORT_SERVICE + "size";
public const string OPEN_KEY = Preferences.APP_FSPOT_EXPORT + EXPORT_SERVICE + "browser";
- public const string ROTATE_KEY = Preferences.APP_FSPOT_EXPORT + EXPORT_SERVICE + "rotate";
public const string EXPORT_TAGS_KEY = Preferences.APP_FSPOT_EXPORT + EXPORT_SERVICE + "export_tags";
public const string EXPORT_TAG_ICONS_KEY = Preferences.APP_FSPOT_EXPORT + EXPORT_SERVICE + "export_tag_icons";
public const string METHOD_KEY = Preferences.APP_FSPOT_EXPORT + EXPORT_SERVICE + "method";
@@ -82,7 +80,6 @@ namespace FSpotFolderExport {
bool open;
bool scale;
- bool rotate;
bool exportTags;
bool exportTagIcons;
int size;
@@ -136,7 +133,6 @@ namespace FSpotFolderExport {
LoadPreference (SCALE_KEY);
LoadPreference (SIZE_KEY);
LoadPreference (OPEN_KEY);
- LoadPreference (ROTATE_KEY);
LoadPreference (EXPORT_TAGS_KEY);
LoadPreference (EXPORT_TAG_ICONS_KEY);
LoadPreference (METHOD_KEY);
@@ -190,11 +186,6 @@ namespace FSpotFolderExport {
Log.Debug ("Exporting full size.");
}
- if (rotate) {
- Log.Debug ("Autorotate images.");
- gallery.SetRotate();
- }
-
if (exportTags)
gallery.SetExportTags ();
@@ -207,8 +198,6 @@ namespace FSpotFolderExport {
FilterSet filter_set = new FilterSet ();
if (scale)
filter_set.Add (new ResizeFilter ((uint) size));
- else if (rotate)
- filter_set.Add (new OrientationFilter ());
filter_set.Add (new ChmodFilter ());
filter_set.Add (new UniqueNameFilter (new SafeUri (gallery_path)));
@@ -268,7 +257,6 @@ namespace FSpotFolderExport {
Preferences.Set (SCALE_KEY, scale);
Preferences.Set (SIZE_KEY, size);
Preferences.Set (OPEN_KEY, open);
- Preferences.Set (ROTATE_KEY, rotate);
Preferences.Set (EXPORT_TAGS_KEY, exportTags);
Preferences.Set (EXPORT_TAG_ICONS_KEY, exportTagIcons);
Preferences.Set (METHOD_KEY, static_radio.Active ? "static" : original_radio.Active ? "original" : "folder" );
@@ -310,7 +298,6 @@ namespace FSpotFolderExport {
dest = GLib.FileFactory.NewForUri (uri_chooser.Uri);
open = open_check.Active;
scale = scale_check.Active;
- rotate = rotate_check.Active;
exportTags = export_tags_check.Active;
exportTagIcons = export_tag_icons_check.Active;
@@ -350,11 +337,6 @@ namespace FSpotFolderExport {
open_check.Active = Preferences.Get<bool> (key);
break;
- case ROTATE_KEY:
- if (rotate_check.Active != Preferences.Get<bool> (key))
- rotate_check.Active = Preferences.Get<bool> (key);
- break;
-
case EXPORT_TAGS_KEY:
if (export_tags_check.Active != Preferences.Get<bool> (key))
export_tags_check.Active = Preferences.Get<bool> (key);
@@ -390,7 +372,6 @@ namespace FSpotFolderExport {
protected string gallery_path;
protected bool scale;
protected int size;
- protected bool rotate;
protected bool exportTags;
protected bool exportTagIcons;
protected string description;
@@ -586,10 +567,6 @@ namespace FSpotFolderExport {
requests [0].Height = size;
}
- public void SetRotate () {
- this.rotate = true;
- }
-
public void SetExportTags () {
this.exportTags = true;
}
diff --git a/extensions/Exporters/FolderExport/FolderExport.glade b/extensions/Exporters/FolderExport/FolderExport.glade
index f43eb07..66f3d98 100644
--- a/extensions/Exporters/FolderExport/FolderExport.glade
+++ b/extensions/Exporters/FolderExport/FolderExport.glade
@@ -1,14 +1,15 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--*- mode: xml -*-->
+<?xml version="1.0"?>
<glade-interface>
+ <!-- interface-requires gtk+ 2.6 -->
+ <!-- interface-naming-policy toplevel-contextual -->
<widget class="GtkDialog" id="folder_export_dialog">
<property name="title" translatable="yes">Folder Export</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+ <property name="type_hint">dialog</property>
<property name="has_separator">False</property>
<child internal-child="vbox">
<widget class="GtkVBox" id="vbox55">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<child>
<widget class="GtkHBox" id="hbox48">
<property name="visible">True</property>
@@ -17,7 +18,7 @@
<widget class="GtkFrame" id="frame37">
<property name="visible">True</property>
<property name="label_xalign">0</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="shadow_type">none</property>
<child>
<widget class="GtkAlignment" id="alignment41">
<property name="visible">True</property>
@@ -27,9 +28,9 @@
<property name="width_request">180</property>
<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>
+ <property name="hscrollbar_policy">automatic</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">in</property>
<child>
<placeholder/>
</child>
@@ -48,16 +49,20 @@
</packing>
</child>
</widget>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<widget class="GtkVBox" id="vbox56">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<widget class="GtkFrame" id="frame38">
<property name="visible">True</property>
<property name="label_xalign">0</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="shadow_type">none</property>
<child>
<widget class="GtkAlignment" id="alignment42">
<property name="visible">True</property>
@@ -65,6 +70,7 @@
<child>
<widget class="GtkVBox" id="vbox57">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<widget class="GtkTable" id="table17">
@@ -103,7 +109,6 @@
<widget class="GtkEntry" id="name_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">*</property>
</widget>
<packing>
<property name="left_attach">1</property>
@@ -135,7 +140,6 @@
<widget class="GtkEntry" id="description_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">*</property>
</widget>
<packing>
<property name="left_attach">1</property>
@@ -160,14 +164,17 @@
</packing>
</child>
</widget>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<widget class="GtkCheckButton" id="open_check">
+ <property name="label" translatable="yes">Open _destination when done exporting</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Open _destination when done exporting</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
</widget>
@@ -207,13 +214,14 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<widget class="GtkFrame" id="frame40">
<property name="visible">True</property>
<property name="label_xalign">0</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="shadow_type">none</property>
<child>
<widget class="GtkAlignment" id="alignment47">
<property name="visible">True</property>
@@ -221,14 +229,15 @@
<child>
<widget class="GtkVBox" id="vbox61">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<widget class="GtkRadioButton" id="static_radio">
+ <property name="label" translatable="yes">Create standalone _web gallery</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Create standalone _web gallery</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<signal name="toggled" handler="HandleStandaloneActive"/>
@@ -236,15 +245,16 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<widget class="GtkRadioButton" id="plain_radio">
+ <property name="label" translatable="yes">_Save the files only</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">_Save the files only</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
<property name="group">static_radio</property>
</widget>
@@ -256,11 +266,11 @@
</child>
<child>
<widget class="GtkRadioButton" id="original_radio">
+ <property name="label" translatable="yes">Create _gallery using "Original"</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Create _gallery using "Original"</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
<property name="group">static_radio</property>
</widget>
@@ -295,7 +305,7 @@
<widget class="GtkFrame" id="frame39">
<property name="visible">True</property>
<property name="label_xalign">0</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="shadow_type">none</property>
<child>
<widget class="GtkAlignment" id="alignment43">
<property name="visible">True</property>
@@ -303,23 +313,25 @@
<child>
<widget class="GtkVBox" id="vbox58">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<widget class="GtkHBox" id="hbox49">
<property name="visible">True</property>
<child>
<widget class="GtkCheckButton" id="scale_check">
+ <property name="label" translatable="yes">_Resize to: </property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">_Resize to: </property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
<signal name="toggled" handler="HandleSizeActive"/>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -346,24 +358,9 @@
<property name="position">2</property>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkCheckButton" id="rotate_check">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Autorotate</property>
- <property name="use_underline">True</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -371,12 +368,12 @@
<property name="visible">True</property>
<child>
<widget class="GtkCheckButton" id="export_tags_check">
+ <property name="label" translatable="yes">Export _tags</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="receives_default">False</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">Export _tags</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<signal name="toggled" handler="HandleExportTagsActive"/>
@@ -384,15 +381,16 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<widget class="GtkCheckButton" id="export_tag_icons_check">
+ <property name="label" translatable="yes">Export tag _icons</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Export tag _icons</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
</widget>
@@ -402,20 +400,11 @@
<property name="position">1</property>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
</widget>
<packing>
- <property name="position">2</property>
+ <property name="position">1</property>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
</widget>
</child>
</widget>
@@ -435,9 +424,6 @@
<property name="position">2</property>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
</widget>
<packing>
<property name="position">1</property>
@@ -451,34 +437,44 @@
<child internal-child="action_area">
<widget class="GtkHButtonBox" id="hbuttonbox9">
<property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
+ <property name="layout_style">end</property>
<child>
<widget class="GtkButton" id="button20">
+ <property name="label">gtk-cancel</property>
+ <property name="response_id">-6</property>
<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="receives_default">False</property>
<property name="use_stock">True</property>
- <property name="response_id">-6</property>
</widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<widget class="GtkButton" id="export_button">
+ <property name="label" translatable="yes">_Export</property>
+ <property name="response_id">-5</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
- <property name="label" translatable="yes">_Export</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
- <property name="response_id">-5</property>
</widget>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
</widget>
<packing>
<property name="expand">False</property>
- <property name="pack_type">GTK_PACK_END</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
</packing>
</child>
</widget>
diff --git a/extensions/Exporters/GalleryExport/GalleryExport.cs b/extensions/Exporters/GalleryExport/GalleryExport.cs
index 5e16cc5..8d5f80a 100644
--- a/extensions/Exporters/GalleryExport/GalleryExport.cs
+++ b/extensions/Exporters/GalleryExport/GalleryExport.cs
@@ -648,7 +648,6 @@ namespace G2Export {
LoadPreference (SIZE_KEY);
LoadPreference (BROWSER_KEY);
LoadPreference (META_KEY);
- LoadPreference (ROTATE_KEY);
}
public const string EXPORT_SERVICE = "gallery/";
@@ -656,11 +655,9 @@ namespace G2Export {
public const string SIZE_KEY = Preferences.APP_FSPOT_EXPORT + EXPORT_SERVICE + "size";
public const string BROWSER_KEY = Preferences.APP_FSPOT_EXPORT + EXPORT_SERVICE + "browser";
public const string META_KEY = Preferences.APP_FSPOT_EXPORT + EXPORT_SERVICE + "meta";
- public const string ROTATE_KEY = Preferences.APP_FSPOT_EXPORT + EXPORT_SERVICE + "rotate";
public const string LIGHTTPD_WORKAROUND_KEY = Preferences.APP_FSPOT_EXPORT + EXPORT_SERVICE + "lighttpd_workaround";
private bool scale;
- private bool rotate;
private int size;
private bool browser;
private bool meta;
@@ -687,7 +684,6 @@ namespace G2Export {
[Glade.Widget] Gtk.CheckButton browser_check;
[Glade.Widget] Gtk.CheckButton scale_check;
[Glade.Widget] Gtk.CheckButton meta_check;
- [Glade.Widget] Gtk.CheckButton rotate_check;
[Glade.Widget] Gtk.SpinButton size_spin;
@@ -718,7 +714,6 @@ namespace G2Export {
browser = browser_check.Active;
meta = meta_check.Active;
- rotate = rotate_check.Active;
if (account != null) {
//System.Console.WriteLine ("history = {0}", album_optionmenu.History);
@@ -738,7 +733,6 @@ namespace G2Export {
Preferences.Set (SIZE_KEY, size);
Preferences.Set (BROWSER_KEY, browser);
Preferences.Set (META_KEY, meta);
- Preferences.Set (ROTATE_KEY, rotate);
}
}
@@ -766,9 +760,6 @@ namespace G2Export {
filters.Add (new WhiteListFilter (new string []{".jpg", ".jpeg", ".png", ".gif"}));
if (scale)
filters.Add (new ResizeFilter ((uint) size));
- else if (rotate)
- filters.Add (new OrientationFilter ());
-
while (photo_index < items.Length) {
IBrowsableItem item = items [photo_index];
@@ -993,11 +984,6 @@ namespace G2Export {
if (meta_check.Active != Preferences.Get<bool> (key))
meta_check.Active = Preferences.Get<bool> (key);
break;
-
- case ROTATE_KEY:
- if (rotate_check.Active != Preferences.Get<bool> (key))
- rotate_check.Active = Preferences.Get<bool> (key);
- break;
}
}
}
diff --git a/extensions/Exporters/GalleryExport/GalleryExport.glade b/extensions/Exporters/GalleryExport/GalleryExport.glade
index ce0b8da..682121f 100644
--- a/extensions/Exporters/GalleryExport/GalleryExport.glade
+++ b/extensions/Exporters/GalleryExport/GalleryExport.glade
@@ -1,16 +1,15 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--*- mode: xml -*-->
+<?xml version="1.0"?>
<glade-interface>
- <requires lib="canvas"/>
- <requires lib="gnome"/>
+ <!-- interface-requires gtk+ 2.6 -->
+ <!-- interface-naming-policy toplevel-contextual -->
<widget class="GtkDialog" id="gallery_export_dialog">
<property name="title" translatable="yes">Export</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+ <property name="type_hint">dialog</property>
<property name="has_separator">False</property>
<child internal-child="vbox">
<widget class="GtkVBox" id="dialog-vbox11">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<child>
<widget class="GtkHBox" id="hbox17">
<property name="visible">True</property>
@@ -19,7 +18,7 @@
<widget class="GtkFrame" id="frame8">
<property name="visible">True</property>
<property name="label_xalign">0</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="shadow_type">none</property>
<child>
<widget class="GtkAlignment" id="alignment12">
<property name="visible">True</property>
@@ -29,9 +28,9 @@
<property name="width_request">180</property>
<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>
+ <property name="hscrollbar_policy">automatic</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">in</property>
<child>
<placeholder/>
</child>
@@ -50,16 +49,20 @@
</packing>
</child>
</widget>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<widget class="GtkVBox" id="vbox11">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<widget class="GtkFrame" id="frame9">
<property name="visible">True</property>
<property name="label_xalign">0</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="shadow_type">none</property>
<child>
<widget class="GtkAlignment" id="alignment13">
<property name="visible">True</property>
@@ -67,6 +70,7 @@
<child>
<widget class="GtkVBox" id="vbox12">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<widget class="GtkHBox" id="hbox20">
@@ -82,13 +86,14 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<widget class="GtkOptionMenu" id="gallery_optionmenu">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="response_id">0</property>
+ <property name="receives_default">False</property>
<signal name="changed" handler="HandleAccountSelected"/>
</widget>
<packing>
@@ -97,11 +102,11 @@
</child>
<child>
<widget class="GtkButton" id="gallery_button">
+ <property name="label">gtk-add</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label">gtk-add</property>
+ <property name="receives_default">False</property>
<property name="use_stock">True</property>
- <property name="response_id">0</property>
<signal name="clicked" handler="HandleAddGallery"/>
</widget>
<packing>
@@ -112,11 +117,11 @@
</child>
<child>
<widget class="GtkButton" id="edit_button">
+ <property name="label">gtk-edit</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label">gtk-edit</property>
+ <property name="receives_default">False</property>
<property name="use_stock">True</property>
- <property name="response_id">0</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -125,6 +130,9 @@
</packing>
</child>
</widget>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<widget class="GtkLabel" id="status_label">
@@ -154,13 +162,14 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<widget class="GtkFrame" id="frame10">
<property name="visible">True</property>
<property name="label_xalign">0</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="shadow_type">none</property>
<child>
<widget class="GtkAlignment" id="alignment14">
<property name="visible">True</property>
@@ -168,6 +177,7 @@
<child>
<widget class="GtkVBox" id="vbox13">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<widget class="GtkHBox" id="hbox18">
@@ -183,13 +193,14 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<widget class="GtkOptionMenu" id="album_optionmenu">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="response_id">0</property>
+ <property name="receives_default">False</property>
</widget>
<packing>
<property name="position">1</property>
@@ -197,11 +208,11 @@
</child>
<child>
<widget class="GtkButton" id="album_button">
+ <property name="label">gtk-add</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label">gtk-add</property>
+ <property name="receives_default">False</property>
<property name="use_stock">True</property>
- <property name="response_id">0</property>
<signal name="clicked" handler="HandleAddAlbum"/>
</widget>
<packing>
@@ -211,14 +222,17 @@
</packing>
</child>
</widget>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<widget class="GtkCheckButton" id="browser_check">
+ <property name="label" translatable="yes">Open _album in browser when done uploading</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Open _album in browser when done uploading</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
</widget>
@@ -253,7 +267,7 @@
<widget class="GtkFrame" id="frame11">
<property name="visible">True</property>
<property name="label_xalign">0</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="shadow_type">none</property>
<child>
<widget class="GtkAlignment" id="alignment15">
<property name="visible">True</property>
@@ -261,23 +275,25 @@
<child>
<widget class="GtkVBox" id="vbox14">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<widget class="GtkHBox" id="hbox58">
<property name="visible">True</property>
<child>
<widget class="GtkCheckButton" id="scale_check">
+ <property name="label" translatable="yes">_Resize to: </property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">_Resize to: </property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
<signal name="toggled" handler="HandleSizeActive"/>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -304,40 +320,25 @@
<property name="position">2</property>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkCheckButton" id="rotate_check">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Autorotate</property>
- <property name="use_underline">True</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<widget class="GtkCheckButton" id="meta_check">
+ <property name="label" translatable="yes">Export _titles and comments</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Export _titles and comments</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">2</property>
+ <property name="position">1</property>
</packing>
</child>
</widget>
@@ -374,34 +375,44 @@
<child internal-child="action_area">
<widget class="GtkHButtonBox" id="dialog-action_area11">
<property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
+ <property name="layout_style">end</property>
<child>
<widget class="GtkButton" id="cancel_button">
+ <property name="label">gtk-cancel</property>
+ <property name="response_id">-6</property>
<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="receives_default">False</property>
<property name="use_stock">True</property>
- <property name="response_id">-6</property>
</widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<widget class="GtkButton" id="export_button">
+ <property name="label" translatable="yes">_Export</property>
+ <property name="response_id">-5</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
- <property name="label" translatable="yes">_Export</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
- <property name="response_id">-5</property>
</widget>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
</widget>
<packing>
<property name="expand">False</property>
- <property name="pack_type">GTK_PACK_END</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
</packing>
</child>
</widget>
@@ -409,7 +420,7 @@
</widget>
<widget class="GtkDialog" id="gallery_add_album_dialog">
<property name="visible">True</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+ <property name="type_hint">dialog</property>
<property name="has_separator">False</property>
<child internal-child="vbox">
<widget class="GtkVBox" id="dialog-vbox12">
@@ -454,7 +465,6 @@
<widget class="GtkEntry" id="title_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">*</property>
</widget>
<packing>
<property name="left_attach">1</property>
@@ -483,7 +493,6 @@
<widget class="GtkEntry" id="description_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">*</property>
</widget>
<packing>
<property name="left_attach">1</property>
@@ -512,7 +521,6 @@
<widget class="GtkEntry" id="name_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">*</property>
</widget>
<packing>
<property name="left_attach">1</property>
@@ -526,7 +534,7 @@
<widget class="GtkOptionMenu" id="album_optionmenu">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="response_id">0</property>
+ <property name="receives_default">False</property>
<signal name="changed" handler="HandleChanged"/>
</widget>
<packing>
@@ -539,41 +547,51 @@
</widget>
<packing>
<property name="expand">False</property>
- <property name="pack_type">GTK_PACK_END</property>
+ <property name="pack_type">end</property>
<property name="position">1</property>
</packing>
</child>
<child internal-child="action_area">
<widget class="GtkHButtonBox" id="dialog-action_area12">
<property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
+ <property name="layout_style">end</property>
<child>
<widget class="GtkButton" id="cancel_button">
+ <property name="label">gtk-cancel</property>
+ <property name="response_id">-6</property>
<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="receives_default">False</property>
<property name="use_stock">True</property>
- <property name="response_id">-6</property>
</widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<widget class="GtkButton" id="add_button">
+ <property name="label">gtk-add</property>
+ <property name="response_id">-5</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
- <property name="label">gtk-add</property>
+ <property name="receives_default">False</property>
<property name="use_stock">True</property>
- <property name="response_id">-5</property>
</widget>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
</widget>
<packing>
<property name="expand">False</property>
- <property name="pack_type">GTK_PACK_END</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
</packing>
</child>
</widget>
@@ -581,14 +599,16 @@
</widget>
<widget class="GtkDialog" id="gallery_add_dialog">
<property name="visible">True</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+ <property name="type_hint">dialog</property>
<property name="has_separator">False</property>
<child internal-child="vbox">
<widget class="GtkVBox" id="dialog-vbox12">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<child>
<widget class="GtkVBox" id="vbox63">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<child>
<widget class="GtkHBox" id="status_area">
<property name="visible">True</property>
@@ -598,18 +618,20 @@
<property name="visible">True</property>
<property name="yalign">0</property>
<property name="stock">gtk-dialog-question</property>
- <property name="icon_size">6</property>
+ <property name="icon-size">6</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="padding">2</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<widget class="GtkVBox" id="vbox64">
<property name="visible">True</property>
<property name="border_width">6</property>
+ <property name="orientation">vertical</property>
<child>
<widget class="GtkLabel" id="summary_label">
<property name="visible">True</property>
@@ -621,6 +643,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -643,6 +666,7 @@
</widget>
<packing>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -670,7 +694,6 @@
<widget class="GtkEntry" id="gallery_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">*</property>
</widget>
<packing>
<property name="left_attach">1</property>
@@ -698,7 +721,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="visibility">False</property>
- <property name="invisible_char">*</property>
</widget>
<packing>
<property name="left_attach">1</property>
@@ -727,7 +749,6 @@
<widget class="GtkEntry" id="username_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">*</property>
</widget>
<packing>
<property name="left_attach">1</property>
@@ -756,7 +777,6 @@
<widget class="GtkEntry" id="url_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">*</property>
</widget>
<packing>
<property name="left_attach">1</property>
@@ -776,54 +796,67 @@
</widget>
<packing>
<property name="expand">False</property>
- <property name="pack_type">GTK_PACK_END</property>
+ <property name="pack_type">end</property>
<property name="position">1</property>
</packing>
</child>
<child internal-child="action_area">
<widget class="GtkHButtonBox" id="dialog-action_area12">
<property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
+ <property name="layout_style">end</property>
<child>
<widget class="GtkButton" id="cancel_button">
+ <property name="label">gtk-cancel</property>
+ <property name="response_id">-6</property>
<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="receives_default">False</property>
<property name="use_stock">True</property>
- <property name="response_id">-6</property>
</widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<widget class="GtkButton" id="remove_button">
+ <property name="label">gtk-remove</property>
+ <property name="response_id">-2</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
- <property name="label">gtk-remove</property>
+ <property name="receives_default">False</property>
<property name="use_stock">True</property>
- <property name="response_id">-2</property>
</widget>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
<child>
<widget class="GtkButton" id="add_button">
+ <property name="label">gtk-add</property>
+ <property name="response_id">-5</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
- <property name="label">gtk-add</property>
+ <property name="receives_default">False</property>
<property name="use_stock">True</property>
- <property name="response_id">-5</property>
</widget>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">2</property>
</packing>
</child>
</widget>
<packing>
<property name="expand">False</property>
- <property name="pack_type">GTK_PACK_END</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
</packing>
</child>
</widget>
diff --git a/extensions/Exporters/PicasaWebExport/PicasaWebExport.cs b/extensions/Exporters/PicasaWebExport/PicasaWebExport.cs
index 1061f33..be0fdfb 100644
--- a/extensions/Exporters/PicasaWebExport/PicasaWebExport.cs
+++ b/extensions/Exporters/PicasaWebExport/PicasaWebExport.cs
@@ -500,11 +500,8 @@ namespace FSpotGoogleExport {
HandleSizeActive (null, null);
Connect ();
- scale_check.Toggled += HandleScaleCheckToggled;
-
LoadPreference (SCALE_KEY);
LoadPreference (SIZE_KEY);
- LoadPreference (ROTATE_KEY);
LoadPreference (BROWSER_KEY);
// LoadPreference (Preferences.EXPORT_PICASAWEB_META);
LoadPreference (TAG_KEY);
@@ -513,7 +510,6 @@ namespace FSpotGoogleExport {
private bool scale;
private int size;
private bool browser;
- private bool rotate;
// private bool meta;
private bool export_tag;
private bool connect = false;
@@ -538,7 +534,6 @@ namespace FSpotGoogleExport {
public const string EXPORT_SERVICE = "picasaweb/";
public const string SCALE_KEY = Preferences.APP_FSPOT_EXPORT + EXPORT_SERVICE + "scale";
public const string SIZE_KEY = Preferences.APP_FSPOT_EXPORT + EXPORT_SERVICE + "size";
- public const string ROTATE_KEY = Preferences.APP_FSPOT_EXPORT + EXPORT_SERVICE + "rotate";
public const string BROWSER_KEY = Preferences.APP_FSPOT_EXPORT + EXPORT_SERVICE + "browser";
public const string TAG_KEY = Preferences.APP_FSPOT_EXPORT + EXPORT_SERVICE + "tag";
@@ -555,7 +550,6 @@ namespace FSpotGoogleExport {
[Glade.Widget] Gtk.CheckButton browser_check;
[Glade.Widget] Gtk.CheckButton scale_check;
- [Glade.Widget] Gtk.CheckButton rotate_check;
// [Glade.Widget] Gtk.CheckButton meta_check;
[Glade.Widget] Gtk.CheckButton tag_check;
@@ -586,7 +580,6 @@ namespace FSpotGoogleExport {
scale = false;
browser = browser_check.Active;
- rotate = rotate_check.Active;
// meta = meta_check.Active;
export_tag = tag_check.Active;
@@ -605,7 +598,6 @@ namespace FSpotGoogleExport {
// Save these settings for next time
Preferences.Set (SCALE_KEY, scale);
Preferences.Set (SIZE_KEY, size);
- Preferences.Set (ROTATE_KEY, rotate);
Preferences.Set (BROWSER_KEY, browser);
// Preferences.Set (Preferences.EXPORT_GALLERY_META, meta);
Preferences.Set (TAG_KEY, export_tag);
@@ -648,9 +640,6 @@ namespace FSpotGoogleExport {
if (scale)
filters.Add (new ResizeFilter ((uint)size));
- if (rotate)
- filters.Add (new OrientationFilter ());
-
Array.Sort (items, new DateComparer ());
while (photo_index < items.Length) {
@@ -714,11 +703,6 @@ namespace FSpotGoogleExport {
}
}
- private void HandleScaleCheckToggled (object o, EventArgs e)
- {
- rotate_check.Sensitive = !scale_check.Active;
- }
-
private void PopulateGoogleOptionMenu (GoogleAccountManager manager, GoogleAccount changed_account)
{
Gtk.Menu menu = new Gtk.Menu ();
@@ -926,7 +910,6 @@ namespace FSpotGoogleExport {
case SCALE_KEY:
if (scale_check.Active != Preferences.Get<bool> (key)) {
scale_check.Active = Preferences.Get<bool> (key);
- rotate_check.Sensitive = ! Preferences.Get<bool> (key);
}
break;
@@ -939,16 +922,6 @@ namespace FSpotGoogleExport {
browser_check.Active = Preferences.Get<bool> (key);
break;
- case ROTATE_KEY:
- if (rotate_check.Active != Preferences.Get<bool> (key))
- rotate_check.Active = Preferences.Get<bool> (key);
- break;
-
-// case Preferences.EXPORT_GALLERY_META:
-// if (meta_check.Active != (bool) val)
-// meta_check.Active = (bool) val;
-// break;
-
case TAG_KEY:
if (tag_check.Active != Preferences.Get<bool> (key))
tag_check.Active = Preferences.Get<bool> (key);
diff --git a/extensions/Exporters/PicasaWebExport/PicasaWebExport.glade b/extensions/Exporters/PicasaWebExport/PicasaWebExport.glade
index 86b0bd9..39adfcc 100644
--- a/extensions/Exporters/PicasaWebExport/PicasaWebExport.glade
+++ b/extensions/Exporters/PicasaWebExport/PicasaWebExport.glade
@@ -1,16 +1,15 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--*- mode: xml -*-->
+<?xml version="1.0"?>
<glade-interface>
- <requires lib="canvas"/>
- <requires lib="gnome"/>
+ <!-- interface-requires gtk+ 2.6 -->
+ <!-- interface-naming-policy toplevel-contextual -->
<widget class="GtkDialog" id="google_export_dialog">
<property name="title" translatable="yes">Export</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+ <property name="type_hint">dialog</property>
<property name="has_separator">False</property>
<child internal-child="vbox">
<widget class="GtkVBox" id="dialog-vbox11">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<child>
<widget class="GtkHBox" id="hbox17">
<property name="visible">True</property>
@@ -19,7 +18,7 @@
<widget class="GtkFrame" id="frame8">
<property name="visible">True</property>
<property name="label_xalign">0</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="shadow_type">none</property>
<child>
<widget class="GtkAlignment" id="alignment12">
<property name="visible">True</property>
@@ -29,9 +28,9 @@
<property name="width_request">180</property>
<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>
+ <property name="hscrollbar_policy">automatic</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">in</property>
<child>
<placeholder/>
</child>
@@ -50,16 +49,20 @@
</packing>
</child>
</widget>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<widget class="GtkVBox" id="vbox11">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<widget class="GtkFrame" id="frame9">
<property name="visible">True</property>
<property name="label_xalign">0</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="shadow_type">none</property>
<child>
<widget class="GtkAlignment" id="alignment13">
<property name="visible">True</property>
@@ -67,6 +70,7 @@
<child>
<widget class="GtkVBox" id="vbox12">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<widget class="GtkHBox" id="hbox20">
@@ -82,13 +86,14 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<widget class="GtkOptionMenu" id="gallery_optionmenu">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="response_id">0</property>
+ <property name="receives_default">False</property>
<signal name="changed" handler="HandleAccountSelected"/>
</widget>
<packing>
@@ -97,11 +102,11 @@
</child>
<child>
<widget class="GtkButton" id="gallery_button">
+ <property name="label">gtk-add</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label">gtk-add</property>
+ <property name="receives_default">False</property>
<property name="use_stock">True</property>
- <property name="response_id">0</property>
<signal name="clicked" handler="HandleAddGallery"/>
</widget>
<packing>
@@ -112,11 +117,11 @@
</child>
<child>
<widget class="GtkButton" id="edit_button">
+ <property name="label">gtk-edit</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label">gtk-edit</property>
+ <property name="receives_default">False</property>
<property name="use_stock">True</property>
- <property name="response_id">0</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -125,6 +130,9 @@
</packing>
</child>
</widget>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<widget class="GtkLabel" id="status_label">
@@ -156,13 +164,14 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<widget class="GtkFrame" id="frame10">
<property name="visible">True</property>
<property name="label_xalign">0</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="shadow_type">none</property>
<child>
<widget class="GtkAlignment" id="alignment14">
<property name="visible">True</property>
@@ -170,6 +179,7 @@
<child>
<widget class="GtkVBox" id="vbox13">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<widget class="GtkHBox" id="hbox18">
@@ -185,13 +195,14 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<widget class="GtkOptionMenu" id="album_optionmenu">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="response_id">0</property>
+ <property name="receives_default">False</property>
</widget>
<packing>
<property name="position">1</property>
@@ -199,11 +210,11 @@
</child>
<child>
<widget class="GtkButton" id="album_button">
+ <property name="label">gtk-add</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label">gtk-add</property>
+ <property name="receives_default">False</property>
<property name="use_stock">True</property>
- <property name="response_id">0</property>
<signal name="clicked" handler="HandleAddAlbum"/>
</widget>
<packing>
@@ -213,6 +224,9 @@
</packing>
</child>
</widget>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<widget class="GtkLabel" id="album_status_label">
@@ -228,11 +242,11 @@
</child>
<child>
<widget class="GtkCheckButton" id="browser_check">
+ <property name="label" translatable="yes">Open _album in browser when done uploading</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Open _album in browser when done uploading</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
</widget>
@@ -267,7 +281,7 @@
<widget class="GtkFrame" id="frame11">
<property name="visible">True</property>
<property name="label_xalign">0</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="shadow_type">none</property>
<child>
<widget class="GtkAlignment" id="alignment15">
<property name="visible">True</property>
@@ -275,23 +289,25 @@
<child>
<widget class="GtkVBox" id="vbox14">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<widget class="GtkHBox" id="hbox58">
<property name="visible">True</property>
<child>
<widget class="GtkCheckButton" id="scale_check">
+ <property name="label" translatable="yes">_Resize to: </property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">_Resize to: </property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
<signal name="toggled" handler="HandleSizeActive"/>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -322,35 +338,23 @@
<placeholder/>
</child>
</widget>
- </child>
- <child>
- <widget class="GtkCheckButton" id="rotate_check">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">_Autorotate</property>
- <property name="use_underline">True</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
- </widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<widget class="GtkCheckButton" id="tag_check">
+ <property name="label" translatable="yes">_Export tags</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">_Export tags</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">2</property>
+ <property name="position">1</property>
</packing>
</child>
</widget>
@@ -387,34 +391,44 @@
<child internal-child="action_area">
<widget class="GtkHButtonBox" id="dialog-action_area11">
<property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
+ <property name="layout_style">end</property>
<child>
<widget class="GtkButton" id="cancel_button">
+ <property name="label">gtk-cancel</property>
+ <property name="response_id">-6</property>
<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="receives_default">False</property>
<property name="use_stock">True</property>
- <property name="response_id">-6</property>
</widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<widget class="GtkButton" id="export_button">
+ <property name="label" translatable="yes">_Export</property>
+ <property name="response_id">-5</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
- <property name="label" translatable="yes">_Export</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
- <property name="response_id">-5</property>
</widget>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
</widget>
<packing>
<property name="expand">False</property>
- <property name="pack_type">GTK_PACK_END</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
</packing>
</child>
</widget>
@@ -422,7 +436,7 @@
</widget>
<widget class="GtkDialog" id="google_add_album_dialog">
<property name="visible">True</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+ <property name="type_hint">dialog</property>
<property name="has_separator">False</property>
<child internal-child="vbox">
<widget class="GtkVBox" id="dialog-vbox12">
@@ -436,9 +450,6 @@
<property name="column_spacing">7</property>
<property name="row_spacing">6</property>
<child>
- <placeholder/>
- </child>
- <child>
<widget class="GtkLabel" id="descroption_label">
<property name="visible">True</property>
<property name="xalign">1</property>
@@ -457,7 +468,6 @@
<widget class="GtkEntry" id="description_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">*</property>
</widget>
<packing>
<property name="left_attach">1</property>
@@ -484,7 +494,6 @@
<widget class="GtkEntry" id="title_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">*</property>
</widget>
<packing>
<property name="left_attach">1</property>
@@ -494,11 +503,11 @@
</child>
<child>
<widget class="GtkCheckButton" id="public_check">
+ <property name="label" translatable="yes">Public Album</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Public Album</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
</widget>
<packing>
@@ -510,45 +519,58 @@
<property name="y_options"></property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
- <property name="pack_type">GTK_PACK_END</property>
+ <property name="pack_type">end</property>
<property name="position">1</property>
</packing>
</child>
<child internal-child="action_area">
<widget class="GtkHButtonBox" id="dialog-action_area12">
<property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
+ <property name="layout_style">end</property>
<child>
<widget class="GtkButton" id="cancel_button">
+ <property name="label">gtk-cancel</property>
+ <property name="response_id">-6</property>
<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="receives_default">False</property>
<property name="use_stock">True</property>
- <property name="response_id">-6</property>
</widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<widget class="GtkButton" id="add_button">
+ <property name="label">gtk-add</property>
+ <property name="response_id">-5</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
- <property name="label">gtk-add</property>
+ <property name="receives_default">False</property>
<property name="use_stock">True</property>
- <property name="response_id">-5</property>
</widget>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
</widget>
<packing>
<property name="expand">False</property>
- <property name="pack_type">GTK_PACK_END</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
</packing>
</child>
</widget>
@@ -556,7 +578,7 @@
</widget>
<widget class="GtkDialog" id="google_add_dialog">
<property name="visible">True</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+ <property name="type_hint">dialog</property>
<property name="has_separator">False</property>
<child internal-child="vbox">
<widget class="GtkVBox" id="dialog-vbox12">
@@ -572,12 +594,13 @@
<property name="visible">True</property>
<property name="yalign">0</property>
<property name="stock">gtk-dialog-question</property>
- <property name="icon_size">6</property>
+ <property name="icon-size">6</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="padding">2</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -595,6 +618,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -617,6 +641,7 @@
</widget>
<packing>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -627,12 +652,13 @@
<property name="visible">True</property>
<property name="yalign">0</property>
<property name="stock">gtk-missing-image</property>
- <property name="icon_size">6</property>
+ <property name="icon-size">6</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="padding">2</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -650,6 +676,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -705,7 +732,6 @@ the 'Captcha' field. <i>Letters are not case-sensitive</i></property
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="visibility">False</property>
- <property name="invisible_char">*</property>
</widget>
<packing>
<property name="left_attach">1</property>
@@ -732,7 +758,6 @@ the 'Captcha' field. <i>Letters are not case-sensitive</i></property
<widget class="GtkEntry" id="username_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">*</property>
</widget>
<packing>
<property name="left_attach">1</property>
@@ -759,8 +784,10 @@ the 'Captcha' field. <i>Letters are not case-sensitive</i></property
<child>
<widget class="GtkEntry" id="captcha_entry">
<property name="can_focus">True</property>
- <property name="invisible_char">*</property>
</widget>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<widget class="GtkImage" id="captcha_image">
@@ -790,55 +817,68 @@ the 'Captcha' field. <i>Letters are not case-sensitive</i></property
</widget>
<packing>
<property name="expand">False</property>
- <property name="pack_type">GTK_PACK_END</property>
+ <property name="pack_type">end</property>
<property name="position">1</property>
</packing>
</child>
<child internal-child="action_area">
<widget class="GtkHButtonBox" id="dialog-action_area12">
<property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
+ <property name="layout_style">end</property>
<child>
<widget class="GtkButton" id="cancel_button">
+ <property name="label">gtk-cancel</property>
+ <property name="response_id">-6</property>
<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="receives_default">False</property>
<property name="use_stock">True</property>
- <property name="response_id">-6</property>
</widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<widget class="GtkButton" id="remove_button">
+ <property name="label">gtk-remove</property>
+ <property name="response_id">-2</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
- <property name="label">gtk-remove</property>
+ <property name="receives_default">False</property>
<property name="use_stock">True</property>
- <property name="response_id">-2</property>
</widget>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
<child>
<widget class="GtkButton" id="add_button">
+ <property name="label">gtk-add</property>
+ <property name="response_id">-5</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
- <property name="label">gtk-add</property>
+ <property name="receives_default">False</property>
<property name="use_stock">True</property>
- <property name="response_id">-5</property>
</widget>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">2</property>
</packing>
</child>
</widget>
<packing>
<property name="expand">False</property>
- <property name="pack_type">GTK_PACK_END</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
</packing>
</child>
</widget>
diff --git a/extensions/Exporters/SmugMugExport/SmugMugExport.cs b/extensions/Exporters/SmugMugExport/SmugMugExport.cs
index 19439b4..87c256b 100644
--- a/extensions/Exporters/SmugMugExport/SmugMugExport.cs
+++ b/extensions/Exporters/SmugMugExport/SmugMugExport.cs
@@ -433,11 +433,8 @@ namespace FSpotSmugMugExport {
HandleSizeActive (null, null);
Connect ();
- scale_check.Toggled += HandleScaleCheckToggled;
-
LoadPreference (SCALE_KEY);
LoadPreference (SIZE_KEY);
- LoadPreference (ROTATE_KEY);
LoadPreference (BROWSER_KEY);
}
@@ -446,7 +443,6 @@ namespace FSpotSmugMugExport {
private bool scale;
private int size;
private bool browser;
- private bool rotate;
// private bool meta;
private bool connect = false;
@@ -475,7 +471,6 @@ namespace FSpotSmugMugExport {
[Glade.Widget] Gtk.CheckButton browser_check;
[Glade.Widget] Gtk.CheckButton scale_check;
- [Glade.Widget] Gtk.CheckButton rotate_check;
[Glade.Widget] Gtk.SpinButton size_spin;
@@ -491,7 +486,6 @@ namespace FSpotSmugMugExport {
public const string EXPORT_SERVICE = "smugmug/";
public const string SCALE_KEY = Preferences.APP_FSPOT_EXPORT + EXPORT_SERVICE + "scale";
public const string SIZE_KEY = Preferences.APP_FSPOT_EXPORT + EXPORT_SERVICE + "size";
- public const string ROTATE_KEY = Preferences.APP_FSPOT_EXPORT + EXPORT_SERVICE + "rotate";
public const string BROWSER_KEY = Preferences.APP_FSPOT_EXPORT + EXPORT_SERVICE + "browser";
private void HandleResponse (object sender, Gtk.ResponseArgs args)
@@ -508,7 +502,6 @@ namespace FSpotSmugMugExport {
scale = false;
browser = browser_check.Active;
- rotate = rotate_check.Active;
// meta = meta_check.Active;
if (account != null) {
@@ -527,7 +520,6 @@ namespace FSpotSmugMugExport {
// Save these settings for next time
Preferences.Set (SCALE_KEY, scale);
Preferences.Set (SIZE_KEY, size);
- Preferences.Set (ROTATE_KEY, rotate);
Preferences.Set (BROWSER_KEY, browser);
}
}
@@ -552,9 +544,6 @@ namespace FSpotSmugMugExport {
if (scale)
filters.Add (new ResizeFilter ((uint)size));
- if (rotate)
- filters.Add (new OrientationFilter ());
-
while (photo_index < items.Length) {
try {
IBrowsableItem item = items[photo_index];
@@ -614,11 +603,6 @@ namespace FSpotSmugMugExport {
}
}
- private void HandleScaleCheckToggled (object o, EventArgs e)
- {
- rotate_check.Sensitive = !scale_check.Active;
- }
-
private void PopulateSmugMugOptionMenu (SmugMugAccountManager manager, SmugMugAccount changed_account)
{
Gtk.Menu menu = new Gtk.Menu ();
@@ -776,7 +760,6 @@ namespace FSpotSmugMugExport {
case SCALE_KEY:
if (scale_check.Active != Preferences.Get<bool> (key)) {
scale_check.Active = Preferences.Get<bool> (key);
- rotate_check.Sensitive = !Preferences.Get<bool> (key);
}
break;
@@ -788,11 +771,6 @@ namespace FSpotSmugMugExport {
if (browser_check.Active != Preferences.Get<bool> (key))
browser_check.Active = Preferences.Get<bool> (key);
break;
-
- case ROTATE_KEY:
- if (rotate_check.Active != Preferences.Get<bool> (key))
- rotate_check.Active = Preferences.Get<bool> (key);
- break;
}
}
diff --git a/extensions/Exporters/SmugMugExport/SmugMugExport.glade b/extensions/Exporters/SmugMugExport/SmugMugExport.glade
index 9408c15..f63cec1 100644
--- a/extensions/Exporters/SmugMugExport/SmugMugExport.glade
+++ b/extensions/Exporters/SmugMugExport/SmugMugExport.glade
@@ -1,16 +1,15 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--*- mode: xml -*-->
+<?xml version="1.0"?>
<glade-interface>
- <requires lib="canvas"/>
- <requires lib="gnome"/>
+ <!-- interface-requires gtk+ 2.6 -->
+ <!-- interface-naming-policy toplevel-contextual -->
<widget class="GtkDialog" id="smugmug_export_dialog">
<property name="title" translatable="yes">Export</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+ <property name="type_hint">dialog</property>
<property name="has_separator">False</property>
<child internal-child="vbox">
<widget class="GtkVBox" id="vbox88">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<child>
<widget class="GtkHBox" id="hbox91">
<property name="visible">True</property>
@@ -19,7 +18,7 @@
<widget class="GtkFrame" id="frame50">
<property name="visible">True</property>
<property name="label_xalign">0</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="shadow_type">none</property>
<child>
<widget class="GtkAlignment" id="alignment67">
<property name="visible">True</property>
@@ -29,9 +28,9 @@
<property name="width_request">180</property>
<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>
+ <property name="hscrollbar_policy">automatic</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">in</property>
<child>
<placeholder/>
</child>
@@ -50,16 +49,20 @@
</packing>
</child>
</widget>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<widget class="GtkVBox" id="vbox89">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<widget class="GtkFrame" id="frame51">
<property name="visible">True</property>
<property name="label_xalign">0</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="shadow_type">none</property>
<child>
<widget class="GtkAlignment" id="alignment68">
<property name="visible">True</property>
@@ -67,6 +70,7 @@
<child>
<widget class="GtkVBox" id="vbox90">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<widget class="GtkHBox" id="hbox92">
@@ -82,13 +86,14 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<widget class="GtkOptionMenu" id="gallery_optionmenu">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="response_id">0</property>
+ <property name="receives_default">False</property>
<signal name="changed" handler="HandleAccountSelected"/>
</widget>
<packing>
@@ -97,11 +102,11 @@
</child>
<child>
<widget class="GtkButton" id="gallery_button">
+ <property name="label">gtk-add</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label">gtk-add</property>
+ <property name="receives_default">False</property>
<property name="use_stock">True</property>
- <property name="response_id">0</property>
<signal name="clicked" handler="HandleAddGallery"/>
</widget>
<packing>
@@ -112,11 +117,11 @@
</child>
<child>
<widget class="GtkButton" id="edit_button">
+ <property name="label">gtk-edit</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label">gtk-edit</property>
+ <property name="receives_default">False</property>
<property name="use_stock">True</property>
- <property name="response_id">0</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -125,6 +130,9 @@
</packing>
</child>
</widget>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<widget class="GtkLabel" id="label222">
@@ -156,13 +164,14 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<widget class="GtkFrame" id="frame52">
<property name="visible">True</property>
<property name="label_xalign">0</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="shadow_type">none</property>
<child>
<widget class="GtkAlignment" id="alignment69">
<property name="visible">True</property>
@@ -170,6 +179,7 @@
<child>
<widget class="GtkVBox" id="vbox91">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<widget class="GtkHBox" id="hbox93">
@@ -185,13 +195,14 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<widget class="GtkOptionMenu" id="album_optionmenu">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="response_id">0</property>
+ <property name="receives_default">False</property>
</widget>
<packing>
<property name="position">1</property>
@@ -199,11 +210,11 @@
</child>
<child>
<widget class="GtkButton" id="album_button">
+ <property name="label">gtk-add</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label">gtk-add</property>
+ <property name="receives_default">False</property>
<property name="use_stock">True</property>
- <property name="response_id">0</property>
<signal name="clicked" handler="HandleAddAlbum"/>
</widget>
<packing>
@@ -213,14 +224,17 @@
</packing>
</child>
</widget>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<widget class="GtkCheckButton" id="browser_check">
+ <property name="label" translatable="yes">Open _album in browser when done uploading</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Open _album in browser when done uploading</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
</widget>
@@ -255,7 +269,7 @@
<widget class="GtkFrame" id="frame53">
<property name="visible">True</property>
<property name="label_xalign">0</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="shadow_type">none</property>
<child>
<widget class="GtkAlignment" id="alignment70">
<property name="visible">True</property>
@@ -263,23 +277,25 @@
<child>
<widget class="GtkVBox" id="vbox92">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<widget class="GtkHBox" id="hbox94">
<property name="visible">True</property>
<child>
<widget class="GtkCheckButton" id="scale_check">
+ <property name="label" translatable="yes">_Resize to: </property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">_Resize to: </property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
<signal name="toggled" handler="HandleSizeActive"/>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -310,20 +326,8 @@
<placeholder/>
</child>
</widget>
- </child>
- <child>
- <widget class="GtkCheckButton" id="rotate_check">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Autorotate</property>
- <property name="use_underline">True</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
- </widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
</widget>
@@ -360,34 +364,44 @@
<child internal-child="action_area">
<widget class="GtkHButtonBox" id="hbuttonbox14">
<property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
+ <property name="layout_style">end</property>
<child>
<widget class="GtkButton" id="cancel_button">
+ <property name="label">gtk-cancel</property>
+ <property name="response_id">-6</property>
<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="receives_default">False</property>
<property name="use_stock">True</property>
- <property name="response_id">-6</property>
</widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<widget class="GtkButton" id="export_button">
+ <property name="label" translatable="yes">_Export</property>
+ <property name="response_id">-5</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
- <property name="label" translatable="yes">_Export</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
- <property name="response_id">-5</property>
</widget>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
</widget>
<packing>
<property name="expand">False</property>
- <property name="pack_type">GTK_PACK_END</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
</packing>
</child>
</widget>
@@ -395,7 +409,7 @@
</widget>
<widget class="GtkDialog" id="smugmug_add_album_dialog">
<property name="visible">True</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+ <property name="type_hint">dialog</property>
<property name="has_separator">False</property>
<child internal-child="vbox">
<widget class="GtkVBox" id="vbox93">
@@ -409,9 +423,6 @@
<property name="column_spacing">7</property>
<property name="row_spacing">6</property>
<child>
- <placeholder/>
- </child>
- <child>
<widget class="GtkLabel" id="category_label">
<property name="visible">True</property>
<property name="xalign">1</property>
@@ -442,7 +453,6 @@
<widget class="GtkEntry" id="title_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">*</property>
</widget>
<packing>
<property name="left_attach">1</property>
@@ -452,11 +462,11 @@
</child>
<child>
<widget class="GtkCheckButton" id="public_check">
+ <property name="label" translatable="yes">Public Album</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Public Album</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
</widget>
<packing>
@@ -481,45 +491,58 @@
<property name="y_options">GTK_FILL</property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
- <property name="pack_type">GTK_PACK_END</property>
+ <property name="pack_type">end</property>
<property name="position">1</property>
</packing>
</child>
<child internal-child="action_area">
<widget class="GtkHButtonBox" id="hbuttonbox15">
<property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
+ <property name="layout_style">end</property>
<child>
<widget class="GtkButton" id="cancele_button">
+ <property name="label">gtk-cancel</property>
+ <property name="response_id">-6</property>
<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="receives_default">False</property>
<property name="use_stock">True</property>
- <property name="response_id">-6</property>
</widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<widget class="GtkButton" id="add_button">
+ <property name="label">gtk-add</property>
+ <property name="response_id">-5</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
- <property name="label">gtk-add</property>
+ <property name="receives_default">False</property>
<property name="use_stock">True</property>
- <property name="response_id">-5</property>
</widget>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
</widget>
<packing>
<property name="expand">False</property>
- <property name="pack_type">GTK_PACK_END</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
</packing>
</child>
</widget>
@@ -527,7 +550,7 @@
</widget>
<widget class="GtkDialog" id="smugmug_add_dialog">
<property name="visible">True</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+ <property name="type_hint">dialog</property>
<property name="has_separator">False</property>
<child internal-child="vbox">
<widget class="GtkVBox" id="vbox97">
@@ -563,7 +586,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="visibility">False</property>
- <property name="invisible_char">*</property>
</widget>
<packing>
<property name="left_attach">1</property>
@@ -590,7 +612,6 @@
<widget class="GtkEntry" id="username_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">*</property>
</widget>
<packing>
<property name="left_attach">1</property>
@@ -601,60 +622,74 @@
</widget>
<packing>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
</widget>
<packing>
<property name="expand">False</property>
- <property name="pack_type">GTK_PACK_END</property>
+ <property name="pack_type">end</property>
<property name="position">1</property>
</packing>
</child>
<child internal-child="action_area">
<widget class="GtkHButtonBox" id="hbuttonbox16">
<property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
+ <property name="layout_style">end</property>
<child>
<widget class="GtkButton" id="cancel_button">
+ <property name="label">gtk-cancel</property>
+ <property name="response_id">-6</property>
<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="receives_default">False</property>
<property name="use_stock">True</property>
- <property name="response_id">-6</property>
</widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<widget class="GtkButton" id="remove_button">
+ <property name="label">gtk-remove</property>
+ <property name="response_id">-2</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
- <property name="label">gtk-remove</property>
+ <property name="receives_default">False</property>
<property name="use_stock">True</property>
- <property name="response_id">-2</property>
</widget>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
<child>
<widget class="GtkButton" id="add_button">
+ <property name="label">gtk-add</property>
+ <property name="response_id">-5</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
- <property name="label">gtk-add</property>
+ <property name="receives_default">False</property>
<property name="use_stock">True</property>
- <property name="response_id">-5</property>
</widget>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">2</property>
</packing>
</child>
</widget>
<packing>
<property name="expand">False</property>
- <property name="pack_type">GTK_PACK_END</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
</packing>
</child>
</widget>
diff --git a/extensions/Tools/LiveWebGallery/PhotoRequestHandler.cs b/extensions/Tools/LiveWebGallery/PhotoRequestHandler.cs
index 508ed81..f15d6a5 100644
--- a/extensions/Tools/LiveWebGallery/PhotoRequestHandler.cs
+++ b/extensions/Tools/LiveWebGallery/PhotoRequestHandler.cs
@@ -47,7 +47,6 @@ namespace LiveWebGalleryExtension
FilterSet filters = new FilterSet ();
filters.Add (new JpegFilter ());
filters.Add (new ResizeFilter (1600));
- filters.Add (new OrientationFilter ());
using (FilterRequest request = new FilterRequest (photo.DefaultVersion.Uri)) {
filters.Convert (request);
diff --git a/extensions/Tools/MetaPixel/MetaPixel.cs b/extensions/Tools/MetaPixel/MetaPixel.cs
index ce988e3..03268ed 100644
--- a/extensions/Tools/MetaPixel/MetaPixel.cs
+++ b/extensions/Tools/MetaPixel/MetaPixel.cs
@@ -151,7 +151,6 @@ namespace MetaPixelExtension {
FilterSet filters = new FilterSet ();
filters.Add (new JpegFilter ());
- filters.Add (new OrientationFilter ());
FilterRequest freq = new FilterRequest (p.DefaultVersion.Uri);
filters.Convert (freq);
@@ -200,7 +199,6 @@ namespace MetaPixelExtension {
FilterSet filters = new FilterSet ();
filters.Add (new JpegFilter ());
- filters.Add (new OrientationFilter ());
FilterRequest freq = new FilterRequest (p.DefaultVersion.Uri);
filters.Convert (freq);
diff --git a/extensions/Tools/PictureTile/PictureTile.cs b/extensions/Tools/PictureTile/PictureTile.cs
index 6b16db8..64b09ce 100644
--- a/extensions/Tools/PictureTile/PictureTile.cs
+++ b/extensions/Tools/PictureTile/PictureTile.cs
@@ -113,7 +113,6 @@ namespace PictureTileExtension {
FilterSet filters = new FilterSet ();
filters.Add (new JpegFilter ());
- filters.Add (new OrientationFilter ());
uint counter = 0;
ArrayList all_tags = new ArrayList ();
foreach (Photo p in App.Instance.Organizer.SelectedPhotos ()) {
diff --git a/src/Makefile.am b/src/Makefile.am
index 13dc597..eed4b36 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -60,7 +60,6 @@ SOURCES = \
Filters/FilterSet.cs \
Filters/IFilter.cs \
Filters/JpegFilter.cs \
- Filters/OrientationFilter.cs \
Filters/ResizeFilter.cs \
Filters/SharpFilter.cs \
Filters/UniqueNameFilter.cs \
diff --git a/src/SendEmail.cs b/src/SendEmail.cs
index b22d945..40a0110 100644
--- a/src/SendEmail.cs
+++ b/src/SendEmail.cs
@@ -32,7 +32,6 @@ namespace FSpot
[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;
- [GtkBeans.Builder.Object] private CheckButton rotate_check;
#pragma warning restore 0649
long Orig_Photo_Size = 0;
@@ -79,8 +78,6 @@ namespace FSpot
default: break;
}
- rotate_check.Active = Preferences.Get<bool> (Preferences.EXPORT_EMAIL_ROTATE);
- rotate_check.Sensitive = original_size.Active && tiny_size.Sensitive;
tray_scrolled.Add (new TrayView (selection));
@@ -195,9 +192,6 @@ namespace FSpot
public void on_size_toggled (object o, EventArgs args)
{
UpdateEstimatedSize();
-
- // Only enable the rotate option if Original size is selected.
- rotate_check.Sensitive = original_size.Active;
}
@@ -205,7 +199,6 @@ namespace FSpot
{
int size = 0;
bool UserCancelled = false;
- bool rotate = true;
// Lets remove the mail "create mail" dialog
Destroy();
@@ -239,9 +232,6 @@ namespace FSpot
break;
}
- rotate = rotate_check.Active; // Should we automatically rotate original photos.
- Preferences.Set (Preferences.EXPORT_EMAIL_ROTATE, rotate);
-
// Create a tmp directory.
tmp_mail_dir = System.IO.Path.GetTempFileName (); // Create a tmp file
System.IO.File.Delete (tmp_mail_dir); // Delete above tmp file
@@ -253,8 +243,6 @@ namespace FSpot
if (size != 0)
filters.Add (new ResizeFilter ((uint) size));
- else if (rotate)
- filters.Add (new OrientationFilter ());
filters.Add (new UniqueNameFilter (new SafeUri (tmp_mail_dir)));
diff --git a/src/ui/mail_dialog.ui b/src/ui/mail_dialog.ui
index 546b865..aa438b0 100644
--- a/src/ui/mail_dialog.ui
+++ b/src/ui/mail_dialog.ui
@@ -217,39 +217,7 @@
</packing>
</child>
<child>
- <object class="GtkFrame" id="optionframe">
- <property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
- <child>
- <object class="GtkAlignment" id="alignment65">
- <property name="visible">True</property>
- <property name="left_padding">12</property>
- <child>
- <object class="GtkCheckButton" id="rotate_check">
- <property name="label" translatable="yes">Autorotate</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="tooltip_text" translatable="yes">Specify if an original size picture should be rotated or not. Smaller sizes are automatically rotated.</property>
- <property name="use_underline">True</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- </object>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="label217">
- <property name="visible">True</property>
- <property name="label" translatable="yes"><b>Style</b></property>
- <property name="use_markup">True</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
+ <placeholder/>
</child>
<child>
<object class="GtkFrame" id="frame42">
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
