diff options
Diffstat (limited to 'src/dialogs')
| -rw-r--r-- | src/dialogs/AdjustDateTimeDialog.vala | 2 | ||||
| -rw-r--r-- | src/dialogs/ExportDialog.vala | 12 | ||||
| -rw-r--r-- | src/dialogs/ProgressDialog.vala | 2 |
3 files changed, 10 insertions, 6 deletions
diff --git a/src/dialogs/AdjustDateTimeDialog.vala b/src/dialogs/AdjustDateTimeDialog.vala index f475773..2b6ae45 100644 --- a/src/dialogs/AdjustDateTimeDialog.vala +++ b/src/dialogs/AdjustDateTimeDialog.vala @@ -231,7 +231,7 @@ public class AdjustDateTimeDialog : Gtk.Dialog { uint year, month, day; calendar.get_date(out year, out month, out day); - return new DateTime.local((int)year, (int)month + 1, (int)day, hour, (int)minute.get_value(), (int)second.get_value()); + return new DateTime(Application.timezone, (int)year, (int)month + 1, (int)day, hour, (int)minute.get_value(), (int)second.get_value()); } public bool execute(out TimeSpan time_shift, out bool keep_relativity, diff --git a/src/dialogs/ExportDialog.vala b/src/dialogs/ExportDialog.vala index 5a61dc4..1f0a581 100644 --- a/src/dialogs/ExportDialog.vala +++ b/src/dialogs/ExportDialog.vala @@ -71,7 +71,7 @@ public class ExportDialog : Gtk.Dialog { format_combo = new Gtk.ComboBoxText(); format_add_option(UNMODIFIED_FORMAT_LABEL); format_add_option(CURRENT_FORMAT_LABEL); - foreach (PhotoFileFormat format in PhotoFileFormat.get_writeable()) { + foreach (PhotoFileFormat format in PhotoFileFormat.get_image_writeable()) { format_add_option(format.get_properties().get_user_visible_name()); } @@ -144,7 +144,7 @@ public class ExportDialog : Gtk.Dialog { selection_ticker++; } - error("format_set_active_text: text '%s' isn't in combo box", text); + critical("format_set_active_text: text '%s' isn't in combo box", text); } private PhotoFileFormat get_specified_format() { @@ -153,7 +153,7 @@ public class ExportDialog : Gtk.Dialog { index = NUM_SPECIAL_FORMATS; index -= NUM_SPECIAL_FORMATS; - PhotoFileFormat[] writeable_formats = PhotoFileFormat.get_writeable(); + PhotoFileFormat[] writeable_formats = PhotoFileFormat.get_image_writeable(); return writeable_formats[index]; } @@ -276,7 +276,7 @@ public class ExportDialog : Gtk.Dialog { if (format_combo.get_active_text() == UNMODIFIED_FORMAT_LABEL) { // if the user wishes to export the media unmodified, then we just copy the original - // files, so parameterizing size, quality, etc. is impossible -- these are all + // files, so parameterize size, quality, etc. is impossible -- these are all // just as they are in the original file. In this case, we set the scale constraint to // original and lock out all the controls constraint_combo.set_active(0); /* 0 == original size */ @@ -303,7 +303,9 @@ public class ExportDialog : Gtk.Dialog { constraint_combo.set_sensitive(true); bool jpeg = get_specified_format() == PhotoFileFormat.JFIF; quality_combo.sensitive = !original && jpeg; - export_metadata.sensitive = true; + + export_metadata.sensitive = get_specified_format().can_write_metadata(); + export_metadata.active = get_specified_format().can_write_metadata(); } } diff --git a/src/dialogs/ProgressDialog.vala b/src/dialogs/ProgressDialog.vala index 9368764..9d28551 100644 --- a/src/dialogs/ProgressDialog.vala +++ b/src/dialogs/ProgressDialog.vala @@ -37,6 +37,8 @@ public class ProgressDialog : Gtk.Window { cancel_button = new Gtk.Button.with_mnemonic(Resources.CANCEL_LABEL); cancel_button.clicked.connect(on_cancel); delete_event.connect(on_window_closed); + } else { + delete_event.connect(hide_on_delete); } Gtk.Box hbox = new Gtk.Box(Gtk.Orientation.HORIZONTAL, 8); |