kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Merge pull request #10681 from wwmayer/dock_windows_rebased

Browse Source 
Gui: make layout of Combo, Property and Tree view more flexible
This commit is contained in:
Chris Hennes
2023-09-18 10:53:40 -05:00
committed by GitHub
parent f393a90467 f5b4123109
commit 3915e44ee7
11 changed files with 223 additions and 272 deletions
Download Patch File Download Diff File Expand all files Collapse all files

111
src/Gui/ComboView.cpp
View File

@@ -23,15 +23,13 @@
#include "PreCompiled.h"
#ifndef _PreComp_
# include <QEvent>
# include <QGridLayout>
# include <QSplitter>
#endif
#include "ComboView.h"
#include "BitmapFactory.h"
#include "Document.h"
#include "PropertyView.h"
#include "Tree.h"
#include "TaskView/TaskView.h"
using namespace Gui;
@@ -40,11 +38,8 @@ using namespace Gui::DockWnd;
/* TRANSLATOR Gui::DockWnd::ComboView */
ComboView::ComboView(bool showModel, Gui::Document* pcDocument, QWidget *parent)
: DockWindow(pcDocument,parent)
, oldTabIndex(0)
, modelIndex(-1)
, taskIndex(-1)
ComboView::ComboView(Gui::Document* pcDocument, QWidget *parent)
: DockWindow(pcDocument, parent)
{
setWindowTitle(tr("Combo View"));
@@ -53,102 +48,20 @@ ComboView::ComboView(bool showModel, Gui::Document* pcDocument, QWidget *parent)
pLayout->setContentsMargins ( 0, 0, 0, 0 );
// tabs to switch between Tree/Properties and TaskPanel
tabs = new QTabWidget ();
tabs->setObjectName(QString::fromUtf8("combiTab"));
tabs->setTabPosition(QTabWidget::North);
pLayout->addWidget( tabs, 0, 0 );
auto splitter = new QSplitter();
pLayout->addWidget( splitter, 0, 0 );
connect(tabs, qOverload<int>(&QTabWidget::currentChanged),
this, &ComboView::onCurrentTabChanged);
if (showModel) {
// splitter between tree and property view
auto splitter = new QSplitter();
splitter->setOrientation(Qt::Vertical);
// splitter between tree and property view
splitter->setOrientation(Qt::Vertical);
tree = new TreePanel("ComboView", this);
splitter->addWidget(tree);
tree = new TreePanel("ComboView", this);
splitter->addWidget(tree);
// property view
prop = new PropertyView(this);
splitter->addWidget(prop);
modelIndex = tabs->addTab(splitter,tr("Model"));
}
else {
tree = nullptr;
prop = nullptr;
}
// task panel
taskPanel = new Gui::TaskView::TaskView(this);
taskIndex = tabs->addTab(taskPanel, tr("Tasks"));
// task panel
//projectView = new Gui::ProjectWidget(this);
//tabs->addTab(projectView, tr("Project"));
// property view
prop = new PropertyView(this);
splitter->addWidget(prop);
}
ComboView::~ComboView() = default;
void ComboView::showDialog(Gui::TaskView::TaskDialog *dlg)
{
static QIcon icon = Gui::BitmapFactory().pixmap("edit-edit.svg");
// switch to the TaskView tab
oldTabIndex = tabs->currentIndex();
tabs->setCurrentIndex(taskIndex);
tabs->setTabIcon(taskIndex, icon);
// set the dialog
taskPanel->showDialog(dlg);
// force to show the combo view
if (modelIndex < 0) {
if (parentWidget())
parentWidget()->raise();
}
}
void ComboView::closeDialog()
{
// close the dialog
taskPanel->removeDialog();
}
void ComboView::closedDialog()
{
static QIcon icon = QIcon();
// dialog has been closed
tabs->setCurrentIndex(oldTabIndex);
tabs->setTabIcon(taskIndex, icon);
}
void ComboView::showTreeView()
{
// switch to the tree view
tabs->setCurrentIndex(modelIndex);
}
void ComboView::showTaskView()
{
// switch to the task view
tabs->setCurrentIndex(taskIndex);
}
void ComboView::changeEvent(QEvent *e)
{
if (e->type() == QEvent::LanguageChange) {
tabs->setTabText(modelIndex, tr("Model"));
tabs->setTabText(taskIndex, tr("Tasks"));
//tabs->setTabText(2, tr("Project"));
}
DockWindow::changeEvent(e);
}
void ComboView::onCurrentTabChanged(int index)
{
if (index != taskIndex)
oldTabIndex = index;
}
#include "moc_ComboView.cpp"

26
src/Gui/ComboView.h
View File

@@ -56,7 +56,7 @@ namespace Gui {
namespace DockWnd {
/** Combo View
* is a combination of a tree, property and TaskPanel for
* is a combination of a tree and property view for
* integrated user action.
*/
class GuiExport ComboView : public Gui::DockWindow
@@ -68,7 +68,7 @@ public:
* A constructor.
* A more elaborate description of the constructor.
*/
ComboView(bool showModel, Gui::Document* pcDocument, QWidget *parent=nullptr);
ComboView(Gui::Document* pcDocument, QWidget *parent=nullptr);
/**
* A destructor.
@@ -76,33 +76,11 @@ public:
*/
~ComboView() override;
Gui::TaskView::TaskView *getTaskPanel(){return taskPanel;}
QTabWidget* getTabPanel() const { return tabs;}
friend class Gui::ControlSingleton;
void showTreeView();
void showTaskView();
private Q_SLOTS:
void onCurrentTabChanged(int index);
protected:
void showDialog(Gui::TaskView::TaskDialog *dlg);
void closeDialog();
void closedDialog();
void changeEvent(QEvent *e) override;
private:
int oldTabIndex;
int modelIndex;
int taskIndex;
QTabWidget * tabs;
Gui::PropertyView * prop;
Gui::TreePanel * tree;
Gui::TaskView::TaskView * taskPanel;
//Gui::ProjectWidget * projectView;
};
} // namespace DockWnd

188
src/Gui/Control.cpp
View File

@@ -37,6 +37,8 @@
#include <Gui/MainWindow.h>
#include "Control.h"
#include "BitmapFactory.h"
#include "Tree.h"
#include "TaskView/TaskView.h"
@@ -46,10 +48,10 @@ using namespace std;
/* TRANSLATOR Gui::ControlSingleton */
ControlSingleton* ControlSingleton::_pcSingleton = nullptr;
static QPointer<Gui::TaskView::TaskView> _taskPanel = nullptr;
ControlSingleton::ControlSingleton()
: ActiveDialog(nullptr)
, oldTabIndex(-1)
{
}
@@ -58,37 +60,86 @@ ControlSingleton::~ControlSingleton() = default;
Gui::TaskView::TaskView* ControlSingleton::taskPanel() const
{
auto pcComboView = qobject_cast<Gui::DockWnd::ComboView*>
(Gui::DockWindowManager::instance()->getDockWindow("Combo View"));
// should return the pointer to combo view
if (pcComboView)
return pcComboView->getTaskPanel();
// not all workbenches have the combo view enabled
else if (_taskPanel)
return _taskPanel;
// no task panel available
else
return nullptr;
auto taskView = qobject_cast<Gui::TaskView::TaskView*>
(Gui::DockWindowManager::instance()->getDockWindow("Tasks"));
return taskView;
}
void ControlSingleton::showDockWidget(QWidget* widget)
{
QWidget* parent = widget->parentWidget();
if (parent) {
parent->show();
parent->raise();
}
}
QTabBar* ControlSingleton::findTabBar(QDockWidget* widget) const
{
int count = getMainWindow()->tabifiedDockWidgets(widget).size() + 1;
if (count > 1) {
QList<QTabBar*> bars = getMainWindow()->findChildren<QTabBar*>();
for (auto it : bars) {
if (it->count() <= count) {
for (int i = 0; i < count; i++) {
if (it->tabText(i) == widget->windowTitle()) {
return it;
}
}
}
}
}
return nullptr;
}
void ControlSingleton::aboutToShowDialog(QDockWidget* widget)
{
static QIcon icon = Gui::BitmapFactory().pixmap("edit-edit.svg");
QTabBar* bar = findTabBar(widget);
if (bar) {
oldTabIndex = bar->currentIndex();
for (int i = 0; i < bar->count(); i++) {
if (bar->tabText(i) == widget->windowTitle()) {
bar->setTabIcon(i, icon);
break;
}
}
}
widget->show();
widget->raise();
}
void ControlSingleton::aboutToHideDialog(QDockWidget* widget)
{
QTabBar* bar = findTabBar(widget);
if (bar) {
bar->setCurrentIndex(oldTabIndex);
for (int i = 0; i < bar->count(); i++) {
if (bar->tabText(i) == widget->windowTitle()) {
bar->setTabIcon(i, QIcon());
break;
}
}
}
}
void ControlSingleton::showTaskView()
{
auto pcComboView = qobject_cast<Gui::DockWnd::ComboView*>
(Gui::DockWindowManager::instance()->getDockWindow("Combo View"));
if (pcComboView)
pcComboView->showTaskView();
else if (_taskPanel)
_taskPanel->raise();
Gui::TaskView::TaskView* taskView = taskPanel();
if (taskView) {
showDockWidget(taskView);
}
}
void ControlSingleton::showModelView()
{
auto pcComboView = qobject_cast<Gui::DockWnd::ComboView*>
(Gui::DockWindowManager::instance()->getDockWindow("Combo View"));
if (pcComboView)
pcComboView->showTreeView();
else if (_taskPanel)
_taskPanel->raise();
auto treeView = qobject_cast<Gui::TreeDockWidget*>
(Gui::DockWindowManager::instance()->getDockWindow("Tree view"));
if (treeView) {
showDockWidget(treeView);
}
}
void ControlSingleton::showDialog(Gui::TaskView::TaskDialog *dlg)
@@ -113,14 +164,15 @@ void ControlSingleton::showDialog(Gui::TaskView::TaskDialog *dlg)
// which may open a transaction but fails when auto transaction is still active.
App::AutoTransaction::setEnable(false);
auto pcComboView = qobject_cast<Gui::DockWnd::ComboView*>
(Gui::DockWindowManager::instance()->getDockWindow("Combo View"));
Gui::TaskView::TaskView* taskView = taskPanel();
// should return the pointer to combo view
if (pcComboView) {
pcComboView->showDialog(dlg);
if (taskView) {
taskView->showDialog(dlg);
// make sure that the combo view is shown
auto dw = qobject_cast<QDockWidget*>(pcComboView->parentWidget());
auto dw = qobject_cast<QDockWidget*>(taskView->parentWidget());
if (dw) {
aboutToShowDialog(dw);
dw->setVisible(true);
dw->toggleViewAction()->setVisible(true);
dw->setFeatures(QDockWidget::DockWidgetMovable|QDockWidget::DockWidgetFloatable);
@@ -132,37 +184,6 @@ void ControlSingleton::showDialog(Gui::TaskView::TaskDialog *dlg)
connect(dlg, &TaskView::TaskDialog::aboutToBeDestroyed,
this, &ControlSingleton::closedDialog);
}
// not all workbenches have the combo view enabled
else if (!_taskPanel) {
auto dw = new QDockWidget();
dw->setWindowTitle(tr("Task panel"));
dw->setFeatures(QDockWidget::DockWidgetMovable);
_taskPanel = new Gui::TaskView::TaskView(dw);
dw->setWidget(_taskPanel);
_taskPanel->showDialog(dlg);
getMainWindow()->addDockWidget(Qt::LeftDockWidgetArea, dw);
connect(dlg, &TaskView::TaskDialog::destroyed, dw, &ControlSingleton::deleteLater);
// if we have the normal tree view available then just tabify with it
QWidget* treeView = Gui::DockWindowManager::instance()->getDockWindow("Tree view");
QDockWidget* par = treeView ? qobject_cast<QDockWidget*>(treeView->parent()) : 0;
if (par && par->isVisible()) {
getMainWindow()->tabifyDockWidget(par, dw);
qApp->processEvents(); // make sure that the task panel is tabified now
dw->show();
dw->raise();
}
}
}
QTabWidget* ControlSingleton::tabPanel() const
{
Gui::DockWnd::ComboView* pcComboView = qobject_cast<Gui::DockWnd::ComboView*>
(Gui::DockWindowManager::instance()->getDockWindow("Combo View"));
// should return the pointer to combo view
if (pcComboView)
return pcComboView->getTabPanel();
return nullptr;
}
Gui::TaskView::TaskDialog* ControlSingleton::activeDialog() const
@@ -170,22 +191,11 @@ Gui::TaskView::TaskDialog* ControlSingleton::activeDialog() const
return ActiveDialog;
}
Gui::TaskView::TaskView* ControlSingleton::getTaskPanel()
{
// should return the pointer to combo view
auto pcComboView = qobject_cast<Gui::DockWnd::ComboView*>
(Gui::DockWindowManager::instance()->getDockWindow("Combo View"));
if (pcComboView)
return pcComboView->getTaskPanel();
else
return _taskPanel;
}
void ControlSingleton::accept()
{
Gui::TaskView::TaskView* taskPanel = getTaskPanel();
if (taskPanel) {
taskPanel->accept();
Gui::TaskView::TaskView* taskView = taskPanel();
if (taskView) {
taskView->accept();
qApp->processEvents(QEventLoop::ExcludeUserInputEvents |
QEventLoop::ExcludeSocketNotifiers);
}
@@ -193,9 +203,9 @@ void ControlSingleton::accept()
void ControlSingleton::reject()
{
Gui::TaskView::TaskView* taskPanel = getTaskPanel();
if (taskPanel) {
taskPanel->reject();
Gui::TaskView::TaskView* taskView = taskPanel();
if (taskView) {
taskView->reject();
qApp->processEvents(QEventLoop::ExcludeUserInputEvents |
QEventLoop::ExcludeSocketNotifiers);
}
@@ -203,29 +213,25 @@ void ControlSingleton::reject()
void ControlSingleton::closeDialog()
{
auto pcComboView = qobject_cast<Gui::DockWnd::ComboView*>
(Gui::DockWindowManager::instance()->getDockWindow("Combo View"));
// should return the pointer to combo view
if (pcComboView)
pcComboView->closeDialog();
else if (_taskPanel)
_taskPanel->removeDialog();
Gui::TaskView::TaskView* taskView = taskPanel();
if (taskView)
taskView->removeDialog();
}
void ControlSingleton::closedDialog()
{
ActiveDialog = nullptr;
auto pcComboView = qobject_cast<Gui::DockWnd::ComboView*>
(Gui::DockWindowManager::instance()->getDockWindow("Combo View"));
// should return the pointer to combo view
assert(pcComboView);
pcComboView->closedDialog();
Gui::TaskView::TaskView* taskView = taskPanel();
assert(taskView);
// make sure that the combo view is shown
auto dw = qobject_cast<QDockWidget*>(pcComboView->parentWidget());
if (dw)
auto dw = qobject_cast<QDockWidget*>(taskView->parentWidget());
if (dw) {
aboutToHideDialog(dw);
dw->setFeatures(QDockWidget::DockWidgetClosable
| QDockWidget::DockWidgetMovable
| QDockWidget::DockWidgetFloatable);
}
}
bool ControlSingleton::isAllowedAlterDocument() const

13
src/Gui/Control.h
View File

@@ -32,7 +32,8 @@
#include <Gui/TaskView/TaskDialog.h>
class QTabWidget;
class QDockWidget;
class QTabBar;
namespace App
{
@@ -75,8 +76,6 @@ public:
Gui::TaskView::TaskView* taskPanel() const;
/// raising the model view
void showModelView();
/// get the tab panel
QTabWidget* tabPanel() const;
//@}
/*!
@@ -106,9 +105,6 @@ private Q_SLOTS:
/// This get called by the TaskView when the Dialog is finished
void closedDialog();
private:
Gui::TaskView::TaskView *getTaskPanel();
private:
struct status {
std::bitset<32> StatusBits;
@@ -117,12 +113,17 @@ private:
std::stack<status> StatusStack;
Gui::TaskView::TaskDialog *ActiveDialog;
int oldTabIndex;
private:
/// Construction
ControlSingleton();
/// Destruction
~ControlSingleton() override;
void showDockWidget(QWidget*);
QTabBar* findTabBar(QDockWidget*) const;
void aboutToShowDialog(QDockWidget* widget);
void aboutToHideDialog(QDockWidget* widget);
static ControlSingleton* _pcSingleton;
};

14
src/Gui/DockWindowManager.cpp
View File

@@ -175,6 +175,20 @@ QWidget* DockWindowManager::getDockWindow(const char* name) const
return nullptr;
}
/**
* Returns the dock widget by name.
* If it does not exist 0 is returned.
*/
QDockWidget* DockWindowManager::getDockContainer(const char* name) const
{
for (QList<QDockWidget*>::Iterator it = d->_dockedWindows.begin(); it != d->_dockedWindows.end(); ++it) {
if ((*it)->objectName() == QLatin1String(name))
return (*it);
}
return nullptr;
}
/**
* Returns a list of all widgets inside the dock windows.
*/

2
src/Gui/DockWindowManager.h
View File

@@ -86,6 +86,8 @@ public:
/// returned from @ref addDockWindow. If you want to access the QDockWidget
/// you get it with parentWidget() of the returned widget.
QWidget* getDockWindow(const char* name) const;
/// Returns the QDockWidget container
QDockWidget* getDockContainer(const char* name) const;
/// Returns a list of all widgets which set to a QDockWidget.
QList<QWidget*> getDockWindows() const;
/// If the corresponding dock widget isn't visible then activate it

56
src/Gui/MainWindow.cpp
View File

@@ -469,15 +469,18 @@ void MainWindow::setupDockWindows()
if (ht != config.end())
hiddenDockWindows = ht->second;
bool treeView = setupTreeView(hiddenDockWindows);
bool propertyView = setupPropertyView(hiddenDockWindows);
setupTreeView(hiddenDockWindows);
setupPropertyView(hiddenDockWindows);
setupTaskView(hiddenDockWindows);
setupSelectionView(hiddenDockWindows);
setupComboView(hiddenDockWindows, !treeView || !propertyView);
setupComboView(hiddenDockWindows);
// Report view must be created before PythonConsole!
setupReportView(hiddenDockWindows);
setupPythonConsole(hiddenDockWindows);
setupDAGView(hiddenDockWindows);
this->setTabPosition(Qt::LeftDockWidgetArea, QTabWidget::North);
}
bool MainWindow::setupTreeView(const std::string& hiddenDockWindows)
@@ -489,7 +492,7 @@ bool MainWindow::setupTreeView(const std::string& hiddenDockWindows)
bool enabled = group->GetBool("Enabled", true);
if (enabled != group->GetBool("Enabled", false)) {
enabled = App::GetApplication().GetUserParameter().GetGroup("BaseApp")
->GetGroup("MainWindow")->GetGroup("DockWindows")->GetBool("Std_TreeView",false);
->GetGroup("MainWindow")->GetGroup("DockWindows")->GetBool("Std_TreeView", true);
}
group->SetBool("Enabled", enabled); //ensure entry exists.
if (enabled) {
@@ -507,6 +510,23 @@ bool MainWindow::setupTreeView(const std::string& hiddenDockWindows)
return false;
}
bool MainWindow::setupTaskView(const std::string& hiddenDockWindows)
{
// Task view
if (hiddenDockWindows.find("Std_TaskView") == std::string::npos) {
auto taskView = new Gui::TaskView::TaskView(this);
taskView->setObjectName
(QString::fromLatin1(QT_TRANSLATE_NOOP("QDockWidget","Tasks")));
taskView->setMinimumWidth(210);
DockWindowManager* pDockMgr = DockWindowManager::instance();
pDockMgr->registerDockWindow("Std_TaskView", taskView);
return true;
}
return false;
}
bool MainWindow::setupPropertyView(const std::string& hiddenDockWindows)
{
// Property view
@@ -517,7 +537,7 @@ bool MainWindow::setupPropertyView(const std::string& hiddenDockWindows)
bool enabled = group->GetBool("Enabled", true);
if (enabled != group->GetBool("Enabled", false)) {
enabled = App::GetApplication().GetUserParameter().GetGroup("BaseApp")
->GetGroup("MainWindow")->GetGroup("DockWindows")->GetBool("Std_PropertyView",false);
->GetGroup("MainWindow")->GetGroup("DockWindows")->GetBool("Std_PropertyView", true);
}
group->SetBool("Enabled", enabled); //ensure entry exists.
if (enabled) {
@@ -552,23 +572,23 @@ bool MainWindow::setupSelectionView(const std::string& hiddenDockWindows)
return false;
}
bool MainWindow::setupComboView(const std::string& hiddenDockWindows, bool enable)
bool MainWindow::setupComboView(const std::string& hiddenDockWindows)
{
// Combo view
if (hiddenDockWindows.find("Std_ComboView") == std::string::npos) {
if (!enable) {
ParameterGrp::handle group = App::GetApplication().GetUserParameter().
GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("DockWindows")->GetGroup("ComboView");
enable = group->GetBool("Enabled", true);
ParameterGrp::handle group = App::GetApplication().GetUserParameter().
GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("DockWindows")->GetGroup("ComboView");
bool enable = group->GetBool("Enabled", false);
if (enable) {
auto pcComboView = new ComboView(nullptr, this);
pcComboView->setObjectName(QString::fromLatin1(QT_TRANSLATE_NOOP("QDockWidget", "Model")));
pcComboView->setMinimumWidth(150);
DockWindowManager* pDockMgr = DockWindowManager::instance();
pDockMgr->registerDockWindow("Std_ComboView", pcComboView);
return true;
}
auto pcComboView = new ComboView(enable, nullptr, this);
pcComboView->setObjectName(QString::fromLatin1(QT_TRANSLATE_NOOP("QDockWidget","Combo View")));
pcComboView->setMinimumWidth(150);
DockWindowManager* pDockMgr = DockWindowManager::instance();
pDockMgr->registerDockWindow("Std_ComboView", pcComboView);
return true;
}
return false;

3
src/Gui/MainWindow.h
View File

@@ -284,9 +284,10 @@ protected:
private:
void setupDockWindows();
bool setupTreeView(const std::string&);
bool setupTaskView(const std::string&);
bool setupPropertyView(const std::string&);
bool setupSelectionView(const std::string&);
bool setupComboView(const std::string&, bool enable);
bool setupComboView(const std::string&);
bool setupDAGView(const std::string&);
bool setupReportView(const std::string&);
bool setupPythonConsole(const std::string&);

75
src/Gui/PreferencePages/DlgSettingsGeneral.cpp
View File

@@ -226,23 +226,7 @@ void DlgSettingsGeneral::saveSettings()
int blinkTime{hGrp->GetBool("EnableCursorBlinking", true) ? -1 : 0};
qApp->setCursorFlashTime(blinkTime);
hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/DockWindows");
bool treeView=false;
bool propertyView=false;
bool comboView=true;
switch(ui->treeMode->currentIndex()) {
case 1:
treeView = propertyView = true;
comboView = false;
break;
case 2:
comboView = true;
treeView = propertyView = true;
break;
}
hGrp->GetGroup("ComboView")->SetBool("Enabled",comboView);
hGrp->GetGroup("TreeView")->SetBool("Enabled",treeView);
hGrp->GetGroup("PropertyView")->SetBool("Enabled",propertyView);
saveDockWindowVisibility();
hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/MainWindow");
hGrp->SetBool("TiledBackground", ui->tiledBackground->isChecked());
@@ -330,20 +314,7 @@ void DlgSettingsGeneral::loadSettings()
ui->toolbarIconSize->setCurrentIndex(index);
//TreeMode combobox setup.
ui->treeMode->clear();
ui->treeMode->addItem(tr("Combo View"));
ui->treeMode->addItem(tr("TreeView and PropertyView"));
ui->treeMode->addItem(tr("Both"));
hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/DockWindows");
bool propertyView = hGrp->GetGroup("PropertyView")->GetBool("Enabled",false);
bool treeView = hGrp->GetGroup("TreeView")->GetBool("Enabled",false);
bool comboView = hGrp->GetGroup("ComboView")->GetBool("Enabled",true);
index = 0;
if(propertyView || treeView) {
index = comboView?2:1;
}
ui->treeMode->setCurrentIndex(index);
loadDockWindowVisibility();
hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/MainWindow");
ui->tiledBackground->setChecked(hGrp->GetBool("TiledBackground", false));
@@ -427,6 +398,48 @@ void DlgSettingsGeneral::changeEvent(QEvent *event)
}
}
void DlgSettingsGeneral::saveDockWindowVisibility()
{
auto hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/DockWindows");
bool treeView = hGrp->GetGroup("TreeView")->GetBool("Enabled", true);
bool propertyView = hGrp->GetGroup("PropertyView")->GetBool("Enabled", true);
bool comboView = hGrp->GetGroup("ComboView")->GetBool("Enabled", false);
switch (ui->treeMode->currentIndex()) {
case 0:
comboView = true;
treeView = propertyView = false;
break;
case 1:
treeView = propertyView = true;
comboView = false;
break;
}
hGrp->GetGroup("ComboView")->SetBool("Enabled", comboView);
hGrp->GetGroup("TreeView")->SetBool("Enabled", treeView);
hGrp->GetGroup("PropertyView")->SetBool("Enabled", propertyView);
}
void DlgSettingsGeneral::loadDockWindowVisibility()
{
ui->treeMode->clear();
ui->treeMode->addItem(tr("Combo View"));
ui->treeMode->addItem(tr("TreeView and PropertyView"));
auto hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/DockWindows");
bool propertyView = hGrp->GetGroup("PropertyView")->GetBool("Enabled", true);
bool treeView = hGrp->GetGroup("TreeView")->GetBool("Enabled", true);
bool comboView = hGrp->GetGroup("ComboView")->GetBool("Enabled", false);
int index = -1;
if (propertyView || treeView) {
index = 1;
}
else if (comboView) {
index = 0;
}
ui->treeMode->setCurrentIndex(index);
}
void DlgSettingsGeneral::recreatePreferencePackMenu()
{
ui->PreferencePacks->setRowCount(0); // Begin by clearing whatever is there

6
src/Gui/PreferencePages/DlgSettingsGeneral.h
View File

@@ -25,7 +25,7 @@
#ifndef GUI_DIALOG_DLGSETTINGSGENERAL_H
#define GUI_DIALOG_DLGSETTINGSGENERAL_H
#include <Gui/PropertyPage.h>
#include <memory>
#include <string>
@@ -72,6 +72,8 @@ public Q_SLOTS:
void onUnitSystemIndexChanged(int index);
private:
void saveDockWindowVisibility();
void loadDockWindowVisibility();
void setRecentFileSize();
void saveAsNewPreferencePack();
void revertToSavedConfig();
@@ -91,4 +93,4 @@ private:
} // namespace Dialog
} // namespace Gui
#endif // GUI_DIALOG_DLGSETTINGSGENERAL_H
#endif // GUI_DIALOG_DLGSETTINGSGENERAL_H

1
src/Gui/Workbench.cpp
View File

@@ -837,6 +837,7 @@ DockWindowItems* StdWorkbench::setupDockWindows() const
//root->addDockWidget("Std_HelpView", Qt::RightDockWidgetArea, true, false);
root->addDockWidget("Std_TreeView", Qt::LeftDockWidgetArea, true, false);
root->addDockWidget("Std_PropertyView", Qt::LeftDockWidgetArea, true, false);
root->addDockWidget("Std_TaskView", Qt::LeftDockWidgetArea, true, true);
root->addDockWidget("Std_SelectionView", Qt::LeftDockWidgetArea, false, false);
root->addDockWidget("Std_ComboView", Qt::LeftDockWidgetArea, false, false);
root->addDockWidget("Std_ReportView", Qt::BottomDockWidgetArea, true, true);