Photos

Merge lp:~mathias-porten/pantheon-photos/fix-1467148 into lp:~pantheon-photos/pantheon-photos/trunk

  1. fix-1467148
  2. Merge into trunk
Proposed by mporten
Status: Rejected
Rejected by: Danielle Foré
Proposed branch: lp:~mathias-porten/pantheon-photos/fix-1467148
Merge into: lp:~pantheon-photos/pantheon-photos/trunk
Diff against target: 201 lines (+63/-95)
1 file modified
ui/shotwell.glade (+63/-95)
To merge this branch: bzr merge lp:~mathias-porten/pantheon-photos/fix-1467148
Reviewer Review Type Date Requested Status
Danielle Foré Disapprove
Review via email: mp+268304@code.launchpad.net

Description of the change

Changed section headers in Preferences dialog from bold to <h4>

To post a comment you must log in.
Revision history for this message
Danielle Foré (danrabbit) wrote :

The code you edited seems to be vestigial. Removed it and pushed a branch that edits the right section here: https://code.launchpad.net/~elementary-apps/pantheon-photos/h4-headers

review: Disapprove

Unmerged revisions

2808. By mporten

changed bold sections to <h4>

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ui/shotwell.glade'
2--- ui/shotwell.glade 2014-11-08 13:37:25 +0000
3+++ ui/shotwell.glade 2015-08-18 09:20:23 +0000
4@@ -578,28 +578,6 @@
5 </packing>
6 </child>
7 <child>
8- <object class="GtkAlignment" id="alignment4">
9- <property name="visible">True</property>
10- <property name="can_focus">False</property>
11- <property name="top_padding">3</property>
12- <property name="bottom_padding">3</property>
13- <child>
14- <object class="GtkLabel" id="library location">
15- <property name="visible">True</property>
16- <property name="can_focus">False</property>
17- <property name="xalign">0</property>
18- <property name="label" translatable="yes">Library Location</property>
19- <attributes>
20- <attribute name="weight" value="bold"/>
21- </attributes>
22- </object>
23- </child>
24- </object>
25- <packing>
26- <property name="right_attach">2</property>
27- </packing>
28- </child>
29- <child>
30 <object class="GtkAlignment" id="alignment8">
31 <property name="visible">True</property>
32 <property name="can_focus">False</property>
33@@ -626,30 +604,6 @@
34 </packing>
35 </child>
36 <child>
37- <object class="GtkAlignment" id="label: metadata">
38- <property name="visible">True</property>
39- <property name="can_focus">False</property>
40- <property name="top_padding">14</property>
41- <property name="bottom_padding">3</property>
42- <child>
43- <object class="GtkLabel" id="label10">
44- <property name="visible">True</property>
45- <property name="can_focus">False</property>
46- <property name="xalign">0</property>
47- <property name="label" translatable="yes">Metadata</property>
48- <attributes>
49- <attribute name="weight" value="bold"/>
50- </attributes>
51- </object>
52- </child>
53- </object>
54- <packing>
55- <property name="right_attach">2</property>
56- <property name="top_attach">8</property>
57- <property name="bottom_attach">9</property>
58- </packing>
59- </child>
60- <child>
61 <object class="GtkAlignment" id="label: metadate write">
62 <property name="visible">True</property>
63 <property name="can_focus">False</property>
64@@ -698,30 +652,6 @@
65 </packing>
66 </child>
67 <child>
68- <object class="GtkAlignment" id="label: importing">
69- <property name="visible">True</property>
70- <property name="can_focus">False</property>
71- <property name="top_padding">14</property>
72- <property name="bottom_padding">3</property>
73- <child>
74- <object class="GtkLabel" id="importing">
75- <property name="visible">True</property>
76- <property name="can_focus">False</property>
77- <property name="xalign">0</property>
78- <property name="label" translatable="yes">Importing</property>
79- <attributes>
80- <attribute name="weight" value="bold"/>
81- </attributes>
82- </object>
83- </child>
84- </object>
85- <packing>
86- <property name="right_attach">2</property>
87- <property name="top_attach">3</property>
88- <property name="bottom_attach">4</property>
89- </packing>
90- </child>
91- <child>
92 <object class="GtkAlignment" id="label: directory structure">
93 <property name="visible">True</property>
94 <property name="can_focus">False</property>
95@@ -891,30 +821,6 @@
96 </packing>
97 </child>
98 <child>
99- <object class="GtkAlignment" id="label: developer">
100- <property name="visible">True</property>
101- <property name="can_focus">False</property>
102- <property name="top_padding">14</property>
103- <property name="bottom_padding">3</property>
104- <child>
105- <object class="GtkLabel" id="label3">
106- <property name="visible">True</property>
107- <property name="can_focus">False</property>
108- <property name="xalign">0</property>
109- <property name="label" translatable="yes">RAW Developer</property>
110- <attributes>
111- <attribute name="weight" value="bold"/>
112- </attributes>
113- </object>
114- </child>
115- </object>
116- <packing>
117- <property name="right_attach">2</property>
118- <property name="top_attach">10</property>
119- <property name="bottom_attach">11</property>
120- </packing>
121- </child>
122- <child>
123 <object class="GtkComboBoxText" id="default_raw_developer2">
124 <property name="visible">True</property>
125 <property name="can_focus">False</property>
126@@ -948,6 +854,68 @@
127 <property name="bottom_attach">12</property>
128 </packing>
129 </child>
130+ <child>
131+ <object class="GtkLabel" id="library location">
132+ <property name="visible">True</property>
133+ <property name="can_focus">False</property>
134+ <property name="xalign">0</property>
135+ <property name="label" translatable="yes">Library Location</property>
136+ <style>
137+ <class name="h4"/>
138+ </style>
139+ </object>
140+ <packing>
141+ <property name="right_attach">2</property>
142+ </packing>
143+ </child>
144+ <child>
145+ <object class="GtkLabel" id="importing">
146+ <property name="visible">True</property>
147+ <property name="can_focus">False</property>
148+ <property name="xalign">0</property>
149+ <property name="label" translatable="yes">Importing</property>
150+ <style>
151+ <class name="h4"/>
152+ </style>
153+ </object>
154+ <packing>
155+ <property name="right_attach">2</property>
156+ <property name="top_attach">3</property>
157+ <property name="bottom_attach">4</property>
158+ </packing>
159+ </child>
160+ <child>
161+ <object class="GtkLabel" id="label10">
162+ <property name="visible">True</property>
163+ <property name="can_focus">False</property>
164+ <property name="xalign">0</property>
165+ <property name="label" translatable="yes">Metadata</property>
166+ <style>
167+ <class name="h4"/>
168+ </style>
169+ </object>
170+ <packing>
171+ <property name="right_attach">2</property>
172+ <property name="top_attach">8</property>
173+ <property name="bottom_attach">9</property>
174+ </packing>
175+ </child>
176+ <child>
177+ <object class="GtkLabel" id="label3">
178+ <property name="visible">True</property>
179+ <property name="can_focus">False</property>
180+ <property name="xalign">0</property>
181+ <property name="label" translatable="yes">RAW Developer</property>
182+ <style>
183+ <class name="h4"/>
184+ </style>
185+ </object>
186+ <packing>
187+ <property name="right_attach">2</property>
188+ <property name="top_attach">10</property>
189+ <property name="bottom_attach">11</property>
190+ </packing>
191+ </child>
192 </object>
193 </child>
194 </object>
195@@ -1934,4 +1902,4 @@
196 </packing>
197 </child>
198 </object>
199-</interface>
200\ No newline at end of file
201+</interface>

Subscribers

People subscribed via source and target branches

to all changes: