Changeset 008d5c72452c9189b0f715046a34d75bb9acba88

Timestamp:

22/12/10 20:19:42 (2 years ago)

Author:

Matias De la Puente <mfpuente.ar@…>

Children:

c15395525506be7df1e1d05b82bfb04f27268ab7

Parents:

15c36f68bf2989f4965aa740a6d7e33fb6fd0016

git-committer:

Matias De la Puente <mfpuente.ar@…> (22/12/10 20:19:42)

Message:

Projects: Improve AddFileDialog?

Move file actions to ProjectsLogic?

Location:

libi4uccore

Files:

• addfiledialoglogic.vala (modified) (1 diff)
• projectslogic.vala (modified) (2 diffs)

libi4uccore/addfiledialoglogic.vala

@@ -43 +43 @@
         }
 
-        public bool run (out string file, out Gee.List<string> profiles)
+        public bool run ()
         {
-                var response = _view.run ();
-                var is_new = _view.is_new;
-                var filename = _view.filename;
-                profiles = _view.activated_profiles;
-                _view.close_dialog ();
-
-                if (response != DialogResponse.OK)
+                if (_view.run () == DialogResponse.CANCEL)
                         return false;
-
-                if (is_new)
-                {
-                        var new_file = File.new_for_uri (_project.get_file_uri (filename));
-                        var overwrite = true;
-                        if (new_file.query_exists (null))
-                        {
-                                var message = _("The file <<%s>> already exists, do you want to create a new one?").printf (new_file.get_path ());
-                                response = _view.show_yes_no_message (message, true);
-
-                                if (response == DialogResponse.CANCEL)
-                                        return false;
-
-                                if (response == DialogResponse.NO)
-                                        overwrite = false;
-                        }
-                        if (overwrite)
-                                new_file.replace_contents ("", 0, null, false, FileCreateFlags.NONE, null, null);
-                        file = filename;
-                }
-                else
-                {
-                        var import_file = File.new_for_uri (filename);
-                        var file_info = import_file.query_info (FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME, FileQueryInfoFlags.NONE, null);
-                        var import_filename = file_info.get_display_name ();
-                        if (_project.folder_uri != import_file.get_parent ().get_uri ())
-                        {
-                                var message = _("The file <<%s>> is outside the project's folder, do you want to copy the file?").printf (import_file.get_path ());
-                                response = _view.show_yes_no_message (message, false);
-
-                                if (response == DialogResponse.YES)
-                                {
-                                        var dest_file = File.new_for_uri (_project.get_file_uri (import_filename));
-                                        message = _("Do you want to overwrite the file <<%s>>?").printf (dest_file.get_path ());
-                                        if (dest_file.query_exists (null) && _view.show_yes_no_message (message, false) == DialogResponse.NO)
-                                                return false;
-                                        import_file.copy (dest_file, FileCopyFlags.OVERWRITE, null, null);
-                                }
-                        }
-                        file = import_filename;
-                }
                 return true;
         }
-
+        
         private void on_is_new_changed ()
         {

libi4uccore/projectslogic.vala

@@ -133 +133 @@
         private void on_add_file_clicked ()
         {
-                var current_project = _page_logic.current_project;
-                var dialog_logic = new AddFileDialogLogic (_view.create_add_file_dialog_view (), current_project);
-                string file;
-                Gee.List<string> profiles;
-                if (dialog_logic.run (out file, out profiles))
-                {
+                var dialog_view = _view.create_add_file_dialog_view ();
+                var current_project = _page_logic.current_project;
+                var dialog_logic = new AddFileDialogLogic (dialog_view, current_project);
+                
+                if (dialog_logic.run ())
+                {
+                        string file;
+                        if (dialog_view.is_new)
+                        {
+                                // Create a new empty file
+                                var new_file = File.new_for_uri (current_project.get_file_uri (dialog_view.filename));
+                                var overwrite = true;
+                                if (new_file.query_exists (null))
+                                {
+                                        // The file already exists, ask to create a new one
+                                        var message = _("The file <<%s>> already exists, do you want to create a new one?").printf (new_file.get_path ());
+                                        var response = _view.show_yes_no_message (message, true);
+        
+                                        if (response == DialogResponse.CANCEL)
+                                                return;
+        
+                                        if (response == DialogResponse.NO)
+                                                overwrite = false;
+                                }
+                                if (overwrite)
+                                        new_file.replace_contents ("", 0, null, false, FileCreateFlags.NONE, null, null);
+                                file = dialog_view.filename;
+                        }
+                        else
+                        {
+                                // Import a file
+                                var import_file = File.new_for_uri (dialog_view.filename);
+                                var file_info = import_file.query_info (FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME, FileQueryInfoFlags.NONE, null);
+                                var import_filename = file_info.get_display_name ();
+                                if (current_project.folder_uri != import_file.get_parent ().get_uri ())
+                                {
+                                        // The file is in another folder, ask to copy the file
+                                        var message = _("The file <<%s>> is outside the project's folder, do you want to copy the file?").printf (import_file.get_path ());
+                                        var response = _view.show_yes_no_message (message, false);
+                                        
+                                        if (response == DialogResponse.YES)
+                                        {
+                                                // The file already exists, ask to ovewrite the file
+                                                var dest_file = File.new_for_uri (current_project.get_file_uri (import_filename));
+                                                message = _("Do you want to overwrite the file <<%s>>?").printf (dest_file.get_path ());
+                                                if (dest_file.query_exists (null) && _view.show_yes_no_message (message, false) == DialogResponse.NO)
+                                                        return;
+                                                import_file.copy (dest_file, FileCopyFlags.OVERWRITE, null, null);
+                                        }
+                                }
+                                file = import_filename;
+                        }
+                        
+                        // Add the file to the project and to the selected profiles and open the file
                         if (!(file in current_project.files))
                                 current_project.files.add (file);
-                        foreach (var profile in profiles)
+                        foreach (var profile in dialog_view.activated_profiles)
                                 if (!(file in current_project.profiles[profile].files))
                                         current_project.profiles[profile].files.add (file);
@@ -148 +196 @@
                         _documents_logic.open_document (current_project.get_file_uri (file));
                 }
+                dialog_view.close_dialog ();
         }