Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Better management for our fork #1221

Closed
Ste74 opened this issue Apr 15, 2018 · 22 comments
Closed

Better management for our fork #1221

Ste74 opened this issue Apr 15, 2018 · 22 comments
Labels

Comments

@Ste74
Copy link

Ste74 commented Apr 15, 2018

Hi there, i'm the creator of the papirus variant for Manjaro ( papirus-maia-icon-theme ) and probably remember when @FadeMind talk about this variant. Well my variant use -maia in theme index for showing the new theme but since papirus is very complex theme in the folder tree ( symlink ) i have do the papirus-maia in conflicts with papirus regular theme . I know your script to change folder color but this not solve the problem because this script no create the new index-theme and in our forum ( since your theme is really famous ) users asking to install both themes at the same time ( usefull also for our DE settings ).
This is the point in the PKGBUILD where born the conflicts
https://github.com/manjaro/packages-community/blob/master/papirus-maia-icon-theme/PKGBUILD#L62.
Any input from you are very appreciated

Stefano
Manjaro Team

@FadeMind
Copy link
Contributor

IMHO @varlesh could just prepare valid folder icons with -maia- sufix (like for blue, black, orange and so on) and customize proper green color. Alex please consider this cause We (as Community) appreciate your work. Papirus is very popular on Manjaro Distro.

[fademind@manjaro places]$ ls |grep blue-                                   
folder-blue-activities.svg
folder-blue-apple.svg
folder-blue-cd.svg
folder-blue-copy-cloud.svg
folder-blue-desktop.svg@
folder-blue-development.svg
folder-blue-documents.svg
folder-blue-downloads.svg@
folder-blue-download.svg
folder-blue-drag-accept.svg
folder-blue-dropbox.svg
folder-blue-favorites.svg
folder-blue-games.svg
folder-blue-github.svg
folder-blue-git.svg
folder-blue-gnome.svg
folder-blue-google-drive.svg
folder-blue-image-people.svg
folder-blue-important.svg
folder-blue-java.svg
folder-blue-linux.svg
folder-blue-locked.svg
folder-blue-mail-cloud.svg
folder-blue-mail.svg
folder-blue-mega.svg
folder-blue-meocloud.svg
folder-blue-music.svg
folder-blue-network.svg
folder-blue-open.svg
folder-blue-owncloud.svg
folder-blue-photo.svg
folder-blue-pictures.svg
folder-blue-print.svg
folder-blue-private.svg
folder-blue-public.svg@
folder-blue-recent.svg
folder-blue-remote.svg
folder-blue-script.svg
folder-blue-steam.svg
folder-blue-tar.svg
folder-blue-templates.svg
folder-blue-torrent.svg
folder-blue-unlocked.svg
folder-blue-vbox.svg
folder-blue-videos.svg@
folder-blue-video.svg
folder-blue-visiting.svg
folder-blue-wifi.svg
folder-blue-wine.svg
folder-blue-yandex-disk.svg
user-blue-desktop.svg
user-blue-home.svg
[fademind@manjaro places]$ ls |grep black-
folder-black-activities.svg
folder-black-apple.svg
folder-black-cd.svg
folder-black-copy-cloud.svg
folder-black-desktop.svg@
folder-black-development.svg
folder-black-documents.svg
folder-black-downloads.svg@
folder-black-download.svg
folder-black-drag-accept.svg
folder-black-dropbox.svg
folder-black-favorites.svg
folder-black-games.svg
folder-black-github.svg
folder-black-git.svg
folder-black-gnome.svg
folder-black-google-drive.svg
folder-black-image-people.svg
folder-black-important.svg
folder-black-java.svg
folder-black-linux.svg
folder-black-locked.svg
folder-black-mail-cloud.svg
folder-black-mail.svg
folder-black-mega.svg
folder-black-meocloud.svg
folder-black-music.svg
folder-black-network.svg
folder-black-open.svg
folder-black-owncloud.svg
folder-black-photo.svg
folder-black-pictures.svg
folder-black-print.svg
folder-black-private.svg
folder-black-public.svg@
folder-black-recent.svg
folder-black-remote.svg
folder-black-script.svg
folder-black-steam.svg
folder-black-tar.svg
folder-black-templates.svg
folder-black-torrent.svg
folder-black-unlocked.svg
folder-black-vbox.svg
folder-black-videos.svg@
folder-black-video.svg
folder-black-visiting.svg
folder-black-wifi.svg
folder-black-wine.svg
folder-black-yandex-disk.svg
user-black-desktop.svg
user-black-home.svg

@SmartFinn
Copy link
Member

SmartFinn commented Apr 15, 2018

@FadeMind we already have the color with -teal- suffix for Manjaro:

folder-teal user-teal-home folder-teal-download

@FadeMind
Copy link
Contributor

How to set then -teal- as default?

@varlesh
Copy link
Contributor

varlesh commented Apr 15, 2018

you need create script for remap symlinks

@SmartFinn
Copy link
Member

@FadeMind by using our papirus-folders. The script rebuild the symlinks even after papirus-icon-theme package upgrade (when installing via Papirus Installer or PPA).

@Ste74
Copy link
Author

Ste74 commented Apr 15, 2018

thanks for the quick response, then we would already have a color for manjaro (not verified but corresponds to #16a085?) but how can we also have the whole theme with suffix -maia..

EDIT: uhm not teal color is #008080 ( as wikipedisay ) so no we have to recolor anyway ( offiacial maia color for manjaro is #16a085 )

@FadeMind
Copy link
Contributor

screenshot_20180415_174548

@varlesh
Copy link
Contributor

varlesh commented Apr 15, 2018

another solution - create theme with teal folders only (and rename) and use Papirus as fallback (on inherits)

@FadeMind
Copy link
Contributor

Symlinks

[fademind@manjaro places]$ ls |grep @
certificate-server.svg@
desktop.svg@
folder-activities.svg@
folder-apple.svg@
folder-black-desktop.svg@
folder-black-downloads.svg@
folder-black-public.svg@
folder-black-videos.svg@
folder-blue-desktop.svg@
folder-blue-downloads.svg@
folder-blue-public.svg@
folder-blue-videos.svg@
folder-bookmarks.svg@
folder-bookmark.svg@
folder-brown-desktop.svg@
folder-brown-downloads.svg@
folder-brown-public.svg@
folder-brown-videos.svg@
folder-camera.svg@
folder-cd.svg@
folder-cloud.svg@
folder-copy-cloud.svg@
folder-custom-desktop.svg@
folder-custom-downloads.svg@
folder-custom-public.svg@
folder-custom-videos.svg@
folder-cyan-desktop.svg@
folder-cyan-downloads.svg@
folder-cyan-public.svg@
folder-cyan-videos.svg@
folder-decrypted.svg@
folder-desktop.svg@
folder-development.svg@
folder-documents.svg@
folder-downloads.svg@
folder-download.svg@
folder-drag-accept.svg@
folder-dropbox.svg@
folder-encrypted.svg@
folder-favorites.svg@
folder-games.svg@
folder-gdrive.svg@
folder-github.svg@
folder-git.svg@
folder-gnome.svg@
folder-google-drive.svg@
folder-green-desktop.svg@
folder-green-downloads.svg@
folder-green-public.svg@
folder-green-videos.svg@
folder-grey-desktop.svg@
folder-grey-downloads.svg@
folder-grey-public.svg@
folder-grey-videos.svg@
folder_home.svg@
folder-home.svg@
folder-html.svg@
folder-image-people.svg@
folder-images.svg@
folder-image.svg@
folder-important.svg@
folder-java.svg@
folder-linux.svg@
folder-locked.svg@
folder-magenta-desktop.svg@
folder-magenta-downloads.svg@
folder-magenta-public.svg@
folder-magenta-videos.svg@
folder-mail-cloud.svg@
folder-mail.svg@
folder-mega.svg@
folder-meocloud.svg@
folder-music.svg@
folder-network.svg@
folder_open.svg@
folder-open.svg@
folder-orange-desktop.svg@
folder-orange-downloads.svg@
folder-orange-public.svg@
folder-orange-videos.svg@
folder-owncloud.svg@
folder-photos.svg@
folder-photo.svg@
folder-pictures.svg@
folder-picture.svg@
folder-print.svg@
folder-private.svg@
folder-publicshare.svg@
folder-public.svg@
folder-recent.svg@
folder-red-desktop.svg@
folder-red-downloads.svg@
folder-red-public.svg@
folder-red-videos.svg@
folder-remote.svg@
folder-script.svg@
folder-sound.svg@
folder-steam.svg@
folder.svg@
folder-tar.svg@
folder-teal-desktop.svg@
folder-teal-downloads.svg@
folder-teal-public.svg@
folder-teal-videos.svg@
folder-templates.svg@
folder-temp.svg@
folder-text.svg@
folder-torrent.svg@
folder-txt.svg@
folder-unlocked.svg@
folder-vbox.svg@
folder-videocamera.svg@
folder-videos.svg@
folder-video.svg@
folder-violet-desktop.svg@
folder-violet-downloads.svg@
folder-violet-public.svg@
folder-violet-videos.svg@
folder-visiting.svg@
folder-wifi.svg@
folder-wine.svg@
folder-yandex-disk.svg@
folder-yellow-desktop.svg@
folder-yellow-downloads.svg@
folder-yellow-public.svg@
folder-yellow-videos.svg@
gnome-fs-bookmark-missing.svg@
gnome-fs-bookmark.svg@
gnome-fs-directory-accept.svg@
gnome-fs-directory.svg@
gnome-fs-home.svg@
gnome-home.svg@
gtk-directory.svg@
inode-directory.svg@
insync-folder.svg@
knetattach.svg@
library-music.svg@
network.svg@
repository.svg@
stock_bookmark.svg@
stock_delete-bookmark.svg@
stock_folder.svg@
stock_open.svg@
user-desktop.svg@
user-home.svg@
[fademind@manjaro places]$ 

@SmartFinn
Copy link
Member

Agree with @varlesh. Just add papirus-icon-theme as a dependent to your package and remap symlinks in places. The other icons should be inherited from Papirus.

@Ste74
Copy link
Author

Ste74 commented Apr 15, 2018

This seem make sense like in the past use arc-maia based on arc icons and fallback to moka icon theme..
@FadeMind can you help me 😉

@FadeMind
Copy link
Contributor

Yep

@SmartFinn
Copy link
Member

There is a script that helps to remap all needed symlinks from PKGBUILD #1191 (comment)

@Ste74
Copy link
Author

Ste74 commented Apr 15, 2018

Thank you guys, very collaborative .. thank you so much 😄

@SmartFinn
Copy link
Member

SmartFinn commented Apr 15, 2018

Ha, in the case when using Inherits method the following themes should not contain any icon:

  • Papirus-Dark-Maia (gets places from Papirus-Maia)
  • Papirus-Light-Maia (gets places from Papirus-Maia)
  • Papirus-Adapta-Nokto-Maia (gets places from Papirus-Adapta-Maia)

These themes must contain only index.theme that should looks like:

[Icon Theme]
Name=Papirus-Adapta-Nokto-Maia
Comment=Papirus Maia icon theme for Adapta Nokto
Inherits=Papirus-Adapta-Maia,Papirus-Adapta-Nokto,Papirus,breeze-dark,ubuntu-mono-dark,gnome,hicolor

Example=folder

FollowsColorScheme=true

DesktopDefault=48
DesktopSizes=16,22,24,32,48,64
ToolbarDefault=22
ToolbarSizes=16,22,24,32,48
MainToolbarDefault=22
MainToolbarSizes=16,22,24,32,48
SmallDefault=16
SmallSizes=16,22,24,32,48
PanelDefault=48
PanelSizes=16,22,24,32,48,64
DialogDefault=48
DialogSizes=16,22,24,32,48,64

@FadeMind
Copy link
Contributor

@SmartFinn
Copy link
Member

@FadeMind actually no. Here is the index.theme for Papirus-Adapta-Maia:

[Icon Theme]
Name=Papirus-Adapta-Maia
Comment=Papirus Maia icon theme for Adapta
Inherits=Papirus-Adapta,Papirus,breeze,ubuntu-mono-dark,gnome,hicolor

Example=folder

FollowsColorScheme=true

DesktopDefault=48
DesktopSizes=16,22,24,32,48,64
ToolbarDefault=22
ToolbarSizes=16,22,24,32,48
MainToolbarDefault=22
MainToolbarSizes=16,22,24,32,48
SmallDefault=16
SmallSizes=16,22,24,32,48
PanelDefault=48
PanelSizes=16,22,24,32,48,64
DialogDefault=48
DialogSizes=16,22,24,32,48,64

# Directory list
Directories=16x16/places,16x16@2x/places,22x22/places,22x22@2x/places,24x24/places,24x24@2x/places,32x32/places,32x32@2x/places,48x48/places,48x48@2x/places,64x64/places,64x64@2x/places

[16x16/places]
Context=Places
Size=16
Type=Fixed

[16x16@2x/places]
Context=Places
Size=16
Scale=2
Type=Fixed

[22x22/places]
Context=Places
Size=22
Type=Fixed

[22x22@2x/places]
Context=Places
Size=22
Scale=2
Type=Fixed

[24x24/places]
Context=Places
Size=24
Type=Fixed

[24x24@2x/places]
Context=Places
Size=24
Scale=2
Type=Fixed

[32x32/places]
Context=Places
Size=32
Type=Fixed

[32x32@2x/places]
Context=Places
Size=32
Scale=2
Type=Fixed

[48x48/places]
Context=Places
Size=48
Type=Fixed

[48x48@2x/places]
Context=Places
Size=48
Scale=2
Type=Fixed

[64x64/places]
Context=Places
Size=64
MinSize=64
MaxSize=512
Type=Scalable

[64x64@2x/places]
Context=Places
Size=64
Scale=2
MinSize=64
MaxSize=512
Type=Scalable

Papirus-Adapta-Maia theme should contains only places icons with remaped symlinks to teal color.

@SmartFinn
Copy link
Member

I was wrong. Papirus-Dark-Maia, Papirus-Light-Maia, and Papirus-Adapta-Nokto-Maia themes should contain monochrome (16x16) places icons. That adds a few problems, but we can fix it by moving user-trash.svg and user-trash-full.svg icons from status to places.

Here is a demo Papirus-Maia.tar.gz

@Ste74
Copy link
Author

Ste74 commented Apr 16, 2018

@SmartFinn thank you , after modifications pushed in our community for testing 😃
https://github.com/manjaro/packages-community/commit/530d4368d7f2eac736e36b9364eb5349fbd48309

@Ste74
Copy link
Author

Ste74 commented Apr 19, 2018

Sorry for delay and thank you again for your effort .. @SmartFinn i grabbed your "demo" and modified a little the colors ( you can see the sed command here .. Seem all is fine but @FadeMind report this issue: papirus-light-maia not show the proper gtk preview in plasma ..
30703869_599182787103378_2112811592495136768_n
30712093_599182790436711_7507632391372931072_n
30712778_598776553810668_451799811868327936_n
30715230_599182797103377_6000879729891082240_n
30724473_599182807103376_1529651206606028800_n
30740161_599182813770042_1227151291239628800_n
You know what happen?

@FadeMind
Copy link
Contributor

THIS screenshot was cause I downloaded ZIPPED archive instead of git clone whole.
s
so ignore this.

Main issue is that:

screenshot_20180420_064742
screenshot_20180420_064759
screenshot_20180420_064817
screenshot_20180418_083131
screenshot_20180418_083151
screenshot_20180418_083217
screenshot_20180418_083242
screenshot_20180418_083315

SmartFinn added a commit that referenced this issue Oct 4, 2018
SmartFinn added a commit that referenced this issue Oct 4, 2018
- Removed user-bookmarks icon from 16x16/places
- Renamed bookmarks to user-bookmark
- Fixed broken symlinks
SmartFinn added a commit that referenced this issue Oct 4, 2018
- Makes bookmarks icon similar to bookmark-new and bookmarks-symbolic icons
- Fixed bookmark-new icon
SmartFinn added a commit that referenced this issue Oct 4, 2018
This is an icon for Double Commander.
No needs to add the following icons:

- folder-link-broken
- folder-link
- link-broken
- link

These icons are not used when setting `Options` → `Icons` →
[x] `Show overlay icons, e.g. for links`
@SmartFinn
Copy link
Member

@FadeMind The preview is buggy. For example, it shows that the chosen folder color should be blue, but the folder color is teal.

screenshot_20181007-23-45-32

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

No branches or pull requests

4 participants