diff --git a/Nasal/multiplayer.nas b/Nasal/multiplayer.nas
index 90b87159c..d4b970ad5 100644
--- a/Nasal/multiplayer.nas
+++ b/Nasal/multiplayer.nas
@@ -147,24 +147,28 @@ var handle_key = func(key)
# multiplayer.dialog.show() -- displays pilot list dialog
#
var PILOTSDLG_RUNNING = 0;
-
var dialog = {
init: func(x = nil, y = nil) {
me.x = x;
me.y = y;
- me.bg = [0, 0, 0, 0.3]; # background color
- me.fg = [[0.9, 0.9, 0.2, 1], [1, 1, 1, 1], [1, 0.5, 0, 1]]; # alternative active & disabled color
+ me.bg = [0.1, 0.1, 0.1, 0.8]; # background color
+ me.fg = [[0.9, 0.9, 0.2, 1], [1, 1, 1, 1], [1, 0.7, 0, 1]]; # alternative active & disabled color
me.unit = 1;
me.toggle_unit(); # set to imperial
#
# "private"
- var font = { name: "FIXED_8x13" };
+ var font = "";
+ if (getprop("/sim/gui/current-syle"))
+ font = {name: "FIXED_8x13" };
+ else
+ font = { name: "AvantGarde-Demi.txf"};
+
me.header = ["chat", " callsign"," code"," model", " brg", func dialog.dist_hdr, func dialog.alt_hdr ~ " ", "ignore" ~ " "];
me.columns = [
- { type: "button", legend: "", halign: "right", callback: "multiplayer.compose_message", "pref-height": 14, "pref-width": 14},
- { type: "text", property: "callsign", format: " %s", label: "-----------", halign: "fill" },
- { type: "text", property: "id-code", format: " %s", label: "-----", halign: "fill" },
- { type: "text", property: "model-short", format: "%s", label: "--------------", halign: "fill" },
+ { type: "button", legend: "", halign: "right", callback: "multiplayer.compose_message", "pref-height": 14, "pref-width": 14 },
+ { type: "text", property: "callsign", format: " %s", label: "-----------", halign: "fill" , font: font },
+ { type: "text", property: "id-code", format: " %s", label: "-----", halign: "fill" , font: font },
+ { type: "text", property: "model-short", format: "%s", label: "--------------", halign: "fill" , font: font },
{ type: "text", property: "bearing-to", format: " %3.0f", label: "----", halign: "right", font: font },
{ type: "text", property: func dialog.dist_node, format:" %8.2f", label: "---------", halign: "right", font: font },
{ type: "text", property: func dialog.alt_node, format:" %7.0f", label: "---------", halign: "right", font: font },
diff --git a/defaults.xml b/defaults.xml
index ec7b0580b..f0848619f 100644
--- a/defaults.xml
+++ b/defaults.xml
@@ -801,7 +801,7 @@ Started September 2000 by David Megginson, david@megginson.com
1
-
+
false
diff --git a/gui/dialogs/nasal-console.xml b/gui/dialogs/nasal-console.xml
index 85343eaf0..a85515b44 100644
--- a/gui/dialogs/nasal-console.xml
+++ b/gui/dialogs/nasal-console.xml
@@ -45,7 +45,7 @@
true
false
- FIXED_8x13
+ AvantGarde-Book.txf
/sim/gui/dialogs/nasal-console/edit
diff --git a/gui/styles/anthrax.xml b/gui/styles/anthrax.xml
index 47106497e..240bc9467 100644
--- a/gui/styles/anthrax.xml
+++ b/gui/styles/anthrax.xml
@@ -8,7 +8,7 @@
"helvetica_bold.txf". "size" and "slant" take only effect on
texture fonts.
-->
-
+ Anthrax
HELVETICA_12
diff --git a/gui/styles/classic.xml b/gui/styles/classic.xml
deleted file mode 100644
index 1008cbcf6..000000000
--- a/gui/styles/classic.xml
+++ /dev/null
@@ -1,161 +0,0 @@
-
-
-
-
-
-
-
- Helvetica.txf
- 15
- 0
-
-
-
- HELVETICA_18
-
-
-
-
- SANS_12B
-
-
-
-
-
-
- 0.8
- 0.8
- 0.9
- 0.85
-
-
-
- 0.8
- 0.8
- 0.9
- 0.85
-
-
-
- 1.0
- 1.0
- 1.0
- 1.0
-
-
-
-
-
-
-
- 0.0
- 0.0
- 0.0
- 1.0
-
-
-
-
- 0.0
- 0.0
- 0.0
- 1.0
-
-
-
- 0.0
- 0.0
- 0.0
- 1.0
-
-
-
- 0.8
- 0.7
- 0.7
- 1.0
-
-
-
- 1
- 0.9
- 0.9
- 1.0
-
-
-
- 0.8
- 0.7
- 0.7
- 1.0
-
-
-
- 1
- 0.9
- 0.9
- 1.0
-
-
-
- 0.4
- 0.3
- 0.3
- 1.0
-
-
-
- 0.8
- 0.7
- 0.7
- 1.0
-
-
-
- 1.0
- 0.9
- 0.9
- 1.0
-
-
-
- 0.1
- 0.1
- 1.0
- 1.0
-
-
-
-
-
- 1.0
- 0.9
- 0.0
-
-
-
- 0.0
- 0.0
- 0.0
-
-
-
diff --git a/gui/styles/tortola.xml b/gui/styles/tortola.xml
new file mode 100644
index 000000000..f3ceb7bbe
--- /dev/null
+++ b/gui/styles/tortola.xml
@@ -0,0 +1,289 @@
+
+
+
+
+ Tortola
+
+
+
+ AvantGarde-Demi.txf
+
+
+
+ HELVETICA_18
+
+
+
+ Helvetica-BoldOblique.txf
+
+
+
+
+
+
+
+ 0.21
+ 0.212
+ 0.221
+ 0.8
+
+
+
+ 0.9
+ 0.9
+ 0.9
+ 0.9
+
+
+
+ 0.21
+ 0.212
+ 0.221
+ 1.0
+
+
+
+
+
+
+
+ 0.0
+ 0.0
+ 0.0
+ 1.0
+
+
+
+ 0.0
+ 0.0
+ 0.0
+ 1.0
+
+
+
+ 0.0
+ 0.0
+ 0.0
+ 1.0
+
+
+
+ 0.51
+ 0.511
+ 0.61
+ 1.0
+
+
+
+ 0.31
+ 0.312
+ 0.321
+ 0.8
+
+
+
+ 0.31
+ 0.312
+ 0.321
+ 0.8
+
+
+
+ 0.31
+ 0.312
+ 0.321
+ 0.8
+
+
+
+ 0.31
+ 0.312
+ 0.321
+ 0.8
+
+
+
+ 0.31
+ 0.312
+ 0.321
+ 0.8
+
+
+
+ 0.31
+ 0.312
+ 0.321
+ 0.8
+
+
+
+
+ 0.51
+ 0.511
+ 0.61
+ 1.0
+
+
+
+ 0.51
+ 0.511
+ 0.61
+ 1.0
+
+
+
+ 0.51
+ 0.511
+ 0.61
+ 1.0
+
+
+
+ 0.51
+ 0.511
+ 0.61
+ 1.0
+
+
+
+ 0.51
+ 0.511
+ 0.61
+ 1.0
+
+
+
+ 0.571
+ 0.57
+ 0.57
+ 1.0
+
+
+
+ 0.571
+ 0.57
+ 0.57
+ 1.0
+
+
+
+ 0.371
+ 0.37
+ 0.37
+ 1.0
+
+
+
+ 0.31
+ 0.312
+ 0.321
+ 1.0
+
+
+
+ 0.31
+ 0.312
+ 0.321
+ 1.0
+
+
+
+ 0.31
+ 0.312
+ 0.321
+ 1.0
+
+
+
+
+ 1.0
+ 0.0
+ 0.0
+ 1.0
+
+
+
+ 0.21
+ 0.212
+ 0.221
+ 1.0
+
+
+
+ 0.21
+ 0.212
+ 0.221
+ 1.0
+
+
+
+
+ 0.23
+ 0.232
+ 0.231
+ 1.0
+
+
+
+ 0.21
+ 0.212
+ 0.221
+ 1.0
+
+
+
+ 0.21
+ 0.212
+ 0.221
+ 1.0
+
+
+
+ 0.23
+ 0.232
+ 0.231
+ 1.0
+
+
+
+
+
+ 1.0
+ 0.9
+ 0.0
+
+
+
+ 0.0
+ 0.0
+ 0.0
+
+
+