Compare commits

..

No commits in common. "7b24a54ca24b666cfc3913524c34997b5bd83eac" and "3f107f1ba4f68b5bc418f7aa1786f29b0f5e4699" have entirely different histories.

11 changed files with 262 additions and 319 deletions

View file

@ -241,22 +241,17 @@ Diese Einstellungen können jederzeit über das Menü "Einstellungen"
<context> <context>
<name>HistoryBrowser</name> <name>HistoryBrowser</name>
<message> <message>
<location filename="../qml/eu/ad5001/LogarithmPlotter/History/HistoryBrowser.qml" line="56"/> <location filename="../qml/eu/ad5001/LogarithmPlotter/History/HistoryBrowser.qml" line="81"/>
<source>Filter...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/eu/ad5001/LogarithmPlotter/History/HistoryBrowser.qml" line="97"/>
<source>Redo &gt;</source> <source>Redo &gt;</source>
<translation>Wiederherstellen &gt;</translation> <translation>Wiederherstellen &gt;</translation>
</message> </message>
<message> <message>
<location filename="../qml/eu/ad5001/LogarithmPlotter/History/HistoryBrowser.qml" line="116"/> <location filename="../qml/eu/ad5001/LogarithmPlotter/History/HistoryBrowser.qml" line="100"/>
<source>&gt; Now</source> <source>&gt; Now</source>
<translation>&gt; Aktueller Stand</translation> <translation>&gt; Aktueller Stand</translation>
</message> </message>
<message> <message>
<location filename="../qml/eu/ad5001/LogarithmPlotter/History/HistoryBrowser.qml" line="146"/> <location filename="../qml/eu/ad5001/LogarithmPlotter/History/HistoryBrowser.qml" line="129"/>
<source>&lt; Undo</source> <source>&lt; Undo</source>
<translation>&lt; Rückgängig</translation> <translation>&lt; Rückgängig</translation>
</message> </message>
@ -343,37 +338,37 @@ Diese Einstellungen können jederzeit über das Menü &quot;Einstellungen&quot;
<context> <context>
<name>ObjectLists</name> <name>ObjectLists</name>
<message> <message>
<location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="81"/> <location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="74"/>
<source>Hide all %1</source> <source>Hide all %1</source>
<translation>Alle %1 ausblenden</translation> <translation>Alle %1 ausblenden</translation>
</message> </message>
<message> <message>
<location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="81"/> <location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="74"/>
<source>Show all %1</source> <source>Show all %1</source>
<translation>Alle %1 anzeigen</translation> <translation>Alle %1 anzeigen</translation>
</message> </message>
<message> <message>
<location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="118"/> <location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="111"/>
<source>Hide %1 %2</source> <source>Hide %1 %2</source>
<translation>Ausblenden %1 %2</translation> <translation>Ausblenden %1 %2</translation>
</message> </message>
<message> <message>
<location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="119"/> <location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="112"/>
<source>Show %1 %2</source> <source>Show %1 %2</source>
<translation>Anzeigen %1 %2</translation> <translation>Anzeigen %1 %2</translation>
</message> </message>
<message> <message>
<location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="165"/> <location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="158"/>
<source>Set %1 %2 position</source> <source>Set %1 %2 position</source>
<translation>Position von %1 %2 einstellen</translation> <translation>Position von %1 %2 einstellen</translation>
</message> </message>
<message> <message>
<location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="190"/> <location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="183"/>
<source>Delete %1 %2</source> <source>Delete %1 %2</source>
<translation>%1 %2 löschen</translation> <translation>%1 %2 löschen</translation>
</message> </message>
<message> <message>
<location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="223"/> <location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="216"/>
<source>Pick new color for %1 %2</source> <source>Pick new color for %1 %2</source>
<translation>Neue Farbe für %1 %2 auswählen</translation> <translation>Neue Farbe für %1 %2 auswählen</translation>
</message> </message>
@ -537,10 +532,9 @@ Diese Einstellungen können jederzeit über das Menü &quot;Einstellungen&quot;
<context> <context>
<name>control</name> <name>control</name>
<message> <message>
<location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="87"/>
<location filename="../qml/eu/ad5001/LogarithmPlotter/Setting/ComboBoxSetting.qml" line="119"/> <location filename="../qml/eu/ad5001/LogarithmPlotter/Setting/ComboBoxSetting.qml" line="119"/>
<location filename="../qml/eu/ad5001/LogarithmPlotter/Setting/ListSetting.qml" line="98"/> <location filename="../qml/eu/ad5001/LogarithmPlotter/Setting/ListSetting.qml" line="98"/>
<location filename="../qml/eu/ad5001/LogarithmPlotter/Setting/TextSetting.qml" line="100"/> <location filename="../qml/eu/ad5001/LogarithmPlotter/Setting/TextSetting.qml" line="95"/>
<source>%1: </source> <source>%1: </source>
<translation>%1: </translation> <translation>%1: </translation>
</message> </message>

View file

@ -241,22 +241,17 @@ These settings can be changed at any time from the &quot;Settings&quot; menu.</t
<context> <context>
<name>HistoryBrowser</name> <name>HistoryBrowser</name>
<message> <message>
<location filename="../qml/eu/ad5001/LogarithmPlotter/History/HistoryBrowser.qml" line="56"/> <location filename="../qml/eu/ad5001/LogarithmPlotter/History/HistoryBrowser.qml" line="81"/>
<source>Filter...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/eu/ad5001/LogarithmPlotter/History/HistoryBrowser.qml" line="97"/>
<source>Redo &gt;</source> <source>Redo &gt;</source>
<translation>Redo &gt;</translation> <translation>Redo &gt;</translation>
</message> </message>
<message> <message>
<location filename="../qml/eu/ad5001/LogarithmPlotter/History/HistoryBrowser.qml" line="116"/> <location filename="../qml/eu/ad5001/LogarithmPlotter/History/HistoryBrowser.qml" line="100"/>
<source>&gt; Now</source> <source>&gt; Now</source>
<translation>&gt; Now</translation> <translation>&gt; Now</translation>
</message> </message>
<message> <message>
<location filename="../qml/eu/ad5001/LogarithmPlotter/History/HistoryBrowser.qml" line="146"/> <location filename="../qml/eu/ad5001/LogarithmPlotter/History/HistoryBrowser.qml" line="129"/>
<source>&lt; Undo</source> <source>&lt; Undo</source>
<translation>&lt; Undo</translation> <translation>&lt; Undo</translation>
</message> </message>
@ -343,37 +338,37 @@ These settings can be changed at any time from the &quot;Settings&quot; menu.</t
<context> <context>
<name>ObjectLists</name> <name>ObjectLists</name>
<message> <message>
<location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="81"/> <location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="74"/>
<source>Hide all %1</source> <source>Hide all %1</source>
<translation>Hide all %1</translation> <translation>Hide all %1</translation>
</message> </message>
<message> <message>
<location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="81"/> <location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="74"/>
<source>Show all %1</source> <source>Show all %1</source>
<translation>Show all %1</translation> <translation>Show all %1</translation>
</message> </message>
<message> <message>
<location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="118"/> <location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="111"/>
<source>Hide %1 %2</source> <source>Hide %1 %2</source>
<translation>Hide %1 %2</translation> <translation>Hide %1 %2</translation>
</message> </message>
<message> <message>
<location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="119"/> <location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="112"/>
<source>Show %1 %2</source> <source>Show %1 %2</source>
<translation>Show %1 %2</translation> <translation>Show %1 %2</translation>
</message> </message>
<message> <message>
<location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="165"/> <location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="158"/>
<source>Set %1 %2 position</source> <source>Set %1 %2 position</source>
<translation>Set %1 %2 position</translation> <translation>Set %1 %2 position</translation>
</message> </message>
<message> <message>
<location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="190"/> <location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="183"/>
<source>Delete %1 %2</source> <source>Delete %1 %2</source>
<translation>Delete %1 %2</translation> <translation>Delete %1 %2</translation>
</message> </message>
<message> <message>
<location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="223"/> <location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="216"/>
<source>Pick new color for %1 %2</source> <source>Pick new color for %1 %2</source>
<translation>Pick new color for %1 %2</translation> <translation>Pick new color for %1 %2</translation>
</message> </message>
@ -537,10 +532,9 @@ These settings can be changed at any time from the &quot;Settings&quot; menu.</t
<context> <context>
<name>control</name> <name>control</name>
<message> <message>
<location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="87"/>
<location filename="../qml/eu/ad5001/LogarithmPlotter/Setting/ComboBoxSetting.qml" line="119"/> <location filename="../qml/eu/ad5001/LogarithmPlotter/Setting/ComboBoxSetting.qml" line="119"/>
<location filename="../qml/eu/ad5001/LogarithmPlotter/Setting/ListSetting.qml" line="98"/> <location filename="../qml/eu/ad5001/LogarithmPlotter/Setting/ListSetting.qml" line="98"/>
<location filename="../qml/eu/ad5001/LogarithmPlotter/Setting/TextSetting.qml" line="100"/> <location filename="../qml/eu/ad5001/LogarithmPlotter/Setting/TextSetting.qml" line="95"/>
<source>%1: </source> <source>%1: </source>
<translation>%1: </translation> <translation>%1: </translation>
</message> </message>

View file

@ -240,22 +240,17 @@ These settings can be changed at any time from the &quot;Settings&quot; menu.</s
<context> <context>
<name>HistoryBrowser</name> <name>HistoryBrowser</name>
<message> <message>
<location filename="../qml/eu/ad5001/LogarithmPlotter/History/HistoryBrowser.qml" line="56"/> <location filename="../qml/eu/ad5001/LogarithmPlotter/History/HistoryBrowser.qml" line="81"/>
<source>Filter...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/eu/ad5001/LogarithmPlotter/History/HistoryBrowser.qml" line="97"/>
<source>Redo &gt;</source> <source>Redo &gt;</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/eu/ad5001/LogarithmPlotter/History/HistoryBrowser.qml" line="116"/> <location filename="../qml/eu/ad5001/LogarithmPlotter/History/HistoryBrowser.qml" line="100"/>
<source>&gt; Now</source> <source>&gt; Now</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/eu/ad5001/LogarithmPlotter/History/HistoryBrowser.qml" line="146"/> <location filename="../qml/eu/ad5001/LogarithmPlotter/History/HistoryBrowser.qml" line="129"/>
<source>&lt; Undo</source> <source>&lt; Undo</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -342,37 +337,37 @@ These settings can be changed at any time from the &quot;Settings&quot; menu.</s
<context> <context>
<name>ObjectLists</name> <name>ObjectLists</name>
<message> <message>
<location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="81"/> <location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="74"/>
<source>Hide all %1</source> <source>Hide all %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="81"/> <location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="74"/>
<source>Show all %1</source> <source>Show all %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="118"/> <location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="111"/>
<source>Hide %1 %2</source> <source>Hide %1 %2</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="119"/> <location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="112"/>
<source>Show %1 %2</source> <source>Show %1 %2</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="165"/> <location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="158"/>
<source>Set %1 %2 position</source> <source>Set %1 %2 position</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="190"/> <location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="183"/>
<source>Delete %1 %2</source> <source>Delete %1 %2</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="223"/> <location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="216"/>
<source>Pick new color for %1 %2</source> <source>Pick new color for %1 %2</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -536,10 +531,9 @@ These settings can be changed at any time from the &quot;Settings&quot; menu.</s
<context> <context>
<name>control</name> <name>control</name>
<message> <message>
<location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="87"/>
<location filename="../qml/eu/ad5001/LogarithmPlotter/Setting/ComboBoxSetting.qml" line="119"/> <location filename="../qml/eu/ad5001/LogarithmPlotter/Setting/ComboBoxSetting.qml" line="119"/>
<location filename="../qml/eu/ad5001/LogarithmPlotter/Setting/ListSetting.qml" line="98"/> <location filename="../qml/eu/ad5001/LogarithmPlotter/Setting/ListSetting.qml" line="98"/>
<location filename="../qml/eu/ad5001/LogarithmPlotter/Setting/TextSetting.qml" line="100"/> <location filename="../qml/eu/ad5001/LogarithmPlotter/Setting/TextSetting.qml" line="95"/>
<source>%1: </source> <source>%1: </source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>

View file

@ -249,22 +249,17 @@ These settings can always be changed at any time from the &quot;Settings&quot; m
<context> <context>
<name>HistoryBrowser</name> <name>HistoryBrowser</name>
<message> <message>
<location filename="../qml/eu/ad5001/LogarithmPlotter/History/HistoryBrowser.qml" line="56"/> <location filename="../qml/eu/ad5001/LogarithmPlotter/History/HistoryBrowser.qml" line="81"/>
<source>Filter...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/eu/ad5001/LogarithmPlotter/History/HistoryBrowser.qml" line="97"/>
<source>Redo &gt;</source> <source>Redo &gt;</source>
<translation>Rétablir &gt;</translation> <translation>Rétablir &gt;</translation>
</message> </message>
<message> <message>
<location filename="../qml/eu/ad5001/LogarithmPlotter/History/HistoryBrowser.qml" line="116"/> <location filename="../qml/eu/ad5001/LogarithmPlotter/History/HistoryBrowser.qml" line="100"/>
<source>&gt; Now</source> <source>&gt; Now</source>
<translation>&gt; État actuel</translation> <translation>&gt; État actuel</translation>
</message> </message>
<message> <message>
<location filename="../qml/eu/ad5001/LogarithmPlotter/History/HistoryBrowser.qml" line="146"/> <location filename="../qml/eu/ad5001/LogarithmPlotter/History/HistoryBrowser.qml" line="129"/>
<source>&lt; Undo</source> <source>&lt; Undo</source>
<translation>&lt; Annuler</translation> <translation>&lt; Annuler</translation>
</message> </message>
@ -351,37 +346,37 @@ These settings can always be changed at any time from the &quot;Settings&quot; m
<context> <context>
<name>ObjectLists</name> <name>ObjectLists</name>
<message> <message>
<location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="81"/> <location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="74"/>
<source>Hide all %1</source> <source>Hide all %1</source>
<translation>Cacher tous les %1</translation> <translation>Cacher tous les %1</translation>
</message> </message>
<message> <message>
<location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="81"/> <location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="74"/>
<source>Show all %1</source> <source>Show all %1</source>
<translation>Montrer tous les %1</translation> <translation>Montrer tous les %1</translation>
</message> </message>
<message> <message>
<location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="118"/> <location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="111"/>
<source>Hide %1 %2</source> <source>Hide %1 %2</source>
<translation>Cacher l&apos;objet %1 %2</translation> <translation>Cacher l&apos;objet %1 %2</translation>
</message> </message>
<message> <message>
<location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="119"/> <location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="112"/>
<source>Show %1 %2</source> <source>Show %1 %2</source>
<translation>Montrer l&apos;objet %1 %2</translation> <translation>Montrer l&apos;objet %1 %2</translation>
</message> </message>
<message> <message>
<location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="165"/> <location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="158"/>
<source>Set %1 %2 position</source> <source>Set %1 %2 position</source>
<translation>Définir la position de l&apos;objet %1 %2</translation> <translation>Définir la position de l&apos;objet %1 %2</translation>
</message> </message>
<message> <message>
<location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="190"/> <location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="183"/>
<source>Delete %1 %2</source> <source>Delete %1 %2</source>
<translation>Supprimer l&apos;objet %1 %2</translation> <translation>Supprimer l&apos;objet %1 %2</translation>
</message> </message>
<message> <message>
<location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="223"/> <location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="216"/>
<source>Pick new color for %1 %2</source> <source>Pick new color for %1 %2</source>
<translation>Choisissez une nouvelle couleur pour %1 %2</translation> <translation>Choisissez une nouvelle couleur pour %1 %2</translation>
</message> </message>
@ -546,10 +541,9 @@ These settings can always be changed at any time from the &quot;Settings&quot; m
<context> <context>
<name>control</name> <name>control</name>
<message> <message>
<location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="87"/>
<location filename="../qml/eu/ad5001/LogarithmPlotter/Setting/ComboBoxSetting.qml" line="119"/> <location filename="../qml/eu/ad5001/LogarithmPlotter/Setting/ComboBoxSetting.qml" line="119"/>
<location filename="../qml/eu/ad5001/LogarithmPlotter/Setting/ListSetting.qml" line="98"/> <location filename="../qml/eu/ad5001/LogarithmPlotter/Setting/ListSetting.qml" line="98"/>
<location filename="../qml/eu/ad5001/LogarithmPlotter/Setting/TextSetting.qml" line="100"/> <location filename="../qml/eu/ad5001/LogarithmPlotter/Setting/TextSetting.qml" line="95"/>
<source>%1: </source> <source>%1: </source>
<translation>%1 : </translation> <translation>%1 : </translation>
</message> </message>

View file

@ -241,22 +241,17 @@ Ezek a beállítások bármikor módosíthatók a „Beállítások” menüben.
<context> <context>
<name>HistoryBrowser</name> <name>HistoryBrowser</name>
<message> <message>
<location filename="../qml/eu/ad5001/LogarithmPlotter/History/HistoryBrowser.qml" line="56"/> <location filename="../qml/eu/ad5001/LogarithmPlotter/History/HistoryBrowser.qml" line="81"/>
<source>Filter...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/eu/ad5001/LogarithmPlotter/History/HistoryBrowser.qml" line="97"/>
<source>Redo &gt;</source> <source>Redo &gt;</source>
<translation>Ismétlés &gt;</translation> <translation>Ismétlés &gt;</translation>
</message> </message>
<message> <message>
<location filename="../qml/eu/ad5001/LogarithmPlotter/History/HistoryBrowser.qml" line="116"/> <location filename="../qml/eu/ad5001/LogarithmPlotter/History/HistoryBrowser.qml" line="100"/>
<source>&gt; Now</source> <source>&gt; Now</source>
<translation>&gt; Most</translation> <translation>&gt; Most</translation>
</message> </message>
<message> <message>
<location filename="../qml/eu/ad5001/LogarithmPlotter/History/HistoryBrowser.qml" line="146"/> <location filename="../qml/eu/ad5001/LogarithmPlotter/History/HistoryBrowser.qml" line="129"/>
<source>&lt; Undo</source> <source>&lt; Undo</source>
<translation>&lt; Visszavonás</translation> <translation>&lt; Visszavonás</translation>
</message> </message>
@ -343,37 +338,37 @@ Ezek a beállítások bármikor módosíthatók a „Beállítások” menüben.
<context> <context>
<name>ObjectLists</name> <name>ObjectLists</name>
<message> <message>
<location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="81"/> <location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="74"/>
<source>Hide all %1</source> <source>Hide all %1</source>
<translation>Összes %1 elrejtése</translation> <translation>Összes %1 elrejtése</translation>
</message> </message>
<message> <message>
<location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="81"/> <location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="74"/>
<source>Show all %1</source> <source>Show all %1</source>
<translation>Összes %1 megjelenítése</translation> <translation>Összes %1 megjelenítése</translation>
</message> </message>
<message> <message>
<location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="118"/> <location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="111"/>
<source>Hide %1 %2</source> <source>Hide %1 %2</source>
<translation>%1 %2 elrejtése</translation> <translation>%1 %2 elrejtése</translation>
</message> </message>
<message> <message>
<location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="119"/> <location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="112"/>
<source>Show %1 %2</source> <source>Show %1 %2</source>
<translation>%1 %2 megjelenítése</translation> <translation>%1 %2 megjelenítése</translation>
</message> </message>
<message> <message>
<location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="165"/> <location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="158"/>
<source>Set %1 %2 position</source> <source>Set %1 %2 position</source>
<translation>%1 %2 helye beállítása</translation> <translation>%1 %2 helye beállítása</translation>
</message> </message>
<message> <message>
<location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="190"/> <location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="183"/>
<source>Delete %1 %2</source> <source>Delete %1 %2</source>
<translation>%1 %2 törlése</translation> <translation>%1 %2 törlése</translation>
</message> </message>
<message> <message>
<location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="223"/> <location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="216"/>
<source>Pick new color for %1 %2</source> <source>Pick new color for %1 %2</source>
<translation>Válasszon új színt a következőhöz: %1 %2</translation> <translation>Válasszon új színt a következőhöz: %1 %2</translation>
</message> </message>
@ -537,10 +532,9 @@ Ezek a beállítások bármikor módosíthatók a „Beállítások” menüben.
<context> <context>
<name>control</name> <name>control</name>
<message> <message>
<location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="87"/>
<location filename="../qml/eu/ad5001/LogarithmPlotter/Setting/ComboBoxSetting.qml" line="119"/> <location filename="../qml/eu/ad5001/LogarithmPlotter/Setting/ComboBoxSetting.qml" line="119"/>
<location filename="../qml/eu/ad5001/LogarithmPlotter/Setting/ListSetting.qml" line="98"/> <location filename="../qml/eu/ad5001/LogarithmPlotter/Setting/ListSetting.qml" line="98"/>
<location filename="../qml/eu/ad5001/LogarithmPlotter/Setting/TextSetting.qml" line="100"/> <location filename="../qml/eu/ad5001/LogarithmPlotter/Setting/TextSetting.qml" line="95"/>
<source>%1: </source> <source>%1: </source>
<translation>%1: </translation> <translation>%1: </translation>
</message> </message>

View file

@ -241,22 +241,17 @@ Disse innstillingene kan endres når som helst fra «Innstillinger»-menyen.</tr
<context> <context>
<name>HistoryBrowser</name> <name>HistoryBrowser</name>
<message> <message>
<location filename="../qml/eu/ad5001/LogarithmPlotter/History/HistoryBrowser.qml" line="56"/> <location filename="../qml/eu/ad5001/LogarithmPlotter/History/HistoryBrowser.qml" line="81"/>
<source>Filter...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/eu/ad5001/LogarithmPlotter/History/HistoryBrowser.qml" line="97"/>
<source>Redo &gt;</source> <source>Redo &gt;</source>
<translation>Angre &gt;</translation> <translation>Angre &gt;</translation>
</message> </message>
<message> <message>
<location filename="../qml/eu/ad5001/LogarithmPlotter/History/HistoryBrowser.qml" line="116"/> <location filename="../qml/eu/ad5001/LogarithmPlotter/History/HistoryBrowser.qml" line="100"/>
<source>&gt; Now</source> <source>&gt; Now</source>
<translation>&gt; </translation> <translation>&gt; </translation>
</message> </message>
<message> <message>
<location filename="../qml/eu/ad5001/LogarithmPlotter/History/HistoryBrowser.qml" line="146"/> <location filename="../qml/eu/ad5001/LogarithmPlotter/History/HistoryBrowser.qml" line="129"/>
<source>&lt; Undo</source> <source>&lt; Undo</source>
<translation>&lt; Angre</translation> <translation>&lt; Angre</translation>
</message> </message>
@ -343,37 +338,37 @@ Disse innstillingene kan endres når som helst fra «Innstillinger»-menyen.</tr
<context> <context>
<name>ObjectLists</name> <name>ObjectLists</name>
<message> <message>
<location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="81"/> <location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="74"/>
<source>Hide all %1</source> <source>Hide all %1</source>
<translation>Skjul alle %1</translation> <translation>Skjul alle %1</translation>
</message> </message>
<message> <message>
<location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="81"/> <location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="74"/>
<source>Show all %1</source> <source>Show all %1</source>
<translation>Vis alle %1</translation> <translation>Vis alle %1</translation>
</message> </message>
<message> <message>
<location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="118"/> <location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="111"/>
<source>Hide %1 %2</source> <source>Hide %1 %2</source>
<translation>Skjul %1 %2</translation> <translation>Skjul %1 %2</translation>
</message> </message>
<message> <message>
<location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="119"/> <location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="112"/>
<source>Show %1 %2</source> <source>Show %1 %2</source>
<translation>Vis %1 %2</translation> <translation>Vis %1 %2</translation>
</message> </message>
<message> <message>
<location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="165"/> <location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="158"/>
<source>Set %1 %2 position</source> <source>Set %1 %2 position</source>
<translation type="unfinished">Sett %1 %2 posisjon</translation> <translation type="unfinished">Sett %1 %2 posisjon</translation>
</message> </message>
<message> <message>
<location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="190"/> <location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="183"/>
<source>Delete %1 %2</source> <source>Delete %1 %2</source>
<translation>Slett %1 %2</translation> <translation>Slett %1 %2</translation>
</message> </message>
<message> <message>
<location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="223"/> <location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="216"/>
<source>Pick new color for %1 %2</source> <source>Pick new color for %1 %2</source>
<translation>Velg ny farge for %1 %2</translation> <translation>Velg ny farge for %1 %2</translation>
</message> </message>
@ -537,10 +532,9 @@ Disse innstillingene kan endres når som helst fra «Innstillinger»-menyen.</tr
<context> <context>
<name>control</name> <name>control</name>
<message> <message>
<location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="87"/>
<location filename="../qml/eu/ad5001/LogarithmPlotter/Setting/ComboBoxSetting.qml" line="119"/> <location filename="../qml/eu/ad5001/LogarithmPlotter/Setting/ComboBoxSetting.qml" line="119"/>
<location filename="../qml/eu/ad5001/LogarithmPlotter/Setting/ListSetting.qml" line="98"/> <location filename="../qml/eu/ad5001/LogarithmPlotter/Setting/ListSetting.qml" line="98"/>
<location filename="../qml/eu/ad5001/LogarithmPlotter/Setting/TextSetting.qml" line="100"/> <location filename="../qml/eu/ad5001/LogarithmPlotter/Setting/TextSetting.qml" line="95"/>
<source>%1: </source> <source>%1: </source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>

View file

@ -240,22 +240,17 @@ These settings can be changed at any time from the &quot;Settings&quot; menu.</s
<context> <context>
<name>HistoryBrowser</name> <name>HistoryBrowser</name>
<message> <message>
<location filename="../qml/eu/ad5001/LogarithmPlotter/History/HistoryBrowser.qml" line="56"/> <location filename="../qml/eu/ad5001/LogarithmPlotter/History/HistoryBrowser.qml" line="81"/>
<source>Filter...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/eu/ad5001/LogarithmPlotter/History/HistoryBrowser.qml" line="97"/>
<source>Redo &gt;</source> <source>Redo &gt;</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/eu/ad5001/LogarithmPlotter/History/HistoryBrowser.qml" line="116"/> <location filename="../qml/eu/ad5001/LogarithmPlotter/History/HistoryBrowser.qml" line="100"/>
<source>&gt; Now</source> <source>&gt; Now</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/eu/ad5001/LogarithmPlotter/History/HistoryBrowser.qml" line="146"/> <location filename="../qml/eu/ad5001/LogarithmPlotter/History/HistoryBrowser.qml" line="129"/>
<source>&lt; Undo</source> <source>&lt; Undo</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -342,37 +337,37 @@ These settings can be changed at any time from the &quot;Settings&quot; menu.</s
<context> <context>
<name>ObjectLists</name> <name>ObjectLists</name>
<message> <message>
<location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="81"/> <location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="74"/>
<source>Hide all %1</source> <source>Hide all %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="81"/> <location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="74"/>
<source>Show all %1</source> <source>Show all %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="118"/> <location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="111"/>
<source>Hide %1 %2</source> <source>Hide %1 %2</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="119"/> <location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="112"/>
<source>Show %1 %2</source> <source>Show %1 %2</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="165"/> <location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="158"/>
<source>Set %1 %2 position</source> <source>Set %1 %2 position</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="190"/> <location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="183"/>
<source>Delete %1 %2</source> <source>Delete %1 %2</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="223"/> <location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="216"/>
<source>Pick new color for %1 %2</source> <source>Pick new color for %1 %2</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -536,10 +531,9 @@ These settings can be changed at any time from the &quot;Settings&quot; menu.</s
<context> <context>
<name>control</name> <name>control</name>
<message> <message>
<location filename="../qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml" line="87"/>
<location filename="../qml/eu/ad5001/LogarithmPlotter/Setting/ComboBoxSetting.qml" line="119"/> <location filename="../qml/eu/ad5001/LogarithmPlotter/Setting/ComboBoxSetting.qml" line="119"/>
<location filename="../qml/eu/ad5001/LogarithmPlotter/Setting/ListSetting.qml" line="98"/> <location filename="../qml/eu/ad5001/LogarithmPlotter/Setting/ListSetting.qml" line="98"/>
<location filename="../qml/eu/ad5001/LogarithmPlotter/Setting/TextSetting.qml" line="100"/> <location filename="../qml/eu/ad5001/LogarithmPlotter/Setting/TextSetting.qml" line="95"/>
<source>%1: </source> <source>%1: </source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>

View file

@ -53,7 +53,7 @@ Item {
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
anchors.top: parent.top anchors.top: parent.top
placeholderText: qsTr("Filter...") placeholderText: "Filter..."
} }
ScrollView { ScrollView {

View file

@ -52,7 +52,7 @@ Column {
id: createBtn id: createBtn
width: parent.width/3 width: parent.width/3
visible: Objects.types[modelData].createable() visible: Objects.types[modelData].createable()
height: visible ? width*0.8 : 0 height: visible ? width*0.6 : 0
// The KDE SDK is kinda buggy, so it respects neither specified color nor display propreties. // The KDE SDK is kinda buggy, so it respects neither specified color nor display propreties.
//display: AbstractButton.TextUnderIcon //display: AbstractButton.TextUnderIcon
@ -63,7 +63,7 @@ Column {
anchors.left: parent.left anchors.left: parent.left
anchors.leftMargin: (parent.width-width)/2 anchors.leftMargin: (parent.width-width)/2
anchors.top: parent.top anchors.top: parent.top
anchors.topMargin: (label.y-height)/2 anchors.topMargin: 8
color: sysPalette.windowText color: sysPalette.windowText
source: '../icons/objects/'+modelData+'.svg' source: '../icons/objects/'+modelData+'.svg'
@ -80,7 +80,6 @@ Column {
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
font.pixelSize: 14 font.pixelSize: 14
text: Objects.types[modelData].displayType() text: Objects.types[modelData].displayType()
wrapMode: Text.WordWrap
clip: true clip: true
} }

View file

@ -34,211 +34,195 @@ import "../js/historylib.js" as HistoryLib
\sa LogarithmPlotter, ObjectCreationGrid, ObjectLists \sa LogarithmPlotter, ObjectCreationGrid, ObjectLists
*/ */
ScrollView { ListView {
id: objectListList id: objectListList
signal changed() signal changed()
property var listViews: {'':''} // Needs to be initialized or will be undefined -_- property var listViews: {'':''} // Needs to be initialized or will be undefined -_-
model: Object.keys(Objects.types)
implicitHeight: contentItem.childrenRect.height + footer.height + 10
ScrollBar.horizontal.visible: false delegate: ListView {
ScrollBar.vertical.visible: true id: objTypeList
property string objType: objectListList.model[index]
ListView { property var editingRows: []
id: objectsListView model: Objects.currentObjects[objType]
model: Object.keys(Objects.types) width: objectListList.width
width: implicitWidth //objectListList.width - (implicitHeight > objectListList.parent.height ? 20 : 0) implicitHeight: contentItem.childrenRect.height
implicitHeight: contentItem.childrenRect.height + footer.height + 10 visible: model != undefined && model.length > 0
interactive: false
delegate: ListView { Component.onCompleted: objectListList.listViews[objType] = objTypeList // Listing in order to be refreshed
id: objTypeList
property string objType: objectsListView.model[index] header: Row {
property var editingRows: [] width: typeHeaderText.width + typeVisibilityCheckBox.visible
model: Objects.currentObjects[objType] height: visible ? 20 : 0
width: objectsListView.width visible: objTypeList.visible
implicitHeight: contentItem.childrenRect.height
visible: model != undefined && model.length > 0
interactive: false
Component.onCompleted: objectListList.listViews[objType] = objTypeList // Listing in order to be refreshed CheckBox {
id: typeVisibilityCheckBox
header: Row { checked: Objects.currentObjects[objType] != undefined ? Objects.currentObjects[objType].every(obj => obj.visible) : true
width: typeHeaderText.width + typeVisibilityCheckBox.visible onClicked: {
height: visible ? 20 : 0 for(var obj of Objects.currentObjects[objType]) obj.visible = this.checked
visible: objTypeList.visible for(var obj of objTypeList.editingRows) obj.objVisible = this.checked
objectListList.changed()
CheckBox {
id: typeVisibilityCheckBox
checked: Objects.currentObjects[objType] != undefined ? Objects.currentObjects[objType].every(obj => obj.visible) : true
onClicked: {
for(var obj of Objects.currentObjects[objType]) obj.visible = this.checked
for(var obj of objTypeList.editingRows) obj.objVisible = this.checked
objectListList.changed()
}
ToolTip.visible: hovered
ToolTip.text: checked ? qsTr("Hide all %1").arg(Objects.types[objType].displayTypeMultiple()) : qsTr("Show all %1").arg(Objects.types[objType].displayTypeMultiple())
} }
Label { ToolTip.visible: hovered
id: typeHeaderText ToolTip.text: checked ? qsTr("Hide all %1").arg(Objects.types[objType].displayTypeMultiple()) : qsTr("Show all %1").arg(Objects.types[objType].displayTypeMultiple())
verticalAlignment: TextInput.AlignVCenter
text: qsTranslate("control", "%1: ").arg(Objects.types[objType].displayTypeMultiple())
font.pixelSize: 20
}
} }
delegate: Item { Label {
id: controlRow id: typeHeaderText
property var obj: Objects.currentObjects[objType][index] verticalAlignment: TextInput.AlignVCenter
property alias objVisible: objVisibilityCheckBox.checked text: qsTranslate("control", "%1: ").arg(Objects.types[objType].displayTypeMultiple())
height: 40 font.pixelSize: 20
width: objTypeList.width
Component.onCompleted: objTypeList.editingRows.push(controlRow)
CheckBox {
id: objVisibilityCheckBox
checked: Objects.currentObjects[objType][index].visible
anchors.verticalCenter: parent.verticalCenter
anchors.left: parent.left
anchors.leftMargin: 5
onClicked: {
history.addToHistory(new HistoryLib.EditedVisibility(
Objects.currentObjects[objType][index].name, objType, this.checked
))
Objects.currentObjects[objType][index].visible = this.checked
objectListList.changed()
controlRow.obj = Objects.currentObjects[objType][index]
}
ToolTip.visible: hovered
ToolTip.text: checked ?
qsTr("Hide %1 %2").arg(Objects.types[objType].displayType()).arg(obj.name) :
qsTr("Show %1 %2").arg(Objects.types[objType].displayType()).arg(obj.name)
}
Label {
id: objDescription
anchors.left: objVisibilityCheckBox.right
anchors.right: deleteButton.left
height: parent.height
verticalAlignment: TextInput.AlignVCenter
text: obj.getReadableString()
font.pixelSize: 14
MouseArea {
anchors.fill: parent
onClicked: {
objEditor.obj = Objects.currentObjects[objType][index]
objEditor.objType = objType
objEditor.objIndex = index
//objEditor.editingRow = controlRow
objEditor.show()
}
}
}
Button {
id: pointerButton
width: parent.height - 10
height: width
anchors.right: deleteButton.left
anchors.rightMargin: 5
anchors.topMargin: 5
Setting.Icon {
id: icon
width: 18
height: 18
anchors.centerIn: parent
color: sysPalette.windowText
source: '../icons/common/position.svg'
}
property bool hasXProp: Objects.types[objType].properties().hasOwnProperty('x')
property bool hasYProp: Objects.types[objType].properties().hasOwnProperty('y')
visible: hasXProp || hasYProp
ToolTip.visible: hovered
ToolTip.text: qsTr("Set %1 %2 position").arg(Objects.types[objType].displayType()).arg(obj.name)
onClicked: {
positionPicker.objType = objType
positionPicker.objName = obj.name
positionPicker.pickX = hasXProp
positionPicker.pickY = hasYProp
positionPicker.propertyX = 'x'
positionPicker.propertyY = 'y'
positionPicker.visible = true
}
}
Button {
id: deleteButton
width: parent.height - 10
height: width
anchors.right: colorPickRect.left
anchors.rightMargin: 5
anchors.topMargin: 5
icon.name: 'delete'
icon.source: '../icons/common/delete.svg'
icon.color: sysPalette.buttonText
ToolTip.visible: hovered
ToolTip.text: qsTr("Delete %1 %2").arg(Objects.types[objType].displayType()).arg(obj.name)
onClicked: {
history.addToHistory(new HistoryLib.DeleteObject(
obj.name, objType, obj.export()
))
Objects.currentObjects[objType][index].delete()
Objects.currentObjects[objType].splice(index, 1)
objectListList.update()
}
}
Rectangle {
id: colorPickRect
anchors.right: parent.right
anchors.rightMargin: 5
anchors.topMargin: 5
color: obj.color
width: parent.height - 10
height: width
radius: Math.min(width, height)
border.width: 2
border.color: sysPalette.windowText
MouseArea {
anchors.fill: parent
onClicked: pickColor.open()
}
}
D.ColorDialog {
id: pickColor
color: obj.color
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, obj.color, color.toString()
))
obj.color = color.toString()
controlRow.obj = Objects.currentObjects[objType][index]
objectListList.update()
}
}
} }
} }
// Create items delegate: Item {
footer: ObjectCreationGrid { id: controlRow
id: createRow property var obj: Objects.currentObjects[objType][index]
width: objectsListView.width property alias objVisible: objVisibilityCheckBox.checked
objectEditor: objEditor height: 40
objectLists: objectListList width: objTypeList.width
Component.onCompleted: objTypeList.editingRows.push(controlRow)
CheckBox {
id: objVisibilityCheckBox
checked: Objects.currentObjects[objType][index].visible
anchors.verticalCenter: parent.verticalCenter
anchors.left: parent.left
anchors.leftMargin: 5
onClicked: {
history.addToHistory(new HistoryLib.EditedVisibility(
Objects.currentObjects[objType][index].name, objType, this.checked
))
Objects.currentObjects[objType][index].visible = this.checked
objectListList.changed()
controlRow.obj = Objects.currentObjects[objType][index]
}
ToolTip.visible: hovered
ToolTip.text: checked ?
qsTr("Hide %1 %2").arg(Objects.types[objType].displayType()).arg(obj.name) :
qsTr("Show %1 %2").arg(Objects.types[objType].displayType()).arg(obj.name)
}
Label {
id: objDescription
anchors.left: objVisibilityCheckBox.right
anchors.right: deleteButton.left
height: parent.height
verticalAlignment: TextInput.AlignVCenter
text: obj.getReadableString()
font.pixelSize: 14
MouseArea {
anchors.fill: parent
onClicked: {
objEditor.obj = Objects.currentObjects[objType][index]
objEditor.objType = objType
objEditor.objIndex = index
//objEditor.editingRow = controlRow
objEditor.show()
}
}
}
Button {
id: pointerButton
width: parent.height - 10
height: width
anchors.right: deleteButton.left
anchors.rightMargin: 5
anchors.topMargin: 5
Setting.Icon {
id: icon
width: 18
height: 18
anchors.centerIn: parent
color: sysPalette.windowText
source: '../icons/common/position.svg'
}
property bool hasXProp: Objects.types[objType].properties().hasOwnProperty('x')
property bool hasYProp: Objects.types[objType].properties().hasOwnProperty('y')
visible: hasXProp || hasYProp
ToolTip.visible: hovered
ToolTip.text: qsTr("Set %1 %2 position").arg(Objects.types[objType].displayType()).arg(obj.name)
onClicked: {
positionPicker.objType = objType
positionPicker.objName = obj.name
positionPicker.pickX = hasXProp
positionPicker.pickY = hasYProp
positionPicker.propertyX = 'x'
positionPicker.propertyY = 'y'
positionPicker.visible = true
}
}
Button {
id: deleteButton
width: parent.height - 10
height: width
anchors.right: colorPickRect.left
anchors.rightMargin: 5
anchors.topMargin: 5
icon.name: 'delete'
icon.source: '../icons/common/delete.svg'
icon.color: sysPalette.buttonText
ToolTip.visible: hovered
ToolTip.text: qsTr("Delete %1 %2").arg(Objects.types[objType].displayType()).arg(obj.name)
onClicked: {
history.addToHistory(new HistoryLib.DeleteObject(
obj.name, objType, obj.export()
))
Objects.currentObjects[objType][index].delete()
Objects.currentObjects[objType].splice(index, 1)
objectListList.update()
}
}
Rectangle {
id: colorPickRect
anchors.right: parent.right
anchors.rightMargin: 5
anchors.topMargin: 5
color: obj.color
width: parent.height - 10
height: width
radius: Math.min(width, height)
border.width: 2
border.color: sysPalette.windowText
MouseArea {
anchors.fill: parent
onClicked: pickColor.open()
}
}
D.ColorDialog {
id: pickColor
color: obj.color
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, obj.color, color.toString()
))
obj.color = color.toString()
controlRow.obj = Objects.currentObjects[objType][index]
objectListList.update()
}
}
} }
} }
@ -247,6 +231,14 @@ ScrollView {
id: objEditor id: objEditor
} }
// Create items
footer: ObjectCreationGrid {
id: createRow
width: parent.width
objectEditor: objEditor
objectLists: objectListList
}
/*! /*!
\qmlmethod void ObjectLists::update() \qmlmethod void ObjectLists::update()
Updates the view of the ObjectLists. Updates the view of the ObjectLists.

View file

@ -36,19 +36,13 @@ Item {
Path of the icon image source. Path of the icon image source.
*/ */
property alias source: img.source property alias source: img.source
/*!
\qmlproperty string Icon::source
Path of the icon image source.
*/
property alias sourceSize: img.sourceSize.width
Image { Image {
id: img id: img
height: parent.height height: parent.height
width: parent.width width: parent.width
//smooth: true smooth: true
visible: false visible: false
sourceSize.height: sourceSize.width
} }
ColorOverlay { ColorOverlay {
anchors.fill: img anchors.fill: img