gauge ui update

LordOfDragons · Sep 19, 2024 · 17dec08 · 17dec08
1 parent 91eb6f5
commit 17dec08
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 8 deletions.
diff --git a/...data/guithemes/test1/dial/background.webp → ...ata/guithemes/test1/gauge/background.webp b/...data/guithemes/test1/dial/background.webp → ...ata/guithemes/test1/gauge/background.webp
diff --git a/...ject/data/guithemes/test1/dial/blend.webp → ...ect/data/guithemes/test1/gauge/blend.webp b/...ject/data/guithemes/test1/dial/blend.webp → ...ect/data/guithemes/test1/gauge/blend.webp
diff --git a/...oject/data/guithemes/test1/dial/dial.webp → ...ect/data/guithemes/test1/gauge/gauge.webp b/...oject/data/guithemes/test1/dial/dial.webp → ...ect/data/guithemes/test1/gauge/gauge.webp
diff --git a/dstestproject/data/guithemes/ui.guitheme.xml b/dstestproject/data/guithemes/ui.guitheme.xml
@@ -163,20 +163,28 @@
 	<!-- scrollbars -->
 	<designer name='ProgressGauge.Gauge1' type='ProgressGauge'>
 		<canvasCreator parameter='normal.canvas' type='Image'>
-			<image parameter='image'>test1/dial/background.webp</image>
+			<image parameter='image'>test1/gauge/background.webp</image>
 		</canvasCreator>
-		<canvasCreator parameter='normal.dial' type='Image'>
-			<image parameter='image'>test1/dial/dial.webp</image>
+		<canvasCreator parameter='normal.gauge' type='Image'>
+			<image parameter='image'>test1/gauge/gauge.webp</image>
 		</canvasCreator>
 		<canvasCreator parameter='normal.blend' type='Image'>
-			<image parameter='image'>test1/dial/blend.webp</image>
+			<image parameter='image'>test1/gauge/blend.webp</image>
 		</canvasCreator>
-		<float parameter='blendWidth'>0</float>
+		<float parameter='normal.blendWidth'>0</float>
 		<point parameter='normal.minimumSize' x='64' y='64'/>
 	</designer>
 
 	<designer name='ProgressGauge.Gauge2' extendNamed='ProgressGauge.Gauge1'>
-		<float parameter='blendWidth'>0.2</float>
+		<float parameter='normal.blendWidth'>0.25</float>
+	</designer>
+
+	<designer name='ProgressGauge.Gauge3' extendNamed='ProgressGauge.Gauge1'>
+		<float parameter='normal.blendWidth'>0.5</float>
+	</designer>
+
+	<designer name='ProgressGauge.Gauge4' extendNamed='ProgressGauge.Gauge1'>
+		<float parameter='normal.blendWidth'>1</float>
 	</designer>
 
 

diff --git 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
diff --git a/dstestproject/develop/vorlage/gauge.svgz b/dstestproject/develop/vorlage/gauge.svgz