Settings Menu, Mils, Localization

This commit is contained in:
PabstMirror 2015-03-10 21:48:57 -05:00
parent 1cf8843cae
commit 13e6ae60b2
13 changed files with 242 additions and 81 deletions

View File

@ -4,30 +4,28 @@
if (!hasInterface) exitWith {}; if (!hasInterface) exitWith {};
//Add Keybinds: //Add Keybinds:
["ACE3", QGVAR(openGPS), "Open GPS", ["ACE3", QGVAR(openGPS), (localize "STR_ACE_microdagr_openUnit"),
{ {
// Conditions: canInteract // Conditions: canInteract
_exceptions = []; _exceptions = [];
if !(_exceptions call EGVAR(common,canInteract)) exitWith {false}; if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
// Conditions: specific // Conditions: specific
if (!("ACE_microDAGR" in (items ace_player))) exitWith {false}; if (!("ACE_microDAGR" in (items ace_player))) exitWith {false};
systemChat "Toggle Button Press";
[] call FUNC(openDisplay); [] call FUNC(openDisplay);
true; true;
}, },
{false}, {false},
[0xC7, [false, false, false]], false] call cba_fnc_addKeybind; //Home Key [0xC7, [false, false, false]], false] call cba_fnc_addKeybind; //Home Key
["ACE3", QGVAR(closeGpS), "Close GPS", ["ACE3", QGVAR(closeGPS), (localize "STR_ACE_microdagr_closeUnit"),
{ {
// Conditions: canInteract // Conditions: canInteract
_exceptions = []; _exceptions = [];
if !(_exceptions call EGVAR(common,canInteract)) exitWith {false}; if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
// Conditions: specific // Conditions: specific
if (!("ACE_microDAGR" in (items ace_player))) exitWith {false}; if (!("ACE_microDAGR" in (items ace_player))) exitWith {false};
if (GVAR(currentShowMode) == DISPLAY_MODE_CLOSED) exitWith {false};
systemChat "Close Button Press";
[DISPLAY_MODE_CLOSED] call FUNC(openDisplay); [DISPLAY_MODE_CLOSED] call FUNC(openDisplay);
true; true;
}, },
@ -45,6 +43,10 @@ GVAR(mapZoom) = 0.075;
GVAR(currentApplicationPage) = APP_MODE_NULL; GVAR(currentApplicationPage) = APP_MODE_NULL;
GVAR(currentShowMode) = DISPLAY_MODE_CLOSED; GVAR(currentShowMode) = DISPLAY_MODE_CLOSED;
//User Settings
GVAR(settingUseMils) = false;
GVAR(settingShowAllWaypointsOnMap) = true;
GVAR(newWaypointPosition) = []; GVAR(newWaypointPosition) = [];
GVAR(currentWaypoint) = -1; GVAR(currentWaypoint) = -1;
GVAR(rangeFinderPositionASL) = []; GVAR(rangeFinderPositionASL) = [];

View File

@ -4,6 +4,7 @@ ADDON = false;
PREP(appMarkKeypadEntry); PREP(appMarkKeypadEntry);
PREP(appMenuButtonConnectRangefinder); PREP(appMenuButtonConnectRangefinder);
PREP(appSettingsLBClick);
PREP(appWaypointsButtonDeleteWP); PREP(appWaypointsButtonDeleteWP);
PREP(appWaypointsButtonSetWP); PREP(appWaypointsButtonSetWP);
PREP(canShow); PREP(canShow);

View File

@ -0,0 +1,27 @@
/*
* Author: PabstMirror
* Takes some arguments and returns something or other.
*
* Arguments:
* 0: The first argument <STRING>
* 1: The second argument <OBJECT>
* 2: Third Optional Argument <BOOL><OPTIONAL>
*
* Return Value:
* The return value <BOOL>
*
* Example:
* _bool = ["something", player] call ace_common_fnc_imanexample
*
* Public: Yes
*/
#include "script_component.hpp"
_itemClicked = _this select 1;
switch (_itemClicked) do {
case (0): { GVAR(settingUseMils) = ! GVAR(settingUseMils)};
case (1): { GVAR(settingShowAllWaypointsOnMap) = ! GVAR(settingShowAllWaypointsOnMap)};
};
[] call FUNC(updateDisplay);

View File

@ -22,5 +22,4 @@ PARAMS_1(_showType);
if (_show == DISPLAY_MODE_CLOSED) exitWith {true}; if (_show == DISPLAY_MODE_CLOSED) exitWith {true};
if (_show == DISPLAY_MODE_HIDDEN) exitWith {true}; if (_show == DISPLAY_MODE_HIDDEN) exitWith {true};
true true

View File

@ -17,7 +17,6 @@
*/ */
#include "script_component.hpp" #include "script_component.hpp"
systemChat "Debug: dialog closed";
if (GVAR(currentShowMode) == DISPLAY_MODE_DIALOG) then { if (GVAR(currentShowMode) == DISPLAY_MODE_DIALOG) then {
[-1] call FUNC(saveCurrentAndSetNewMode); [-1] call FUNC(saveCurrentAndSetNewMode);
[DISPLAY_MODE_DISPLAY] call FUNC(openDisplay); [DISPLAY_MODE_DISPLAY] call FUNC(openDisplay);

View File

@ -51,13 +51,15 @@ if (GVAR(currentApplicationPage) == 1) then {
_theMap ctrlMapAnimAdd [0, (GVAR(mapZoom)/_mapSize), GVAR(gpsPositionASL)]; _theMap ctrlMapAnimAdd [0, (GVAR(mapZoom)/_mapSize), GVAR(gpsPositionASL)];
ctrlMapAnimCommit _theMap; ctrlMapAnimCommit _theMap;
}; };
_size = 30 * _mapSize; _size = 32 * _mapSize;
_theMap drawIcon [QUOTE(PATHTO_R(images\icon_self.paa)), [0.533,0.769,0.76,0.75], GVAR(gpsPositionASL), _size, _size, (getDir ace_player), '', 0 ]; _theMap drawIcon [QUOTE(PATHTO_R(images\icon_self.paa)), [0.533,0.769,0.76,0.75], GVAR(gpsPositionASL), _size, _size, (getDir ace_player), '', 0 ];
_size = 20 * _mapSize; if (GVAR(settingShowAllWaypointsOnMap)) then {
{ _size = 24 * _mapSize;
EXPLODE_2_PVT(_x,_wpName,_wpPos); {
_alpha = if (_forEachIndex == GVAR(currentWaypoint)) then {1} else {0.5}; EXPLODE_2_PVT(_x,_wpName,_wpPos);
_theMap drawIcon [QUOTE(PATHTO_R(images\icon_mapWaypoints.paa)), [1,1,1,_alpha], _wpPos, _size, _size, 0, '', 0 ]; _alpha = if (_forEachIndex == GVAR(currentWaypoint)) then {1} else {0.5};
} forEach _waypoints; _theMap drawIcon [QUOTE(PATHTO_R(images\icon_mapWaypoints.paa)), [1,1,1,_alpha], _wpPos, _size, _size, 0, '', 0 ];
} forEach _waypoints;
};
}; };

View File

@ -38,11 +38,7 @@ if (GVAR(currentApplicationPage) == APP_MODE_NULL) then {
GVAR(mapPosition) = getPos ace_player; GVAR(mapPosition) = getPos ace_player;
}; };
systemChat format ["%1 to %2 from %3", _oldShowMode, GVAR(currentShowMode), _this];
if (GVAR(currentShowMode) in [DISPLAY_MODE_CLOSED, DISPLAY_MODE_HIDDEN]) then { if (GVAR(currentShowMode) in [DISPLAY_MODE_CLOSED, DISPLAY_MODE_HIDDEN]) then {
systemChat "Closing";
//If Dialog is open, back it up before closing: //If Dialog is open, back it up before closing:
if (dialog && {!isNull (uiNamespace getVariable [QGVAR(DialogDisplay), displayNull])}) then { if (dialog && {!isNull (uiNamespace getVariable [QGVAR(DialogDisplay), displayNull])}) then {
@ -54,7 +50,6 @@ if (GVAR(currentShowMode) in [DISPLAY_MODE_CLOSED, DISPLAY_MODE_HIDDEN]) then {
(QGVAR(TheRscTitleDisplay) call BIS_fnc_rscLayer) cutText ["", "PLAIN"]; (QGVAR(TheRscTitleDisplay) call BIS_fnc_rscLayer) cutText ["", "PLAIN"];
} else { } else {
if (GVAR(currentShowMode) == DISPLAY_MODE_DISPLAY) then { if (GVAR(currentShowMode) == DISPLAY_MODE_DISPLAY) then {
systemChat "Opening Display";
//If Dialog is open, back it up before closing: //If Dialog is open, back it up before closing:
if (dialog && {!isNull (uiNamespace getVariable [QGVAR(DialogDisplay), displayNull])}) then { if (dialog && {!isNull (uiNamespace getVariable [QGVAR(DialogDisplay), displayNull])}) then {
[-1] call FUNC(saveCurrentAndSetNewMode); [-1] call FUNC(saveCurrentAndSetNewMode);
@ -63,7 +58,6 @@ if (GVAR(currentShowMode) in [DISPLAY_MODE_CLOSED, DISPLAY_MODE_HIDDEN]) then {
//Open the display: //Open the display:
(QGVAR(TheRscTitleDisplay) call BIS_fnc_rscLayer) cutRsc [QGVAR(TheRscTitleDisplay), "PLAIN", 0, true]; (QGVAR(TheRscTitleDisplay) call BIS_fnc_rscLayer) cutRsc [QGVAR(TheRscTitleDisplay), "PLAIN", 0, true];
} else { } else {
systemChat "Opening Dialog";
//Close the display: //Close the display:
(QGVAR(TheRscTitleDisplay) call BIS_fnc_rscLayer) cutText ["", "PLAIN"]; (QGVAR(TheRscTitleDisplay) call BIS_fnc_rscLayer) cutText ["", "PLAIN"];
//Open the dialog: //Open the dialog:

View File

@ -90,10 +90,10 @@ if (GVAR(currentApplicationPage) == APP_MODE_MARK) then {
if ((count GVAR(newWaypointPosition)) == 0) then { if ((count GVAR(newWaypointPosition)) == 0) then {
(_display displayCtrl IDC_MODEMARK_HEADER) ctrlSetText format ["Enter Grid Cords:"]; (_display displayCtrl IDC_MODEMARK_HEADER) ctrlSetText (localize "STR_ACE_microdagr_wpEnterCords");
(_display displayCtrl IDC_MODEMARK_CORDSEDIT) ctrlSetText ""; (_display displayCtrl IDC_MODEMARK_CORDSEDIT) ctrlSetText "";
} else { } else {
(_display displayCtrl IDC_MODEMARK_HEADER) ctrlSetText format ["Name of [%1]", mapGridPosition GVAR(newWaypointPosition)]; (_display displayCtrl IDC_MODEMARK_HEADER) ctrlSetText format [(localize "STR_ACE_microdagr_wpEnterName"), mapGridPosition GVAR(newWaypointPosition)];
(_display displayCtrl IDC_MODEMARK_CORDSEDIT) ctrlSetText format ["[%1]", mapGridPosition GVAR(newWaypointPosition)]; (_display displayCtrl IDC_MODEMARK_CORDSEDIT) ctrlSetText format ["[%1]", mapGridPosition GVAR(newWaypointPosition)];
}; };
ctrlSetFocus (_display displayCtrl IDC_MODEMARK_CORDSEDIT); ctrlSetFocus (_display displayCtrl IDC_MODEMARK_CORDSEDIT);
@ -104,7 +104,9 @@ if (GVAR(currentApplicationPage) == APP_MODE_MARK) then {
//Mode: Waypoints //Mode: Waypoints
(_display displayCtrl IDC_MODEWAYPOINTS) ctrlShow (GVAR(currentApplicationPage) == APP_MODE_WAYPOINTS); (_display displayCtrl IDC_MODEWAYPOINTS) ctrlShow (GVAR(currentApplicationPage) == APP_MODE_WAYPOINTS);
systemChat format ["WP %1 on %2", (GVAR(currentApplicationPage) == APP_MODE_WAYPOINTS), _display];
//Mode: Setting
(_display displayCtrl IDC_MODESETTINGS) ctrlShow (GVAR(currentApplicationPage) == APP_MODE_SETUP);
//Button's pushed: //Button's pushed:

View File

@ -45,14 +45,17 @@ case (APP_MODE_INFODISPLAY): {
(_display displayCtrl IDC_MODEDISPLAY_NORTHING) ctrlSetText _northingText; (_display displayCtrl IDC_MODEDISPLAY_NORTHING) ctrlSetText _northingText;
//Elevation: //Elevation:
_numASL = (GVAR(gpsPositionASL) select 2) + getNumber(configFile >> "CfgWorlds" >> worldName >> "elevationOffset"); _numASL = (GVAR(gpsPositionASL) select 2) + GVAR(mapAltitude);
_aboveSeaLevelText = [_numASL, 5, 0] call CBA_fnc_formatNumber; _aboveSeaLevelText = [_numASL, 5, 0] call CBA_fnc_formatNumber;
_aboveSeaLevelText = if (_numASL > 0) then {"+" + _aboveSeaLevelText + " MSL"} else {_aboveSeaLevelText + " MSL"}; _aboveSeaLevelText = if (_numASL > 0) then {"+" + _aboveSeaLevelText + " MSL"} else {_aboveSeaLevelText + " MSL"};
(_display displayCtrl IDC_MODEDISPLAY_ELEVATIONNUM) ctrlSetText _aboveSeaLevelText; (_display displayCtrl IDC_MODEDISPLAY_ELEVATIONNUM) ctrlSetText _aboveSeaLevelText;
//Heading: //Heading:
_compassAngleText = [(floor (getDir ace_player)), 3, 1] call CBA_fnc_formatNumber; _compassAngleText = if (GVAR(settingUseMils)) then {
_compassAngleText = _compassAngleText + "°"; //degree symbol is in UTF-8 [(floor ((6400 / 360) * (getDir ace_player))), 4, 0] call CBA_fnc_formatNumber;
} else {
([(floor (getDir ace_player)), 3, 1] call CBA_fnc_formatNumber) + "°" //degree symbol is in UTF-8
};
(_display displayCtrl IDC_MODEDISPLAY_HEADINGNUM) ctrlSetText _compassAngleText; (_display displayCtrl IDC_MODEDISPLAY_HEADINGNUM) ctrlSetText _compassAngleText;
//Speed: //Speed:
@ -83,10 +86,14 @@ case (APP_MODE_INFODISPLAY): {
if (!(_targetPosLocationASL isEqualTo [])) then { if (!(_targetPosLocationASL isEqualTo [])) then {
_bearing = [GVAR(gpsPositionASL), _targetPosLocationASL] call BIS_fnc_dirTo; _bearing = [GVAR(gpsPositionASL), _targetPosLocationASL] call BIS_fnc_dirTo;
_bearingText = format ["%1°M", [_bearing, 3, 1] call CBA_fnc_formatNumber]; _bearingText = if (GVAR(settingUseMils)) then {
[(floor ((6400 / 360) * (_bearing))), 4, 0] call CBA_fnc_formatNumber;
} else {
([(floor (_bearing)), 3, 1] call CBA_fnc_formatNumber) + "°" //degree symbol is in UTF-8
};
_2dDistanceKm = ((GVAR(gpsPositionASL) select [0,2]) distance (_targetPosLocationASL select [0,2])) / 1000; _2dDistanceKm = ((GVAR(gpsPositionASL) select [0,2]) distance (_targetPosLocationASL select [0,2])) / 1000;
_rangeText = format ["%1km", ([_2dDistanceKm, 1, 1] call CBA_fnc_formatNumber)]; _rangeText = format ["%1km", ([_2dDistanceKm, 1, 1] call CBA_fnc_formatNumber)];
_numASL = (_targetPosLocationASL select 2) + getNumber(configFile >> "CfgWorlds" >> worldName >> "elevationOffset"); _numASL = (_targetPosLocationASL select 2) + GVAR(mapAltitude);
_aboveSeaLevelText = [_numASL, 5, 0] call CBA_fnc_formatNumber; _aboveSeaLevelText = [_numASL, 5, 0] call CBA_fnc_formatNumber;
_aboveSeaLevelText = if (_numASL > 0) then {"+" + _aboveSeaLevelText + " MSL"} else {_aboveSeaLevelText + " MSL"}; _aboveSeaLevelText = if (_numASL > 0) then {"+" + _aboveSeaLevelText + " MSL"} else {_aboveSeaLevelText + " MSL"};
}; };
@ -96,16 +103,14 @@ case (APP_MODE_INFODISPLAY): {
(_display displayCtrl IDC_MODEDISPLAY_TARGETELEVATIONNUM) ctrlSetText _aboveSeaLevelText; (_display displayCtrl IDC_MODEDISPLAY_TARGETELEVATIONNUM) ctrlSetText _aboveSeaLevelText;
(_display displayCtrl IDC_MODEDISPLAY_TARGETNAME) ctrlSetText _targetPosName; (_display displayCtrl IDC_MODEDISPLAY_TARGETNAME) ctrlSetText _targetPosName;
}; };
// _modePositionInfo ctrlSetStructuredText parseText format ["<t font='EtelkaMonospacePro'><t size='1' align='left'>MGRS-New</t><t align='right'>WGD</t><br/><br/><t size='2' align='right'>%1 %2e<br/>%3n</t><br/><br/><t size='1' align='left'>Elevation:</t><t size='1.5' align='right'>+%4m MSL</t><br/><br/><t align='left'><img size='2' image='mapButton_track.paa'/><t size='1.5' align='center'>%5°</t><t size='1.5' align='right'>%6kph</t><br/><br/><t align='left'><img size='2' image='mapButton_track.paa'/><t size='1' color='#449d65' align='center'>%7 %8L</t></t>", _utmGrid, _easting, _northing, _aboveSeaLevel, _compassAngle, _playerSpeed, _date, _time];
//bullshit gps accuracy: <t size='1' align='left'>EHE: +03.7</t><t size='1' align='right'>FOM: 1</t><br/><br/>
}; };
case (APP_MODE_COMPASS): { case (APP_MODE_COMPASS): {
//Heading: //Heading:
_compassAngleText = [(floor (getDir ace_player)), 3, 1] call CBA_fnc_formatNumber; _compassAngleText = if (GVAR(settingUseMils)) then {
_compassAngleText = _compassAngleText + "°M"; //degree symbol is in UTF-8 [(floor ((6400 / 360) * (getDir ace_player))), 4, 0] call CBA_fnc_formatNumber;
} else {
([(floor (getDir ace_player)), 3, 1] call CBA_fnc_formatNumber) + "°M" //degree symbol is in UTF-8
};
(_display displayCtrl IDC_MODECOMPASS_HEADING) ctrlSetText _compassAngleText; (_display displayCtrl IDC_MODECOMPASS_HEADING) ctrlSetText _compassAngleText;
//Speed: //Speed:
@ -138,12 +143,16 @@ case (APP_MODE_COMPASS): {
if (!(_targetPosLocationASL isEqualTo [])) then { if (!(_targetPosLocationASL isEqualTo [])) then {
_bearing = [GVAR(gpsPositionASL), _targetPosLocationASL] call BIS_fnc_dirTo; _bearing = [GVAR(gpsPositionASL), _targetPosLocationASL] call BIS_fnc_dirTo;
_bearing = format ["%1°M", [_bearing, 3, 1] call CBA_fnc_formatNumber]; _bearingText = if (GVAR(settingUseMils)) then {
[(floor ((6400 / 360) * (_bearing))), 4, 0] call CBA_fnc_formatNumber;
} else {
([(floor (_bearing)), 3, 1] call CBA_fnc_formatNumber) + "°M" //degree symbol is in UTF-8
};
_2dDistanceKm = ((GVAR(gpsPositionASL) select [0,2]) distance (_targetPosLocationASL select [0,2])) / 1000; _2dDistanceKm = ((GVAR(gpsPositionASL) select [0,2]) distance (_targetPosLocationASL select [0,2])) / 1000;
_rangeText = format ["%1km", ([_2dDistanceKm, 1, 1] call CBA_fnc_formatNumber)]; _rangeText = format ["%1km", ([_2dDistanceKm, 1, 1] call CBA_fnc_formatNumber)];
}; };
(_display displayCtrl IDC_MODECOMPASS_BEARING) ctrlSetText _bearing; (_display displayCtrl IDC_MODECOMPASS_BEARING) ctrlSetText _bearingText;
(_display displayCtrl IDC_MODECOMPASS_RANGE) ctrlSetText _rangeText; (_display displayCtrl IDC_MODECOMPASS_RANGE) ctrlSetText _rangeText;
(_display displayCtrl IDC_MODECOMPASS_TARGET) ctrlSetText _targetPosName; (_display displayCtrl IDC_MODECOMPASS_TARGET) ctrlSetText _targetPosName;
}; };
@ -152,7 +161,7 @@ case (APP_MODE_COMPASS): {
case (APP_MODE_WAYPOINTS): { case (APP_MODE_WAYPOINTS): {
_wpListBox = _display displayCtrl IDC_MODEWAYPOINTS_LISTOFWAYPOINTS; _wpListBox = _display displayCtrl IDC_MODEWAYPOINTS_LISTOFWAYPOINTS;
_currentIndex = lbCurSel _wpListBox; _currentIndex = lbCurSel _wpListBox;
lbClear _wpListBox; lbClear _wpListBox;
{ {
EXPLODE_2_PVT(_x,_wpName,_wpPos); EXPLODE_2_PVT(_x,_wpName,_wpPos);
@ -164,4 +173,23 @@ case (APP_MODE_WAYPOINTS): {
_currentIndex = (_currentIndex max 0) min (count _waypoints); _currentIndex = (_currentIndex max 0) min (count _waypoints);
_wpListBox lbSetCurSel _currentIndex; _wpListBox lbSetCurSel _currentIndex;
}; };
case (APP_MODE_SETUP): {
_settingListBox = _display displayCtrl IDC_MODESETTINGS;
lbClear _settingListBox;
_settingListBox lbAdd (localize "STR_ACE_microdagr_settingUseMils");
if (GVAR(settingUseMils)) then {
_settingListBox lbSetTextRight [0, (localize "STR_ACE_microdagr_settingMils")];
} else {
_settingListBox lbSetTextRight [0, (localize "STR_ACE_microdagr_settingDegrees")];
};
_settingListBox lbAdd (localize "STR_ACE_microdagr_settingShowWP");
if (GVAR(settingShowAllWaypointsOnMap)) then {
_settingListBox lbSetTextRight [1, (localize "STR_ACE_microdagr_settingOn")];
} else {
_settingListBox lbSetTextRight [1, (localize "STR_ACE_microdagr_settingOff")];
};
};
}; };

View File

@ -22,7 +22,6 @@ class RscListBox;
class GVAR(RscActiveTextPicture): RscActiveText { class GVAR(RscActiveTextPicture): RscActiveText {
style = 48; style = 48;
onbuttonclick = "hint 'cen'";
colorText[] = {1,1,1,1}; colorText[] = {1,1,1,1};
colorActive[] = {1,1,1,1}; colorActive[] = {1,1,1,1};
color[] = {1,1,1,1}; color[] = {1,1,1,1};

View File

@ -27,7 +27,7 @@ class controlsBackground {
class ClockText: GVAR(RscText) { class ClockText: GVAR(RscText) {
idc = IDC_CLOCKTEXT; idc = IDC_CLOCKTEXT;
style = ST_RIGHT; style = ST_RIGHT;
text = "12:00"; // text = "12:00";
x = X_PART(0); x = X_PART(0);
y = Y_PART(0.2); y = Y_PART(0.2);
w = W_PART(15); w = W_PART(15);
@ -149,7 +149,6 @@ class controls {
onbuttonclick = QUOTE([3] call FUNC(saveCurrentAndSetNewMode)); onbuttonclick = QUOTE([3] call FUNC(saveCurrentAndSetNewMode));
}; };
//Mode: Display //Mode: Display
class ModeDisplay: RscControlsGroupNoScrollbars { class ModeDisplay: RscControlsGroupNoScrollbars {
idc = IDC_MODEDISPLAY; idc = IDC_MODEDISPLAY;
@ -160,7 +159,7 @@ class controls {
class Controls { class Controls {
class MGRSNew: GVAR(RscText) { class MGRSNew: GVAR(RscText) {
idc = -1; idc = -1;
text = "MGRS-New"; //--- ToDo: Localize; text = "$STR_ACE_microdagr_controlMGRS";
x = W_PART(0.5); x = W_PART(0.5);
y = H_PART(0); y = H_PART(0);
w = W_PART(10); w = W_PART(10);
@ -170,7 +169,7 @@ class controls {
class WGD: GVAR(RscText) { class WGD: GVAR(RscText) {
idc = -1; idc = -1;
style = ST_RIGHT; style = ST_RIGHT;
text = "WGD"; //--- ToDo: Localize; text = "$STR_ACE_microdagr_controlWGD";
x = W_PART(14.5); x = W_PART(14.5);
y = H_PART(0); y = H_PART(0);
w = W_PART(10); w = W_PART(10);
@ -179,7 +178,7 @@ class controls {
}; };
class UTMGrid: GVAR(RscText) { class UTMGrid: GVAR(RscText) {
idc = IDC_MODEDISPLAY_UTMGRID; idc = IDC_MODEDISPLAY_UTMGRID;
text = "15T XG"; // text = "15T XG";
x = W_PART(4.5); x = W_PART(4.5);
y = H_PART(1.5); y = H_PART(1.5);
w = W_PART(10); w = W_PART(10);
@ -196,7 +195,7 @@ class controls {
}; };
class Easting: GVAR(RscText) { class Easting: GVAR(RscText) {
idc = IDC_MODEDISPLAY_EASTING; idc = IDC_MODEDISPLAY_EASTING;
text = "11994e"; //--- ToDo: Localize; // text = "11994e"; //--- ToDo: Localize;
style = ST_RIGHT; style = ST_RIGHT;
x = W_PART(14.5); x = W_PART(14.5);
y = H_PART(1.5); y = H_PART(1.5);
@ -206,7 +205,7 @@ class controls {
}; };
class Northing: GVAR(RscText) { class Northing: GVAR(RscText) {
idc = IDC_MODEDISPLAY_NORTHING; idc = IDC_MODEDISPLAY_NORTHING;
text = "11994n"; //--- ToDo: Localize; // text = "11994n"; //--- ToDo: Localize;
style = ST_RIGHT; style = ST_RIGHT;
x = W_PART(14.5); x = W_PART(14.5);
y = H_PART(3.5); y = H_PART(3.5);
@ -216,7 +215,7 @@ class controls {
}; };
class ElevationText: GVAR(RscText) { class ElevationText: GVAR(RscText) {
idc = -1; idc = -1;
text = "Elevation:"; //--- ToDo: Localize; text = "$STR_A3_disp_editor_elevation";
x = W_PART(0.5); x = W_PART(0.5);
y = H_PART(6); y = H_PART(6);
w = W_PART(10); w = W_PART(10);
@ -225,7 +224,7 @@ class controls {
}; };
class ElevationNum: GVAR(RscText) { class ElevationNum: GVAR(RscText) {
idc = IDC_MODEDISPLAY_ELEVATIONNUM; idc = IDC_MODEDISPLAY_ELEVATIONNUM;
text = "+000232 MSL"; //--- ToDo: Localize; // text = "+000232 MSL"; //--- ToDo: Localize;
style = ST_RIGHT; style = ST_RIGHT;
x = W_PART(12); x = W_PART(12);
y = H_PART(6); y = H_PART(6);
@ -251,7 +250,7 @@ class controls {
}; };
class HeadingNum: GVAR(RscText) { class HeadingNum: GVAR(RscText) {
idc = IDC_MODEDISPLAY_HEADINGNUM; idc = IDC_MODEDISPLAY_HEADINGNUM;
text = "097.2oM"; //--- ToDo: Localize; // text = "097.2oM"; //--- ToDo: Localize;
x = W_PART(4); x = W_PART(4);
y = H_PART(8.5); y = H_PART(8.5);
w = W_PART(10); w = W_PART(10);
@ -260,7 +259,7 @@ class controls {
}; };
class SpeedNum: GVAR(RscText) { class SpeedNum: GVAR(RscText) {
idc = IDC_MODEDISPLAY_SPEEDNUM; idc = IDC_MODEDISPLAY_SPEEDNUM;
text = "34kph"; //--- ToDo: Localize; // text = "34kph"; //--- ToDo: Localize;
style = ST_RIGHT; style = ST_RIGHT;
x = W_PART(14.5); x = W_PART(14.5);
y = H_PART(8.5); y = H_PART(8.5);
@ -324,7 +323,7 @@ class controls {
}; };
class TrackNum: GVAR(RscText) { class TrackNum: GVAR(RscText) {
idc = IDC_MODEDISPLAY_TRACKNUM; idc = IDC_MODEDISPLAY_TRACKNUM;
text = "097.2oM"; //--- ToDo: Localize; // text = "097.2oM"; //--- ToDo: Localize;
x = W_PART(4); x = W_PART(4);
y = H_PART(0.5); y = H_PART(0.5);
w = W_PART(10); w = W_PART(10);
@ -333,7 +332,7 @@ class controls {
}; };
class TargetRangeText: GVAR(RscText) { class TargetRangeText: GVAR(RscText) {
idc = -1; idc = -1;
text = "Range: "; //--- ToDo: Localize; text = "$STR_ACE_microdagr_controlRange";
x = W_PART(0.5); x = W_PART(0.5);
y = H_PART(2); y = H_PART(2);
w = W_PART(7.5); w = W_PART(7.5);
@ -342,7 +341,7 @@ class controls {
}; };
class TargetRangeNum: GVAR(RscText) { class TargetRangeNum: GVAR(RscText) {
idc = IDC_MODEDISPLAY_TARGETRANGENUM; idc = IDC_MODEDISPLAY_TARGETRANGENUM;
text = "1250 m"; // text = "1250 m";
style = ST_RIGHT; style = ST_RIGHT;
x = W_PART(14.5); x = W_PART(14.5);
y = H_PART(2); y = H_PART(2);
@ -352,7 +351,7 @@ class controls {
}; };
class TargetElevationText: GVAR(RscText) { class TargetElevationText: GVAR(RscText) {
idc = -1; idc = -1;
text = "Elevation:"; //--- ToDo: Localize; text = "$STR_A3_disp_editor_elevation"; //--- ToDo: Localize;
x = W_PART(0.5); x = W_PART(0.5);
y = H_PART(3.5); y = H_PART(3.5);
w = W_PART(10); w = W_PART(10);
@ -361,7 +360,7 @@ class controls {
}; };
class TargetElevationNum: GVAR(RscText) { class TargetElevationNum: GVAR(RscText) {
idc = IDC_MODEDISPLAY_TARGETELEVATIONNUM; idc = IDC_MODEDISPLAY_TARGETELEVATIONNUM;
text = "+000232 MSL"; //--- ToDo: Localize; // text = "+000232 MSL"; //--- ToDo: Localize;
style = ST_RIGHT; style = ST_RIGHT;
x = W_PART(12); x = W_PART(12);
y = H_PART(3.5); y = H_PART(3.5);
@ -371,7 +370,7 @@ class controls {
}; };
class TargetName: GVAR(RscText) { class TargetName: GVAR(RscText) {
idc = IDC_MODEDISPLAY_TARGETNAME; idc = IDC_MODEDISPLAY_TARGETNAME;
text = "43243 33432"; //--- ToDo: Localize; // text = "43243 33432"; //--- ToDo: Localize;
style = ST_CENTER; style = ST_CENTER;
x = W_PART(1); x = W_PART(1);
y = H_PART(5.5); y = H_PART(5.5);
@ -396,7 +395,7 @@ class controls {
class CompassHeader: GVAR(RscText) { class CompassHeader: GVAR(RscText) {
idc = -1; idc = -1;
style = ST_CENTER; style = ST_CENTER;
text = "Compass Direction"; text = "$STR_ACE_microdagr_compasDirection";
x = W_PART(0); x = W_PART(0);
y = H_PART(0); y = H_PART(0);
w = W_PART(25); w = W_PART(25);
@ -471,14 +470,6 @@ class controls {
w = W_PART(25); w = W_PART(25);
h = H_PART(19); h = H_PART(19);
class Controls { class Controls {
// class MenuBackground: RscPicture {
// idc = -1;
// text = "#(argb,8,8,3)color(0,0,0,1)";
// x = W_PART(0.1);
// y = H_PART(0);
// w = W_PART(24.8);
// h = H_PART(25);
// };
class ButtonTL: GVAR(RscActiveTextPicture) { class ButtonTL: GVAR(RscActiveTextPicture) {
idc = -1; idc = -1;
text = QUOTE(PATHTOF(images\icon_menuMark.paa)); text = QUOTE(PATHTOF(images\icon_menuMark.paa));
@ -509,7 +500,7 @@ class controls {
class TextTL: GVAR(RscText) { class TextTL: GVAR(RscText) {
idc = -1; idc = -1;
style = ST_CENTER; style = ST_CENTER;
text = "Mark"; //--- ToDo: Localize; text = "$STR_ACE_microdagr_menuMark";
x = W_PART(0); x = W_PART(0);
y = H_PART(7.5); y = H_PART(7.5);
w = W_PART(14); w = W_PART(14);
@ -517,16 +508,17 @@ class controls {
sizeEx = H_PART(1.2); sizeEx = H_PART(1.2);
}; };
class TextTR: TextTL { class TextTR: TextTL {
text = "Waypoints"; //--- ToDo: Localize; text = "$STR_ACE_microdagr_menuWaypoints";
x = W_PART(11); x = W_PART(11);
y = H_PART(7.5); y = H_PART(7.5);
}; };
class TextBL: TextTL { class TextBL: TextTL {
text = "Connect To"; //--- ToDo: Localize; text = "$STR_ACE_microdagr_menuConnectTo";
x = W_PART(0); x = W_PART(0);
y = H_PART(16.5); y = H_PART(16.5);
}; class TextBR: TextTL { };
text = "Settings"; //--- ToDo: Localize; class TextBR: TextTL {
text = "$STR_ACE_microdagr_menuSettings";
x = W_PART(11); x = W_PART(11);
y = H_PART(16.5); y = H_PART(16.5);
}; };
@ -592,7 +584,7 @@ class controls {
onbuttonclick = QUOTE(['2'] call FUNC(appMarkKeypadEntry)); onbuttonclick = QUOTE(['2'] call FUNC(appMarkKeypadEntry));
}; };
class Keypad3: Keypad1 { class Keypad3: Keypad1 {
text = "2"; text = "3";
x = W_PART(16); x = W_PART(16);
onbuttonclick = QUOTE(['3'] call FUNC(appMarkKeypadEntry)); onbuttonclick = QUOTE(['3'] call FUNC(appMarkKeypadEntry));
}; };
@ -657,19 +649,23 @@ class controls {
sizeEx = H_PART(1.5); sizeEx = H_PART(1.5);
sizeEx2 = H_PART(1.5); sizeEx2 = H_PART(1.5);
rowHeight = H_PART(1.75); rowHeight = H_PART(1.75);
colorText[] = {1,1,1,1}; colorText[] = {0.75,0.75,0.75,1};
colorBackground[] = {0.05,0.05,0.05,1}; colorSelect[] = {0.75,0.75,0.75,1};
itemBackground[] = {1,1,1,0.2}; colorSelect2[] = {0.75,0.75,0.75,1};
colorBackground[] = {0,0,0,1};
colorSelectBackground[] = {0.3,0.3,0.3,1};
colorSelectBackground2[] = {0.3,0.3,0.3,1};
itemSpacing = 0.001; itemSpacing = 0.001;
x = W_PART(0.5); x = W_PART(0.2);
y = H_PART(0.5); y = H_PART(0.5);
w = W_PART(24); w = W_PART(24.6);
h = H_PART(16.5); h = H_PART(16.5);
}; };
class ButtonSetWP: RscButton { class ButtonSetWP: RscButton {
idc = -1; idc = -1;
text = "SetWP"; text = "$STR_ACE_microdagr_waypointsSet";
x = W_PART(1); x = W_PART(1);
y = H_PART(17); y = H_PART(17);
w = W_PART(7); w = W_PART(7);
@ -684,18 +680,37 @@ class controls {
onbuttonclick = QUOTE(_this call FUNC(appWaypointsButtonSetWP)); onbuttonclick = QUOTE(_this call FUNC(appWaypointsButtonSetWP));
}; };
class ButtonAdd: ButtonSetWP { class ButtonAdd: ButtonSetWP {
text = "Add"; text = "$STR_ACE_microdagr_waypointsAdd";
x = W_PART(9); x = W_PART(9);
onbuttonclick = QUOTE([APP_MODE_MARK] call FUNC(saveCurrentAndSetNewMode)); onbuttonclick = QUOTE([APP_MODE_MARK] call FUNC(saveCurrentAndSetNewMode));
}; };
class ButtonDelete: ButtonSetWP { class ButtonDelete: ButtonSetWP {
text = "Delete"; text = "$STR_ACE_microdagr_waypointsDelete";
x = W_PART(17); x = W_PART(17);
onbuttonclick = QUOTE(_this call FUNC(appWaypointsButtonDeleteWP)); onbuttonclick = QUOTE(_this call FUNC(appWaypointsButtonDeleteWP));
}; };
}; };
}; };
class SettingsMenu: RscListBox {
idc = IDC_MODESETTINGS;
x = X_PART(0.2);
y = Y_PART(2);
w = W_PART(24.6);
h = H_PART(19);
onLBDblClick = QUOTE(_this call FUNC(appSettingsLBClick));
sizeEx = H_PART(1.5);
sizeEx2 = H_PART(1.5);
rowHeight = H_PART(1.75);
itemSpacing = 0.001;
colorText[] = {0.75,0.75,0.75,1};
colorSelect[] = {0.75,0.75,0.75,1};
colorSelect2[] = {0.75,0.75,0.75,1};
colorBackground[] = {0.05,0.05,0.05,1};
colorSelectBackground[] = {0.05,0.05,0.05,1};
colorSelectBackground2[] = {0.05,0.05,0.05,1};
};
class ButtonBG0: RscPicture { class ButtonBG0: RscPicture {
idc = IDC_BUTTONBG0; idc = IDC_BUTTONBG0;
text = QUOTE(PATHTOF(images\button_pushedDown.paa)); text = QUOTE(PATHTOF(images\button_pushedDown.paa));

View File

@ -75,6 +75,8 @@
#define IDC_MODEWAYPOINTS 144500 #define IDC_MODEWAYPOINTS 144500
#define IDC_MODEWAYPOINTS_LISTOFWAYPOINTS 144501 #define IDC_MODEWAYPOINTS_LISTOFWAYPOINTS 144501
#define IDC_MODESETTINGS 144600
#define IDC_BUTTONBG0 77710 #define IDC_BUTTONBG0 77710
#define IDC_BUTTONBG1 77711 #define IDC_BUTTONBG1 77711
#define IDC_BUTTONBG2 77712 #define IDC_BUTTONBG2 77712

View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- Edited with tabler - 2015-03-09 --> <!-- Edited with tabler - 2015-03-10 -->
<Project name="ACE"> <Project name="ACE">
<Package name="microdagr"> <Package name="microdagr">
<Key ID="STR_ACE_microdagr_itemName"> <Key ID="STR_ACE_microdagr_itemName">
@ -8,5 +8,96 @@
<Key ID="STR_ACE_microdagr_itemDescription"> <Key ID="STR_ACE_microdagr_itemDescription">
<English>MicroDAGR advanced GPS receiver</English> <English>MicroDAGR advanced GPS receiver</English>
</Key> </Key>
<Key ID="STR_ACE_microdagr_settingUseMils">
<English>Angular Unit:</English>
</Key>
<Key ID="STR_ACE_microdagr_settingMils">
<English>Mils</English>
</Key>
<Key ID="STR_ACE_microdagr_settingShowWP">
<English>Show Waypoints On Map:</English>
</Key>
<Key ID="STR_ACE_microdagr_settingDegrees">
<English>Degrees</English>
</Key>
<Key ID="STR_ACE_microdagr_settingOn">
<English>On</English>
<Czech>Zapnuto</Czech>
<French>Oui</French>
<German>Ein</German>
<Italian></Italian>
<Polish>Wł.</Polish>
<Portuguese>Ativar</Portuguese>
<Russian>Вкл.</Russian>
<Spanish></Spanish>
</Key>
<Key ID="STR_ACE_microdagr_settingOff">
<English>Off</English>
<Czech>Vypnuto</Czech>
<French>Non</French>
<German>Aus</German>
<Italian>No</Italian>
<Polish>Wył.</Polish>
<Portuguese>Desativar</Portuguese>
<Russian>Выкл.</Russian>
<Spanish>No</Spanish>
</Key>
<Key ID="STR_ACE_microdagr_openUnit">
<English>Open MicroDAGR</English>
</Key>
<Key ID="STR_ACE_microdagr_closeUnit">
<English>Close MicroDAGR</English>
</Key>
<Key ID="STR_ACE_microdagr_wpEnterCords">
<English>Enter Grid Cords:</English>
</Key>
<Key ID="STR_ACE_microdagr_wpEnterName">
<English>Name of [%1]</English>
</Key>
<Key ID="STR_ACE_microdagr_controlMGRS">
<English>MGRS-New</English>
</Key>
<Key ID="STR_ACE_microdagr_controlWGD">
<English>WGD</English>
</Key>
<Key ID="STR_ACE_microdagr_controlRange">
<English>Range:</English>
<German>Reichweite:</German>
</Key>
<Key ID="STR_ACE_microdagr_compasDirection">
<English>Compass Direction</English>
</Key>
<Key ID="STR_ACE_microdagr_menuMark">
<English>Mark</English>
</Key>
<Key ID="STR_ACE_microdagr_menuWaypoints">
<English>Waypoints</English>
<German>Wegpunkte</German>
</Key>
<Key ID="STR_ACE_microdagr_menuConnectTo">
<English>Connect To</English>
</Key>
<Key ID="STR_ACE_microdagr_menuSettings">
<English>Settings</English>
<German>Einstellungen</German>
<Spanish>Configuración</Spanish>
</Key>
<Key ID="STR_ACE_microdagr_waypointsSet">
<English>SetWP</English>
</Key>
<Key ID="STR_ACE_microdagr_waypointsAdd">
<English>Add</English>
</Key>
<Key ID="STR_ACE_microdagr_waypointsDelete">
<English>Delete</English>
<Czech>Smazat</Czech>
<French>Supprimer</French>
<German>Löschen</German>
<Italian>Elimina</Italian>
<Polish>Usuń</Polish>
<Portuguese>Excluir</Portuguese>
<Russian>Удалить</Russian>
<Spanish>Suprimir</Spanish>
</Key>
</Package> </Package>
</Project> </Project>