diff --git a/BuiltInSearchResults.py b/BuiltInSearchResults.py index f9bba40..e96bc43 100644 --- a/BuiltInSearchResults.py +++ b/BuiltInSearchResults.py @@ -1,3 +1,4 @@ +print("Loaded file BuiltInSearchResults.py") # You can add your own result proviers and action/tooltip handlers, by importing this module and calling the registration functions as follows. # We use wrapper functions which import the actual implementation and call it, in order to avoid loading too much code during startup. @@ -22,7 +23,7 @@ SearchResults.registerResultHandler('toolbar', SearchResults.registerResultHandler('tool', action = lambda nfo : __import__('ResultsToolbar').subToolAction(nfo), toolTip = lambda nfo, setParent: __import__('ResultsToolbar').subToolToolTip(nfo, setParent)) -SearchResults.registerResultHandler('subtool', +SearchResults.registerResultHandler('subTool', action = lambda nfo : __import__('ResultsToolbar').subToolAction(nfo), toolTip = lambda nfo, setParent: __import__('ResultsToolbar').subToolToolTip(nfo, setParent)) SearchResults.registerResultHandler('document', diff --git a/GetItemGroups.py b/GetItemGroups.py index 42b1bd3..13369ac 100644 --- a/GetItemGroups.py +++ b/GetItemGroups.py @@ -1,3 +1,4 @@ +print("Loaded file GetItemGroups.py") globalGroups = [] itemGroups = None diff --git a/IndentedItemDelegate.py b/IndentedItemDelegate.py index aff7046..b328d2a 100644 --- a/IndentedItemDelegate.py +++ b/IndentedItemDelegate.py @@ -1,3 +1,4 @@ +print("Loaded file IndentedItemDelegate.py") from PySide import QtGui # Inspired by https://stackoverflow.com/a/5443220/324969 diff --git a/InitGui.py b/InitGui.py index ce3f9ec..be0bcb3 100644 --- a/InitGui.py +++ b/InitGui.py @@ -1,10 +1,11 @@ +print("Loaded file InitGui.py") # Avoid garbage collection by storing the action in a global variable wax = None def addToolSearchBox(): import FreeCADGui from PySide import QtGui - import SearchBox + import SearchBoxLight global wax, sea mw = FreeCADGui.getMainWindow() mbr = mw.findChildren(QtGui.QToolBar, 'File') @@ -13,7 +14,7 @@ def addToolSearchBox(): # Get the first toolbar named 'File', and add mbr = mbr[0] # Create search box widget - sea = SearchBox.SearchBox(getItemGroups = lambda: __import__('GetItemGroups').getItemGroups(), + sea = SearchBoxLight.SearchBoxLight(getItemGroups = lambda: __import__('GetItemGroups').getItemGroups(), getToolTip = lambda groupId, setParent: __import__('GetItemGroups').getToolTip(groupId, setParent), getItemDelegate = lambda: __import__('IndentedItemDelegate').IndentedItemDelegate()) sea.resultSelected.connect(lambda index, groupId: __import__('GetItemGroups').onResultSelected(index, groupId)) diff --git a/RefreshTools.py b/RefreshTools.py index 7a15a03..a7cfc76 100644 --- a/RefreshTools.py +++ b/RefreshTools.py @@ -1,3 +1,4 @@ +print("Loaded file RefreshTools.py") import os import FreeCAD as App diff --git a/ResultsDocument.py b/ResultsDocument.py index 0050c28..1b7accc 100644 --- a/ResultsDocument.py +++ b/ResultsDocument.py @@ -1,3 +1,4 @@ +print("Loaded file ResultsDocument.py") from PySide import QtGui from PySide import QtCore import FreeCAD as App diff --git a/ResultsRefreshTools.py b/ResultsRefreshTools.py index 74859a9..08ea1a6 100644 --- a/ResultsRefreshTools.py +++ b/ResultsRefreshTools.py @@ -1,3 +1,4 @@ +print("Loaded file ResultsRefreshTools.py") import os from PySide import QtGui import Serialize diff --git a/ResultsToolbar.py b/ResultsToolbar.py index f2dd122..6833c69 100644 --- a/ResultsToolbar.py +++ b/ResultsToolbar.py @@ -1,3 +1,4 @@ +print("Loaded file ResultsToolbar.py") from PySide import QtGui import FreeCADGui import Serialize diff --git a/SafeViewer.py b/SafeViewer.py index 92a2249..25f632b 100644 --- a/SafeViewer.py +++ b/SafeViewer.py @@ -1,3 +1,4 @@ +print("Loaded file SafeViewer.py") from PySide import QtGui class SafeViewer(QtGui.QWidget): diff --git a/SearchBox.py b/SearchBox.py index e0ca8a8..e9c2420 100644 --- a/SearchBox.py +++ b/SearchBox.py @@ -1,6 +1,8 @@ +print("Loaded file SearchBox.py") import os from PySide import QtGui from PySide import QtCore +from SearchBoxLight import SearchBoxLight globalIgnoreFocusOut = False @@ -14,10 +16,33 @@ def easyToolTipWidget(html): return foo class SearchBox(QtGui.QLineEdit): + # The following block of code is present in the lightweight proxy SearchBoxLight + ''' resultSelected = QtCore.Signal(int, int) - def __init__(self, getItemGroups, getToolTip, getItemDelegate, maxVisibleRows = 20, parent = None): + ''' + @staticmethod + def lazyInit(self): + if self.isInitialized: + return self + getItemGroups = self.getItemGroups + getToolTip = self.getToolTip + getItemDelegate = self.getItemDelegate + maxVisibleRows = self.maxVisibleRows + # The following block of code is executed by the lightweight proxy SearchBoxLight + ''' # Call parent cosntructor - super(SearchBox, self).__init__(parent) + super(SearchBoxLight, self).__init__(parent) + # Connect signals and slots + self.textChanged.connect(self.filterModel) + # Thanks to https://saurabhg.com/programming/search-box-using-qlineedit/ for indicating a few useful options + ico = QtGui.QIcon(':/icons/help-browser.svg') + #ico = QtGui.QIcon(':/icons/WhatsThis.svg') + self.addAction(ico, QtGui.QLineEdit.LeadingPosition) + self.setClearButtonEnabled(True) + self.setPlaceholderText('Search tools, prefs & tree') + self.setFixedWidth(200) # needed to avoid a change of width when the clear button appears/disappears + ''' + # Save arguments #self.model = model self.getItemGroups = getItemGroups @@ -48,33 +73,35 @@ class SearchBox(QtGui.QLineEdit): self.setExtraInfoIsActive = False self.pendingExtraInfo = None # Connect signals and slots - self.textChanged.connect(self.filterModel) self.listView.clicked.connect(lambda x: self.selectResult('select', x)) self.listView.selectionModel().selectionChanged.connect(self.onSelectionChanged) - # Thanks to https://saurabhg.com/programming/search-box-using-qlineedit/ for indicating a few useful options - ico = QtGui.QIcon(':/icons/help-browser.svg') - #ico = QtGui.QIcon(':/icons/WhatsThis.svg') - self.addAction(ico, QtGui.QLineEdit.LeadingPosition) - self.setClearButtonEnabled(True) - self.setPlaceholderText('Search tools, prefs & tree') - self.setFixedWidth(200) # needed to avoid a change of width when the clear button appears/disappears # Initialize the model with the full list (assuming the text() is empty) - #self.filterModel(self.text()) # This is done by refreshItemGroups on focusInEvent, because the initial loading from cache can take time + #self.proxyFilterModel(self.text()) # This is done by refreshItemGroups on focusInEvent, because the initial loading from cache can take time + self.isInitialized = True + return self + + @staticmethod def refreshItemGroups(self): self.itemGroups = self.getItemGroups() - self.filterModel(self.text()) - def focusInEvent(self, qFocusEvent): + self.proxyFilterModel(self.text()) + + @staticmethod + def proxyFocusInEvent(self, qFocusEvent): global globalIgnoreFocusOut if not globalIgnoreFocusOut: self.refreshItemGroups() self.showList() - super(SearchBox, self).focusInEvent(qFocusEvent) - def focusOutEvent(self, qFocusEvent): + super(SearchBoxLight, self).focusInEvent(qFocusEvent) + + @staticmethod + def proxyFocusOutEvent(self, qFocusEvent): global globalIgnoreFocusOut if not globalIgnoreFocusOut: self.hideList() - super(SearchBox, self).focusOutEvent(qFocusEvent) - def keyPressEvent(self, qKeyEvent): + super(SearchBoxLight, self).focusOutEvent(qFocusEvent) + + @staticmethod + def proxyKeyPressEvent(self, qKeyEvent): key = qKeyEvent.key() listMovementKeys = { QtCore.Qt.Key_Down: lambda current, nbRows: (current + 1) % nbRows, @@ -113,26 +140,36 @@ class SearchBox(QtGui.QLineEdit): self.clearFocus() else: self.showList() - super(SearchBox, self).keyPressEvent(qKeyEvent) + super(SearchBoxLight, self).keyPressEvent(qKeyEvent) + + @staticmethod def showList(self): self.setFloatingWidgetsGeometry() if not self.listView.isVisible(): self.listView.show() self.showExtraInfo() + + @staticmethod def hideList(self): self.listView.hide() self.hideExtraInfo() + + @staticmethod def hideExtraInfo(self): self.extraInfo.hide() + + @staticmethod def selectResult(self, mode, index): - groupIdx = int(index.model().itemData(index.siblingAtColumn(2))[0]) + groupId = int(index.model().itemData(index.siblingAtColumn(2))[0]) self.hideList() # TODO: allow other options, e.g. some items could act as combinators / cumulative filters self.setText('') - self.filterModel(self.text()) + self.proxyFilterModel(self.text()) # TODO: emit index relative to the base model - self.resultSelected.emit(index, groupIdx) - def filterModel(self, userInput): + self.resultSelected.emit(index, groupId) + + @staticmethod + def proxyFilterModel(self, userInput): # TODO: this will cause a race condition if it is accessed while being modified def matches(s): return userInput.lower() in s.lower() @@ -169,6 +206,8 @@ class SearchBox(QtGui.QLineEdit): else: self.clearExtraInfo() #self.showList() + + @staticmethod def setFloatingWidgetsGeometry(self): def getScreenPosition(widget): geo = widget.geometry() @@ -201,7 +240,9 @@ class SearchBox(QtGui.QLineEdit): extraw = min(extraleftw, extraw) self.listView.setGeometry(x, y, w, h) self.extraInfo.setGeometry(extrax, y, extraw, h) - def onSelectionChanged(self, selected, deselected): + + @staticmethod + def proxyOnSelectionChanged(self, selected, deselected): # The list has .setSelectionMode(QtGui.QAbstractItemView.SingleSelection), # so there is always at most one index in selected.indexes() and at most one # index in deselected.indexes() @@ -215,6 +256,8 @@ class SearchBox(QtGui.QLineEdit): self.showExtraInfo() elif len(deselected) > 0: self.hideExtraInfo() + + @staticmethod def setExtraInfo(self, index): # TODO: use an atomic swap or mutex if possible if self.setExtraInfoIsActive: @@ -262,8 +305,12 @@ class SearchBox(QtGui.QLineEdit): break #print("unlock") self.setExtraInfoIsActive = False + + @staticmethod def clearExtraInfo(self): # TODO: just clear the contents but keep the widget visible. self.extraInfo.hide() + + @staticmethod def showExtraInfo(self): self.extraInfo.show() diff --git a/SearchBoxLight.py b/SearchBoxLight.py new file mode 100644 index 0000000..baf33cb --- /dev/null +++ b/SearchBoxLight.py @@ -0,0 +1,78 @@ +print("Loaded file SearchBoxLight.py") +from PySide import QtGui +from PySide import QtCore + +# This is a "light" version of the SearchBox implementation, which loads the actual implementation on first click +class SearchBoxLight(QtGui.QLineEdit): + resultSelected = QtCore.Signal(int, int) + def __init__(self, getItemGroups, getToolTip, getItemDelegate, maxVisibleRows = 20, parent = None): + self.isInitialized = False + + # Store arguments + self.getItemGroups = getItemGroups + self.getToolTip = getToolTip + self.getItemDelegate = getItemDelegate + self.maxVisibleRows = maxVisibleRows + + # Call parent cosntructor + super(SearchBoxLight, self).__init__(parent) + # Connect signals and slots + self.textChanged.connect(self.filterModel) + # Thanks to https://saurabhg.com/programming/search-box-using-qlineedit/ for indicating a few useful options + ico = QtGui.QIcon(':/icons/help-browser.svg') + #ico = QtGui.QIcon(':/icons/WhatsThis.svg') + self.addAction(ico, QtGui.QLineEdit.LeadingPosition) + self.setClearButtonEnabled(True) + self.setPlaceholderText('Search tools, prefs & tree') + self.setFixedWidth(200) # needed to avoid a change of width when the clear button appears/disappears + def lazyInit(self): + pass + def __getattr__(self, name): + import types + def f(*args, **kwargs): + import SearchBox + SearchBox.SearchBox.lazyInit(self) + return getattr(SearchBox.SearchBox, name)(*args, **kwargs) + return types.MethodType(f, self) + def focusInEvent(self, *args, **kwargs): + self.proxyFocusInEvent(*args, **kwargs) + def focusOutEvent(self, *args, **kwargs): + self.proxyFocusOutEvent(*args, **kwargs) + def keyPressEvent(self, *args, **kwargs): + self.proxyKeyPressEvent(*args, **kwargs) + def onSelectionChanged(self, *args, **kwargs): + self.proxyOnSelectionChanged(*args, **kwargs) + def filterModel(self, *args, **kwargs): + self.proxyFilterModel(*args, **kwargs) + +# .focusInEvent(self, qFocusEvent) +# +# def focusInEvent(self, qFocusEvent): +# def focusOutEvent(self, qFocusEvent): +# import SearchBox +# SearchBox.SearchBox.lazyInit(self) +# SearchBox.SearchBox.focusOutEvent(self, qFocusEvent) +# def keyPressEvent(self, qKeyEvent): +# import SearchBox +# SearchBox.SearchBox.lazyInit(self) +# SearchBox.SearchBox.keyPressEvent(self, qKeyEvent) +# def showList(self): +# import SearchBox +# SearchBox.SearchBox.lazyInit(self) +# SearchBox.SearchBox.showList(self) +# def hideList(self): +# import SearchBox +# SearchBox.SearchBox.lazyInit(self) +# SearchBox.SearchBox.hideList(self) +# def hideExtraInfo(self): +# import SearchBox +# SearchBox.SearchBox.lazyInit(self) +# SearchBox.SearchBox.hideExtraInfo(self) +# def showExtraInfo(self): +# import SearchBox +# SearchBox.SearchBox.lazyInit(self) +# SearchBox.SearchBox.showExtraInfo(self) +# def filterModel(self, userInput): +# import SearchBox +# SearchBox.SearchBox.lazyInit(self) +# SearchBox.SearchBox.filterModel(self, userInput) \ No newline at end of file diff --git a/SearchResults.py b/SearchResults.py index 58252fa..bff4116 100644 --- a/SearchResults.py +++ b/SearchResults.py @@ -1,3 +1,4 @@ +print("Loaded file SearchResults.py") actionHandlers = { } toolTipHandlers = { } resultProvidersCached = { } diff --git a/SearchTools_notes.py b/SearchTools_notes.py deleted file mode 100644 index bd25882..0000000 --- a/SearchTools_notes.py +++ /dev/null @@ -1,343 +0,0 @@ - - # for wbname, workbench in Gui.listWorkbenches().items(): - # try: - # tbs = workbench.listToolbars() - # # careful, tbs contains all the toolbars of the workbench, including shared toolbars - # for tb in mw.findChildren(QtGui.QToolBar, 'XternalApplications'): - # for bt in tb.findChildren(QtGui.QToolButton): - # text = bt.text() - # if text != '': - # # TODO: there also is the tooltip - # icon = bt.icon() - - # # To preview the icon, assign it as the icon of a dummy window. - # mdi.setWindowIcon(icon) # probably sets the default icon to use for windows without an icon? - # mwx.setWindowIcon(icon) # untested - # except: - # pass - - - -#from PySide import QtGui -#qwd = QtGui.QWidget() -#but1 = QtGui.QPushButton("hi") -#but2 = QtGui.QPushButton("hello") -#lay = QtGui.QGridLayout(qwd) -#lay.addWidget(but1) -#lay.addWidget(but2) -#mwx = QtGui.QMainWindow() -#mwx.setCentralWidget(qwd) -#mw = Gui.getMainWindow() -#mdi = mw.findChild(QtGui.QMdiArea) -#mdi.addSubWindow(mwx) -#mwx.show() -#but3 = QtGui.QPushButton("XXX") -#lay.addWidget(but3) -# - - - - - - - - - - - - #lay.addWidget(sea) - # - #lsv = QtGui.QListView() - #sim = QtGui.QStandardItemModel() - #sim.appendColumn([]) - #flt = QtCore.QSortFilterProxyModel() - #flt.setSourceModel(sim) - #flt.setFilterCaseSensitivity(QtCore.Qt.CaseSensitivity.CaseInsensitive) - ## make the QListView non-editable - #lsv.setEditTriggers(QtGui.QAbstractItemView.NoEditTriggers) - #lsv.setModel(flt) - ##lay.addWidget(lsv) - # - #lsv.setWindowFlag(QtGui.Qt.FramelessWindowHint) - #lsv.setWindowFlag(QtGui.Qt.ToolTip) - #def searchPopup(str): - # def getScreenPosition(widget): - # geo = widget.geometry() - # parent = widget.parent() - # parentGeo = getScreenPosition(parent) if parent is not None else QtCore.QPoint(0,0) - # return QtCore.QPoint(geo.x() + parentGeo.x(), geo.y() + parentGeo.y()) - # pos = getScreenPosition(sea) - # siz = sea.size() - # scr = QtGui.QGuiApplication.screenAt(pos).geometry() - # x = pos.x() - # y = pos.y() + siz.height() - # hint_w = lsv.sizeHint().width() - # w = max(siz.width(), hint_w) - # x = min(scr.x() + scr.width() - hint_w, x) - # h = 100 - # lsv.setGeometry(x, y, w, h) - # lsv.show() - # flt.setFilterWildcard(str) - #sea.textChanged.connect(searchPopup) - # - #cbx = QtGui.QComboBox() - #cbx.setModel(sim) - #cbx.setEditable(True) - - #mwx.setCentralWidget(wdg) - #mdi.addSubWindow(mwx) - - #xap = mw.findChildren(QtGui.QToolBar, 'XternalApplications')[0] - #mbr = mw.findChildren(QtGui.QMenuBar)[0] - - - #le = QtGui.QLineEdit() - #mbr.addWidget(cbx) - #qom = QtGui.QCompleter() - #qom.setModel(sim) - #qom.setPopup(lsv) - #qom.setParent(le) - #def onChanged(x): - # print(x) - # lsv.show() - # #qom.complete() - #le.textChanged.connect(onChanged) - - - #mw.findChildren(QtGui.QToolBar, 'XternalApplications') - #mw.findChildren(QtGui.QToolBar, 'XternalApplications')[0] - - - - # - #cbx.setCurrentText('') - #mwx.show() - - -{ - 'File': ['Std_New', 'Std_Open', 'Std_Save', 'Std_Print', 'Separator', 'Std_Cut', 'Std_Copy', 'Std_Paste', 'Separator', 'Std_Undo', 'Std_Redo', 'Separator', 'Std_Refresh', 'Separator', 'Std_WhatsThis'], - 'Workbench': ['Std_Workbench'], - 'Macro': ['Std_DlgMacroRecord', 'Std_MacroStopRecord', 'Std_DlgMacroExecute', 'Std_DlgMacroExecuteDirect'], - 'View': ['Std_ViewFitAll', 'Std_ViewFitSelection', 'Std_DrawStyle', 'Std_SelBoundingBox', 'Separator', 'Std_SelBack', 'Std_SelForward', 'Std_LinkSelectActions', 'Separator', 'Std_TreeViewActions', 'Std_ViewIsometric', 'Separator', 'Std_ViewFront', 'Std_ViewTop', 'Std_ViewRight', 'Separator', 'Std_ViewRear', 'Std_ViewBottom', 'Std_ViewLeft', 'Separator', 'Std_MeasureDistance'], - 'Structure': ['Std_Part', 'Std_Group', 'Std_LinkMake', 'Std_LinkActions'], - 'XternalApplications': ['XternalAppsOpenInkscapeCommand', 'XternalAppsReloadInkscapeCommand', 'XternalAppsToolInkscapeFractalizeCommand'] -} - -[ - , - , - , - , - , -] - - - - #def processGroup(group, depth = 0, depthAdded = 0, path = [], includeAll = False): - # # group: group of {icon, text, subitems} elements, each element is added if it matches() the userInput - # # depth in the hierarchy of subitems (initial group has depth 0) - # # depthAdded indicates the position in the path[] of ancestors up to which elements have already been added - # # path is a list of ancestors, root at index 0 and parent at index len(path)-1 - # # includeAll indicates if the whole subtree should be added (e.g. because an ancestor matched()) - # if group['icon'] is not None: - # header = QtGui.QStandardItem(group['icon'], group['text']) - # else: - # header = QtGui.QStandardItem(group['text']) - # headerRow = [header, QtGui.QStandardItem(str(depth)), QtGui.QStandardItem('internal data:' + str(header))] - # if depth == len(path): - # path.append(headerRow) - # else: - # path[depth] = headerRow - # # - # #print(includeAll, header.data(0)) - # if includeAll or matches(header.data(0)): - # includeAll = True - # added = True - # for ancestorRow in path[depthAdded:depth+1]: - # print(ancestorRow[0].data(0), includeAll, depthAdded, depth) - # mdl.appendRow(ancestorRow) - # depthAdded = depth - # else: - # added = False - # for item in group['subitems']: - # # If the group given to processGroup or any of its descendents have been added, then - # # the ancestors up to the current depth have been added. - # if added: - # depthAdded = depth - # print('recur:',item,includeAll) - # added = added or processGroup(item, depth+1, depthAdded, path, includeAll) - # return added - - - - #mdl = QtGui.QStandardItemModel() - #for group in itemGroups: - # mdl.appendRow(QtGui.QStandardItem(*group['header'])) - # for item in group['items']: - # mdl.appendRow(QtGui.QStandardItem(*item)) - #super(SearchQCompleter, self).setModel(mdl) - #super(SearchQCompleter, self).popup().setItemDelegate(self.itemDelegate) - - - #for group in self.itemGroups: - # processGroup(group) - - #class FilterProxyModel(QtCore.QSortFilterProxyModel): - # def filterAcceptsRow(self, sourceRow, sourceParent): - # #mdl = self.sourceModel - # #label = mdl.data(mdl.index(sourceRow, 0, sourceParent)) - # #metadata = mdl.data(mdl.index(sourceRow, 1, sourceParent)) - # #return metadata == 'toolbar' or userInput.lower() in label.lower() - # return True - #filteredProxyModel = FilterProxyModel() - #filteredProxyModel.setSourceModel(mdl) - - - - - - - - - - - - - - - - - - - #mdl = QtCore.QStringListModel(['aaa', 'aab', 'aac', 'bxy', 'bac']) - #sbx = SearchBox(mdl, 10, None) - #sbx.show() - - # Inspired by https://stackoverflow.com/a/7767999/324969 - #class SearchQCompleter(QtGui.QCompleter): - # def __init__(self, model, itemDelegate): - # super(SearchQCompleter, self).__init__() - # super(SearchQCompleter, self).setModel(QtCore.QIdentityProxyModel()) - # #https://stackoverflow.com/a/65930408/324969 - # super(SearchQCompleter, self).popup().setItemDelegate(itemDelegate) - # self.setModel(model) - # - # def setModel(self, itemGroups): - # self.itemGroups = itemGroups - # self.filterModel('') - # - # def filterModel(self, userInput): - # def matches(s): - # return userInput.lower() in s.lower() - # def filterGroup(group): - # if matches(group['text']): - # # If a group matches, include the entire subtree (might need to disable this if it causes too much noise) - # return group - # else: - # subitems = filterGroups(group['subitems']) - # if len(subitems) > 0 or matches(group['text']): - # return { 'text': group['text'], 'icon': group['icon'], 'action': group['action'], 'subitems': subitems } - # else: - # return None - # def filterGroups(groups): - # groups = (filterGroup(group) for group in groups) - # return [group for group in groups if group is not None] - # def addGroups(filteredGroups, depth=0): - # for group in filteredGroups: - # mdl.appendRow([QtGui.QStandardItem(group['icon'] or QtGui.QIcon(), group['text']), - # QtGui.QStandardItem(str(depth)), - # QtGui.QStandardItem(group['action'])]) - # addGroups(group['subitems'], depth+1) - # mdl = QtGui.QStandardItemModel() - # mdl.appendColumn([]) - # addGroups(filterGroups(itemGroups)) - # - # print('setSourceModel for userInput ' + repr(userInput) + ' with ' + str(mdl.rowCount()) + ' rows.') - # self.model().setSourceModel(mdl) - # # https://stackoverflow.com/a/65930408/324969 - # - # # the splitPath(self, path) method is called every time the input string changes, before - # # drawing the completion list, we latch onto this method to also update the model to contain - # # the appropriate results, as given by the custom filterAcceptsRow method above. - # def splitPath(self, path): - # self.filterModel(path) - # # Pretend that the user endered the empty string, so that all items from the filteredProxyModel match. - # return '' - # - #class SearchBox(QtGui.QLineEdit): - # resultSelected = QtCore.Signal(int, str) - # def __init__(self, itemGroups): - # super(SearchBox, self).__init__() - # qom = SearchQCompleter(itemGroups, IndentedItemDelegate()) - # qom.setMaxVisibleItems(20) - # #qom.setCompletionMode(QtGui.QCompleter.CompletionMode.PopupCompletion) - # # Thanks to https://saurabhg.com/programming/search-box-using-qlineedit/ for indicating a few useful options - # ico = QtGui.QIcon(':/icons/help-browser.svg') - # #ico = QtGui.QIcon(':/icons/WhatsThis.svg') - # self.addAction(ico, QtGui.QLineEdit.LeadingPosition) - # self.setClearButtonEnabled(True) - # self.setPlaceholderText('Search tools, prefs & tree') - # self.setFixedWidth(200) - # # Signals & slots for enter / click - # def completerActivated(index): - # print('fooooooooooooo') - # print(qom.model().rowCount(), index.row()) - # # TODO: run the action! - # result = str(qom.model().data(index.siblingAtColumn(1))) - # print('res='+result) - # self.clear() - # self.completer().setCompletionPrefix('') - # self.resultSelected.emit(str(index), result) - # def returnPressed(): - # #self.clear() - # #self.completer().setCompletionPrefix('') - # pass - # #text = sea.text() - # #self.clear() - # #self.resultSelected.emit('text returnPressed' + text) - # self.returnPressed.connect(returnPressed) - # #QtCore.QObject.connect(self.completer(), QtCore.SIGNAL('activated(QModelIndex)'), completerActivated) #, QtCore.Qt.ConnectionType.QueuedConnection) - # qom.activated.connect(completerActivated, QtCore.Qt.ConnectionType.DirectConnection) #, QtCore.Qt.ConnectionType.QueuedConnection) - # #self.completer().activated.connect(returnPressedOrCompleterActivated) - # def textChanged(): - # print('textChanged') - # # Workaround: Clear completion prefix and still show the completion box when doing backspace after typing a single character - # if self.text() == '': - # self.completer().setCompletionPrefix(self.text()) - # self.completer().complete() - # self.textChanged.connect(textChanged) - # QtCore.QObject.connect(qom.popup(), QtCore.SIGNAL('clicked(QModelIndex)'), lambda x: print(x)) - # self.setCompleter(qom) - # def focusInEvent(self, e): - # super(SearchBox, self).focusInEvent(e) - # self.completer().setCompletionPrefix(self.text()) - # self.completer().complete() - # self.completer().setCurrentRow(1) # Does not work - # #d=QtGui.QKeyEvent(QtCore.QEvent.KeyPress, QtCore.Qt.Key_Down, QtCore.Qt.NoModifier) - # #QtCore.QCoreApplication.postEvent(self, d) - # def mousePressEvent(self, e): - # super(SearchBox, self).mousePressEvent(e) - # self.completer().setCompletionPrefix(self.text()) - # self.completer().complete() - # self.completer().setCurrentRow(1) # Does not work - # #d=QtGui.QKeyEvent(QtCore.QEvent.KeyPress, QtCore.Qt.Key_Down, QtCore.Qt.NoModifier) - # #QtCore.QCoreApplication.postEvent(self, d) - # - - #sim.appendRow([QtGui.QStandardItem(icon, 't:' + text), QtGui.QStandardItem('tool')]) - - #all_actions.append(mac.trigger) - - #print('whaaaat', str(len(all_actions))) - - #all_actions.append(tbt.actions().trigger) - #global lalala - #lalala=tbt - #print('whuuuut', str(len(all_actions))) - - #viu = mw.findChildren(QtGui.QToolBar, 'View')[0] - #tbt = viu.findChildren(QtGui.QToolButton) - #men = tbt[3].menu() - #acs = men.actions() # QtGui.QAction list - #act = tbt[2].defaultAction() # QtGui.QAction - #act.trigger() diff --git a/Serialize.py b/Serialize.py index 3b891ba..b7dc305 100644 --- a/Serialize.py +++ b/Serialize.py @@ -1,3 +1,4 @@ +print("Loaded file Serialize.py") from PySide import QtCore from PySide import QtGui import json diff --git a/TODO.py b/TODO.py index e0d717e..68ffcf1 100644 --- a/TODO.py +++ b/TODO.py @@ -1,3 +1,4 @@ +print("Loaded file TODO.py") import os import FreeCAD as App from PySide import QtGui