feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

AdvancedDockingSystem: WorkspaceDialog: Use Layouting

Browse Source 
Change-Id: I998147908941b4390c810983a5676628f07b1250
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Jarek Kobus
2022-11-17 17:05:07 +01:00
parent bcdfe1cedc
commit 7afe536a5c
8 changed files with 116 additions and 279 deletions
Download Patch File Download Diff File Expand all files Collapse all files

163
src/libs/advanceddockingsystem/workspacedialog.cpp
View File

@@ -4,10 +4,16 @@
#include "workspacedialog.h"
#include "dockmanager.h"
#include "workspaceview.h"
#include <utils/algorithm.h>
#include <utils/layoutbuilder.h>
#include <QInputDialog>
#include <QCheckBox>
#include <QDialogButtonBox>
#include <QLabel>
#include <QLineEdit>
#include <QPushButton>
#include <QRegularExpression>
#include <QValidator>
@@ -59,12 +65,9 @@ WorkspaceNameInputDialog::WorkspaceNameInputDialog(DockManager *manager, QWidget
: QDialog(parent)
, m_manager(manager)
{
auto hlayout = new QVBoxLayout(this);
auto label = new QLabel(tr("Enter the name of the workspace:"), this);
hlayout->addWidget(label);
m_newWorkspaceLineEdit = new QLineEdit(this);
m_newWorkspaceLineEdit->setValidator(new WorkspaceValidator(this, m_manager->workspaces()));
hlayout->addWidget(m_newWorkspaceLineEdit);
auto buttons = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel,
Qt::Horizontal,
this);
@@ -74,8 +77,14 @@ WorkspaceNameInputDialog::WorkspaceNameInputDialog(DockManager *manager, QWidget
connect(m_switchToButton, &QPushButton::clicked, [this]() { m_usedSwitchTo = true; });
connect(buttons, &QDialogButtonBox::accepted, this, &QDialog::accept);
connect(buttons, &QDialogButtonBox::rejected, this, &QDialog::reject);
hlayout->addWidget(buttons);
setLayout(hlayout);
using namespace Utils::Layouting;
Column {
label,
m_newWorkspaceLineEdit,
buttons
}.attachTo(this);
}
void WorkspaceNameInputDialog::setActionText(const QString &actionText,
@@ -103,64 +112,90 @@ bool WorkspaceNameInputDialog::isSwitchToRequested() const
WorkspaceDialog::WorkspaceDialog(DockManager *manager, QWidget *parent)
: QDialog(parent)
, m_manager(manager)
, m_workspaceView(new WorkspaceView(manager))
, m_btCreateNew(new QPushButton(tr("&New")))
, m_btRename(new QPushButton(tr("&Rename")))
, m_btClone(new QPushButton(tr("C&lone")))
, m_btDelete(new QPushButton(tr("&Delete")))
, m_btReset(new QPushButton(tr("Reset")))
, m_btSwitch(new QPushButton(tr("&Switch To")))
, m_btImport(new QPushButton(tr("Import")))
, m_btExport(new QPushButton(tr("Export")))
, m_autoLoadCheckBox(new QCheckBox(tr("Restore last workspace on startup")))
{
m_ui.setupUi(this);
m_ui.workspaceView->setActivationMode(Utils::DoubleClickActivation);
setWindowTitle(tr("Workspace Manager"));
connect(m_ui.btCreateNew,
&QAbstractButton::clicked,
m_ui.workspaceView,
&WorkspaceView::createNewWorkspace);
connect(m_ui.btClone,
&QAbstractButton::clicked,
m_ui.workspaceView,
&WorkspaceView::cloneCurrentWorkspace);
connect(m_ui.btDelete,
&QAbstractButton::clicked,
m_ui.workspaceView,
&WorkspaceView::deleteSelectedWorkspaces);
connect(m_ui.btSwitch,
&QAbstractButton::clicked,
m_ui.workspaceView,
&WorkspaceView::switchToCurrentWorkspace);
connect(m_ui.btRename,
&QAbstractButton::clicked,
m_ui.workspaceView,
&WorkspaceView::renameCurrentWorkspace);
connect(m_ui.btReset,
&QAbstractButton::clicked,
m_ui.workspaceView,
&WorkspaceView::resetCurrentWorkspace);
connect(m_ui.workspaceView,
&WorkspaceView::workspaceActivated,
m_ui.workspaceView,
&WorkspaceView::switchToCurrentWorkspace);
connect(m_ui.workspaceView,
&WorkspaceView::workspacesSelected,
this,
&WorkspaceDialog::updateActions);
connect(m_ui.btImport,
&QAbstractButton::clicked,
m_ui.workspaceView,
&WorkspaceView::importWorkspace);
connect(m_ui.btExport,
&QAbstractButton::clicked,
m_ui.workspaceView,
&WorkspaceView::exportCurrentWorkspace);
m_workspaceView->setActivationMode(Utils::DoubleClickActivation);
m_ui.whatsAWorkspaceLabel->setOpenExternalLinks(true);
QLabel *whatsAWorkspaceLabel = new QLabel(tr("<a href=\"qthelp://org.qt-project.qtcreator/doc/"
"creator-project-managing-workspaces.html\">What is a Workspace?</a>"));
whatsAWorkspaceLabel->setOpenExternalLinks(true);
updateActions(m_ui.workspaceView->selectedWorkspaces());
QDialogButtonBox *buttonBox = new QDialogButtonBox;
buttonBox->setStandardButtons(QDialogButtonBox::Close);
connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
connect(buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);
using namespace Utils::Layouting;
Column {
Row {
Column {
m_workspaceView,
m_autoLoadCheckBox
},
Column {
m_btCreateNew,
m_btRename,
m_btClone,
m_btDelete,
m_btReset,
m_btSwitch,
st,
m_btImport,
m_btExport
}
},
hr,
Row {
whatsAWorkspaceLabel,
buttonBox
}
}.attachTo(this);
connect(m_btCreateNew, &QAbstractButton::clicked,
m_workspaceView, &WorkspaceView::createNewWorkspace);
connect(m_btClone, &QAbstractButton::clicked,
m_workspaceView, &WorkspaceView::cloneCurrentWorkspace);
connect(m_btDelete, &QAbstractButton::clicked,
m_workspaceView, &WorkspaceView::deleteSelectedWorkspaces);
connect(m_btSwitch, &QAbstractButton::clicked,
m_workspaceView, &WorkspaceView::switchToCurrentWorkspace);
connect(m_btRename, &QAbstractButton::clicked,
m_workspaceView, &WorkspaceView::renameCurrentWorkspace);
connect(m_btReset, &QAbstractButton::clicked,
m_workspaceView, &WorkspaceView::resetCurrentWorkspace);
connect(m_workspaceView, &WorkspaceView::workspaceActivated,
m_workspaceView, &WorkspaceView::switchToCurrentWorkspace);
connect(m_workspaceView, &WorkspaceView::workspacesSelected,
this, &WorkspaceDialog::updateActions);
connect(m_btImport, &QAbstractButton::clicked,
m_workspaceView, &WorkspaceView::importWorkspace);
connect(m_btExport, &QAbstractButton::clicked,
m_workspaceView, &WorkspaceView::exportCurrentWorkspace);
updateActions(m_workspaceView->selectedWorkspaces());
}
void WorkspaceDialog::setAutoLoadWorkspace(bool check)
{
m_ui.autoLoadCheckBox->setChecked(check);
m_autoLoadCheckBox->setChecked(check);
}
bool WorkspaceDialog::autoLoadWorkspace() const
{
return m_ui.autoLoadCheckBox->checkState() == Qt::Checked;
return m_autoLoadCheckBox->checkState() == Qt::Checked;
}
DockManager *WorkspaceDialog::dockManager() const
@@ -171,12 +206,12 @@ DockManager *WorkspaceDialog::dockManager() const
void WorkspaceDialog::updateActions(const QStringList &workspaces)
{
if (workspaces.isEmpty()) {
m_ui.btDelete->setEnabled(false);
m_ui.btRename->setEnabled(false);
m_ui.btClone->setEnabled(false);
m_ui.btReset->setEnabled(false);
m_ui.btSwitch->setEnabled(false);
m_ui.btExport->setEnabled(false);
m_btDelete->setEnabled(false);
m_btRename->setEnabled(false);
m_btClone->setEnabled(false);
m_btReset->setEnabled(false);
m_btSwitch->setEnabled(false);
m_btExport->setEnabled(false);
return;
}
const bool presetIsSelected = Utils::anyOf(workspaces, [this](const QString &workspace) {
@@ -185,12 +220,12 @@ void WorkspaceDialog::updateActions(const QStringList &workspaces)
const bool activeIsSelected = Utils::anyOf(workspaces, [this](const QString &workspace) {
return workspace == m_manager->activeWorkspace();
});
m_ui.btDelete->setEnabled(!activeIsSelected && !presetIsSelected);
m_ui.btRename->setEnabled(workspaces.size() == 1 && !presetIsSelected);
m_ui.btClone->setEnabled(workspaces.size() == 1);
m_ui.btReset->setEnabled(presetIsSelected);
m_ui.btSwitch->setEnabled(workspaces.size() == 1);
m_ui.btExport->setEnabled(workspaces.size() == 1);
m_btDelete->setEnabled(!activeIsSelected && !presetIsSelected);
m_btRename->setEnabled(workspaces.size() == 1 && !presetIsSelected);
m_btClone->setEnabled(workspaces.size() == 1);
m_btReset->setEnabled(presetIsSelected);
m_btSwitch->setEnabled(workspaces.size() == 1);
m_btExport->setEnabled(workspaces.size() == 1);
}
} // namespace ADS