Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Frontend changes to accommodate global docsets option #1689

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Frontend changes to accommodate global docsets option #1689

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/libs/core/settings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,7 @@ void Settings::load()
docsetPath = QStringLiteral("docsets");
#endif
}
useGlobalDocsets = settings->value(QStringLiteral("use_global"), true).toBool();
settings->endGroup();

// Create the docset storage directory if it doesn't exist.
Expand Down Expand Up @@ -268,6 +269,7 @@ void Settings::save()

settings->beginGroup(GroupDocsets);
settings->setValue(QStringLiteral("path"), docsetPath);
settings->setValue(QStringLiteral("use_global"), useGlobalDocsets);
settings->endGroup();

settings->beginGroup(GroupState);
Expand Down
1 change: 1 addition & 0 deletions src/libs/core/settings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ class Settings final : public QObject

// Other
QString docsetPath;
bool useGlobalDocsets;

// State
QByteArray windowGeometry;
Expand Down
2 changes: 2 additions & 0 deletions src/libs/ui/settingsdialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,7 @@ void SettingsDialog::loadSettings()
ui->toolButton->setKeySequence(settings->showShortcut);

ui->docsetStorageEdit->setText(QDir::toNativeSeparators(settings->docsetPath));
ui->docsetStorageGlobalCheckBox->setChecked(settings->useGlobalDocsets);

// Tabs Tab
ui->openNewTabAfterActive->setChecked(settings->openNewTabAfterActive);
Expand Down Expand Up @@ -259,6 +260,7 @@ void SettingsDialog::saveSettings()
settings->showShortcut = ui->toolButton->keySequence();

settings->docsetPath = QDir::fromNativeSeparators(ui->docsetStorageEdit->text());
settings->useGlobalDocsets = ui->docsetStorageGlobalCheckBox->isChecked();

// Tabs Tab
settings->openNewTabAfterActive = ui->openNewTabAfterActive->isChecked();
Expand Down
8 changes: 8 additions & 0 deletions src/libs/ui/settingsdialog.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,13 @@
</item>
</layout>
</item>
<item row="1" column="0" colspan="2">
<widget class="QCheckBox" name="docsetStorageGlobalCheckBox">
<property name="text">
<string>Enable global docset storage</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
Expand Down Expand Up @@ -797,6 +804,7 @@
<class>SettingsDialog</class>
<extends>QDialog</extends>
<header>ui/settingsdialog.h</header>
<container>1</container>
</customwidget>
</customwidgets>
<resources/>
Expand Down
Loading