[f-spot] More cleaning, kills more warnings.
- From: Ruben Vermeersch <rubenv src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [f-spot] More cleaning, kills more warnings.
- Date: Thu, 22 Jul 2010 17:30:32 +0000 (UTC)
commit da1668d44e7c958bfd2f9e31c6414553e6cbd804
Author: Ruben Vermeersch <ruben savanne be>
Date: Thu Jul 22 19:30:10 2010 +0200
More cleaning, kills more warnings.
src/SingleView.cs | 1 -
src/UI.Dialog/DateRangeDialog.cs | 11 +----------
src/UI.Dialog/LastRollDialog.cs | 6 +++---
src/UI.Dialog/RatingFilterDialog.cs | 5 -----
src/UI.Dialog/TagSelectionDialog.cs | 3 ---
5 files changed, 4 insertions(+), 22 deletions(-)
---
diff --git a/src/SingleView.cs b/src/SingleView.cs
index ccc9b4a..0a1ec27 100644
--- a/src/SingleView.cs
+++ b/src/SingleView.cs
@@ -18,7 +18,6 @@ namespace FSpot {
[GtkBeans.Builder.Object] Gtk.HBox toolbar_hbox;
[GtkBeans.Builder.Object] Gtk.VBox info_vbox;
[GtkBeans.Builder.Object] Gtk.ScrolledWindow image_scrolled;
- [GtkBeans.Builder.Object] Gtk.HPaned info_hpaned;
Gtk.ScrolledWindow directory_scrolled;
diff --git a/src/UI.Dialog/DateRangeDialog.cs b/src/UI.Dialog/DateRangeDialog.cs
index 80a6592..25446e3 100644
--- a/src/UI.Dialog/DateRangeDialog.cs
+++ b/src/UI.Dialog/DateRangeDialog.cs
@@ -19,9 +19,6 @@ using FSpot.Widgets;
namespace FSpot.UI.Dialog
{
public class DateRangeDialog : BuilderDialog {
- Gtk.Window parent_window;
-
- [GtkBeans.Builder.Object] Button ok_button;
[GtkBeans.Builder.Object] Frame startframe;
[GtkBeans.Builder.Object] Frame endframe;
[GtkBeans.Builder.Object] ComboBox period_combobox;
@@ -50,7 +47,6 @@ namespace FSpot.UI.Dialog
public DateRangeDialog (DateRange query_range, Gtk.Window parent_window) : base ("DateRangeDialog.ui", "date_range_dialog")
{
- this.parent_window = parent_window;
TransientFor = parent_window;
DefaultResponse = ResponseType.Ok;
@@ -86,12 +82,7 @@ namespace FSpot.UI.Dialog
(cell as CellRendererText).Text = name;
}
- private static string GetString(int index)
- {
- return GetString (ranges [index]);
- }
-
- private static string GetString(string rangename)
+ private string GetString(string rangename)
{
System.DateTime today = System.DateTime.Today;
switch (rangename) {
diff --git a/src/UI.Dialog/LastRollDialog.cs b/src/UI.Dialog/LastRollDialog.cs
index a187c30..61187f4 100644
--- a/src/UI.Dialog/LastRollDialog.cs
+++ b/src/UI.Dialog/LastRollDialog.cs
@@ -18,7 +18,6 @@ namespace FSpot.UI.Dialog {
public class LastRolls : BuilderDialog {
FSpot.PhotoQuery query;
RollStore rollstore;
- Gtk.Window parent_window;
Roll [] rolls;
@@ -28,13 +27,14 @@ namespace FSpot.UI.Dialog {
[GtkBeans.Builder.Object] private Label and_label; // and label between two comboboxes.
[GtkBeans.Builder.Object] private Label photos_in_selected_rolls;
- public LastRolls (FSpot.PhotoQuery query, RollStore rollstore, Gtk.Window parent_window) : base ("LastImportRollFilterDialog.ui", "last_import_rolls_filter")
+ public LastRolls (FSpot.PhotoQuery query, RollStore rollstore, Window parent) : base ("LastImportRollFilterDialog.ui", "last_import_rolls_filter")
{
this.query = query;
this.rollstore = rollstore;
- this.parent_window = parent_window;
rolls = rollstore.GetRolls (FSpot.Preferences.Get<int> (FSpot.Preferences.IMPORT_GUI_ROLL_HISTORY));
+ TransientFor = parent;
+
PopulateCombos ();
combo_filter.Active = 0;
diff --git a/src/UI.Dialog/RatingFilterDialog.cs b/src/UI.Dialog/RatingFilterDialog.cs
index 4604a76..2b588c2 100644
--- a/src/UI.Dialog/RatingFilterDialog.cs
+++ b/src/UI.Dialog/RatingFilterDialog.cs
@@ -17,9 +17,6 @@ using FSpot.UI.Dialog;
namespace FSpot.UI.Dialog
{
public class RatingFilterDialog : BuilderDialog {
- FSpot.PhotoQuery query;
- Gtk.Window parent_window;
-
[GtkBeans.Builder.Object] Button ok_button;
[GtkBeans.Builder.Object] HBox minrating_hbox;
[GtkBeans.Builder.Object] HBox maxrating_hbox;
@@ -31,8 +28,6 @@ namespace FSpot.UI.Dialog
public RatingFilterDialog (FSpot.PhotoQuery query, Gtk.Window parent_window) : base ("RatingFilterDialog.ui", "rating_filter_dialog")
{
- this.query = query;
- this.parent_window = parent_window;
TransientFor = parent_window;
DefaultResponse = ResponseType.Ok;
ok_button.GrabFocus ();
diff --git a/src/UI.Dialog/TagSelectionDialog.cs b/src/UI.Dialog/TagSelectionDialog.cs
index f5cb1b9..77fb097 100644
--- a/src/UI.Dialog/TagSelectionDialog.cs
+++ b/src/UI.Dialog/TagSelectionDialog.cs
@@ -7,9 +7,6 @@ namespace FSpot.UI.Dialog {
public class TagSelectionDialog : GladeDialog
{
[Widget] Gtk.ScrolledWindow tag_selection_scrolled;
- [Widget] Gtk.VBox selection_vbox;
- [Widget] Gtk.Button ok_button;
- [Widget] Gtk.Button cancel_button;
TagSelectionWidget tag_selection_widget;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]