Skip to content

Commit 99e4dad

Browse files
andy128kandy128k
committed
Reimplement toolbar with regular boxes and buttons
1 parent 4fdcc21 commit 99e4dad

3 files changed

Lines changed: 234 additions & 152 deletions

File tree

‎gtk/gtkbuilder/window_main.ui‎

Lines changed: 147 additions & 116 deletions
Original file line numberDiff line numberDiff line change
@@ -20,179 +20,210 @@
2020
<object class="GtkBox" id="hbox_button_toolbar">
2121
<property name="visible">True</property>
2222
<property name="can_focus">False</property>
23+
<property name="orientation">horizontal</property>
24+
<property name="spacing">10</property>
2325
<child>
24-
<object class="GtkToolbar" id="toolbar_main">
26+
<object class="GtkButton">
2527
<property name="visible">True</property>
2628
<property name="can_focus">False</property>
27-
<property name="toolbar_style">both-horiz</property>
28-
<property name="show_arrow">False</property>
29+
<property name="relief">GTK_RELIEF_NONE</property>
30+
<property name="tooltip-text" translatable="yes">Reload the package information to become informed about new, removed or upgraded software packages.</property>
31+
<property name="use_underline">True</property>
32+
<property name="action-name">win.reload</property>
2933
<child>
30-
<object class="GtkToolButton">
31-
<property name="visible">True</property>
32-
<property name="can_focus">False</property>
33-
<property name="is_important">True</property>
34-
<property name="label" translatable="yes">Reload</property>
35-
<property name="tooltip-text" translatable="yes">Reload the package information to become informed about new, removed or upgraded software packages.</property>
36-
<property name="use_underline">True</property>
37-
<property name="icon_name">view-refresh</property>
38-
<property name="action-name">win.reload</property>
39-
</object>
40-
<packing>
41-
<property name="expand">False</property>
42-
<property name="homogeneous">True</property>
43-
</packing>
44-
</child>
45-
<child>
46-
<object class="GtkToolButton">
34+
<object class="GtkBox">
4735
<property name="visible">True</property>
48-
<property name="can_focus">False</property>
49-
<property name="is_important">True</property>
50-
<property name="label" translatable="yes">Mark All Upgrades</property>
51-
<property name="tooltip-text" translatable="yes">Mark all possible upgrades</property>
52-
<property name="use_underline">True</property>
53-
<property name="icon-name">system-upgrade</property>
54-
<property name="action-name">win.mark-all-upgrades</property>
36+
<property name="spacing">6</property>
37+
<child>
38+
<object class="GtkImage">
39+
<property name="visible">True</property>
40+
<property name="icon_name">view-refresh</property>
41+
</object>
42+
</child>
43+
<child>
44+
<object class="GtkLabel">
45+
<property name="visible">True</property>
46+
<property name="label" translatable="yes">Reload</property>
47+
</object>
48+
</child>
5549
</object>
56-
<packing>
57-
<property name="expand">False</property>
58-
<property name="homogeneous">True</property>
59-
</packing>
6050
</child>
51+
</object>
52+
<packing>
53+
<property name="expand">False</property>
54+
</packing>
55+
</child>
56+
<child>
57+
<object class="GtkButton">
58+
<property name="visible">True</property>
59+
<property name="can_focus">False</property>
60+
<property name="relief">GTK_RELIEF_NONE</property>
61+
<property name="tooltip-text" translatable="yes">Mark all possible upgrades</property>
62+
<property name="use_underline">True</property>
63+
<property name="action-name">win.mark-all-upgrades</property>
6164
<child>
62-
<object class="GtkToolButton">
65+
<object class="GtkBox">
6366
<property name="visible">True</property>
64-
<property name="can_focus">False</property>
65-
<property name="is_important">True</property>
66-
<property name="label" translatable="yes">Apply</property>
67-
<property name="tooltip-text" translatable="yes">Apply all marked changes</property>
68-
<property name="use_underline">True</property>
69-
<property name="icon_name">system-run</property>
70-
<property name="action-name">win.apply</property>
67+
<property name="spacing">6</property>
68+
<child>
69+
<object class="GtkImage">
70+
<property name="visible">True</property>
71+
<property name="icon_name">system-upgrade</property>
72+
</object>
73+
</child>
74+
<child>
75+
<object class="GtkLabel">
76+
<property name="visible">True</property>
77+
<property name="label" translatable="yes">Mark All Upgrades</property>
78+
</object>
79+
</child>
7180
</object>
72-
<packing>
73-
<property name="expand">False</property>
74-
<property name="homogeneous">True</property>
75-
</packing>
7681
</child>
7782
</object>
7883
<packing>
79-
<property name="expand">True</property>
80-
<property name="fill">True</property>
81-
<property name="position">0</property>
84+
<property name="expand">False</property>
8285
</packing>
8386
</child>
84-
<child type="center">
85-
<object class="GtkToolbar" id="toolbar_filter">
87+
<child>
88+
<object class="GtkButton">
8689
<property name="visible">True</property>
8790
<property name="can_focus">False</property>
91+
<property name="hexpand">True</property>
92+
<property name="halign">start</property>
93+
<property name="relief">GTK_RELIEF_NONE</property>
94+
<property name="tooltip-text" translatable="yes">Apply all marked changes</property>
95+
<property name="use_underline">True</property>
96+
<property name="action-name">win.apply</property>
8897
<child>
89-
<object class="GtkToolItem" id="toolitem_fast_search">
98+
<object class="GtkBox">
9099
<property name="visible">True</property>
91-
<property name="can_focus">False</property>
92-
<property name="halign">end</property>
100+
<property name="spacing">6</property>
93101
<child>
94-
<object class="GtkBox" id="vbox_fast_search">
102+
<object class="GtkImage">
95103
<property name="visible">True</property>
96-
<property name="can_focus">False</property>
97-
<property name="orientation">vertical</property>
98-
<child>
99-
<object class="GtkLabel" id="label_fast_search">
100-
<property name="visible">True</property>
101-
<property name="can_focus">False</property>
102-
<property name="label" translatable="yes">Quick filter</property>
103-
<property name="ellipsize">end</property>
104-
<property name="xalign">0</property>
105-
</object>
106-
<packing>
107-
<property name="expand">True</property>
108-
<property name="fill">False</property>
109-
<property name="position">0</property>
110-
</packing>
111-
</child>
112-
<child>
113-
<object class="GtkSearchEntry" id="entry_fast_search">
114-
<property name="width_request">200</property>
115-
<property name="visible">True</property>
116-
<property name="can_focus">True</property>
117-
<property name="invisible_char">●</property>
118-
</object>
119-
<packing>
120-
<property name="expand">False</property>
121-
<property name="fill">False</property>
122-
<property name="position">1</property>
123-
</packing>
124-
</child>
104+
<property name="icon_name">system-run</property>
105+
</object>
106+
</child>
107+
<child>
108+
<object class="GtkLabel">
109+
<property name="visible">True</property>
110+
<property name="label" translatable="yes">Apply</property>
125111
</object>
126112
</child>
127113
</object>
128-
<packing>
129-
<property name="expand">False</property>
130-
<property name="homogeneous">False</property>
131-
</packing>
132114
</child>
133115
</object>
134116
<packing>
135117
<property name="expand">False</property>
136-
<property name="fill">True</property>
137-
<property name="position">3</property>
138118
</packing>
139119
</child>
140120
<child>
141-
<object class="GtkToolbar" id="toolbar_search">
121+
<object class="GtkBox" id="toolbar_filter">
142122
<property name="visible">True</property>
143123
<property name="can_focus">False</property>
144-
<property name="toolbar_style">both-horiz</property>
145-
<property name="show_arrow">False</property>
124+
<property name="orientation">vertical</property>
125+
<property name="spacing">6</property>
126+
<property name="margin-top">6</property>
127+
<property name="margin-bottom">6</property>
146128
<child>
147-
<object class="GtkToolButton" id="button_details">
129+
<object class="GtkLabel" id="label_fast_search">
148130
<property name="visible">True</property>
149131
<property name="can_focus">False</property>
150-
<property name="halign">end</property>
151-
<property name="is_important">True</property>
152-
<property name="label" translatable="yes">Properties</property>
153-
<property name="tooltip-text" translatable="yes">View package properties</property>
154-
<property name="use_underline">True</property>
155-
<property name="icon_name">document-properties</property>
156-
<property name="action-name">win.package-properties</property>
132+
<property name="label" translatable="yes">Quick filter</property>
133+
<property name="ellipsize">end</property>
134+
<property name="xalign">0</property>
157135
</object>
158136
<packing>
159-
<property name="expand">False</property>
160-
<property name="homogeneous">True</property>
137+
<property name="expand">True</property>
138+
<property name="fill">False</property>
139+
<property name="position">0</property>
161140
</packing>
162141
</child>
163142
<child>
164-
<object class="GtkToolButton">
143+
<object class="GtkSearchEntry" id="entry_fast_search">
144+
<property name="width_request">200</property>
165145
<property name="visible">True</property>
166-
<property name="can_focus">False</property>
167-
<property name="halign">end</property>
168-
<property name="is_important">True</property>
169-
<property name="label" translatable="yes">Search</property>
170-
<property name="tooltip-text" translatable="yes">Search for packages</property>
171-
<property name="use_underline">True</property>
172-
<property name="icon_name">edit-find</property>
173-
<property name="action-name">win.search</property>
146+
<property name="can_focus">True</property>
147+
<property name="invisible_char">●</property>
174148
</object>
175149
<packing>
176150
<property name="expand">False</property>
177-
<property name="homogeneous">True</property>
151+
<property name="fill">False</property>
152+
<property name="position">1</property>
178153
</packing>
179154
</child>
180155
</object>
181156
<packing>
182157
<property name="expand">False</property>
183158
<property name="fill">False</property>
184-
<property name="pack_type">end</property>
185-
<property name="position">1</property>
186159
</packing>
187160
</child>
188-
<style>
189-
<class name="primary-toolbar"/>
190-
</style>
161+
<child>
162+
<object class="GtkButton" id="button_details">
163+
<property name="visible">True</property>
164+
<property name="can_focus">False</property>
165+
<property name="relief">GTK_RELIEF_NONE</property>
166+
<property name="tooltip-text" translatable="yes">View package properties</property>
167+
<property name="use_underline">True</property>
168+
<property name="action-name">win.package-properties</property>
169+
<child>
170+
<object class="GtkBox">
171+
<property name="visible">True</property>
172+
<property name="spacing">6</property>
173+
<child>
174+
<object class="GtkImage">
175+
<property name="visible">True</property>
176+
<property name="icon_name">document-properties</property>
177+
</object>
178+
</child>
179+
<child>
180+
<object class="GtkLabel">
181+
<property name="visible">True</property>
182+
<property name="label" translatable="yes">Properties</property>
183+
</object>
184+
</child>
185+
</object>
186+
</child>
187+
</object>
188+
<packing>
189+
<property name="expand">False</property>
190+
</packing>
191+
</child>
192+
<child>
193+
<object class="GtkButton">
194+
<property name="visible">True</property>
195+
<property name="can_focus">False</property>
196+
<property name="relief">GTK_RELIEF_NONE</property>
197+
<property name="tooltip-text" translatable="yes">Search for packages</property>
198+
<property name="use_underline">True</property>
199+
<property name="action-name">win.search</property>
200+
<child>
201+
<object class="GtkBox">
202+
<property name="visible">True</property>
203+
<property name="spacing">6</property>
204+
<child>
205+
<object class="GtkImage">
206+
<property name="visible">True</property>
207+
<property name="icon_name">edit-find</property>
208+
</object>
209+
</child>
210+
<child>
211+
<object class="GtkLabel">
212+
<property name="visible">True</property>
213+
<property name="label" translatable="yes">Search</property>
214+
</object>
215+
</child>
216+
</object>
217+
</child>
218+
</object>
219+
<packing>
220+
<property name="expand">False</property>
221+
</packing>
222+
</child>
191223
</object>
192224
<packing>
193225
<property name="expand">False</property>
194226
<property name="fill">True</property>
195-
<property name="position">1</property>
196227
</packing>
197228
</child>
198229
<child>

0 commit comments

Comments
 (0)