Skip to content

Commit c90d547

Browse files
committed
Frontend changes to accommodate global docsets option
1 parent 48289b9 commit c90d547

File tree

4 files changed

+13
-0
lines changed

4 files changed

+13
-0
lines changed

src/libs/core/settings.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,7 @@ void Settings::load()
189189
docsetPath = QStringLiteral("docsets");
190190
#endif
191191
}
192+
useGlobalDocsets = settings->value(QStringLiteral("use_global"), true).toBool();
192193
settings->endGroup();
193194

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

269270
settings->beginGroup(GroupDocsets);
270271
settings->setValue(QStringLiteral("path"), docsetPath);
272+
settings->setValue(QStringLiteral("use_global"), useGlobalDocsets);
271273
settings->endGroup();
272274

273275
settings->beginGroup(GroupState);

src/libs/core/settings.h

+1
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ class Settings final : public QObject
9898

9999
// Other
100100
QString docsetPath;
101+
bool useGlobalDocsets;
101102

102103
// State
103104
QByteArray windowGeometry;

src/libs/ui/settingsdialog.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,7 @@ void SettingsDialog::loadSettings()
166166
ui->toolButton->setKeySequence(settings->showShortcut);
167167

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

170171
// Tabs Tab
171172
ui->openNewTabAfterActive->setChecked(settings->openNewTabAfterActive);
@@ -259,6 +260,7 @@ void SettingsDialog::saveSettings()
259260
settings->showShortcut = ui->toolButton->keySequence();
260261

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

263265
// Tabs Tab
264266
settings->openNewTabAfterActive = ui->openNewTabAfterActive->isChecked();

src/libs/ui/settingsdialog.ui

+8
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,13 @@
145145
</item>
146146
</layout>
147147
</item>
148+
<item row="1" column="0" colspan="2">
149+
<widget class="QCheckBox" name="docsetStorageGlobalCheckBox">
150+
<property name="text">
151+
<string>Enable global docset storage</string>
152+
</property>
153+
</widget>
154+
</item>
148155
</layout>
149156
</widget>
150157
</item>
@@ -797,6 +804,7 @@
797804
<class>SettingsDialog</class>
798805
<extends>QDialog</extends>
799806
<header>ui/settingsdialog.h</header>
807+
<container>1</container>
800808
</customwidget>
801809
</customwidgets>
802810
<resources/>

0 commit comments

Comments
 (0)