Landscape Client

Merge lp:~tealeg/landscape-client/stop-truncating-explanatory-text into lp:~landscape/landscape-client/trunk

  1. stop-truncating-explanatory-text
  2. Merge into trunk
Proposed by Geoff Teale
Status: Merged
Approved by: Geoff Teale
Approved revision: 790
Merged at revision: 791
Proposed branch: lp:~tealeg/landscape-client/stop-truncating-explanatory-text
Merge into: lp:~landscape/landscape-client/trunk
Diff against target: 171 lines (+3/-31)
1 file modified
landscape/ui/view/ui/landscape-client-settings.glade (+3/-31)
To merge this branch: bzr merge lp:~tealeg/landscape-client/stop-truncating-explanatory-text
Reviewer Review Type Date Requested Status
Björn Tillenius (community) Approve
Benji York (community) Approve
Review via email: mp+237746@code.launchpad.net

Commit message

Modify the Glade XML so that the landscape-client-ui doesn't truncate
the warning message when "None" is selected on the dropdown.

Description of the change

Modify the Glade XML so that the landscape-client-ui doesn't truncate
the warning message when "None" is selected on the dropdown.

To post a comment you must log in.
Revision history for this message
Benji York (benji) wrote :

The code looks fine, but I can't figure out how to actually see the UI itself. I'd usually list the things I've tried, but I've tried so many things that listing them is probably counter-productive.

How do I test the UI?

Thanks.

review: Needs Information
Revision history for this message
Geoff Teale (tealeg) wrote :

Hi Benji,

There are two ways. Either build the landscape-client debian packages and install landscape-client-setting-ui, or install the current version and simply overwrite the glade file that's installed with the new glade file.

Top tip, that file lives here:

/usr/lib/python2.7/dist-packages/landscape/ui/view/ui/landscape-client-settings.glade

Once you've done either of the above, just go to your system settings panel and hit that landscape icon!

Revision history for this message
Benji York (benji) wrote :

Thanks for the info. I never could get the package to build. I suspect it takes more than just "make package", but I swapped the glade file in and it looked good.

Thanks for the fix.

review: Approve
Revision history for this message
Björn Tillenius (bjornt) wrote :

+1. I didn't test it, but I trust that both you and Benji tested it.

review: Approve
Revision history for this message
Geoff Teale (tealeg) wrote :

Cheers Björn. I did indeed test it, and it seems that Benji did too.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'landscape/ui/view/ui/landscape-client-settings.glade'
2--- landscape/ui/view/ui/landscape-client-settings.glade 2012-08-27 15:35:05 +0000
3+++ landscape/ui/view/ui/landscape-client-settings.glade 2014-10-09 09:53:23 +0000
4@@ -1,6 +1,7 @@
5 <?xml version="1.0" encoding="UTF-8"?>
6+<!-- Generated with glade 3.18.3 -->
7 <interface>
8- <!-- interface-requires gtk+ 3.0 -->
9+ <requires lib="gtk+" version="3.0"/>
10 <object class="GtkDialog" id="dialog1">
11 <property name="can_focus">False</property>
12 <property name="border_width">5</property>
13@@ -21,7 +22,6 @@
14 <property name="visible">True</property>
15 <property name="can_focus">True</property>
16 <property name="receives_default">True</property>
17- <property name="use_action_appearance">False</property>
18 <property name="use_stock">True</property>
19 </object>
20 <packing>
21@@ -37,7 +37,6 @@
22 <property name="visible">True</property>
23 <property name="can_focus">True</property>
24 <property name="receives_default">True</property>
25- <property name="use_action_appearance">False</property>
26 <property name="use_stock">True</property>
27 </object>
28 <packing>
29@@ -53,7 +52,6 @@
30 <property name="visible">True</property>
31 <property name="can_focus">True</property>
32 <property name="receives_default">True</property>
33- <property name="use_action_appearance">False</property>
34 <property name="use_stock">True</property>
35 </object>
36 <packing>
37@@ -123,7 +121,6 @@
38 <property name="halign">start</property>
39 <property name="valign">start</property>
40 <property name="margin_left">6</property>
41- <property name="use_action_appearance">False</property>
42 <property name="relief">none</property>
43 <property name="uri">https://landscape.canonical.com</property>
44 </object>
45@@ -231,8 +228,6 @@
46 <packing>
47 <property name="left_attach">0</property>
48 <property name="top_attach">0</property>
49- <property name="width">1</property>
50- <property name="height">1</property>
51 </packing>
52 </child>
53 <child>
54@@ -246,8 +241,6 @@
55 <packing>
56 <property name="left_attach">0</property>
57 <property name="top_attach">1</property>
58- <property name="width">1</property>
59- <property name="height">1</property>
60 </packing>
61 </child>
62 <child>
63@@ -260,8 +253,6 @@
64 <packing>
65 <property name="left_attach">0</property>
66 <property name="top_attach">2</property>
67- <property name="width">1</property>
68- <property name="height">1</property>
69 </packing>
70 </child>
71 <child>
72@@ -274,8 +265,6 @@
73 <packing>
74 <property name="left_attach">1</property>
75 <property name="top_attach">0</property>
76- <property name="width">1</property>
77- <property name="height">1</property>
78 </packing>
79 </child>
80 <child>
81@@ -289,8 +278,6 @@
82 <packing>
83 <property name="left_attach">1</property>
84 <property name="top_attach">1</property>
85- <property name="width">1</property>
86- <property name="height">1</property>
87 </packing>
88 </child>
89 <child>
90@@ -301,7 +288,6 @@
91 <property name="can_focus">False</property>
92 <property name="receives_default">True</property>
93 <property name="has_tooltip">True</property>
94- <property name="use_action_appearance">False</property>
95 <property name="relief">none</property>
96 <property name="xalign">0</property>
97 <property name="uri">https://landscape.canonical.com</property>
98@@ -309,8 +295,6 @@
99 <packing>
100 <property name="left_attach">1</property>
101 <property name="top_attach">2</property>
102- <property name="width">1</property>
103- <property name="height">1</property>
104 </packing>
105 </child>
106 </object>
107@@ -351,8 +335,6 @@
108 <packing>
109 <property name="left_attach">0</property>
110 <property name="top_attach">1</property>
111- <property name="width">1</property>
112- <property name="height">1</property>
113 </packing>
114 </child>
115 <child>
116@@ -365,8 +347,6 @@
117 <packing>
118 <property name="left_attach">0</property>
119 <property name="top_attach">0</property>
120- <property name="width">1</property>
121- <property name="height">1</property>
122 </packing>
123 </child>
124 <child>
125@@ -376,14 +356,11 @@
126 <property name="hexpand">True</property>
127 <property name="visibility">False</property>
128 <property name="invisible_char">•</property>
129- <property name="invisible_char_set">True</property>
130 <property name="progress_pulse_step">0.25999999046325684</property>
131 </object>
132 <packing>
133 <property name="left_attach">1</property>
134 <property name="top_attach">1</property>
135- <property name="width">1</property>
136- <property name="height">1</property>
137 </packing>
138 </child>
139 <child>
140@@ -395,8 +372,6 @@
141 <packing>
142 <property name="left_attach">1</property>
143 <property name="top_attach">0</property>
144- <property name="width">1</property>
145- <property name="height">1</property>
146 </packing>
147 </child>
148 </object>
149@@ -435,12 +410,11 @@
150 <property name="label" translatable="yes">If you click "Disable" the Landscape client on this machine will be disabled. You can reenable it later by revisiting this dialog.</property>
151 <property name="wrap">True</property>
152 <property name="ellipsize">end</property>
153+ <property name="lines">12</property>
154 </object>
155 <packing>
156 <property name="left_attach">1</property>
157 <property name="top_attach">0</property>
158- <property name="width">1</property>
159- <property name="height">1</property>
160 </packing>
161 </child>
162 <child>
163@@ -452,8 +426,6 @@
164 <packing>
165 <property name="left_attach">0</property>
166 <property name="top_attach">0</property>
167- <property name="width">1</property>
168- <property name="height">1</property>
169 </packing>
170 </child>
171 </object>

Subscribers

People subscribed via source and target branches

to all changes: