Merge lp:~nataliabidart/ubuntuone-control-panel/support-everywhere into lp:ubuntuone-control-panel

Proposed by Natalia Bidart on 2011-03-04
Status: Merged
Approved by: Natalia Bidart on 2011-03-04
Approved revision: 93
Merged at revision: 93
Proposed branch: lp:~nataliabidart/ubuntuone-control-panel/support-everywhere
Merge into: lp:ubuntuone-control-panel
Prerequisite: lp:~nataliabidart/ubuntuone-control-panel/tweak-overview
Diff against target: 291 lines (+136/-136)
2 files modified
data/dashboard.ui (+0/-136)
data/management.ui (+136/-0)
To merge this branch: bzr merge lp:~nataliabidart/ubuntuone-control-panel/support-everywhere
Reviewer Review Type Date Requested Status
Alejandro J. Cura (community) Approve on 2011-03-04
Eric Casteleijn (community) 2011-03-04 Approve on 2011-03-04
Review via email: mp+52202@code.launchpad.net

Commit message

- A better fix for having the Support button more accessible from every single tab (LP: #706661).

To post a comment you must log in.
Eric Casteleijn (thisfred) wrote :

Looks good, I see all the support channels on each tab

review: Approve
Alejandro J. Cura (alecu) wrote :

Nice!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/dashboard.ui'
2--- data/dashboard.ui 2011-03-02 19:30:37 +0000
3+++ data/dashboard.ui 2011-03-04 14:56:31 +0000
4@@ -170,141 +170,5 @@
5 <property name="position">0</property>
6 </packing>
7 </child>
8- <child>
9- <object class="GtkHBox" id="hbox1">
10- <property name="visible">True</property>
11- <property name="can_focus">False</property>
12- <property name="spacing">20</property>
13- <child>
14- <object class="GtkAlignment" id="alignment3">
15- <property name="visible">True</property>
16- <property name="can_focus">False</property>
17- <property name="yalign">1</property>
18- <property name="yscale">0</property>
19- <child>
20- <object class="GtkHButtonBox" id="hbuttonbox3">
21- <property name="visible">True</property>
22- <property name="can_focus">False</property>
23- <property name="spacing">5</property>
24- <property name="layout_style">start</property>
25- <child>
26- <object class="GtkLinkButton" id="linkbutton2">
27- <property name="label" translatable="yes">Official Support</property>
28- <property name="visible">True</property>
29- <property name="can_focus">True</property>
30- <property name="receives_default">True</property>
31- <property name="use_action_appearance">False</property>
32- <property name="relief">half</property>
33- <property name="uri">https://one.ubuntu.com/support/</property>
34- </object>
35- <packing>
36- <property name="expand">False</property>
37- <property name="fill">False</property>
38- <property name="position">0</property>
39- </packing>
40- </child>
41- <child>
42- <object class="GtkLinkButton" id="linkbutton4">
43- <property name="label" translatable="yes">Community Support</property>
44- <property name="visible">True</property>
45- <property name="can_focus">True</property>
46- <property name="receives_default">True</property>
47- <property name="use_action_appearance">False</property>
48- <property name="relief">half</property>
49- <property name="uri">http://askubuntu.com/questions/tagged/ubuntu-one</property>
50- </object>
51- <packing>
52- <property name="expand">False</property>
53- <property name="fill">False</property>
54- <property name="position">1</property>
55- </packing>
56- </child>
57- </object>
58- </child>
59- </object>
60- <packing>
61- <property name="expand">False</property>
62- <property name="fill">True</property>
63- <property name="position">0</property>
64- </packing>
65- </child>
66- <child>
67- <object class="GtkHBox" id="hbox2">
68- <property name="visible">True</property>
69- <property name="can_focus">False</property>
70- <child>
71- <object class="GtkLabel" id="label4">
72- <property name="visible">True</property>
73- <property name="can_focus">False</property>
74- <property name="label" translatable="yes">Talk to us on:</property>
75- </object>
76- <packing>
77- <property name="expand">True</property>
78- <property name="fill">True</property>
79- <property name="position">0</property>
80- </packing>
81- </child>
82- <child>
83- <object class="GtkLinkButton" id="linkbutton5">
84- <property name="visible">True</property>
85- <property name="can_focus">True</property>
86- <property name="receives_default">True</property>
87- <property name="use_action_appearance">False</property>
88- <property name="relief">none</property>
89- <property name="uri">http://twitter.com/ubuntuone</property>
90- <child>
91- <object class="GtkImage" id="twitter">
92- <property name="visible">True</property>
93- <property name="can_focus">False</property>
94- <property name="tooltip_text" translatable="yes">http://twitter.com/ubuntuone</property>
95- <property name="pixbuf">twitter.png</property>
96- </object>
97- </child>
98- </object>
99- <packing>
100- <property name="expand">False</property>
101- <property name="fill">False</property>
102- <property name="position">1</property>
103- </packing>
104- </child>
105- <child>
106- <object class="GtkLinkButton" id="linkbutton6">
107- <property name="visible">True</property>
108- <property name="can_focus">True</property>
109- <property name="receives_default">True</property>
110- <property name="use_action_appearance">False</property>
111- <property name="relief">none</property>
112- <property name="uri">http://www.facebook.com/ubuntuone</property>
113- <child>
114- <object class="GtkImage" id="facebook">
115- <property name="visible">True</property>
116- <property name="can_focus">False</property>
117- <property name="tooltip_text" translatable="yes">http://www.facebook.com/ubuntuone</property>
118- <property name="pixbuf">facebook.png</property>
119- </object>
120- </child>
121- </object>
122- <packing>
123- <property name="expand">True</property>
124- <property name="fill">True</property>
125- <property name="position">2</property>
126- </packing>
127- </child>
128- </object>
129- <packing>
130- <property name="expand">False</property>
131- <property name="fill">True</property>
132- <property name="pack_type">end</property>
133- <property name="position">1</property>
134- </packing>
135- </child>
136- </object>
137- <packing>
138- <property name="expand">False</property>
139- <property name="fill">True</property>
140- <property name="pack_type">end</property>
141- <property name="position">1</property>
142- </packing>
143- </child>
144 </object>
145 </interface>
146
147=== modified file 'data/management.ui'
148--- data/management.ui 2011-03-04 14:56:31 +0000
149+++ data/management.ui 2011-03-04 14:56:31 +0000
150@@ -196,5 +196,141 @@
151 <property name="position">1</property>
152 </packing>
153 </child>
154+ <child>
155+ <object class="GtkHBox" id="hbox1">
156+ <property name="visible">True</property>
157+ <property name="can_focus">False</property>
158+ <property name="border_width">12</property>
159+ <child>
160+ <object class="GtkAlignment" id="alignment3">
161+ <property name="visible">True</property>
162+ <property name="can_focus">False</property>
163+ <property name="yalign">1</property>
164+ <property name="yscale">0</property>
165+ <child>
166+ <object class="GtkHButtonBox" id="hbuttonbox3">
167+ <property name="visible">True</property>
168+ <property name="can_focus">False</property>
169+ <property name="spacing">5</property>
170+ <property name="layout_style">start</property>
171+ <child>
172+ <object class="GtkLinkButton" id="linkbutton2">
173+ <property name="label" translatable="yes">Official Support</property>
174+ <property name="visible">True</property>
175+ <property name="can_focus">True</property>
176+ <property name="receives_default">True</property>
177+ <property name="use_action_appearance">False</property>
178+ <property name="relief">half</property>
179+ <property name="uri">https://one.ubuntu.com/support/</property>
180+ </object>
181+ <packing>
182+ <property name="expand">False</property>
183+ <property name="fill">False</property>
184+ <property name="position">0</property>
185+ </packing>
186+ </child>
187+ <child>
188+ <object class="GtkLinkButton" id="linkbutton4">
189+ <property name="label" translatable="yes">Community Support</property>
190+ <property name="visible">True</property>
191+ <property name="can_focus">True</property>
192+ <property name="receives_default">True</property>
193+ <property name="use_action_appearance">False</property>
194+ <property name="relief">half</property>
195+ <property name="uri">http://askubuntu.com/questions/tagged/ubuntu-one</property>
196+ </object>
197+ <packing>
198+ <property name="expand">False</property>
199+ <property name="fill">False</property>
200+ <property name="position">1</property>
201+ </packing>
202+ </child>
203+ </object>
204+ </child>
205+ </object>
206+ <packing>
207+ <property name="expand">False</property>
208+ <property name="fill">True</property>
209+ <property name="position">0</property>
210+ </packing>
211+ </child>
212+ <child>
213+ <object class="GtkHBox" id="hbox3">
214+ <property name="visible">True</property>
215+ <property name="can_focus">False</property>
216+ <child>
217+ <object class="GtkLabel" id="label4">
218+ <property name="visible">True</property>
219+ <property name="can_focus">False</property>
220+ <property name="label" translatable="yes">Talk to us on:</property>
221+ </object>
222+ <packing>
223+ <property name="expand">True</property>
224+ <property name="fill">True</property>
225+ <property name="position">0</property>
226+ </packing>
227+ </child>
228+ <child>
229+ <object class="GtkLinkButton" id="linkbutton5">
230+ <property name="visible">True</property>
231+ <property name="can_focus">True</property>
232+ <property name="receives_default">True</property>
233+ <property name="use_action_appearance">False</property>
234+ <property name="relief">none</property>
235+ <property name="uri">http://twitter.com/ubuntuone</property>
236+ <child>
237+ <object class="GtkImage" id="twitter">
238+ <property name="visible">True</property>
239+ <property name="can_focus">False</property>
240+ <property name="tooltip_text" translatable="yes">http://twitter.com/ubuntuone</property>
241+ <property name="pixbuf">twitter.png</property>
242+ </object>
243+ </child>
244+ </object>
245+ <packing>
246+ <property name="expand">False</property>
247+ <property name="fill">False</property>
248+ <property name="position">1</property>
249+ </packing>
250+ </child>
251+ <child>
252+ <object class="GtkLinkButton" id="linkbutton6">
253+ <property name="visible">True</property>
254+ <property name="can_focus">True</property>
255+ <property name="receives_default">True</property>
256+ <property name="use_action_appearance">False</property>
257+ <property name="relief">none</property>
258+ <property name="uri">http://www.facebook.com/ubuntuone</property>
259+ <child>
260+ <object class="GtkImage" id="facebook">
261+ <property name="visible">True</property>
262+ <property name="can_focus">False</property>
263+ <property name="tooltip_text" translatable="yes">http://www.facebook.com/ubuntuone</property>
264+ <property name="pixbuf">facebook.png</property>
265+ </object>
266+ </child>
267+ </object>
268+ <packing>
269+ <property name="expand">True</property>
270+ <property name="fill">True</property>
271+ <property name="position">2</property>
272+ </packing>
273+ </child>
274+ </object>
275+ <packing>
276+ <property name="expand">False</property>
277+ <property name="fill">True</property>
278+ <property name="pack_type">end</property>
279+ <property name="position">1</property>
280+ </packing>
281+ </child>
282+ </object>
283+ <packing>
284+ <property name="expand">False</property>
285+ <property name="fill">True</property>
286+ <property name="pack_type">end</property>
287+ <property name="position">1</property>
288+ </packing>
289+ </child>
290 </object>
291 </interface>

Subscribers

People subscribed via source and target branches