kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2026-10-05 02:24:13 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Settings: only write the prefix rows that were edited

Browse Source 
Review findings on the prefix editor:

- OK without touching anything changed the file: every row was written
  back, so an explicit <prefix/>, which reads as an empty field and
  cancels the inheritance, was dropped and that folder started
  inheriting its parent's prefix again. A row is now written only when
  it was edited or no longer holds what the file has, and the two kinds
  of empty field look different: hasPrefix() tells an explicit
  <prefix/> from a missing one, which is what the field hint shows.
- load() copied a broken file aside before the user had chosen
  anything, so every "Corriger le fichier" left a .bak behind while the
  message said nothing had been modified. The copy is now made by
  save(), right before the file is replaced: repairing or cancelling
  leaves nothing behind, and a copy that cannot be made stops the write
  rather than destroying the only copy.
- The button followed the combo box only for "Parcourir...": put back
  on "Par defaut" it fell back to the previously saved path instead of
  the default one. The directory of the entry being displayed is now
  used, "Par defaut" being dataDir()/elements/.
This commit is contained in:
Kellermorph
2026-09-30 11:01:31 +02:00
parent 03bffa96c7
commit 1d339a8b27
4 changed files with 104 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sources/ui/configpage/generalconfigurationpage.cpp
+15 -8
View File
@@ -650,13 +650,20 @@ void GeneralConfigurationPage::on_m_user_macros_path_cb_currentIndexChanged(int
*/
void GeneralConfigurationPage::on_m_prefix_pb_clicked()
{
//The directory currently shown in the combo is the one this page
//displays, even when it has not been applied yet, while
//QETApp::customElementsDir() still returns the previously saved
//path : follow what the user sees.
//The directory the page displays, even when the change has not
//been applied yet : QETApp::customElementsDir() still answers with
//the previously saved path, which is not what is shown when the
//combo has been put back on "Par defaut".
QString directory;
if (ui->m_custom_elmt_path_cb->currentIndex() == 1) {
switch (ui->m_custom_elmt_path_cb->currentIndex()) {
case 1: //"Parcourir..." : the item itself holds the chosen path
directory = ui->m_custom_elmt_path_cb->itemData(1, Qt::DisplayRole).toString();
break;
case 0: //"Par defaut" : where a default custom collection lives
directory = QETApp::dataDir() + QStringLiteral("/elements/");
break;
default:
break;
}
if (directory.isEmpty()) {
directory = QETApp::customElementsDir();
@@ -704,9 +711,9 @@ void GeneralConfigurationPage::on_m_prefix_pb_clicked()
"Ouvrez le fichier dans un éditeur de texte à l'endroit indiqué, "
"corrigez-le puis relancez cette commande.\n\n"
"« Reconstruire » : l'arborescence des dossiers est recréée, "
"mais tous les préfixes actuels sont perdus."));
box.setDetailedText(tr("Fichier : %1\nCopie conservée : %2")
.arg(labels.filePath(), labels.backupPath()));
"mais tous les préfixes actuels sont perdus. Le fichier actuel "
"est conservé sous le nom qet_labels.xml.bak avant d'être remplacé."));
box.setDetailedText(tr("Fichier : %1").arg(labels.filePath()));
box.exec();
if (box.clickedButton() != rebuild_button) {
return;