diff --git a/src/plugins/help/CMakeLists.txt b/src/plugins/help/CMakeLists.txt index 5402d77f7d4..7d6452c4738 100644 --- a/src/plugins/help/CMakeLists.txt +++ b/src/plugins/help/CMakeLists.txt @@ -6,7 +6,7 @@ add_qtc_plugin(Help SOURCES docsettingspage.cpp docsettingspage.h filtersettingspage.cpp filtersettingspage.h - generalsettingspage.cpp generalsettingspage.h generalsettingspage.ui + generalsettingspage.cpp generalsettingspage.h help.qrc helpconstants.h helpfindsupport.cpp helpfindsupport.h diff --git a/src/plugins/help/generalsettingspage.cpp b/src/plugins/help/generalsettingspage.cpp index ac595b12cfe..3d7068b9a4a 100644 --- a/src/plugins/help/generalsettingspage.cpp +++ b/src/plugins/help/generalsettingspage.cpp @@ -40,9 +40,19 @@ #include #include +#include +#include #include +#include +#include +#include +#include +#include +#include #include +#include #include +#include #include @@ -52,6 +62,200 @@ using namespace Utils; namespace Help { namespace Internal { +class GeneralSettingsPageWidget : public QWidget +{ +public: + GeneralSettingsPageWidget(); + + QSpinBox *zoomSpinBox; + QFontComboBox *familyComboBox; + QComboBox *styleComboBox; + QComboBox *sizeComboBox; + QLineEdit *homePageLineEdit; + QComboBox *helpStartComboBox; + QComboBox *contextHelpComboBox; + QPushButton *currentPageButton; + QPushButton *blankPageButton; + QPushButton *defaultPageButton; + QLabel *errorLabel; + QPushButton *importButton; + QPushButton *exportButton; + QCheckBox *scrollWheelZooming; + QCheckBox *m_returnOnClose; + QComboBox *viewerBackend; +}; + +GeneralSettingsPageWidget::GeneralSettingsPageWidget() +{ + // font group box + auto fontGroupBox = new QGroupBox( + QCoreApplication::translate("Help::Internal::GeneralSettingsPage", "Font")); + auto familyLabel = new QLabel( + QCoreApplication::translate("Help::Internal::GeneralSettingsPage", "Family:")); + + familyComboBox = new QFontComboBox; + auto styleLabel = new QLabel( + QCoreApplication::translate("Help::Internal::GeneralSettingsPage", "Style:")); + styleComboBox = new QComboBox; + auto sizeLabel = new QLabel( + QCoreApplication::translate("Help::Internal::GeneralSettingsPage", "Size:")); + sizeComboBox = new QComboBox; + + auto fontLayout = new QHBoxLayout(); + fontLayout->addWidget(familyComboBox); + fontLayout->addSpacing(20); + fontLayout->addWidget(styleLabel); + fontLayout->addWidget(styleComboBox); + fontLayout->addSpacing(20); + fontLayout->addWidget(sizeLabel); + fontLayout->addWidget(sizeComboBox); + fontLayout->addStretch(); + + auto noteLabel = new QLabel(QCoreApplication::translate( + "Help::Internal::GeneralSettingsPage", + "Note: The above setting takes effect only if the HTML file does not use a style sheet.")); + noteLabel->setWordWrap(true); + auto zoomLabel = new QLabel( + QCoreApplication::translate("Help::Internal::GeneralSettingsPage", "Zoom:")); + + zoomSpinBox = new QSpinBox; + zoomSpinBox->setMinimum(10); + zoomSpinBox->setMaximum(3000); + zoomSpinBox->setSingleStep(10); + zoomSpinBox->setValue(100); + zoomSpinBox->setSuffix(QCoreApplication::translate("Help::Internal::GeneralSettingsPage", "%")); + + auto zoomLayout = new QHBoxLayout(); + zoomLayout->addWidget(zoomSpinBox); + zoomLayout->addStretch(); + + auto fontGroupBoxLayout = new QGridLayout; + fontGroupBox->setLayout(fontGroupBoxLayout); + fontGroupBoxLayout->addWidget(familyLabel, 0, 0); + fontGroupBoxLayout->addLayout(fontLayout, 0, 1); + fontGroupBoxLayout->addWidget(noteLabel, 1, 0, 1, 2); + fontGroupBoxLayout->addWidget(zoomLabel, 2, 0); + fontGroupBoxLayout->addLayout(zoomLayout, 2, 1); + + // startup group box + auto startupGroupBox = new QGroupBox( + QCoreApplication::translate("Help::Internal::GeneralSettingsPage", "Startup")); + + contextHelpComboBox = new QComboBox(startupGroupBox); + contextHelpComboBox->addItem(QCoreApplication::translate("Help::Internal::GeneralSettingsPage", + "Show Side-by-Side if Possible")); + contextHelpComboBox->addItem(QCoreApplication::translate("Help::Internal::GeneralSettingsPage", + "Always Show Side-by-Side")); + contextHelpComboBox->addItem(QCoreApplication::translate("Help::Internal::GeneralSettingsPage", + "Always Show in Help Mode")); + contextHelpComboBox->addItem(QCoreApplication::translate("Help::Internal::GeneralSettingsPage", + "Always Show in External Window")); + + helpStartComboBox = new QComboBox(startupGroupBox); + helpStartComboBox->addItem( + QCoreApplication::translate("Help::Internal::GeneralSettingsPage", "Show My Home Page")); + helpStartComboBox->addItem( + QCoreApplication::translate("Help::Internal::GeneralSettingsPage", "Show a Blank Page")); + helpStartComboBox->addItem(QCoreApplication::translate("Help::Internal::GeneralSettingsPage", + "Show My Tabs from Last Session")); + + auto startupFormLayout = new QFormLayout; + startupGroupBox->setLayout(startupFormLayout); + startupFormLayout->setFieldGrowthPolicy(QFormLayout::ExpandingFieldsGrow); + startupFormLayout->addRow(QCoreApplication::translate("Help::Internal::GeneralSettingsPage", + "On context help:"), + contextHelpComboBox); + startupFormLayout->addRow(QCoreApplication::translate("Help::Internal::GeneralSettingsPage", + "On help start:"), + helpStartComboBox); + + homePageLineEdit = new QLineEdit; + currentPageButton = new QPushButton( + QCoreApplication::translate("Help::Internal::GeneralSettingsPage", "Use &Current Page")); + blankPageButton = new QPushButton( + QCoreApplication::translate("Help::Internal::GeneralSettingsPage", "Use &Blank Page")); + defaultPageButton = new QPushButton( + QCoreApplication::translate("Help::Internal::GeneralSettingsPage", "Reset")); + defaultPageButton->setToolTip( + QCoreApplication::translate("Help::Internal::GeneralSettingsPage", "Reset to default.")); + + auto homePageLayout = new QHBoxLayout; + homePageLayout->addWidget(homePageLineEdit); + homePageLayout->addWidget(currentPageButton); + homePageLayout->addWidget(blankPageButton); + homePageLayout->addWidget(defaultPageButton); + + startupFormLayout->addRow(QCoreApplication::translate("Help::Internal::GeneralSettingsPage", + "Home page:"), + homePageLayout); + + // behavior group box + auto behaviourGroupBox = new QGroupBox( + QCoreApplication::translate("Help::Internal::GeneralSettingsPage", "Behaviour")); + scrollWheelZooming = new QCheckBox( + QCoreApplication::translate("Help::Internal::GeneralSettingsPage", + "Enable scroll wheel zooming")); + + m_returnOnClose = new QCheckBox( + QCoreApplication::translate("Help::Internal::GeneralSettingsPage", + "Return to editor on closing the last page")); + m_returnOnClose->setToolTip( + QCoreApplication::translate("Help::Internal::GeneralSettingsPage", + "Switches to editor context after last help page is closed.")); + + auto viewerBackendLabel = new QLabel( + QCoreApplication::translate("Help::Internal::GeneralSettingsPage", "Viewer backend:")); + viewerBackend = new QComboBox; + const QString description = GeneralSettingsPage::tr( + "Change takes effect after reloading help pages."); + auto viewerBackendDescription = new QLabel(description); + viewerBackendLabel->setToolTip(description); + viewerBackend->setToolTip(description); + + auto viewerBackendLayout = new QHBoxLayout(); + viewerBackendLayout->addWidget(viewerBackendLabel); + viewerBackendLayout->addWidget(viewerBackend); + viewerBackendLayout->addWidget(viewerBackendDescription); + viewerBackendLayout->addStretch(); + + auto behaviourGroupBoxLayout = new QVBoxLayout; + behaviourGroupBox->setLayout(behaviourGroupBoxLayout); + behaviourGroupBoxLayout->addWidget(scrollWheelZooming); + behaviourGroupBoxLayout->addWidget(m_returnOnClose); + behaviourGroupBoxLayout->addLayout(viewerBackendLayout); + + // bookmarks + errorLabel = new QLabel(this); + QPalette palette; + QBrush brush(QColor(255, 0, 0, 255)); + brush.setStyle(Qt::SolidPattern); + palette.setBrush(QPalette::Active, QPalette::Text, brush); + palette.setBrush(QPalette::Inactive, QPalette::Text, brush); + QBrush brush1(QColor(120, 120, 120, 255)); + brush1.setStyle(Qt::SolidPattern); + palette.setBrush(QPalette::Disabled, QPalette::Text, brush1); + errorLabel->setPalette(palette); + + importButton = new QPushButton( + QCoreApplication::translate("Help::Internal::GeneralSettingsPage", "Import Bookmarks...")); + exportButton = new QPushButton( + QCoreApplication::translate("Help::Internal::GeneralSettingsPage", "Export Bookmarks...")); + + auto bookmarksLayout = new QHBoxLayout(); + bookmarksLayout->addStretch(); + bookmarksLayout->addWidget(errorLabel); + bookmarksLayout->addWidget(importButton); + bookmarksLayout->addWidget(exportButton); + + auto mainLayout = new QVBoxLayout; + setLayout(mainLayout); + mainLayout->addWidget(fontGroupBox); + mainLayout->addWidget(startupGroupBox); + mainLayout->addWidget(behaviourGroupBox); + mainLayout->addLayout(bookmarksLayout); + mainLayout->addStretch(1); +} + GeneralSettingsPage::GeneralSettingsPage() { setId("A.General settings"); @@ -64,96 +268,88 @@ GeneralSettingsPage::GeneralSettingsPage() QWidget *GeneralSettingsPage::widget() { if (!m_widget) { - m_widget = new QWidget; - m_ui = new Ui::GeneralSettingsPage; - m_ui->setupUi(m_widget); - m_ui->sizeComboBox->setEditable(false); - m_ui->styleComboBox->setEditable(false); + m_widget = new GeneralSettingsPageWidget; m_font = LocalHelpManager::fallbackFont(); m_fontZoom = LocalHelpManager::fontZoom(); - m_ui->zoomSpinBox->setValue(m_fontZoom); + m_widget->zoomSpinBox->setValue(m_fontZoom); updateFontSizeSelector(); updateFontStyleSelector(); updateFontFamilySelector(); - connect(m_ui->familyComboBox, &QFontComboBox::currentFontChanged, this, [this]() { + connect(m_widget->familyComboBox, &QFontComboBox::currentFontChanged, this, [this]() { updateFont(); updateFontStyleSelector(); updateFontSizeSelector(); updateFont(); // changes that might have happened when updating the selectors }); - connect(m_ui->styleComboBox, QOverload::of(&QComboBox::currentIndexChanged), + connect(m_widget->styleComboBox, QOverload::of(&QComboBox::currentIndexChanged), this, [this]() { updateFont(); updateFontSizeSelector(); updateFont(); // changes that might have happened when updating the selectors }); - connect(m_ui->sizeComboBox, QOverload::of(&QComboBox::currentIndexChanged), + connect(m_widget->sizeComboBox, QOverload::of(&QComboBox::currentIndexChanged), this, &GeneralSettingsPage::updateFont); - connect(m_ui->zoomSpinBox, QOverload::of(&QSpinBox::valueChanged), + connect(m_widget->zoomSpinBox, QOverload::of(&QSpinBox::valueChanged), this, [this](int value) { m_fontZoom = value; }); m_homePage = LocalHelpManager::homePage(); - m_ui->homePageLineEdit->setText(m_homePage); + m_widget->homePageLineEdit->setText(m_homePage); m_startOption = LocalHelpManager::startOption(); - m_ui->helpStartComboBox->setCurrentIndex(m_startOption); + m_widget->helpStartComboBox->setCurrentIndex(m_startOption); m_contextOption = LocalHelpManager::contextHelpOption(); - m_ui->contextHelpComboBox->setCurrentIndex(m_contextOption); + m_widget->contextHelpComboBox->setCurrentIndex(m_contextOption); - connect(m_ui->currentPageButton, &QPushButton::clicked, + connect(m_widget->currentPageButton, &QPushButton::clicked, this, &GeneralSettingsPage::setCurrentPage); - connect(m_ui->blankPageButton, &QPushButton::clicked, + connect(m_widget->blankPageButton, &QPushButton::clicked, this, &GeneralSettingsPage::setBlankPage); - connect(m_ui->defaultPageButton, + connect(m_widget->defaultPageButton, &QPushButton::clicked, this, &GeneralSettingsPage::setDefaultPage); HelpViewer *viewer = HelpPlugin::modeHelpWidget()->currentViewer(); if (!viewer) - m_ui->currentPageButton->setEnabled(false); + m_widget->currentPageButton->setEnabled(false); - m_ui->errorLabel->setVisible(false); - connect(m_ui->importButton, &QPushButton::clicked, + m_widget->errorLabel->setVisible(false); + connect(m_widget->importButton, &QPushButton::clicked, this, &GeneralSettingsPage::importBookmarks); - connect(m_ui->exportButton, &QPushButton::clicked, + connect(m_widget->exportButton, &QPushButton::clicked, this, &GeneralSettingsPage::exportBookmarks); m_returnOnClose = LocalHelpManager::returnOnClose(); - m_ui->m_returnOnClose->setChecked(m_returnOnClose); + m_widget->m_returnOnClose->setChecked(m_returnOnClose); m_scrollWheelZoomingEnabled = LocalHelpManager::isScrollWheelZoomingEnabled(); - m_ui->scrollWheelZooming->setChecked(m_scrollWheelZoomingEnabled); + m_widget->scrollWheelZooming->setChecked(m_scrollWheelZoomingEnabled); - const QString description = tr("Change takes effect after reloading help pages."); - m_ui->viewerBackendDescription->setText(description); - m_ui->viewerBackendLabel->setToolTip(description); - m_ui->viewerBackend->setToolTip(description); - m_ui->viewerBackend->addItem(tr("Default (%1)", "Default viewer backend") + m_widget->viewerBackend->addItem(tr("Default (%1)", "Default viewer backend") .arg(LocalHelpManager::defaultViewerBackend().displayName)); const QByteArray currentBackend = LocalHelpManager::viewerBackendId(); const QVector backends = LocalHelpManager::viewerBackends(); for (const HelpViewerFactory &f : backends) { - m_ui->viewerBackend->addItem(f.displayName, f.id); + m_widget->viewerBackend->addItem(f.displayName, f.id); if (f.id == currentBackend) - m_ui->viewerBackend->setCurrentIndex(m_ui->viewerBackend->count() - 1); + m_widget->viewerBackend->setCurrentIndex(m_widget->viewerBackend->count() - 1); } if (backends.size() == 1) - m_ui->viewerBackend->setEnabled(false); + m_widget->viewerBackend->setEnabled(false); } return m_widget; } void GeneralSettingsPage::apply() { - if (!m_ui) // page was never shown + if (!m_widget) // page was never shown return; if (m_font != LocalHelpManager::fallbackFont()) @@ -162,40 +358,40 @@ void GeneralSettingsPage::apply() if (m_fontZoom != LocalHelpManager::fontZoom()) LocalHelpManager::setFontZoom(m_fontZoom); - QString homePage = QUrl::fromUserInput(m_ui->homePageLineEdit->text()).toString(); + QString homePage = QUrl::fromUserInput(m_widget->homePageLineEdit->text()).toString(); if (homePage.isEmpty()) homePage = Help::Constants::AboutBlank; - m_ui->homePageLineEdit->setText(homePage); + m_widget->homePageLineEdit->setText(homePage); if (m_homePage != homePage) { m_homePage = homePage; LocalHelpManager::setHomePage(homePage); } - const int startOption = m_ui->helpStartComboBox->currentIndex(); + const int startOption = m_widget->helpStartComboBox->currentIndex(); if (m_startOption != startOption) { m_startOption = startOption; LocalHelpManager::setStartOption(LocalHelpManager::StartOption(m_startOption)); } - const int helpOption = m_ui->contextHelpComboBox->currentIndex(); + const int helpOption = m_widget->contextHelpComboBox->currentIndex(); if (m_contextOption != helpOption) { m_contextOption = helpOption; LocalHelpManager::setContextHelpOption(HelpManager::HelpViewerLocation(m_contextOption)); } - const bool close = m_ui->m_returnOnClose->isChecked(); + const bool close = m_widget->m_returnOnClose->isChecked(); if (m_returnOnClose != close) { m_returnOnClose = close; LocalHelpManager::setReturnOnClose(m_returnOnClose); } - const bool zoom = m_ui->scrollWheelZooming->isChecked(); + const bool zoom = m_widget->scrollWheelZooming->isChecked(); if (m_scrollWheelZoomingEnabled != zoom) { m_scrollWheelZoomingEnabled = zoom; LocalHelpManager::setScrollWheelZoomingEnabled(m_scrollWheelZoomingEnabled); } - const QByteArray viewerBackendId = m_ui->viewerBackend->currentData().toByteArray(); + const QByteArray viewerBackendId = m_widget->viewerBackend->currentData().toByteArray(); LocalHelpManager::setViewerBackendId(viewerBackendId); } @@ -203,22 +399,22 @@ void GeneralSettingsPage::setCurrentPage() { HelpViewer *viewer = HelpPlugin::modeHelpWidget()->currentViewer(); if (viewer) - m_ui->homePageLineEdit->setText(viewer->source().toString()); + m_widget->homePageLineEdit->setText(viewer->source().toString()); } void GeneralSettingsPage::setBlankPage() { - m_ui->homePageLineEdit->setText(Help::Constants::AboutBlank); + m_widget->homePageLineEdit->setText(Help::Constants::AboutBlank); } void GeneralSettingsPage::setDefaultPage() { - m_ui->homePageLineEdit->setText(LocalHelpManager::defaultHomePage()); + m_widget->homePageLineEdit->setText(LocalHelpManager::defaultHomePage()); } void GeneralSettingsPage::importBookmarks() { - m_ui->errorLabel->setVisible(false); + m_widget->errorLabel->setVisible(false); FilePath filePath = FileUtils::getOpenFilePath(nullptr, tr("Import Bookmarks"), FilePath::fromString(QDir::currentPath()), tr("Files (*.xbel)")); @@ -234,13 +430,13 @@ void GeneralSettingsPage::importBookmarks() return; } - m_ui->errorLabel->setVisible(true); - m_ui->errorLabel->setText(tr("Cannot import bookmarks.")); + m_widget->errorLabel->setVisible(true); + m_widget->errorLabel->setText(tr("Cannot import bookmarks.")); } void GeneralSettingsPage::exportBookmarks() { - m_ui->errorLabel->setVisible(false); + m_widget->errorLabel->setVisible(false); FilePath filePath = FileUtils::getSaveFilePath(nullptr, tr("Save File"), "untitled.xbel", tr("Files (*.xbel)")); @@ -256,8 +452,8 @@ void GeneralSettingsPage::exportBookmarks() saver.setResult(&writer); } if (!saver.finalize()) { - m_ui->errorLabel->setVisible(true); - m_ui->errorLabel->setText(saver.errorString()); + m_widget->errorLabel->setVisible(true); + m_widget->errorLabel->setText(saver.errorString()); } } @@ -270,19 +466,19 @@ void GeneralSettingsPage::updateFontSizeSelector() if (pointSizes.empty()) pointSizes = QFontDatabase::standardSizes(); - QSignalBlocker blocker(m_ui->sizeComboBox); - m_ui->sizeComboBox->clear(); - m_ui->sizeComboBox->setCurrentIndex(-1); - m_ui->sizeComboBox->setEnabled(!pointSizes.empty()); + QSignalBlocker blocker(m_widget->sizeComboBox); + m_widget->sizeComboBox->clear(); + m_widget->sizeComboBox->setCurrentIndex(-1); + m_widget->sizeComboBox->setEnabled(!pointSizes.empty()); // try to maintain selection or select closest. if (!pointSizes.empty()) { QString n; foreach (int pointSize, pointSizes) - m_ui->sizeComboBox->addItem(n.setNum(pointSize), QVariant(pointSize)); + m_widget->sizeComboBox->addItem(n.setNum(pointSize), QVariant(pointSize)); const int closestIndex = closestPointSizeIndex(m_font.pointSize()); if (closestIndex != -1) - m_ui->sizeComboBox->setCurrentIndex(closestIndex); + m_widget->sizeComboBox->setCurrentIndex(closestIndex); } } @@ -291,49 +487,49 @@ void GeneralSettingsPage::updateFontStyleSelector() const QString &fontStyle = m_fontDatabase.styleString(m_font); const QStringList &styles = m_fontDatabase.styles(m_font.family()); - QSignalBlocker blocker(m_ui->styleComboBox); - m_ui->styleComboBox->clear(); - m_ui->styleComboBox->setCurrentIndex(-1); - m_ui->styleComboBox->setEnabled(!styles.empty()); + QSignalBlocker blocker(m_widget->styleComboBox); + m_widget->styleComboBox->clear(); + m_widget->styleComboBox->setCurrentIndex(-1); + m_widget->styleComboBox->setEnabled(!styles.empty()); if (!styles.empty()) { int normalIndex = -1; const QString normalStyle = "Normal"; foreach (const QString &style, styles) { // try to maintain selection or select 'normal' preferably - const int newIndex = m_ui->styleComboBox->count(); - m_ui->styleComboBox->addItem(style); + const int newIndex = m_widget->styleComboBox->count(); + m_widget->styleComboBox->addItem(style); if (fontStyle == style) { - m_ui->styleComboBox->setCurrentIndex(newIndex); + m_widget->styleComboBox->setCurrentIndex(newIndex); } else { if (fontStyle == normalStyle) normalIndex = newIndex; } } - if (m_ui->styleComboBox->currentIndex() == -1 && normalIndex != -1) - m_ui->styleComboBox->setCurrentIndex(normalIndex); + if (m_widget->styleComboBox->currentIndex() == -1 && normalIndex != -1) + m_widget->styleComboBox->setCurrentIndex(normalIndex); } } void GeneralSettingsPage::updateFontFamilySelector() { - m_ui->familyComboBox->setCurrentFont(m_font); + m_widget->familyComboBox->setCurrentFont(m_font); } void GeneralSettingsPage::updateFont() { - const QString &family = m_ui->familyComboBox->currentFont().family(); + const QString &family = m_widget->familyComboBox->currentFont().family(); m_font.setFamily(family); int fontSize = 14; - int currentIndex = m_ui->sizeComboBox->currentIndex(); + int currentIndex = m_widget->sizeComboBox->currentIndex(); if (currentIndex != -1) - fontSize = m_ui->sizeComboBox->itemData(currentIndex).toInt(); + fontSize = m_widget->sizeComboBox->itemData(currentIndex).toInt(); m_font.setPointSize(fontSize); - currentIndex = m_ui->styleComboBox->currentIndex(); + currentIndex = m_widget->styleComboBox->currentIndex(); if (currentIndex != -1) - m_font.setStyleName(m_ui->styleComboBox->itemText(currentIndex)); + m_font.setStyleName(m_widget->styleComboBox->itemText(currentIndex)); } int GeneralSettingsPage::closestPointSizeIndex(int desiredPointSize) const @@ -342,9 +538,9 @@ int GeneralSettingsPage::closestPointSizeIndex(int desiredPointSize) const int closestIndex = -1; int closestAbsError = 0xFFFF; - const int pointSizeCount = m_ui->sizeComboBox->count(); + const int pointSizeCount = m_widget->sizeComboBox->count(); for (int i = 0; i < pointSizeCount; i++) { - const int itemPointSize = m_ui->sizeComboBox->itemData(i).toInt(); + const int itemPointSize = m_widget->sizeComboBox->itemData(i).toInt(); const int absError = qAbs(desiredPointSize - itemPointSize); if (absError < closestAbsError) { closestIndex = i; @@ -362,10 +558,6 @@ int GeneralSettingsPage::closestPointSizeIndex(int desiredPointSize) const void GeneralSettingsPage::finish() { delete m_widget; - if (!m_ui) // page was never shown - return; - delete m_ui; - m_ui = nullptr; } } // Internal diff --git a/src/plugins/help/generalsettingspage.h b/src/plugins/help/generalsettingspage.h index 0c1353f267f..5a50ee4deb8 100644 --- a/src/plugins/help/generalsettingspage.h +++ b/src/plugins/help/generalsettingspage.h @@ -25,14 +25,16 @@ #pragma once -#include "ui_generalsettingspage.h" #include +#include #include namespace Help { namespace Internal { +class GeneralSettingsPageWidget; + class GeneralSettingsPage : public Core::IOptionsPage { Q_OBJECT @@ -68,8 +70,7 @@ private: bool m_returnOnClose; bool m_scrollWheelZoomingEnabled; - QPointer m_widget; - Ui::GeneralSettingsPage *m_ui = nullptr; + QPointer m_widget; }; } // Internal diff --git a/src/plugins/help/generalsettingspage.ui b/src/plugins/help/generalsettingspage.ui deleted file mode 100644 index 90936861cdb..00000000000 --- a/src/plugins/help/generalsettingspage.ui +++ /dev/null @@ -1,500 +0,0 @@ - - - Help::Internal::GeneralSettingsPage - - - - 0 - 0 - 706 - 594 - - - - - - - - - - Font - - - - - - - 0 - 0 - - - - Family: - - - - - - - - - - - - Qt::Horizontal - - - QSizePolicy::Preferred - - - - 20 - 20 - - - - - - - - - 0 - 0 - - - - Style: - - - - - - - - 1 - 0 - - - - - - - - Qt::Horizontal - - - QSizePolicy::Preferred - - - - 20 - 20 - - - - - - - - - 0 - 0 - - - - Size: - - - - - - - - 1 - 0 - - - - - - - - Qt::Horizontal - - - - 13 - 20 - - - - - - - - - - Note: The above setting takes effect only if the HTML file does not use a style sheet. - - - true - - - - - - - - 0 - 0 - - - - Zoom: - - - - - - - - - % - - - 10 - - - 3000 - - - 10 - - - 100 - - - - - - - Qt::Horizontal - - - - 13 - 20 - - - - - - - - - - - - - true - - - Startup - - - - - - QFormLayout::ExpandingFieldsGrow - - - - - - 0 - 0 - - - - On context help: - - - - - - - - 0 - 0 - - - - - Show Side-by-Side if Possible - - - - - Always Show Side-by-Side - - - - - Always Show in Help Mode - - - - - Always Show in External Window - - - - - - - - - 0 - 0 - - - - On help start: - - - - - - - - 0 - 0 - - - - - Show My Home Page - - - - - Show a Blank Page - - - - - Show My Tabs from Last Session - - - - - - - - Home page: - - - - - - - - - - - - Use &Current Page - - - - - - - Use &Blank Page - - - - - - - Reset to default. - - - Reset - - - - - - - - - - - - - - Behaviour - - - - - - Enable scroll wheel zooming - - - - - - - Switches to editor context after last help page is closed. - - - Return to editor on closing the last page - - - - - - - - - Viewer backend: - - - - - - - - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - - - - Qt::Horizontal - - - - 244 - 20 - - - - - - - - - - - - - 255 - 0 - 0 - - - - - - - - - 255 - 0 - 0 - - - - - - - - - 120 - 120 - 120 - - - - - - - - - - - - Import Bookmarks... - - - - - - - Export Bookmarks... - - - - - - - - - Qt::Vertical - - - QSizePolicy::MinimumExpanding - - - - 0 - 0 - - - - - - - - familyComboBox - styleComboBox - sizeComboBox - contextHelpComboBox - helpStartComboBox - homePageLineEdit - currentPageButton - blankPageButton - defaultPageButton - m_returnOnClose - importButton - exportButton - - - - diff --git a/src/plugins/help/help.qbs b/src/plugins/help/help.qbs index efd8d6110ac..ec3fb7929e4 100644 --- a/src/plugins/help/help.qbs +++ b/src/plugins/help/help.qbs @@ -37,7 +37,7 @@ Project { files: [ "docsettingspage.cpp", "docsettingspage.h", "filtersettingspage.cpp", "filtersettingspage.h", - "generalsettingspage.cpp", "generalsettingspage.h", "generalsettingspage.ui", + "generalsettingspage.cpp", "generalsettingspage.h", "help.qrc", "helpconstants.h", "helpfindsupport.cpp", "helpfindsupport.h",