OpenToonz - An open-source full-featured 2D animation creation software
C
feat(file-browser): add optional double-click to open folders
Ahl76623e3ed1bc2b
diff --git a/toonz/sources/include/toonz/preferences.h b/toonz/sources/include/toonz/preferences.hindex aad29fa4c..ce5e12ed7 100644--- a/toonz/sources/include/toonz/preferences.h+++ b/toonz/sources/include/toonz/preferences.h@@ -182,6 +182,9 @@ public:bool isWatchFileSystemEnabled() {return getBoolValue(watchFileSystemEnabled);}+ bool isFileBrowserFolderDoubleClick() const {+ return getBoolValue(fileBrowserFolderDoubleClick);+ }int getProjectRoot() { return getIntValue(projectRoot); }QString getCustomProjectRoot() { return getStringValue(customProjectRoot); }PathAliasPriority getPathAliasPriority() const {diff --git a/toonz/sources/include/toonz/preferencesitemids.h b/toonz/sources/include/toonz/preferencesitemids.hindex 75c056b90..840280f3f 100644--- a/toonz/sources/include/toonz/preferencesitemids.h+++ b/toonz/sources/include/toonz/preferencesitemids.h@@ -10,6 +10,7 @@ enum PreferencesItemId {taskchunksize,sceneNumberingEnabled,watchFileSystemEnabled,+ fileBrowserFolderDoubleClick,projectRoot,customProjectRoot,pathAliasPriority,diff --git a/toonz/sources/toonz/filebrowser.cpp b/toonz/sources/toonz/filebrowser.cppindex 9e60c0a17..b0f32a39d 100644--- a/toonz/sources/toonz/filebrowser.cpp+++ b/toonz/sources/toonz/filebrowser.cpp@@ -2071,9 +2071,11 @@ void FileBrowser::onClickedItem(int index) {if (0 <= index && index < (int)m_items.size()) {TFilePath fp = m_items[index].m_path;if (m_items[index].m_isFolder) {- setFolder(fp, true);- QModelIndex idx = m_folderTreeView->currentIndex();- if (idx.isValid()) m_folderTreeView->scrollTo(idx);+ if (!Preferences::instance()->isFileBrowserFolderDoubleClick()) {+ setFolder(fp, true);+ QModelIndex idx = m_folderTreeView->currentIndex();+ if (idx.isValid()) m_folderTreeView->scrollTo(idx);+ }} elseemit filePathClicked(fp);}diff --git a/toonz/sources/toonz/preferencespopup.cpp b/toonz/sources/toonz/preferencespopup.cppindex 3427cc4ab..6884ded4f 100644--- a/toonz/sources/toonz/preferencespopup.cpp+++ b/toonz/sources/toonz/preferencespopup.cpp@@ -1281,6 +1281,8 @@ QString PreferencesPopup::getUIString(PreferencesItemId id) {{sceneNumberingEnabled, tr("Add Info water mark in Rendered Frames")},{watchFileSystemEnabled,tr("Watch File System and Update File Browser Automatically")},+ {fileBrowserFolderDoubleClick,+ tr("Open Folders in File Browser with Double-Click")},//{ projectRoot, tr("") },{customProjectRoot, tr("Custom Project Path(s):")},{pathAliasPriority, tr("Path Alias Priority:")},@@ -1804,6 +1806,7 @@ QWidget* PreferencesPopup::createGeneralPage() {insertUI(undoMemorySize, lay);insertUI(rasterOptimizedMemory, lay);insertUI(watchFileSystemEnabled, lay);+ insertUI(fileBrowserFolderDoubleClick, lay);insertUI(lazyLoadRooms, lay);QGridLayout* projectRootLay =diff --git a/toonz/sources/toonzlib/preferences.cpp b/toonz/sources/toonzlib/preferences.cppindex 669cbd003..f55f6931b 100644--- a/toonz/sources/toonzlib/preferences.cpp+++ b/toonz/sources/toonzlib/preferences.cpp@@ -387,6 +387,8 @@ void Preferences::definePreferenceItems() {false);define(watchFileSystemEnabled, "watchFileSystemEnabled", QMetaType::Bool,true);+ define(fileBrowserFolderDoubleClick, "fileBrowserFolderDoubleClick",+ QMetaType::Bool, false);define(projectRoot, "projectRoot", QMetaType::Int, 0x08);define(customProjectRoot, "customProjectRoot", QMetaType::QString, "");define(pathAliasPriority, "pathAliasPriority", QMetaType::Int,