New Icon Style (#215)

* Add files via upload

* Add files via upload

* renormalize

* add translation file

---------

Co-authored-by: diwako <[email protected]>

.editorconfig

@@ -1,59 +1,59 @@
-root = true
-
-[*]
-end_of_line = crlf
-charset = utf-8
-
-[*.sqf]
-indent_size = 4
-insert_final_newline = true
-indent_style = space
-trim_trailing_whitespace = true
-
-[*.cpp]
-indent_size = 4
-insert_final_newline = true
-indent_style = space
-trim_trailing_whitespace = true
-
-[*.hpp]
-indent_size = 4
-insert_final_newline = true
-indent_style = space
-trim_trailing_whitespace = true
-
-[*.js]
-indent_size = 2
-insert_final_newline = true
-indent_style = space
-trim_trailing_whitespace = true
-
-[*.xml]
-indent_size = 4
-insert_final_newline = true
-indent_style = space
-trim_trailing_whitespace = true
-
-[*.paa]
-charset = unset
-end_of_line = unset
-insert_final_newline = unset
-trim_trailing_whitespace = unset
-indent_style = unset
-indent_size = unset
-
-[*.fsm]
-charset = unset
-end_of_line = unset
-insert_final_newline = unset
-trim_trailing_whitespace = unset
-indent_style = unset
-indent_size = unset
-
-[*.json]
-charset = unset
-end_of_line = unset
-insert_final_newline = unset
-trim_trailing_whitespace = unset
-indent_style = unset
-indent_size = unset
+root = true
+
+[*]
+end_of_line = crlf
+charset = utf-8
+
+[*.sqf]
+indent_size = 4
+insert_final_newline = true
+indent_style = space
+trim_trailing_whitespace = true
+
+[*.cpp]
+indent_size = 4
+insert_final_newline = true
+indent_style = space
+trim_trailing_whitespace = true
+
+[*.hpp]
+indent_size = 4
+insert_final_newline = true
+indent_style = space
+trim_trailing_whitespace = true
+
+[*.js]
+indent_size = 2
+insert_final_newline = true
+indent_style = space
+trim_trailing_whitespace = true
+
+[*.xml]
+indent_size = 4
+insert_final_newline = true
+indent_style = space
+trim_trailing_whitespace = true
+
+[*.paa]
+charset = unset
+end_of_line = unset
+insert_final_newline = unset
+trim_trailing_whitespace = unset
+indent_style = unset
+indent_size = unset
+
+[*.fsm]
+charset = unset
+end_of_line = unset
+insert_final_newline = unset
+trim_trailing_whitespace = unset
+indent_style = unset
+indent_size = unset
+
+[*.json]
+charset = unset
+end_of_line = unset
+insert_final_newline = unset
+trim_trailing_whitespace = unset
+indent_style = unset
+indent_size = unset

.gitattributes

@@ -1,12 +1,12 @@
-*.sqf text eol=crlf
-*.hpp text eol=crlf
-*.cpp text eol=crlf
-*.paa binary
-*.fsm text eol=crlf
-*.json text eol=crlf
-*.js text eol=crlf
-*.py text eol=crlf
-*.md text eol=crlf
-*.toml text eol=crlf
-*.txt text eol=crlf
-*.xml text eol=crlf
+*.sqf text eol=crlf
+*.hpp text eol=crlf
+*.cpp text eol=crlf
+*.paa binary
+*.fsm text eol=crlf
+*.json text eol=crlf
+*.js text eol=crlf
+*.py text eol=crlf
+*.md text eol=crlf
+*.toml text eol=crlf
+*.txt text eol=crlf
+*.xml text eol=crlf

.github/workflows/main.yml

@@ -1,52 +1,52 @@
-name: CI
-
-on:
-  push:
-    branches:
-    - master
-  pull_request:
-
-jobs:
-  validate:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout the source code
-      uses: actions/checkout@master
-    - name: Validate SQF
-      run: python3 tools/sqf_validator.py
-    - name: Validate Config
-      run: python3 tools/config_style_checker.py
-    - name: Check for BOM
-      uses: arma-actions/bom-check@master
-
-  lint:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout the source code
-      uses: actions/checkout@master
-    - name: Lint (sqflint)
-      uses: jokoho48/sqflint@master
-      continue-on-error: true # No failure due to many false-positives
-    - uses: actions/upload-artifact@master
-      with:
-       name: 'sqfLint Log'
-       path: 'sqf.log'
-    - name: Validate SQFLinter Logs
-      run: python3 tools/sqf_linter_LogChecker.py
-
-  stringtables:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Install Python packages
-      run: |
-        pip3 install wheel
-        pip3 install setuptools
-        pip3 install pygithub
-        pip3 install pygithub3
-    - name: Checkout the source code
-      uses: actions/checkout@master
-    - name: Update Translation issue
-      if: github.repository == 'diwako/diwako_dui' && github.ref	== 'refs/heads/master' && ! contains(github.event.head_commit.message, '[ci skip]')
-      env:
-        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      run: python3 tools/stringtableDeploy.py
+name: CI
+
+on:
+  push:
+    branches:
+    - master
+  pull_request:
+
+jobs:
+  validate:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout the source code
+      uses: actions/checkout@master
+    - name: Validate SQF
+      run: python3 tools/sqf_validator.py
+    - name: Validate Config
+      run: python3 tools/config_style_checker.py
+    - name: Check for BOM
+      uses: arma-actions/bom-check@master
+
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout the source code
+      uses: actions/checkout@master
+    - name: Lint (sqflint)
+      uses: jokoho48/sqflint@master
+      continue-on-error: true # No failure due to many false-positives
+    - uses: actions/upload-artifact@master
+      with:
+       name: 'sqfLint Log'
+       path: 'sqf.log'
+    - name: Validate SQFLinter Logs
+      run: python3 tools/sqf_linter_LogChecker.py
+
+  stringtables:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Install Python packages
+      run: |
+        pip3 install wheel
+        pip3 install setuptools
+        pip3 install pygithub
+        pip3 install pygithub3
+    - name: Checkout the source code
+      uses: actions/checkout@master
+    - name: Update Translation issue
+      if: github.repository == 'diwako/diwako_dui' && github.ref	== 'refs/heads/master' && ! contains(github.event.head_commit.message, '[ci skip]')
+      env:
+        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      run: python3 tools/stringtableDeploy.py

.gitignore

@@ -1,19 +1,19 @@
-
-*.biprivatekey
-
-hemtt\.exe
-armake2\.exe
-keys/
-releases/
-*.pbo
-
-*.bisign
-
-releases/*
-keys/*
-.hemtt/local
-*.pdb
-*.exe
-*.sqfc
-*.bat
-*.dll
+
+*.biprivatekey
+
+hemtt\.exe
+armake2\.exe
+keys/
+releases/
+*.pbo
+
+*.bisign
+
+releases/*
+keys/*
+.hemtt/local
+*.pdb
+*.exe
+*.sqfc
+*.bat
+*.dll

addons/indicators/$PBOPREFIX$

@@ -1 +1 @@
-z\diwako_dui\addons\indicators
+z\diwako_dui\addons\indicators

addons/main/$PBOPREFIX$

@@ -1 +1 @@
-z\diwako_dui\addons\main
+z\diwako_dui\addons\main

addons/main/CfgIconStyles.hpp

@@ -71,4 +71,19 @@ class diwako_dui_icon_style
         explosive_specialist = QPATHTO_T(UI\icon_styles\clones\icon_grenadier.paa);
         rifleman = QPATHTO_T(UI\icon_styles\clones\icon_rifleman.paa);
     };
+
+    class everlight:standard
+    {
+        name = "$STR_dui_icon_everlight";
+
+        sql = QPATHTO_T(UI\icon_styles\everlight\Everlight_iconManLeader_ca.paa);
+        medic = QPATHTO_T(UI\icon_styles\everlight\Everlight_iconManMedic_ca.paa);
+        auto_rifleman = QPATHTO_T(UI\icon_styles\everlight\Everlight_iconManMG_ca.paa);
+        at_gunner = QPATHTO_T(UI\icon_styles\everlight\Everlight_iconManAT_ca.paa);
+        engineer = QPATHTO_T(UI\icon_styles\everlight\Everlight_iconManEngineer_ca.paa);
+        explosive_specialist = QPATHTO_T(UI\icon_styles\everlight\Everlight_iconManExplosive_ca.paa);
+        rifleman = QPATHTO_T(UI\icon_styles\everlight\Everlight_iconMan_ca.paa);
+
+        buddy_compass = QPATHTO_T(UI\icon_styles\everlight\Everlight_buddy_compass.paa);
+    };
 };

addons/main/stringtable.xml

@@ -1837,6 +1837,9 @@
             <Russian>Копии</Russian>
             <Turkish>Klonlar</Turkish>
         </Key>
+        <Key ID="STR_dui_icon_everlight">
+            <English>Everlight</English>
+        </Key>
         <!-- Compass styles -->
         <Key ID="STR_dui_compass_bohemia">
             <English>Bohemia Interactive</English>

addons/nametags/$PBOPREFIX$

@@ -1 +1 @@
-z\diwako_dui\addons\nametags
+z\diwako_dui\addons\nametags

addons/radar/$PBOPREFIX$

@@ -1 +1 @@
-z\diwako_dui\addons\radar
+z\diwako_dui\addons\radar