Merge pull request #1960 from Stephan-S/beta-testing

Release 1.1.1.2
Stephan-S · Jun 12, 2021 · 41aa08a · 41aa08a
2 parents 95a3891 + 178556e
commit 41aa08a
Show file tree

Hide file tree

Showing 68 changed files with 2,523 additions and 733 deletions.
diff --git a/FS19_AutoDrive/gui/debugSettingsPage.xml b/FS19_AutoDrive/gui/debugSettingsPage.xml
@@ -89,6 +89,14 @@
 						<GuiElement type="text" profile="autoDriveDebugSettingsCheckboxToggleText" text="$l10n_gui_ad_debugChannelRoadNetwork" />
 					</GuiElement>
 				</GuiElement>
+				<GuiElement type="bitmap" profile="autoDriveDebugSettingsCheckbox" onCreate="onCreateCheckbox" onCreateArgs="1024">
+					<GuiElement type="toggleButton" profile="autoDriveDebugSettingsCheckboxToggle" onClick="onClickToggle">
+						<GuiElement type="button" profile="autoDriveDebugSettingsCheckboxToggleTick" />
+						<GuiElement type="button" profile="autoDriveDebugSettingsCheckboxToggleUntick" />
+						<GuiElement type="bitmap" profile="autoDriveDebugSettingsCheckboxToggleIcon" imageUVs="256px 128px 128px 128px" />
+						<GuiElement type="text" profile="autoDriveDebugSettingsCheckboxToggleText" text="$l10n_gui_ad_debugChannelBGA" />
+					</GuiElement>
+				</GuiElement>
 				<GuiElement type="bitmap" profile="autoDriveDebugSettingsCheckbox" onCreate="onCreateCheckbox" onCreateArgs="65535">
 					<GuiElement type="toggleButton" profile="autoDriveDebugSettingsCheckboxToggle" onClick="onClickToggle">
 						<GuiElement type="button" profile="autoDriveDebugSettingsCheckboxToggleTick" />

diff --git a/FS19_AutoDrive/gui/guiProfiles.xml b/FS19_AutoDrive/gui/guiProfiles.xml
@@ -276,4 +276,66 @@
         <Value name="textOffset" value="46px 2px" />
         <Value name="textFocusedOffset" value="46px 2px" />
     </Profile>
+
+    <Profile name="autoDriveTipOfTheDayNavigationBox" extends="emptyPanel" with="lightFrame">
+        <Value name="size" value="720px 662px" />
+        <Value name="position" value="0px -45px" />
+        <Value name="screenAlign" value="topCenter" />
+        <Value name="positionOrigin" value="topCenter" />
+    </Profile>
+
+    <Profile name="autoDriveTipOfTheDayText" extends="textDefault">
+        <Value name="size" value="562px 600px" />
+        <Value name="textMaxWidth" value="456px" />
+        <Value name="textVerticalAlignment" value="top" />
+        <Value name="textSize" value="16px" />
+        <Value name="textBold" value="true" />
+        <Value name="textOffset" value="46px 2px" />
+        <Value name="textFocusedOffset" value="46px 2px" />
+        <Value name="textFocusedOffset" value="46px 2px" />
+        <Value name="textWrapWidth" value="456px" />
+        <Value name="positionOrigin" value="topLeft" />
+        <Value name="screenAlign" value="topLeft" />
+        <Value name="position" value="130px -10px" />
+    </Profile>
+
+    <Profile name="autoDriveNotificationHistoryItemIcon" extends="baseReference">
+        <Value name="size" value="128px 128px" />
+        <Value name="position" value="10px -10px" />
+        <Value name="imageFilename" value="g_autoDriveTipOfTheDayUIFilename" />
+        <Value name="imageUVs" value="0px 0px 128px 128px" />
+        <Value name="frameThickness" value="0 0 0 0" />
+        <Value name="positionOrigin" value="topLeft" />
+        <Value name="screenAlign" value="topLeft" />
+    </Profile>  
+
+    <Profile name="autoDriveTipOfTheDayTitleText" extends="textDefault">
+        <Value name="size" value="720px 50px" />
+        <Value name="textMaxWidth" value="720px" />
+        <Value name="textVerticalAlignment" value="top" />
+        <Value name="textSize" value="20px" />
+        <Value name="textBold" value="true" />
+        <Value name="position" value="15px 25px" />
+        <Value name="screenAlign" value="topLeft" />
+        <Value name="positionOrigin" value="topLeft" />
+    </Profile>      
+
+    <Profile name="autoDriveTipOfTheDayCheckbox" extends="baseReference" with="lightFrame">
+        <Value name="size" value="450px 48px" />
+        <Value name="frameThickness" value="1dp 1dp 1dp 1dp" />
+        <Value name="imageColor" value="$preset_colorGlassMedium" />
+        <Value name="imageDisabledColor" value="$preset_colorGlass" />
+        <Value name="margin" value="24px 12px 48px 32px" />
+        <Value name="screenAlign" value="bottomLeft" />
+        <Value name="positionOrigin" value="bottomLeft" />
+        <Value name="position" value="45px 15px" />
+    </Profile>
+
+    <Profile name="autoDriveTipOfTheDayCheckboxToggle" extends="ingameMenuMPActionsListPermissionCheckbox" with="anchorMiddleLeft">
+        <Value name="frameThickness" value="0 0 1dp 0" />
+    </Profile>
+
+    <Profile name="autoDriveTipOfTheDayCheckboxToggleText" extends="textDefault" with="anchorMiddleLeft">
+        <Value name="position" value="60px 0px" />
+    </Profile>
 </GUIProfiles>
diff --git a/FS19_AutoDrive/gui/tipOfTheDayGUI.xml b/FS19_AutoDrive/gui/tipOfTheDayGUI.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8" standalone="no" ?>
+<GUI onOpen="onOpen" onClose="onClose" onCreate="onCreate">
+    <GuiElement type="empty" profile="newLayer" />
+
+    <GuiElement type="bitmap" profile="yesNoDialogBg" position="0px -150px" size="810px 780px" screenAlign="topCenter" positionOrigin="topCenter">
+        <GuiElement type="bitmap" profile="dialogHeaderDocked">
+            <GuiElement type="text" profile="dialogHeaderText" text="$l10n_gui_ad_tipOfTheDayTitle" />
+        </GuiElement>
+
+        <GuiElement type="empty" profile="autoDriveTipOfTheDayNavigationBox" id="tipOfTheDayTemplate">
+            <GuiElement type="text" profile="autoDriveTipOfTheDayTitleText" text="$l10n_ad_helpTitle_01"/>
+            <GuiElement type="bitmap" profile="autoDriveNotificationHistoryItemIcon" name="listItemIcon" />
+            <GuiElement type="text" profile="autoDriveTipOfTheDayText" text="$l10n_ad_helpText_08_01" name="listItemText" />
+        </GuiElement>
+
+        <GuiElement type="bitmap" profile="autoDriveTipOfTheDayCheckbox" onCreate="onCreateCheckbox" onCreateArgs="2">
+            <GuiElement type="toggleButton" profile="autoDriveTipOfTheDayCheckboxToggle" onClick="onClickToggle">
+                <GuiElement type="button" profile="autoDriveDebugSettingsCheckboxToggleTick" />
+                <GuiElement type="button" profile="autoDriveDebugSettingsCheckboxToggleUntick" />
+                <GuiElement type="text" profile="autoDriveTipOfTheDayCheckboxToggleText" text="$l10n_gui_ad_tipOfTheDayActive" />
+            </GuiElement>
+        </GuiElement>
+
+        <GuiElement type="flowLayout" profile="buttonBoxDocked">
+            <GuiElement type="button" profile="buttonBack" text="$l10n_button_back" onClick="onClickBack" />
+            <GuiElement type="button" profile="buttonActivate" text="$l10n_ad_next_tip" onClick="onClickActivate" />
+        </GuiElement>
+    </GuiElement>
+</GUI>
diff --git a/FS19_AutoDrive/gui/userSettingsPage.xml b/FS19_AutoDrive/gui/userSettingsPage.xml
@@ -97,6 +97,14 @@
 					<GuiElement type="bitmap" profile="multiTextOptionSettingsBg" />
 					<GuiElement type="bitmap" profile="baseReference" screenAlign="topLeft" position="5px 4px" size="17px 17px" />
 				</GuiElement>
+				<GuiElement type="multiTextOption" profile="multiTextOptionSettings" onCreate="onCreateAutoDriveSetting" onClick="onOptionChange" name="showTipOfTheDay" toolTipElementId="ingameMenuHelpBoxText">
+					<GuiElement type="button" profile="multiTextOptionSettingsLeft" />
+					<GuiElement type="button" profile="multiTextOptionSettingsRight" />
+					<GuiElement type="text" profile="multiTextOptionSettingsText" />
+					<GuiElement type="text" profile="multiTextOptionSettingsTitle" position="27px 6px" />
+					<GuiElement type="bitmap" profile="multiTextOptionSettingsBg" />
+					<GuiElement type="bitmap" profile="baseReference" screenAlign="topLeft" position="5px 4px" size="17px 17px" />
+				</GuiElement>
 				<!-- <GuiElement type="multiTextOption" profile="multiTextOptionSettings" onCreate="onCreateAutoDriveSetting" onClick="onOptionChange" name="combineCPADHudMouse" toolTipElementId="ingameMenuHelpBoxText"> -->
 					<!-- <GuiElement type="button" profile="multiTextOptionSettingsLeft" /> -->
 					<!-- <GuiElement type="button" profile="multiTextOptionSettingsRight" /> -->

diff --git a/FS19_AutoDrive/gui/vehicleSettingsPage.xml b/FS19_AutoDrive/gui/vehicleSettingsPage.xml
@@ -90,22 +90,22 @@
 					<GuiElement type="bitmap" profile="multiTextOptionSettingsBg" />
 					<GuiElement type="bitmap" profile="baseReference" screenAlign="topLeft" position="5px 4px" size="17px 17px" />
 				</GuiElement>
-				<!-- <GuiElement type="multiTextOption" profile="multiTextOptionSettings" onCreate="onCreateAutoDriveSetting" onClick="onOptionChange" name="shovelWidth" toolTipElementId="ingameMenuHelpBoxText"> -->
-					<!-- <GuiElement type="button" profile="multiTextOptionSettingsLeft" /> -->
-					<!-- <GuiElement type="button" profile="multiTextOptionSettingsRight" /> -->
-					<!-- <GuiElement type="text" profile="multiTextOptionSettingsText" /> -->
-					<!-- <GuiElement type="text" profile="multiTextOptionSettingsTitle" position="27px 6px" /> -->
-					<!-- <GuiElement type="bitmap" profile="multiTextOptionSettingsBg" /> -->
-					<!-- <GuiElement type="bitmap" profile="baseReference" screenAlign="topLeft" position="5px 4px" size="17px 17px" /> -->
-				<!-- </GuiElement> -->
-				<!-- <GuiElement type="multiTextOption" profile="multiTextOptionSettings" onCreate="onCreateAutoDriveSetting" onClick="onOptionChange" name="shovelHeight" toolTipElementId="ingameMenuHelpBoxText"> -->
-					<!-- <GuiElement type="button" profile="multiTextOptionSettingsLeft" /> -->
-					<!-- <GuiElement type="button" profile="multiTextOptionSettingsRight" /> -->
-					<!-- <GuiElement type="text" profile="multiTextOptionSettingsText" /> -->
-					<!-- <GuiElement type="text" profile="multiTextOptionSettingsTitle" position="27px 6px" /> -->
-					<!-- <GuiElement type="bitmap" profile="multiTextOptionSettingsBg" /> -->
-					<!-- <GuiElement type="bitmap" profile="baseReference" screenAlign="topLeft" position="5px 4px" size="17px 17px" /> -->
-				<!-- </GuiElement> -->
+				<GuiElement type="multiTextOption" profile="multiTextOptionSettings" onCreate="onCreateAutoDriveSetting" onClick="onOptionChange" name="shovelWidth" toolTipElementId="ingameMenuHelpBoxText"> 
+					<GuiElement type="button" profile="multiTextOptionSettingsLeft" /> 
+					<GuiElement type="button" profile="multiTextOptionSettingsRight" /> 
+					<GuiElement type="text" profile="multiTextOptionSettingsText" /> 
+					<GuiElement type="text" profile="multiTextOptionSettingsTitle" position="27px 6px" /> 
+					<GuiElement type="bitmap" profile="multiTextOptionSettingsBg" /> 
+					<GuiElement type="bitmap" profile="baseReference" screenAlign="topLeft" position="5px 4px" size="17px 17px" /> 
+				</GuiElement> 
+				<GuiElement type="multiTextOption" profile="multiTextOptionSettings" onCreate="onCreateAutoDriveSetting" onClick="onOptionChange" name="shovelHeight" toolTipElementId="ingameMenuHelpBoxText"> 
+					<GuiElement type="button" profile="multiTextOptionSettingsLeft" /> 
+					<GuiElement type="button" profile="multiTextOptionSettingsRight" /> 
+					<GuiElement type="text" profile="multiTextOptionSettingsText" /> 
+					<GuiElement type="text" profile="multiTextOptionSettingsTitle" position="27px 6px" /> 
+					<GuiElement type="bitmap" profile="multiTextOptionSettingsBg" /> 
+					<GuiElement type="bitmap" profile="baseReference" screenAlign="topLeft" position="5px 4px" size="17px 17px" />
+				</GuiElement>
 				<GuiElement type="multiTextOption" profile="multiTextOptionSettings" onCreate="onCreateAutoDriveSetting" onClick="onOptionChange" name="autoRefuel" toolTipElementId="ingameMenuHelpBoxText">
 					<GuiElement type="button" profile="multiTextOptionSettingsLeft" />
 					<GuiElement type="button" profile="multiTextOptionSettingsRight" />
@@ -146,6 +146,14 @@
 					<GuiElement type="bitmap" profile="multiTextOptionSettingsBg" />
 					<GuiElement type="bitmap" profile="baseReference" screenAlign="topLeft" position="5px 4px" size="17px 17px" />
 				</GuiElement>
+				<GuiElement type="multiTextOption" profile="multiTextOptionSettings" onCreate="onCreateAutoDriveSetting" onClick="onOptionChange" name="useForwardTurningManoeuvre" toolTipElementId="ingameMenuHelpBoxText">
+					<GuiElement type="button" profile="multiTextOptionSettingsLeft" />
+					<GuiElement type="button" profile="multiTextOptionSettingsRight" />
+					<GuiElement type="text" profile="multiTextOptionSettingsText" />
+					<GuiElement type="text" profile="multiTextOptionSettingsTitle" position="27px 6px" />
+					<GuiElement type="bitmap" profile="multiTextOptionSettingsBg" />
+					<GuiElement type="bitmap" profile="baseReference" screenAlign="topLeft" position="5px 4px" size="17px 17px" />
+				</GuiElement>
 			</GuiElement>
 		</GuiElement>