Merge lp:~codygarver/pantheon-terminal/about-dialog-fixes into lp:~kekun-plazas/pantheon-terminal/trunk

Proposed by Cody Garver
Status: Merged
Merged at revision: 24
Proposed branch: lp:~codygarver/pantheon-terminal/about-dialog-fixes
Merge into: lp:~kekun-plazas/pantheon-terminal/trunk
Diff against target: 94 lines (+17/-15)
2 files modified
src/Resources.vala (+4/-5)
src/main.vala (+13/-10)
To merge this branch: bzr merge lp:~codygarver/pantheon-terminal/about-dialog-fixes
Reviewer Review Type Date Requested Status
Adrien Plazas Pending
Review via email: mp+71469@code.launchpad.net

Description of the change

Add icon to About. Fix license typos. Set window icon.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/Resources.vala'
--- src/Resources.vala 2011-06-20 11:05:25 +0000
+++ src/Resources.vala 2011-08-14 03:13:25 +0000
@@ -17,22 +17,21 @@
17 null17 null
18 };18 };
19 19
20 public const string ICON_ABOUT_LOGO = "";20 public const string ICON_ABOUT_LOGO = "terminal";
21 21
22 public const string LICENSE = """22 public const string LICENSE = """
23Strip is free software; you can redistribute it and/or modify it under the 23Pantheon Terminal is free software; you can redistribute it and/or modify it under the
24terms of the GNU Lesser General Public License as published by the Free 24terms of the GNU Lesser General Public License as published by the Free
25Software Foundation; either version 3 of the License, or (at your option) 25Software Foundation; either version 3 of the License, or (at your option)
26any later version.26any later version.
2727
28Marlin is distributed in the hope that it will be useful, but WITHOUT 28Pantheon Terminal is distributed in the hope that it will be useful, but WITHOUT
29ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS29ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
30FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for 30FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
31more details.31more details.
3232
33You should have received a copy of the GNU Lesser General Public License 33You should have received a copy of the GNU Lesser General Public License
34along with Marlin; if not, write to the Free Software Foundation, Inc., 34along with Pantheon Terminal; if not, write to the Free Software Foundation, Inc.,
3551 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA3551 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
36""";36""";
37
38}37}
3938
=== modified file 'src/main.vala'
--- src/main.vala 2011-08-01 09:41:16 +0000
+++ src/main.vala 2011-08-14 03:13:25 +0000
@@ -59,9 +59,9 @@
59 59
60 //~ Notify.Notification notification;60 //~ Notify.Notification notification;
61 61
62 // Control and Shift keys62 // Control and Shift keys
63 bool ctrlL = false;63 bool ctrlL = false;
64 bool ctrlR = false;64 bool ctrlR = false;
65 bool shiftL = false;65 bool shiftL = false;
66 bool shiftR = false;66 bool shiftR = false;
67 bool arrow = false;67 bool arrow = false;
@@ -74,9 +74,10 @@
74 stdout.printf("%s\n", arg);74 stdout.printf("%s\n", arg);
75 75
76//~ Gtk.Settings.get_default().gtk_application_prefer_dark_theme = true;76//~ Gtk.Settings.get_default().gtk_application_prefer_dark_theme = true;
77 set_title("Terminal");77 title = "Terminal";
78 default_width = 640;78 default_width = 640;
79 default_height = 400;79 default_height = 400;
80 icon_name = "terminal";
80 destroy.connect(close);81 destroy.connect(close);
81 82
82 // Check if the window have the focus83 // Check if the window have the focus
@@ -100,11 +101,6 @@
100 add_button.set_tooltip_text("Open a new tab");101 add_button.set_tooltip_text("Open a new tab");
101 add_button.clicked.connect(() => { new_tab(false); } );102 add_button.clicked.connect(() => { new_tab(false); } );
102 right_box.pack_start(add_button, false, false, 0);103 right_box.pack_start(add_button, false, false, 0);
103
104 // Try to set the icon FIXME
105 Pixbuf icon = new Pixbuf(Colorspace.RGB, true, 8, 1, 1);
106 try { IconTheme.get_default().load_icon("terminal", 16, IconLookupFlags.FORCE_SVG); } catch (Error er) {}
107 set_icon(icon);
108 104
109 // Set the theme105 // Set the theme
110 set_theme();106 set_theme();
@@ -303,6 +299,13 @@
303 299
304 public void about()300 public void about()
305 {301 {
302 Gdk.Pixbuf logo = null;
303 try {
304 logo = IconTheme.get_default ().load_icon ("terminal", 64, 0);
305 } catch (Error err) {
306 stderr.printf ("Unable to load terminal icon: %s", err.message);
307 }
308
306 show_about_dialog(this,309 show_about_dialog(this,
307 "program-name", Resources.APP_TITLE,310 "program-name", Resources.APP_TITLE,
308 "version", Resources.VERSION,311 "version", Resources.VERSION,
@@ -313,7 +316,7 @@
313 "website-label", Resources.WEBSITE_LABEL,316 "website-label", Resources.WEBSITE_LABEL,
314 "authors", Resources.AUTHORS,317 "authors", Resources.AUTHORS,
315 "artists", Resources.ARTISTS,318 "artists", Resources.ARTISTS,
316//~ "logo", new Pixbuf.from_file(Resources.ICON_ABOUT_LOGO),319 "logo", logo,
317//~ "translator-credits", _("translator-credits"), // FIXME320//~ "translator-credits", _("translator-credits"), // FIXME
318 null);321 null);
319 }322 }

Subscribers

People subscribed via source and target branches