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

Add desktop and icon files #712

Merged
merged 1 commit into from Jan 18, 2017
Merged

Add desktop and icon files #712

merged 1 commit into from Jan 18, 2017

Conversation

AsciiWolf
Copy link
Contributor

This pull request adds the previously missing desktop and icon files.
Fixes #710.

@AsciiWolf
Copy link
Contributor Author

@austin987 Please let me know if there are any problems with this pull request.

@jre-wine
Copy link
Contributor

jre-wine commented Jan 15, 2017

In Debian we have a nearly identical .desktop file, however it has
Categories=Wine;
while this PR has:
Categories=Utility;Emulator;
The latter are official ones, see https://specifications.freedesktop.org/menu-spec/latest/apa.html and https://specifications.freedesktop.org/menu-spec/latest/apas02.html. I'm not sure about this, but do you think we should add "Wine"? btw, the Wine wine.desktop specifies no Categories.

For the copyright:
I have verified that the suggested winetricks.svg is identical to the one in Debian:

$ md5sum winetricks.svg 
308b1036aadd9abde3f3925006027ad1  winetricks.svg

Then we have in debian/copyright

Files: debian/winetricks.svg
Copyright:
 2010-2011 Joel Holdsworth <joel@airwebreathe.org.uk>
Comment:
 See http://bugs.debian.org/708198 for confirmation of copyright.
 .
 Date: Wed, 20 Apr 2011 18:10:48 -0700
 From: Scott Ritchie (winetricks Ubuntu maintainer) <scott@open-vote.org>
 To: Jari Aalto <jari.aalto@cante.net>
 Subject: Re: winetricks: *.svg file copyright in Ubuntu package
 .
 On 04/20/2011 12:01 AM, Jari Aalto wrote:
 .
 Oh hey!
 .
 > The Ubuntu package ships *.svg icon which would also be good for Debian.
 > Could your point em to the person who holds the copyright. Do you know
 > under which licence it is released?
 >
 .
 The icon is the same copyright as the icons in the wine/winetricks
 package itself -- Copyright Joel Holdsworth <joel@airwebreathe.org.uk>
 and licensed the same way Wine is (LGPL 2.1+)
 .
 I'll update the copyright file next upload.
 .
 Thanks,
 Scott Ritchie
License: LGPL-2.1+

@AsciiWolf
Copy link
Contributor Author

AsciiWolf commented Jan 15, 2017

"Wine" is a non-standard (non-valid) category. I don't think it should be added.

Wine.desktop doesn't have any categories because it's not a menu launcher file.

@jre-wine
Copy link
Contributor

You're right, after running desktop-file-validate winetricks.desktop I'd suggest (if at all):
Categories=Utility;Emulator;X-Wine;

@jre-wine
Copy link
Contributor

Ok, after looking into this again I now really propose a change:
Categories=Emulator;System;

This way I see it in Gnome in "System Tools", instead of "Accessories". I think it matches much better in that category: "Accessories" is for things like Calculator, that you use for doing other things. "System Tools" is for changing parts of your System, which is what winetricks does.
"Emulator" seems to have no effect here, but "desktop-file-validate" suggested to use it together with System.
Both "Wine" and "X-Wine" seem to have no effect here, although I have a "Wine" category, created by installed Windows applications.

@austin987
Copy link
Contributor

Where does utilities end up? I think winetricks is more of a utility than a system tool. It should run as an unprivileged user, and is used within user writeable locations, not /var or the like.

I'm not strongly opinioned, as long as there's consensus on what is chosen. I'm not going to be using the GUI to run it ;)

@jre-wine
Copy link
Contributor

Not a strong opinion here either. I just want to get this implemented and be done with it.

Here in Gnome if I change winetricks.desktop to ...

  • "Categories:Utility" --> Menu "Accessories", not in "System Tools" or "Utilities".
  • "Categories:System" --> Menu "System Tools", not in "Accessories" or "Utilities".

Other entries in menu...

  • "Accessories": Bluetooth Transfer, Calculator, Desktop Search, Help, Maps, Notes, Remote Desktop Viewer, Gnome Tweak Tool. VirtualBox, Weather, several editors and pdf viewers
  • "System Tools": Gnome Settings, CD/DVD Creator, Color Picker, GSmartControl, Keyboard Layout, Network Tools, Software, System Log, System Monitor, Terminal
  • "Utilities": Archive Manager, Characters, Disks, Disk Usage Analyzer, Font Viewer, Help, Image Viewer, Logs, Passwords and Keys, Gnome Tweak Tool, pdf Viewer

@austin987
Copy link
Contributor

austin987 commented Jan 16, 2017 via email

@jre-wine
Copy link
Contributor

/usr/share/applications/org.gnome.FileRoller.desktop:
Categories=GTK;GNOME;Utility;Archiving;Compression;X-GNOME-Utilities;

So here in Gnome category "Utility" is for menu "Accessories", and X-GNOME-Utilities for menu "Utilities". I'm against using desktop specific settings here (I assume we all agree on that).
My reasoning is I see "Accessories" as everyday helpers (weather, calculator, ...), while "System Tools" seems to be more for "change a setting and be done with it". I see winetricks in the latter (but no hard opinion on this). Obviously there's no clear line between those, Gnome's third category adds even more confusion.

@AsciiWolf
Copy link
Contributor Author

In my opinion, the "Utility" category is a better choice (I like it more and it's also used by PlayOnLinux), but as you noted, according to the Desktop Menu Specification, the correct main category for the "Emulator" subcategory is "System", not "Utility", so the "System" category will probably be better after all.

@austin987
Copy link
Contributor

austin987 commented Jan 16, 2017 via email

@jre-wine
Copy link
Contributor

By now, I get why you "like" Accessories more than System Tools. And I think the actual feeling of someone who uses this is important here. Personally I only had the formal view on this. Further I agree that winetricks and playonlinux should be in the same category. So yes, maybe leave it in this menu.

I didn't see any effect of emulator anyway and also agree with Austin here. So maybe just drop "Emulator" and go with Categories=Utility; only.
desktop-file-validate is also happy with this.

@AsciiWolf
Copy link
Contributor Author

@jre-wine Done.

@austin987
Copy link
Contributor

@AsciiWolf, how would you feel about updating the comment to something like:
Work around problems in and install applications under Wine

In my experience, most users want to install native DLLs, not install games or applications.

I want to make some TravisCI changes to test make install before committing this, fyi, but should be Tuesday or Wednesday.

@AsciiWolf
Copy link
Contributor Author

@austin987 Done.

@jre-wine
Copy link
Contributor

@AsciiWolf Great! We'll probably go ahead with this version in Debian.

@austin987 austin987 merged commit 894dd0c into Winetricks:master Jan 18, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants