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

Tabs to Spaces, Removed unused GUI class

Browse Source
This commit is contained in:
jonpas 2015-05-09 22:25:48 +02:00
parent 633e94a114
commit 1a2e7d0596
4 changed files with 716 additions and 723 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1084
addons/interaction/CfgVehicles.hpp
View File

File diff suppressed because it is too large Load Diff

324
addons/interaction/Menu_Config.hpp
View File

@ -1,46 +1,44 @@
#define HSPACE 0.5-2.0/16/2 #define HSPACE 0.5-2.0/16/2
#define VSPACE 0.5-0.3/9/2 #define VSPACE 0.5-0.3/9/2
class RscStructuredText;
class ACE_Interaction_Button_Base { class ACE_Interaction_Button_Base {
tooltip = ""; tooltip = "";
//action = "ACE_Interaction_isMousePressed = true;(findDisplay 1713999) closeDisplay 1;_action = ACE_Interaction_Buttons select ACE_Interaction_SelectedButton;ACE_Interaction_SelectedButton = -1; if (call (_action select 2)) then {call (_action select 1)};"; //action = "ACE_Interaction_isMousePressed = true;(findDisplay 1713999) closeDisplay 1;_action = ACE_Interaction_Buttons select ACE_Interaction_SelectedButton;ACE_Interaction_SelectedButton = -1; if (call (_action select 2)) then {call (_action select 1)};";
action = ""; action = "";
idc = -1; idc = -1;
access = 0; access = 0;
type = 1; type = 1;
text = ""; text = "";
font = "PuristaMedium"; font = "PuristaMedium";
sizeEx = "0.8 / 40 / (getResolution select 5)"; sizeEx = "0.8 / 40 / (getResolution select 5)";
shadow = 2; shadow = 2;
style = 2; style = 2;
x = 0; x = 0;
y = 0; y = 0;
w = 2.0 / 16 * safezoneW; w = 2.0 / 16 * safezoneW;
h = 0.3 / 9 * safezoneH; h = 0.3 / 9 * safezoneH;
offsetX = 0.003; offsetX = 0.003;
offsetY = 0.003; offsetY = 0.003;
offsetPressedX = 0.002; offsetPressedX = 0.002;
offsetPressedY = 0.002; offsetPressedY = 0.002;
borderSize = 0; borderSize = 0;
colorText[] = {1,1,1,1}; colorText[] = {1,1,1,1};
colorDisabled[] = {0.5,0.5,0.5,1}; colorDisabled[] = {0.5,0.5,0.5,1};
colorBackground[] = {0,0,0,0.8}; colorBackground[] = {0,0,0,0.8};
colorBackgroundDisabled[] = {0,0,0,0.8}; colorBackgroundDisabled[] = {0,0,0,0.8};
colorBackgroundActive[] = {1,1,1,0}; colorBackgroundActive[] = {1,1,1,0};
colorFocused[] = {1,1,1,1}; colorFocused[] = {1,1,1,1};
colorShadow[] = {0,0,0,0}; colorShadow[] = {0,0,0,0};
colorBorder[] = {1,1,1,0.8}; colorBorder[] = {1,1,1,0.8};
soundEnter[] = {"\A3\ui_f\data\sound\RscButton\soundEnter",0.09,1}; soundEnter[] = {"\A3\ui_f\data\sound\RscButton\soundEnter",0.09,1};
soundPush[] = {"\A3\ui_f\data\sound\RscButton\soundPush",0.09,1}; soundPush[] = {"\A3\ui_f\data\sound\RscButton\soundPush",0.09,1};
soundClick[] = {"\A3\ui_f\data\sound\RscButton\soundClick",0.09,1}; soundClick[] = {"\A3\ui_f\data\sound\RscButton\soundClick",0.09,1};
soundEscape[] = {"\A3\ui_f\data\sound\RscButton\soundEscape",0.09,1}; soundEscape[] = {"\A3\ui_f\data\sound\RscButton\soundEscape",0.09,1};
}; };
class RscListbox; class RscListbox;
@ -49,86 +47,86 @@ class RscText;
#define X_OFFSET 0.2 #define X_OFFSET 0.2
class RscACE_SelectAnItem { class RscACE_SelectAnItem {
idd = 8854; idd = 8854;
movingEnable = 0; movingEnable = 0;
class controls { class controls {
class back:IGUIBack { class back:IGUIBack {
x = X_OFFSET; x = X_OFFSET;
y = 0; y = 0;
w = 0.6; w = 0.6;
h = 0.71; h = 0.71;
colorBackground[] = {0, 0, 0, 0.2}; colorBackground[] = {0, 0, 0, 0.2};
}; };
class header: RscText{ class header: RscText{
idc = 8870; idc = 8870;
x = X_OFFSET + 0.005; x = X_OFFSET + 0.005;
y = 0.005; y = 0.005;
w = 0.59; w = 0.59;
h = 0.05; h = 0.05;
style = 0x02; style = 0x02;
text = ""; text = "";
}; };
class itemList:RscListBox { class itemList:RscListBox {
onMouseButtonDblClick = "_this call ACE_Interaction_fnc_onSelectMenuDblClick"; onMouseButtonDblClick = "_this call ACE_Interaction_fnc_onSelectMenuDblClick";
idc = 8866; idc = 8866;
x = X_OFFSET + 0.005; x = X_OFFSET + 0.005;
w = 0.59; w = 0.59;
h = 0.54; h = 0.54;
y = 0.06; y = 0.06;
}; };
class cancelBtnBackground: ACE_Interaction_Button_Base { class cancelBtnBackground: ACE_Interaction_Button_Base {
type = 0; type = 0;
style = 2; style = 2;
idc = -1; idc = -1;
colorBackground[] = {0,0,0,0.5}; colorBackground[] = {0,0,0,0.5};
colorBackgroundDisabled[] = {0,0,0,0.5}; colorBackgroundDisabled[] = {0,0,0,0.5};
x = X_OFFSET + 0.005; x = X_OFFSET + 0.005;
w = 0.15; w = 0.15;
h = 0.1; h = 0.1;
y = 0.605; y = 0.605;
}; };
class approveBtnBackground: ACE_Interaction_Button_Base { class approveBtnBackground: ACE_Interaction_Button_Base {
type = 0; type = 0;
style = 2; style = 2;
idc = -1; idc = -1;
colorBackground[] = {0,0,0,0.5}; colorBackground[] = {0,0,0,0.5};
colorBackgroundDisabled[] = {0,0,0,0.5}; colorBackgroundDisabled[] = {0,0,0,0.5};
x = X_OFFSET + 0.445; x = X_OFFSET + 0.445;
y = 0.605; y = 0.605;
h = 0.1; h = 0.1;
w = 0.15; w = 0.15;
}; };
class cancelBtn: ACE_Interaction_Button_Base { class cancelBtn: ACE_Interaction_Button_Base {
idc = 8855; idc = 8855;
x = X_OFFSET + 0.005; x = X_OFFSET + 0.005;
w = 0.15; w = 0.15;
h = 0.1; h = 0.1;
y = 0.605; y = 0.605;
style = 2; style = 2;
text = $STR_ACE_Interaction_Back; //$STR_ACE_Interaction_CancelSelection; text = $STR_ACE_Interaction_Back; //$STR_ACE_Interaction_CancelSelection;
action = "call ACE_Interaction_fnc_hideMenu;"; //'Default' call ACE_Interaction_fnc_openMenu; 'Default' call ACE_Interaction_fnc_openMenuSelf; action = "call ACE_Interaction_fnc_hideMenu;"; //'Default' call ACE_Interaction_fnc_openMenu; 'Default' call ACE_Interaction_fnc_openMenuSelf;
colorBackground[] = {0,0,0,0}; colorBackground[] = {0,0,0,0};
colorBackgroundDisabled[] = {0,0,0,0}; colorBackgroundDisabled[] = {0,0,0,0};
colorBackgroundActive[] = {1,1,1,0.2}; colorBackgroundActive[] = {1,1,1,0.2};
colorFocused[] = {0,0,0,0}; colorFocused[] = {0,0,0,0};
};
class approveBtn: ACE_Interaction_Button_Base {
idc = 8860;
x = X_OFFSET + 0.445;
y = 0.605;
h = 0.1;
w = 0.15;
style = 2;
text = $STR_ACE_Interaction_MakeSelection;
action = "call ACE_Interaction_fnc_hideMenu;";
colorBackground[] = {0,0,0,0};
colorBackgroundDisabled[] = {0,0,0,0};
colorBackgroundActive[] = {1,1,1,0.2};
colorFocused[] = {0,0,0,0};
};
}; };
class approveBtn: ACE_Interaction_Button_Base {
idc = 8860;
x = X_OFFSET + 0.445;
y = 0.605;
h = 0.1;
w = 0.15;
style = 2;
text = $STR_ACE_Interaction_MakeSelection;
action = "call ACE_Interaction_fnc_hideMenu;";
colorBackground[] = {0,0,0,0};
colorBackgroundDisabled[] = {0,0,0,0};
colorBackgroundActive[] = {1,1,1,0.2};
colorFocused[] = {0,0,0,0};
};
};
}; };
#define GUI_GRID_W (0.025) #define GUI_GRID_W (0.025)
@ -136,64 +134,64 @@ class RscACE_SelectAnItem {
class RscPicture; class RscPicture;
class RscInteractionIcon: RscPicture { class RscInteractionIcon: RscPicture {
x = 19.25 * GUI_GRID_W; x = 19.25 * GUI_GRID_W;
y = 15.75 * GUI_GRID_H; y = 15.75 * GUI_GRID_H;
w = 2*GUI_GRID_H; w = 2*GUI_GRID_H;
h = 2*GUI_GRID_H; h = 2*GUI_GRID_H;
}; };
class RscInteractionHelperIcon: RscInteractionIcon { class RscInteractionHelperIcon: RscInteractionIcon {
x = 20 * GUI_GRID_W; x = 20 * GUI_GRID_W;
y = 16 * GUI_GRID_H; y = 16 * GUI_GRID_H;
w = GUI_GRID_H; w = GUI_GRID_H;
h = GUI_GRID_H; h = GUI_GRID_H;
}; };
class RscInteractionText: RscText{ class RscInteractionText: RscText{
x = 21 * GUI_GRID_W; x = 21 * GUI_GRID_W;
y = 16 * GUI_GRID_H; y = 16 * GUI_GRID_H;
w = 8 * GUI_GRID_W; w = 8 * GUI_GRID_W;
h = 1.5 * GUI_GRID_H; h = 1.5 * GUI_GRID_H;
}; };
class RscTitles { class RscTitles {
class GVAR(InteractionHelper) { class GVAR(InteractionHelper) {
idd = 9930; idd = 9930;
enableSimulation = 1; enableSimulation = 1;
movingEnable = 0; movingEnable = 0;
fadeIn=0.5; fadeIn=0.5;
fadeOut=0.5; fadeOut=0.5;
duration = 10e10; duration = 10e10;
onLoad = "uiNamespace setVariable ['ACE_Helper_Display', _this select 0];"; onLoad = "uiNamespace setVariable ['ACE_Helper_Display', _this select 0];";
class controls { class controls {
class SelectIcon: RscInteractionHelperIcon{ class SelectIcon: RscInteractionHelperIcon{
idc = 1200; idc = 1200;
text = PATHTOF(UI\mouse_left_ca.paa); text = PATHTOF(UI\mouse_left_ca.paa);
y = 17.5 * GUI_GRID_H; y = 17.5 * GUI_GRID_H;
}; };
class SelectText: RscInteractionText{ class SelectText: RscInteractionText{
idc = 1000; idc = 1000;
y = 17 * GUI_GRID_H; y = 17 * GUI_GRID_H;
text = $STR_ACE_Interaction_MakeSelection; text = $STR_ACE_Interaction_MakeSelection;
}; };
class GoBackIcon: RscInteractionHelperIcon{ class GoBackIcon: RscInteractionHelperIcon{
idc = 1201; idc = 1201;
text = PATHTOF(UI\mouse_right_ca.paa); text = PATHTOF(UI\mouse_right_ca.paa);
y = 19.5 * GUI_GRID_H; y = 19.5 * GUI_GRID_H;
}; };
class GoBackText: RscInteractionText{ class GoBackText: RscInteractionText{
idc = 1001; idc = 1001;
y = 19 * GUI_GRID_H; y = 19 * GUI_GRID_H;
text = $STR_ACE_Interaction_Back; text = $STR_ACE_Interaction_Back;
}; };
class ScrollIcon: RscInteractionHelperIcon{ class ScrollIcon: RscInteractionHelperIcon{
idc = 1202; idc = 1202;
text = PATHTOF(UI\mouse_scroll_ca.paa); text = PATHTOF(UI\mouse_scroll_ca.paa);
y = 18.5 * GUI_GRID_H; y = 18.5 * GUI_GRID_H;
}; };
class ScrollText: RscInteractionText{ class ScrollText: RscInteractionText{
idc = 1002; idc = 1002;
y = 18 * GUI_GRID_H; y = 18 * GUI_GRID_H;
text = $STR_ACE_Interaction_ScrollHint; text = $STR_ACE_Interaction_ScrollHint;
}; };
};
}; };
};
}; };

1
addons/interaction/README.md
View File

@ -3,7 +3,6 @@ ace_interaction
Provides interaction options between units. Provides interaction options between units.
## Maintainers ## Maintainers
The people responsible for merging changes to this component or answering potential questions. The people responsible for merging changes to this component or answering potential questions.

30
addons/interaction/config.cpp
View File

@ -1,26 +1,24 @@
#include "script_component.hpp" #include "script_component.hpp"
class CfgPatches { class CfgPatches {
class ADDON { class ADDON {
units[] = {}; units[] = {};
weapons[] = {}; weapons[] = {};
requiredVersion = REQUIRED_VERSION; requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_interact_menu"}; requiredAddons[] = {"ace_interact_menu"};
author[] = {"commy2", "KoffeinFlummi", "esteldunedain", "bux578"}; author[] = {"commy2", "KoffeinFlummi", "esteldunedain", "bux578"};
authorUrl = "https://github.com/commy2/"; authorUrl = "https://github.com/commy2/";
VERSION_CONFIG; VERSION_CONFIG;
}; };
}; };
#include "CfgEventHandlers.hpp" #include "CfgEventHandlers.hpp"
#include "CfgVehicles.hpp" #include "CfgVehicles.hpp"
#include "Menu_Config.hpp"
#include <Menu_Config.hpp>
class ACE_Settings { class ACE_Settings {
class GVAR(EnableTeamManagement) { class GVAR(EnableTeamManagement) {
value = 1; value = 1;
typeName = "BOOL"; typeName = "BOOL";
}; };
}; };