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

Add more translations, change how shared button text is managed

Browse Source
This commit is contained in:
Josuan Albin 2017-11-07 15:52:10 +01:00
parent e511f6ce26
commit ec2fd926a7
7 changed files with 44 additions and 24 deletions

6
addons/arsenal/functions/fnc_buttonExport.sqf
View File

@ -17,7 +17,7 @@ params ["_display"];
if (GVAR(shiftState)) then {
if (isNil QGVAR(defaultLoadoutsList) || {GVAR(defaultLoadoutsList) isEqualTo []}) exitWIth {
[_display, "Default loadouts list is empty"] call FUNC(message); //TBL
[_display, "Default loadouts list is empty"] call FUNC(message); // TBL
};
private _listLength = count GVAR(defaultLoadoutsList);
@ -40,12 +40,12 @@ if (GVAR(shiftState)) then {
"ace_clipboard" callExtension "--COMPLETE--";
[_display, "Default loadouts list exported to clipboard"] call FUNC(message); //TBL
[_display, "Default loadouts list exported to clipboard"] call FUNC(message); // TBL
} else {
private _export = str getUnitLoadout GVAR(center);
"ace_clipboard" callExtension (_export + ";");
"ace_clipboard" callExtension "--COMPLETE--";
[_display, "Current loadout exported to clipboard"] call FUNC(message); //TBL
[_display, "Current loadout exported to clipboard"] call FUNC(message); // TBL
};

8
addons/arsenal/functions/fnc_buttonLoadoutsShare.sqf
View File

@ -32,6 +32,7 @@ if (_loadoutIndex > -1) then {
GVAR(sharedLoadoutsVars) = GVAR(sharedLoadoutsVars) - [_loadoutVar];
_contentPanelCtrl lnbSetPicture [[_contentPanelCursSel, 0], QPATHTOF(data\iconPublicBlank.paa)];
_contentPanelCtrl lnbSetValue [[_contentPanelCursSel, 0], 0];
[QGVAR(loadoutUnshared), [_contentPanelCtrl, profileName, _loadoutName]] call CBA_fnc_remoteEvent;
} else {
@ -39,8 +40,13 @@ if (_loadoutIndex > -1) then {
GVAR(sharedLoadoutsVars) pushBackUnique _loadoutVar;
_contentPanelCtrl lnbSetPicture [[_contentPanelCursSel, 0], QPATHTOF(data\iconPublic.paa)];
_contentPanelCtrl lnbSetValue [[_contentPanelCursSel, 0], 1];
[QGVAR(loadoutShared), [_contentPanelCtrl, [_profileName ,_loadoutName , _loadoutData]]] call CBA_fnc_remoteEvent;
};
_control ctrlSetText (["Share", "Unshare"] select ((_contentPanelCtrl lnbText [_contentPanelCursSel, 0]) != "")); // TBL
_control ctrlSetText ( [
localize LSTRING(buttonSharePrivateText),
localize LSTRING(buttonSharePublicText)
] select ((_contentPanelCtrl lnbValue [_contentPanelCursSel, 0]) == 1));
publicVariable QGVAR(sharedLoadoutsVars);

1
addons/arsenal/functions/fnc_fillLoadoutsList.sqf
View File

@ -81,6 +81,7 @@ if (GVAR(currentLoadoutsTab) != IDC_buttonSharedLoadouts) then {
if ((profileName + _loadoutName) in GVAR(sharedLoadoutsVars) && {GVAR(currentLoadoutsTab) == IDC_buttonMyLoadouts}) then {
_contentListCtrl lnbSetPicture [[_newRow, 0], QPATHTOF(data\iconPublic.paa)];
_contentListCtrl lnbSetValue [[_newRow, 0], 1];
};
} foreach ([_data, +GVAR(defaultLoadoutsList)] select (ctrlIDC _control == IDC_buttonDefaultLoadouts));
} else {

6
addons/arsenal/functions/fnc_loadoutsChangeTab.sqf
View File

@ -46,21 +46,21 @@ _control ctrlCommit 0;
switch (ctrlIDC _control) do {
case IDC_buttonMyLoadouts: {
_centerBoxTitleCtrl ctrlSetText "My loadouts"; // TBL
_centerBoxTitleCtrl ctrlSetText (localize LSTRING(tabMyLoadoutsText));
_saveButtonCtrl ctrlEnable true;
_saveButtonCtrl ctrlCommit 0;
};
case IDC_buttonDefaultLoadouts: {
_centerBoxTitleCtrl ctrlSetText "Default loadouts"; // TBL
_centerBoxTitleCtrl ctrlSetText (localize LSTRING(tabDefaultLoadoutsText));
_saveButtonCtrl ctrlEnable (is3DEN);
_saveButtonCtrl ctrlCommit 0;
};
case IDC_buttonSharedLoadouts: {
_centerBoxTitleCtrl ctrlSetText "Shared loadouts"; // TBL
_centerBoxTitleCtrl ctrlSetText (localize LSTRING(tabSharedLoadoutsText));
_saveButtonCtrl ctrlEnable false;
_saveButtonCtrl ctrlCommit 0;

7
addons/arsenal/functions/fnc_onSelChangedLoadouts.sqf
View File

@ -30,7 +30,7 @@ if (_curSel == -1) exitWith {
_saveButtonCtrl ctrlCommit 0;
};
_shareButtonCtrl ctrlSetText "Share"; // TBL
_shareButtonCtrl ctrlSetText (localize LSTRING(buttonSharePrivateText));
{
_x ctrlEnable false;
@ -48,7 +48,10 @@ switch (GVAR(currentLoadoutsTab)) do {
_loadButtonCtrl ctrlEnable true;
_loadButtonCtrl ctrlCommit 0;
_shareButtonCtrl ctrlSetText (["Share", "Unshare"] select ((_control lnbText [_curSel, 0]) != "")); // TBL
_shareButtonCtrl ctrlSetText ( [
localize LSTRING(buttonSharePrivateText),
localize LSTRING(buttonSharePublicText)
] select ((_control lnbValue [_curSel, 0]) == 1));
{
_x ctrlEnable true;

38
addons/arsenal/stringtable.xml
View File

@ -1,11 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project name="ACE">
<Package name="Arsenal">
<Key ID="STR_ACE_Arsenal_CantOpenDisplay">
<English>Unable to open ACE arsenal</English>
<French>Impossible d'afficher l'interface</French>
<German>Kann ACE Arsenal nicht anzeigen</German>
</Key>
<Key ID="STR_ACE_Arsenal_buttonHideText">
<English>Hide</English>
<French>Cacher</French>
@ -18,7 +13,7 @@
</Key>
<Key ID="STR_ACE_Arsenal_buttonLoadoutsText">
<English>Loadouts</English>
<French>Loadouts</French>
<French>Équipements</French>
<German>Ausrüstungen</German>
</Key>
<Key ID="STR_ACE_Arsenal_buttonExportText">
@ -59,6 +54,7 @@
<Key ID="STR_ACE_Arsenal_buttonRenameTooltip">
<English>Rename the selected loadout</English>
<German>Ausgewählte Ausrüstung umbenennen</German>
<French>Renomme l'équipement sélectionné</French>
</Key>
<Key ID="STR_ACE_Arsenal_buttonLoadText">
<English>Load</English>
@ -68,6 +64,7 @@
<Key ID="STR_ACE_Arsenal_buttonLoadTooltip">
<English>Load the selected loadout</English>
<German>Ausgewählte Ausrüstung laden</German>
<French>Charger l'équipement sélectionné</French>
</Key>
<Key ID="STR_ACE_Arsenal_buttonDeleteText">
<English>Delete</English>
@ -77,26 +74,37 @@
<Key ID="STR_ACE_Arsenal_buttonDeleteTooltip">
<English>Delete the selected loadout</English>
<German>Ausgewählte Ausrüstung entfernen</German>
<French>Supprimer l'équipement sélectionné</French>
</Key>
<Key ID="STR_ACE_Arsenal_tabMyLoadoutsText">
<English>My loadouts</English>
<German>Meine Ausrüstungen</German>
<French>Mes équipements</French>
</Key>
<Key ID="STR_ACE_Arsenal_tabMyLoadoutsTooltip">
<English>Loadouts saved in your profile</English>
<German>Ausrüstungen, die in deinem Profil gespeichert sind</German>
<French>Équipements enregistrés dans votre profil</French>
</Key>
<Key ID="STR_ACE_Arsenal_tabDefaultLoadoutsText">
<English>Default loadouts</English>
<German>Standard-Ausrüstungen</German>
<French>Équipements de base</French>
</Key>
<Key ID="STR_ACE_Arsenal_tabDefaultLoadoutsTooltip">
<English>Loadouts made available by the mission maker</English>
<German>Ausrüstungen, die durch den Missionsersteller zur Verfügung gestellt worden sind</German>
<French>Équipements faits par l'auteur de la mission</French>
</Key>
<Key ID="STR_ACE_Arsenal_tabSharedLoadoutsText">
<English>Public loadouts</English>
<German>Veröffentlichte Ausrüstungen</German>
<French>Équipements publics</French>
</Key>
<Key ID="STR_ACE_Arsenal_tabSharedLoadoutsTooltip">
<English>Loadouts shared by you and other players</English>
<German>Ausrüstungen, die von dir und anderen Spielern geteilt wurden</German>
<French>Équipements mis à disposition par vous ou les autres joueurs</French>
</Key>
<Key ID="STR_ACE_Arsenal_sortByWeightText">
<English>Sort by weight</English>
@ -108,17 +116,19 @@
<French>Trier par quantité</French>
<German>Nach Menge sortieren</German>
</Key>
<Key ID="STR_ACE_Arsenal_buttonShareText">
<English>Private</English>
<German>Privat</German>
</Key>
<Key ID="STR_ACE_Arsenal_buttonShareTooltip">
<English>Share or stop sharing the selected loadout</English>
<German>Ausgewählte Ausrüstung teilen oder nicht mehr teilen</German>
<French>Partager ou arrêter de partager cet équipement</French>
</Key>
<Key ID="STR_ACE_Arsenal_tabSharedLoadoutsText">
<English>Public loadouts</English>
<German>Veröffentlichte Ausrüstungen</German>
<Key ID="STR_ACE_Arsenal_buttonSharePrivateText">
<English>Private</English>
<French>Privé</French>
<German>Privat</German>
</Key>
<Key ID="STR_ACE_Arsenal_buttonSharePublicText">
<English>Public</English>
<French>Public</French>
</Key>
</Package>
</Project>
</Project>

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

@ -807,7 +807,7 @@ class GVAR(loadoutsDisplay) {
class buttonShare: buttonSave {
idc = IDC_buttonShare;
x = QUOTE((safezoneW * 0.5) + safezoneX + (15 * GRID_W));
text= CSTRING(buttonShareText);
text= CSTRING(buttonSharePrivateText);
tooltip= CSTRING(buttonShareTooltip);
onButtonClick = QUOTE([ARR_2(ctrlparent (_this select 0), _this select 0)] call FUNC(buttonLoadoutsShare));
};