Disallow saving items with empty name

And remove associated global setting

Closes #210

Author: svetter

src/dialogs/item_dialog.cpp

@@ -71,7 +71,7 @@ void ItemDialog::handle_ok(QLineEdit* nameLineEdit, QString initName, QString em
 	aboutToClose();
 
 	QString itemName = nameLineEdit->text();
-	if (itemName.isEmpty() && !Settings::allowEmptyNames.get()) {
+	if (itemName.isEmpty()) {
 		QMessageBox::information(this, emptyNameWindowTitle, emptyNameMessage, QMessageBox::Ok, QMessageBox::Ok);
 		return;
 	}

src/settings/settings.cpp

@@ -82,6 +82,12 @@ void Settings::checkForVersionChange()
 		resetGeometrySettings();
 	}
 
+	// 1.3.0 or older
+	if (settingsVersionUpTo("1.3.0")) {
+		// Setting for allowing empty names was removed => clean up
+		qSettings.remove("allowEmptyNames");
+	}
+	
 	// Update settings version
 	const QString currentAppVersion = getAppVersion();
 	const QString currentSettingsVersion = appVersion.get();

src/settings/settings.h

@@ -310,8 +310,6 @@ class Settings {
 	inline static const Setting<bool>	confirmDelete								= Setting<bool>		("confirmDelete",								true);
 	/** Ask user for confirmation before discarding changes in an edit dialog. */
 	inline static const Setting<bool>	confirmCancel								= Setting<bool>		("confirmCancel",								true);
-	/** Allow user to store items with empty names. */
-	inline static const Setting<bool>	allowEmptyNames								= Setting<bool>		("allowEmptyNames",								false);
 	/** Warn user if an item with the same name already exists. */
 	inline static const Setting<bool>	warnAboutDuplicateNames						= Setting<bool>		("warnAboutDuplicateNames",						true);
 

src/settings/settings_window.cpp

@@ -98,7 +98,6 @@ void SettingsWindow::loadSettings()
 
 	confirmDeleteCheckbox						->setChecked	(confirmDelete								.get());
 	confirmCancelCheckbox						->setChecked	(confirmCancel								.get());
-	allowEmptyNamesCheckbox						->setChecked	(allowEmptyNames							.get());
 	warnAboutDuplicateNamesCheckbox				->setChecked	(warnAboutDuplicateNames					.get());
 	onlyPrepareActiveTableCheckbox				->setChecked	(onlyPrepareActiveTableOnStartup			.get());
 	openProjectSettingsOnNewDatabaseCheckbox	->setChecked	(openProjectSettingsOnNewDatabase			.get());
@@ -140,7 +139,6 @@ void SettingsWindow::loadDefaults()
 
 	confirmDeleteCheckbox						->setChecked	(confirmDelete								.getDefault());
 	confirmCancelCheckbox						->setChecked	(confirmCancel								.getDefault());
-	allowEmptyNamesCheckbox						->setChecked	(allowEmptyNames							.getDefault());
 	warnAboutDuplicateNamesCheckbox				->setChecked	(warnAboutDuplicateNames					.getDefault());
 	onlyPrepareActiveTableCheckbox				->setChecked	(onlyPrepareActiveTableOnStartup			.getDefault());
 	openProjectSettingsOnNewDatabaseCheckbox	->setChecked	(openProjectSettingsOnNewDatabase			.getDefault());
@@ -190,7 +188,6 @@ void SettingsWindow::saveSettings()
 
 	confirmDelete								.set(confirmDeleteCheckbox						->isChecked());
 	confirmCancel								.set(confirmCancelCheckbox						->isChecked());
-	allowEmptyNames								.set(allowEmptyNamesCheckbox					->isChecked());
 	warnAboutDuplicateNames						.set(warnAboutDuplicateNamesCheckbox			->isChecked());
 	onlyPrepareActiveTableOnStartup				.set(onlyPrepareActiveTableCheckbox				->isChecked());
 	openProjectSettingsOnNewDatabase			.set(openProjectSettingsOnNewDatabaseCheckbox	->isChecked());

src/ui/settings_window.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>400</width>
-    <height>895</height>
+    <height>868</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -157,13 +157,6 @@
         </property>
        </widget>
       </item>
-      <item>
-       <widget class="QCheckBox" name="allowEmptyNamesCheckbox">
-        <property name="text">
-         <string>Allow saving when item name is empty</string>
-        </property>
-       </widget>
-      </item>
       <item>
        <widget class="QCheckBox" name="warnAboutDuplicateNamesCheckbox">
         <property name="text">

translation/de.ts

@@ -3135,11 +3135,6 @@ Trotzdem speichern?</translation>
         <source>Ask for confirmation before discarding unsaved changes</source>
         <translation>Vor dem Verwerfen ungesicherter Änderungen nachfragen</translation>
     </message>
-    <message>
-        <location filename="../src/ui/settings_window.ui" line="163"/>
-        <source>Allow saving when item name is empty</source>
-        <translation>Speichern von Einträgen ohne Name erlauben</translation>
-    </message>
     <message>
         <location filename="../src/ui/settings_window.ui" line="170"/>
         <source>Warn when saving an item with a duplicate name</source>