diff --git a/dstestproject/data/guithemes/test1/dial/background.webp b/dstestproject/data/guithemes/test1/gauge/background.webp similarity index 100% rename from dstestproject/data/guithemes/test1/dial/background.webp rename to dstestproject/data/guithemes/test1/gauge/background.webp diff --git a/dstestproject/data/guithemes/test1/dial/blend.webp b/dstestproject/data/guithemes/test1/gauge/blend.webp similarity index 100% rename from dstestproject/data/guithemes/test1/dial/blend.webp rename to dstestproject/data/guithemes/test1/gauge/blend.webp diff --git a/dstestproject/data/guithemes/test1/dial/dial.webp b/dstestproject/data/guithemes/test1/gauge/gauge.webp similarity index 100% rename from dstestproject/data/guithemes/test1/dial/dial.webp rename to dstestproject/data/guithemes/test1/gauge/gauge.webp diff --git a/dstestproject/data/guithemes/ui.guitheme.xml b/dstestproject/data/guithemes/ui.guitheme.xml index 7dbac3c..3a6246b 100644 --- a/dstestproject/data/guithemes/ui.guitheme.xml +++ b/dstestproject/data/guithemes/ui.guitheme.xml @@ -163,20 +163,28 @@ - test1/dial/background.webp + test1/gauge/background.webp - - test1/dial/dial.webp + + test1/gauge/gauge.webp - test1/dial/blend.webp + test1/gauge/blend.webp - 0 + 0 - 0.2 + 0.25 + + + + 0.5 + + + + 1 diff --git a/dstestproject/data/scripts/WindowScrollbars.ds b/dstestproject/data/scripts/WindowScrollbars.ds index 5d44eec..c67cdd1 100644 --- a/dstestproject/data/scripts/WindowScrollbars.ds +++ b/dstestproject/data/scripts/WindowScrollbars.ds @@ -151,8 +151,10 @@ class WindowScrollbars extends Window p.addWidget(ScrollPanel.new(textArea)) p.addWidget(Panel.new(FlowLayout.new(LayoutAxis.x, 5), block Panel p2 - p2.addWidget(ProgressGauge.new(modelScroll, "ProgressDial.Gauge1")) - p2.addWidget(ProgressGauge.new(modelScroll, "ProgressDial.Gauge2")) + p2.addWidget(ProgressGauge.new(modelProgress, "ProgressGauge.Gauge1")) + p2.addWidget(ProgressGauge.new(modelProgress, "ProgressGauge.Gauge2")) + p2.addWidget(ProgressGauge.new(modelProgress, "ProgressGauge.Gauge3")) + p2.addWidget(ProgressGauge.new(modelProgress, "ProgressGauge.Gauge4")) end)) end), BorderLayout.Area.content) end diff --git a/dstestproject/develop/vorlage/dial.svgz b/dstestproject/develop/vorlage/dial.svgz deleted file mode 100644 index 9df3ee1..0000000 Binary files a/dstestproject/develop/vorlage/dial.svgz and /dev/null differ diff --git a/dstestproject/develop/vorlage/gauge.svgz b/dstestproject/develop/vorlage/gauge.svgz new file mode 100644 index 0000000..a67f961 Binary files /dev/null and b/dstestproject/develop/vorlage/gauge.svgz differ