chore(packaging): AppStream.xml, screenshots review (#38)

.gitignore

@@ -26,3 +26,6 @@ compile/
 src/Changelog
 SDL2_*
 *.kate-swp
+repo/
+.flatpak-builder/
+.vscode/

CMakeLists.txt

@@ -600,6 +600,7 @@ if(UNIX)
     ecm_install_icons(ICONS src/icons/application/32x32/apps/32-apps-io.github.antimicrox.antimicrox.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons)
     ecm_install_icons(ICONS src/icons/application/48x48/apps/48-apps-io.github.antimicrox.antimicrox.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons)
     ecm_install_icons(ICONS src/icons/application/64x64/apps/64-apps-io.github.antimicrox.antimicrox.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons)
+    ecm_install_icons(ICONS src/icons/application/128x128/apps/128-apps-io.github.antimicrox.antimicrox.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons)
     ecm_install_icons(ICONS src/icons/application/scalable/apps/sc-apps-io.github.antimicrox.antimicrox.svg DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons)
 
     install(FILES src/images/antimicrox.png src/images/antimicrox_trayicon.png src/images/axis.png src/images/button.png src/images/controllermap.png DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/antimicrox/images")

README.md

@@ -1,6 +1,5 @@
 # <img src="./src/images/antimicrox.png" alt="Icon" width="60"/> AntiMicroX 3.1.0 
 
-
 1. [Description](#description)  
 2. [License](#license)  
 3. [Command Line](#command-line) 
@@ -14,8 +13,6 @@
 11. [Credits](#credits)  
 12. [Participation in the translation of AntiMicroX](#participation-in-the-translation-of-antimicrox)
 
-<br/>
-
 ## Description
 
 antimicrox is a graphical program used to map keyboard keys and mouse controls to a gamepad. You can use this program to control any desktop application with a gamepad; on Linux, this means that your system has to be running an X environment in order to run this program.
@@ -38,23 +35,25 @@ Legacy repositories:
 
 **Screenshots:**  
 Disclaimer: Theme may depend on your system configuration.
+
 <table border="0px" >
-<tr><td>
-
-<img src="./other/appdata/screenshots/controller_main_window_dark_theme_1.png" alt="Main Window" />
-  </td><td>
-    <img src="./other/appdata/screenshots/controller_mapping_dark_theme.png" alt="Mapping" />
-  </td></tr>
-
-  <tr><td>
-    <img src="./other/appdata/screenshots/controller_callibration_dark_theme.png" alt="Calibration" />
-
-  </td><td>
-    <img src="./other/appdata/screenshots/controller_configure_dark_theme.png" alt="Configuration" />
-  </td></tr>
+  <tr>
+    <td>
+      <img src="./other/appdata/screenshots/app_light.png" alt="Main Window" />
+    </td>
+    <td>
+      <img src="./other/appdata/screenshots/controllermapping.png" alt="Mapping" />
+    </td>
+  </tr>
+  <tr>
+    <td>
+      <img src="./other/appdata/screenshots/calibration.png" alt="Calibration" />
+    </td>
+    <td>
+    <img src="./other/appdata/screenshots/advanced.png" alt="Advanced settings" />
+    </td>
+  </tr>
 </table>
-<br/>
-
 
 ## License
 
@@ -63,8 +62,6 @@ included with the source code if you would like to read the terms of the license
 The license can also be found online at
 http://www.gnu.org/licenses/gpl.txt
 
-<br/>
-
 ## Command Line
 
     Usage: antimicrox [options] [profile]
@@ -97,9 +94,6 @@ http://www.gnu.org/licenses/gpl.txt
                                    check your controller index, name or 
                                    even GUID.  
 
-<br/>
-
-
 ## Installation
 
 ### Fedora
@@ -112,10 +106,11 @@ dnf install antimicrox
 ```
 trizen -S antimicrox
 ```
-**or**<br/>
+**or**
 
 pre-built version can de downloaded from unofficial repository called [chaotic-aur](https://lonewolf.pedrohlc.com/chaotic-aur/).
-<br/>Append (one of listed mirrors) to `/etc/pacman.conf`:
+
+Append (one of listed mirrors) to `/etc/pacman.conf`:
 ```bash
 # Brazil
 Server = http://lonewolf-builder.duckdns.org/$repo/$arch
@@ -142,7 +137,8 @@ Download from the [release site](https://github.com/AntiMicroX/antimicrox/releas
 
 ### AppImage
 Download from the [release site](https://github.com/AntiMicroX/antimicrox/releases).
-<br/>It is recommended to use [AppImageLauncher](https://github.com/TheAssassin/AppImageLauncher) with this package.
+
+It is recommended to use [AppImageLauncher](https://github.com/TheAssassin/AppImageLauncher) with this package.
 
 ### Running using Docker
 If you want to run application without building process and choose between various distributions, then [look here](https://hub.docker.com/r/juliagoda/antimicrox)  
@@ -151,14 +147,10 @@ This method is described in details [here](./BUILDING.md)
 ### Building Yourself
 List of required dependencies and build instructions can be found [here](./BUILDING.md).
 
-<br/>
-
 ## Wiki
 
 [Look here](https://github.com/juliagoda/antimicroX/wiki)
 
-<br/>
-
 ## Testing Under Linux
 
 If you are having problems with antimicrox detecting a controller or
@@ -170,8 +162,6 @@ testing with older programs that use joydev won't be as helpful since some
 devices behave a bit differently between the two systems. Another method also exist, 
 which can be found [here](https://github.com/juliagoda/SDL_JoystickButtonNames).
 
-<br/>
-
 ## AntiMicroX Profiles
 
 If you would like to send the profile you are using for your application or find something 
@@ -179,36 +169,24 @@ for yourself, [here](https://github.com/AntiMicroX/antimicrox-profiles) is the f
 a question or share a suggestion, you can do that on the antimicrox page or on the
 [antimicrox-profiles](https://github.com/AntiMicroX/antimicrox-profiles) page.
 
-<br/>
-
 ## Support
 
 In order to obtain support, you can post an issue [here](https://github.com/AntiMicroX/antimicrox/issues).
 
-<br/>
-
 ## Bugs
 
 Application's bugs will be fixed. There are created tests for detecting bugs. Of course, I'm open to proposals or questions from users. 
 
-<br/>
-
 ## Shoutout
 
 A big, original inspiration for this program was the program QJoyPad.
 
-<br/>
-
 ## Credits
 
-<br/>
-
 ### Contributors
 
 Full list is available [here](https://github.com/AntiMicroX/antimicrox/graphs/contributors)
 
-<br/>
-
 ### Package Maintainers
 
  **Distro** | **Maintainer** | **Package**  |
@@ -217,8 +195,6 @@ Full list is available [here](https://github.com/AntiMicroX/antimicrox/graphs/co
 | Arch Linux | FabioLolix   | [antimicrox-git](https://aur.archlinux.org/packages/antimicrox-git) <sup>AUR</sup> |
 | Fedora Linux | [Gergely Gombos](https://github.com/gombosg) | antimicroX |
 
-<br/>
-
 ### Translators
 
 VaGNaroK <vagnarokalkimist@gmail.com> - Brazilian Portuguese  
@@ -234,8 +210,6 @@ Flavio HR <flavio.hrx@gmail.com> - Spanish
 WAZAAAAA - <wazaaaaa00@gmail.com> - Italian  
 juliagoda <juliagoda.pl@protonmail.com> - Polish
 
-<br/>
-
 ## Participation in the translation of AntiMicroX
 
 If you want to participate in the translation of the program, but your language is not yet on the support list. Please contact us.

other/appdata/PO_files/en.po

@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-12-06 21:37-0500\n"
+"POT-Creation-Date: 2020-09-14 23:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -9,73 +9,77 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. (itstool) path: component/id
-#: antimicrox.appdata.xml.in:4
-msgid "antimicrox.desktop"
-msgstr ""
-
-#. (itstool) path: component/metadata_license
-#: antimicrox.appdata.xml.in:5
-msgid "MIT"
-msgstr ""
-
-#. (itstool) path: component/project_license
-#: antimicro.appdataX.xml.in:6
-msgid "GPL-3.0+"
-msgstr ""
-
-#. (itstool) path: component/name
-#: antimicrox.appdata.xml.in:7
-msgid "antimicrox"
-msgstr ""
-
 #. (itstool) path: component/summary
-#: antimicrox.appdata.xml.in:8
-msgid "Graphical program used to map keyboard buttons and mouse controls to a gamepad"
+#: io.github.antimicrox.antimicrox.appdata.xml.in:7
+msgid "Graphical program used to map keyboard buttons and mouse controls to a gamepad. Useful for playing games with no gamepad support."
 msgstr ""
 
 #. (itstool) path: description/p
-#: antimicrox.appdata.xml.in:10
-msgid "antimicroX is a graphical program used to map keyboard keys and mouse controls to a gamepad. This program is useful for playing PC games using a gamepad that do not have any form of built-in gamepad support. antimicroX was inspired by QJoyPad but has additional features."
+#: io.github.antimicrox.antimicrox.appdata.xml.in:9
+msgid "AntiMicroX is a graphical program used to map keyboard keys and mouse controls to a gamepad. This program is useful for playing PC games using a gamepad that do not have any form of built-in gamepad support."
 msgstr ""
 
-#. (itstool) path: screenshot/image
-#: antimicrox.appdata.xml.in:19
-msgid "https://raw.githubusercontent.com/AntiMicroX/antimicroX/master/other/appdata/screenshots/controller_main_window_light_theme.png"
+#. (itstool) path: description/p
+#: io.github.antimicrox.antimicrox.appdata.xml.in:14
+msgid "AntiMicroX was inspired by QJoyPad but has additional features."
 msgstr ""
 
 #. (itstool) path: screenshot/caption
-#: antimicrox.appdata.xml.in:20
-msgid "Profile Configuration Dialog"
-msgstr ""
-
-#. (itstool) path: screenshot/image
-#: antimicrox.appdata.xml.in:23
-msgid "https://raw.githubusercontent.com/AntiMicroX/antimicroX/master/other/appdata/screenshots/controller_configure_light_theme.png"
+#: io.github.antimicrox.antimicrox.appdata.xml.in:38
+msgid "Main Window (Light Theme)"
 msgstr ""
 
 #. (itstool) path: screenshot/caption
-#: antimicrox.appdata.xml.in:24
-msgid "Analog Stick Configuration Dialog"
-msgstr ""
-
-#. (itstool) path: screenshot/image
-#: antimicrox.appdata.xml.in:27
-msgid "https://raw.githubusercontent.com/AntiMicroX/antimicroX/master/other/appdata/screenshots/controller_mapping_light_theme.png"
+#: io.github.antimicrox.antimicrox.appdata.xml.in:42
+msgid "Main Window (Dark Theme)"
 msgstr ""
 
 #. (itstool) path: screenshot/caption
-#: antimicrox.appdata.xml.in:28
-msgid "Controller Mapping Dialog"
+#: io.github.antimicrox.antimicrox.appdata.xml.in:46
+msgid "Controller Calibration (Dark Theme)"
 msgstr ""
 
-#. (itstool) path: component/url
-#: antimicrox.appdata.xml.in:31
-msgid "https://github.com/AntiMicroX/antimicroX/"
+#. (itstool) path: screenshot/caption
+#: io.github.antimicrox.antimicrox.appdata.xml.in:50
+msgid "Controller Mapping (Dark Theme)"
 msgstr ""
 
-#. (itstool) path: component/updatecontact
-#: antimicrox.appdata.xml.in:32
-msgid "juliagoda.pl_AT_protonmail.com"
+#. (itstool) path: screenshot/caption
+#: io.github.antimicrox.antimicrox.appdata.xml.in:54
+msgid "Advanced Settings (Dark Theme)"
 msgstr ""
 
+#. (itstool) path: screenshot/caption
+#: io.github.antimicrox.antimicrox.appdata.xml.in:58
+msgid "About Window (Dark Theme)"
+msgstr ""
+
+#. (itstool) path: keywords/keyword
+#: io.github.antimicrox.antimicrox.appdata.xml.in:63
+msgid "game"
+msgstr ""
+
+#. (itstool) path: keywords/keyword
+#: io.github.antimicrox.antimicrox.appdata.xml.in:64
+msgid "controller"
+msgstr ""
+
+#. (itstool) path: keywords/keyword
+#: io.github.antimicrox.antimicrox.appdata.xml.in:65
+msgid "joystick"
+msgstr ""
+
+#. (itstool) path: keywords/keyword
+#: io.github.antimicrox.antimicrox.appdata.xml.in:66
+msgid "keyboard"
+msgstr ""
+
+#. (itstool) path: keywords/keyword
+#: io.github.antimicrox.antimicrox.appdata.xml.in:67
+msgid "mouse"
+msgstr ""
+
+#. (itstool) path: categories/category
+#: io.github.antimicrox.antimicrox.appdata.xml.in:70
+msgid "Utility"
+msgstr ""

other/appdata/io.github.antimicrox.antimicrox.appdata.xml.in

@@ -5,69 +5,72 @@
   <project_license>GPL-3.0+</project_license>
   <name>AntiMicroX</name>
   <summary>Graphical program used to map keyboard buttons and mouse controls to a gamepad. Useful for playing games with no gamepad support.</summary>
-   <description>
-   <p>
+  <description>
+    <p>
      AntiMicroX is a graphical program used to map keyboard keys and mouse
      controls to a gamepad. This program is useful for playing PC games using a
      gamepad that do not have any form of built-in gamepad support. 
-   </p>
-   <p>
+    </p>
+    <p>
      AntiMicroX was inspired by QJoyPad but has additional features.
-   </p>
- </description>
+    </p>
+  </description>
   <url type="homepage">https://github.com/AntiMicroX/antimicrox/</url>
-  <launchable type="desktop-id">.desktop</launchable>
+  <launchable type="desktop-id">io.github.antimicrox.antimicrox.desktop</launchable>
   <releases>
-    <release version="3.1.0" date="2020-09-09"/>
-    <release version="3.0.1" date="2020-08-23"/>
-    <release version="3.0" date="2020-06-11"/>
-    <release version="2.25" date="2020-01-07"/>
-    <release version="2.24" date="2018-06-16"/>
-​    <release version="2.23" date="2016-11-06"/>
-    <release version="2.22" date="2016-07-30"/>
-    <release version="2.21" date="2016-01-10"/>
-    <release version="2.20" date="2015-10-10"/>
+    <release version="3.1.0" date="2020-09-09" />
+    <release version="3.0.1" date="2020-08-23" />
+    <release version="3.0" date="2020-06-11" />
+    <release version="2.25" date="2020-01-07" />
+    <release version="2.24" date="2018-06-16" />
+    <release version="2.23" date="2016-11-06" />
+    <release version="2.22" date="2016-07-30" />
+    <release version="2.21" date="2016-01-10" />
+    <release version="2.20" date="2015-10-10" />
   </releases>
   <provides>
     <binary>antimicrox</binary>
   </provides>
- <kudos>
-   <kudo>ModernToolkit</kudo>
- </kudos>
   <screenshots>
-  <screenshot>
-   <image>https://raw.githubusercontent.com/AntiMicroX/antimicrox/master/other/appdata/screenshots/application_trayicon.png</image>
-   <caption>Application Tray Icon</caption>
-  </screenshot>
-  <screenshot>
-   <image>https://raw.githubusercontent.com/AntiMicroX/antimicrox/master/other/appdata/screenshots/controller_callibration_dark_theme.png</image>
-   <caption>Controller Calibration (Dark Theme)</caption>
-  </screenshot>
-  <screenshot>
-   <image>https://raw.githubusercontent.com/AntiMicroX/antimicrox/master/other/appdata/screenshots/controller_main_window_dark_theme_1.png</image>
-   <caption>Profile Configuration Dialog 1 (Dark Theme)</caption>
-  </screenshot>
-  <screenshot>
-   <image>https://raw.githubusercontent.com/AntiMicroX/antimicrox/master/other/appdata/screenshots/controller_main_window_dark_theme_2.png</image>
-   <caption>Profile Configuration Dialog 2 (Dark Theme)</caption>
-  </screenshot>
-  <screenshot>
-   <image>https://raw.githubusercontent.com/AntiMicroX/antimicrox/master/other/appdata/screenshots/controller_configure_dark_theme.png</image>
-   <caption>Analog Sticks Configuration Dialog (Dark Theme)</caption>
-  </screenshot>
-  <screenshot>
-   <image>https://raw.githubusercontent.com/AntiMicroX/antimicrox/master/other/appdata/screenshots/controller_mapping_dark_theme.png</image>
-   <caption>Controller Mapping Dialog (Dark Theme)</caption>
-  </screenshot>
- </screenshots>
- <url type="homepage">https://github.com/AntiMicroX/antimicrox/</url>
- <keywords>
-   <keyword>game</keyword>
-   <keyword>controller</keyword>
-   <keyword>joystick</keyword>
-   <keyword>keyboard</keyword>
-   <keyword>mouse</keyword>
- </keywords>
+    <screenshot type="default">
+      <image>https://raw.githubusercontent.com/AntiMicroX/antimicrox/master/other/appdata/screenshots/app_light.png</image>
+      <caption>Main Window (Light Theme)</caption>
+    </screenshot>
+    <screenshot>
+      <image>https://raw.githubusercontent.com/AntiMicroX/antimicrox/master/other/appdata/screenshots/app_dark.png</image>
+      <caption>Main Window (Dark Theme)</caption>
+    </screenshot>
+    <screenshot>
+      <image>https://raw.githubusercontent.com/AntiMicroX/antimicrox/master/other/appdata/screenshots/calibration.png</image>
+      <caption>Controller Calibration (Dark Theme)</caption>
+    </screenshot>
+    <screenshot>
+      <image>https://raw.githubusercontent.com/AntiMicroX/antimicrox/master/other/appdata/screenshots/controllermapping.png</image>
+      <caption>Controller Mapping (Dark Theme)</caption>
+    </screenshot>
+    <screenshot>
+      <image>https://raw.githubusercontent.com/AntiMicroX/antimicrox/master/other/appdata/screenshots/advanced.png</image>
+      <caption>Advanced Settings (Dark Theme)</caption>
+    </screenshot>
+    <screenshot>
+      <image>https://raw.githubusercontent.com/AntiMicroX/antimicrox/master/other/appdata/screenshots/about.png</image>
+      <caption>About Window (Dark Theme)</caption>
+    </screenshot>
+  </screenshots>
+  <url type="homepage">https://github.com/AntiMicroX/antimicrox/</url>
+  <keywords>
+    <keyword>game</keyword>
+    <keyword>controller</keyword>
+    <keyword>joystick</keyword>
+    <keyword>keyboard</keyword>
+    <keyword>mouse</keyword>
+  </keywords>
+  <categories>
+    <category>Utility</category>
+  </categories>
+  <mimetypes>
+    <mimetype>application/x-amgp</mimetype>
+  </mimetypes>
   <content_rating type="oars-1.0">
     <content_attribute id="language-profanity">none</content_attribute>
     <content_attribute id="language-humor">none</content_attribute>

other/io.github.antimicrox.antimicrox.yml

@@ -7,8 +7,6 @@ finish-args:
   # X11 + XShm access
   - --share=ipc
   - --socket=x11
-  # Wayland access
-  - --socket=wayland
   - --device=dri
   # Gamepads
   - --device=all
@@ -22,7 +20,5 @@ modules:
     sources:
       - type: git
         url: https://github.com/AntiMicroX/antimicrox.git
-        # TODO fix this at release, add tag + commit
-        branch: flatpak
-        # tag: 3.0.2
-        # commit: xxxxx
+        tag: 3.1
+        commit: 58cbb66bb4e079ca3e08de991ebed6a51d755426

src/icons/index.theme

@@ -1,6 +1,6 @@
 [Icon Theme]
 Name=Hicolor
-Directories=16x16/actions,16x16/apps,24x24/apps,32x32/apps,48x48/apps,64x64/apps,scalable/apps
+Directories=16x16/actions,16x16/apps,24x24/apps,32x32/apps,48x48/apps,64x64/apps,128x128/apps,scalable/apps
 
 [16x16/actions]
 Size=16
@@ -32,9 +32,14 @@ Size=64
 Context=Applications
 Type=Fixed
 
+[128x128/apps]
+Size=64
+Context=Applications
+Type=Fixed
+
 [scalable/apps]
 Type=Scalable
 MinSize=1
 Size=512
 MaxSize=512
-Context=Applications
+Context=Applications

src/resources.qrc

@@ -47,6 +47,7 @@
         <file>icons/application/32x32/apps/32-apps-io.github.antimicrox.antimicrox.png</file>
         <file>icons/application/48x48/apps/48-apps-io.github.antimicrox.antimicrox.png</file>
         <file>icons/application/64x64/apps/64-apps-io.github.antimicrox.antimicrox.png</file>
+        <file>icons/application/128x128/apps/128-apps-io.github.antimicrox.antimicrox.png</file>
         <file>icons/application/scalable/apps/sc-apps-io.github.antimicrox.antimicrox.svg</file>
         <file>images/battery-low-level.png</file>
         <file>icons/icons/16x16/actions/16-actions-join_slots.png</file>