From dfe1f28169cf28d422e57aaebfe9366db71fa8cb Mon Sep 17 00:00:00 2001 From: cryham Date: Thu, 11 Apr 2024 23:04:32 +0200 Subject: [PATCH] new tab gui, scale fonts, wnds --- data/gui/Editor_Options.layout | 99 ++++++++++++++++++--------- data/gui/Game_Options.layout | 118 +++++++++++++++++++++++++-------- docs/Statistics.md | 2 +- src/common/settings_com.cpp | 2 +- src/editor/CGui.h | 3 + src/editor/Gui_Init.cpp | 10 +-- src/game/CGui.h | 3 + src/game/Gui_Init.cpp | 7 ++ 8 files changed, 173 insertions(+), 71 deletions(-) diff --git a/data/gui/Editor_Options.layout b/data/gui/Editor_Options.layout index 22dd7e9a..b54493a3 100644 --- a/data/gui/Editor_Options.layout +++ b/data/gui/Editor_Options.layout @@ -76,9 +76,69 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + --> diff --git a/data/gui/Game_Options.layout b/data/gui/Game_Options.layout index a00dc766..993eba1a 100644 --- a/data/gui/Game_Options.layout +++ b/data/gui/Game_Options.layout @@ -77,9 +77,92 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - + + --> diff --git a/docs/Statistics.md b/docs/Statistics.md index 21d86b40..738bf79e 100644 --- a/docs/Statistics.md +++ b/docs/Statistics.md @@ -17,7 +17,7 @@ Link to calculate [date difference](https://www.timeanddate.com/date/durationres |Version | Date |Days| MB |g|e |Tracks |new|ren|del| Scn |New Sceneries |Vehicles|new|New Vehicles| Changes | |---------|--------|----|-----|-|--|-------|---|---|---|------|---------------|--------|---|------------|-----------------------| -|**3.0.5**| ?.4'24|>122|2100?| |3 |**229**| +1|30?| | 41 | | **33** | +8| R1,R2,R3, Q1,Q3, H1,H2, YG | | +|**3.1** | ?.4'24|>122|2100?| |3 |**229**| +1|30?| | 41 | | **33** | +8| R1,R2,R3, Q1,Q3, H1,H2, YG | | |**3.0.1**|20.12'23| 17 |2100?| | |**228**| | | | 41 | | 25 | | | | |**3.0** | 3.12'23| 388|2098 |1|--|**228**|+26|153|-2 | 41 | | 25 | | | OgreNext, PBS, Horizons | |**2.8?** | -- |>388|2098?| | |**227**|+25| 7 |-2 | 41 | Marble, Spring, Anomaly, PostApo | 25 | | | | diff --git a/src/common/settings_com.cpp b/src/common/settings_com.cpp index cdd25d89..105f3789 100644 --- a/src/common/settings_com.cpp +++ b/src/common/settings_com.cpp @@ -166,5 +166,5 @@ const char SETcom::colFilDef[2][COL_FIL] = // ver diff rating objects obstacles fluids bumps jumps loops pipes banked frenzy sum longn // v ! * o c w ~ J L P b s E l * + {{01, 0,0, 0,0, 0,0, 0,0,0, 0,0, 0,0, 0,0}, // min - {30, 7,6, 4,4, 5,5, 4,6,4, 5,5, 35,35, 6,1}}; // max + {31, 7,6, 4,4, 5,5, 4,6,4, 5,5, 35,35, 6,1}}; // max ///^ up in next ver, also in *default.cfg diff --git a/src/editor/CGui.h b/src/editor/CGui.h index f6452b4b..6cc7e504 100644 --- a/src/editor/CGui.h +++ b/src/editor/CGui.h @@ -466,6 +466,9 @@ class CGui : public BGui Ed trkName =0; void editTrkDescr(Ed), editTrkAdvice(Ed); + // fonts + SV svFntWnd, svFntGui; + // ⛓️ system, utils, mtr Ogre::String strFSerrors; // not used.. bool Rename(Ogre::String from, Ogre::String to); diff --git a/src/editor/Gui_Init.cpp b/src/editor/Gui_Init.cpp index 4ae9a631..d14427e0 100644 --- a/src/editor/Gui_Init.cpp +++ b/src/editor/Gui_Init.cpp @@ -705,13 +705,9 @@ void CGui::InitGui() gcom->ChangeTrackView(); - /// 🧊 3d view [] (veget models, objects) todo: - //-------------------------------------------- - //rndCanvas = mGUI->findWidget("CanVeget"); //? - // viewCanvas = app->mWndEdit->createWidget("Canvas", GetViewSize(), Align::Stretch); - // viewCanvas->setInheritsAlpha(false); - // viewCanvas->setPointer("hand"); - // viewCanvas->setVisible(false); + // fonts + sv= &svFntWnd; sv->Init("FntWnd", &pSet->font_wnds, -0.1f, 0.2f); sv->DefaultF(0.f); + sv= &svFntGui; sv->Init("FntGui", &pSet->font_gui, 0.8f, 1.2f); sv->DefaultF(1.f); bGI = true; // gui inited, gui events can now save vals diff --git a/src/game/CGui.h b/src/game/CGui.h index 3f709cb2..adc7d0d0 100644 --- a/src/game/CGui.h +++ b/src/game/CGui.h @@ -571,6 +571,9 @@ class CGui : public BGui Ed edNetServerPort =0, edNetServerIP =0; void evEdNetServerPort(Ed), evEdNetServerIP(Ed); + // fonts + SV svFntWnd, svFntGui, svFntHud, svFntTimes; + // 🔗 open urls void btnTrackEditor(WP); // start ed exe void btnWelcome(WP), btnWebsite(WP), btnWiki(WP), btnWikiInput(WP); diff --git a/src/game/Gui_Init.cpp b/src/game/Gui_Init.cpp index 36b940e7..4d071ad2 100644 --- a/src/game/Gui_Init.cpp +++ b/src/game/Gui_Init.cpp @@ -541,6 +541,13 @@ void CGui::InitGui() gcom->ChangeTrackView(); + // fonts + sv= &svFntWnd; sv->Init("FntWnd", &pSet->font_wnds, -0.1f, 0.2f); sv->DefaultF(0.f); + sv= &svFntGui; sv->Init("FntGui", &pSet->font_gui, 0.8f, 1.2f); sv->DefaultF(1.f); + sv= &svFntHud; sv->Init("FntHud", &pSet->font_hud, 0.8f, 1.2f); sv->DefaultF(1.f); + sv= &svFntTimes; sv->Init("FntTimes", &pSet->font_times, 0.8f, 1.2f); sv->DefaultF(1.f); + + // 🔗 open url btns ------------- Btn("BtnTrackEditor", btnTrackEditor); Btn("OpenWelcome", btnWelcome); Btn("OpenWebsite", btnWebsite); Btn("OpenSources", btnSources);