From 719d56127d6495c18be59c15bdef2c6bb565941a Mon Sep 17 00:00:00 2001 From: Ad5001 Date: Mon, 31 Jan 2022 23:07:00 +0100 Subject: [PATCH] Enhanced overall readability of history through usage + Using bold and 1 space padding for object names (for long actions) + Using color blocs for colors + Removed verbose object type from property edition (still accessible from tooltip) + Property edition values are now monospaced and have a slight shade as background + Using "rename" for name changing verbs. --- LogarithmPlotter/i18n/lp_de.ts | 160 +++++++++++------ LogarithmPlotter/i18n/lp_en.ts | 160 +++++++++++------ LogarithmPlotter/i18n/lp_es.ts | 167 ++++++++++-------- LogarithmPlotter/i18n/lp_fr.ts | 160 +++++++++++------ LogarithmPlotter/i18n/lp_hu.ts | 158 +++++++++++------ LogarithmPlotter/i18n/lp_nb_NO.ts | 158 +++++++++++------ LogarithmPlotter/i18n/lp_template.ts | 167 ++++++++++-------- .../LogarithmPlotter/History/HistoryItem.qml | 12 +- .../ObjectLists/ObjectLists.qml | 3 +- .../LogarithmPlotter/js/history/color.js | 13 +- .../LogarithmPlotter/js/history/create.js | 6 + .../LogarithmPlotter/js/history/delete.js | 6 + .../js/history/editproperty.js | 46 +++-- .../LogarithmPlotter/js/history/name.js | 6 + .../LogarithmPlotter/js/history/visibility.js | 15 +- 15 files changed, 802 insertions(+), 435 deletions(-) diff --git a/LogarithmPlotter/i18n/lp_de.ts b/LogarithmPlotter/i18n/lp_de.ts index bcef035..c960b50 100644 --- a/LogarithmPlotter/i18n/lp_de.ts +++ b/LogarithmPlotter/i18n/lp_de.ts @@ -5,7 +5,7 @@ About - + About LogarithmPlotter Über LogarithmPlotter @@ -28,107 +28,107 @@ AppMenuBar - + &File &Datei - + &Load... &Laden… - + &Save &Speichern - + Save &As... Speichern &Unter… - + &Quit &Ausfahrt - + &Edit &Bearbeiten - + &Undo &Lösen - + &Redo &Wiederherstellen - + &Copy plot Grafik &Kopieren - + &Create &Erstellen - + &Settings &Einstellungen - + Check for updates on startup Beim Starten auf Updates prüfen - + Reset redo stack automaticly Wiederherstellen-Stapel automatisch zurücksetzen - + &Help &Hilfe - + &Source code &Quellcode - + &Report a bug Fehler &Melden - + &Changelog &Changelog - + &Help translating! &Hilfe beim Übersetzen! - + &About &Übrigens - + Save unsaved changes? Änderungen speichern? - + This plot contains unsaved changes. By doing this, all unsaved data will be lost. Continue? Diese Grafik enthält ungespeicherte Änderungen. Dadurch gehen alle ungespeicherten Daten verloren. Fortfahren? @@ -179,8 +179,8 @@ Name + Wert - - + + + Create new %1 + Neues %1objekt erstellen @@ -241,17 +241,17 @@ Diese Einstellungen können jederzeit über das Menü "Einstellungen" HistoryBrowser - + Redo > Wiederherstellen > - + > Now > Aktueller Stand - + < Undo < Rückgängig @@ -330,7 +330,7 @@ Diese Einstellungen können jederzeit über das Menü "Einstellungen" ObjectCreationGrid - + + Create new: + Neu erstellen: @@ -338,37 +338,37 @@ Diese Einstellungen können jederzeit über das Menü "Einstellungen" ObjectLists - + Hide all %1 Alle %1 ausblenden - + Show all %1 Alle %1 anzeigen - + Hide %1 %2 Ausblenden %1 %2 - + Show %1 %2 Anzeigen %1 %2 - + Set %1 %2 position Position von %1 %2 einstellen - + Delete %1 %2 %1 %2 löschen - + Pick new color for %1 %2 Neue Farbe für %1 %2 auswählen @@ -487,16 +487,25 @@ Diese Einstellungen können jederzeit über das Menü "Einstellungen" changelog - + Could not fetch changelog: Server error {}. Changelog konnte nicht geholt werden: Server-Fehler {}. - + Could not fetch update: {}. Changelog konnte nicht geholt werden: {}. + + color + + + + %1 %2's color changed from %3 to %4. + + + comment @@ -530,6 +539,37 @@ Diese Einstellungen können jederzeit über das Menü "Einstellungen" %1: + + create + + + + New %1 %2 created. + Neu %1 %2 erstellt. + + + + delete + + + + %1 %2 deleted. + %1 %2 gelöscht. + + + + editproperty + + + %1 of %2 %3 changed from "%4" to "%5". + %1 von %2 %3 wurde von "%4" auf "%5" geändert. + + + + %1 of %2 changed from %3 to %4. + + + function @@ -569,35 +609,37 @@ Diese Einstellungen können jederzeit über das Menü "Einstellungen" historylib - New %1 %2 created. - Neu %1 %2 erstellt. + Neu %1 %2 erstellt. - %1 %2 deleted. - %1 %2 gelöscht. + %1 %2 gelöscht. - - %1 of %2 %3 changed from "%4" to "%5". - %1 von %2 %3 wurde von "%4" auf "%5" geändert. + %1 von %2 %3 wurde von "%4" auf "%5" geändert. - %1 %2 shown. - %1 %2 angezeigt. + %1 %2 angezeigt. - %1 %2 hidden. - %1 %2 ausgeblendet. + %1 %2 ausgeblendet. - Name of %1 %2 changed to %3. - Der Name von %1 %2 wurde in %3 geändert. + Der Name von %1 %2 wurde in %3 geändert. + + + + name + + + + %1 %2 renamed to %3. + @@ -895,9 +937,8 @@ Diese Einstellungen können jederzeit über das Menü "Einstellungen" Initialisierungswerte - color - Farbe + Farbe @@ -980,6 +1021,21 @@ Diese Einstellungen können jederzeit über das Menü "Einstellungen" Es konnten keine Aktualisierungsinformationen abgerufen werden:{}. + + visibility + + + + %1 %2 shown. + %1 %2 angezeigt. + + + + + %1 %2 hidden. + %1 %2 ausgeblendet. + + xcursor diff --git a/LogarithmPlotter/i18n/lp_en.ts b/LogarithmPlotter/i18n/lp_en.ts index 76d5a69..e6fc864 100644 --- a/LogarithmPlotter/i18n/lp_en.ts +++ b/LogarithmPlotter/i18n/lp_en.ts @@ -5,7 +5,7 @@ About - + About LogarithmPlotter About LogarithmPlotter @@ -28,107 +28,107 @@ AppMenuBar - + &File &File - + &Load... &Load… - + &Save &Save - + Save &As... Save &As… - + &Quit &Quit - + &Edit &Edit - + &Undo &Undo - + &Redo &Redo - + &Copy plot &Copy plot - + &Create &Create - + &Settings &Settings - + Check for updates on startup Check for updates on startup - + Reset redo stack automaticly Reset redo stack automatically - + &Help &Help - + &Source code &Source code - + &Report a bug &Report a bug - + &Changelog &Changelog - + &Help translating! &Help translating! - + &About &About - + Save unsaved changes? Save unsaved changes? - + This plot contains unsaved changes. By doing this, all unsaved data will be lost. Continue? This plot contains unsaved changes. By doing this, all unsaved data will be lost. Continue? @@ -179,8 +179,8 @@ name + value - - + + + Create new %1 + Create new %1 @@ -241,17 +241,17 @@ These settings can be changed at any time from the "Settings" menu. HistoryBrowser - + Redo > Redo > - + > Now > Now - + < Undo < Undo @@ -330,7 +330,7 @@ These settings can be changed at any time from the "Settings" menu. ObjectCreationGrid - + + Create new: + Create new: @@ -338,37 +338,37 @@ These settings can be changed at any time from the "Settings" menu. ObjectLists - + Hide all %1 Hide all %1 - + Show all %1 Show all %1 - + Hide %1 %2 Hide %1 %2 - + Show %1 %2 Show %1 %2 - + Set %1 %2 position Set %1 %2 position - + Delete %1 %2 Delete %1 %2 - + Pick new color for %1 %2 Pick new color for %1 %2 @@ -487,16 +487,25 @@ These settings can be changed at any time from the "Settings" menu. changelog - + Could not fetch changelog: Server error {}. Could not fetch changelog: Server error {}. - + Could not fetch update: {}. Could not fetch changelog: {}. + + color + + + + %1 %2's color changed from %3 to %4. + + + comment @@ -530,6 +539,37 @@ These settings can be changed at any time from the "Settings" menu.%1: + + create + + + + New %1 %2 created. + New %1 %2 created. + + + + delete + + + + %1 %2 deleted. + %1 %2 deleted. + + + + editproperty + + + %1 of %2 %3 changed from "%4" to "%5". + %1 of %2 %3 changed from "%4" to "%5". + + + + %1 of %2 changed from %3 to %4. + + + function @@ -569,35 +609,37 @@ These settings can be changed at any time from the "Settings" menu. historylib - New %1 %2 created. - New %1 %2 created. + New %1 %2 created. - %1 %2 deleted. - %1 %2 deleted. + %1 %2 deleted. - - %1 of %2 %3 changed from "%4" to "%5". - %1 of %2 %3 changed from "%4" to "%5". + %1 of %2 %3 changed from "%4" to "%5". - %1 %2 shown. - %1 %2 shown. + %1 %2 shown. - %1 %2 hidden. - %1 %2 hidden. + %1 %2 hidden. - Name of %1 %2 changed to %3. - Name of %1 %2 changed to %3. + Name of %1 %2 changed to %3. + + + + name + + + + %1 %2 renamed to %3. + @@ -895,9 +937,8 @@ These settings can be changed at any time from the "Settings" menu.Initialisation values - color - Color + Color @@ -980,6 +1021,21 @@ These settings can be changed at any time from the "Settings" menu.Could not fetch update information: {}. + + visibility + + + + %1 %2 shown. + %1 %2 shown. + + + + + %1 %2 hidden. + %1 %2 hidden. + + xcursor diff --git a/LogarithmPlotter/i18n/lp_es.ts b/LogarithmPlotter/i18n/lp_es.ts index 828aeb2..b228d49 100644 --- a/LogarithmPlotter/i18n/lp_es.ts +++ b/LogarithmPlotter/i18n/lp_es.ts @@ -5,7 +5,7 @@ About - + About LogarithmPlotter Sobre LogarithmPlotter @@ -28,107 +28,107 @@ AppMenuBar - + &File - + &Load... - + &Save - + Save &As... - + &Quit - + &Edit - + &Undo - + &Redo - + &Copy plot - + &Create - + &Settings - + Check for updates on startup - + Reset redo stack automaticly - + &Help - + &Source code - + &Report a bug - + &Changelog - + &Help translating! - + &About - + Save unsaved changes? - + This plot contains unsaved changes. By doing this, all unsaved data will be lost. Continue? @@ -179,8 +179,8 @@ - - + + + Create new %1 @@ -240,17 +240,17 @@ These settings can be changed at any time from the "Settings" menu. HistoryBrowser - + Redo > - + > Now - + < Undo @@ -329,7 +329,7 @@ These settings can be changed at any time from the "Settings" menu. ObjectCreationGrid - + + Create new: @@ -337,37 +337,37 @@ These settings can be changed at any time from the "Settings" menu. ObjectLists - + Hide all %1 - + Show all %1 - + Hide %1 %2 - + Show %1 %2 - + Set %1 %2 position - + Delete %1 %2 - + Pick new color for %1 %2 @@ -486,16 +486,25 @@ These settings can be changed at any time from the "Settings" menu. changelog - + Could not fetch changelog: Server error {}. - + Could not fetch update: {}. + + color + + + + %1 %2's color changed from %3 to %4. + + + comment @@ -529,6 +538,37 @@ These settings can be changed at any time from the "Settings" menu. + + create + + + + New %1 %2 created. + + + + + delete + + + + %1 %2 deleted. + + + + + editproperty + + + %1 of %2 %3 changed from "%4" to "%5". + + + + + %1 of %2 changed from %3 to %4. + + + function @@ -566,36 +606,11 @@ These settings can be changed at any time from the "Settings" menu. - historylib + name - - New %1 %2 created. - - - - - %1 %2 deleted. - - - - - - %1 of %2 %3 changed from "%4" to "%5". - - - - - %1 %2 shown. - - - - - %1 %2 hidden. - - - - - Name of %1 %2 changed to %3. + + + %1 %2 renamed to %3. @@ -893,11 +908,6 @@ These settings can be changed at any time from the "Settings" menu.baseValues - - - color - - repartition @@ -979,6 +989,21 @@ These settings can be changed at any time from the "Settings" menu. + + visibility + + + + %1 %2 shown. + + + + + + %1 %2 hidden. + + + xcursor diff --git a/LogarithmPlotter/i18n/lp_fr.ts b/LogarithmPlotter/i18n/lp_fr.ts index 21090a8..ed05157 100644 --- a/LogarithmPlotter/i18n/lp_fr.ts +++ b/LogarithmPlotter/i18n/lp_fr.ts @@ -5,7 +5,7 @@ About - + About LogarithmPlotter À propos de LogarithmPlotter @@ -28,108 +28,108 @@ AppMenuBar - + &File &Fichier - + &Load... &Ouvrir… - + &Save &Sauvegarder - + Save &As... Sauvegarde &Sous… - + &Quit &Quitter - + &Edit &Édition - + &Undo &Annuler - + &Redo &Rétablir - + &Copy plot &Copier le graphe - + &Create &Créer - + &Settings &Paramètres - + Check for updates on startup Vérifier la présence de mise à jour au démarrage - + Reset redo stack automaticly Légèrement long, et pas forcément très compréhensible. Réinitialiser la pile d'action "Rétablir" automatiquement - + &Help &Aide - + &Source code &Code source - + &Report a bug &Rapport de bug - + &Changelog &Historique des modifications - + &Help translating! &Aider à la traduction ! - + &About &À propos - + Save unsaved changes? Sauvegarder les modifications ? - + This plot contains unsaved changes. By doing this, all unsaved data will be lost. Continue? Ce graphe contient des modifications non sauvegardées. En faisant cela, toutes les données non sauvegardées seront perdues. Continuer ? @@ -180,8 +180,8 @@ nom + valeur - - + + + Create new %1 Traduction non litéralle pour éviter les problèmes de genre. + Créer un nouvel objet %1 @@ -249,17 +249,17 @@ These settings can always be changed at any time from the "Settings" m HistoryBrowser - + Redo > Rétablir > - + > Now > État actuel - + < Undo < Annuler @@ -338,7 +338,7 @@ These settings can always be changed at any time from the "Settings" m ObjectCreationGrid - + + Create new: + Créer : @@ -346,37 +346,37 @@ These settings can always be changed at any time from the "Settings" m ObjectLists - + Hide all %1 Cacher tous les %1 - + Show all %1 Montrer tous les %1 - + Hide %1 %2 Cacher l'objet %1 %2 - + Show %1 %2 Montrer l'objet %1 %2 - + Set %1 %2 position Définir la position de l'objet %1 %2 - + Delete %1 %2 Supprimer l'objet %1 %2 - + Pick new color for %1 %2 Choisissez une nouvelle couleur pour %1 %2 @@ -495,16 +495,25 @@ These settings can always be changed at any time from the "Settings" m changelog - + Could not fetch changelog: Server error {}. Impossible de récupérer l'historique des modifications : Erreur de serveur {}. - + Could not fetch update: {}. Impossible de récupérer l'historique des modifications : {}. + + color + + + + %1 %2's color changed from %3 to %4. + + + comment @@ -539,6 +548,37 @@ These settings can always be changed at any time from the "Settings" m %1 : + + create + + + + New %1 %2 created. + Nouvel objet %1 %2 créé. + + + + delete + + + + %1 %2 deleted. + %1 %2 supprimé(e). + + + + editproperty + + + %1 of %2 %3 changed from "%4" to "%5". + %1 de %2 %3 modifiée de "%4" à "%5". + + + + %1 of %2 changed from %3 to %4. + + + function @@ -578,35 +618,37 @@ These settings can always be changed at any time from the "Settings" m historylib - New %1 %2 created. - Nouvel objet %1 %2 créé. + Nouvel objet %1 %2 créé. - %1 %2 deleted. - %1 %2 supprimé(e). + %1 %2 supprimé(e). - - %1 of %2 %3 changed from "%4" to "%5". - %1 de %2 %3 modifiée de "%4" à "%5". + %1 de %2 %3 modifiée de "%4" à "%5". - %1 %2 shown. - %1 %2 affiché(e). + %1 %2 affiché(e). - %1 %2 hidden. - %1 %2 cachée(e). + %1 %2 cachée(e). - Name of %1 %2 changed to %3. - Le nom de %1 %2 a été changé en %3. + Le nom de %1 %2 a été changé en %3. + + + + name + + + + %1 %2 renamed to %3. + @@ -904,9 +946,8 @@ These settings can always be changed at any time from the "Settings" m Valeurs d'initialisation - color - Couleur + Couleur @@ -989,6 +1030,21 @@ These settings can always be changed at any time from the "Settings" m Impossible de récupérer les informations de mise à jour. {}. + + visibility + + + + %1 %2 shown. + %1 %2 affiché(e). + + + + + %1 %2 hidden. + %1 %2 cachée(e). + + xcursor diff --git a/LogarithmPlotter/i18n/lp_hu.ts b/LogarithmPlotter/i18n/lp_hu.ts index edc2b7a..a9b4002 100644 --- a/LogarithmPlotter/i18n/lp_hu.ts +++ b/LogarithmPlotter/i18n/lp_hu.ts @@ -5,7 +5,7 @@ About - + About LogarithmPlotter LogarithmPlotter névjegye @@ -28,107 +28,107 @@ AppMenuBar - + &File &Fájl - + &Load... &Betöltés… - + &Save &Mentés - + Save &As... Me&ntés másként… - + &Quit &Kilépés - + &Edit S&zerkesztés - + &Undo &Visszavonás - + &Redo &Ismétlés - + &Copy plot Ábra má&solása - + &Create &Létrehozás - + &Settings &Beállítások - + Check for updates on startup Frissítések keresése indításkor - + Reset redo stack automaticly Ismétlési verem önműködő visszaállítása - + &Help &Súgó - + &Source code &Forráskód - + &Report a bug &Hiba bejelentése - + &Changelog &Változásnapló - + &Help translating! &Segítség a fordításban! - + &About &Névjegy - + Save unsaved changes? Menti a változtatásokat? - + This plot contains unsaved changes. By doing this, all unsaved data will be lost. Continue? Ez az ábra nem mentett változtatásokat tartalmaz. Ezzel az összes nem mentett adat elveszik. Folytatja? @@ -179,8 +179,8 @@ név + érték - - + + + Create new %1 + Új %1 létrehozása @@ -241,17 +241,17 @@ Ezek a beállítások bármikor módosíthatók a „Beállítások” menüben. HistoryBrowser - + Redo > Ismétlés > - + > Now > Most - + < Undo < Visszavonás @@ -330,7 +330,7 @@ Ezek a beállítások bármikor módosíthatók a „Beállítások” menüben. ObjectCreationGrid - + + Create new: + Új létrehozása: @@ -338,37 +338,37 @@ Ezek a beállítások bármikor módosíthatók a „Beállítások” menüben. ObjectLists - + Hide all %1 Összes %1 elrejtése - + Show all %1 Összes %1 megjelenítése - + Hide %1 %2 %1 %2 elrejtése - + Show %1 %2 %1 %2 megjelenítése - + Set %1 %2 position %1 %2 helye beállítása - + Delete %1 %2 %1 %2 törlése - + Pick new color for %1 %2 Válasszon új színt a következőhöz: %1 %2 @@ -487,16 +487,25 @@ Ezek a beállítások bármikor módosíthatók a „Beállítások” menüben. changelog - + Could not fetch changelog: Server error {}. Nem sikerült lekérni a változásnaplót: Kiszolgálóhiba: {}. - + Could not fetch update: {}. Nem sikerült lekérni a változásnaplót: {}. + + color + + + + %1 %2's color changed from %3 to %4. + + + comment @@ -530,6 +539,37 @@ Ezek a beállítások bármikor módosíthatók a „Beállítások” menüben. %1: + + create + + + + New %1 %2 created. + Új %1 %2 létrehozva. + + + + delete + + + + %1 %2 deleted. + %1 %2 törölve. + + + + editproperty + + + %1 of %2 %3 changed from "%4" to "%5". + %1/%2 %3 megváltozott. Régi érték: %4, új érték: %5. + + + + %1 of %2 changed from %3 to %4. + + + function @@ -569,34 +609,32 @@ Ezek a beállítások bármikor módosíthatók a „Beállítások” menüben. historylib - New %1 %2 created. - Új %1 %2 létrehozva. + Új %1 %2 létrehozva. - %1 %2 deleted. - %1 %2 törölve. + %1 %2 törölve. - - %1 of %2 %3 changed from "%4" to "%5". - %1/%2 %3 megváltozott. Régi érték: %4, új érték: %5. + %1/%2 %3 megváltozott. Régi érték: %4, új érték: %5. - %1 %2 shown. - %1 %2 megjelenítve. + %1 %2 megjelenítve. - %1 %2 hidden. - %1 %2 rejtve. + %1 %2 rejtve. + + + name - - Name of %1 %2 changed to %3. + + + %1 %2 renamed to %3. @@ -894,11 +932,6 @@ Ezek a beállítások bármikor módosíthatók a „Beállítások” menüben. baseValues Kezdeményezési értékek - - - color - - repartition @@ -980,6 +1013,21 @@ Ezek a beállítások bármikor módosíthatók a „Beállítások” menüben. Nem sikerült lekérni a frissítési adatokat: {}. + + visibility + + + + %1 %2 shown. + %1 %2 megjelenítve. + + + + + %1 %2 hidden. + %1 %2 rejtve. + + xcursor diff --git a/LogarithmPlotter/i18n/lp_nb_NO.ts b/LogarithmPlotter/i18n/lp_nb_NO.ts index 3188412..f63e9c0 100644 --- a/LogarithmPlotter/i18n/lp_nb_NO.ts +++ b/LogarithmPlotter/i18n/lp_nb_NO.ts @@ -5,7 +5,7 @@ About - + About LogarithmPlotter Om @@ -28,107 +28,107 @@ AppMenuBar - + &File &Fil - + &Load... &Last inn … - + &Save &Lagre - + Save &As... Lagre &som … - + &Quit &Avslutt - + &Edit &Rediger - + &Undo &Angre - + &Redo &Gjenta - + &Copy plot &Kopier plott - + &Create &Opprett - + &Settings &Innstillinger - + Check for updates on startup Se etter nye versjoner ved programstart - + Reset redo stack automaticly Tilbakestill angrehistorikk automatisk - + &Help &Hjelp - + &Source code - + &Report a bug - + &Changelog - + &Help translating! - + &About &Om - + Save unsaved changes? - + This plot contains unsaved changes. By doing this, all unsaved data will be lost. Continue? @@ -179,8 +179,8 @@ navn + veri - - + + + Create new %1 + Opprett nytt %1 @@ -241,17 +241,17 @@ Disse innstillingene kan endres når som helst fra «Innstillinger»-menyen. HistoryBrowser - + Redo > Angre > - + > Now > Nå - + < Undo < Angre @@ -330,7 +330,7 @@ Disse innstillingene kan endres når som helst fra «Innstillinger»-menyen. ObjectCreationGrid - + + Create new: + Opprett ny: @@ -338,37 +338,37 @@ Disse innstillingene kan endres når som helst fra «Innstillinger»-menyen. ObjectLists - + Hide all %1 Skjul alle %1 - + Show all %1 Vis alle %1 - + Hide %1 %2 Skjul %1 %2 - + Show %1 %2 Vis %1 %2 - + Set %1 %2 position Sett %1 %2 posisjon - + Delete %1 %2 Slett %1 %2 - + Pick new color for %1 %2 Velg ny farge for %1 %2 @@ -487,16 +487,25 @@ Disse innstillingene kan endres når som helst fra «Innstillinger»-menyen. changelog - + Could not fetch changelog: Server error {}. - + Could not fetch update: {}. + + color + + + + %1 %2's color changed from %3 to %4. + + + comment @@ -530,6 +539,37 @@ Disse innstillingene kan endres når som helst fra «Innstillinger»-menyen. + + create + + + + New %1 %2 created. + Ny %1 %2 opprettet. + + + + delete + + + + %1 %2 deleted. + %1 %2 slettet. + + + + editproperty + + + %1 of %2 %3 changed from "%4" to "%5". + %1 av %2 %3 endret fra «%4» til «%5». + + + + %1 of %2 changed from %3 to %4. + + + function @@ -569,34 +609,32 @@ Disse innstillingene kan endres når som helst fra «Innstillinger»-menyen. historylib - New %1 %2 created. - Ny %1 %2 opprettet. + Ny %1 %2 opprettet. - %1 %2 deleted. - %1 %2 slettet. + %1 %2 slettet. - - %1 of %2 %3 changed from "%4" to "%5". - %1 av %2 %3 endret fra «%4» til «%5». + %1 av %2 %3 endret fra «%4» til «%5». - %1 %2 shown. - %1 %2 vist. + %1 %2 vist. - %1 %2 hidden. - %1 %2 skjult. + %1 %2 skjult. + + + name - - Name of %1 %2 changed to %3. + + + %1 %2 renamed to %3. @@ -894,11 +932,6 @@ Disse innstillingene kan endres når som helst fra «Innstillinger»-menyen.baseValues - - - color - - repartition @@ -980,6 +1013,21 @@ Disse innstillingene kan endres når som helst fra «Innstillinger»-menyen.Kunne ikke hente info om hvorvidt det er nye versjoner: {}. + + visibility + + + + %1 %2 shown. + %1 %2 vist. + + + + + %1 %2 hidden. + %1 %2 skjult. + + xcursor diff --git a/LogarithmPlotter/i18n/lp_template.ts b/LogarithmPlotter/i18n/lp_template.ts index 9ffcad6..a22d36c 100644 --- a/LogarithmPlotter/i18n/lp_template.ts +++ b/LogarithmPlotter/i18n/lp_template.ts @@ -5,7 +5,7 @@ About - + About LogarithmPlotter @@ -28,107 +28,107 @@ AppMenuBar - + &File - + &Load... - + &Save - + Save &As... - + &Quit - + &Edit - + &Undo - + &Redo - + &Copy plot - + &Create - + &Settings - + Check for updates on startup - + Reset redo stack automaticly - + &Help - + &Source code - + &Report a bug - + &Changelog - + &Help translating! - + &About - + Save unsaved changes? - + This plot contains unsaved changes. By doing this, all unsaved data will be lost. Continue? @@ -179,8 +179,8 @@ - - + + + Create new %1 @@ -240,17 +240,17 @@ These settings can be changed at any time from the "Settings" menu. HistoryBrowser - + Redo > - + > Now - + < Undo @@ -329,7 +329,7 @@ These settings can be changed at any time from the "Settings" menu. ObjectCreationGrid - + + Create new: @@ -337,37 +337,37 @@ These settings can be changed at any time from the "Settings" menu. ObjectLists - + Hide all %1 - + Show all %1 - + Hide %1 %2 - + Show %1 %2 - + Set %1 %2 position - + Delete %1 %2 - + Pick new color for %1 %2 @@ -486,16 +486,25 @@ These settings can be changed at any time from the "Settings" menu. changelog - + Could not fetch changelog: Server error {}. - + Could not fetch update: {}. + + color + + + + %1 %2's color changed from %3 to %4. + + + comment @@ -529,6 +538,37 @@ These settings can be changed at any time from the "Settings" menu. + + create + + + + New %1 %2 created. + + + + + delete + + + + %1 %2 deleted. + + + + + editproperty + + + %1 of %2 %3 changed from "%4" to "%5". + + + + + %1 of %2 changed from %3 to %4. + + + function @@ -566,36 +606,11 @@ These settings can be changed at any time from the "Settings" menu. - historylib + name - - New %1 %2 created. - - - - - %1 %2 deleted. - - - - - - %1 of %2 %3 changed from "%4" to "%5". - - - - - %1 %2 shown. - - - - - %1 %2 hidden. - - - - - Name of %1 %2 changed to %3. + + + %1 %2 renamed to %3. @@ -893,11 +908,6 @@ These settings can be changed at any time from the "Settings" menu.baseValues - - - color - - repartition @@ -979,6 +989,21 @@ These settings can be changed at any time from the "Settings" menu. + + visibility + + + + %1 %2 shown. + + + + + + %1 %2 hidden. + + + xcursor diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/History/HistoryItem.qml b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/History/HistoryItem.qml index 909cbaa..b5d67d1 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/History/HistoryItem.qml +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/History/HistoryItem.qml @@ -64,16 +64,22 @@ Button { Base height of the action. */ readonly property int actionHeight: 40 + /*! + \qmlproperty color HistoryItem::clr + Color of the history action. + */ + readonly property color clr: historyAction.color(darkTheme) height: Math.max(actionHeight, label.height + 15) + LinearGradient { anchors.fill: parent start: Qt.point(0, 0) end: Qt.point(parent.width, 0) gradient: Gradient { GradientStop { position: 0.1; color: "transparent" } - GradientStop { position: 1.5; color: historyAction.color(darkTheme) } + GradientStop { position: 1.5; color: clr } } } @@ -94,10 +100,10 @@ Button { anchors.left: icon.right anchors.right: parent.right anchors.leftMargin: 6 - anchors.rightMargin: 10 + anchors.rightMargin: 20 anchors.verticalCenter: parent.verticalCenter font.pixelSize: 14 - text: historyAction.getHTMLString() + text: historyAction.getHTMLString().replace(/\$\{tag_color\}/g, clr) textFormat: Text.RichText clip: true wrapMode: Text.WordWrap diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml index d16b2f6..4c5dc44 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml @@ -216,8 +216,7 @@ ListView { title: qsTr("Pick new color for %1 %2").arg(Objects.types[objType].displayType()).arg(obj.name) onAccepted: { history.addToHistory(new HistoryLib.ColorChanged( - obj.name, objType, "color", - obj.color, color.toString() + obj.name, objType, obj.color, color.toString() )) obj.color = color.toString() controlRow.obj = Objects.currentObjects[objType][index] diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/history/color.js b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/history/color.js index ec50642..7739f7a 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/history/color.js +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/history/color.js @@ -29,6 +29,14 @@ class ColorChanged extends EP.EditedProperty { icon(){return 'appearance'} + constructor(targetName = "", targetType = "Point", oldColor = "black", newColor = "white") { + super(targetName, targetType, "color", oldColor, newColor) + } + + export() { + return [this.targetName, this.targetType, this.previousValue, this.newValue] + } + color(darkVer=false){return darkVer ? 'purple' : 'plum'} getReadableString() { @@ -38,12 +46,13 @@ class ColorChanged extends EP.EditedProperty { } formatColor(color) { - return `  ` + return `██` } getHTMLString() { return qsTr("%1 %2's color changed from %3 to %4.") - .arg(Objects.types[this.targetType].displayType()).arg(this.targetName) + .arg(Objects.types[this.targetType].displayType()) + .arg(' ' + this.targetName + " ") .arg(this.formatColor(this.previousValue)).arg(this.formatColor(this.newValue)) } } diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/history/create.js b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/history/create.js index 2a3f505..72abb6f 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/history/create.js +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/history/create.js @@ -52,5 +52,11 @@ class CreateNewObject extends C.Action { getReadableString() { return qsTr("New %1 %2 created.").arg(Objects.types[this.targetType].displayType()).arg(this.targetName) } + + getHTMLString() { + return qsTr("New %1 %2 created.") + .arg(Objects.types[this.targetType].displayType()) + .arg('' + this.targetName + "") + } } diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/history/delete.js b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/history/delete.js index 19ebe3e..59b5003 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/history/delete.js +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/history/delete.js @@ -41,4 +41,10 @@ class DeleteObject extends Create.CreateNewObject { getReadableString() { return qsTr("%1 %2 deleted.").arg(Objects.types[this.targetType].displayType()).arg(this.targetName) } + + getHTMLString() { + return qsTr("%1 %2 deleted.") + .arg(Objects.types[this.targetType].displayType()) + .arg('' + this.targetName + "") + } } diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/history/editproperty.js b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/history/editproperty.js index ee33a0d..1119096 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/history/editproperty.js +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/history/editproperty.js @@ -29,7 +29,9 @@ class EditedProperty extends C.Action { icon(){return 'modify'} - color(darkVer=false){return darkVer ? 'darkslateblue' : 'cyan'} + color(darkVer=false){ + return darkVer ? 'darkslateblue' : 'cyan'; + } constructor(targetName = "", targetType = "Point", targetProperty = "visible", previousValue = false, newValue = true, valueIsExpressionNeedingImport = false) { super(targetName, targetType) @@ -51,6 +53,7 @@ class EditedProperty extends C.Action { this.newValue = Objects.getObjectByName(this.newValue); } } + this.setReadableValues() } undo() { @@ -71,35 +74,48 @@ class EditedProperty extends C.Action { } } - getReadableString() { - let prev = ""; - let next = ""; + setReadableValues() { + this.prev = ""; + this.next = ""; if(this.propertyType instanceof Object) { switch(this.propertyType.type) { case "Enum": - prev = this.propertyType.translatedValues[this.propertyType.values.indexOf(this.previousValue)] - next = this.propertyType.translatedValues[this.propertyType.values.indexOf(this.newValue)] + this.prev = this.propertyType.translatedValues[this.propertyType.values.indexOf(this.previousValue)] + this.next = this.propertyType.translatedValues[this.propertyType.values.indexOf(this.newValue)] break; case "ObjectType": - prev = this.previousValue.name - next = this.newValue.name + this.prev = this.previousValue.name + this.next = this.newValue.name break; case "List": - prev = this.previousValue.join(",") - next = this.newValue.name.join(",") + this.prev = this.previousValue.join(",") + this.next = this.newValue.name.join(",") break; case "Dict": - prev = JSON.stringify(this.previousValue).replace("'", "\\'").replace('"', "'") - next = JSON.stringify(this.newValue).replace("'", "\\'").replace('"', "'") + this.prev = JSON.stringify(this.previousValue).replace("'", "\\'").replace('"', "'") + this.next = JSON.stringify(this.newValue).replace("'", "\\'").replace('"', "'") break; } } else { - prev = this.previousValue == null ? "null" : this.previousValue.toString() - next = this.newValue == null ? "null" : this.newValue.toString() + this.prev = this.previousValue == null ? "null" : this.previousValue.toString() + this.next = this.newValue == null ? "null" : this.newValue.toString() } + } + + getReadableString() { return qsTr('%1 of %2 %3 changed from "%4" to "%5".') .arg(this.targetPropertyReadable) .arg(Objects.types[this.targetType].displayType()) - .arg(this.targetName).arg(prev).arg(next) + .arg(this.targetName).arg(this.prev).arg(this.next) + } + + getHTMLString() { + return qsTr('%1 of %2 changed from %3 to %4.') + .arg(this.targetPropertyReadable) + .arg(' ' + this.targetName + ' ') + .arg(' '+this.prev+' ') + .arg(' '+this.next+'') +// .arg('' + Objects.types[this.targetType].displayType()) + } } diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/history/name.js b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/history/name.js index 5c2b114..34d4028 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/history/name.js +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/history/name.js @@ -52,6 +52,12 @@ class NameChanged extends EP.EditedProperty { .arg(Objects.types[this.targetType].displayType()) .arg(this.targetName).arg(this.newValue) } + + getHTMLString() { + return qsTr('%1 %2 renamed to %3.') + .arg(Objects.types[this.targetType].displayType()) + .arg('' + this.targetName + "").arg(''+this.newValue+'') + } } diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/history/visibility.js b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/history/visibility.js index 85ce611..08f0595 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/history/visibility.js +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/history/visibility.js @@ -19,6 +19,7 @@ .pragma library .import "editproperty.js" as EP +.import "../objects.js" as Objects class EditedVisibility extends EP.EditedProperty { @@ -42,11 +43,15 @@ class EditedVisibility extends EP.EditedProperty { } getReadableString() { - if(this.newValue) { - return qsTr('%1 %2 shown.').arg(this.targetType).arg(this.targetName) - } else { - return qsTr('%1 %2 hidden.').arg(this.targetType).arg(this.targetName) - } + return (this.newValue ? qsTr('%1 %2 shown.') : qsTr('%1 %2 hidden.')) + .arg(Objects.types[this.targetType].displayType()) + .arg(this.targetName) + } + + getHTMLString() { + return (this.newValue ? qsTr('%1 %2 shown.') : qsTr('%1 %2 hidden.')) + .arg(Objects.types[this.targetType].displayType()) + .arg('' + this.targetName + "") } }