elementary-dev-community team mailing list archive

[Cameron Norman <camerontnorman@xxxxxxxxx>]

Cameron Norman has proposed merging lp:~elementary-dev-community/pantheon-terminal/fix-1329550 into lp:pantheon-terminal.

Requested reviews:
  elementary Apps team (elementary-apps)
Related bugs:
  Bug #1329550 in Terminal: "Move "About" to quicklist"
  https://bugs.launchpad.net/pantheon-terminal/+bug/1329550

For more details, see:
https://code.launchpad.net/~elementary-dev-community/pantheon-terminal/fix-1329550/+merge/229683

This adds an --about (-a) command line option and a corresponding quicklist item. It leaves the item in the right click menu intact, so that users on desktops that do not implement quicklists can still access the about dialog via GUI.
-- 
https://code.launchpad.net/~elementary-dev-community/pantheon-terminal/fix-1329550/+merge/229683
Your team elementary Developer Community is subscribed to branch lp:~elementary-dev-community/pantheon-terminal/fix-1329550.

=== modified file 'data/pantheon-terminal.desktop'
--- data/pantheon-terminal.desktop	2014-05-22 22:07:48 +0000
+++ data/pantheon-terminal.desktop	2014-08-05 20:03:13 +0000
@@ -10,7 +10,7 @@
 StartupNotify=true
 X-GNOME-Gettext-Domain=pantheon-terminal
 Keywords=command;prompt;cmd;commandline;run;
-Actions=NewWindow;NewRootWindow;
+Actions=NewWindow;NewRootWindow;AboutDialog;
 
 [Desktop Action NewWindow]
 Name=New Window
@@ -21,3 +21,7 @@
 Name=New Root Window
 Icon=utilities-terminal
 Exec=gksu pantheon-terminal
+
+[Desktop Action AboutDialog]
+Name=About Terminal
+Exec=pantheon-terminal --about

=== modified file 'src/PantheonTerminal.vala'
--- src/PantheonTerminal.vala	2014-07-03 23:20:40 +0000
+++ src/PantheonTerminal.vala	2014-08-05 20:03:13 +0000
@@ -31,6 +31,7 @@
         private static string[]? command_e = null;
 
         private static bool print_version = false;
+        private static bool show_about_dialog = false;
 
         public int minimum_width;
         public int minimum_height;
@@ -196,6 +197,7 @@
 
         static const OptionEntry[] entries = {
             { "version", 'v', 0, OptionArg.NONE, out print_version, N_("Print version info and exit"), null },
+            { "about", 'a', 0, OptionArg.NONE, out show_about_dialog, N_("Show about dialog"), null },
             { "execute" , 'e', 0, OptionArg.STRING_ARRAY, ref command_e, N_("Run a program in terminal"), "" },
             { "working-directory", 'w', 0, OptionArg.STRING, ref working_directory, N_("Set shell working directory"), "" },
             { null }
@@ -214,7 +216,7 @@
             } catch (Error e) {
                 stdout.printf ("pantheon-terminal: ERROR: " + e.message + "\n");
 
-                return 0;
+                return 1;
             }
 
             if (print_version) {