From 7132fb9edaf22d1ee09c82da5c4433ce87e90593 Mon Sep 17 00:00:00 2001
From: jsalmon3 <>
Date: Fri, 17 Oct 2003 13:56:16 +0000
Subject: [PATCH] Fixed bug #6010, saved menu-panel
---
src/ui/ui.cpp | 89 ++++++++++++++++++++++++++-------------------------
1 file changed, 45 insertions(+), 44 deletions(-)
diff --git a/src/ui/ui.cpp b/src/ui/ui.cpp
index af9b38d77..70fd1f882 100644
--- a/src/ui/ui.cpp
+++ b/src/ui/ui.cpp
@@ -508,24 +508,58 @@ local void SaveUi(CLFile* file, const UI* ui)
CLprintf(file, "\n 'size '(%d %d)",
ui->MapArea.EndX - ui->MapArea.X + 1,
ui->MapArea.EndY - ui->MapArea.Y + 1);
- CLprintf(file, ")\n\n");
+ CLprintf(file, ")\n");
- CLprintf(file, " ; Menu button background\n");
- CLprintf(file, " 'menu-panel (list \"%s\" %d %d)\n",
- ui->MenuPanel.File, ui->MenuPanelX,
- ui->MenuPanelY);
+ CLprintf(file, "\n 'menu-panel (list\n");
+ CLprintf(file, "\n 'panel (list");
+ CLprintf(file, "\n 'file \"%s\"", ui->MenuPanel.File);
+ CLprintf(file, "\n 'pos '(%d %d)",
+ ui->MenuPanelX, ui->MenuPanelY);
+ CLprintf(file, ")");
+ CLprintf(file, "\n 'menu-button '(");
+ CLprintf(file, "\n pos (%d %d)",
+ ui->MenuButton.X, ui->MenuButton.Y);
+ CLprintf(file, "\n size (%d %d)",
+ ui->MenuButton.Width, ui->MenuButton.Height);
+ CLprintf(file, "\n caption \"%s\"",
+ ui->MenuButton.Text);
+ CLprintf(file, "\n style %s",
+ MenuButtonStyle(ui->MenuButton.Button));
+ CLprintf(file, ")");
+ CLprintf(file, "\n 'network-menu-button '(");
+ CLprintf(file, "\n pos (%d %d)",
+ ui->NetworkMenuButton.X, ui->NetworkMenuButton.Y);
+ CLprintf(file, "\n size (%d %d)",
+ ui->NetworkMenuButton.Width, ui->NetworkMenuButton.Height);
+ CLprintf(file, "\n caption \"%s\"",
+ ui->NetworkMenuButton.Text);
+ CLprintf(file, "\n style %s",
+ MenuButtonStyle(ui->NetworkMenuButton.Button));
+ CLprintf(file, ")");
+ CLprintf(file, "\n 'network-diplomacy-button '(");
+ CLprintf(file, "\n pos (%d %d)",
+ ui->NetworkDiplomacyButton.X, ui->NetworkDiplomacyButton.Y);
+ CLprintf(file, "\n size (%d %d)",
+ ui->NetworkDiplomacyButton.Width, ui->NetworkDiplomacyButton.Height);
+ CLprintf(file, "\n caption \"%s\"",
+ ui->NetworkDiplomacyButton.Text);
+ CLprintf(file, "\n style %s",
+ MenuButtonStyle(ui->NetworkDiplomacyButton.Button));
+ CLprintf(file, ")");
+ CLprintf(file, ")\n");
- CLprintf(file, " 'minimap (list\n");
- CLprintf(file, " 'file \"%s\"\n", ui->MinimapPanel.File);
+ CLprintf(file, "\n 'minimap (list");
+ CLprintf(file, "\n 'file \"%s\"", ui->MinimapPanel.File);
if (ui->MinimapTransparent) {
- CLprintf(file, " 'transparent\n");
+ CLprintf(file, "\n 'transparent");
}
- CLprintf(file, " 'panel-pos '(%d %d)\n",
+ CLprintf(file, "\n 'panel-pos '(%d %d)",
ui->MinimapPanelX, ui->MinimapPanelY);
- CLprintf(file, " 'pos '(%d %d)\n",
+ CLprintf(file, "\n 'pos '(%d %d)",
ui->MinimapPosX, ui->MinimapPosY);
- CLprintf(file, " 'size '(%d %d))\n",
+ CLprintf(file, "\n 'size '(%d %d)",
ui->MinimapW, ui->MinimapH);
+ CLprintf(file, ")\n");
CLprintf(file, "\n 'status-line '(");
CLprintf(file, "\n file \"%s\"",ui->StatusLine.File);
@@ -535,39 +569,6 @@ local void SaveUi(CLFile* file, const UI* ui)
CLprintf(file, "\n font %s",FontNames[ui->StatusLineFont]);
CLprintf(file, ")\n");
- CLprintf(file, "\n 'menu-button '(");
- CLprintf(file, "\n pos (%d %d)",
- ui->MenuButton.X, ui->MenuButton.Y);
- CLprintf(file, "\n size (%d %d)",
- ui->MenuButton.Width, ui->MenuButton.Height);
- CLprintf(file, "\n caption \"%s\"",
- ui->MenuButton.Text);
- CLprintf(file, "\n style %s",
- MenuButtonStyle(ui->MenuButton.Button));
- CLprintf(file, ")");
-
- CLprintf(file, "\n 'network-menu-button '(");
- CLprintf(file, "\n pos (%d %d)",
- ui->NetworkMenuButton.X, ui->NetworkMenuButton.Y);
- CLprintf(file, "\n size (%d %d)",
- ui->NetworkMenuButton.Width, ui->NetworkMenuButton.Height);
- CLprintf(file, "\n caption \"%s\"",
- ui->NetworkMenuButton.Text);
- CLprintf(file, "\n style %s",
- MenuButtonStyle(ui->NetworkMenuButton.Button));
- CLprintf(file, ")");
-
- CLprintf(file, "\n 'network-diplomacy-button '(");
- CLprintf(file, "\n pos (%d %d)",
- ui->NetworkDiplomacyButton.X, ui->NetworkDiplomacyButton.Y);
- CLprintf(file, "\n size (%d %d)",
- ui->NetworkDiplomacyButton.Width, ui->NetworkDiplomacyButton.Height);
- CLprintf(file, "\n caption \"%s\"",
- ui->NetworkDiplomacyButton.Text);
- CLprintf(file, "\n style %s",
- MenuButtonStyle(ui->NetworkDiplomacyButton.Button));
- CLprintf(file, ")\n");
-
CLprintf(file, "\n 'cursors '(");
CLprintf(file, "\n point %s", ui->Point.Name);
CLprintf(file, "\n glass %s", ui->Glass.Name);