Compiz

Merge lp:~muktupavels/compiz/gtk-box-pack into lp:compiz/0.9.13

  1. gtk-box-pack
  2. Merge into 0.9.13
Proposed by Alberts Muktupāvels
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: 4144
Merged at revision: 4144
Proposed branch: lp:~muktupavels/compiz/gtk-box-pack
Merge into: lp:compiz/0.9.13
Diff against target: 925 lines (+155/-155)
5 files modified
compizconfig/ccsm/ccm/Conflicts.py (+1/-1)
compizconfig/ccsm/ccm/Pages.py (+82/-82)
compizconfig/ccsm/ccm/Settings.py (+45/-45)
compizconfig/ccsm/ccm/Widgets.py (+23/-23)
compizconfig/ccsm/ccm/Window.py (+4/-4)
To merge this branch: bzr merge lp:~muktupavels/compiz/gtk-box-pack
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) Approve
Compiz Maintainers Pending
Review via email: mp+348590@code.launchpad.net

Commit message

ccsm: set all arguments for pack_start() and pack_end().

Description of the change

Add missing arguments to pack_start() and pack_end() functions. This will help reduce diff porting to python 3.

To post a comment you must log in.
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

Ack

review: Approve
Revision history for this message
Alberts Muktupāvels (muktupavels) wrote :

Thanks for quick review! When do you plan to merge this? I would like to avoid using prerequisite branches.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'compizconfig/ccsm/ccm/Conflicts.py'
2--- compizconfig/ccsm/ccm/Conflicts.py 2014-03-19 18:38:34 +0000
3+++ compizconfig/ccsm/ccm/Conflicts.py 2018-06-27 10:14:12 +0000
4@@ -51,7 +51,7 @@
5
6 if custom_widgets != None:
7 for widget in custom_widgets:
8- dialog.vbox.pack_start(widget, False, False)
9+ dialog.vbox.pack_start(widget, False, False, 0)
10
11 dialog.set_markup(message)
12 dialog.show_all()
13
14=== modified file 'compizconfig/ccsm/ccm/Pages.py'
15--- compizconfig/ccsm/ccm/Pages.py 2013-12-02 17:37:06 +0000
16+++ compizconfig/ccsm/ccm/Pages.py 2018-06-27 10:14:12 +0000
17@@ -79,15 +79,15 @@
18 self.FilterEntry = ClearEntry()
19 self.FilterEntry.connect("changed", self.FilterChanged)
20
21- self.LeftWidget.pack_start(pluginImg, False, False)
22- self.LeftWidget.pack_start(filterLabel, False, False)
23- self.LeftWidget.pack_start(self.FilterEntry, False, False)
24- self.LeftWidget.pack_start(pluginLabel, False, False)
25+ self.LeftWidget.pack_start(pluginImg, False, False, 0)
26+ self.LeftWidget.pack_start(filterLabel, False, False, 0)
27+ self.LeftWidget.pack_start(self.FilterEntry, False, False, 0)
28+ self.LeftWidget.pack_start(pluginLabel, False, False, 0)
29 infoLabelCont = gtk.HBox()
30 infoLabelCont.set_border_width(10)
31- self.LeftWidget.pack_start(infoLabelCont, False, False)
32+ self.LeftWidget.pack_start(infoLabelCont, False, False, 0)
33 infoLabel = Label(plugin.LongDesc, 180)
34- infoLabelCont.pack_start(infoLabel, True, True)
35+ infoLabelCont.pack_start(infoLabel, True, True, 0)
36
37 self.NotFoundBox = None
38
39@@ -96,23 +96,23 @@
40 enableLabel = Label()
41 enableLabel.set_markup(HeaderMarkup % (_("Use This Plugin")))
42 enableLabel.connect("style-set", self.HeaderStyleSet)
43- self.LeftWidget.pack_start(enableLabel, False, False)
44+ self.LeftWidget.pack_start(enableLabel, False, False, 0)
45 enableCheckCont = gtk.HBox()
46 enableCheckCont.set_border_width(10)
47- self.LeftWidget.pack_start(enableCheckCont, False, False)
48+ self.LeftWidget.pack_start(enableCheckCont, False, False, 0)
49 enableCheck = gtk.CheckButton()
50 enableCheck.add(Label(_("Enable %s") % plugin.ShortDesc, 120))
51 enableCheck.set_tooltip_text(plugin.LongDesc)
52 enableCheck.set_active(plugin.Enabled)
53 enableCheck.set_sensitive(plugin.Context.AutoSort)
54- enableCheckCont.pack_start(enableCheck, True, True)
55+ enableCheckCont.pack_start(enableCheck, True, True, 0)
56 enableCheck.connect('toggled', self.EnablePlugin)
57 else:
58 self.FilterEntry.set_tooltip_text(_("Search Compiz Core Options"))
59
60 backButton = gtk.Button(gtk.STOCK_GO_BACK)
61 backButton.set_use_stock(True)
62- self.LeftWidget.pack_end(backButton, False, False)
63+ self.LeftWidget.pack_end(backButton, False, False, 0)
64 backButton.connect('clicked', self.GoBack)
65 self.RightWidget = gtk.Notebook()
66 self.RightWidget.set_scrollable(True)
67@@ -252,8 +252,8 @@
68 filterLabel.set_markup(HeaderMarkup % (_("Filter")))
69 filterLabel.connect("style-set", self.HeaderStyleSet)
70 filterImg = Image("search", ImageCategory, 64)
71- self.LeftWidget.pack_start(filterImg, False, False)
72- self.LeftWidget.pack_start(filterLabel, False, False)
73+ self.LeftWidget.pack_start(filterImg, False, False, 0)
74+ self.LeftWidget.pack_start(filterLabel, False, False, 0)
75
76 # Entry FIXME find a solution with std gtk
77 self.FilterEntry = ClearEntry()
78@@ -263,35 +263,35 @@
79
80 self.FilterEntry.set_tooltip_text(_("Enter a filter.\nClick the keyboard image to grab a key for which to search."))
81 self.FilterEntry.connect("changed", self.FilterChanged)
82- self.LeftWidget.pack_start(self.FilterEntry, False, False)
83+ self.LeftWidget.pack_start(self.FilterEntry, False, False, 0)
84
85 # Search in...
86 filterSearchLabel = Label()
87 filterSearchLabel.set_markup(HeaderMarkup % (_("Search in...")))
88 filterSearchLabel.connect("style-set", self.HeaderStyleSet)
89- self.LeftWidget.pack_start(filterSearchLabel, False, False)
90+ self.LeftWidget.pack_start(filterSearchLabel, False, False, 0)
91
92 # Options
93 self.FilterNameCheck = check = gtk.CheckButton(_("Short description and name"))
94 check.set_active(True)
95 check.connect("toggled", self.LevelChanged, FilterName)
96- self.LeftWidget.pack_start(check, False, False)
97+ self.LeftWidget.pack_start(check, False, False, 0)
98
99 self.FilterLongDescCheck = check = gtk.CheckButton(_("Long description"))
100 check.set_active(True)
101 check.connect("toggled", self.LevelChanged, FilterLongDesc)
102- self.LeftWidget.pack_start(check, False, False)
103+ self.LeftWidget.pack_start(check, False, False, 0)
104
105 self.FilterValueCheck = check = gtk.CheckButton(_("Settings value"))
106 check.set_active(False)
107 check.connect("toggled", self.LevelChanged, FilterValue)
108- self.LeftWidget.pack_start(check, False, False)
109+ self.LeftWidget.pack_start(check, False, False, 0)
110
111 # Back Button
112 self.BackButton = gtk.Button(gtk.STOCK_GO_BACK)
113 self.BackButton.set_use_stock(True)
114 self.BackButton.connect('clicked', self.GoBack)
115- self.LeftWidget.pack_end(self.BackButton, False, False)
116+ self.LeftWidget.pack_end(self.BackButton, False, False, 0)
117
118 self.NotFoundBox = None
119
120@@ -326,19 +326,19 @@
121 scroll.props.hscrollbar_policy = gtk.POLICY_AUTOMATIC
122 scroll.props.vscrollbar_policy = gtk.POLICY_AUTOMATIC
123 scroll.add(self.PluginBox)
124- self.SelectorBoxes.pack_start(scroll, False, False)
125+ self.SelectorBoxes.pack_start(scroll, False, False, 0)
126 scroll = gtk.ScrolledWindow()
127 scroll.props.hscrollbar_policy = gtk.POLICY_AUTOMATIC
128 scroll.props.vscrollbar_policy = gtk.POLICY_AUTOMATIC
129 scroll.add(self.GroupBox)
130- self.SelectorBoxes.pack_start(scroll, False, False)
131+ self.SelectorBoxes.pack_start(scroll, False, False, 0)
132 scroll = gtk.ScrolledWindow()
133 scroll.add(self.SubGroupBox)
134 scroll.props.hscrollbar_policy = gtk.POLICY_AUTOMATIC
135 scroll.props.vscrollbar_policy = gtk.POLICY_AUTOMATIC
136- self.SelectorBoxes.pack_start(scroll, False, False)
137- self.RightChild.pack_start(self.SelectorButtons, False, False)
138- self.RightChild.pack_start(self.SelectorBoxes, False, False)
139+ self.SelectorBoxes.pack_start(scroll, False, False, 0)
140+ self.RightChild.pack_start(self.SelectorButtons, False, False, 0)
141+ self.RightChild.pack_start(self.SelectorBoxes, False, False, 0)
142 self.SettingsArea = gtk.ScrolledWindow()
143 ebox = gtk.EventBox()
144 self.SettingsBox = gtk.VBox()
145@@ -348,7 +348,7 @@
146 self.SettingsArea.props.vscrollbar_policy = gtk.POLICY_ALWAYS
147 self.SettingsArea.set_border_width(5)
148 self.SettingsArea.add_with_viewport(ebox)
149- self.RightChild.pack_start(self.SettingsArea, True, True)
150+ self.RightChild.pack_start(self.SettingsArea, True, True, 0)
151
152 GlobalUpdater.Block += 1
153
154@@ -364,10 +364,10 @@
155 progress.connect("delete-event", lambda *a: True)
156 progress.set_title(_("Loading Advanced Search"))
157 bar = gtk.ProgressBar()
158- box.pack_start(bar, False, False)
159+ box.pack_start(bar, False, False, 0)
160
161 label = gtk.Label()
162- box.pack_start(label, False, False)
163+ box.pack_start(label, False, False, 0)
164
165 progress.set_size_request(300, -1)
166
167@@ -433,7 +433,7 @@
168 if pos != gtk.ENTRY_ICON_PRIMARY:
169 return
170 grabber = KeyGrabber(label = _("Grab key combination"))
171- self.LeftWidget.pack_start(grabber, False, False)
172+ self.LeftWidget.pack_start(grabber, False, False, 0)
173 grabber.hide()
174 grabber.set_no_show_all(True)
175 grabber.connect('changed', self.GotKey)
176@@ -595,17 +595,17 @@
177 for plugin in plugins:
178 box = gtk.VBox()
179 for (pageName, page) in self.GroupPages[plugin.Name]:
180- box.pack_start(page.Label, False, False)
181- box.pack_start(page.Widget, False, False)
182+ box.pack_start(page.Label, False, False, 0)
183+ box.pack_start(page.Widget, False, False, 0)
184
185 self.PackedGroups.append(page)
186- self.SettingsBox.pack_start(box, False, False)
187+ self.SettingsBox.pack_start(box, False, False, 0)
188 self.PackedPlugins.append(box)
189
190 if groups is not None:
191 self.PackedGroups = []
192 for page in groups:
193- self.SettingsBox.pack_start(page.Widget, False, False)
194+ self.SettingsBox.pack_start(page.Widget, False, False, 0)
195 self.PackedGroups.append(page)
196
197 if subgroups is not None:
198@@ -613,7 +613,7 @@
199 for area in subgroups:
200 sga = SubGroupArea('', area.SubGroup)
201 sga.Filter(self.FilterEntry.get_text().lower())
202- self.SettingsBox.pack_start(sga.Widget, False, False)
203+ self.SettingsBox.pack_start(sga.Widget, False, False, 0)
204 self.PackedSubGroups.append(sga)
205
206 self.SettingsBox.show_all()
207@@ -678,9 +678,9 @@
208 self.ProfileComboBox.set_active(active+1)
209 profileAdd.connect("clicked", self.AddProfile)
210 profileRemove.connect("clicked", self.RemoveProfile)
211- profileBox.pack_start(self.ProfileComboBox, True, True)
212- profileBox.pack_start(profileAdd, False, False)
213- profileBox.pack_start(profileRemove, False, False)
214+ profileBox.pack_start(self.ProfileComboBox, True, True, 0)
215+ profileBox.pack_start(profileAdd, False, False, 0)
216+ profileBox.pack_start(profileRemove, False, False, 0)
217 profileLabel = Label()
218 profileLabel.set_markup(HeaderMarkup % (_("Profile")))
219 profileLabel.connect("style-set", self.HeaderStyleSet)
220@@ -702,10 +702,10 @@
221 profileImportAsButton.connect("clicked", self.ImportProfileAs)
222 profileExportButton.connect("clicked", self.ExportProfile)
223 profileResetButton.connect("clicked", self.ResetProfile)
224- self.ProfileImportExportBox.pack_start(profileImportButton, False, False)
225- self.ProfileImportExportBox.pack_start(profileImportAsButton, False, False)
226- self.ProfileImportExportBox.pack_start(profileExportButton, False, False)
227- self.ProfileImportExportBox.pack_start(profileResetButton, False, False)
228+ self.ProfileImportExportBox.pack_start(profileImportButton, False, False, 0)
229+ self.ProfileImportExportBox.pack_start(profileImportAsButton, False, False, 0)
230+ self.ProfileImportExportBox.pack_start(profileExportButton, False, False, 0)
231+ self.ProfileImportExportBox.pack_start(profileResetButton, False, False, 0)
232 rightChild.pack_start(profileLabel, False, False, 5)
233 rightChild.pack_start(profileBox, False, False, 5)
234 rightChild.pack_start(self.ProfileImportExportBox, False, False, 5)
235@@ -962,8 +962,8 @@
236 leftButton.set_image(leftImage)
237 leftButton.connect("clicked", self.EnabledPluginsList.delete)
238
239- buttonBox.pack_start(rightButton, False, False)
240- buttonBox.pack_start(leftButton, False, False)
241+ buttonBox.pack_start(rightButton, False, False, 0)
242+ buttonBox.pack_start(leftButton, False, False, 0)
243
244 # Up/Down buttons
245 enabledBox = gtk.VBox()
246@@ -986,16 +986,16 @@
247 addButton.set_use_stock(True)
248 addButton.connect('clicked', self.AddPlugin)
249
250- enabledButtonBox.pack_start(addButton, False, False)
251- enabledButtonBox.pack_start(upButton, False, False)
252- enabledButtonBox.pack_start(downButton, False, False)
253-
254- enabledBox.pack_start(self.EnabledPluginsList, True, True)
255- enabledBox.pack_start(enabledAlignment, False, False)
256-
257- listBox.pack_start(self.DisabledPluginsList, True, True)
258- listBox.pack_start(boxAlignment, True, False)
259- listBox.pack_start(enabledBox, True, True)
260+ enabledButtonBox.pack_start(addButton, False, False, 0)
261+ enabledButtonBox.pack_start(upButton, False, False, 0)
262+ enabledButtonBox.pack_start(downButton, False, False, 0)
263+
264+ enabledBox.pack_start(self.EnabledPluginsList, True, True, 0)
265+ enabledBox.pack_start(enabledAlignment, False, False, 0)
266+
267+ listBox.pack_start(self.DisabledPluginsList, True, True, 0)
268+ listBox.pack_start(boxAlignment, True, False, 0)
269+ listBox.pack_start(enabledBox, True, True, 0)
270
271 self.UpdateEnabledPluginsList()
272 self.UpdateDisabledPluginsList()
273@@ -1005,7 +1005,7 @@
274 self.EnabledPluginsList.store.connect('row-deleted', self.ListChanged)
275 self.EnabledPluginsList.store.connect('rows-reordered', self.ListChanged)
276
277- rightChild.pack_start(listBox, True, True)
278+ rightChild.pack_start(listBox, True, True, 0)
279
280 # Auto sort
281 autoSort.connect('toggled', self.AutoSortChanged)
282@@ -1062,11 +1062,11 @@
283
284 label = gtk.Label(_("Plugin name:"))
285 label.set_tooltip_text(_("Insert plugin name"))
286- dlg.vbox.pack_start(label)
287+ dlg.vbox.pack_start(label, True, True, 0)
288
289 entry = gtk.Entry()
290 entry.props.activates_default = True
291- dlg.vbox.pack_start(entry)
292+ dlg.vbox.pack_start(entry, True, True, 0)
293
294 dlg.vbox.set_spacing(5)
295
296@@ -1111,13 +1111,13 @@
297 self.DescLabel.set_markup(HeaderMarkup % (_("Preferences")))
298 self.DescLabel.connect("style-set", self.HeaderStyleSet)
299 self.DescImg = Image("profiles",ImageCategory, 64)
300- self.LeftWidget.pack_start(self.DescImg, False, False)
301- self.LeftWidget.pack_start(self.DescLabel, False, False)
302+ self.LeftWidget.pack_start(self.DescImg, False, False, 0)
303+ self.LeftWidget.pack_start(self.DescLabel, False, False, 0)
304 self.InfoLabelCont = gtk.HBox()
305 self.InfoLabelCont.set_border_width(10)
306- self.LeftWidget.pack_start(self.InfoLabelCont, False, False)
307+ self.LeftWidget.pack_start(self.InfoLabelCont, False, False, 0)
308 self.InfoLabel = Label(_("Configure the backend, profile and other internal settings used by the Compiz Configuration System."), 180)
309- self.InfoLabelCont.pack_start(self.InfoLabel, True, True)
310+ self.InfoLabelCont.pack_start(self.InfoLabel, True, True, 0)
311
312 # About Button
313 aboutLabel = Label()
314@@ -1128,22 +1128,22 @@
315 aboutImage = Image(gtk.STOCK_ABOUT, ImageStock, gtk.ICON_SIZE_BUTTON)
316 aboutFrame = gtk.HBox()
317 aboutFrame.set_spacing(5)
318- aboutFrame.pack_start(aboutImage, False, False)
319- aboutFrame.pack_start(Label(_("About CCSM...")), False, False)
320+ aboutFrame.pack_start(aboutImage, False, False, 0)
321+ aboutFrame.pack_start(Label(_("About CCSM...")), False, False, 0)
322 aboutButton.add(aboutFrame)
323 aboutButton.set_tooltip_text(_("About"))
324 aboutButton.connect('clicked', self.ShowAboutDialog)
325 aboutBin = gtk.HBox()
326 aboutBin.set_border_width(10)
327- aboutBin.pack_start(aboutButton, False, False)
328- self.LeftWidget.pack_start(aboutLabel, False, False)
329- self.LeftWidget.pack_start(aboutBin, False, False)
330+ aboutBin.pack_start(aboutButton, False, False, 0)
331+ self.LeftWidget.pack_start(aboutLabel, False, False, 0)
332+ self.LeftWidget.pack_start(aboutBin, False, False, 0)
333
334 # Back Button
335 backButton = gtk.Button(gtk.STOCK_GO_BACK)
336 backButton.set_use_stock(True)
337 backButton.connect('clicked', self.GoBack)
338- self.LeftWidget.pack_end(backButton, False, False)
339+ self.LeftWidget.pack_end(backButton, False, False, 0)
340
341 # Profile & Backend Page
342 self.ProfileBackendPage = ProfileBackendPage(context)
343@@ -1202,8 +1202,8 @@
344 screenLabel.set_markup(HeaderMarkup % (_("Screen")))
345 screenLabel.connect("style-set", self.HeaderStyleSet)
346
347- sidebar.pack_start(screenLabel, False, False)
348- sidebar.pack_start(screenBox, False, False)
349+ sidebar.pack_start(screenLabel, False, False, 0)
350+ sidebar.pack_start(screenBox, False, False, 0)
351
352 # Categories
353 categoryBox = gtk.VBox()
354@@ -1222,12 +1222,12 @@
355 align.set_padding (0, 0, 0, 10)
356 align.add (categoryToggleIcon)
357 categoryToggleBox = gtk.HBox ()
358- categoryToggleBox.pack_start (align, False, False)
359- categoryToggleBox.pack_start (categoryToggleLabel, True, True)
360+ categoryToggleBox.pack_start (align, False, False, 0)
361+ categoryToggleBox.pack_start (categoryToggleLabel, True, True, 0)
362 categoryToggle = PrettyButton ()
363 categoryToggle.add(categoryToggleBox)
364 categoryToggle.connect("clicked", self.ToggleCategory, category)
365- categoryBox.pack_start(categoryToggle, False, False)
366+ categoryBox.pack_start(categoryToggle, False, False, 0)
367 categoryLabel = Label()
368 categoryLabel.props.xalign = 0.1
369 categoryLabel.set_markup(HeaderMarkup % (_("Category")))
370@@ -1248,8 +1248,8 @@
371 searchButton.connect("clicked", self.ShowAdvancedFilter)
372 searchButton.set_relief(gtk.RELIEF_NONE)
373 searchFrame = gtk.HBox()
374- searchFrame.pack_start(searchLabel, False, False)
375- searchFrame.pack_end(searchImage, False, False)
376+ searchFrame.pack_start(searchLabel, False, False, 0)
377+ searchFrame.pack_end(searchImage, False, False, 0)
378 searchButton.add(searchFrame)
379
380 # Preferences
381@@ -1262,18 +1262,18 @@
382 prefButton.connect("clicked", self.ShowPreferences)
383 prefButton.set_relief(gtk.RELIEF_NONE)
384 prefFrame = gtk.HBox()
385- prefFrame.pack_start(prefLabel, False, False)
386- prefFrame.pack_end(prefImage, False, False)
387+ prefFrame.pack_start(prefLabel, False, False, 0)
388+ prefFrame.pack_end(prefImage, False, False, 0)
389 prefButton.add(prefFrame)
390
391 # Pack widgets into sidebar
392- sidebar.pack_start(filterLabel, False, False)
393- sidebar.pack_start(filterEntry, False, False)
394- sidebar.pack_start(categoryLabel, False, False)
395- sidebar.pack_start(categoryBox, False, False)
396- sidebar.pack_end(exitButton, False, False)
397- sidebar.pack_end(searchButton, False, False)
398- sidebar.pack_end(prefButton, False, False)
399+ sidebar.pack_start(filterLabel, False, False, 0)
400+ sidebar.pack_start(filterEntry, False, False, 0)
401+ sidebar.pack_start(categoryLabel, False, False, 0)
402+ sidebar.pack_start(categoryBox, False, False, 0)
403+ sidebar.pack_end(exitButton, False, False, 0)
404+ sidebar.pack_end(searchButton, False, False, 0)
405+ sidebar.pack_end(prefButton, False, False, 0)
406
407 self.LeftWidget = sidebar
408 self.RightWidget = pluginWindow
409@@ -1358,7 +1358,7 @@
410 if '' in group:
411 sga = SubGroupArea('', group[''][1])
412 if not sga.Empty:
413- self.SetContainer.pack_start(sga.Widget, False, False)
414+ self.SetContainer.pack_start(sga.Widget, False, False, 0)
415 self.Empty = False
416 self.subGroupAreas.append(sga)
417
418@@ -1367,7 +1367,7 @@
419 if not subGroupName == '':
420 sga = SubGroupArea(subGroupName, subGroup)
421 if not sga.Empty:
422- self.SetContainer.pack_start(sga.Widget, False, False)
423+ self.SetContainer.pack_start(sga.Widget, False, False, 0)
424 self.Empty = False
425 self.subGroupAreas.append(sga)
426
427
428=== modified file 'compizconfig/ccsm/ccm/Settings.py'
429--- compizconfig/ccsm/ccm/Settings.py 2015-10-26 17:15:43 +0000
430+++ compizconfig/ccsm/ccm/Settings.py 2018-06-27 10:14:12 +0000
431@@ -206,8 +206,8 @@
432 class StockSetting(Setting):
433
434 def _Init(self):
435- self.Box.pack_start(self.Label, False, False)
436- self.Box.pack_end(self.Reset, False, False)
437+ self.Box.pack_start(self.Label, False, False, 0)
438+ self.Box.pack_end(self.Reset, False, False, 0)
439
440 class StringSetting(StockSetting):
441 def _Init(self):
442@@ -216,7 +216,7 @@
443 self.Entry.connect('activate', self.Changed)
444 self.Entry.connect('focus-out-event', self.Changed)
445 self.Widget = self.Entry
446- self.Box.pack_start(self.Widget, True, True)
447+ self.Box.pack_start(self.Widget, True, True, 0)
448
449 def _Read(self):
450 self.Entry.set_text(self.Get())
451@@ -228,7 +228,7 @@
452 def _Init(self):
453 StringSetting._Init(self)
454 self.MatchButton = MatchButton(self.Entry)
455- self.Box.pack_start(self.MatchButton, False, False)
456+ self.Box.pack_start(self.MatchButton, False, False, 0)
457
458 class FileStringSetting(StringSetting):
459
460@@ -241,7 +241,7 @@
461 StringSetting._Init(self)
462 self.FileButton = FileButton(self.Setting.Plugin.Context, self.Entry,
463 self.isDirectory, self.isImage)
464- self.Box.pack_start(self.FileButton, False, False)
465+ self.Box.pack_start(self.FileButton, False, False, 0)
466
467 class EnumSetting(StockSetting):
468
469@@ -260,7 +260,7 @@
470 self.Combo.connect('changed', self.Changed)
471
472 self.Widget = self.Combo
473- self.Box.pack_start(self.Combo, True, True)
474+ self.Box.pack_start(self.Combo, True, True, 0)
475
476 def _CellEdited(self, cell, path, new_text):
477 self.CurrentRow = int(path[0])
478@@ -324,7 +324,7 @@
479 self.Combo.connect('changed', self.Changed)
480
481 self.Widget = self.Combo
482- self.Box.pack_start(self.Combo, True, True)
483+ self.Box.pack_start(self.Combo, True, True, 0)
484
485 self.OriginalValue = None
486 self.NAItemShift = 0
487@@ -402,7 +402,7 @@
488 self.CheckButton = gtk.CheckButton ()
489 align = gtk.Alignment(yalign=0.5)
490 align.add(self.CheckButton)
491- self.Box.pack_end(align, False, False)
492+ self.Box.pack_end(align, False, False, 0)
493 self.CheckButton.connect ('toggled', self.Changed)
494
495 def _Read (self):
496@@ -445,7 +445,7 @@
497 self.Spin.connect("value-changed", self.Changed)
498 self.Widget = self.Spin
499
500- self.Box.pack_end(self.Spin, False, False)
501+ self.Box.pack_end(self.Spin, False, False, 0)
502
503 def _Read(self):
504 self.Adj.set_value(self.Get())
505@@ -483,7 +483,7 @@
506
507 self.Widget = gtk.Alignment (1, 0.5)
508 self.Widget.add (self.Button)
509- self.Box.pack_start(self.Widget, True, True)
510+ self.Box.pack_start(self.Widget, True, True, 0)
511
512 def GetForRenderer(self):
513 return ["#%.4x%.4x%.4x%.4x" %tuple(seq) for seq in self.Setting.Value]
514@@ -538,12 +538,12 @@
515 self.Scroll.props.hscrollbar_policy = gtk.POLICY_AUTOMATIC
516 self.Scroll.props.vscrollbar_policy = gtk.POLICY_NEVER
517 self.Scroll.add(self.View)
518- self.Widget.pack_start(self.Scroll, True, True)
519+ self.Widget.pack_start(self.Scroll, True, True, 0)
520 self.Widget.set_child_packing(self.Scroll, True, True, 0, gtk.PACK_START)
521 buttonBox = gtk.HBox(False)
522 buttonBox.set_spacing(5)
523 buttonBox.set_border_width(5)
524- self.Widget.pack_start(buttonBox, False, False)
525+ self.Widget.pack_start(buttonBox, False, False, 0)
526 buttonTypes = ((gtk.STOCK_NEW, self.Add, None, True),
527 (gtk.STOCK_DELETE, self.Delete, None, False),
528 (gtk.STOCK_EDIT, self.Edit, None, False),
529@@ -553,7 +553,7 @@
530 for stock, callback, data, sensitive in buttonTypes:
531 b = gtk.Button(stock)
532 b.set_use_stock(True)
533- buttonBox.pack_start(b, False, False)
534+ buttonBox.pack_start(b, False, False, 0)
535 if data is not None:
536 b.connect('clicked', callback, data)
537 else:
538@@ -575,9 +575,9 @@
539 self.PopupItems[gtk.STOCK_DELETE] = delete
540 self.Popup.show_all()
541
542- buttonBox.pack_end(self.Reset, False, False)
543+ buttonBox.pack_end(self.Reset, False, False, 0)
544
545- self.Box.pack_start(self.Widget)
546+ self.Box.pack_start(self.Widget, True, True, 0)
547
548 def AddUpdater(self):
549 pass
550@@ -630,14 +630,14 @@
551 dlg = gtk.Dialog(_("Edit"))
552 vbox = gtk.VBox(spacing=TableX)
553 vbox.props.border_width = 6
554- dlg.vbox.pack_start(vbox, True, True)
555+ dlg.vbox.pack_start(vbox, True, True, 0)
556 dlg.set_default_size(500, -1)
557 dlg.add_button(gtk.STOCK_CLOSE, gtk.RESPONSE_CLOSE)
558 dlg.set_default_response(gtk.RESPONSE_CLOSE)
559
560 group = gtk.SizeGroup(gtk.SIZE_GROUP_HORIZONTAL)
561 for widget in self.Widgets:
562- vbox.pack_start(widget.EBox, False, False)
563+ vbox.pack_start(widget.EBox, False, False, 0)
564 group.add_widget(widget.Label)
565 return dlg
566
567@@ -801,14 +801,14 @@
568 row += 1
569
570 vbox = gtk.VBox()
571- vbox.pack_start(self.Reset, False, False)
572+ vbox.pack_start(self.Reset, False, False, 0)
573
574 hbox = gtk.HBox()
575- hbox.pack_start(table, True, True)
576- hbox.pack_start(vbox, False, False)
577+ hbox.pack_start(table, True, True, 0)
578+ hbox.pack_start(vbox, False, False, 0)
579
580 frame.add(hbox)
581- self.Box.pack_start(frame, True, True)
582+ self.Box.pack_start(frame, True, True, 0)
583
584 def _Read(self):
585 for key, box in self.Checks:
586@@ -852,14 +852,14 @@
587 row += 1
588
589 vbox = gtk.VBox()
590- vbox.pack_start(self.Reset, False, False)
591+ vbox.pack_start(self.Reset, False, False, 0)
592
593 hbox = gtk.HBox()
594- hbox.pack_start(table, True, True)
595- hbox.pack_start(vbox, False, False)
596+ hbox.pack_start(table, True, True, 0)
597+ hbox.pack_start(vbox, False, False, 0)
598
599 frame.add(hbox)
600- self.Box.pack_start(frame, True, True)
601+ self.Box.pack_start(frame, True, True, 0)
602
603 def _Read(self):
604 for key, box in self.Checks:
605@@ -897,10 +897,10 @@
606 editButton.connect ("clicked", self.RunEditDialog)
607
608 action = ActionImage (action)
609- self.Box.pack_start (action, False, False)
610+ self.Box.pack_start (action, False, False, 0)
611 self.Box.reorder_child (action, 0)
612- self.Box.pack_end (editButton, False, False)
613- self.Box.pack_end(alignment, False, False)
614+ self.Box.pack_end (editButton, False, False, 0)
615+ self.Box.pack_end(alignment, False, False, 0)
616 self.Widget = widget
617
618
619@@ -920,7 +920,7 @@
620 alignment.add (entry)
621
622 entry.set_tooltip_text(self.Setting.LongDesc)
623- dlg.vbox.pack_start (alignment)
624+ dlg.vbox.pack_start (alignment, True, True, 0)
625
626 dlg.vbox.show_all ()
627 ret = dlg.run ()
628@@ -1034,18 +1034,18 @@
629 alignment = gtk.Alignment ()
630 alignment.set_padding (10, 10, 10, 10)
631 alignment.add (mainBox)
632- dlg.vbox.pack_start (alignment)
633+ dlg.vbox.pack_start (alignment, True, True, 0)
634
635 checkButton = gtk.CheckButton (_("Enabled"))
636 active = len (self.current) \
637 and self.current.lower () not in ("disabled", "none")
638 checkButton.set_active (active)
639 checkButton.set_tooltip_text(self.Setting.LongDesc)
640- mainBox.pack_start (checkButton)
641+ mainBox.pack_start (checkButton, True, True, 0)
642
643 box = gtk.VBox ()
644 checkButton.connect ("toggled", ShowHideBox, box, dlg)
645- mainBox.pack_start (box)
646+ mainBox.pack_start (box, True, True, 0)
647
648 currentMods = ""
649 for mod in KeyModifier:
650@@ -1056,20 +1056,20 @@
651 modifierSelector.set_tooltip_text (self.Setting.LongDesc)
652 alignment = gtk.Alignment (0.5)
653 alignment.add (modifierSelector)
654- box.pack_start (alignment)
655+ box.pack_start (alignment, True, True, 0)
656
657 key, mods = gtk.accelerator_parse (self.current)
658 grabber = KeyGrabber (key = key, mods = mods,
659 label = _("Grab key combination"))
660 grabber.set_tooltip_text (self.Setting.LongDesc)
661- box.pack_start (grabber)
662+ box.pack_start (grabber, True, True, 0)
663
664 label = gtk.Label (self.current)
665 label.set_tooltip_text (self.Setting.LongDesc)
666 alignment = gtk.Alignment (0.5, 0.5)
667 alignment.set_padding (15, 0, 0, 0)
668 alignment.add (label)
669- box.pack_start (alignment)
670+ box.pack_start (alignment, True, True, 0)
671
672 modifierSelector.connect ("added", HandleModifierAdded, label)
673 modifierSelector.connect ("removed", HandleModifierRemoved, label)
674@@ -1186,18 +1186,18 @@
675 alignment = gtk.Alignment ()
676 alignment.set_padding (10, 10, 10, 10)
677 alignment.add (mainBox)
678- dlg.vbox.pack_start (alignment)
679+ dlg.vbox.pack_start (alignment, True, True, 0)
680
681 checkButton = gtk.CheckButton (_("Enabled"))
682 active = len (self.current) \
683 and self.current.lower () not in ("disabled", "none")
684 checkButton.set_active (active)
685 checkButton.set_tooltip_text (self.Setting.LongDesc)
686- mainBox.pack_start (checkButton)
687+ mainBox.pack_start (checkButton, True, True, 0)
688
689 box = gtk.VBox ()
690 checkButton.connect ("toggled", ShowHideBox, box, dlg)
691- mainBox.pack_start (box)
692+ mainBox.pack_start (box, True, True, 0)
693
694 currentEdges = ""
695 for edge in Edges:
696@@ -1206,7 +1206,7 @@
697 currentEdges.rstrip ("|")
698 edgeSelector = SingleEdgeSelector (currentEdges)
699 edgeSelector.set_tooltip_text(self.Setting.LongDesc)
700- box.pack_start (edgeSelector)
701+ box.pack_start (edgeSelector, True, True, 0)
702
703 currentMods = ""
704 for mod in KeyModifier:
705@@ -1215,7 +1215,7 @@
706 currentMods.rstrip ("|")
707 modifierSelector = ModifierSelector (currentMods)
708 modifierSelector.set_tooltip_text(self.Setting.LongDesc)
709- box.pack_start (modifierSelector)
710+ box.pack_start (modifierSelector, True, True, 0)
711
712 buttonCombo = gtk.combo_box_new_text ()
713 currentButton = 1
714@@ -1233,7 +1233,7 @@
715 else:
716 buttonCombo.set_active (currentButton - 1)
717 buttonCombo.set_tooltip_text(self.Setting.LongDesc)
718- box.pack_start (buttonCombo)
719+ box.pack_start (buttonCombo, True, True, 0)
720
721 dlg.vbox.show_all ()
722 ShowHideBox (checkButton, box, dlg)
723@@ -1351,7 +1351,7 @@
724 alignment.add (selector)
725
726 selector.set_tooltip_text (self.Setting.LongDesc)
727- dlg.vbox.pack_start (alignment)
728+ dlg.vbox.pack_start (alignment, True, True, 0)
729
730 dlg.vbox.show_all ()
731 ret = dlg.run ()
732@@ -1383,7 +1383,7 @@
733 def _Init (self):
734 BoolSetting._Init (self)
735 bell = ActionImage ("bell")
736- self.Box.pack_start (bell, False, False)
737+ self.Box.pack_start (bell, False, False, 0)
738 self.Box.reorder_child (bell, 0)
739
740 def MakeStringSetting (setting, List=False):
741@@ -1479,7 +1479,7 @@
742 if len(settings) > 1 and HasOnlyType(settings, 'List'):
743 multiList = MultiListSetting(Settings=settings)
744 multiList.Read()
745- self.Child.pack_start(multiList.EBox, True, True)
746+ self.Child.pack_start(multiList.EBox, True, True, 0)
747 self.MySettings.append(multiList)
748 self.Empty = False
749 if name:
750@@ -1493,7 +1493,7 @@
751 setting = MakeSetting(setting)
752 if setting is not None:
753 setting.Read()
754- self.Child.pack_start(setting.EBox, True, True)
755+ self.Child.pack_start(setting.EBox, True, True, 0)
756 self.MySettings.append(setting)
757 self.Empty = False
758
759
760=== modified file 'compizconfig/ccsm/ccm/Widgets.py'
761--- compizconfig/ccsm/ccm/Widgets.py 2015-10-26 17:15:43 +0000
762+++ compizconfig/ccsm/ccm/Widgets.py 2018-06-27 10:14:12 +0000
763@@ -158,7 +158,7 @@
764 column = self.insert_column_with_attributes(0, _('Plugin'), gtk.CellRendererPixbuf(), pixbuf=1, sensitive=2)
765 cell = gtk.CellRendererText()
766 cell.props.wrap_width = 200
767- column.pack_start(cell)
768+ column.pack_start(cell, True, True, 0)
769 column.set_attributes(cell, text=0)
770 self.model.set_visible_func(self.VisibleFunc)
771 self.get_selection().connect('changed', self.SelectionChanged)
772@@ -244,9 +244,9 @@
773 button.set_relief(gtk.RELIEF_NONE)
774 button.connect('clicked', self.on_button_clicked, callback)
775 if self.get_children():
776- self.pack_start(arrow, False, False)
777+ self.pack_start(arrow, False, False, 0)
778 self.arrows.append(arrow)
779- self.pack_start(button, False, False)
780+ self.pack_start(button, False, False, 0)
781 self.buttons.append(button)
782 self.show_all()
783
784@@ -290,20 +290,20 @@
785 label.set_markup(markup % text or _("General"))
786 labelBox = gtk.VBox()
787 labelBox.set_spacing(5)
788- labelBox.pack_start(label)
789+ labelBox.pack_start(label, True, True, 0)
790 if info:
791 infoLabel = Label()
792 infoLabel.set_markup("<span size='small'>%s</span>" % info)
793- labelBox.pack_start(infoLabel)
794+ labelBox.pack_start(infoLabel, True, True, 0)
795 box = gtk.HBox()
796 box.set_spacing(5)
797 if image:
798- box.pack_start(image, False, False)
799- box.pack_start(labelBox)
800+ box.pack_start(image, False, False, 0)
801+ box.pack_start(labelBox, True, True, 0)
802 button.add(box)
803 button.connect("clicked", callback, item)
804 button.set_relief(gtk.RELIEF_NONE)
805- self.box.pack_start(button, False, False)
806+ self.box.pack_start(button, False, False, 0)
807
808 def clear_list(self):
809 for button in self.box.get_children():
810@@ -1175,8 +1175,8 @@
811 entry.connect ('changed', self._check_entry_value, dlg)
812 button = gtk.Button (_("Grab"))
813 button.connect ('clicked', self.grab_value, entry, type_chooser)
814- box.pack_start (entry, True, True)
815- box.pack_start (button, False, False)
816+ box.pack_start (entry, True, True, 0)
817+ box.pack_start (button, False, False, 0)
818 rows.append ((label, box))
819
820 # Relation
821@@ -1198,7 +1198,7 @@
822 table.attach(widget, 1, 2, row, row+1, yoptions=0, xpadding=TableX, ypadding=TableY)
823 row += 1
824
825- dlg.vbox.pack_start (table)
826+ dlg.vbox.pack_start (table, True, True, 0)
827 dlg.vbox.set_spacing (5)
828 dlg.show_all ()
829
830@@ -1429,8 +1429,8 @@
831 label.connect ('style-set', self.style_set)
832 box = gtk.HBox ()
833 box.set_spacing (5)
834- box.pack_start (image, False, False)
835- box.pack_start (label)
836+ box.pack_start (image, False, False, 0)
837+ box.pack_start (label, True, True, 0)
838
839 button = PrettyButton ()
840 button.connect ('clicked', self.show_plugin_page)
841@@ -1448,8 +1448,8 @@
842 enable.set_sensitive (plugin.Context.AutoSort)
843 self._toggled_handler = enable.connect ("toggled", self.enable_plugin)
844 PluginSetting (plugin, enable, self._toggled_handler)
845- self.pack_start (enable, False, False)
846- self.pack_start (button, False, False)
847+ self.pack_start (enable, False, False, 0)
848+ self.pack_start (button, False, False, 0)
849
850 self.set_size_request (220, -1)
851
852@@ -1549,8 +1549,8 @@
853
854 icon = text.lower ().replace (" ", "_")
855 image = Image (icon, ImageCategory)
856- header.pack_start (image, False, False)
857- header.pack_start (label, False, False)
858+ header.pack_start (image, False, False, 0)
859+ header.pack_start (label, False, False, 0)
860
861 self._table = gtk.Table ()
862 self._table.set_border_width (10)
863@@ -1567,15 +1567,15 @@
864 self._alignment.set_padding (0, 20, 0, 0)
865 self._alignment.add (gtk.HSeparator ())
866
867- self.pack_start (header, False, False)
868- self.pack_start (self._table, False, False)
869- self.pack_start (self._alignment)
870+ self.pack_start (header, False, False, 0)
871+ self.pack_start (self._table, False, False, 0)
872+ self.pack_start (self._alignment, True, True, 0)
873
874 def show_separator (self, show):
875 children = self.get_children ()
876 if show:
877 if self._alignment not in children:
878- self.pack_start (self._alignment)
879+ self.pack_start (self._alignment, True, True, 0)
880 else:
881 if self._alignment in children:
882 self.remove(self._alignment)
883@@ -1671,7 +1671,7 @@
884 category_box = CategoryBox(context, category, plugins, i)
885 self.connect_buttons (category_box)
886 self._boxes.append (category_box)
887- self._box.pack_start (category_box, False, False)
888+ self._box.pack_start (category_box, False, False, 0)
889
890 viewport = gtk.Viewport ()
891 viewport.connect("style-set", self.set_viewport_style)
892@@ -1732,7 +1732,7 @@
893 last_box.show_separator (True)
894
895 if box not in children:
896- self._box.pack_start (box, False, False)
897+ self._box.pack_start (box, False, False, 0)
898 self._box.reorder_child (box, pos)
899 box.rebuild_table (ncols)
900 box.show_separator (False)
901
902=== modified file 'compizconfig/ccsm/ccm/Window.py'
903--- compizconfig/ccsm/ccm/Window.py 2011-03-17 11:08:00 +0000
904+++ compizconfig/ccsm/ccm/Window.py 2018-06-27 10:14:12 +0000
905@@ -54,8 +54,8 @@
906 self.LeftPane = gtk.VBox()
907 self.RightPane = gtk.VBox()
908 self.RightPane.set_border_width(5)
909- self.MainBox.pack_start(self.LeftPane, False, False)
910- self.MainBox.pack_start(self.RightPane, True, True)
911+ self.MainBox.pack_start(self.LeftPane, False, False, 0)
912+ self.MainBox.pack_start(self.RightPane, True, True, 0)
913 self.MainPage = MainPage(self, self.Context)
914 self.CurrentPage = None
915 self.SetPage(self.MainPage)
916@@ -89,8 +89,8 @@
917 leftWidget.destroy()
918 rightWidget.destroy()
919
920- self.LeftPane.pack_start(page.LeftWidget, True, True)
921- self.RightPane.pack_start(page.RightWidget, True, True)
922+ self.LeftPane.pack_start(page.LeftWidget, True, True, 0)
923+ self.RightPane.pack_start(page.RightWidget, True, True, 0)
924 self.CurrentPage = page
925 self.show_all()
926

Subscribers

People subscribed via source and target branches