Skip to content

Commit fe4e531

Browse files
author
Ram Rachum
committed
-
1 parent 6ecc8e6 commit fe4e531

File tree

3 files changed

+127
-135
lines changed

3 files changed

+127
-135
lines changed

‎garlicsim.wpu‎

Lines changed: 125 additions & 133 deletions
Original file line numberDiff line numberDiff line change
@@ -139,109 +139,16 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
139139
'notebook_percent': 0.0,
140140
'override_title': None,
141141
'pagelist': [],
142-
'primary_view_state': {'editor_states': {'bookmarks': ([(loc('garlicsim_wx/garlicsim_wx/frame/frame.py'),
143-
{'attrib-starts': [('Frame',
144-
32),
145-
('Frame.__organize_workspace_widgets',
146-
245)],
147-
'first-line': 225,
142+
'primary_view_state': {'editor_states': {'bookmarks': ([(loc('garlicsim/garlicsim/general_misc/queue_tools.py'),
143+
{'attrib-starts': [('iterate',
144+
21)],
145+
'first-line': 0,
148146
'folded-linenos': [],
149-
'sel-line': 246,
150-
'sel-line-start': 8334,
151-
'selection_end': 8342,
152-
'selection_start': 8342},
153-
1264000284.796),
154-
(loc('../../../../../Python26/Lib/site-packages/wx/lib/agw/aui/framemanager.py'),
155-
{'attrib-starts': [('AuiManager',
156-
3309),
157-
('AuiManager.DetachPane',
158-
4101)],
159-
'first-line': 4176,
160-
'folded-linenos': [],
161-
'sel-line': 4113,
162-
'sel-line-start': 134300,
163-
'selection_end': 134300,
164-
'selection_start': 134300},
165-
1264000290.25),
166-
(loc('../../../../../Python26/Lib/site-packages/wx/lib/agw/aui/framemanager.py'),
167-
{'attrib-starts': [('AuiManager',
168-
3309),
169-
('AuiManager.CalculatePaneSizerLimits',
170-
6113)],
171-
'first-line': 6238,
172-
'folded-linenos': [],
173-
'sel-line': 6113,
174-
'sel-line-start': 207789,
175-
'selection_end': 207821,
176-
'selection_start': 207797},
177-
1264000297.1400001),
178-
(loc('../../../../../Python26/Lib/site-packages/wx/lib/agw/aui/framemanager.py'),
179-
{'attrib-starts': [('AuiManager',
180-
3309),
181-
('AuiManager.AddPane',
182-
3879)],
183-
'first-line': 4009,
184-
'folded-linenos': [],
185-
'sel-line': 3879,
186-
'sel-line-start': 125086,
187-
'selection_end': 125101,
188-
'selection_start': 125094},
189-
1264000302.9059999),
190-
(loc('../../../../../Python26/Lib/site-packages/wx/lib/agw/aui/framemanager.py'),
191-
{'attrib-starts': [],
192-
'first-line': 93,
193-
'folded-linenos': [],
194-
'sel-line': 103,
195-
'sel-line-start': 3861,
196-
'selection_end': 3875,
197-
'selection_start': 3875},
198-
1264000324.421),
199-
(loc('garlicsim_wx/garlicsim_wx/frame/frame.py'),
200-
{'attrib-starts': [('Frame',
201-
32),
202-
('Frame.on_new',
203-
221)],
204-
'first-line': 225,
205-
'folded-linenos': [],
206-
'sel-line': 228,
207-
'sel-line-start': 7687,
208-
'selection_end': 7729,
209-
'selection_start': 7729},
210-
1264008624.0780001),
211-
(loc('garlicsim_wx/garlicsim_wx/frame/frame.py'),
212-
{'attrib-starts': [('Frame',
213-
32),
214-
('Frame.on_new',
215-
221)],
216-
'first-line': 235,
217-
'folded-linenos': [],
218-
'sel-line': 241,
219-
'sel-line-start': 8127,
220-
'selection_end': 8194,
221-
'selection_start': 8156},
222-
1264012965.6559999),
223-
(loc('garlicsim_wx/garlicsim_wx/frame/frame.py'),
224-
{'attrib-starts': [('Frame',
225-
32),
226-
('Frame.on_idle',
227-
271)],
228-
'first-line': 246,
229-
'folded-linenos': [],
230-
'sel-line': 271,
231-
'sel-line-start': 9129,
232-
'selection_end': 9144,
233-
'selection_start': 9137},
234-
1264012968.171),
235-
(loc('garlicsim/garlicsim/general_misc/queue_tools.py'),
236-
{'attrib-starts': [('iterate',
237-
21)],
238-
'first-line': 0,
239-
'folded-linenos': [],
240-
'sel-line': 29,
241-
'sel-line-start': 721,
242-
'selection_end': 721,
243-
'selection_start': 721},
244-
1264018872.0),
147+
'sel-line': 29,
148+
'sel-line-start': 721,
149+
'selection_end': 721,
150+
'selection_start': 721},
151+
1264018872.0),
245152
(loc('garlicsim_wx/garlicsim_wx/frame/frame.py'),
246153
{'attrib-starts': [('Frame',
247154
32),
@@ -362,20 +269,105 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
362269
'selection_end': 4277,
363270
'selection_start': 4277},
364271
1264110957.4679999),
365-
[loc('garlicsim_wx/garlicsim_wx/widgets/workspace_widgets_warehouse/tree_browser/tree_browser.py'),
366-
{'attrib-starts': [('TreeBrowser',
367-
26),
368-
('TreeBrowser.on_paint',
369-
70)],
370-
'first-line': 66,
272+
(loc('garlicsim_wx/garlicsim_wx/widgets/workspace_widgets_warehouse/tree_browser/tree_browser.py'),
273+
{'attrib-starts': [('NiftyPaintDC',
274+
141),
275+
('NiftyPaintDC.draw_tree',
276+
248)],
277+
'first-line': 229,
371278
'folded-linenos': [],
372-
'sel-line': 84,
373-
'sel-line-start': 2849,
374-
'selection_end': 2849,
375-
'selection_start': 2849},
376-
1264110985.109]],
279+
'sel-line': 254,
280+
'sel-line-start': 8369,
281+
'selection_end': 8380,
282+
'selection_start': 8380},
283+
1264110985.109),
284+
(loc('garlicsim_wx/garlicsim_wx/frame/frame.py'),
285+
{'attrib-starts': [('Frame',
286+
32),
287+
('Frame.on_new',
288+
223)],
289+
'first-line': 3,
290+
'folded-linenos': [],
291+
'sel-line': 224,
292+
'sel-line-start': 7495,
293+
'selection_end': 7495,
294+
'selection_start': 7495},
295+
1264157545.625),
296+
[loc('../../../../../Python26/Lib/site-packages/wx/lib/agw/aui/__init__.py'),
297+
{'attrib-starts': [],
298+
'first-line': 181,
299+
'folded-linenos': [],
300+
'sel-line': 190,
301+
'sel-line-start': 10106,
302+
'selection_end': 10136,
303+
'selection_start': 10136},
304+
1264157553.5150001],
305+
(loc('garlicsim_wx/garlicsim_wx/frame/frame.py'),
306+
{'attrib-starts': [],
307+
'first-line': 22,
308+
'folded-linenos': [],
309+
'sel-line': 27,
310+
'sel-line-start': 708,
311+
'selection_end': 708,
312+
'selection_start': 708},
313+
1264157565.0150001),
314+
(loc('garlicsim_wx/garlicsim_wx/frame/frame.py'),
315+
{'attrib-starts': [('Frame',
316+
32)],
317+
'first-line': 18,
318+
'folded-linenos': [],
319+
'sel-line': 32,
320+
'sel-line-start': 800,
321+
'selection_end': 813,
322+
'selection_start': 812},
323+
1264158240.0309999),
324+
(loc('garlicsim_wx/garlicsim_wx/frame/frame.py'),
325+
{'attrib-starts': [('Frame',
326+
32),
327+
('Frame.__init__',
328+
38)],
329+
'first-line': 35,
330+
'folded-linenos': [],
331+
'sel-line': 58,
332+
'sel-line-start': 1555,
333+
'selection_end': 1586,
334+
'selection_start': 1582},
335+
1264158241.421),
336+
(loc('garlicsim_wx/garlicsim_wx/frame/frame.py'),
337+
{'attrib-starts': [('Frame',
338+
32),
339+
('Frame.__init__',
340+
38)],
341+
'first-line': 35,
342+
'folded-linenos': [],
343+
'sel-line': 58,
344+
'sel-line-start': 1555,
345+
'selection_end': 1589,
346+
'selection_start': 1582},
347+
1264158242.875),
348+
(loc('garlicsim_wx/garlicsim_wx/frame/frame.py'),
349+
{'attrib-starts': [('Frame',
350+
32),
351+
('Frame.__init__',
352+
38)],
353+
'first-line': 35,
354+
'folded-linenos': [],
355+
'sel-line': 44,
356+
'sel-line-start': 1179,
357+
'selection_end': 1187,
358+
'selection_start': 1187},
359+
1264158244.562),
360+
[loc('garlicsim_wx/garlicsim_wx/frame/frame.py'),
361+
{'attrib-starts': [],
362+
'first-line': 201,
363+
'folded-linenos': [],
364+
'sel-line': 224,
365+
'sel-line-start': 7516,
366+
'selection_end': 7516,
367+
'selection_start': 7516},
368+
1264158264.8900001]],
377369
19),
378-
'current-loc': loc('garlicsim_wx/garlicsim_wx/widgets/workspace_widgets_warehouse/tree_browser/tree_browser.py'),
370+
'current-loc': loc('garlicsim_wx/garlicsim_wx/frame/frame.py'),
379371
'editor-states': {loc('garlicsim/garlicsim/general_misc/queue_tools.py'): {''\
380372
'attrib-starts': [('iterate',
381373
21)],
@@ -390,12 +382,12 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
390382
32),
391383
('Frame.on_new',
392384
223)],
393-
'first-line': 173,
385+
'first-line': 201,
394386
'folded-linenos': [],
395387
'sel-line': 224,
396-
'sel-line-start': 7495,
397-
'selection_end': 7495,
398-
'selection_start': 7495},
388+
'sel-line-start': 7516,
389+
'selection_end': 7516,
390+
'selection_start': 7516},
399391
loc('garlicsim_wx/garlicsim_wx/gui_project.py'): {''\
400392
'attrib-starts': [('GuiProject',
401393
30),
@@ -434,7 +426,7 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
434426
141),
435427
('NiftyPaintDC.draw_tree',
436428
248)],
437-
'first-line': 228,
429+
'first-line': 229,
438430
'folded-linenos': [],
439431
'sel-line': 254,
440432
'sel-line-start': 8369,
@@ -453,9 +445,9 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
453445
u'garlicsim_wx/garlicsim_wx/widgets/workspace_widgets_warehouse/seek_bar.py',
454446
u'../../../../../Python26/Lib/site-packages/wx/lib/agw/aui/framemanager.py',
455447
u'garlicsim/garlicsim/general_misc/queue_tools.py',
456-
u'garlicsim_wx/garlicsim_wx/frame/frame.py',
457448
u'garlicsim_wx/garlicsim_wx/gui_project.py',
458-
u'garlicsim_wx/garlicsim_wx/widgets/workspace_widgets_warehouse/tree_browser/tree_browser.py']},
449+
u'garlicsim_wx/garlicsim_wx/widgets/workspace_widgets_warehouse/tree_browser/tree_browser.py',
450+
u'garlicsim_wx/garlicsim_wx/frame/frame.py']},
459451
'split_percents': {0: 0.5},
460452
'splits': 1,
461453
'tab_location': 'top',
@@ -464,8 +456,8 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
464456
'splits': 2,
465457
'tab_location': 'left',
466458
'user_data': {}},
467-
'window-alloc': (421,
468-
334,
459+
'window-alloc': (338,
460+
197,
469461
664,
470462
146)},
471463
{'name': 'gK7vpy9RfmJ37zuDvf6S9qR8GO2vZOXh',
@@ -763,9 +755,9 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
763755
'fMatchCase': False,
764756
'fOmitBinary': True,
765757
'fRegexFlags': 46,
766-
'fReplaceText': u'widgets.misc',
758+
'fReplaceText': u'aui',
767759
'fReverse': False,
768-
'fSearchText': u'idle',
760+
'fSearchText': u'wx.lib.agw.aui',
769761
'fStartPos': 0,
770762
'fStyle': 'text',
771763
'fWholeWords': False,
@@ -778,7 +770,7 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
778770
'fReplaceOnDisk': False,
779771
'fShowFirstMatch': False,
780772
'fShowLineno': True,
781-
'fShowReplaceWidgets': False},
773+
'fShowReplaceWidgets': True},
782774
'replace-entry-expanded': False,
783775
'search-entry-expanded': False}),
784776
('batch-search',
@@ -831,9 +823,9 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
831823
'user_data': {'origin-window': 'yZ2qXe8ceW6MqtuWo8cELPLG2V'\
832824
'vxKCCZ'}},
833825
'window-alloc': None}]}
834-
guimgr.recent-documents = [loc('garlicsim_wx/garlicsim_wx/widgets/workspace_widgets_warehouse/tree_browser/tree_browser.py'),
826+
guimgr.recent-documents = [loc('garlicsim_wx/garlicsim_wx/frame/frame.py'),
827+
loc('garlicsim_wx/garlicsim_wx/widgets/workspace_widgets_warehouse/tree_browser/tree_browser.py'),
835828
loc('garlicsim_wx/garlicsim_wx/gui_project.py'),
836-
loc('garlicsim_wx/garlicsim_wx/frame/frame.py'),
837829
loc('garlicsim/garlicsim/general_misc/queue_tools.py')]
838830
guimgr.visual-state = {loc('../../../Local Settings/Application Data/Wing IDE 3/pi-cache/2.6/c/Python26/Lib/site-packages/wx/_controls_.pi'): {''\
839831
'attrib-starts': [('TextCtrl_swiginit',
@@ -2267,12 +2259,12 @@ guimgr.visual-state = {loc('../../../Local Settings/Application Data/Wing IDE 3/
22672259
'selection_start': 28664},
22682260
loc('../../../../../Python26/Lib/site-packages/wx/lib/agw/aui/__init__.py'): {''\
22692261
'attrib-starts': [],
2270-
'first-line': 198,
2262+
'first-line': 278,
22712263
'folded-linenos': [],
2272-
'sel-line': 190,
2273-
'sel-line-start': 10106,
2274-
'selection_end': 10136,
2275-
'selection_start': 10136},
2264+
'sel-line': 246,
2265+
'sel-line-start': 12597,
2266+
'selection_end': 12597,
2267+
'selection_start': 12597},
22762268
loc('../../../../../Python26/Lib/site-packages/wx/lib/agw/aui/auibar.py'): {''\
22772269
'attrib-starts': [],
22782270
'first-line': 0,

‎garlicsim_wx/garlicsim_wx/frame/frame.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import cPickle
1616

1717
import wx
18-
import wx.lib.agw.aui
18+
from garlicsim_wx.general_misc.third_party import aui
1919
import pkg_resources
2020

2121

@@ -56,7 +56,7 @@ def __init__(self, *args, **keywords):
5656
list_of_default_widgets
5757
)
5858

59-
self.aui_manager = wx.lib.agw.aui.AuiManager()
59+
self.aui_manager = aui.AuiManager()
6060
self.aui_manager.SetManagedWindow(self)
6161

6262
self.gui_project = None

‎garlicsim_wx/garlicsim_wx/general_misc/third_party/__init__.py‎

Whitespace-only changes.

0 commit comments

Comments
 (0)