Photos

Merge lp:~fabiozaramella/pantheon-photos/fix-1357862 into lp:~pantheon-photos/pantheon-photos/trunk

  1. fix-1357862
  2. Merge into trunk
Proposed by Fabio Zaramella
Status: Merged
Merged at revision: 2582
Proposed branch: lp:~fabiozaramella/pantheon-photos/fix-1357862
Merge into: lp:~pantheon-photos/pantheon-photos/trunk
Diff against target: 211 lines (+10/-137)
4 files modified
src/Dialogs.vala (+1/-3)
src/Resources.vala (+6/-16)
src/plugins/ManifestWidget.vala (+2/-3)
ui/shotwell.glade (+1/-115)
To merge this branch: bzr merge lp:~fabiozaramella/pantheon-photos/fix-1357862
Reviewer Review Type Date Requested Status
Cody Garver (community) Approve
Review via email: mp+231216@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Cody Garver (codygarver) wrote :

ui/shotwell.glade: remove lines 1743-1857, I think that's all of preferences_external

review: Needs Fixing
lp:~fabiozaramella/pantheon-photos/fix-1357862 updated
2582. By Fabio Zaramella

code from shotwell.glade removed

Revision history for this message
Cody Garver (codygarver) wrote :

I merged a slightly altered version of this

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/Dialogs.vala'
2--- src/Dialogs.vala 2014-08-14 02:01:42 +0000
3+++ src/Dialogs.vala 2014-08-19 08:54:04 +0000
4@@ -2235,14 +2235,12 @@
5 Gtk.Stack container = new Gtk.Stack ();
6 container.expand = true;
7 container.add_titled (builder.get_object ("preferences_library") as Gtk.Box, "library", _ ("Library"));
8- container.add_titled (builder.get_object ("preferences_external") as Gtk.Box, "external", _ ("External"));
9 container.add_titled (builder.get_object ("preferences_plugins") as Gtk.Box, "plugins", _ ("Plugins"));
10
11 Gtk.StackSwitcher switcher = new Gtk.StackSwitcher ();
12 switcher.stack = container;
13 switcher.expand = true;
14 switcher.halign = Gtk.Align.CENTER;
15- switcher.margin_top = 6;
16 switcher.margin_bottom = 6;
17
18 // Add the switcher, stack container and button container to the window
19@@ -2621,4 +2619,4 @@
20 progress.close ();
21
22 AppWindow.get_instance ().set_normal_cursor ();
23-}
24+}
25\ No newline at end of file
26
27=== modified file 'src/Resources.vala'
28--- src/Resources.vala 2014-08-10 22:31:33 +0000
29+++ src/Resources.vala 2014-08-19 08:54:04 +0000
30@@ -52,21 +52,11 @@
31 null
32 };
33
34-public const string LICENSE = """
35- Shotwell is free software; you can redistribute it and/or modify it under the
36- terms of the GNU Lesser General Public License as published by the Free
37- Software Foundation; either version 2.1 of the License, or (at your option)
38- any later version.
39-
40- Shotwell is distributed in the hope that it will be useful, but WITHOUT
41- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
42- FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
43- more details.
44-
45- You should have received a copy of the GNU Lesser General Public License
46- along with Shotwell; if not, write to the Free Software Foundation, Inc.,
47- 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
48- """;
49+public const string LICENSE = """Shotwell is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version.
50+
51+Shotwell is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
52+
53+You should have received a copy of the GNU Lesser General Public License along with Shotwell; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.""";
54
55 public const string CLOCKWISE = "object-rotate-right";
56 public const string COUNTERCLOCKWISE = "object-rotate-left";
57@@ -1132,4 +1122,4 @@
58
59 public const string ONIMAGE_FONT_COLOR = "#000000";
60 public const string ONIMAGE_FONT_BACKGROUND = "rgba(255,255,255,0.5)";
61-}
62+}
63\ No newline at end of file
64
65=== modified file 'src/plugins/ManifestWidget.vala'
66--- src/plugins/ManifestWidget.vala 2014-08-08 21:13:09 +0000
67+++ src/plugins/ManifestWidget.vala 2014-08-19 08:54:04 +0000
68@@ -79,7 +79,7 @@
69 about_dialog.license = info.license;
70 about_dialog.wrap_license = info.is_license_wordwrapped;
71 about_dialog.logo = (info.icons != null && info.icons.length > 0) ? info.icons[0] :
72- Resources.get_icon (Resources.ICON_GENERIC_PLUGIN);
73+ Resources.get_icon (Resources.ICON_GENERIC_PLUGIN);
74 about_dialog.program_name = get_pluggable_name (id);
75 about_dialog.translator_credits = info.translators;
76 about_dialog.version = info.version;
77@@ -278,5 +278,4 @@
78 }
79 }
80
81-}
82-
83+}
84\ No newline at end of file
85
86=== modified file 'ui/shotwell.glade'
87--- ui/shotwell.glade 2014-05-27 16:07:34 +0000
88+++ ui/shotwell.glade 2014-08-19 08:54:04 +0000
89@@ -1740,121 +1740,7 @@
90 </packing>
91 </child>
92 </object>
93- <object class="GtkBox" id="preferences_external">
94- <property name="visible">True</property>
95- <property name="can_focus">False</property>
96- <property name="orientation">vertical</property>
97- <child>
98- <object class="GtkAlignment" id="alignment11">
99- <property name="visible">True</property>
100- <property name="can_focus">False</property>
101- <property name="border_width">6</property>
102- <property name="xalign">0</property>
103- <property name="yalign">0</property>
104- <property name="yscale">0</property>
105- <child>
106- <object class="GtkBox" id="hbox6">
107- <property name="visible">True</property>
108- <property name="can_focus">False</property>
109- <child>
110- <object class="GtkAlignment" id="labels: external editors1">
111- <property name="visible">True</property>
112- <property name="can_focus">False</property>
113- <property name="left_padding">6</property>
114- <child>
115- <object class="GtkBox" id="vbox1">
116- <property name="visible">True</property>
117- <property name="can_focus">False</property>
118- <property name="orientation">vertical</property>
119- <property name="spacing">6</property>
120- <child>
121- <object class="GtkLabel" id="label18">
122- <property name="visible">True</property>
123- <property name="can_focus">False</property>
124- <property name="halign">end</property>
125- <property name="xalign">0</property>
126- <property name="xpad">4</property>
127- <property name="label" translatable="yes">E_xternal photo editor:</property>
128- <property name="use_underline">True</property>
129- <property name="mnemonic_widget">external_photo_editor_combo2</property>
130- </object>
131- <packing>
132- <property name="expand">True</property>
133- <property name="fill">True</property>
134- <property name="position">0</property>
135- </packing>
136- </child>
137- <child>
138- <object class="GtkLabel" id="label19">
139- <property name="visible">True</property>
140- <property name="can_focus">False</property>
141- <property name="halign">end</property>
142- <property name="xalign">0</property>
143- <property name="xpad">4</property>
144- <property name="label" translatable="yes">External _RAW editor:</property>
145- <property name="use_underline">True</property>
146- <property name="mnemonic_widget">external_raw_editor_combo2</property>
147- </object>
148- <packing>
149- <property name="expand">True</property>
150- <property name="fill">True</property>
151- <property name="position">1</property>
152- </packing>
153- </child>
154- </object>
155- </child>
156- </object>
157- <packing>
158- <property name="expand">True</property>
159- <property name="fill">True</property>
160- <property name="position">0</property>
161- </packing>
162- </child>
163- <child>
164- <object class="GtkBox" id="vbox4">
165- <property name="visible">True</property>
166- <property name="can_focus">False</property>
167- <property name="orientation">vertical</property>
168- <property name="spacing">6</property>
169- <child>
170- <object class="GtkComboBox" id="external_photo_editor_combo">
171- <property name="visible">True</property>
172- <property name="can_focus">False</property>
173- </object>
174- <packing>
175- <property name="expand">True</property>
176- <property name="fill">True</property>
177- <property name="position">0</property>
178- </packing>
179- </child>
180- <child>
181- <object class="GtkComboBox" id="external_raw_editor_combo">
182- <property name="visible">True</property>
183- <property name="can_focus">False</property>
184- </object>
185- <packing>
186- <property name="expand">True</property>
187- <property name="fill">True</property>
188- <property name="position">1</property>
189- </packing>
190- </child>
191- </object>
192- <packing>
193- <property name="expand">True</property>
194- <property name="fill">True</property>
195- <property name="position">1</property>
196- </packing>
197- </child>
198- </object>
199- </child>
200- </object>
201- <packing>
202- <property name="expand">False</property>
203- <property name="fill">True</property>
204- <property name="position">0</property>
205- </packing>
206- </child>
207- </object>
208+
209 <object class="GtkBox" id="preferences_plugins">
210 <property name="visible">True</property>
211 <property name="can_focus">False</property>

Subscribers

People subscribed via source and target branches