Re: [Elementary-dev-community] [Merge] lp:~elementary-dev-community/granite/fix-1324424 into lp:granite
Review: Approve It looks fine - thanks for your work. I didn't test the *BSD part, I assume that you or Olivier Duchateau tested it. I am going to merge this with an upper case style (i.e DRAGON_FLY instead of DragonFly). -- https://code.launchpad.net/~elementary-dev-community/granite/fix-1324424/+merge/229547 Your team elementary Developer Community is subscribed to branch lp:~elementary-dev-community/granite/fix-1324424. -- Mailing list: https://launchpad.net/~elementary-dev-community Post to : elementary-dev-community@lists.launchpad.net Unsubscribe : https://launchpad.net/~elementary-dev-community More help : https://help.launchpad.net/ListHelp
[Elementary-dev-community] [Merge] lp:~elementary-dev-community/granite/fix-1324424 into lp:granite
The proposal to merge lp:~elementary-dev-community/granite/fix-1324424 into lp:granite has been updated. Status: Needs review = Merged For more details, see: https://code.launchpad.net/~elementary-dev-community/granite/fix-1324424/+merge/229547 -- https://code.launchpad.net/~elementary-dev-community/granite/fix-1324424/+merge/229547 Your team elementary Developer Community is subscribed to branch lp:~elementary-dev-community/granite/fix-1324424. -- Mailing list: https://launchpad.net/~elementary-dev-community Post to : elementary-dev-community@lists.launchpad.net Unsubscribe : https://launchpad.net/~elementary-dev-community More help : https://help.launchpad.net/ListHelp
[Elementary-dev-community] [Merge] lp:~elementary-dev-community/pantheon-terminal/fix-1329550 into lp:pantheon-terminal
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 +
+++ data/pantheon-terminal.desktop 2014-08-05 20:03:13 +
@@ -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 +
+++ src/PantheonTerminal.vala 2014-08-05 20:03:13 +
@@ -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) {
--
Mailing list: https://launchpad.net/~elementary-dev-community
Post to : elementary-dev-community@lists.launchpad.net
Unsubscribe : https://launchpad.net/~elementary-dev-community
More help : https://help.launchpad.net/ListHelp
Re: [Elementary-dev-community] [Merge] lp:~elementary-dev-community/pantheon-terminal/fix-1329550 into lp:pantheon-terminal
Review: Needs Fixing 1. Instead of 43 stdout.printf (pantheon-terminal: ERROR: + e.message + \n); 44 45 return 0; use error (e.message); 2. Not sure about the relevant part in the code, but the dark GTK+ theme isn't active when you start the About-Dialog from the quicklist and no terminal-instance is already running. In this case the about-window uses the normal GTK+ theme (so, a white window in elementary). -- 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. -- Mailing list: https://launchpad.net/~elementary-dev-community Post to : elementary-dev-community@lists.launchpad.net Unsubscribe : https://launchpad.net/~elementary-dev-community More help : https://help.launchpad.net/ListHelp
Re: [Elementary-dev-community] [Merge] lp:~elementary-dev-community/pantheon-terminal/fix-1329550 into lp:pantheon-terminal
1) is not my code, but I can definitely include that change. 2) This may be a granite deficiency, as the about option here works by relying on the Granite.Application's behavior when running with the --about option. I think that when Granite creates the about dialog when the app is already running, the Gtk setting has already been set (in PantheonTerminalWindow.vala), but when it creates the dialog without a running app, no such setting has been made, and it comes up light. I tried setting the dark theme before running the main app, but it did not work. I got this error message: [_LOG_LEVEL_FATAL 16:24:08.038999] [GLib-GObject] g_object_set: assertion 'G_IS_OBJECT (object)' failed [_LOG_LEVEL_FATAL 16:24:08.039074] PantheonTerminal will not function properly. Perhaps a dark_theme value in Granite.Application is necessary? Or am I doing something wrong? I will try to investigate a little later. -- 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. -- Mailing list: https://launchpad.net/~elementary-dev-community Post to : elementary-dev-community@lists.launchpad.net Unsubscribe : https://launchpad.net/~elementary-dev-community More help : https://help.launchpad.net/ListHelp
