rbrito / mediterranean-gtk-themes

Maintenance fork of the Mediterranean theme for GTK2/3.
GNU General Public License v3.0
53 stars 12 forks source link

Fix whitespace and `^M` control characters normally generated by Windows #2

Closed darvelo closed 10 years ago

darvelo commented 10 years ago

The original files contain ^M control characters that usually originate from editing files in Windows. The dreaded dos line-endings. These control characters can cause errors on Linux machines.

Extra whitespace at the end of lines is also removed.

darvelo commented 10 years ago

I'd also like to submit a patch next time that removes executable privileges on the themes' files. There are a whole lot of them and apparently it's not necessary. The very popular theme Zukitwo has no executable files.

rbrito commented 10 years ago

Hi, @appleYaks.

On May 04 2014, appleYaks wrote:

The original files contain ^M control characters that usually originate from editing files in Windows. The dreaded dos line-endings. These control characters can cause errors on Linux machines.

Thanks for caring about this.

Your pull request unfortunately only came with a change to the series file, but not with the actual changes.

Anyway, with your answer and with support from other people, I was motivated to bite the bullet and I merged the Debian patches in a "normal" branch that I called upstream-next, which is at:

https://github.com/rbrito/pkg-mediterranean-gtk-themes/tree/upstream-next

Can you please send the changes (regularly, without the bureaucracy of exporting the patches etc) to this branch?

It is fine for me if you just change things and do a force push to your tree, to keep the history clean here, instead of opening another issue. Or, if you prefer, just close this issue and create a new pull request. Whatever is easier for you, so that we can go and fix the real issues.

Regarding the executable bits, please, go ahead (but in a separate pull request). Only executable files should have the executable bit set, after all.

The files are the way that they are because I tried to get a bit-identical copy of the original tarball (and you can create such a bit-identical tarball with the timestamps and everything else with the additional data from the pristine-tar branch).

But since we are deviating from the old upstream, I see no purpose in carrying the unwise decisions that they had.

Again, thanks for helping with the maintenance of one of the last usable, sober, dark (but not complete black) themes out there for GTK.

Thanks,

Rogério Brito.

P.S.: I would have chosen to keep Zukitwo Dark (as that, for me, is the gold standard of what a usable theme is), but this theme is usable at least and it was the one that was easiest to integrate the patches, as it didn't need

the Unico GTK3 engine.

Rogério Brito : rbrito@{ime.usp.br,gmail.com} : GPG key 4096R/BCFCAAAA http://cynic.cc/blog/ : github.com/rbrito : profiles.google.com/rbrito DebianQA: http://qa.debian.org/developer.php?login=rbrito%40ime.usp.br

darvelo commented 10 years ago

Hey, thanks for being so open and enthusiastic about collaborating on this. Like the rest of us, I just want to continue using this theme, even if I have no knowledge of GTK or Gnome theming. I know CSS, so hopefully that'll carry at least a couple of patches. I'm also using Cinnamon, so I'm not sure if my patches will help many others if they're not using it.

I've never seen Zukitwo Dark. Apparently they dropped the Dark version in 2012 because of difficulty in maintenance. You're right, so few mid-level dark themes out there. This is the only one I really liked.

About the PR, there's a change to the series file and also the addition of a new patch file. The changes were so many that GitHub won't even display them unless you ask. I don't blame you for not seeing it, it's very easy to miss.

I'm so glad you decided to bite the bullet and just start merging code into the pristine version. I was a little skeptical at first but I diff'd it and it's pristine just like you said. Now we can do some meaningful stuff! My plans are to try to figure out how to get it working with Gnome's new client-side decorations and border CSS, and to fix my lock screen background, which is missing my wallpaper.

I'm not sure how much time I can dedicate to this, but hopefully in the coming weeks/months I can produce something usable. To open source!

Some helpful links I've found so far (maybe we need a wiki?):

http://worldofgnome.org/how-to-hack-gnomes-adwaita-gtk-theme/ http://blogs.gnome.org/mclasen/2013/12/05/client-side-decorations-in-themes/ http://worldofgnome.org/live-editing-gtk-css-with-gtk-parasite-just-sweet/ https://github.com/chipx86/gtkparasite https://git.gnome.org/browse/gnome-themes-standard/

P.S. Interesting that one of your recent blog posts mentions Paco de Lucia... I just got some music of his recently and it's fantastic.

rbrito commented 10 years ago

Hi, David.

On May 04 2014, appleYaks wrote:

Hey, thanks for being so open and enthusiastic about collaborating on this. Like the rest of us, I just want to continue using this theme, even if I have no knowledge of GTK or Gnome theming.

I don't know many things, but I am willing to learn, especially because I like aesthetics, so that I can work without the computer getting in the way.

I know CSS, so hopefully that'll carry at least a couple of patches. I'm also using Cinnamon, so I'm not sure if my patches will help many others if they're not using it.

That's great, because I am using MATE, which means that if things work for us, then we will have covered a lot of cases with the modern desktops. MATE still uses GTK2, though, which means that I have to take care of different parts with different syntax from what GTK3 wants.

Also, any application that uses Qt (e.g., clementine, qbittorrent, and so on) will be themed with GTK2 if under a GTK-based environment, which is also makes GTK2 theming important.

And, of course, I have applications like GNU Emacs which is currently compiled with GTK3 and I certainly will like to have it looking good.

I've never seen Zukitwo Dark. Apparently they dropped the Dark version in 2012 because of difficulty in maintenance.

I was seriously thinking of creating a bounty (and donating money myself) to get Zukitwo Dark to work with newer versions of GTK. In my very humble opinion, with Zukitwo Dark (GTK theme) + Faenza Darkest (icon theme), my desktop was the most beautiful of all time.

If you want to take a look at how Zukitwo Dark looks like, you can try my repository https://github.com/rbrito/gnome-themes-zukitwo and a (not really representative) screenshot here: http://i.imgur.com/POSEt.jpg

What I am using right now is:

About the PR, there's a change to the series file and also the addition of a new patch file. The changes were so many that GitHub won't even display them unless you ask. I don't blame you for not seeing it, it's very easy to miss.

Thanks for pointing that out. I am getting old and missed that completely. :)

I'm so glad you decided to bite the bullet and just start merging code into the pristine version. I was a little skeptical at first but I diff'd it and it's pristine just like you said. Now we can do some meaningful stuff! My plans are to try to figure out how to get it working with Gnome's new client-side decorations and border CSS, and to fix my lock screen background, which is missing my wallpaper.

Please, see if what we have so far (with the first patches that I hunted from around the web) are not enough. I see that evince (which now has the title bar or whatever it is called) was looking bad, but now it looks "less bad".

When I fire up gtk3-widget-factory things look like this: http://imgur.com/jIJFcww

I'm not sure how much time I can dedicate to this, but hopefully in the coming weeks/months I can produce something usable. To open source!

Me too. I am committed to a lot of projects, but I may be able to tweak one thing or another and integrate patches from more knowledgeable people.

Some helpful links I've found so far (maybe we need a wiki?):

http://worldofgnome.org/how-to-hack-gnomes-adwaita-gtk-theme/ http://blogs.gnome.org/mclasen/2013/12/05/client-side-decorations-in-themes/ http://worldofgnome.org/live-editing-gtk-css-with-gtk-parasite-just-sweet/ https://github.com/chipx86/gtkparasite https://git.gnome.org/browse/gnome-themes-standard/

Thank you for the links. I especially liked to know about the existence of gtkparasite. I think that it will make things much easier to debug.

BTW, go ahead and create anything on the project's wiki. I think that documentation (and I count the commit logs as documentation) is the most important part of the project (well, as long as the software works).

P.S. Interesting that one of your recent blog posts mentions Paco de Lucia... I just got some music of his recently and it's fantastic.

Yes, his work and the Guitar Trio in particular was simply awesome.

Thanks,

Rogério Brito : rbrito@{ime.usp.br,gmail.com} : GPG key 4096R/BCFCAAAA http://cynic.cc/blog/ : github.com/rbrito : profiles.google.com/rbrito DebianQA: http://qa.debian.org/developer.php?login=rbrito%40ime.usp.br

darvelo commented 10 years ago

That's great, because I am using MATE, which means that if things work for us, then we will have covered a lot of cases with the modern desktops. MATE still uses GTK2, though, which means that I have to take care of different parts with different syntax from what GTK3 wants.

Also, any application that uses Qt (e.g., clementine, qbittorrent, and so on) will be themed with GTK2 if under a GTK-based environment, which is also makes GTK2 theming important.

And, of course, I have applications like GNU Emacs which is currently compiled with GTK3 and I certainly will like to have it looking good.

I didn't realize GTK2 was still so prevalent on a GTK3 system like Cinnamon. That's very interesting.

If you want to take a look at how Zukitwo Dark looks like, you can try my repository https://github.com/rbrito/gnome-themes-zukitwo and a (not really representative) screenshot here: http://i.imgur.com/POSEt.jpg

  • GTK theme: MediterraneanNight.
  • Icon theme: Faenza Darkest.
  • Window Manager/Metacity/Marco theme: Zukitwo Dark.
  • Cursor theme: DMZ black.

Zukitwo Dark is pretty nice. Not a bad setup you've got there either. Faenza are great icons. Here's what I'm using:

Please, see if what we have so far (with the first patches that I hunted from around the web) are not enough. I see that evince (which now has the title bar or whatever it is called) was looking bad, but now it looks "less bad".

Things definitely look less bad. I appreciate the work you've put in so far. I had a thought today and wanted to hear what you think of it. Do you think it would be more work, or less work, to simply change the colors of the latest Adwaita (for example) to match Mediterranean themes, rather than port over all the old themes to the new format? I'm really only interested in MediterraneanNight, myself, so maybe if we could reduce the theme count we could make quicker work of things? I see you only made patches for MediterraneanNight and MediterraneanNightDarkest.

Me too. I am committed to a lot of projects, but I may be able to tweak one thing or another and integrate patches from more knowledgeable people.

I noticed you're a Debian maintainer. Thanks for the work you do there. I actually use some of the packages you maintain so it's great to match a face to the awesome power of my system. :)

Thank you for the links. I especially liked to know about the existence of gtkparasite. I think that it will make things much easier to debug.

Hopefully. Thanks for letting me know about gtk3-widget-factory.

I'll start the wiki off soon with the links I pasted and keep adding more over time.

Dvad commented 10 years ago

Hi guys,

Nice to hear you are both motivated for this work.

I had a thought today and wanted to hear what you think of it. Do you think it would be more work, or less work, to simply change the colors of the latest Adwaita (for example) to match Mediterranean themes, rather than port over all the old themes to the new format?

I don't really think it is worth to modify Adwaita with color changes. Actually, that's right, there are new gtk widgets we must add in CSS for this theme, like headerBar and default decoration, but old widgets look still fine with the theme created for 3.6. For me it looks like MediterraneanNight needs only some minor adjustments.

I'm really only interested in MediterraneanNight, myself, so maybe if we could reduce the theme count we could make quicker work of things? I see you only made patches for MediterraneanNight and MediterraneanNightDarkest.

I am only interested in MediterraneanNight too. But I have the impression that others themes differ only by color choice. For instance, some big file like "gtk3.0/gtk-widget.css" is in fact a common file for all these themes. (Colors are defined in this file as variable like "@theme_bg_dark_color") So maybe it would finally not take much time to maintain these too.

Thanks for letting me know about gtk3-widget-factory, too. I didn't know that program!