mirror of
https://invent.kde.org/system/dolphin
synced 2024-07-04 17:30:55 +00:00
Merge branch 'work/meven/confirmation-settings' into 'master'
settings: improve confirmation tab layou layout See merge request system/dolphin!772
This commit is contained in:
commit
6ed3a2363f
|
@ -18,6 +18,7 @@
|
||||||
#include <QComboBox>
|
#include <QComboBox>
|
||||||
#include <QFormLayout>
|
#include <QFormLayout>
|
||||||
#include <QLabel>
|
#include <QLabel>
|
||||||
|
#include <QVBoxLayout>
|
||||||
|
|
||||||
namespace
|
namespace
|
||||||
{
|
{
|
||||||
|
@ -72,19 +73,23 @@ ConfirmationsSettingsPage::ConfirmationsSettingsPage(QWidget *parent)
|
||||||
m_confirmScriptExecution = new QComboBox(this);
|
m_confirmScriptExecution = new QComboBox(this);
|
||||||
m_confirmScriptExecution->addItems({i18n("Always ask"), i18n("Open in application"), i18n("Run script")});
|
m_confirmScriptExecution->addItems({i18n("Always ask"), i18n("Open in application"), i18n("Run script")});
|
||||||
|
|
||||||
topLayout->addRow(confirmLabelKde);
|
auto *layout1 = new QVBoxLayout();
|
||||||
topLayout->addRow(nullptr, m_confirmMoveToTrash);
|
layout1->addWidget(m_confirmMoveToTrash);
|
||||||
topLayout->addRow(nullptr, m_confirmEmptyTrash);
|
layout1->addWidget(m_confirmEmptyTrash);
|
||||||
|
topLayout->addRow(confirmLabelKde, layout1);
|
||||||
topLayout->addRow(nullptr, m_confirmDelete);
|
topLayout->addRow(nullptr, m_confirmDelete);
|
||||||
|
|
||||||
topLayout->addItem(new QSpacerItem(0, Dolphin::VERTICAL_SPACER_HEIGHT, QSizePolicy::Fixed, QSizePolicy::Fixed));
|
topLayout->addItem(new QSpacerItem(0, Dolphin::VERTICAL_SPACER_HEIGHT, QSizePolicy::Fixed, QSizePolicy::Fixed));
|
||||||
topLayout->addRow(confirmLabelDolphin);
|
|
||||||
topLayout->addRow(nullptr, m_confirmClosingMultipleTabs);
|
QVBoxLayout *layout2 = new QVBoxLayout();
|
||||||
|
layout2->addWidget(m_confirmClosingMultipleTabs);
|
||||||
|
|
||||||
#if HAVE_TERMINAL
|
#if HAVE_TERMINAL
|
||||||
topLayout->addRow(nullptr, m_confirmClosingTerminalRunningProgram);
|
layout2->addWidget(m_confirmClosingTerminalRunningProgram);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
topLayout->addRow(confirmLabelDolphin, layout2);
|
||||||
|
|
||||||
topLayout->addRow(nullptr, m_confirmOpenManyFolders);
|
topLayout->addRow(nullptr, m_confirmOpenManyFolders);
|
||||||
topLayout->addRow(nullptr, m_confirmOpenManyTerminals);
|
topLayout->addRow(nullptr, m_confirmOpenManyTerminals);
|
||||||
if (KProtocolInfo::isKnownProtocol(QStringLiteral("admin"))) {
|
if (KProtocolInfo::isKnownProtocol(QStringLiteral("admin"))) {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user