set settings page state from settings

src/tuxclocker-qt/widgets/Settings.cpp

@@ -7,10 +7,13 @@
 #include <QListWidget>
 #include <QPushButton>
 #include <QSettings>
+#include <Utils.hpp>
 
 SettingsData Globals::g_settingsData;
 
 Settings::Settings(QWidget *parent) : QWidget(parent) {
+	qRegisterMetaTypeStreamOperators<QVector<QString>>("QVector<QString>>");
+
 	auto layout = new QGridLayout{this};
 
 	auto label = new QLabel{this};
@@ -24,13 +27,14 @@ Settings::Settings(QWidget *parent) : QWidget(parent) {
 
 	m_autoLoad = new QCheckBox{"Apply profile settings automatically", this};
 
-	auto profileCheck = new QCheckBox{"Use profile", this};
+	m_useProfile = new QCheckBox{"Use profile", this};
 
 	// TODO: add delegate to make deleting a little nicer
 	m_profileView = new QListWidget{this};
 	auto triggers = QAbstractItemView::SelectedClicked | QAbstractItemView::EditKeyPressed;
 	m_profileView->setEditTriggers(triggers);
 	m_profileView->setEnabled(false);
+	m_profileView->setSelectionMode(QAbstractItemView::SingleSelection);
 
 	auto addButton = new QPushButton{"Add profile"};
 	addButton->setEnabled(false);
@@ -46,7 +50,7 @@ Settings::Settings(QWidget *parent) : QWidget(parent) {
 	connect(removeButton, &QPushButton::released,
 	    [=] { m_profileView->model()->removeRow(m_profileView->currentRow()); });
 
-	connect(profileCheck, &QCheckBox::stateChanged, [=](auto state) {
+	connect(m_useProfile, &QCheckBox::stateChanged, [=](auto state) {
 		bool enable = (state == Qt::Unchecked) ? false : true;
 
 		addButton->setEnabled(enable);
@@ -69,9 +73,11 @@ Settings::Settings(QWidget *parent) : QWidget(parent) {
 		emit settingsSaved(settingsData);
 	});
 
+	setUIState(readSettings());
+
 	layout->addWidget(label, 0, 0, 1, 1, Qt::AlignLeft | Qt::AlignTop);
 	layout->addWidget(m_autoLoad, 1, 0, 1, 1, Qt::AlignLeft);
-	layout->addWidget(profileCheck, 2, 0, 1, 1, Qt::AlignLeft);
+	layout->addWidget(m_useProfile, 2, 0, 1, 1, Qt::AlignLeft);
 	layout->addWidget(m_profileView, 2, 1, 1, 2);
 	layout->addWidget(addButton, 3, 1);
 	layout->addWidget(removeButton, 3, 2);
@@ -81,16 +87,42 @@ Settings::Settings(QWidget *parent) : QWidget(parent) {
 	this->setLayout(layout);
 }
 
+void Settings::setUIState(SettingsData data) {
+	m_useProfile->setChecked(data.currentProfile.has_value());
+
+	m_autoLoad->setChecked(data.autoApplyProfile);
+
+	for (auto &profile : data.profiles) {
+		auto item = new QListWidgetItem{profile};
+		m_profileView->addItem(item);
+		if (data.currentProfile.has_value() && data.currentProfile.value() == profile)
+			m_profileView->setCurrentItem(item);
+	}
+}
+
 SettingsData Settings::fromUIState() {
 	std::optional<QString> currentProfile = std::nullopt;
 
-	auto data = m_profileView->currentItem()->data(Qt::DisplayRole);
-	if (data.isValid())
-		currentProfile = data.toString();
+	if (m_profileView->currentItem()) {
+		auto data = m_profileView->currentItem()->data(Qt::DisplayRole);
+		if (data.isValid())
+			currentProfile = data.toString();
+	}
+
+	QVector<QString> profiles;
+	auto cb = [&](auto model, auto index, int row) {
+		auto next = model->index(row, 0, index);
+
+		if (next.data(Qt::DisplayRole).isValid())
+			profiles.append(next.data(Qt::DisplayRole).toString());
+		return next;
+	};
+	Utils::traverseModel(cb, m_profileView->model());
 
 	return SettingsData{
 	    .autoApplyProfile = m_autoLoad->isChecked(),
 	    .currentProfile = currentProfile,
+	    .profiles = profiles,
 	};
 }
 
@@ -98,11 +130,46 @@ void Settings::writeSettings(SettingsData data) {
 	bool usingProfile = data.currentProfile.has_value() ? true : false;
 
 	QSettings settings{"tuxclocker"};
-	settings.beginGroup("general");
 
 	settings.setValue("autoApplyProfile", data.autoApplyProfile);
 	settings.setValue("usingProfile", usingProfile);
+	// We need to save this in case nothing is changed in current run
+	settings.setValue("profiles", QVariant::fromValue(data.profiles));
 
 	if (usingProfile)
 		settings.setValue("currentProfile", data.currentProfile.value());
 }
+
+SettingsData Settings::readSettings() {
+	QSettings s{"tuxclocker"};
+
+	std::optional<QString> profile;
+	QVector<AssignableSetting> assignableSettings;
+	auto currentProfile = s.value("currentProfile");
+	if (s.value("usingProfile").toBool() && currentProfile.isValid()) {
+		auto profileStr = s.value("currentProfile").toString();
+		profile = profileStr;
+		// Read possible assignable settings
+		s.beginGroup(QString{"profiles/%1"}.arg(profileStr));
+
+		auto keys = s.allKeys();
+		for (auto &key : keys) {
+			AssignableSetting setting{
+			    .assignablePath = Utils::fromSettingsPath(key),
+			    .value = s.value(key),
+			};
+			assignableSettings.append(setting);
+		}
+		s.endGroup();
+	} else
+		profile = std::nullopt;
+
+	auto profiles = qvariant_cast<QVector<QString>>(s.value("profiles"));
+
+	return SettingsData{
+	    .autoApplyProfile = s.value("autoApplyProfile").toBool(),
+	    .currentProfile = profile,
+	    .assignableSettings = assignableSettings,
+	    .profiles = profiles,
+	};
+}

src/tuxclocker-qt/widgets/Settings.hpp

@@ -17,17 +17,22 @@ struct SettingsData {
 	bool autoApplyProfile;
 	std::optional<QString> currentProfile;
 	QVector<AssignableSetting> assignableSettings;
+	// Only needed for interaction with settings file
+	QVector<QString> profiles;
 };
 
 class Settings : public QWidget {
 public:
 	explicit Settings(QWidget *parent = nullptr);
+
+	static SettingsData readSettings();
 signals:
 	void cancelled();
 	void settingsSaved(SettingsData);
 private:
 	SettingsData fromUIState();
 	void writeSettings(SettingsData);
+	void setUIState(SettingsData);
 
 	QCheckBox *m_autoLoad;
 	QCheckBox *m_useProfile;