From 74d609a782046e65cc44d5e1de108ecd3602c9ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Tue, 16 Jan 2018 15:14:18 +0100 Subject: [PATCH] Always show Advanced config page. --- src/config/configureoptionsdialog.cpp | 9 +++------ src/main.cpp | 3 +-- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/config/configureoptionsdialog.cpp b/src/config/configureoptionsdialog.cpp index 2b36cdc..f1a03e8 100644 --- a/src/config/configureoptionsdialog.cpp +++ b/src/config/configureoptionsdialog.cpp @@ -62,13 +62,10 @@ ConfigureOptionsDialog::ConfigureOptionsDialog(QWidget* parent, const OperationS item = addPage(&fileSystemColorsPageWidget(), xi18nc("@title:tab", "File System Colors"), QString(), i18n("File System Color Settings")); item->setIcon(QIcon::fromTheme(QStringLiteral("format-fill-color")).pixmap(IconSize(KIconLoader::Desktop))); - if (QCoreApplication::arguments().contains(QLatin1String("--advconfig"))) { - item = addPage(&advancedPageWidget(), xi18nc("@title:tab advanced application settings", "Advanced"), QString(), i18n("Advanced Settings")); - item->setIcon(QIcon::fromTheme(QStringLiteral("configure")).pixmap(IconSize(KIconLoader::Desktop))); + item = addPage(&advancedPageWidget(), xi18nc("@title:tab advanced application settings", "Advanced"), QString(), i18n("Advanced Settings")); + item->setIcon(QIcon::fromTheme(QStringLiteral("configure")).pixmap(IconSize(KIconLoader::Desktop))); - connect(&advancedPageWidget().comboBackend(), qOverload(&QComboBox::activated), this, &ConfigureOptionsDialog::onComboDefaultFileSystemActivated); - } else - advancedPageWidget().setVisible(false); + connect(&advancedPageWidget().comboBackend(), qOverload(&QComboBox::activated), this, &ConfigureOptionsDialog::onComboDefaultFileSystemActivated); KConfigGroup kcg(KSharedConfig::openConfig(), "configureOptionsDialogs"); restoreGeometry(kcg.readEntry("Geometry", QByteArray())); diff --git a/src/main.cpp b/src/main.cpp index 72fbdad..ab2c814 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -69,8 +69,7 @@ int Q_DECL_IMPORT main(int argc, char* argv[]) QCommandLineParser parser; aboutData.setupCommandLine(&parser); parser.addOption(QCommandLineOption(QLatin1Literal("dontsu"), xi18nc("@info:shell", "Do not try to gain super user privileges"))); - parser.addOption(QCommandLineOption(QLatin1Literal("advconfig"), xi18nc("@info:shell", "Show advanced tab in configuration dialog"))); - parser.addPositionalArgument(QStringLiteral("device"), xi18nc("@info:shell", "Device(s) to manage"), QStringLiteral("[device...]")); +// FIXME parser.addPositionalArgument(QStringLiteral("device"), xi18nc("@info:shell", "Device(s) to manage"), QStringLiteral("[device...]")); parser.process(app); aboutData.processCommandLine(&parser);