Changeset 3145 for libpipi/trunk/ThePimp/srcTweet

Timestamp:

Oct 30, 2008, 2:02:36 AM (14 years ago)

Author:

Sam Hocevar

Message:

ThePimp?: make file dialogs singletons so that they retain their properties
and do not take ages to build.

Location:

libpipi/trunk/ThePimp/src

Files:

• MainWindow.cs (modified) (2 diffs)
• OpenFile.cs (modified) (1 diff)
• SaveFile.cs (modified) (1 diff)

libpipi/trunk/ThePimp/src/MainWindow.cs

@@ -38 +38 @@
         protected virtual void OnOpenActionActivated (object sender, System.EventArgs e)
         {
-            OpenFile dialog = new OpenFile();
-
-            string s = dialog.GetChoice();
-            dialog.Destroy();
+            string s = OpenFile.GetChoice();
             if(s == null)
                 return;
@@ -91 +88 @@
             if(notebook1.NPages <= 0)
                 return;
-            SaveFile save = new SaveFile();
+
             PictureView view = notebook1.CurrentPageWidget as PictureView;
-            save.Save(view.Picture);
-            save.Destroy();
+
+            string s = OpenFile.GetChoice();
+            if(s == null)
+                return;
+
+            view.Picture.Save(s);
         }
 

libpipi/trunk/ThePimp/src/OpenFile.cs

@@ -20 +20 @@
     public partial class OpenFile : Gtk.Dialog
     {
-        public OpenFile()
+        private static readonly OpenFile instance = new OpenFile();
+
+        // Do not mark type as beforefieldinit
+        static OpenFile() {}
+
+        private OpenFile()
         {
             this.Build();
         }
 
-        public string GetChoice()
+        public static string GetChoice()
         {
-            ResponseType rsp = (ResponseType)Run();
-            Hide();
+            instance.ShowAll();
+            ResponseType rsp = (ResponseType)instance.Run();
+            instance.Hide();
             if(rsp != ResponseType.Ok)
                 return null;
-            return filechooserwidget1.Filename;
+            return instance.filechooserwidget1.Filename;
         }
 

libpipi/trunk/ThePimp/src/SaveFile.cs

@@ -20 +20 @@
     public partial class SaveFile : Gtk.Dialog
     {
-        public SaveFile()
+        private static readonly SaveFile instance = new SaveFile();
+
+        // Do not mark type as beforefieldinit
+        static SaveFile() {}
+
+        private SaveFile()
         {
             this.Build();
         }
 
-        public void Save(Pipi.Picture p)
+        public static string GetChoice()
         {
-            ResponseType rsp = (ResponseType)Run();
-            Hide();
+            instance.ShowAll();
+            ResponseType rsp = (ResponseType)instance.Run();
+            instance.Hide();
             if(rsp != ResponseType.Ok)
-                return;
-            p.Save(filechooserwidget1.Filename);
+                return null;
+            return instance.filechooserwidget1.Filename;
         }