Merge pull request #179 from aoblet/dialogs_clean

Dialogs clean

Author: fabiencastan

blackMosquito.png

@@ -524,9 +524,8 @@ def loadData(self, url='buttleofx/backup/data.bofx'):
         """
             Loads all data from a Json file (the default Json file if no url is given)
         """
-
-        filepath = QtCore.QUrl(url).toLocalFile()
-
+        Qurl = QtCore.QUrl(url)
+        filepath = (Qurl.isLocalFile() and Qurl.toLocalFile()) or url
         self.newData()
 
         with open(filepath, 'r') as f:
@@ -647,14 +646,21 @@ def saveData(self, url):
         """
             Saves all data in a json file
         """
+        # If called from Python, it could be a str or a QUrl
         if isinstance(url, str):
-            # If called from Python, it could be a str or a QUrl.
-            filepath = QtCore.QUrl.fromLocalFile(url).toLocalFile()
+            filepath = url
         else:
-            filepath = QtCore.QUrl(url).toLocalFile()
+            filepath = url.toLocalFile() if url.isLocalFile() else url.toString()
+
+        if filepath.endswith('buttleSave_now.bofx'):
+            filepath = os.path.dirname(filepath)
 
-        if not filepath.lower().endswith(".bofx"):
-            filepath = filepath + ".bofx"
+        # if destination path is a folder, we create a file name containing date and time of now
+        if os.path.isdir(filepath):
+            filepath = os.path.join(filepath, 'buttleSave%s' % datetime.today().strftime('%m_%d_%y_%I_%M'))
+
+        if not filepath.lower().endswith('.bofx'):
+            filepath += '.bofx'
 
         with io.open(filepath, 'w', encoding='utf-8') as f:
             dictJson = {
@@ -675,8 +681,8 @@ def saveData(self, url):
             # Graph
             dictJson["graph"] = self.getGraph().object_to_dict()
 
-            # Graph : currentSeletedNodes
-            for node in self.getGraph().getNodes():
+            # Graph : currentSelectedNodes
+            for node in self._graph.getNodes():
                 if node.getName() in self.getCurrentSelectedNodeNames():
                     dictJson["graph"]["currentSelectedNodes"].append(node.getName())
 
@@ -736,6 +742,9 @@ def zoom(self, width, height, nodeWidth, zoomCoeff, graphPreviousWidth, graphPre
     def getButtlePath(self):
         return self._buttlePath
 
+    def getHomeDir(self):
+        return os.path.expanduser("~")
+
     def getCurrentConnectionWrapper(self):
         """
             Returns the current currentConnectionWrapper.
@@ -1036,6 +1045,7 @@ def graphCanBeSaved(self):
 
     # filePath
     buttlePath = QtCore.pyqtProperty(str, getButtlePath, constant=True)
+    homeDir = QtCore.pyqtProperty(str, getHomeDir, constant=True)
 
     # Current param, view, and selected node
     currentParamNodeChanged = QtCore.pyqtSignal()
@@ -1092,12 +1102,12 @@ def graphCanBeSaved(self):
 globalButtleData = ButtleData()
 
 
-def _decode_dict(dict_):
+def _decode_dict(_dict):
     """
         This function will recursively pass in nested dicts, and will convert
         all str elements into string (essential for some Tuttle functions).
     """
-    for key in dict_:
-        if isinstance(dict_[key], str):
-            dict_[key] = str(dict_[key])
-    return dict_
+    for key in _dict:
+        if isinstance(_dict[key], str):
+            _dict[key] = str(_dict[key])
+    return _dict

buttleofx/MainWindow.qml

@@ -7,12 +7,12 @@
 
 from buttleofx.gui.browser_v2.actions.actionManager import globalActionManager
 from buttleofx.gui.browser_v2.actions.actionWrapper import ActionWrapper
-from buttleofx.gui.browser_v2.browserModel import globalBrowserModel
 from buttleofx.gui.browser_v2.browserItem import BrowserItem
 from buttleofx.gui.browser_v2.actions.concreteActions.copy import Copy
 from buttleofx.gui.browser_v2.actions.concreteActions.move import Move
 from buttleofx.gui.browser_v2.actions.concreteActions.create import Create
 from buttleofx.gui.browser_v2.actions.concreteActions.delete import Delete
+from buttleofx.gui.browser_v2.browserModel import globalBrowserDialog, globalBrowser
 
 
 class BrowserAction(QtCore.QObject):
@@ -21,11 +21,11 @@ class BrowserAction(QtCore.QObject):
     """
     cacheChanged = QtCore.pyqtSignal()
 
-    def __init__(self):
+    def __init__(self, bModel):
         logging.debug('BrowserAction begin constructor')
         QtCore.QObject.__init__(self)
         self._cacheActions = None  # for copy, move actions
-        self._browserModel = globalBrowserModel
+        self._browserModel = bModel
         logging.debug('BrowserAction end constructor')
 
     def pushCache(self, listActions):
@@ -99,4 +99,5 @@ def handleNew(self, typeItem):
     isCache = QtCore.pyqtProperty(bool, isEmptyCache, notify=cacheChanged)
 
 
-globalBrowserAction = BrowserAction()
+globalBrowserAction = BrowserAction(globalBrowser)
+globalBrowserActionDialog = BrowserAction(globalBrowserDialog)

buttleofx/data/buttleData.py

@@ -42,6 +42,7 @@ def __init__(self, path=op.expanduser("~/"), sync=False, showSeq=True, hideDotFi
         """
         QtCore.QObject.__init__(self, parent)
         self._currentPath = path
+        self._bufferBrowserItems = []  # used when recursive process: fix async signal connection when add object
         self._browserItems = []  # used only in python side
         self._browserItemsModel = QObjectListModel(self)  # used for UI
         self._filter = filterFiles
@@ -98,6 +99,7 @@ def updateItems(self, recursivePattern):
                     return
 
             self.clearItemsSync.emit()
+            self._bufferBrowserItems.clear()
             detectOption = sequenceParser.eDetectionDefaultWithDotFile
             if self._hideDotFiles:
                 detectOption = sequenceParser.eDetectionDefault
@@ -146,6 +148,7 @@ def pushBrowserItems(self, allItems, toModel=True):
                 if not self._isSync:
                     itemToAdd.moveToThread(self.thread())
                 self.addItemSync.emit(itemToAdd, toModel)
+                self._bufferBrowserItems.append(itemToAdd)
 
     @QtCore.pyqtSlot(object, bool)
     def onAddItemSync(self, bItem, toModel=True):
@@ -168,30 +171,37 @@ def onClearItemsSync(self):
     @QtCore.pyqtSlot(str, object)
     def searchRecursively(self, pattern, modelRequester):
         """
-        Process a recursive search. Disable thumbnail build for sub BrowserModel
+        Process a recursive search. Disable thumbnail build for sub BrowserModel.
+
+        :param pattern: user input search pattern
+        :param modelRequester: main model which starts the recursive search
         """
         logging.debug("Start recursive search: %s", self._currentPath)
         if modelRequester.getParallelThread().isStopped():
             return
 
-        listToBrowse = self._browserItems
+        listToBrowse = self._bufferBrowserItems
+        # Clear on the first level
         if self == modelRequester:
-            listToBrowse = self._browserItems.copy()  # copy: _browserItems deleted line after
             modelRequester.clearItemsSync.emit()
 
         for bItem in listToBrowse:  # 1st pass, all files in current dir
             logging.debug("processing %s" % bItem.getPath())
             if pattern.lower() in bItem.getName().lower():
                 bItem.moveToThread(modelRequester.thread())
+                # Build thumbnails manually only on matching files
                 bItem.startBuildThumbnail()
                 modelRequester.addItemSync.emit(bItem, True)
 
         for bItem in listToBrowse:  # 2nd pass, recurse
             if not modelRequester._isSync and modelRequester.getParallelThread().isStopped():
                 return
             if bItem.isFolder():
+                # Do not compute thumbnails on all elements, but only manually on matching files.
                 recursiveModel = BrowserModel(bItem.getPath(), True, self._showSeq, self._hideDotFiles, self._filter, buildThumbnail=False)
+                # Browse items for this folder and fill model
                 recursiveModel.loadData()
+                # Launch a search on all sub directories
                 recursiveModel.searchRecursively(pattern.lower(), modelRequester)
 
     def getFilter(self):
@@ -250,7 +260,7 @@ def onSortBrowserItems(self):
             self._browserItems.sort(key=lambda it: (it.getType(), it.getWeight()), reverse=rev)
 
         # sort by folder, file
-        self._browserItems.sort(key=lambda it: (it.getType()))
+        self._browserItems.sort(key=lambda it: (it.getType()))  # TODO: check needed
 
     def searchIndexItem(self, bItem):
         """
@@ -417,4 +427,5 @@ def selectItemTo(self, index):
     loading = QtCore.pyqtProperty(bool, isLoading, notify=loadingChanged)
 
 
-globalBrowserModel = BrowserModel()
+globalBrowser = BrowserModel()
+globalBrowserDialog = BrowserModel()

buttleofx/gui/browser_v2/actions/browserAction.py

@@ -9,7 +9,13 @@ Rectangle {
     height: 600
     color: "#353535"
 
+    property alias fileWindow: fileWindow
+    property alias navBar: navBar
+    property bool showTab: true
+    property variant bModel: _browser
+    property variant bAction: _browserAction
     property int visitedFolderListIndex: 0
+
     signal buttonCloseClicked(bool clicked)
     signal buttonFullscreenClicked(bool clicked)
 
@@ -22,6 +28,13 @@ Rectangle {
         ++ visitedFolderListIndex
     }
 
+    function popVisitedFolder(){
+        if (visitedFolderList.count > 0 && visitedFolderListIndex > 0) {
+            -- visitedFolderListIndex
+            bModel.currentPath = visitedFolderList.get(visitedFolderListIndex).url
+        }
+    }
+
     // Recently visited folder stack
     ListModel {
         id: visitedFolderList
@@ -32,9 +45,10 @@ Rectangle {
         spacing: 0
 
         Tab {
-            Layout.fillWidth: true
             id: tabBar
+            Layout.fillWidth: true
             name: "Browser"
+            visible: root.showTab
             onCloseClicked: root.buttonCloseClicked(true)
             onFullscreenClicked: root.buttonFullscreenClicked(true)
         }
@@ -44,20 +58,19 @@ Rectangle {
             Layout.fillWidth: true
             Layout.preferredHeight: childrenRect.height
 
-            property var model: _browser
+            property var model: root.bModel
             property alias visitedFolderList: visitedFolderList
             property alias visitedFolderListIndex: root.visitedFolderListIndex
+
             onPushVisitedFolder: {
                 root.pushVisitedFolder(path)
             }
         }
 
         Rectangle {
             id: separator
-
             Layout.fillWidth: true
             Layout.preferredHeight: 1
-
             color: "#00b2a1"
         }
 
@@ -67,7 +80,8 @@ Rectangle {
              Layout.fillWidth: true
              Layout.fillHeight: true
 
-             property var model: _browser
+             property var model: root.bModel
+             property var bAction: root.bAction
              property alias visitedFolderList: visitedFolderList
              property alias visitedFolderListIndex: root.visitedFolderListIndex
 
@@ -76,4 +90,14 @@ Rectangle {
              }
          }
     }
+
+    Keys.onPressed: {
+        if ((event.modifiers & Qt.ControlModifier) && (event.key == Qt.Key_L)){
+            navBar.toggleUrlEdit()
+        }
+
+        if (event.key == Qt.Key_Backspace){
+            popVisitedFolder()
+        }
+    }
 }