Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Align buttons perfectly for loadouts display, translation for delete action

Browse Source
This commit is contained in:
Josuan Albin 2017-11-07 17:52:12 +01:00
parent a6feb2d31b
commit fa1ed2307e
3 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/arsenal/functions/fnc_buttonLoadoutsDelete.sqf
View File

@ -36,7 +36,7 @@ if (GVAR(currentLoadoutsTab) != IDC_buttonSharedLoadouts) then {
_contentPanelCtrl lnbDeleteRow _contentPanelCursSel; _contentPanelCtrl lnbDeleteRow _contentPanelCursSel;
_contentPanelCtrl lnbSetCurSelRow (_contentPanelCursSel); _contentPanelCtrl lnbSetCurSelRow (_contentPanelCursSel);
[(findDisplay IDD_ace_arsenal), format ["Loadout '%1' was deleted", _loadoutName]] call FUNC(message); // TBL [(findDisplay IDD_ace_arsenal), [localize LSTRING(loadoutDeleted), _loadoutName] joinString " "] call FUNC(message);
} else { } else {
private _profileName = profileName; // GVAR(center) could be a remote unit private _profileName = profileName; // GVAR(center) could be a remote unit
@ -52,5 +52,5 @@ if (GVAR(currentLoadoutsTab) != IDC_buttonSharedLoadouts) then {
[QGVAR(loadoutUnshared), [_contentPanelCtrl, profileName, _loadoutName]] call CBA_fnc_remoteEvent; [QGVAR(loadoutUnshared), [_contentPanelCtrl, profileName, _loadoutName]] call CBA_fnc_remoteEvent;
[(findDisplay IDD_ace_arsenal), format ["Loadout '%1' was unshared", _loadoutName]] call FUNC(message); // TBL [(findDisplay IDD_ace_arsenal), [localize LSTRING(loadoutUnshared), _loadoutName] joinString " "] call FUNC(message);
}; };

8
addons/arsenal/stringtable.xml
View File

@ -154,5 +154,13 @@
<English>Loadout imported from clipboard</English> <English>Loadout imported from clipboard</English>
<French>Équipement importé depuis le presse papier</French> <French>Équipement importé depuis le presse papier</French>
</Key> </Key>
<Key ID="STR_ACE_Arsenal_loadoutDeleted">
<English>The following loadout was deleted:</English>
<French>L'équipement suivant fut supprimé:</French>
</Key>
<Key ID="STR_ACE_Arsenal_loadoutUnshared">
<English>The following loadout is not public anymore:</English>
<French>L'équipement suivant n'est plus public:</French>
</Key>
</Package> </Package>
</Project> </Project>

22
addons/arsenal/ui/RscAttributes.hpp
View File

@ -781,9 +781,9 @@ class GVAR(loadoutsDisplay) {
}; };
class buttonSave: ctrlButton { class buttonSave: ctrlButton {
idc = IDC_buttonSave; idc = IDC_buttonSave;
x = QUOTE((safezoneW * 0.5) + safezoneX - (75 * GRID_W)); x = QUOTE((safezoneW * 0.5) + safezoneX - (80 * GRID_W));
y = QUOTE(safezoneH + safezoneY - 39 * GRID_H); y = QUOTE(safezoneH + safezoneY - 39 * GRID_H);
w = QUOTE(25 * GRID_W); w = QUOTE(30 * GRID_W);
h = QUOTE(10 * GRID_H); h = QUOTE(10 * GRID_H);
text= CSTRING(buttonSaveText); text= CSTRING(buttonSaveText);
tooltip= CSTRING(buttonSaveTooltip); tooltip= CSTRING(buttonSaveTooltip);
@ -792,7 +792,7 @@ class GVAR(loadoutsDisplay) {
}; };
class buttonRename: buttonSave { class buttonRename: buttonSave {
idc = IDC_buttonRename; idc = IDC_buttonRename;
x = QUOTE((safezoneW * 0.5) + safezoneX - (45 * GRID_W)); x = QUOTE((safezoneW * 0.5) + safezoneX - (47.5 * GRID_W));
text= CSTRING(buttonRenameText); text= CSTRING(buttonRenameText);
tooltip= CSTRING(buttonRenameTooltip); tooltip= CSTRING(buttonRenameTooltip);
onButtonClick = QUOTE([ARR_2(ctrlparent (_this select 0), _this select 0)] call FUNC(buttonLoadoutsRename)); onButtonClick = QUOTE([ARR_2(ctrlparent (_this select 0), _this select 0)] call FUNC(buttonLoadoutsRename));
@ -806,14 +806,14 @@ class GVAR(loadoutsDisplay) {
}; };
class buttonShare: buttonSave { class buttonShare: buttonSave {
idc = IDC_buttonShare; idc = IDC_buttonShare;
x = QUOTE((safezoneW * 0.5) + safezoneX + (15 * GRID_W)); x = QUOTE((safezoneW * 0.5) + safezoneX + (17.5 * GRID_W));
text= CSTRING(buttonSharePrivateText); text= CSTRING(buttonSharePrivateText);
tooltip= CSTRING(buttonShareTooltip); tooltip= CSTRING(buttonShareTooltip);
onButtonClick = QUOTE([ARR_2(ctrlparent (_this select 0), _this select 0)] call FUNC(buttonLoadoutsShare)); onButtonClick = QUOTE([ARR_2(ctrlparent (_this select 0), _this select 0)] call FUNC(buttonLoadoutsShare));
}; };
class buttonDelete: buttonSave { class buttonDelete: buttonSave {
idc = IDC_buttonDelete; idc = IDC_buttonDelete;
x = QUOTE((safezoneW * 0.5) + safezoneX + (45 * GRID_W)); x = QUOTE((safezoneW * 0.5) + safezoneX + (50 * GRID_W));
text= CSTRING(buttonDeleteText); text= CSTRING(buttonDeleteText);
tooltip= CSTRING(buttonDeleteTooltip); tooltip= CSTRING(buttonDeleteTooltip);
onButtonClick = QUOTE([ARR_2(ctrlparent (_this select 0), _this select 0)] call FUNC(buttonLoadoutsDelete)); onButtonClick = QUOTE([ARR_2(ctrlparent (_this select 0), _this select 0)] call FUNC(buttonLoadoutsDelete));
@ -832,9 +832,9 @@ class GVAR(loadoutsDisplay) {
}; };
class buttonBar: ctrlControlsGroupNoScrollbars { class buttonBar: ctrlControlsGroupNoScrollbars {
idc = -1; idc = -1;
x = QUOTE((safezoneW * 0.5) + safezoneX - (61 * GRID_W)); x = QUOTE((safezoneW * 0.5) + safezoneX - (63 * GRID_W));
y = QUOTE(safezoneH + safezoneY - 12 * GRID_H); y = QUOTE(safezoneH + safezoneY - 12 * GRID_H);
w = QUOTE(122 * GRID_W); w = QUOTE(126 * GRID_W);
h = QUOTE(10 * GRID_H); h = QUOTE(10 * GRID_H);
class controls { class controls {
class buttonMyLoadoutsBackground: ctrlStaticBackground { class buttonMyLoadoutsBackground: ctrlStaticBackground {
@ -859,21 +859,21 @@ class GVAR(loadoutsDisplay) {
}; };
class buttonDefaultLoadoutsBackground: buttonMyLoadoutsBackground { class buttonDefaultLoadoutsBackground: buttonMyLoadoutsBackground {
idc = IDC_buttonDefaultLoadoutsBackground; idc = IDC_buttonDefaultLoadoutsBackground;
x = QUOTE(41 * GRID_W); x = QUOTE(42 * GRID_W);
}; };
class buttonDefaultLoadouts: buttonMyLoadouts { class buttonDefaultLoadouts: buttonMyLoadouts {
idc = IDC_buttonDefaultLoadouts; idc = IDC_buttonDefaultLoadouts;
x = QUOTE(41 * GRID_W); x = QUOTE(42 * GRID_W);
text= CSTRING(tabDefaultLoadoutsText); text= CSTRING(tabDefaultLoadoutsText);
tooltip= CSTRING(tabDefaultLoadoutsTooltip); tooltip= CSTRING(tabDefaultLoadoutsTooltip);
}; };
class buttonSharedLoadoutsBackground: buttonMyLoadoutsBackground { class buttonSharedLoadoutsBackground: buttonMyLoadoutsBackground {
idc = IDC_buttonSharedLoadoutsBackground; idc = IDC_buttonSharedLoadoutsBackground;
x = QUOTE(82 * GRID_W); x = QUOTE(84 * GRID_W);
}; };
class buttonSharedLoadouts: buttonMyLoadouts { class buttonSharedLoadouts: buttonMyLoadouts {
idc = IDC_buttonSharedLoadouts; idc = IDC_buttonSharedLoadouts;
x = QUOTE(82 * GRID_W); x = QUOTE(84 * GRID_W);
text= CSTRING(tabSharedLoadoutsText); text= CSTRING(tabSharedLoadoutsText);
tooltip= CSTRING(tabSharedLoadoutsTooltip); tooltip= CSTRING(tabSharedLoadoutsTooltip);
}; };