🔖 Merge dev into main (v0.3.0)

README.md

@@ -23,7 +23,7 @@ ProtonPlus is a simple Proton version manager that make it easy to install and m
 
 If you have any questions about ProtonPlus or want to share information with us, please go to one of the following places:
 
-<img align="right" width=150 src="src/ProtonPlus.png" />
+<img align="right" width=150 src="data/icons/hicolor/scalable/apps/com.vysp3r.ProtonPlus.svg" />
 
 - [Github Discussions](https://github.com/Vysp3r/ProtonPlus/discussions)
 - [Telegram Server](https://t.me/ProtonPlusOfficial)
@@ -93,10 +93,11 @@ _Requirements_
 
 **Installing**
 
-- Clone the GitHub repo: `git clone https://github.com/Vysp3r/ProtonPlus.git` & `cd ProtonPlus`
 - Install all dependencies (I'm using Fedora 37): `sudo dnf install meson gtk4-devel libadwaita-devel json-glib-devel libsoup3-devel libarchive-devel`
-- Build the source: `TODO`
-- Start the application: `TODO`
+- Clone the GitHub repo: `git clone https://github.com/Vysp3r/ProtonPlus.git` & `cd ProtonPlus`
+- Build the source: `meson build --prefix=/usr` & `cd build` & `ninja`
+- (Optional) Install application: `ninja install`
+- Start the application: `cd src` & `./protonplus`
 
 - - - -
 

data/com.vysp3r.ProtonPlus.appdata.xml.in → data/com.vysp3r.ProtonPlus.appdata.xml

@@ -28,6 +28,24 @@
     </screenshots>
 
     <releases>
+      <release version="0.3.0" date="2022-12-11">
+          <description>
+            <p>What's Changed:</p>
+            <ul>
+              <li>✨ Add localization system</li>
+              <li>🚸 Added more tooltips</li>
+              <li>🚸 Update About for better UX</li>
+              <li>🧑‍💻 Project refactor</li>
+              <li>🐛 Fix styles localization</li>
+              <li>✨ Added remember last launcher preference</li>
+              <li>🍱 Update preview images</li>
+              <li>📝 Update README.md</li>
+              <li>🔨 Update appdata</li>
+              <li>🔨 Update meson</li>
+              <li>💬 Update the release notes</li>
+            </ul>
+          </description>
+        </release>
         <release version="0.2.3" date="2022-12-05">
           <description>
             <p>What's Changed:</p>

data/com.vysp3r.ProtonPlus.gresource.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/com/vysp3r/ProtonPlus">
+    <file alias="application.css">css/application.css</file>
+    <file alias="ProtonPlus.png">icons/hicolor/scalable/apps/com.vysp3r.ProtonPlus.svg</file>
+  </gresource>
+</gresources>

data/meson.build

@@ -1,34 +1,16 @@
-desktop_file = i18n.merge_file(
-  input: 'com.vysp3r.ProtonPlus.desktop.in',
-  output: 'com.vysp3r.ProtonPlus.desktop',
-  type: 'desktop',
-  po_dir: '../po',
-  install: true,
-  install_dir: join_paths(get_option('datadir'), 'applications')
+protonplus_sources = gnome.compile_resources('protonplus-resources',
+  'com.vysp3r.ProtonPlus.gresource.xml',
+  c_name: 'protonplus'
 )
 
-desktop_utils = find_program('desktop-file-validate', required: false)
-if desktop_utils.found()
-  test('Validate desktop file', desktop_utils,
-    args: [desktop_file]
-  )
-endif
+desktop_file = install_data('com.vysp3r.ProtonPlus.desktop',
+  install_dir: join_paths(get_option('datadir'), 'applications')
+)
 
-appstream_file = i18n.merge_file(
-  input: 'com.vysp3r.ProtonPlus.appdata.xml.in',
-  output: 'com.vysp3r.ProtonPlus.appdata.xml',
-  po_dir: '../po',
-  install: true,
+appstream_file = install_data('com.vysp3r.ProtonPlus.appdata.xml',
   install_dir: join_paths(get_option('datadir'), 'appdata')
 )
 
-appstream_util = find_program('appstream-util', required: false)
-if appstream_util.found()
-  test('Validate appstream file', appstream_util,
-    args: ['validate', appstream_file]
-  )
-endif
-
 install_data('com.vysp3r.ProtonPlus.gschema.xml',
   install_dir: join_paths(get_option('datadir'), 'glib-2.0/schemas')
 )

meson.build

@@ -1,17 +1,24 @@
 project('protonplus', ['c', 'vala'],
-          version: '0.2.0',
+          version: '0.3.0',
     meson_version: '>= 0.59.0',
-  default_options: [ 'warning_level=2',
-                     'werror=false',
-                   ],
+  default_options: [ 'warning_level=2', 'werror=false', ],
 )
 
 i18n = import('i18n')
-
 gnome = import('gnome')
 
+conf = configuration_data()
+conf.set_quoted('GETTEXT_PACKAGE', meson.project_name())
+conf.set_quoted('DATADIR', join_paths(get_option('prefix'), get_option('datadir')))
+conf.set_quoted('GNOMELOCALEDIR', join_paths(get_option('prefix'), get_option('localedir')))
+
+configure_file(output: 'config.h', configuration: conf)
+config_h_dir = include_directories('.')
+
+# Don't change the order! (data > src > po)
 subdir('data')
 subdir('src')
+subdir('po')
 
 gnome.post_install(
   glib_compile_schemas: true,

po/LINGUAS

@@ -0,0 +1 @@
+fr_CA

po/fr_CA.po

@@ -0,0 +1,119 @@
+msgid ""
+msgstr ""
+"Language: fr_CA\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "Tools"
+msgstr "Outils"
+
+msgid "Games"
+msgstr "Jeux"
+
+msgid "Notifications"
+msgstr "Notifications"
+
+msgid "Preferences"
+msgstr "Préférences"
+
+msgid "Telegram"
+msgstr "Telegram"
+
+msgid "Documentation"
+msgstr "Documentation"
+
+msgid "Donation"
+msgstr "Donation"
+
+msgid "About"
+msgstr "À propos"
+
+msgid "Quit"
+msgstr "Quitter"
+
+msgid "Launcher"
+msgstr "Launcher"
+
+msgid "Launcher settings"
+msgstr "Paramètres du launcher"
+
+msgid "Install a tool"
+msgstr "Installer un outil"
+
+msgid "Are you sure you want to delete the selected tool?"
+msgstr "Êtes vous sure de vouloir supprimer l'outil selectionné?"
+
+msgid "Name: "
+msgstr "Nom: "
+
+msgid "Directory: "
+msgstr "Répertoire: "
+
+msgid "Close"
+msgstr "Fermer"
+
+msgid "Install"
+msgstr "Installer"
+
+msgid "Compatibility Tool"
+msgstr "Outil de compatiblité"
+
+msgid "Version"
+msgstr "Version"
+
+msgid "Info"
+msgstr "Info"
+
+msgid "Downloading..."
+msgstr "En téléchargement..."
+
+msgid "Extracting..."
+msgstr "En extraction..."
+
+msgid "Done!"
+msgstr "Fini!"
+
+msgid "There was an error while fetching data from the GitHub API. You may have reached the maximum amount of requests per hour or may not be connected to the internet. If you think this is a bug, please report this to us."
+msgstr "Il y a eu un erreur lors de récupération des données du API de GitHub. Vous avez peut-être atteind le nombre limite de requête par heure ou vous n`êtes peut-être pas connecté à internet. Si vous pensez que c'est un problème, veuillez nous le reporter."
+
+msgid "Launcher Settings"
+msgstr "Paramètres du launcher"
+
+msgid "Clean launcher"
+msgstr "Nettoyer le launcher"
+
+msgid "Delete every installed tools from the launcher"
+msgstr "Supprime chaques outils installés du launcher"
+
+msgid "Are you sure you want to clean this launcher? WARNING: It will delete every installed tools from the launcher!"
+msgstr "Êtes vous sur de vouloir nettoyer le launcher? MISE EN GARDE: Çela va supprimer chaques outils installés du launcher"
+
+msgid "Styles"
+msgstr "Styles"
+
+msgid "Appearance"
+msgstr "Apparence"
+
+msgid "System"
+msgstr "Système"
+
+msgid "Light"
+msgstr "Clair"
+
+msgid "Dark"
+msgstr "Sombre"
+
+msgid "Show information"
+msgstr "Afficher informations"
+
+msgid "Delete the tool"
+msgstr "Supprimer l'outil"
+
+msgid "Open a browser to the tool page"
+msgstr "Ouvrir un navigateur sur la page de l'outil"
+
+msgid "Install the selected tool"
+msgstr "Installer l'outil sélectionné"
+
+msgid "Launcher information"
+msgstr "Informations du launcher"

po/meson.build

@@ -0,0 +1 @@
+i18n.gettext(meson.project_name(), preset: 'glib')

src/application.vala → src/Application.vala

@@ -22,13 +22,13 @@ namespace ProtonPlus {
             base.activate ();
 
             preferences = new Stores.Preferences ();
-            if (Manager.Preference.Load (ref preferences)) {
-                Manager.Preference.Apply (ref preferences);
-                Manager.Theme.Load ();
+            if (Utils.Preference.Load (ref preferences)) {
+                Utils.Preference.Apply (ref preferences);
+                Utils.Theme.Load ();
 
-                new Windows.Home (this);
+                new Windows.Home (this, ref preferences);
             } else {
-                stderr.printf ("There was an error loading the preferences and it will prevent the application from opening.\n");
+                stderr.printf ("There was an error loading the preferences. They have been reset to avoid further problems.\n");
             }
         }
 
@@ -46,22 +46,22 @@ namespace ProtonPlus {
 
             aboutDialog.set_application_name ("ProtonPlus");
             aboutDialog.set_application_icon ("com.vysp3r.ProtonPlus");
-            aboutDialog.set_version ("v0.2.3");
+            aboutDialog.set_version ("v0.3.0");
             aboutDialog.set_comments ("A simple Wine and Proton-based compatiblity tools manager for GNOME");
             aboutDialog.add_link ("Github", "https://github.com/Vysp3r/ProtonPlus");
-            aboutDialog.set_release_notes ("<ul>
-              <li>💄 Fix ListBox CSS missing</li>
-              <li>🚚 Renamed HomeInfo to AboutTool</li>
-              <li>💄 Update Home layout</li>
-              <li>🧑‍💻 Refactor ProtonMessageDialog</li>
-              <li>🚚 Rename Selector to InstallTool</li>
-              <li>🐛 Fix Adw-Critical error</li>
-              <li>🐛 Fix crash on tool delete</li>
-              <li>🍱 Update preview images</li>
-              <li>📝 Update README.md</li>
-              <li>🔨 Update appdata</li>
-              <li>💬 Update the release notes</li>
-            </ul>");
+            aboutDialog.set_release_notes ("<ul>\n" +
+                                           "<li>✨ Add localization system</li>\n" +
+                                           "<li>🚸 Added more tooltips</li>\n" +
+                                           "<li>🚸 Update About for better UX</li>\n" +
+                                           "<li>🧑‍💻 Project refactor</li>\n" +
+                                           "<li>🐛 Fix styles localization</li>\n" +
+                                           "<li>✨ Added remember last launcher preference</li>\n" +
+                                           "<li>🍱 Update preview images</li>\n" +
+                                           "<li>📝 Update README.md</li>\n" +
+                                           "<li>🔨 Update appdata</li>\n" +
+                                           "<li>🔨 Update meson</li>\n" +
+                                           "<li>💬 Update the release notes</li>\n" +
+                                           "</ul>");
             aboutDialog.set_issue_url ("https://github.com/Vysp3r/ProtonPlus/issues/new/choose");
             aboutDialog.set_copyright ("© 2022 Vysp3r");
             aboutDialog.set_license_type (Gtk.License.GPL_3_0);

src/Config.vapi

@@ -0,0 +1,6 @@
+[CCode (cprefix = "", lower_case_cprefix = "", cheader_filename = "config.h")]
+namespace Config {
+    public const string GETTEXT_PACKAGE;
+    public const string GNOMELOCALEDIR;
+    public const string DATADIR;
+}

src/Main.vala

@@ -0,0 +1,18 @@
+int main (string[] args) {
+    if (Thread.supported () == false) {
+        stderr.printf ("Threads are not supported!\n");
+        return -1;
+    }
+
+    // foreach (var loc in Intl.get_language_names ()) {
+    // stderr.printf (loc + "\n");
+    // }
+
+    Intl.setlocale (LocaleCategory.ALL, "");
+    Intl.bindtextdomain (Config.GETTEXT_PACKAGE, Config.GNOMELOCALEDIR);
+    Intl.bind_textdomain_codeset (Config.GETTEXT_PACKAGE, "UTF-8");
+    Intl.textdomain (Config.GETTEXT_PACKAGE);
+
+    var app = new ProtonPlus.Application ();
+    return app.run (args);
+}