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

Proposed by Cody Garver on 2011-08-14
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 2011-08-14 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
1=== modified file 'src/Resources.vala'
2--- src/Resources.vala 2011-06-20 11:05:25 +0000
3+++ src/Resources.vala 2011-08-14 03:13:25 +0000
4@@ -17,22 +17,21 @@
5 null
6 };
7
8- public const string ICON_ABOUT_LOGO = "";
9+ public const string ICON_ABOUT_LOGO = "terminal";
10
11 public const string LICENSE = """
12-Strip is free software; you can redistribute it and/or modify it under the
13+Pantheon Terminal is free software; you can redistribute it and/or modify it under the
14 terms of the GNU Lesser General Public License as published by the Free
15 Software Foundation; either version 3 of the License, or (at your option)
16 any later version.
17
18-Marlin is distributed in the hope that it will be useful, but WITHOUT
19+Pantheon Terminal is distributed in the hope that it will be useful, but WITHOUT
20 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
21 FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
22 more details.
23
24 You should have received a copy of the GNU Lesser General Public License
25-along with Marlin; if not, write to the Free Software Foundation, Inc.,
26+along with Pantheon Terminal; if not, write to the Free Software Foundation, Inc.,
27 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
28 """;
29-
30 }
31
32=== modified file 'src/main.vala'
33--- src/main.vala 2011-08-01 09:41:16 +0000
34+++ src/main.vala 2011-08-14 03:13:25 +0000
35@@ -59,9 +59,9 @@
36
37 //~ Notify.Notification notification;
38
39- // Control and Shift keys
40- bool ctrlL = false;
41- bool ctrlR = false;
42+ // Control and Shift keys
43+ bool ctrlL = false;
44+ bool ctrlR = false;
45 bool shiftL = false;
46 bool shiftR = false;
47 bool arrow = false;
48@@ -74,9 +74,10 @@
49 stdout.printf("%s\n", arg);
50
51 //~ Gtk.Settings.get_default().gtk_application_prefer_dark_theme = true;
52- set_title("Terminal");
53+ title = "Terminal";
54 default_width = 640;
55 default_height = 400;
56+ icon_name = "terminal";
57 destroy.connect(close);
58
59 // Check if the window have the focus
60@@ -100,11 +101,6 @@
61 add_button.set_tooltip_text("Open a new tab");
62 add_button.clicked.connect(() => { new_tab(false); } );
63 right_box.pack_start(add_button, false, false, 0);
64-
65- // Try to set the icon FIXME
66- Pixbuf icon = new Pixbuf(Colorspace.RGB, true, 8, 1, 1);
67- try { IconTheme.get_default().load_icon("terminal", 16, IconLookupFlags.FORCE_SVG); } catch (Error er) {}
68- set_icon(icon);
69
70 // Set the theme
71 set_theme();
72@@ -303,6 +299,13 @@
73
74 public void about()
75 {
76+ Gdk.Pixbuf logo = null;
77+ try {
78+ logo = IconTheme.get_default ().load_icon ("terminal", 64, 0);
79+ } catch (Error err) {
80+ stderr.printf ("Unable to load terminal icon: %s", err.message);
81+ }
82+
83 show_about_dialog(this,
84 "program-name", Resources.APP_TITLE,
85 "version", Resources.VERSION,
86@@ -313,7 +316,7 @@
87 "website-label", Resources.WEBSITE_LABEL,
88 "authors", Resources.AUTHORS,
89 "artists", Resources.ARTISTS,
90-//~ "logo", new Pixbuf.from_file(Resources.ICON_ABOUT_LOGO),
91+ "logo", logo,
92 //~ "translator-credits", _("translator-credits"), // FIXME
93 null);
94 }

Subscribers

People subscribed via source and target branches