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

diff --git a/marklin.res b/marklin.res
index bea052d..5397092 100644
--- a/marklin.res
+++ b/marklin.res
@@ -2,163 +2,123 @@
 
 default_font "dejavu-12.font";
 
-graphic "greybutton"
-{
-	texture "gui.png";
-	slice 0 54 21 10;
-	border { top 2; right 3; bottom 4; left 2; };
-	shadow { top 0; right 1; bottom 2; left 0; };
-};
-
-graphic "greybuttondown"
-{
-	texture "gui.png";
-	slice 24 54 21 10;
-	border { top 2; right 3; bottom 4; left 2; };
-	shadow { top 0; right 1; bottom 2; left 0; };
-};
-
-graphic "greenbutton"
-{
-	texture "gui.png";
-	slice 0 42 21 10;
-	border { top 2; right 3; bottom 4; left 2; };
-	shadow { top 0; right 1; bottom 2; left 0; };
-};
-
-graphic "greenbuttondown"
-{
-	texture "gui.png";
-	slice 24 42 21 10;
-	border { top 2; right 3; bottom 4; left 2; };
-	shadow { top 0; right 1; bottom 2; left 0; };
-};
-
-graphic "redbutton"
+style "root"
 {
-	texture "gui.png";
-	slice 0 30 21 10;
-	border { top 2; right 3; bottom 4; left 2; };
-	shadow { top 0; right 1; bottom 2; left 0; };
+	special "children";
 };
 
-graphic "redbuttondown"
+style "label"
 {
-	texture "gui.png";
-	slice 24 30 21 10;
-	border { top 2; right 3; bottom 4; left 2; };
-	shadow { top 0; right 1; bottom 2; left 0; };
+	font_color 0 0 0;
+	special "text";
 };
 
-graphic "panelbg"
+style "image"
 {
-	texture "gui.png";
-	slice 0 68 30 20;
-	border { top 2; right 2; bottom 2; left 2; };
+	special "image"
+	{
+		fill 1.0 1.0;
+	};
 };
 
-graphic "entrybg"
+graphic "tooltip"
 {
 	texture "gui.png";
-	slice 32 72 20 16;
+	slice 50 93 20 10;
 	border { top 2; right 2; bottom 2; left 2; };
 };
 
-graphic "entrycursor"
-{
-	texture "gui.png";
-	slice 54 74 2 12;
-};
-
-graphic "dropdownbg"
-{
-	texture "gui.png";
-	slice 58 72 30 16;
-	border { top 4; right 20; bottom 4; left 2; };
-};
-
-graphic "dropdownarrow"
+style "label-tooltip"
 {
-	texture "gui.png";
-	slice 90 75 10 8;
-};
+	font_color 0.0 0.0 0.0;
 
-graphic "yellowlamp"
-{
-	texture "gui.png";
-	slice 30 102 12 12;
-};
+	part
+	{
+		graphic NORMAL "tooltip";
+	};
 
-graphic "yellowlamplit"
-{
-	texture "gui.png";
-	slice 30 116 12 12;
+	special "text"
+	{
+		align 0.0 0.5;
+		fill 0.0 0.0;
+		margin { top 2; right 2; bottom 2; left 2; };
+	};
 };
 
-graphic "greenlamp"
+graphic "grey_button"
 {
 	texture "gui.png";
-	slice 44 102 12 12;
+	slice 2 54 21 10;
+	border { top 2; right 3; bottom 4; left 2; };
+	shadow { top 0; right 1; bottom 2; left 0; };
 };
 
-graphic "greenlamplit"
+graphic "grey_button_pressed"
 {
 	texture "gui.png";
-	slice 44 116 12 12;
+	slice 25 54 21 10;
+	border { top 2; right 3; bottom 4; left 2; };
+	shadow { top 0; right 1; bottom 2; left 0; };
 };
 
-graphic "redlamp"
+graphic "green_button"
 {
 	texture "gui.png";
-	slice 58 102 12 12;
+	slice 2 43 21 10;
+	border { top 2; right 3; bottom 4; left 2; };
+	shadow { top 0; right 1; bottom 2; left 0; };
 };
 
-graphic "redlamplit"
+graphic "green_button_pressed"
 {
 	texture "gui.png";
-	slice 58 116 12 12;
+	slice 25 43 21 10;
+	border { top 2; right 3; bottom 4; left 2; };
+	shadow { top 0; right 1; bottom 2; left 0; };
 };
 
-graphic "digidisplay"
+graphic "red_button"
 {
 	texture "gui.png";
-	slice 0 108 28 20;
-	border { top 5; right 5; bottom 5; left 5; };
+	slice 2 32 21 10;
+	border { top 2; right 3; bottom 4; left 2; };
+	shadow { top 0; right 1; bottom 2; left 0; };
 };
 
-graphic "tooltip"
+graphic "red_button_pressed"
 {
 	texture "gui.png";
-	slice 72 90 20 16;
-	border { top 2; right 2; bottom 2; left 2; };
+	slice 25 32 21 10;
+	border { top 2; right 3; bottom 4; left 2; };
+	shadow { top 0; right 1; bottom 2; left 0; };
 };
 
-graphic "hsliderslot"
+graphic "up_arrow_button"
 {
 	texture "gui.png";
-	slice 0 90 60 10;
-	border { top 0; right 5; bottom 0; left 5; };
+	slice 2 18 13 13;
+	shadow { top 0; right 1; bottom 2; left 0; };
 };
 
-graphic "hsliderknob"
+graphic "up_arrow_button_pressed"
 {
 	texture "gui.png";
-	slice 0 15 32 13;
-	shadow { top 0; right 2; bottom 3; left 0; };
+	slice 17 18 13 13;
+	shadow { top 0; right 1; bottom 2; left 0; };
 };
 
-graphic "switchdown"
+graphic "down_arrow_button"
 {
 	texture "gui.png";
-	slice 47 43 20 21;
-	shadow { top 0; right 2; bottom 3; left 0; };
+	slice 2 4 13 13;
+	shadow { top 0; right 1; bottom 2; left 0; };
 };
 
-graphic "switchup"
+graphic "down_arrow_button_pressed"
 {
 	texture "gui.png";
-	slice 69 43 20 21;
-	shadow { top 0; right 2; bottom 3; left 0; };
+	slice 17 4 13 13;
+	shadow { top 0; right 1; bottom 2; left 0; };
 };
 
 style "button"
@@ -167,8 +127,8 @@ style "button"
 
 	part
 	{
-		graphic NORMAL "greybutton";
-		graphic ACTIVE "greybuttondown";
+		graphic NORMAL "grey_button";
+		graphic ACTIVE "grey_button_pressed";
 		align 0.5 0.0;
 		fill 0.0 0.0;
 	};
@@ -186,8 +146,8 @@ style "button-green"
 
 	part
 	{
-		graphic NORMAL "greenbutton";
-		graphic ACTIVE "greenbuttondown";
+		graphic NORMAL "green_button";
+		graphic ACTIVE "green_button_pressed";
 		align 0.5 0.0;
 		fill 0.0 0.0;
 	};
@@ -205,8 +165,8 @@ style "button-red"
 
 	part
 	{
-		graphic NORMAL "redbutton";
-		graphic ACTIVE "redbuttondown";
+		graphic NORMAL "red_button";
+		graphic ACTIVE "red_button_pressed";
 		align 0.5 0.0;
 		fill 0.0 0.0;
 	};
@@ -218,40 +178,70 @@ style "button-red"
 	};
 };
 
-style "toggle"
+style "button-arrow_up"
 {
-	font_color 0.0 0.0 0.0;
-
-	special "text"
+	part
 	{
-		align 0.5 1.0;
+		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
 	{
-		align 0.5 0.0;
+		graphic NORMAL "down_arrow_button";
+		graphic ACTIVE "down_arrow_button_pressed";
+		align 0.5 0.5;
 		fill 0.0 0.0;
-		graphic NORMAL "switchdown";
-		graphic ACTIVE "switchup";
 	};
 };
 
-style "panel"
+graphic "yellow_lamp"
 {
-	part
-	{
-		graphic NORMAL "panelbg";
-	};
-	special "children";
+	texture "gui.png";
+	slice 28 105 10 10;
+};
+
+graphic "yellow_lamp_lit"
+{
+	texture "gui.png";
+	slice 28 117 10 10;
+};
+
+graphic "green_lamp"
+{
+	texture "gui.png";
+	slice 40 105 10 10;
+};
+
+graphic "green_lamp_lit"
+{
+	texture "gui.png";
+	slice 40 117 10 10;
+};
+
+graphic "red_lamp"
+{
+	texture "gui.png";
+	slice 52 105 10 10;
+};
+
+graphic "red_lamp_lit"
+{
+	texture "gui.png";
+	slice 52 116 10 10;
 };
 
 style "indicator"
 {
 	part
 	{
-		graphic NORMAL "yellowlamp";
-		graphic ACTIVE "yellowlamplit";
+		graphic NORMAL "yellow_lamp";
+		graphic ACTIVE "yellow_lamp_lit";
 		align 0.5 0.5;
 		fill 0.0 0.0;
 	};
@@ -261,8 +251,8 @@ style "indicator-green"
 {
 	part
 	{
-		graphic NORMAL "greenlamp";
-		graphic ACTIVE "greenlamplit";
+		graphic NORMAL "green_lamp";
+		graphic ACTIVE "green_lamp_lit";
 		align 0.5 0.5;
 		fill 0.0 0.0;
 	};
@@ -272,17 +262,39 @@ style "indicator-red"
 {
 	part
 	{
-		graphic NORMAL "redlamp";
-		graphic ACTIVE "redlamplit";
+		graphic NORMAL "red_lamp";
+		graphic ACTIVE "red_lamp_lit";
 		align 0.5 0.5;
 		fill 0.0 0.0;
 	};
 };
 
-style "label"
+graphic "raised_grey_bg"
 {
-	font_color 0 0 0;
-	special "text";
+	texture "gui.png";
+	slice 2 74 24 16;
+	border { top 4; right 4; bottom 4; left 4; };
+};
+
+style "panel"
+{
+	part
+	{
+		graphic NORMAL "raised_grey_bg";
+	};
+	special "children";
+};
+
+style "panel-group"
+{
+	special "children";
+};
+
+graphic "sunken_black_bg"
+{
+	texture "gui.png";
+	slice 2 110 24 16;
+	border { top 4; right 4; bottom 4; left 4; };
 };
 
 style "label-digital"
@@ -292,76 +304,122 @@ style "label-digital"
 
 	part
 	{
-		graphic NORMAL "digidisplay";
+		graphic NORMAL "sunken_black_bg";
 	};
 
 	special "text"
 	{
 		fill 0.0 0.0;
 		align 0.5 0.5;
+		margin { top 1; };
 	};
 };
 
-style "label-tooltip"
+graphic "sunken_white_bg"
 {
-	font_color 0.0 0.0 0.0;
+	texture "gui.png";
+	slice 2 92 24 16;
+	border { top 4; right 4; bottom 4; left 4; };
+};
+
+graphic "cursor"
+{
+	texture "gui.png";
+	slice 40 81 2 10;
+};
+
+style "entry"
+{
+	font_color 0 0 0;
 
 	part
 	{
-		graphic NORMAL "tooltip";
+		graphic NORMAL "sunken_white_bg";
 	};
 
 	special "text"
 	{
 		align 0.0 0.5;
 		fill 0.0 0.0;
-		margin { top 2; right 2; bottom 2; left 2; };
-	};
-};
-
-style "hslider"
-{
-	part
-	{
-		graphic NORMAL "hsliderslot";
-		fill 1.0 0.0;
+		margin { left 3; right 3; };
 	};
 
-	special "slider"
+	special "cursor"
 	{
-		graphic NORMAL "hsliderknob";
+		graphic FOCUS "cursor";
+		align 0.0 0.5;
 		fill 0.0 0.0;
+		size 2 12;
+		margin { left 3; right 3; };
 	};
 };
 
-style "entry"
+style "entry-multiline"
 {
 	font_color 0 0 0;
 
 	part
 	{
-		graphic NORMAL "entrybg";
+		graphic NORMAL "sunken_white_bg";
 	};
 
 	special "text"
 	{
-		align 0.0 0.5;
+		align 0.0 1.0;
 		fill 0.0 0.0;
-		margin { left 3; right 3; };
+		margin { top 2; right 13; left 3; bottom 2; };
 	};
 
 	special "cursor"
 	{
-		graphic FOCUS "entrycursor";
-		align 0.0 0.5;
-		fill 0.0 0.0;
-		margin { left 3; right 3; };
+		graphic FOCUS "cursor";
+		size 2 12;
+	};
+
+	special "slider"
+	{
+		align 1.0 0.0;
+		fill 0.0 1.0;
+		size 10 0;
+		margin { top 3; right 2; bottom 3; };
 	};
 };
 
-style "root"
+graphic "selection"
 {
-	special "children";
+	texture "gui.png";
+	slice 44 81 20 10;
+	border { top 4; right 4; bottom 4; left 4; };
+};
+
+style "list"
+{
+	font_color 0.0 0.0 0.0;
+
+	part
+	{
+		graphic NORMAL "sunken_white_bg";
+	};
+
+	special "selection"
+	{
+		graphic NORMAL "selection";
+		fill 1.0 1.0;
+		margin { top 2; right 13; bottom 2; left 2; };
+	};
+
+	special "items"
+	{
+		margin { top 2; right 13; bottom 2; left 2; };
+	};
+
+	special "slider"
+	{
+		align 1.0 0.0;
+		fill 0.0 1.0;
+		size 10 0;
+		margin { top 3; right 2; bottom 3; };
+	};
 };
 
 style "dropdown"
@@ -370,15 +428,16 @@ style "dropdown"
 
 	part
 	{
-		graphic NORMAL "dropdownbg";
+		graphic NORMAL "sunken_white_bg";
+		margin { right 14; };
 	};
 
 	part
 	{
-		graphic NORMAL "dropdownarrow";
+		graphic NORMAL "down_arrow_button";
+		graphic ACTIVE "down_arrow_button_pressed";
 		align 1.0 0.5;
 		fill 0.0 0.0;
-		margin { right 2; };
 	};
 
 	special "text"
@@ -391,19 +450,97 @@ style "dropdown"
 	special "list";
 };
 
-style "list"
+graphic "switch_up"
+{
+	texture "gui.png";
+	slice 48 42 20 21;
+	shadow { top 0; right 2; bottom 3; left 0; };
+};
+
+graphic "switch_down"
+{
+	texture "gui.png";
+	slice 48 20 20 21;
+	shadow { top 0; right 2; bottom 3; left 0; };
+};
+
+style "toggle"
 {
 	font_color 0.0 0.0 0.0;
 
+	special "text"
+	{
+		align 0.5 1.0;
+		fill 0.0 0.0;
+	};
+
 	part
 	{
-		graphic NORMAL "entrybg";
+		align 0.5 0.0;
+		fill 0.0 0.0;
+		graphic NORMAL "switch_down";
+		graphic ACTIVE "switch_up";
 	};
+};
 
-	special "items"
+graphic "horizontal_slot"
+{
+	texture "gui.png";
+	slice 32 97 12 2;
+	border { left 1; right 1; };
+};
+
+graphic "horizontal_knob"
+{
+	texture "gui.png";
+	slice 70 51 32 13;
+	shadow { top 0; right 2; bottom 3; left 0; };
+};
+
+style "hslider"
+{
+	part
 	{
-		margin { top 2; right 2; bottom 2; left 2; };
+		graphic NORMAL "horizontal_slot";
+		align 0.5 0.5;
+		fill 1.0 0.0;
+		margin { left 4; right 4; };
 	};
+
+	special "slider"
+	{
+		graphic NORMAL "horizontal_knob";
+		fill 0.0 0.0;
+	};
+};
+
+graphic "vertical_slot"
+{
+	texture "gui.png";
+	slice 32 75 2 12;
+	border { top 1; bottom 1; };
 };
 
-style "vslider";
+graphic "vertical_knob"
+{
+	texture "gui.png";
+	slice 70 17 12 33;
+	shadow { top 0; right 2; bottom 3; left 0; };
+};
+
+style "vslider"
+{
+	part
+	{
+		graphic NORMAL "vertical_slot";
+		align 0.5 0.5;
+		fill 0.0 1.0;
+		margin { top 4; bottom 4; };
+	};
+
+	special "slider"
+	{
+		graphic NORMAL "vertical_knob";
+		fill 0.0 0.0;
+	};
+};