mirror of
https://github.com/acemod/ACE3.git
synced 2024-08-30 18:23:18 +00:00
MicroDAGR OS Upgrade
This commit is contained in:
parent
fc54b1180c
commit
f18094e7e4
@ -38,7 +38,7 @@ if (GVAR(currentApplicationPage) == APP_MODE_INFODISPLAY) then {
|
||||
(_display displayCtrl IDC_MODEDISPLAY_MODEPOSTIMECG) ctrlShow false;
|
||||
(_display displayCtrl IDC_MODEDISPLAY_MODEPOSTARGETCG) ctrlShow true;
|
||||
if (GVAR(currentWaypoint) == -2) then {
|
||||
(_display displayCtrl IDC_MODEDISPLAY_TARGETICON) ctrlSetText "\A3\ui_f\data\igui\rscingameui\rscoptics\laser_designator_iconLaserOn.paa"
|
||||
(_display displayCtrl IDC_MODEDISPLAY_TARGETICON) ctrlSetText QUOTE(PATHTOF(images\icon_menuLaser.paa));
|
||||
} else {
|
||||
(_display displayCtrl IDC_MODEDISPLAY_TARGETICON) ctrlSetText QUOTE(PATHTOF(images\icon_menuMark.paa));
|
||||
};
|
||||
|
@ -47,9 +47,9 @@ case (APP_MODE_INFODISPLAY): {
|
||||
|
||||
//Heading:
|
||||
_compassAngleText = if (GVAR(settingUseMils)) then {
|
||||
[(floor ((6400 / 360) * (getDir ACE_player))), 4, 0] call CBA_fnc_formatNumber;
|
||||
[(floor ((6400 / 360) * (([ACE_player] call CBA_fnc_headDir) select 0))), 4, 0] call CBA_fnc_formatNumber;
|
||||
} else {
|
||||
([(floor (getDir ACE_player)), 3, 1] call CBA_fnc_formatNumber) + "°" //degree symbol is in UTF-8
|
||||
([(floor (([ACE_player] call CBA_fnc_headDir) select 0)), 3, 1] call CBA_fnc_formatNumber) + "°" //degree symbol is in UTF-8
|
||||
};
|
||||
(_display displayCtrl IDC_MODEDISPLAY_HEADINGNUM) ctrlSetText _compassAngleText;
|
||||
|
||||
@ -107,9 +107,9 @@ case (APP_MODE_INFODISPLAY): {
|
||||
case (APP_MODE_COMPASS): {
|
||||
//Heading:
|
||||
_compassAngleText = if (GVAR(settingUseMils)) then {
|
||||
[(floor ((6400 / 360) * (getDir ACE_player))), 4, 0] call CBA_fnc_formatNumber;
|
||||
[(floor ((6400 / 360) * (([ACE_player] call CBA_fnc_headDir) select 0))), 4, 0] call CBA_fnc_formatNumber;
|
||||
} else {
|
||||
([(floor (getDir ACE_player)), 3, 1] call CBA_fnc_formatNumber) + "°" //degree symbol is in UTF-8
|
||||
([(floor (([ACE_player] call CBA_fnc_headDir) select 0)), 3, 1] call CBA_fnc_formatNumber) + "°" //degree symbol is in UTF-8
|
||||
};
|
||||
(_display displayCtrl IDC_MODECOMPASS_HEADING) ctrlSetText _compassAngleText;
|
||||
|
||||
@ -171,7 +171,7 @@ case (APP_MODE_WAYPOINTS): {
|
||||
|
||||
_currentIndex = (_currentIndex max 0) min (count _waypoints);
|
||||
_wpListBox lbSetCurSel _currentIndex;
|
||||
|
||||
|
||||
//Reset focus to a dummy ctrl (top button), otherwise HOME/POS1 key goes to top of listBox and has keybind blocked
|
||||
ctrlSetFocus (_display displayCtrl IDC_TOPMENUBUTTON);
|
||||
};
|
||||
@ -193,7 +193,7 @@ case (APP_MODE_SETUP): {
|
||||
} else {
|
||||
_settingListBox lbSetTextRight [1, (localize LSTRING(settingOff))];
|
||||
};
|
||||
|
||||
|
||||
//Reset focus to a dummy ctrl (top button), otherwise HOME/POS1 key goes to top of listBox and has keybind blocked
|
||||
ctrlSetFocus (_display displayCtrl IDC_TOPMENUBUTTON);
|
||||
};
|
||||
|
@ -18,7 +18,7 @@ class controlsBackground {
|
||||
};
|
||||
class RangefinderConnectedIcon: RscPicture {
|
||||
idc = IDC_RANGEFINDERCONNECTEDICON;
|
||||
text = "\A3\ui_f\data\igui\rscingameui\rscoptics\laser_designator_iconLaserOn.paa";
|
||||
text = QUOTE(PATHTOF(images\icon_menuLaser.paa));
|
||||
x = X_PART(6.35);
|
||||
y = Y_PART(0.1);
|
||||
w = W_PART(2.7);
|
||||
@ -486,7 +486,7 @@ class controls {
|
||||
onbuttonclick = QUOTE([5] call FUNC(saveCurrentAndSetNewMode));
|
||||
};
|
||||
class ButtonBL: ButtonTL {
|
||||
text = "\A3\ui_f\data\igui\rscingameui\rscoptics\laser_designator_iconLaserOn.paa";
|
||||
text = QUOTE(PATHTOF(images\icon_menuLaser.paa));
|
||||
x = W_PART(3);
|
||||
y = H_PART(10.5);
|
||||
onbuttonclick = QUOTE(_this call FUNC(appMenuButtonConnectRangefinder));
|
||||
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
addons/microdagr/images/icon_menuLaser.paa
Normal file
BIN
addons/microdagr/images/icon_menuLaser.paa
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue
Block a user