Skip to content

Commit

Permalink
Merge pull request #112 from gusbemacbe/beta
Browse files Browse the repository at this point in the history
Official Release 25.3
  • Loading branch information
gusbemacbe authored Mar 18, 2019
2 parents 41e875d + 292456a commit a0ad032
Show file tree
Hide file tree
Showing 15,564 changed files with 93,141 additions and 39,684 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
28 changes: 14 additions & 14 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -364,17 +364,17 @@ Thanks/Спасибо to [@bzhmurov](https://github.com/bzhmurov) for adding the
* Cerebro
* ChmSee
* Colour Profile
* Compton (@Magog64)
* Compton (@Bonandry)
* Eclipse JEE
* EOm (@Magog64)
* EOm (@Bonandry)
* Files (Nemo)
* Folder Remote
* Foxit Reader
* GNOME MPV
* Google Translator
* GTK DiskFRee
* GTK Hash (@Magog64)
* GTK Select Colour (@Magog64)
* GTK Hash (@Bonandry)
* GTK Select Colour (@Bonandry)
* GTK3 Demo
* GTK3 Widget Factory
* GTK4 Demo
Expand All @@ -388,22 +388,22 @@ Thanks/Спасибо to [@bzhmurov](https://github.com/bzhmurov) for adding the
* LightDM SEttings
* MiamPlayer
* MidnightCommander
* Mozo (@Magog64)
* Mozo (@Bonandry)
* Oracle Java 8
* Osmo
* Panel Drawer
* PHPSTorm
* PyCharm
* Python 3.5
* RClock
* Remmina (@Magog64)
* Remmina (@Bonandry)
* Revelation
* Rygel
* Seahorse Preferences
* Softare Properties GTK (@Magog64)
* Softare Properties GTK (@Bonandry)
* Software Center
* Synthesia
* TRON (by @Magog64)
* TRON (by @Bonandry)
* Typora
* Vidiot
* Yarock
Expand Down Expand Up @@ -508,19 +508,19 @@ Thanks/Спасибо to [@bzhmurov](https://github.com/bzhmurov) for adding the
* Acorn
* Adventure Editor
* Alien Arena
* Amnesia Dark Descent (by @Magog64)
* Amnesia Dark Descent (by @Bonandry)
* And Yet It Moves
* Aspette
* Assault Cube
* Astromenace (by @Magog64)
* Astromenace (by @Bonandry)
* ATomic
* Awesomonauts (by @Magog64)
* Awesomonauts (by @Bonandry)
* Halo
* Origin

# v14 – Venice

Designed @Magog64:
Designed @Bonandry:

* Improved icons in the `apps`, `mimetypes` and `places`
* Added icons:
Expand Down Expand Up @@ -595,7 +595,7 @@ Icons designed by @gusbemacbe:
* Added `places` icons:
* Folder Applications (similar to macOS)

Icons designed by @Magog64:
Icons designed by @Bonandry:

* Added icons
* Google Music Player
Expand All @@ -622,7 +622,7 @@ Icons designed by @Magog64:

# v13.1

* Due to @paullinuxthemer's suggestions, I and @magog64 decided to separate the GTK, icons themes and wallpapers for the new repositories for facilitating the users who wish to download only the icons themes. Besides, the desktop and cursor theme will be maintained in the Suru++.
* Due to @paullinuxthemer's suggestions, I and @Bonandry decided to separate the GTK, icons themes and wallpapers for the new repositories for facilitating the users who wish to download only the icons themes. Besides, the desktop and cursor theme will be maintained in the Suru++.
* We have announced that @gusbemacbe officialised and released the PPA od Suru++ which comes with a full pack:

```shell
Expand Down
71 changes: 3 additions & 68 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,72 +1,7 @@
# Contributing

We are open for new issues and pull requests. By participating in this project, you agree to abide by our [Licence][licence].
The instructions and deisgn guidelines were moved to [Suru++ Site – Design Guidelines](https://gusbemacbe.github.io/suru-plus-site/guidelines.html).

If you'd like to contribute and don't understand something here, reach out on our issue, and we will be happy to offer solutions. Additionally, we welcome any attempts to engage with the project - through acquiring the source code, following documentation steps to get started, and then offering feedback in our communications channels on how this process could be improved.

[licence]: /gusbemacbe/suru-plus/blob/master/LICENSE

## Steps

### Fork and Clone

Fork our repository and create a clone to your personal system.

### Branches

After forking our repository, create one branch per bugs or per files or per icons on your personal repository.

The branch name should describe the bug or version ("alpha or "beta" or "new-icons" or "unstable" or "beta-emergency" or "unstable-emergency"). It should start with the bug or version number, and include a very short description of the bug, or a short version of the bug's title.

## Developing

### Gravit Designer

* You must use the app [Gravit Designer](https://gravit.io) to build the new icons.
* Please use our icon template [Suru++ 20 Icon Template](https://github.com/gusbemacbe/suru-plus/blob/beta/templates/Suru%2B%2B%2020%20Template.gvdesign), opening it with Gravit Designer. Export to SVG.
* Also make two monochromatic and small icons:
* one for the folder `16`
* another for the `symbolic` with the suffix `-symbolic`.
* Export both to SVG.
* It is important that not all the features of an icon are supported in the KDE environment. Here are the unsupported features:
* Blur
* Drop shadow blur (use the natural drop shadow in Gravit Designer)
* Inner shadow blur (use the natural inner shadow in Gravit Designer)
* Masks (instead, cut with intersection or vectorise all the objects)
* You must follow the rules of colours and grids of Sam Hewitt's [Suru Design Guideline](https://snwh.org/suru/guidelines).
* **Colours:** As for Suru++20, prefer the vivid colours of Suru plaette
* **Grids:** A symbol must be resized to 145px and if it is a symbol in form of circle grid, use 165px.
* We also provide a Suru colours palette. Here is the [Suru Palette](https://github.com/gusbemacbe/suru-plus/blob/beta/templates/Suru%20Palette.gvswatch).
* As for the gradients, we prepare a list of gradients for you: [Suru++ Gradients Palette](https://github.com/gusbemacbe/suru-plus/blob/beta/templates/Suru%2B%2B%20Gradients%20Palette.gvswatch).

### Inkscape

Since you are not a Gravit Designer and Gravit Designer will be no longer free in the next version, I will prepare some instructions. You also must take careful for not breaking the groups.

* Follow the same above steps
* Do not ungroup the two groups - highlighting and shape, because if you ungroup, they will lose the drop shadow.

### Commit messages

Commit messages should generally follow [this helpful advice](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html), but please start your commit message with:
* "Added [name of icon] icon" if it is only an icon
* "Added [number of icons] icons" if it is more than icons
* "Fixes #nn:" if it is a bug
* "Improved ##nn" if it is an improvement of a file or an icon

It eases skimming history later. For this reason, the first line will tend to be longer than the 50 chars suggested in that article, aim to keep it less than 72 chars.

### Submitting the pull request

When you submit a pull request, please use the description field to explain in words the overall intention of your changes. A few sentences should be plenty. It's also ok to reuse the commit message, if you included a lot of discussion there.

At this point you're waiting on us. We like to at least comment on pull requests within among one and three days. We may suggest some changes or improvements or alternatives.

### Reviews

We try to avoid landing anything without at least a cursory review. We firstly may analyse your codes, your icons or anything else if they must improve.

### Merging

When a pull request has passed review, the reviewer generally merges.
## Toolkit

You can find the files and palettes in the folder "templates".
157 changes: 152 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
</p>

<h3 align="center">A third-party Suru icons for more than 20 distributions </h3>
<h3 align="center">Successor of <a href="https://github.com/Magog64">@Magog64</a>’s <a href="https://github.com/Magog64/SURU-PLUS">Suru++ Ubuntu</a></h3>
<h3 align="center">Successor of <a href="https://github.com/Bonandry">@Bonandry</a>’s <a href="https://github.com/Bonandry/SURU-PLUS">Suru++ Ubuntu</a></h3>
<h3 align="center">A cyberpunkish, elegant, futuristic, macOS-like, papirusified and modern Suru icons based on <a href="https://snwh.org/suru">Suru Icons</a> by Sam Hewitt</h3>

<p align="center">
Expand Down Expand Up @@ -49,6 +49,7 @@
- [Snap-built apps](#snap-built-apps)
- [AppImage-built apps](#appimage-built-apps)
- [Hardcoded application icons with ugly name](#hardcoded-application-icons-with-ugly-name)
- [Unattractive icons of Bluetooth Manager, Gigolo, Network Wifi, etc.](#unattractive-icons-of-bluetooth-manager-gigolo-network-wifi-etc)
- [Hardcoded tray icons](#hardcoded-tray-icons)
- [Unrecognised and ugly icons](#unrecognised-and-ugly-icons)
- [Okular icon and other icons](#okular-icon-and-other-icons)
Expand All @@ -64,7 +65,7 @@

#### Redesign

Following Sam Hewitt’s rules of grids, and making less conservative and traditional <a href="https://github.com/Magog64">@Magog64</a>’s <a href="https://github.com/Magog64/SURU-PLUS">Suru++ Ubuntu</a>, more than 15k icons have been redesigned, papirusified and improved with new cyberpunk colours and made been compatible with KDE, XFCE and other many environments! Check the new icons:
Following Sam Hewitt’s rules of grids, and making less conservative and traditional <a href="https://github.com/Bonandry">@Bonandry</a>’s <a href="https://github.com/Bonandry/SURU-PLUS">Suru++ Ubuntu</a>, more than 15k icons have been redesigned, papirusified and improved with new cyberpunk colours and made been compatible with KDE, XFCE and other many environments! Check the new icons:

![Screenshot](images/preview1-new.png)

Expand Down Expand Up @@ -273,26 +274,172 @@ Icon=snap/icons/icon.png
Icon=insomnia
```

4. Run `update-desktop-database` in the terminal.

### AppImage-built apps

With AppImageLauncher installed, you click an AppImage, it is automatically integrated to `~/Applications`, and desktop files are automatically created into `~/local/share/applications`. But if you modify one of the AppImage-built app desktop file to correct the icon path, AppImageLauncher reverts automatically the desktop file to the original and keeps again the icon path hardcoded. It also removes the option `StartupWMClass`. We recommend you to ban `AppImageLauncher`.

1. Remove `appimagelauncher` via terminal;
2. Make all AppImages executable and trusted:
2. Create `~/Applications/AppImages/`, move all AppImages to this folder. Make all AppImages executable and trusted:

```bash
chmod a+x *.AppImage
```

3. Reboot;
4. Create the desktop files manually in the directory `~/.local/share/applications`. Do not forget of adding the option `StartupWNClass` or the icon will be unrecognised or ugly.
4. Create the desktop files manually in the directory `~/.local/share/applications`. Do not forget of adding the option `StartupWNClass` or the icon will be unrecognised or ugly. The desktop file, for example, `ColourPicker.desktop`, should be like:

```
[Desktop Entry]
Categories = Graphics;
Comment = A mininal but complete color picker
Comment[en_GB] = A mininal but complete colour picker
Exec = $HOME/Applications/AppImages/ColorPicker.AppImages
GenericName = Color Picker
GenericName[en_GB] = Colour Picker
Icon = colorpicker
Name = Color Picker
Name[en_GB] = Colour Picker
StartupNotify = true
StartupWMClass = ColorPicker
Terminal = false
Type = Application
Version = 1.0
```

And run `update-desktop-database`.

**Tips**

* To know which `StartupWNClass` name, it is the original same AppImage, for example, see in bold: <b><code>ColorPicker</b>.AppImage</code>. If it does not work, you need to extract the AppImage to figure the `bin` shell name.
* If you are foreigner and want comment and name in your native language, you can add, for example, `Comment[en_GB]`, `GenericName[en_GB]` and `Name[en_GB]`. If to Spanish, it would be`[es]`, and to Spanish from Mexico, `[es_MX]`.
* The AppImage names should remain original, but if you want to rename, you are free, but for the `StartupWNClass` name, you need to put the original name of that AppImage.

### Hardcoded application icons with ugly name

We have already icons, but it is wrong or ugly name, or because the icon is hardcoded. For example, the application GitHub Desktop used `Icon=desktop.png` and other apps, like Insomnia, use `Icon=icon.png`, or worse, `Icon=stupid/path/icon.png`.

To deal with hardcoded application icons we recommend to install [hardcode-fixer](https://github.com/Foggalong/hardcode-fixer). Suru++ supports most of the applications in the list. If [hardcode-fixer](https://github.com/Foggalong/hardcode-fixer) doesn't support your favourite app yet, please open an [issue here](https://github.com/Foggalong/hardcode-fixer/issues) or edit your .desktop file manually.

### Unattractive icons of Bluetooth Manager, Gigolo, Network Wifi, etc.

Because the desktop files use the 16px icons of `actions`, `mimetypes`, `panel` and `places` and not the icons of `apps` and `categories`. Therefore, you need to change manually the icon names in the desktop files to catch the icons of `apps`. You can pick of categoric and generic icons:

* `accessibility`
* `addressbook`
* `agenda`
* `application`
* `applications-engineering`
* `applications-interfacedesign`
* `archiver`
* `audio`
* `bluetooth`
* `book`
* `bookworm`
* `broom`
* `browser`
* `bug`
* `caffeine`
* `calculator`
* `calendar`
* `camera`
* `cdrom`
* `charmap`
* `chat`
* `chess`
* `cipher`
* `clipboard`
* `clock`
* `coin`
* `color-picker`
* `colour`
* `computer`
* `database`
* `debian`
* `desktop`
* `dictionary`
* `document`
* `download`
* `ebook`
* `effects`
* `emacs`
* `file-manager`
* `film`
* `flash`
* `font`
* `gameboy`
* `git`
* `hammer`
* `harddisk`
* `help`
* `icons`
* `image-viewer`
* `image`
* `java`
* `keyboard`
* `kronometer`
* `language`
* `leaf`
* `library`
* `login`
* `mail`
* `maps`
* `mate`
* `menu`
* `microphone`
* `monitor`
* `mouse`
* `music`
* `network`
* `night`
* `notepad`
* `notification`
* `package`
* `paint`
* `panel`
* `partitions`
* `password`
* `phone`
* `plasma`
* `plugin`
* `power`
* `ppa`
* `printer`
* `programming`
* `qt`
* `radio`
* `ruby`
* `scissors`
* `screenshot`
* `search`
* `settings`
* `share`
* `shield`
* `shop`
* `star`
* `steam`
* `sublime-text`
* `subtitleeditor`
* `tablet`
* `tag`
* `television`
* `terminal`
* `tool`
* `update`
* `upload`
* `usb`
* `user`
* `video-alt`
* `video-card`
* `voice`
* `wallpaper`
* `weather`
* `webcam`
* `wifi`
* `workspace`


### Hardcoded tray icons

To fix hardcoded tray icons, install and use [Hardcode-Tray script](https://github.com/bil-elmoussaoui/Hardcode-Tray). A list of supported applications is available here.
Expand Down Expand Up @@ -337,7 +484,7 @@ The changelog is available on the release page in theme's repository.
## Credits and Licences

* CC BY-SA/GPL3 © 2018-2019 [Suru Icons](https://github.com/snwh/suru-icon-theme) by [Sam Hewitt](https://github.com/snwh).
* GPL3 © 2018-2019 [Suru++ Ubuntu](https://github.com/Magog64/suru-plus) by [Andrea Bonanni](https://github.com/Magog64) and Gustavo Costa.
* GPL3 © 2018-2019 [Suru++ Ubuntu](https://github.com/Bonandry/suru-plus) by [Andrea Bonanni](https://github.com/Bonandry) and Gustavo Costa.
* GPL3 © 2018-2019 Suru++ 25 by Gustavo Costa.
* GPL3 © [Papirus](https://github.com/PapirusDevelopmentTeam/) by [Alexey Varfolomeev](https://github.com/varlesh).
* GPL3 © [Numix](https://github.com/numixproject/numix-icon-theme) by Numix Team.
Expand Down
1 change: 1 addition & 0 deletions Suru++-Light/actions
14 changes: 14 additions & 0 deletions Suru++-Light/animations/22/nm-stage01-connecting01.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit a0ad032

Please sign in to comment.