UI tweaks

diff --git a/gui.blend b/gui.blend
index 7c7b188dec4c76a2ca098e8e488119cab3aa6ff0..f70f183e3c1dadd5392b2c7d5bc56495c235d335 100644 (file)
Binary files a/gui.blend and b/gui.blend differ

diff --git a/gui.png b/gui.png
index f4e1ee3804f188cfa06d46d01dfcbb3791c39ed8..50c8c5bc345a5c994903ba4acf44148d47ea4760 100644 (file)
Binary files a/gui.png and b/gui.png differ

diff --git a/marklin.res b/marklin.res
index e44ac9d031fc733797c2c8ecada73f75f942f0d4..539709259ba7feec6f9a003e3fde90c347f81074 100644 (file)
--- a/marklin.res
+++ b/marklin.res
@@ -311,6 +311,7 @@ style "label-digital"
        {
                fill 0.0 0.0;
                align 0.5 0.5;
+               margin { top 1; };
        };
 };
 
@@ -360,7 +361,6 @@ style "entry-multiline"
        part
        {
                graphic NORMAL "sunken_white_bg";
-               margin { right 10; };
        };
 
        special "text"
@@ -381,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; };
        };
 };
 
@@ -398,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"
@@ -418,6 +418,7 @@ style "list"
                align 1.0 0.0;
                fill 0.0 1.0;
                size 10 0;
+               margin { top 3; right 2; bottom 3; };
        };
 };
 
@@ -485,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"
@@ -501,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"
@@ -514,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"
@@ -530,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"

diff --git a/source/engineer/timetabledialog.cpp b/source/engineer/timetabledialog.cpp
index 4f227128cee624fe5bd50b255284f31d3258d7d8..1c7c907d25959904f5dc326a345a058af50f12b9 100644 (file)
--- a/source/engineer/timetabledialog.cpp
+++ b/source/engineer/timetabledialog.cpp
@@ -19,7 +19,7 @@ TimetableDialog::TimetableDialog(const GLtk::Resources &r, Timetable &tt):
        GLtk::Dialog(r),
        timetable(tt)
 {
-       set_size(200, 200);
+       set_size(250, 200);
 
        GLtk::Button *btn;
 

diff --git a/source/engineer/trainproperties.cpp b/source/engineer/trainproperties.cpp
index a8d78a028f3e23826dc1ab0db9a72be47f187cee..81463d28498a6493281cecbf5558ac8fc927f5a2 100644 (file)
--- a/source/engineer/trainproperties.cpp
+++ b/source/engineer/trainproperties.cpp
@@ -23,7 +23,7 @@ TrainProperties::TrainProperties(Engineer &e, const GLtk::Resources &r, Train *t
        engineer(e),
        train(t)
 {
-       set_size(200, 275);
+       set_size(250, 275);
 
        GLtk::Label *label;
        add(*(label = new GLtk::Label(res, "Train properties")));