Fix behaviour of project settings window

For #168

Author: svetter

src/db/tables/settings_table.cpp

@@ -102,9 +102,8 @@ void SettingsTable::setSetting(QWidget* parent, const GenericProjectSetting* set
 		// Add setting
 		QList<ColumnDataPair> columnDataPairs = QList<ColumnDataPair>();
 		columnDataPairs.append({settingKeyColumn,	setting->key});
-		columnDataPairs.append({settingValueColumn,	setting->defaultValue});
-		BufferRowIndex newBufferIndex = addRow(parent, columnDataPairs);
-		id = primaryKeyColumn->getValueAt(newBufferIndex);
+		columnDataPairs.append({settingValueColumn,	value});
+		addRow(parent, columnDataPairs);
 	}
 }
 
@@ -134,11 +133,11 @@ ItemID SettingsTable::findSettingID(const GenericProjectSetting* setting, QWidge
 {
 	QList<BufferRowIndex> bufferRowIndices = getMatchingBufferRowIndices(settingKeyColumn, setting->key);
 
-	if (bufferRowIndices.size() == 1) {
-		return VALID_ITEM_ID();
+	if (bufferRowIndices.size() == 0) {
+		return ItemID();
 	}
-	
 	BufferRowIndex settingIndex = bufferRowIndices.last();
+	
 	if (bufferRowIndices.size() > 1) {
 		QString error = "WARNING: Found " + QString::number(bufferRowIndices.size()) + " entries for project setting " + setting->key + ".";
 		if (parent) {

src/settings/project_settings_window.cpp

@@ -61,7 +61,7 @@ ProjectSettingsWindow::ProjectSettingsWindow(QWidget* parent, Database* db, bool
 	restoreDialogGeometry(this, parent, &Settings::projectSettingsWindow_geometry);
 
 
-	populateItemCombo(db->hikersTable, db->hikersTable->nameColumn, true, defaultHikerCombo, selectableHikerIDs);
+	repopulateHikerCombo();
 
 
 	connect(newHikerButton,										&QPushButton::clicked,	this,	&ProjectSettingsWindow::handle_newHiker);
@@ -86,6 +86,11 @@ ProjectSettingsWindow::ProjectSettingsWindow(QWidget* parent, Database* db, bool
 	}
 }
 
+void ProjectSettingsWindow::repopulateHikerCombo()
+{
+	populateItemCombo(db->hikersTable, db->hikersTable->nameColumn, true, defaultHikerCombo, selectableHikerIDs);
+}
+
 
 
 /**
@@ -106,13 +111,19 @@ void ProjectSettingsWindow::loadSettings()
  */
 void ProjectSettingsWindow::saveSettings()
 {
-	if (firstOpen && !newDefaultHikerLineEdit->text().isEmpty()) {
+	if (firstOpen) {
+		if (newDefaultHikerLineEdit->text().isEmpty()) return;
+		
 		QString newDefaultHikerName = newDefaultHikerLineEdit->text();
 		Hiker* newDefaultHiker = new Hiker(ItemID(), newDefaultHikerName);
-		BufferRowIndex newHikerIndex = db->hikersTable->addRow(this, newDefaultHiker);
-		defaultHikerCombo->setCurrentIndex(newHikerIndex.get() + 1);	// 0 is None
+		db->hikersTable->addRow(this, newDefaultHiker);
+		
+		db->projectSettings->defaultHiker.set(this, newDefaultHiker->hikerID.asQVariant());
+		delete newDefaultHiker;
+	}
+	else {
+		db->projectSettings->defaultHiker.set(this, parseItemCombo(defaultHikerCombo, selectableHikerIDs).asQVariant());
 	}
-	db->projectSettings->defaultHiker.set(this, parseItemCombo(defaultHikerCombo, selectableHikerIDs).asQVariant());
 }
 
 
@@ -126,6 +137,8 @@ void ProjectSettingsWindow::handle_newHiker()
 {
 	BufferRowIndex newHikerIndex = openNewHikerDialogAndStore(this, db);
 	if (newHikerIndex.isInvalid()) return;
+	
+	repopulateHikerCombo();
 	ValidItemID hikerID = db->hikersTable->getPrimaryKeyAt(newHikerIndex);
 	defaultHikerCombo->setCurrentIndex(selectableHikerIDs.indexOf(hikerID) + 1);	// 0 is None
 }

src/settings/project_settings_window.h

@@ -54,6 +54,8 @@ class ProjectSettingsWindow : public QDialog, public Ui_ProjectSettingsWindow
 
 public:
 	ProjectSettingsWindow(QWidget* parent, Database* db, bool firstOpen = false);
+private:
+	void repopulateHikerCombo();
 
 private:
 	void loadSettings();

src/ui/project_settings_window.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>350</width>
-    <height>210</height>
+    <height>205</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -33,7 +33,7 @@
     <number>10</number>
    </property>
    <property name="topMargin">
-    <number>10</number>
+    <number>5</number>
    </property>
    <property name="rightMargin">
     <number>10</number>