v3.9 (#374)

* split electron module into electron/asar, simplify the code a bit * remove unneded code, improve code quality * Add unity to DE that uses org.gnome.interface * don't remove the tmp file, check nwjs correctly * Clean up the readme file * Update hardcode-tray * Update version number
bilelmoussaoui · Jun 10, 2017 · 07dfcc6 · 07dfcc6
1 parent cea0f99
commit 07dfcc6
Show file tree

Hide file tree

Showing 21 changed files with 483 additions and 464 deletions.
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 [![Codacy Badge](https://api.codacy.com/project/badge/Coverage/4d5c0768b874407bb1dcc2f928899ba5)](https://www.codacy.com/app/bil-elmoussaoui/Hardcode-Tray?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=bil-elmoussaoui/Hardcode-Tray&amp;utm_campaign=Badge_Coverage)
 [![Gitter](https://img.shields.io/gitter/room/nwjs/nw.js.svg)](https://gitter.im/Hardcode-Tray/Lobby?utm_source=share-link&utm_medium=link&utm_campaign=share-link)
 [![Hardcode-Tray
-release](https://img.shields.io/badge/release-v3.8.2-blue.svg)](https://github.com/bil-elmoussaoui/Hardcode-Tray/releases)
+release](https://img.shields.io/badge/release-v3.9-blue.svg)](https://github.com/bil-elmoussaoui/Hardcode-Tray/releases)
 
 # Hardcode-Tray
 
@@ -15,73 +15,88 @@ The script will automatically detect your default theme, the correct icon size,
 </div>
 
 ## Themes
+
 Here's a list of themes that supports Hardcode-Tray:
-  - [Numix icon theme](https://github.com/numixproject/numix-icon-theme)
+
+- [Numix icon theme](https://github.com/numixproject/numix-icon-theme)
 
  <div align="center"><img src="screenshots/numix.png" alt="Preview" /></div>
 
-  - [Papirus icon theme](https://github.com/PapirusDevelopmentTeam/papirus-icon-theme)
+- [Papirus icon theme](https://github.com/PapirusDevelopmentTeam/papirus-icon-theme)
 
  <div align="center"><img src="screenshots/papirus.png" alt="Preview" /></div>
 
 ## Install
 
 #### Arch Linux (AUR):
+
 Stable version:
+
 ```bash
 yaourt -S hardcode-tray sni-qt-patched-git lib32-sni-qt-patched-git
 ```
+
 <small>The sni-qt patched library by Hardcode-Tray team is still on beta, we will replace the git version with a stable release once we release one.</small>
 Developpement version:
+
 ```bash
 yaourt -S hardcode-tray-git sni-qt-patched-git lib32-sni-qt-patched-git
 ```
+
 #### Ubuntu 14.04 / 16.04 / 16.10 / 17.04 (PPA):
+
 ```bash
 sudo add-apt-repository ppa:andreas-angerer89/sni-qt-patched
 sudo apt update
 sudo apt install sni-qt sni-qt:i386 hardcode-tray
 ```
 
 #### OpenSUSE (Leap 42.2 / Tumbleweed):
+
 OpenSUSE package only contains the patched version of sni-qt. In order to get Hardcode-Tray, please follow the manual installation method.
 
 The one click-installer can be found by following this [link](https://software.opensuse.org/package/sni-qt-patched)
 
 #### Manual installation:
-  1. Download and install the script:
-  ```bash
-  cd /tmp && wget -O - https://raw.githubusercontent.com/bil-elmoussaoui/Hardcode-Tray/master/data/install.sh | bash
-  ```
-
-  2. Install dependencies:
-   - `git`
-   - `wget`
-   - `python3`
-   - `python3-gi`
-   - [`patched sni-qt`](https://github.com/bil-elmoussaoui/sni-qt) <br>
-   - 2.1. Pick up your favorite conversion tool
-       1. `python3-cairosvg`
-       2. `librsvg`
-       3. `inkscape`
-       4. `imagemagick`
-       5. `svgexport`
-  3. Open Hardcode-Tray using this command
-    <pre>hardcode-tray</pre>
-
-  4. Enjoy!
+
+1. Download and install the script:
+
+```bash
+cd /tmp && wget -O - https://raw.githubusercontent.com/bil-elmoussaoui/Hardcode-Tray/master/data/install.sh | bash
+```
+
+2. Install dependencies:
+
+- `git`
+- `wget`
+- `python3`
+- `python3-gi`
+- [`patched sni-qt`](https://github.com/bil-elmoussaoui/sni-qt) <br>
+- Pick up your favorite conversion tool
+  - `python3-cairosvg`
+  - `librsvg`
+  - `inkscape`
+  - `imagemagick`
+  - `svgexport`
+3. Open Hardcode-Tray using this command
+  <pre>hardcode-tray</pre>
+
+4. Enjoy!
 
 You can build [the patched version of sni-qt](https://github.com/bil-elmoussaoui/Hardcode-Tray/wiki/How-to-build-Sni-qt) from source code if you are using a different distribution (like Fedora).<br />
 The `sni-qt:i386` is used for 32 bits applications as Skype.<br />
 Teamviewer is also using the `sni-qt` package. However, it is shipping its own version. Therefore this script also overwrites the version shipped by TeamViewer with the patched one.
 
 ## Options
+
 - `--apply` and `--revert`
 
 Hardcode-Tray shows a welcome message by default and asks the user to choose between applying the fix or reverting it. You can hide that using
+
 ```bash
 hardcode-tray --apply
 ```
+
 or
 
 ```bash
@@ -91,6 +106,7 @@ hardcode-tray --revert
 - `--only`
 
 You can use the `--only` argument to fix/revert only one application; don't use the argument if you want to fix all applications your icon theme supports.
+
 ```bash
 hardcode-tray --only telegram, skype
 ```
@@ -100,102 +116,119 @@ In order to get the names needed to fix only specific programs, you can look at
 - `--path`
 
 If you installed your app in a non-standard location, you can override the path where the icons are stored using the `--path` argument. Only works in combination with the `--only` argument for a single application.
+
 ```bash
 hardcode-tray --only telegram --path /home/user/telegram/
 ```
 
 - `--size`
 
 You can also use `--size {24,22,16}` to force the script to use a different icon size or if the script does not detect your desktop environment.
+
 ```bash
 hardcode-tray --size 24 --only dropbox
 ```
 
 - `--theme`
 
 You can fix your hardcoded icons using a different theme than the default one.
+
 ```bash
 hardcode-tray --theme Numix --only dropbox
 ```
 
 - `--light-theme` and `--dark-theme`
 
 Some applications provide dark and light tray icons with the possibility to modify them using their UI. In order to use a dark theme for dark icons and a light one for light icons, you can use those two arguments. It only works if you use both of them at the same time.
+
 ```bash
 hardcode-tray --dark-theme Numix-light --light-theme Numix
 ```
 
 - `--conversion-tool`
 
 Hardcode-Tray by default detects if the user has either Inkscape, CairoSVG, RSVGConvert, ImageMagick or SVGExport installed and use one of them to convert SVG icons to PNG. In order to choose the tool to use if one of them is broken in your installation is
+
 ```bash
 hardcode-tray --conversion-tool {Inkscape, CairoSVG, RSVGConvert, ImageMagick, SVGExport}
 ```
+
 For now, we support : CairoSVG (python3-cairosvg), Inkscape, rsvgconvert (librsvg), Imagemagick and svgexport(npm library)
 
 Cairo has some issues with converting SVG files that use CSS (see [#245](https://github.com/bil-elmoussaoui/Hardcode-Tray/issues/245)).
 
 - `--change-color`
 
 Your favorite theme does not provide icons for all those hardcoded icons? Just use a different theme and change the colors using Hardcode-Tray.
+
 ```bash
 hardcode-tray --change-color "#FIRSTCOLOR #REPLACE_FIRST_COLOR" "#SECONDCOLOR #REPLACE_SECOND_COLOR"...
 ```
 
 - `--clear-cache`
 
 Let you clear the backup cache folder
+
 ```bash
 hardcode-tray --clear-cache
 ```
 
 - `--version`
 
 You can print the version of Hardcode-Tray using
+
 ```bash
 hardcode-tray --version
 ```
 
 - `--update`
 
 You can also update to the latest version of the script
+
 ```bash
 hardcode-tray --update
 ```
 
 - `--update-git`
 
 You can also update to the git version of the script
+
 ```bash
 hardcode-tray --update-git
 ```
 
 ## Config file
+
 Hardcode-Tray also supports a JSON config file that can be placed under `~/.config`. The file must be named `hardcode-tray.json`. The file supports the following options for now.
+
 - `blacklist`: a list of applications that you don't want to be fixed.
-- `conversion-tool`: the default tool to be used every time you use the script.
+- `conversion_tool`: the default tool to be used every time you use the script.
 - `icons` : An object, that contains `theme` and `size` for the Gtk icon theme and the icon size to be used.
-- `backup-ignore` : A boolean, to configure either you want default icons to be saved on the backup folder or not.
+- `backup_ignore` : A boolean, to configure either you want default icons to be saved on the backup folder or not.
 
 
 ### Node-WebKit JS applications:
+
 In order to fix those ugly tray icons on NWJS applications, you will need to download the SDK from [here](https://nwjs.io/downloads/). Extract the zip file in your home directory (or place it wherever you want) and add a new key to the config file that points to the NwJS SDK directory.
 
 An example of the config file can be found [here](https://github.com/bil-elmoussaoui/Hardcode-Tray/blob/master/data/config.json).
 Passing `--theme` `--conversion-tool` `--size` will overwrite those settings.
 
-
 ## Uninstallation
+
 To remove the script completely from your desktop you can use
+
 ```bash
 cd /tmp && wget -O - https://raw.githubusercontent.com/bil-elmoussaoui/Hardcode-Tray/master/data/uninstall.sh | bash
 ```
 
 ## Credits
+
 - Modified version of `data_pack.py`, by The Chromium Authors released under a BSD-style license
 - Qt applications icons name by [elementaryPlus](https://github.com/mank319/elementaryPlus) team
 
 ## Hardcode-Tray wiki!
+
 - [Changelog](https://github.com/bil-elmoussaoui/Hardcode-Tray/wiki/Changelog)
 - [FAQ](https://github.com/bil-elmoussaoui/Hardcode-Tray/wiki/FAQ)
 - [How to build the patched version of sni-qt](https://github.com/bil-elmoussaoui/Hardcode-Tray/wiki/How-to-build-sni-qt)

diff --git a/data/config.json b/data/config.json
@@ -4,7 +4,7 @@
         "theme": "Numix",
         "size": 24
     },
-    "conversion-tool": "CairoSVG",
-    "backup-ignore": true,
+    "conversion_tool": "CairoSVG",
+    "backup_ignore": true,
     "nwjs": "/home/myusername/Tools/nwjs/"
 }
diff --git a/hardcode-tray b/hardcode-tray
@@ -1,5 +1,5 @@
 #!/bin/bash
-version=v3.8.2
+version=v3.9
 if [[ $EUID -ne 0 ]]; then
   case $1 in
     -u|--update)

diff --git a/hardcode-tray.py b/hardcode-tray.py
@@ -75,7 +75,7 @@
                     help="Clear backup files")
 
 args = parser.parse_args()
-App.get_default(args)
+App.set_args(args)
 
 if (not DESKTOP_ENV or DESKTOP_ENV == "other") and not App.icon_size():
     exit("You need to run the script using 'sudo -E'.\nPlease try again")
@@ -91,9 +91,10 @@
     print("Light Icon Theme: {}".format(App.theme("light")))
 print("Conversion Tool: {}".format(App.svg()))
 print("To Do: ", end="")
-print(", ".join(map(lambda x: x.title(), App.only())) if App.only() else "All")
-# Clear backup cache
-action = App.action()
+print(", ".join(map(lambda x: x.title(), App.get("only"))) if App.get("only") else "All")
+
+
+action = App.get("action")
 if action == Action.APPLY:
     print("Applying now..\n")
 elif action == Action.REVERT: