X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=marklin.res;h=539709259ba7feec6f9a003e3fde90c347f81074;hb=293bfd4d1a5dbd57c7d3c657e5f6467d9f2e3300;hp=8efa84edd184bc65f5265ba7f128ab6a4ecc9cda;hpb=d79f5acedfb9460894c05803b5309c1f9bf21d68;p=r2c2.git

diff --git a/marklin.res b/marklin.res
index 8efa84e..5397092 100644
--- a/marklin.res
+++ b/marklin.res
@@ -13,6 +13,14 @@ style "label"
 	special "text";
 };
 
+style "image"
+{
+	special "image"
+	{
+		fill 1.0 1.0;
+	};
+};
+
 graphic "tooltip"
 {
 	texture "gui.png";
@@ -85,6 +93,34 @@ graphic "red_button_pressed"
 	shadow { top 0; right 1; bottom 2; left 0; };
 };
 
+graphic "up_arrow_button"
+{
+	texture "gui.png";
+	slice 2 18 13 13;
+	shadow { top 0; right 1; bottom 2; left 0; };
+};
+
+graphic "up_arrow_button_pressed"
+{
+	texture "gui.png";
+	slice 17 18 13 13;
+	shadow { top 0; right 1; bottom 2; left 0; };
+};
+
+graphic "down_arrow_button"
+{
+	texture "gui.png";
+	slice 2 4 13 13;
+	shadow { top 0; right 1; bottom 2; left 0; };
+};
+
+graphic "down_arrow_button_pressed"
+{
+	texture "gui.png";
+	slice 17 4 13 13;
+	shadow { top 0; right 1; bottom 2; left 0; };
+};
+
 style "button"
 {
 	font_color 0 0 0;
@@ -142,6 +178,28 @@ style "button-red"
 	};
 };
 
+style "button-arrow_up"
+{
+	part
+	{
+		graphic NORMAL "up_arrow_button";
+		graphic ACTIVE "up_arrow_button_pressed";
+		align 0.5 0.5;
+		fill 0.0 0.0;
+	};
+};
+
+style "button-arrow_down"
+{
+	part
+	{
+		graphic NORMAL "down_arrow_button";
+		graphic ACTIVE "down_arrow_button_pressed";
+		align 0.5 0.5;
+		fill 0.0 0.0;
+	};
+};
+
 graphic "yellow_lamp"
 {
 	texture "gui.png";
@@ -227,6 +285,11 @@ style "panel"
 	special "children";
 };
 
+style "panel-group"
+{
+	special "children";
+};
+
 graphic "sunken_black_bg"
 {
 	texture "gui.png";
@@ -248,6 +311,7 @@ style "label-digital"
 	{
 		fill 0.0 0.0;
 		align 0.5 0.5;
+		margin { top 1; };
 	};
 };
 
@@ -297,7 +361,6 @@ style "entry-multiline"
 	part
 	{
 		graphic NORMAL "sunken_white_bg";
-		margin { right 10; };
 	};
 
 	special "text"
@@ -318,6 +381,7 @@ style "entry-multiline"
 		align 1.0 0.0;
 		fill 0.0 1.0;
 		size 10 0;
+		margin { top 3; right 2; bottom 3; };
 	};
 };
 
@@ -335,19 +399,18 @@ style "list"
 	part
 	{
 		graphic NORMAL "sunken_white_bg";
-		margin { right 10; };
 	};
 
 	special "selection"
 	{
 		graphic NORMAL "selection";
 		fill 1.0 1.0;
-		margin { top 2; right 12; bottom 2; left 2; };
+		margin { top 2; right 13; bottom 2; left 2; };
 	};
 
 	special "items"
 	{
-		margin { top 2; right 12; bottom 2; left 2; };
+		margin { top 2; right 13; bottom 2; left 2; };
 	};
 
 	special "slider"
@@ -355,37 +418,10 @@ style "list"
 		align 1.0 0.0;
 		fill 0.0 1.0;
 		size 10 0;
+		margin { top 3; right 2; bottom 3; };
 	};
 };
 
-graphic "up_arrow_button"
-{
-	texture "gui.png";
-	slice 2 18 13 13;
-	shadow { top 0; right 1; bottom 2; left 0; };
-};
-
-graphic "up_arrow_button_pressed"
-{
-	texture "gui.png";
-	slice 17 18 13 13;
-	shadow { top 0; right 1; bottom 2; left 0; };
-};
-
-graphic "down_arrow_button"
-{
-	texture "gui.png";
-	slice 2 4 13 13;
-	shadow { top 0; right 1; bottom 2; left 0; };
-};
-
-graphic "down_arrow_button_pressed"
-{
-	texture "gui.png";
-	slice 17 4 13 13;
-	shadow { top 0; right 1; bottom 2; left 0; };
-};
-
 style "dropdown"
 {
 	font_color 0.0 0.0 0.0;
@@ -450,8 +486,8 @@ style "toggle"
 graphic "horizontal_slot"
 {
 	texture "gui.png";
-	slice 28 93 20 10;
-	border { top 0; right 5; bottom 0; left 5; };
+	slice 32 97 12 2;
+	border { left 1; right 1; };
 };
 
 graphic "horizontal_knob"
@@ -466,7 +502,9 @@ style "hslider"
 	part
 	{
 		graphic NORMAL "horizontal_slot";
+		align 0.5 0.5;
 		fill 1.0 0.0;
+		margin { left 4; right 4; };
 	};
 
 	special "slider"
@@ -479,8 +517,8 @@ style "hslider"
 graphic "vertical_slot"
 {
 	texture "gui.png";
-	slice 28 71 10 20;
-	border { top 5; right 0; bottom 5; left 0; };
+	slice 32 75 2 12;
+	border { top 1; bottom 1; };
 };
 
 graphic "vertical_knob"
@@ -495,7 +533,9 @@ style "vslider"
 	part
 	{
 		graphic NORMAL "vertical_slot";
+		align 0.5 0.5;
 		fill 0.0 1.0;
+		margin { top 4; bottom 4; };
 	};
 
 	special "slider"