- Custom color theme is now file based (*.conf);

legacy still preserved ntl. (export fix)
rncbc · Mar 3, 2024 · b112bfe · b112bfe
1 parent 1c657f2
commit b112bfe
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 59 deletions.
diff --git a/src/qsamplerPaletteForm.cpp b/src/qsamplerPaletteForm.cpp
@@ -238,9 +238,10 @@ QSettings *PaletteForm::settings (void) const
 
 void PaletteForm::nameComboChanged ( const QString& name )
 {
-	if (m_dirtyCount > 0 || m_ui.nameCombo->findText(name) < 0) {
+	if (m_dirtyCount > 0 && m_ui.nameCombo->findText(name) < 0) {
 		updateDialogButtons();
 	} else {
+		resetButtonClicked();
 		setPaletteName(name);
 		++m_dirtyTotal;
 	}
@@ -409,7 +410,7 @@ void PaletteForm::exportButtonClicked (void)
 	const QFileInfo fi(filename);
 	const QString& name = fi.baseName();
 	if (saveNamedPaletteConf(name, filename, m_palette)) {
-		addNamedPaletteConf(name, filename);
+	//	addNamedPaletteConf(name, filename);
 		setDefaultDir(fi.absolutePath());
 	}
 }

diff --git a/src/translations/qsampler_cs.ts b/src/translations/qsampler_cs.ts
@@ -1195,38 +1195,38 @@ Chcete použít změny?</translation>
 <context>
     <name>QSampler::PaletteForm</name>
     <message>
-        <location filename="../qsamplerPaletteForm.cpp" line="346"/>
+        <location filename="../qsamplerPaletteForm.cpp" line="347"/>
         <source>Import File - %1</source>
         <translation>Zavést soubor - %1</translation>
     </message>
     <message>
-        <location filename="../qsamplerPaletteForm.cpp" line="262"/>
-        <location filename="../qsamplerPaletteForm.cpp" line="349"/>
-        <location filename="../qsamplerPaletteForm.cpp" line="394"/>
+        <location filename="../qsamplerPaletteForm.cpp" line="263"/>
+        <location filename="../qsamplerPaletteForm.cpp" line="350"/>
+        <location filename="../qsamplerPaletteForm.cpp" line="395"/>
         <source>Palette files (*.%1)</source>
         <translation>Soubory s paletami (*.%1)</translation>
     </message>
     <message>
-        <location filename="../qsamplerPaletteForm.cpp" line="260"/>
+        <location filename="../qsamplerPaletteForm.cpp" line="261"/>
         <source>Save Palette - %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qsamplerPaletteForm.cpp" line="263"/>
-        <location filename="../qsamplerPaletteForm.cpp" line="350"/>
-        <location filename="../qsamplerPaletteForm.cpp" line="395"/>
+        <location filename="../qsamplerPaletteForm.cpp" line="264"/>
+        <location filename="../qsamplerPaletteForm.cpp" line="351"/>
+        <location filename="../qsamplerPaletteForm.cpp" line="396"/>
         <source>All files (*.*)</source>
         <translation>Všechny soubory (*.*)</translation>
     </message>
     <message>
-        <location filename="../qsamplerPaletteForm.cpp" line="381"/>
-        <location filename="../qsamplerPaletteForm.cpp" line="757"/>
-        <location filename="../qsamplerPaletteForm.cpp" line="765"/>
+        <location filename="../qsamplerPaletteForm.cpp" line="382"/>
+        <location filename="../qsamplerPaletteForm.cpp" line="758"/>
+        <location filename="../qsamplerPaletteForm.cpp" line="766"/>
         <source>Warning - %1</source>
         <translation>Varování - %1</translation>
     </message>
     <message>
-        <location filename="../qsamplerPaletteForm.cpp" line="382"/>
+        <location filename="../qsamplerPaletteForm.cpp" line="383"/>
         <source>Could not import from file:
 
 %1
@@ -1239,12 +1239,12 @@ Sorry.</source>
 Promiňte.</translation>
     </message>
     <message>
-        <location filename="../qsamplerPaletteForm.cpp" line="391"/>
+        <location filename="../qsamplerPaletteForm.cpp" line="392"/>
         <source>Export File - %1</source>
         <translation>Vyvést soubor - %1</translation>
     </message>
     <message>
-        <location filename="../qsamplerPaletteForm.cpp" line="758"/>
+        <location filename="../qsamplerPaletteForm.cpp" line="759"/>
         <source>Some settings have been changed.
 
 Do you want to discard the changes?</source>
@@ -1253,7 +1253,7 @@ Do you want to discard the changes?</source>
 Chcete zahodit změny?</translation>
     </message>
     <message>
-        <location filename="../qsamplerPaletteForm.cpp" line="766"/>
+        <location filename="../qsamplerPaletteForm.cpp" line="767"/>
         <source>Some settings have been changed:
 
 &quot;%1&quot;.
@@ -1269,22 +1269,22 @@ Chcete uložit změny?</translation>
 <context>
     <name>QSampler::PaletteForm::PaletteModel</name>
     <message>
-        <location filename="../qsamplerPaletteForm.cpp" line="1009"/>
+        <location filename="../qsamplerPaletteForm.cpp" line="1010"/>
         <source>Color Role</source>
         <translation>Barevná role</translation>
     </message>
     <message>
-        <location filename="../qsamplerPaletteForm.cpp" line="1012"/>
+        <location filename="../qsamplerPaletteForm.cpp" line="1013"/>
         <source>Active</source>
         <translation>Činný</translation>
     </message>
     <message>
-        <location filename="../qsamplerPaletteForm.cpp" line="1015"/>
+        <location filename="../qsamplerPaletteForm.cpp" line="1016"/>
         <source>Inactive</source>
         <translation>Nečinný</translation>
     </message>
     <message>
-        <location filename="../qsamplerPaletteForm.cpp" line="1018"/>
+        <location filename="../qsamplerPaletteForm.cpp" line="1019"/>
         <source>Disabled</source>
         <translation>Zakázáno</translation>
     </message>

diff --git a/src/translations/qsampler_fr.ts b/src/translations/qsampler_fr.ts
@@ -1196,38 +1196,38 @@ Souhaitez-vous appliquer les modifications ?</translation>
 <context>
     <name>QSampler::PaletteForm</name>
     <message>
-        <location filename="../qsamplerPaletteForm.cpp" line="346"/>
+        <location filename="../qsamplerPaletteForm.cpp" line="347"/>
         <source>Import File - %1</source>
         <translation>Importer le fichier - %1</translation>
     </message>
     <message>
-        <location filename="../qsamplerPaletteForm.cpp" line="262"/>
-        <location filename="../qsamplerPaletteForm.cpp" line="349"/>
-        <location filename="../qsamplerPaletteForm.cpp" line="394"/>
+        <location filename="../qsamplerPaletteForm.cpp" line="263"/>
+        <location filename="../qsamplerPaletteForm.cpp" line="350"/>
+        <location filename="../qsamplerPaletteForm.cpp" line="395"/>
         <source>Palette files (*.%1)</source>
         <translation>Fichiers de palette (*.%1)</translation>
     </message>
     <message>
-        <location filename="../qsamplerPaletteForm.cpp" line="260"/>
+        <location filename="../qsamplerPaletteForm.cpp" line="261"/>
         <source>Save Palette - %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qsamplerPaletteForm.cpp" line="263"/>
-        <location filename="../qsamplerPaletteForm.cpp" line="350"/>
-        <location filename="../qsamplerPaletteForm.cpp" line="395"/>
+        <location filename="../qsamplerPaletteForm.cpp" line="264"/>
+        <location filename="../qsamplerPaletteForm.cpp" line="351"/>
+        <location filename="../qsamplerPaletteForm.cpp" line="396"/>
         <source>All files (*.*)</source>
         <translation>Tous les fichiers (*.*)</translation>
     </message>
     <message>
-        <location filename="../qsamplerPaletteForm.cpp" line="381"/>
-        <location filename="../qsamplerPaletteForm.cpp" line="757"/>
-        <location filename="../qsamplerPaletteForm.cpp" line="765"/>
+        <location filename="../qsamplerPaletteForm.cpp" line="382"/>
+        <location filename="../qsamplerPaletteForm.cpp" line="758"/>
+        <location filename="../qsamplerPaletteForm.cpp" line="766"/>
         <source>Warning - %1</source>
         <translation>Attention - %1</translation>
     </message>
     <message>
-        <location filename="../qsamplerPaletteForm.cpp" line="382"/>
+        <location filename="../qsamplerPaletteForm.cpp" line="383"/>
         <source>Could not import from file:
 
 %1
@@ -1240,12 +1240,12 @@ Sorry.</source>
 Navré.</translation>
     </message>
     <message>
-        <location filename="../qsamplerPaletteForm.cpp" line="391"/>
+        <location filename="../qsamplerPaletteForm.cpp" line="392"/>
         <source>Export File - %1</source>
         <translation>Exporter le fichier - %1</translation>
     </message>
     <message>
-        <location filename="../qsamplerPaletteForm.cpp" line="758"/>
+        <location filename="../qsamplerPaletteForm.cpp" line="759"/>
         <source>Some settings have been changed.
 
 Do you want to discard the changes?</source>
@@ -1254,7 +1254,7 @@ Do you want to discard the changes?</source>
 Souhaitez-vous abandonner les modifications ?</translation>
     </message>
     <message>
-        <location filename="../qsamplerPaletteForm.cpp" line="766"/>
+        <location filename="../qsamplerPaletteForm.cpp" line="767"/>
         <source>Some settings have been changed:
 
 &quot;%1&quot;.
@@ -1270,22 +1270,22 @@ Souhaitez-vous sauvegarder les modifications ?</translation>
 <context>
     <name>QSampler::PaletteForm::PaletteModel</name>
     <message>
-        <location filename="../qsamplerPaletteForm.cpp" line="1009"/>
+        <location filename="../qsamplerPaletteForm.cpp" line="1010"/>
         <source>Color Role</source>
         <translation>Role de couleur</translation>
     </message>
     <message>
-        <location filename="../qsamplerPaletteForm.cpp" line="1012"/>
+        <location filename="../qsamplerPaletteForm.cpp" line="1013"/>
         <source>Active</source>
         <translation>Actif</translation>
     </message>
     <message>
-        <location filename="../qsamplerPaletteForm.cpp" line="1015"/>
+        <location filename="../qsamplerPaletteForm.cpp" line="1016"/>
         <source>Inactive</source>
         <translation>Inactif</translation>
     </message>
     <message>
-        <location filename="../qsamplerPaletteForm.cpp" line="1018"/>
+        <location filename="../qsamplerPaletteForm.cpp" line="1019"/>
         <source>Disabled</source>
         <translation>Désactivé</translation>
     </message>

diff --git a/src/translations/qsampler_ru.ts b/src/translations/qsampler_ru.ts
@@ -1191,38 +1191,38 @@ Do you want to apply the changes?</source>
 <context>
     <name>QSampler::PaletteForm</name>
     <message>
-        <location filename="../qsamplerPaletteForm.cpp" line="346"/>
+        <location filename="../qsamplerPaletteForm.cpp" line="347"/>
         <source>Import File - %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qsamplerPaletteForm.cpp" line="262"/>
-        <location filename="../qsamplerPaletteForm.cpp" line="349"/>
-        <location filename="../qsamplerPaletteForm.cpp" line="394"/>
+        <location filename="../qsamplerPaletteForm.cpp" line="263"/>
+        <location filename="../qsamplerPaletteForm.cpp" line="350"/>
+        <location filename="../qsamplerPaletteForm.cpp" line="395"/>
         <source>Palette files (*.%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qsamplerPaletteForm.cpp" line="260"/>
+        <location filename="../qsamplerPaletteForm.cpp" line="261"/>
         <source>Save Palette - %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qsamplerPaletteForm.cpp" line="263"/>
-        <location filename="../qsamplerPaletteForm.cpp" line="350"/>
-        <location filename="../qsamplerPaletteForm.cpp" line="395"/>
+        <location filename="../qsamplerPaletteForm.cpp" line="264"/>
+        <location filename="../qsamplerPaletteForm.cpp" line="351"/>
+        <location filename="../qsamplerPaletteForm.cpp" line="396"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qsamplerPaletteForm.cpp" line="381"/>
-        <location filename="../qsamplerPaletteForm.cpp" line="757"/>
-        <location filename="../qsamplerPaletteForm.cpp" line="765"/>
+        <location filename="../qsamplerPaletteForm.cpp" line="382"/>
+        <location filename="../qsamplerPaletteForm.cpp" line="758"/>
+        <location filename="../qsamplerPaletteForm.cpp" line="766"/>
         <source>Warning - %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qsamplerPaletteForm.cpp" line="382"/>
+        <location filename="../qsamplerPaletteForm.cpp" line="383"/>
         <source>Could not import from file:
 
 %1
@@ -1231,19 +1231,19 @@ Sorry.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qsamplerPaletteForm.cpp" line="391"/>
+        <location filename="../qsamplerPaletteForm.cpp" line="392"/>
         <source>Export File - %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qsamplerPaletteForm.cpp" line="758"/>
+        <location filename="../qsamplerPaletteForm.cpp" line="759"/>
         <source>Some settings have been changed.
 
 Do you want to discard the changes?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qsamplerPaletteForm.cpp" line="766"/>
+        <location filename="../qsamplerPaletteForm.cpp" line="767"/>
         <source>Some settings have been changed:
 
 &quot;%1&quot;.
@@ -1255,22 +1255,22 @@ Do you want to save the changes?</source>
 <context>
     <name>QSampler::PaletteForm::PaletteModel</name>
     <message>
-        <location filename="../qsamplerPaletteForm.cpp" line="1009"/>
+        <location filename="../qsamplerPaletteForm.cpp" line="1010"/>
         <source>Color Role</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qsamplerPaletteForm.cpp" line="1012"/>
+        <location filename="../qsamplerPaletteForm.cpp" line="1013"/>
         <source>Active</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qsamplerPaletteForm.cpp" line="1015"/>
+        <location filename="../qsamplerPaletteForm.cpp" line="1016"/>
         <source>Inactive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qsamplerPaletteForm.cpp" line="1018"/>
+        <location filename="../qsamplerPaletteForm.cpp" line="1019"/>
         <source>Disabled</source>
         <translation type="unfinished"></translation>
     </message>