Merge lp:~trojan295/scratch/bugfix1329550 into lp:~elementary-apps/scratch/scratch

[Damian Czaja]

Moved the About dialog to quicklist.

There were some problems with Scratch. The argument '--about' was unknown, even through class ScratchApp inherited from Granite.Application. I found out, that in the main() function, there was some custom argument parsing and it caused, that '--about' was not recognized. I deleted there some code and now it works. The '--version' parameter is handled in the 'command_line' function.
To be honest, I'm not sure what for was that code in the main(). I cannot recognize any difference after removing it. Someone has to check that.

[Cody Garver (codygarver)]

I am not qualified to review this code changes but I can tell you that you need to add "About Scratch" as a string so it's present in the translation domain.

Like this: http://bazaar.launchpad.net/~elementary-apps/snap-elementary/snap/view/head:/src/Snap.vala#L35

[Damian Czaja (trojan295)]

So I don't have to edit any .pot file, only add this const string? In Scratch it looks like the strings are defined in config.vala.cmake, so I have to add this there?

[lp:~trojan295/scratch/bugfix1329550]

1408. By Damian Czaja on 2014-11-12

Added string constant for translation

=== modified file 'data/scratch-text-editor.desktop'
--- data/scratch-text-editor.desktop	2014-04-12 23:26:29 +0000
+++ data/scratch-text-editor.desktop	2014-11-12 11:20:30 +0000
@@ -10,6 +10,7 @@
 Keywords=Notepad;IDE;Plain
 MimeType=text/plain;
 StartupNotify=true
+Actions=AboutDialog;
 
 X-Ayatana-Desktop-Shortcuts=NewWindow;NewDocument
 
@@ -25,3 +26,6 @@
 Exec=scratch-text-editor --new-window
 TargetEnvironment=Unity
 
+[Desktop Action AboutDialog]
+Exec=scratch-text-editor --about
+Name=About Scratch

=== modified file 'src/MainWindow.vala'
--- src/MainWindow.vala	2014-11-02 11:16:30 +0000
+++ src/MainWindow.vala	2014-11-12 11:20:30 +0000
@@ -157,7 +157,7 @@
             this.toolbar.show_close_button = true;
             this.set_titlebar (this.toolbar);
             toolbar.menu = ui.get_widget ("ui/AppMenu") as Gtk.Menu;
-            var app_menu = (app as Granite.Application).create_appmenu (toolbar.menu);
+            var app_menu = new Granite.Widgets.AppMenu (toolbar.menu);
             toolbar.pack_end (app_menu);
 
             // SearchManager
@@ -335,7 +335,7 @@
         // Get current document
         public Scratch.Services.Document? get_current_document () {
             Scratch.Services.Document? doc = null;
-            
+
             var view = this.get_current_view ();
             if (view != null)
                 doc = view.get_current_document ();
@@ -897,4 +897,5 @@
                                          action_fullscreen }
         };
     }
-}
\ No newline at end of file
+}
+

=== modified file 'src/Scratch.vala'
--- src/Scratch.vala	2014-10-27 22:56:33 +0000
+++ src/Scratch.vala	2014-11-12 11:20:30 +0000
@@ -23,12 +23,12 @@
 using Granite.Services;
 
 namespace Scratch {
-    
+
     // Settings
     public SavedState saved_state;
     public Settings settings;
     public ServicesSettings services;
-    
+
     public class ScratchApp : Granite.Application {
 
         private GLib.List <MainWindow> windows;
@@ -42,7 +42,7 @@
         private static bool print_version = false;
         private static bool create_new_tab = false;
         private static bool create_new_window = false;
-        
+
         construct {
             flags |= ApplicationFlags.HANDLES_OPEN;
             flags |= ApplicationFlags.HANDLES_COMMAND_LINE;
@@ -93,7 +93,7 @@
             settings = new Settings ();
             services = new ServicesSettings ();
             windows = new GLib.List <MainWindow> ();
-            
+
             // Init data home folder for unsaved text files
             _data_home_folder_unsaved = Environment.get_user_data_dir () + "/" + exec_name + "/unsaved/";
         }
@@ -126,6 +126,12 @@
                 return Posix.EXIT_FAILURE;
             }
 
+            if (print_version) {
+                stdout.printf ("Scratch Text Editor %s\n", Constants.VERSION);
+                stdout.printf ("Copyright 2011-2014 Scratch Text Editor Developers.\n");
+                return Posix.EXIT_SUCCESS;
+            }
+
             // Create (or show) the first window
             activate ();
 
@@ -143,7 +149,7 @@
             }
 
             // Set Current Directory
-            Environment.set_current_dir (_cwd); 
+            Environment.set_current_dir (_cwd);
 
             // Open all files given as arguments
             if (unclaimed_args > 0) {
@@ -168,9 +174,9 @@
                 // Restore opened documents
                 if (settings.show_at_start == "last-tabs") {
                     window.start_loading ();
-                    
+
                     string[] uris = settings.schema.get_strv ("opened-files");
-                
+
                     foreach (string uri in uris) {
                        if (uri != "") {
                             var file = File.new_for_uri (uri);
@@ -187,7 +193,7 @@
             }
 
         }
-        
+
         protected override void open (File[] files, string hint) {
             // Add a view if there aren't and get the current DocumentView
             Scratch.Widgets.DocumentView? view = null;
@@ -197,7 +203,7 @@
                 view = window.add_view ();
             else
                 view = window.get_current_view ();
-            
+
             for (int i = 0; i < files.length; i++) {
                 // Check if the given path is a directory
                 try {
@@ -233,44 +239,22 @@
             windows.remove (window as MainWindow);
             base.window_removed (window);
         }
-        
+
         static const OptionEntry[] entries = {
             { "new-tab", 't', 0, OptionArg.NONE, out create_new_tab, N_("New Tab"), null },
             { "new-window", 'n', 0, OptionArg.NONE, out create_new_window, N_("New Window"), null },
             { "version", 'v', 0, OptionArg.NONE, out print_version, N_("Print version info and exit"), null },
             { "set", 's', 0, OptionArg.STRING, ref _app_cmd_name, N_("Set of plugins"), "" },
-            { "cwd", 'c', 0, OptionArg.STRING, ref _cwd, N_("Current working directory"), "" },            
+            { "cwd", 'c', 0, OptionArg.STRING, ref _cwd, N_("Current working directory"), "" },
             { null }
         };
 
         public static int main (string[] args) {
             _app_cmd_name = "Scratch";
 
-            var context = new OptionContext ("File");
-            context.add_main_entries (entries, Constants.GETTEXT_PACKAGE);
-            context.add_group (Gtk.get_option_group (true));
-
-            string[] args_primary_instance = args;
-            args_primary_instance += "-c";
-            args_primary_instance += Environment.get_current_dir (); 
-
-            try {
-                context.parse (ref args);
-            } catch(Error e) {
-                print (e.message + "\n");
-
-                return Posix.EXIT_FAILURE;
-            }
-
-            if (print_version) {
-                stdout.printf ("Scratch Text Editor %s\n", Constants.VERSION);
-                stdout.printf ("Copyright 2011-2014 Scratch Text Editor Developers.\n");
-
-                return Posix.EXIT_SUCCESS;
-            }
-
             ScratchApp app = ScratchApp.instance;
-            return app.run (args_primary_instance);
+            return app.run (args);
         }
     }
-}
\ No newline at end of file
+}
+

=== modified file 'src/config.vala.cmake'
--- src/config.vala.cmake	2013-05-09 08:49:17 +0000
+++ src/config.vala.cmake	2014-11-12 11:20:30 +0000
@@ -16,4 +16,5 @@
    public const string GENERIC = N_("Text Editor");
    public const string NEW_DOCUMENT = N_("New Document");
    public const string NEW_WINDOW = N_("New Window");
+   public const string ABOUT_SCRATCH = N_("About Scratch");
 }