Skip to content

Commit c4b9df1

Browse files
committed
Rename desktop -> freedesktop/, package with release, update
instructions to Markdown
1 parent 8e5c296 commit c4b9df1

15 files changed

+51
-36
lines changed

CastleEngineManifest.xml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
<project name="view3dscene"
33
standalone_source="code/view3dscene.lpr"
44
author="Michalis Kamburelis"
5-
qualified_name="net.sourceforge.castleengine.view3dscene"
5+
qualified_name="io.castleengine.view3dscene"
66
>
77
<icons>
88
<icon path="windows/view3dscene.ico" />
9-
<icon path="desktop/view3dscene.svg" />
10-
<icon path="desktop/view3dscene.icns" />
9+
<icon path="freedesktop/view3dscene.svg" />
10+
<icon path="freedesktop/view3dscene.icns" />
1111
</icons>
1212
<dependencies>
1313
<dependency name="Zlib" /> <!-- read .gz -->
@@ -20,6 +20,7 @@
2020
<package>
2121
<include path="tovrmlx3d*" />
2222
<include path="COPYING.GPL2.txt" />
23+
<include path="freedesktop/*" recursive="True" />
2324
</package>
2425
<data exists="false" />
2526

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,13 @@ install:
3737
install view3dscene $(BINDIR)
3838
install tovrmlx3d $(BINDIR)
3939
install -d $(DATADIR)
40-
cd desktop/ && ./install.sh "$(DATADIR)"
40+
cd freedesktop/ && ./install.sh "$(DATADIR)"
4141

4242
.PHONY: uninstall
4343
uninstall:
4444
rm -f $(BINDIR)/view3dscene \
4545
$(BINDIR)/tovrmlx3d
46-
cd desktop/ && ./uninstall.sh "$(DATADIR)"
46+
cd freedesktop/ && ./uninstall.sh "$(DATADIR)"
4747

4848
# code generation ------------------------------------------------------------
4949

File renamed without changes.
File renamed without changes.
Lines changed: 44 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,66 @@
1-
To install on Linux or FreeBSD (any desktop Unix using Xorg and following standard XDG specifications)
2-
you can use the files provided here.
1+
# Installing desktop files for freedesktop
2+
3+
This directory contains files for desktop integration (icons, associations, menu entries) on https://freedesktop.org/ desktops, which practically means: desktops on Linux, FreeBSD and other free software Unix.
4+
5+
# How to install
6+
37
It is advised to build and install by executing this in the top-level view3dscene directory:
48

5-
make
6-
sudo make install
9+
```
10+
make
11+
sudo make install
12+
```
713

8-
The latter command makes a system-wide installation,
9-
copying the view3dscene and tovrmlx3d binaries to /usr/local/bin , to make them available on $PATH.
10-
It also installs some desktop files under /usr/local/share .
11-
You can undo it by
14+
The latter command makes a system-wide installation, copying the view3dscene and tovrmlx3d binaries to `/usr/local/bin` , to make them available on `$PATH`. It also installs some desktop files under `/usr/local/share`. You can undo it by
1215

13-
sudo make uninstall
16+
```
17+
sudo make uninstall
18+
```
1419

15-
If you would prefer to make an installation only for your used,
16-
and not use root privileges, you can also just run
20+
If you would prefer to make an installation only for your used, and not use root privileges, you can also just run
1721

18-
cd desktop/
19-
./install.sh
22+
```
23+
cd freedesktop/
24+
./install.sh
25+
```
2026

21-
But in the latter case, it is your responsibility to make the binaries
22-
actually visible by X session.
23-
Note that you will need to modify $PATH used by the X session,
24-
which usually means you need to create and use the ~/.Xsession file.
25-
( Adjusting path of your shell, e.g. in ~/.bashrc, is *not* enough. )
27+
But in the latter case, it is your responsibility to make the binaries actually visible by X session. Note that you will need to modify `$PATH` used by the X session, which usually means you need to create and use the `~/.Xsession` file. (Adjusting path of your shell, e.g. in `~/.bashrc`, is *not* enough.)
2628

27-
------------------------------------------------------------------------------
28-
DETAILS HOW THIS WORKS
29-
(for developers -- normal users can stop reading now :) ):
29+
# DETAILS HOW THIS WORKS
3030

31-
See http://library.gnome.org/devel/integration-guide/stable/desktop-files.html.en
32-
for basic GNOME integration instructions.
31+
This is for developers -- normal users can stop reading now :)
32+
33+
See http://library.gnome.org/devel/integration-guide/stable/desktop-files.html.en for basic GNOME integration instructions.
3334

3435
Desktop file
36+
3537
- Should be copied to /usr/share/applications or ~/.local/share/applications
3638
(for GNOME <= 2.10 (<= 2.8 on Fedora) this should be
3739
~/.gnome2/vfolders/applications).
40+
3841
- See http://standards.freedesktop.org/menu-spec/latest/apa.html
3942
for a list of allowed Category values.
43+
4044
- "StartupNotify=true" can be useful for me to add to *.desktop files,
4145
as GTK 2 backend should automatically support this
4246
(http://library.gnome.org/devel/gdk/stable/gdk-General.html#gdk-notify-startup-complete).
4347
For now, view3dscene opens instantly fast, so it's not needed.
48+
4449
- update-desktop-database call is needed to actually associate my program
4550
with MimeType specified in desktop file. (Found by looking at some Debian
4651
packges postinst script.)
4752

4853
Icon file
54+
4955
- Should be copied under /usr/share/icons/,
5056
most standard is /usr/share/icons/hicolor/48x48/apps/.
5157
Local user has this in ~/.local/share/icons/
5258
and ~/.local/share/icons/hicolor/48x48/apps/
59+
5360
- "48x48" is just indicated as most standard, and smaller versions will
5461
be generated from it. For SVG icons, I think (but didn't actually
5562
read this anywhere) they should go to "scalable" subdir.
63+
5664
- Update: although on my Debian "scalable" subdir is indeed standard,
5765
it looks like desktop icon remains for some reason stupidly small
5866
(even though it's recorded in SVG file that resolution is 48x48).
@@ -61,23 +69,28 @@ Icon file
6169
just adds 48x48 icon as PNG file, in addition to SVG in scalable.
6270
Fortunately, we can trivially easy just autogenerate PNG 48x48 version
6371
to workaround this.
72+
6473
- Do not specify icon extension in *.desktop file.
6574
Algorithm for searching icons (from spec
6675
http://standards.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html)
6776
makes it clear that implementation will try appending various extensions
6877
on it's own. Besides, as noted above, we have both SVG and PNG versions of
6978
the icon, so we do not know what extension to specify.
7079

71-
Mime file
80+
Mime file:
81+
7282
- Should be copied to /usr/share/mime/packages/,
7383
local user location is ~/.local/share/mime/packages/.
84+
7485
- After copying you should run
7586
update-mime-database /usr/share/mime
7687
or equivalent for local user location.
88+
7789
- Note that our mime XML file describes "model/x3d+binary", but it's
7890
not yet listed in our desktop file --- because we do not handle x3db yet.
7991

8092
Thumbnailer script:
93+
8194
- It works :)
8295

8396
- Beware that loading arbitrary 3D scene may take a lot of time,
@@ -102,9 +115,10 @@ Thumbnailer script:
102115
slowdowns when using this thumbnailer.
103116

104117
You may want to run
105-
killall gnome-panel
106-
killall nautilus
107-
to refresh icons and mime types everywhere without relogging to GNOME.
108-
(If anyone knows a cleaner to do this, please let me know.) Without these
109-
kills, only the menu entry is actomatically updated. I.e. changes to *.desktop
110-
files dir are picked up automatically, but icon and mime files not (it seems).
118+
119+
```
120+
killall gnome-panel
121+
killall nautilus
122+
```
123+
124+
to refresh icons and mime types everywhere without relogging to GNOME. (If anyone knows a cleaner to do this, please let me know.) Without these kills, only the menu entry is actomatically updated. I.e. changes to *.desktop files dir are picked up automatically, but icon and mime files not (it seems).
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)