Merge lp:~daker/dexter-rolodex/fix.685195 into lp:dexter-rolodex

Proposed by Adnane Belmadiaf
Status: Merged
Merged at revision: 223
Proposed branch: lp:~daker/dexter-rolodex/fix.685195
Merge into: lp:dexter-rolodex
Diff against target: 87 lines (+42/-27)
1 file modified
data/ui/DexterWindow.ui (+42/-27)
To merge this branch: bzr merge lp:~daker/dexter-rolodex/fix.685195
Reviewer Review Type Date Requested Status
Postler Devs Pending
Review via email: mp+42837@code.launchpad.net
To post a comment you must log in.
lp:~daker/dexter-rolodex/fix.685195 updated
224. By Adnane Belmadiaf

* Minor update

225. By Adnane Belmadiaf

* Fixed bug 685060

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/ui/DexterWindow.ui'
2--- data/ui/DexterWindow.ui 2010-12-03 09:04:46 +0000
3+++ data/ui/DexterWindow.ui 2010-12-06 14:54:20 +0000
4@@ -368,33 +368,49 @@
5 <property name="label_xalign">0</property>
6 <property name="label_yalign">0</property>
7 <child>
8- <object class="GtkHBox" id="hbox2">
9+ <object class="GtkScrolledWindow" id="scrolledwindow2">
10 <property name="visible">True</property>
11- <child>
12- <object class="GtkVBox" id="header_column">
13- <property name="visible">True</property>
14- <child>
15- <placeholder/>
16- </child>
17- </object>
18- <packing>
19- <property name="expand">False</property>
20- <property name="padding">5</property>
21- <property name="position">0</property>
22- </packing>
23- </child>
24- <child>
25- <object class="GtkVBox" id="data_column">
26- <property name="visible">True</property>
27- <child>
28- <placeholder/>
29- </child>
30- </object>
31- <packing>
32- <property name="expand">False</property>
33- <property name="padding">5</property>
34- <property name="position">1</property>
35- </packing>
36+ <property name="can_focus">True</property>
37+ <property name="hscrollbar_policy">automatic</property>
38+ <property name="vscrollbar_policy">automatic</property>
39+ <child>
40+ <object class="GtkViewport" id="viewport1">
41+ <property name="visible">True</property>
42+ <property name="resize_mode">queue</property>
43+ <property name="shadow_type">none</property>
44+ <child>
45+ <object class="GtkHBox" id="hbox2">
46+ <property name="visible">True</property>
47+ <property name="homogeneous">True</property>
48+ <child>
49+ <object class="GtkVBox" id="header_column">
50+ <property name="visible">True</property>
51+ <child>
52+ <placeholder/>
53+ </child>
54+ </object>
55+ <packing>
56+ <property name="expand">False</property>
57+ <property name="padding">5</property>
58+ <property name="position">0</property>
59+ </packing>
60+ </child>
61+ <child>
62+ <object class="GtkVBox" id="data_column">
63+ <property name="visible">True</property>
64+ <child>
65+ <placeholder/>
66+ </child>
67+ </object>
68+ <packing>
69+ <property name="expand">False</property>
70+ <property name="padding">5</property>
71+ <property name="position">1</property>
72+ </packing>
73+ </child>
74+ </object>
75+ </child>
76+ </object>
77 </child>
78 </object>
79 </child>
80@@ -673,7 +689,6 @@
81 </child>
82 <child>
83 <object class="GtkLabel" id="label6">
84- <property name="width_request">135</property>
85 <property name="visible">True</property>
86 <property name="sensitive">False</property>
87 <property name="xalign">0</property>

Subscribers

People subscribed via source and target branches