This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/cleanup in repository x2goclient. commit 26161a55fa560c7c14421829a5dbdf63e4c75732 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Feb 14 01:30:16 2015 +0100 general: move img/ to res/img/ and update references in: - COPYRIGHT.x2go-logos - Makefile - debian/x2goclient.install - macbuild.sh - x2goclient.pro - x2goclient.rc --- COPYRIGHT.x2go-logos | 20 ++++++------- Makefile | 14 ++++----- debian/changelog | 30 ++++++++++++++++---- debian/x2goclient.install | 14 ++++----- macbuild.sh | 4 +-- {img => res/img}/icons/128x128/X.png | Bin 6255 -> 6255 bytes {img => res/img}/icons/128x128/audio.png | Bin 5229 -> 5229 bytes {img => res/img}/icons/128x128/create_file.png | Bin 5107 -> 5107 bytes {img => res/img}/icons/128x128/delete.png | Bin 7978 -> 7978 bytes {img => res/img}/icons/128x128/edit.png | Bin 5761 -> 5761 bytes {img => res/img}/icons/128x128/edit_file.png | Bin 6219 -> 6219 bytes {img => res/img}/icons/128x128/edit_settings.png | Bin 5806 -> 5806 bytes {img => res/img}/icons/128x128/file-open.png | Bin 4051 -> 4051 bytes {img => res/img}/icons/128x128/folder.png | Bin 3220 -> 3220 bytes {img => res/img}/icons/128x128/gnome.png | Bin 3650 -> 3650 bytes {img => res/img}/icons/128x128/kde.png | Bin 14296 -> 14296 bytes {img => res/img}/icons/128x128/lxde.png | Bin 11886 -> 11886 bytes {img => res/img}/icons/128x128/new_file.png | Bin 4882 -> 4882 bytes {img => res/img}/icons/128x128/preferences.png | Bin 18292 -> 18292 bytes {img => res/img}/icons/128x128/rdp.png | Bin 10941 -> 10941 bytes {img => res/img}/icons/128x128/resolution.png | Bin 3308 -> 3308 bytes {img => res/img}/icons/128x128/session.png | Bin 4936 -> 4936 bytes {img => res/img}/icons/128x128/unity.png | Bin 17622 -> 17622 bytes {img => res/img}/icons/128x128/x2go.png | Bin 6085 -> 6085 bytes {img => res/img}/icons/128x128/x2goclient.png | Bin 19158 -> 19158 bytes {img => res/img}/icons/128x128/x2gogroup.png | Bin 1817 -> 1817 bytes {img => res/img}/icons/128x128/x2gohosts.png | Bin 1731 -> 1731 bytes {img => res/img}/icons/128x128/x2gomailclient.png | Bin 19158 -> 19158 bytes {img => res/img}/icons/128x128/x2gosession.png | Bin 9324 -> 9324 bytes {img => res/img}/icons/128x128/x2gouser.png | Bin 1771 -> 1771 bytes {img => res/img}/icons/16x16/X.png | Bin 657 -> 657 bytes {img => res/img}/icons/16x16/audio.png | Bin 653 -> 653 bytes {img => res/img}/icons/16x16/cinnamon.png | Bin 505 -> 505 bytes {img => res/img}/icons/16x16/create_file.png | Bin 594 -> 594 bytes {img => res/img}/icons/16x16/delete.png | Bin 680 -> 680 bytes {img => res/img}/icons/16x16/edit.png | Bin 662 -> 662 bytes {img => res/img}/icons/16x16/edit_file.png | Bin 649 -> 649 bytes {img => res/img}/icons/16x16/edit_settings.png | Bin 646 -> 646 bytes {img => res/img}/icons/16x16/file-open.png | Bin 595 -> 595 bytes {img => res/img}/icons/16x16/gnome.png | Bin 463 -> 463 bytes {img => res/img}/icons/16x16/icewm.png | Bin 538 -> 538 bytes {img => res/img}/icons/16x16/kde.png | Bin 899 -> 899 bytes {img => res/img}/icons/16x16/lxde.png | Bin 716 -> 716 bytes {img => res/img}/icons/16x16/mate.png | Bin 774 -> 774 bytes {img => res/img}/icons/16x16/new_file.png | Bin 593 -> 593 bytes {img => res/img}/icons/16x16/openbox.png | Bin 360 -> 360 bytes {img => res/img}/icons/16x16/preferences.png | Bin 340 -> 340 bytes {img => res/img}/icons/16x16/rdp.png | Bin 754 -> 754 bytes {img => res/img}/icons/16x16/resolution.png | Bin 446 -> 446 bytes {img => res/img}/icons/16x16/session.png | Bin 846 -> 846 bytes {img => res/img}/icons/16x16/tbshow.png | Bin 302 -> 302 bytes {img => res/img}/icons/16x16/trinity.png | Bin 748 -> 748 bytes {img => res/img}/icons/16x16/unity.png | Bin 1410 -> 1410 bytes {img => res/img}/icons/16x16/x2go.png | Bin 854 -> 854 bytes {img => res/img}/icons/16x16/x2goclient.png | Bin 949 -> 949 bytes {img => res/img}/icons/16x16/xfce.png | Bin 639 -> 639 bytes .../img}/icons/22x22/applications-development.png | Bin 977 -> 977 bytes .../img}/icons/22x22/applications-education.png | Bin 644 -> 644 bytes .../img}/icons/22x22/applications-games.png | Bin 688 -> 688 bytes .../img}/icons/22x22/applications-graphics.png | Bin 1523 -> 1523 bytes .../img}/icons/22x22/applications-internet.png | Bin 1355 -> 1355 bytes .../img}/icons/22x22/applications-multimedia.png | Bin 1353 -> 1353 bytes .../img}/icons/22x22/applications-office.png | Bin 804 -> 804 bytes .../img}/icons/22x22/applications-other.png | Bin 775 -> 775 bytes .../img}/icons/22x22/applications-system.png | Bin 1403 -> 1403 bytes .../img}/icons/22x22/applications-utilities.png | Bin 888 -> 888 bytes .../img}/icons/22x22/preferences-system.png | Bin 1350 -> 1350 bytes {img => res/img}/icons/32x32/X.png | Bin 1414 -> 1414 bytes {img => res/img}/icons/32x32/apps.png | Bin 1664 -> 1664 bytes {img => res/img}/icons/32x32/attach.png | Bin 831 -> 831 bytes {img => res/img}/icons/32x32/audio.png | Bin 1465 -> 1465 bytes {img => res/img}/icons/32x32/auth.png | Bin 1686 -> 1686 bytes {img => res/img}/icons/32x32/contest.png | Bin 1267 -> 1267 bytes {img => res/img}/icons/32x32/create_file.png | Bin 1148 -> 1148 bytes {img => res/img}/icons/32x32/delete.png | Bin 1456 -> 1456 bytes {img => res/img}/icons/32x32/detach.png | Bin 870 -> 870 bytes {img => res/img}/icons/32x32/edit.png | Bin 1232 -> 1232 bytes {img => res/img}/icons/32x32/edit_file.png | Bin 1334 -> 1334 bytes {img => res/img}/icons/32x32/edit_settings.png | Bin 1313 -> 1313 bytes {img => res/img}/icons/32x32/exit.png | Bin 1915 -> 1915 bytes {img => res/img}/icons/32x32/file-open.png | Bin 1068 -> 1068 bytes {img => res/img}/icons/32x32/gnome.png | Bin 846 -> 846 bytes {img => res/img}/icons/32x32/kde.png | Bin 2245 -> 2245 bytes {img => res/img}/icons/32x32/lxde.png | Bin 1731 -> 1731 bytes {img => res/img}/icons/32x32/new_file.png | Bin 1109 -> 1109 bytes {img => res/img}/icons/32x32/open_dir.png | Bin 476 -> 476 bytes {img => res/img}/icons/32x32/preferences.png | Bin 2545 -> 2545 bytes {img => res/img}/icons/32x32/rdp.png | Bin 1768 -> 1768 bytes {img => res/img}/icons/32x32/reconnect.png | Bin 1651 -> 1651 bytes {img => res/img}/icons/32x32/resolution.png | Bin 855 -> 855 bytes {img => res/img}/icons/32x32/session.png | Bin 1177 -> 1177 bytes {img => res/img}/icons/32x32/stop.png | Bin 1190 -> 1190 bytes {img => res/img}/icons/32x32/stop_session.png | Bin 1093 -> 1093 bytes {img => res/img}/icons/32x32/suspend.png | Bin 349 -> 349 bytes {img => res/img}/icons/32x32/suspend_session.png | Bin 229 -> 229 bytes {img => res/img}/icons/32x32/tbhide.png | Bin 1266 -> 1266 bytes {img => res/img}/icons/32x32/tbshow.png | Bin 902 -> 902 bytes {img => res/img}/icons/32x32/tbshow.xcf | Bin 2124 -> 2124 bytes {img => res/img}/icons/32x32/unity.png | Bin 2984 -> 2984 bytes {img => res/img}/icons/32x32/x2goclient.png | Bin 2675 -> 2675 bytes {img => res/img}/icons/48x48/x2goclient.png | Bin 4817 -> 4817 bytes {img => res/img}/icons/64x64/X.png | Bin 3066 -> 3066 bytes {img => res/img}/icons/64x64/audio.png | Bin 2895 -> 2895 bytes {img => res/img}/icons/64x64/create_file.png | Bin 2595 -> 2595 bytes {img => res/img}/icons/64x64/delete.png | Bin 3752 -> 3752 bytes {img => res/img}/icons/64x64/edit.png | Bin 2785 -> 2785 bytes {img => res/img}/icons/64x64/edit_file.png | Bin 3057 -> 3057 bytes {img => res/img}/icons/64x64/edit_settings.png | Bin 2955 -> 2955 bytes {img => res/img}/icons/64x64/file-open.png | Bin 2039 -> 2039 bytes {img => res/img}/icons/64x64/gnome.png | Bin 1689 -> 1689 bytes {img => res/img}/icons/64x64/kde.png | Bin 5725 -> 5725 bytes {img => res/img}/icons/64x64/lxde.png | Bin 4537 -> 4537 bytes {img => res/img}/icons/64x64/new_file.png | Bin 2440 -> 2440 bytes {img => res/img}/icons/64x64/personal.png | Bin 5046 -> 5046 bytes {img => res/img}/icons/64x64/preferences.png | Bin 7000 -> 7000 bytes {img => res/img}/icons/64x64/rdp.png | Bin 4498 -> 4498 bytes {img => res/img}/icons/64x64/resolution.png | Bin 1805 -> 1805 bytes {img => res/img}/icons/64x64/session.png | Bin 2606 -> 2606 bytes {img => res/img}/icons/64x64/unity.png | Bin 7241 -> 7241 bytes {img => res/img}/icons/64x64/x2goclient.png | Bin 7095 -> 7095 bytes {img => res/img}/icons/hildon/x2goclient_26.png | Bin 1235 -> 1235 bytes {img => res/img}/icons/hildon/x2goclient_40.png | Bin 1860 -> 1860 bytes {img => res/img}/icons/hildon/x2goclient_64.png | Bin 2826 -> 2826 bytes .../img}/icons/hildon/x2goclient_hildon.svg | 0 {img => res/img}/icons/x2go-mac.icns | Bin 134586 -> 134586 bytes {img => res/img}/icons/x2go-win-48.ico | Bin 120254 -> 120254 bytes {img => res/img}/icons/x2goclient.xpm | 0 {img => res/img}/png/ico.png | Bin 3437 -> 3437 bytes {img => res/img}/png/ico_440x180.png | Bin 1331 -> 1331 bytes {img => res/img}/png/ico_mini.png | Bin 753 -> 753 bytes {img => res/img}/png/macinstaller_background.png | Bin 59943 -> 59943 bytes {img => res/img}/png/power-button.png | Bin 762 -> 762 bytes {img => res/img}/png/sess_ico.png | Bin 1161 -> 1161 bytes {img => res/img}/svg/bg-anim.svg | 0 {img => res/img}/svg/bg.svg | 0 {img => res/img}/svg/bg_hildon.svg | 0 {img => res/img}/svg/folder.svg | 0 {img => res/img}/svg/folder_grey.svg | 0 {img => res/img}/svg/line.svg | 0 {img => res/img}/svg/macinstaller_background.svg | 0 {img => res/img}/svg/onlogo.svg | 0 {img => res/img}/svg/passform.svg | 0 {img => res/img}/svg/sessionbut.svg | 0 {img => res/img}/svg/sessionbut_grey.svg | 0 {img => res/img}/svg/unity.svg | 0 {img => res/img}/svg/x2gologo.svg | 0 {img => res/img}/svg/xfce.svg | 0 {img => res/img}/x2go-logos/mksizedsymbols.sh | 0 {img => res/img}/x2go-logos/x2go-logo-colored.svg | 0 {img => res/img}/x2go-logos/x2go-logo-rotated.svg | 0 {img => res/img}/x2go-logos/x2go-logo.svg | 0 {img => res/img}/x2go-logos/x2go-mascot.svg | 0 x2goclient.pro | 2 +- x2goclient.rc | 2 +- 154 files changed, 52 insertions(+), 34 deletions(-) diff --git a/COPYRIGHT.x2go-logos b/COPYRIGHT.x2go-logos index 3bf4c7b..54445da 100644 --- a/COPYRIGHT.x2go-logos +++ b/COPYRIGHT.x2go-logos @@ -2,21 +2,21 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: X2Go-artwork [~X] Upstream-Contact: Heinz-M. Graesing <heinz-m.graesing@obviously-nice.de> -Files: img/x2go-logos/mksizedsymbols.sh +Files: res/img/x2go-logos/mksizedsymbols.sh Copyright: 2005-2015 Heinz-M. Graesing <heinz-m.graesing@obviously-nice.de> License: GPL-2.0+ - img/x2go-logos/x2go-logo-colored.svg - img/x2go-logos/x2go-logo.svg - img/x2go-logos/x2go-logo-rotated.svg - img/x2go-logos/x2go-mascot.svg + res/img/x2go-logos/x2go-logo-colored.svg + res/img/x2go-logos/x2go-logo.svg + res/img/x2go-logos/x2go-logo-rotated.svg + res/img/x2go-logos/x2go-mascot.svg Copyright: 2005-2015 Heinz-M. Grasesing <heinz-m.graesing@obviously-nice.de> License: GPL-2.0+ -Files: img/icons/16x16/x2goclient.png - img/icons/32x32/x2goclient.png - img/icons/48x48/x2goclient.png - img/icons/64x64/x2goclient.png - img/icons/128x128/x2goclient.png +Files: res/img/icons/16x16/x2goclient.png + res/img/icons/32x32/x2goclient.png + res/img/icons/48x48/x2goclient.png + res/img/icons/64x64/x2goclient.png + res/img/icons/128x128/x2goclient.png Copyright: 2005-2015 Heinz-M. Graesing <heinz-m.graesing@obviously-nice.de> License: GPL-2.0+ diff --git a/Makefile b/Makefile index 4f95d9c..0aac144 100755 --- a/Makefile +++ b/Makefile @@ -83,13 +83,13 @@ install_client: $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/icons/hicolor/32x32/apps $(INSTALL_PROGRAM) $(CLIENT_DIR)/x2goclient $(DESTDIR)$(BINDIR)/x2goclient $(INSTALL_FILE) desktop/x2goclient.desktop $(DESTDIR)$(SHAREDIR)/applications/x2goclient.desktop - $(INSTALL_FILE) img/icons/x2goclient.xpm $(DESTDIR)$(SHAREDIR)/x2goclient/icons/x2goclient.xpm - $(INSTALL_FILE) img/icons/128x128/x2goclient.png $(DESTDIR)$(SHAREDIR)/x2goclient/icons/x2goclient.png - $(INSTALL_FILE) img/icons/128x128/x2gosession.png $(DESTDIR)$(SHAREDIR)/x2goclient/icons/x2gosession.png - $(INSTALL_FILE) img/icons/128x128/x2goclient.png $(DESTDIR)$(SHAREDIR)/icons/hicolor/128x128/apps/x2goclient.png - $(INSTALL_FILE) img/icons/16x16/x2goclient.png $(DESTDIR)$(SHAREDIR)/icons/hicolor/16x16/apps/x2goclient.png - $(INSTALL_FILE) img/icons/64x64/x2goclient.png $(DESTDIR)$(SHAREDIR)/icons/hicolor/64x64/apps/x2goclient.png - $(INSTALL_FILE) img/icons/32x32/x2goclient.png $(DESTDIR)$(SHAREDIR)/icons/hicolor/32x32/apps/x2goclient.png + $(INSTALL_FILE) res/img/icons/x2goclient.xpm $(DESTDIR)$(SHAREDIR)/x2goclient/icons/x2goclient.xpm + $(INSTALL_FILE) res/img/icons/128x128/x2goclient.png $(DESTDIR)$(SHAREDIR)/x2goclient/icons/x2goclient.png + $(INSTALL_FILE) res/img/icons/128x128/x2gosession.png $(DESTDIR)$(SHAREDIR)/x2goclient/icons/x2gosession.png + $(INSTALL_FILE) res/img/icons/128x128/x2goclient.png $(DESTDIR)$(SHAREDIR)/icons/hicolor/128x128/apps/x2goclient.png + $(INSTALL_FILE) res/img/icons/16x16/x2goclient.png $(DESTDIR)$(SHAREDIR)/icons/hicolor/16x16/apps/x2goclient.png + $(INSTALL_FILE) res/img/icons/64x64/x2goclient.png $(DESTDIR)$(SHAREDIR)/icons/hicolor/64x64/apps/x2goclient.png + $(INSTALL_FILE) res/img/icons/32x32/x2goclient.png $(DESTDIR)$(SHAREDIR)/icons/hicolor/32x32/apps/x2goclient.png install_plugin: $(INSTALL_DIR) $(DESTDIR)$(MOZPLUGDIR)/ diff --git a/debian/changelog b/debian/changelog index 4e6ed5c..7c153fe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -118,12 +118,23 @@ x2goclient (4.0.3.2-0x2go1) UNRELEASED; urgency=medium around messages, remove or add whitespace where applicable. - Move *.rc and *.rcc files back to top directory for now. Resources must be in the resource file's base directory or a sub-directory. - - Move icons/ to img/icons/ and update references in resources.rcc, - COPYRIGHT.x2go-logos, Makefile, debian/x2goclient.install, macbuild.sh, - nsis/x2goclient.nsi, src/onmainwindow.cpp, src/appdialog.cpp, - src/folderbutton.cpp, src/folderexplorer.cpp, src/sessionbutton.cpp, - src/sessionexplorer.cpp, src/sessionmanagedialog.cpp, - src/sessionwidget.cpp, src/ui/helpdialog.ui and src/xsettingswidget.cpp. + - Move icons/ to img/icons/ and update references in + + resources.rcc + + COPYRIGHT.x2go-logos + + Makefile + + debian/x2goclient.install + + macbuild.sh + + nsis/x2goclient.nsi + + src/onmainwindow.cpp + + src/appdialog.cpp + + src/folderbutton.cpp + + src/folderexplorer.cpp + + src/sessionbutton.cpp + + src/sessionexplorer.cpp + + src/sessionmanagedialog.cpp + + src/sessionwidget.cpp + + src/ui/helpdialog.ui + + src/xsettingswidget.cpp - Move png/ to img/png/ and update references in resources.rcc and src/onmainwindow.cpp. - Move svg/ to img/svg/ and update references in resources.rcc, @@ -142,6 +153,13 @@ x2goclient (4.0.3.2-0x2go1) UNRELEASED; urgency=medium x2goclient.pro. - Remove executability bit from src/sshmasterconnection.cpp and src/sshprocess.cpp. + - Move img/ to res/img/ and update references in + + COPYRIGHT.x2go-logos + + Makefile + + debian/x2goclient.install + + macbuild.sh + + x2goclient.pro + + x2goclient.rc -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 27 Nov 2014 12:01:43 +0100 diff --git a/debian/x2goclient.install b/debian/x2goclient.install index 04ba470..0725ed4 100644 --- a/debian/x2goclient.install +++ b/debian/x2goclient.install @@ -1,9 +1,9 @@ client_build/x2goclient usr/bin desktop/x2goclient.desktop usr/share/applications/ -img/icons/x2goclient.xpm usr/share/x2goclient/icons/ -img/icons/128x128/x2goclient.png usr/share/x2goclient/icons/ -img/icons/128x128/x2gosession.png usr/share/x2goclient/icons/ -img/icons/128x128/x2goclient.png usr/share/icons/hicolor/128x128/apps/ -img/icons/16x16/x2goclient.png usr/share/icons/hicolor/16x16/apps/ -img/icons/64x64/x2goclient.png usr/share/icons/hicolor/64x64/apps/ -img/icons/32x32/x2goclient.png usr/share/icons/hicolor/32x32/apps/ +res/img/icons/x2goclient.xpm usr/share/x2goclient/icons/ +res/img/icons/128x128/x2goclient.png usr/share/x2goclient/icons/ +res/img/icons/128x128/x2gosession.png usr/share/x2goclient/icons/ +res/img/icons/128x128/x2goclient.png usr/share/icons/hicolor/128x128/apps/ +res/img/icons/16x16/x2goclient.png usr/share/icons/hicolor/16x16/apps/ +res/img/icons/64x64/x2goclient.png usr/share/icons/hicolor/64x64/apps/ +res/img/icons/32x32/x2goclient.png usr/share/icons/hicolor/32x32/apps/ diff --git a/macbuild.sh b/macbuild.sh index 115718c..bda1866 100755 --- a/macbuild.sh +++ b/macbuild.sh @@ -59,10 +59,10 @@ $PKG_DMG \ --volname "x2goclient" \ --verbosity 2 \ --mkdir "/.background" \ - --copy "./png/macinstaller_background.png:/.background" \ + --copy "./res/img/png/macinstaller_background.png:/.background" \ --copy "./macdmg.DS_Store:/.DS_Store" \ --copy "./LICENSE" \ --copy "./COPYING" \ --symlink "/Applications: " \ - --icon "./img/icons/x2go-mac.icns" \ + --icon "./res/img/icons/x2go-mac.icns" \ --format "UDBZ" diff --git a/img/icons/128x128/X.png b/res/img/icons/128x128/X.png similarity index 100% rename from img/icons/128x128/X.png rename to res/img/icons/128x128/X.png diff --git a/img/icons/128x128/audio.png b/res/img/icons/128x128/audio.png similarity index 100% rename from img/icons/128x128/audio.png rename to res/img/icons/128x128/audio.png diff --git a/img/icons/128x128/create_file.png b/res/img/icons/128x128/create_file.png similarity index 100% rename from img/icons/128x128/create_file.png rename to res/img/icons/128x128/create_file.png diff --git a/img/icons/128x128/delete.png b/res/img/icons/128x128/delete.png similarity index 100% rename from img/icons/128x128/delete.png rename to res/img/icons/128x128/delete.png diff --git a/img/icons/128x128/edit.png b/res/img/icons/128x128/edit.png similarity index 100% rename from img/icons/128x128/edit.png rename to res/img/icons/128x128/edit.png diff --git a/img/icons/128x128/edit_file.png b/res/img/icons/128x128/edit_file.png similarity index 100% rename from img/icons/128x128/edit_file.png rename to res/img/icons/128x128/edit_file.png diff --git a/img/icons/128x128/edit_settings.png b/res/img/icons/128x128/edit_settings.png similarity index 100% rename from img/icons/128x128/edit_settings.png rename to res/img/icons/128x128/edit_settings.png diff --git a/img/icons/128x128/file-open.png b/res/img/icons/128x128/file-open.png similarity index 100% rename from img/icons/128x128/file-open.png rename to res/img/icons/128x128/file-open.png diff --git a/img/icons/128x128/folder.png b/res/img/icons/128x128/folder.png similarity index 100% rename from img/icons/128x128/folder.png rename to res/img/icons/128x128/folder.png diff --git a/img/icons/128x128/gnome.png b/res/img/icons/128x128/gnome.png similarity index 100% rename from img/icons/128x128/gnome.png rename to res/img/icons/128x128/gnome.png diff --git a/img/icons/128x128/kde.png b/res/img/icons/128x128/kde.png similarity index 100% rename from img/icons/128x128/kde.png rename to res/img/icons/128x128/kde.png diff --git a/img/icons/128x128/lxde.png b/res/img/icons/128x128/lxde.png similarity index 100% rename from img/icons/128x128/lxde.png rename to res/img/icons/128x128/lxde.png diff --git a/img/icons/128x128/new_file.png b/res/img/icons/128x128/new_file.png similarity index 100% rename from img/icons/128x128/new_file.png rename to res/img/icons/128x128/new_file.png diff --git a/img/icons/128x128/preferences.png b/res/img/icons/128x128/preferences.png similarity index 100% rename from img/icons/128x128/preferences.png rename to res/img/icons/128x128/preferences.png diff --git a/img/icons/128x128/rdp.png b/res/img/icons/128x128/rdp.png similarity index 100% rename from img/icons/128x128/rdp.png rename to res/img/icons/128x128/rdp.png diff --git a/img/icons/128x128/resolution.png b/res/img/icons/128x128/resolution.png similarity index 100% rename from img/icons/128x128/resolution.png rename to res/img/icons/128x128/resolution.png diff --git a/img/icons/128x128/session.png b/res/img/icons/128x128/session.png similarity index 100% rename from img/icons/128x128/session.png rename to res/img/icons/128x128/session.png diff --git a/img/icons/128x128/unity.png b/res/img/icons/128x128/unity.png similarity index 100% rename from img/icons/128x128/unity.png rename to res/img/icons/128x128/unity.png diff --git a/img/icons/128x128/x2go.png b/res/img/icons/128x128/x2go.png similarity index 100% rename from img/icons/128x128/x2go.png rename to res/img/icons/128x128/x2go.png diff --git a/img/icons/128x128/x2goclient.png b/res/img/icons/128x128/x2goclient.png similarity index 100% rename from img/icons/128x128/x2goclient.png rename to res/img/icons/128x128/x2goclient.png diff --git a/img/icons/128x128/x2gogroup.png b/res/img/icons/128x128/x2gogroup.png similarity index 100% rename from img/icons/128x128/x2gogroup.png rename to res/img/icons/128x128/x2gogroup.png diff --git a/img/icons/128x128/x2gohosts.png b/res/img/icons/128x128/x2gohosts.png similarity index 100% rename from img/icons/128x128/x2gohosts.png rename to res/img/icons/128x128/x2gohosts.png diff --git a/img/icons/128x128/x2gomailclient.png b/res/img/icons/128x128/x2gomailclient.png similarity index 100% rename from img/icons/128x128/x2gomailclient.png rename to res/img/icons/128x128/x2gomailclient.png diff --git a/img/icons/128x128/x2gosession.png b/res/img/icons/128x128/x2gosession.png similarity index 100% rename from img/icons/128x128/x2gosession.png rename to res/img/icons/128x128/x2gosession.png diff --git a/img/icons/128x128/x2gouser.png b/res/img/icons/128x128/x2gouser.png similarity index 100% rename from img/icons/128x128/x2gouser.png rename to res/img/icons/128x128/x2gouser.png diff --git a/img/icons/16x16/X.png b/res/img/icons/16x16/X.png similarity index 100% rename from img/icons/16x16/X.png rename to res/img/icons/16x16/X.png diff --git a/img/icons/16x16/audio.png b/res/img/icons/16x16/audio.png similarity index 100% rename from img/icons/16x16/audio.png rename to res/img/icons/16x16/audio.png diff --git a/img/icons/16x16/cinnamon.png b/res/img/icons/16x16/cinnamon.png similarity index 100% rename from img/icons/16x16/cinnamon.png rename to res/img/icons/16x16/cinnamon.png diff --git a/img/icons/16x16/create_file.png b/res/img/icons/16x16/create_file.png similarity index 100% rename from img/icons/16x16/create_file.png rename to res/img/icons/16x16/create_file.png diff --git a/img/icons/16x16/delete.png b/res/img/icons/16x16/delete.png similarity index 100% rename from img/icons/16x16/delete.png rename to res/img/icons/16x16/delete.png diff --git a/img/icons/16x16/edit.png b/res/img/icons/16x16/edit.png similarity index 100% rename from img/icons/16x16/edit.png rename to res/img/icons/16x16/edit.png diff --git a/img/icons/16x16/edit_file.png b/res/img/icons/16x16/edit_file.png similarity index 100% rename from img/icons/16x16/edit_file.png rename to res/img/icons/16x16/edit_file.png diff --git a/img/icons/16x16/edit_settings.png b/res/img/icons/16x16/edit_settings.png similarity index 100% rename from img/icons/16x16/edit_settings.png rename to res/img/icons/16x16/edit_settings.png diff --git a/img/icons/16x16/file-open.png b/res/img/icons/16x16/file-open.png similarity index 100% rename from img/icons/16x16/file-open.png rename to res/img/icons/16x16/file-open.png diff --git a/img/icons/16x16/gnome.png b/res/img/icons/16x16/gnome.png similarity index 100% rename from img/icons/16x16/gnome.png rename to res/img/icons/16x16/gnome.png diff --git a/img/icons/16x16/icewm.png b/res/img/icons/16x16/icewm.png similarity index 100% rename from img/icons/16x16/icewm.png rename to res/img/icons/16x16/icewm.png diff --git a/img/icons/16x16/kde.png b/res/img/icons/16x16/kde.png similarity index 100% rename from img/icons/16x16/kde.png rename to res/img/icons/16x16/kde.png diff --git a/img/icons/16x16/lxde.png b/res/img/icons/16x16/lxde.png similarity index 100% rename from img/icons/16x16/lxde.png rename to res/img/icons/16x16/lxde.png diff --git a/img/icons/16x16/mate.png b/res/img/icons/16x16/mate.png similarity index 100% rename from img/icons/16x16/mate.png rename to res/img/icons/16x16/mate.png diff --git a/img/icons/16x16/new_file.png b/res/img/icons/16x16/new_file.png similarity index 100% rename from img/icons/16x16/new_file.png rename to res/img/icons/16x16/new_file.png diff --git a/img/icons/16x16/openbox.png b/res/img/icons/16x16/openbox.png similarity index 100% rename from img/icons/16x16/openbox.png rename to res/img/icons/16x16/openbox.png diff --git a/img/icons/16x16/preferences.png b/res/img/icons/16x16/preferences.png similarity index 100% rename from img/icons/16x16/preferences.png rename to res/img/icons/16x16/preferences.png diff --git a/img/icons/16x16/rdp.png b/res/img/icons/16x16/rdp.png similarity index 100% rename from img/icons/16x16/rdp.png rename to res/img/icons/16x16/rdp.png diff --git a/img/icons/16x16/resolution.png b/res/img/icons/16x16/resolution.png similarity index 100% rename from img/icons/16x16/resolution.png rename to res/img/icons/16x16/resolution.png diff --git a/img/icons/16x16/session.png b/res/img/icons/16x16/session.png similarity index 100% rename from img/icons/16x16/session.png rename to res/img/icons/16x16/session.png diff --git a/img/icons/16x16/tbshow.png b/res/img/icons/16x16/tbshow.png similarity index 100% rename from img/icons/16x16/tbshow.png rename to res/img/icons/16x16/tbshow.png diff --git a/img/icons/16x16/trinity.png b/res/img/icons/16x16/trinity.png similarity index 100% rename from img/icons/16x16/trinity.png rename to res/img/icons/16x16/trinity.png diff --git a/img/icons/16x16/unity.png b/res/img/icons/16x16/unity.png similarity index 100% rename from img/icons/16x16/unity.png rename to res/img/icons/16x16/unity.png diff --git a/img/icons/16x16/x2go.png b/res/img/icons/16x16/x2go.png similarity index 100% rename from img/icons/16x16/x2go.png rename to res/img/icons/16x16/x2go.png diff --git a/img/icons/16x16/x2goclient.png b/res/img/icons/16x16/x2goclient.png similarity index 100% rename from img/icons/16x16/x2goclient.png rename to res/img/icons/16x16/x2goclient.png diff --git a/img/icons/16x16/xfce.png b/res/img/icons/16x16/xfce.png similarity index 100% rename from img/icons/16x16/xfce.png rename to res/img/icons/16x16/xfce.png diff --git a/img/icons/22x22/applications-development.png b/res/img/icons/22x22/applications-development.png similarity index 100% rename from img/icons/22x22/applications-development.png rename to res/img/icons/22x22/applications-development.png diff --git a/img/icons/22x22/applications-education.png b/res/img/icons/22x22/applications-education.png similarity index 100% rename from img/icons/22x22/applications-education.png rename to res/img/icons/22x22/applications-education.png diff --git a/img/icons/22x22/applications-games.png b/res/img/icons/22x22/applications-games.png similarity index 100% rename from img/icons/22x22/applications-games.png rename to res/img/icons/22x22/applications-games.png diff --git a/img/icons/22x22/applications-graphics.png b/res/img/icons/22x22/applications-graphics.png similarity index 100% rename from img/icons/22x22/applications-graphics.png rename to res/img/icons/22x22/applications-graphics.png diff --git a/img/icons/22x22/applications-internet.png b/res/img/icons/22x22/applications-internet.png similarity index 100% rename from img/icons/22x22/applications-internet.png rename to res/img/icons/22x22/applications-internet.png diff --git a/img/icons/22x22/applications-multimedia.png b/res/img/icons/22x22/applications-multimedia.png similarity index 100% rename from img/icons/22x22/applications-multimedia.png rename to res/img/icons/22x22/applications-multimedia.png diff --git a/img/icons/22x22/applications-office.png b/res/img/icons/22x22/applications-office.png similarity index 100% rename from img/icons/22x22/applications-office.png rename to res/img/icons/22x22/applications-office.png diff --git a/img/icons/22x22/applications-other.png b/res/img/icons/22x22/applications-other.png similarity index 100% rename from img/icons/22x22/applications-other.png rename to res/img/icons/22x22/applications-other.png diff --git a/img/icons/22x22/applications-system.png b/res/img/icons/22x22/applications-system.png similarity index 100% rename from img/icons/22x22/applications-system.png rename to res/img/icons/22x22/applications-system.png diff --git a/img/icons/22x22/applications-utilities.png b/res/img/icons/22x22/applications-utilities.png similarity index 100% rename from img/icons/22x22/applications-utilities.png rename to res/img/icons/22x22/applications-utilities.png diff --git a/img/icons/22x22/preferences-system.png b/res/img/icons/22x22/preferences-system.png similarity index 100% rename from img/icons/22x22/preferences-system.png rename to res/img/icons/22x22/preferences-system.png diff --git a/img/icons/32x32/X.png b/res/img/icons/32x32/X.png similarity index 100% rename from img/icons/32x32/X.png rename to res/img/icons/32x32/X.png diff --git a/img/icons/32x32/apps.png b/res/img/icons/32x32/apps.png similarity index 100% rename from img/icons/32x32/apps.png rename to res/img/icons/32x32/apps.png diff --git a/img/icons/32x32/attach.png b/res/img/icons/32x32/attach.png similarity index 100% rename from img/icons/32x32/attach.png rename to res/img/icons/32x32/attach.png diff --git a/img/icons/32x32/audio.png b/res/img/icons/32x32/audio.png similarity index 100% rename from img/icons/32x32/audio.png rename to res/img/icons/32x32/audio.png diff --git a/img/icons/32x32/auth.png b/res/img/icons/32x32/auth.png similarity index 100% rename from img/icons/32x32/auth.png rename to res/img/icons/32x32/auth.png diff --git a/img/icons/32x32/contest.png b/res/img/icons/32x32/contest.png similarity index 100% rename from img/icons/32x32/contest.png rename to res/img/icons/32x32/contest.png diff --git a/img/icons/32x32/create_file.png b/res/img/icons/32x32/create_file.png similarity index 100% rename from img/icons/32x32/create_file.png rename to res/img/icons/32x32/create_file.png diff --git a/img/icons/32x32/delete.png b/res/img/icons/32x32/delete.png similarity index 100% rename from img/icons/32x32/delete.png rename to res/img/icons/32x32/delete.png diff --git a/img/icons/32x32/detach.png b/res/img/icons/32x32/detach.png similarity index 100% rename from img/icons/32x32/detach.png rename to res/img/icons/32x32/detach.png diff --git a/img/icons/32x32/edit.png b/res/img/icons/32x32/edit.png similarity index 100% rename from img/icons/32x32/edit.png rename to res/img/icons/32x32/edit.png diff --git a/img/icons/32x32/edit_file.png b/res/img/icons/32x32/edit_file.png similarity index 100% rename from img/icons/32x32/edit_file.png rename to res/img/icons/32x32/edit_file.png diff --git a/img/icons/32x32/edit_settings.png b/res/img/icons/32x32/edit_settings.png similarity index 100% rename from img/icons/32x32/edit_settings.png rename to res/img/icons/32x32/edit_settings.png diff --git a/img/icons/32x32/exit.png b/res/img/icons/32x32/exit.png similarity index 100% rename from img/icons/32x32/exit.png rename to res/img/icons/32x32/exit.png diff --git a/img/icons/32x32/file-open.png b/res/img/icons/32x32/file-open.png similarity index 100% rename from img/icons/32x32/file-open.png rename to res/img/icons/32x32/file-open.png diff --git a/img/icons/32x32/gnome.png b/res/img/icons/32x32/gnome.png similarity index 100% rename from img/icons/32x32/gnome.png rename to res/img/icons/32x32/gnome.png diff --git a/img/icons/32x32/kde.png b/res/img/icons/32x32/kde.png similarity index 100% rename from img/icons/32x32/kde.png rename to res/img/icons/32x32/kde.png diff --git a/img/icons/32x32/lxde.png b/res/img/icons/32x32/lxde.png similarity index 100% rename from img/icons/32x32/lxde.png rename to res/img/icons/32x32/lxde.png diff --git a/img/icons/32x32/new_file.png b/res/img/icons/32x32/new_file.png similarity index 100% rename from img/icons/32x32/new_file.png rename to res/img/icons/32x32/new_file.png diff --git a/img/icons/32x32/open_dir.png b/res/img/icons/32x32/open_dir.png similarity index 100% rename from img/icons/32x32/open_dir.png rename to res/img/icons/32x32/open_dir.png diff --git a/img/icons/32x32/preferences.png b/res/img/icons/32x32/preferences.png similarity index 100% rename from img/icons/32x32/preferences.png rename to res/img/icons/32x32/preferences.png diff --git a/img/icons/32x32/rdp.png b/res/img/icons/32x32/rdp.png similarity index 100% rename from img/icons/32x32/rdp.png rename to res/img/icons/32x32/rdp.png diff --git a/img/icons/32x32/reconnect.png b/res/img/icons/32x32/reconnect.png similarity index 100% rename from img/icons/32x32/reconnect.png rename to res/img/icons/32x32/reconnect.png diff --git a/img/icons/32x32/resolution.png b/res/img/icons/32x32/resolution.png similarity index 100% rename from img/icons/32x32/resolution.png rename to res/img/icons/32x32/resolution.png diff --git a/img/icons/32x32/session.png b/res/img/icons/32x32/session.png similarity index 100% rename from img/icons/32x32/session.png rename to res/img/icons/32x32/session.png diff --git a/img/icons/32x32/stop.png b/res/img/icons/32x32/stop.png similarity index 100% rename from img/icons/32x32/stop.png rename to res/img/icons/32x32/stop.png diff --git a/img/icons/32x32/stop_session.png b/res/img/icons/32x32/stop_session.png similarity index 100% rename from img/icons/32x32/stop_session.png rename to res/img/icons/32x32/stop_session.png diff --git a/img/icons/32x32/suspend.png b/res/img/icons/32x32/suspend.png similarity index 100% rename from img/icons/32x32/suspend.png rename to res/img/icons/32x32/suspend.png diff --git a/img/icons/32x32/suspend_session.png b/res/img/icons/32x32/suspend_session.png similarity index 100% rename from img/icons/32x32/suspend_session.png rename to res/img/icons/32x32/suspend_session.png diff --git a/img/icons/32x32/tbhide.png b/res/img/icons/32x32/tbhide.png similarity index 100% rename from img/icons/32x32/tbhide.png rename to res/img/icons/32x32/tbhide.png diff --git a/img/icons/32x32/tbshow.png b/res/img/icons/32x32/tbshow.png similarity index 100% rename from img/icons/32x32/tbshow.png rename to res/img/icons/32x32/tbshow.png diff --git a/img/icons/32x32/tbshow.xcf b/res/img/icons/32x32/tbshow.xcf similarity index 100% rename from img/icons/32x32/tbshow.xcf rename to res/img/icons/32x32/tbshow.xcf diff --git a/img/icons/32x32/unity.png b/res/img/icons/32x32/unity.png similarity index 100% rename from img/icons/32x32/unity.png rename to res/img/icons/32x32/unity.png diff --git a/img/icons/32x32/x2goclient.png b/res/img/icons/32x32/x2goclient.png similarity index 100% rename from img/icons/32x32/x2goclient.png rename to res/img/icons/32x32/x2goclient.png diff --git a/img/icons/48x48/x2goclient.png b/res/img/icons/48x48/x2goclient.png similarity index 100% rename from img/icons/48x48/x2goclient.png rename to res/img/icons/48x48/x2goclient.png diff --git a/img/icons/64x64/X.png b/res/img/icons/64x64/X.png similarity index 100% rename from img/icons/64x64/X.png rename to res/img/icons/64x64/X.png diff --git a/img/icons/64x64/audio.png b/res/img/icons/64x64/audio.png similarity index 100% rename from img/icons/64x64/audio.png rename to res/img/icons/64x64/audio.png diff --git a/img/icons/64x64/create_file.png b/res/img/icons/64x64/create_file.png similarity index 100% rename from img/icons/64x64/create_file.png rename to res/img/icons/64x64/create_file.png diff --git a/img/icons/64x64/delete.png b/res/img/icons/64x64/delete.png similarity index 100% rename from img/icons/64x64/delete.png rename to res/img/icons/64x64/delete.png diff --git a/img/icons/64x64/edit.png b/res/img/icons/64x64/edit.png similarity index 100% rename from img/icons/64x64/edit.png rename to res/img/icons/64x64/edit.png diff --git a/img/icons/64x64/edit_file.png b/res/img/icons/64x64/edit_file.png similarity index 100% rename from img/icons/64x64/edit_file.png rename to res/img/icons/64x64/edit_file.png diff --git a/img/icons/64x64/edit_settings.png b/res/img/icons/64x64/edit_settings.png similarity index 100% rename from img/icons/64x64/edit_settings.png rename to res/img/icons/64x64/edit_settings.png diff --git a/img/icons/64x64/file-open.png b/res/img/icons/64x64/file-open.png similarity index 100% rename from img/icons/64x64/file-open.png rename to res/img/icons/64x64/file-open.png diff --git a/img/icons/64x64/gnome.png b/res/img/icons/64x64/gnome.png similarity index 100% rename from img/icons/64x64/gnome.png rename to res/img/icons/64x64/gnome.png diff --git a/img/icons/64x64/kde.png b/res/img/icons/64x64/kde.png similarity index 100% rename from img/icons/64x64/kde.png rename to res/img/icons/64x64/kde.png diff --git a/img/icons/64x64/lxde.png b/res/img/icons/64x64/lxde.png similarity index 100% rename from img/icons/64x64/lxde.png rename to res/img/icons/64x64/lxde.png diff --git a/img/icons/64x64/new_file.png b/res/img/icons/64x64/new_file.png similarity index 100% rename from img/icons/64x64/new_file.png rename to res/img/icons/64x64/new_file.png diff --git a/img/icons/64x64/personal.png b/res/img/icons/64x64/personal.png similarity index 100% rename from img/icons/64x64/personal.png rename to res/img/icons/64x64/personal.png diff --git a/img/icons/64x64/preferences.png b/res/img/icons/64x64/preferences.png similarity index 100% rename from img/icons/64x64/preferences.png rename to res/img/icons/64x64/preferences.png diff --git a/img/icons/64x64/rdp.png b/res/img/icons/64x64/rdp.png similarity index 100% rename from img/icons/64x64/rdp.png rename to res/img/icons/64x64/rdp.png diff --git a/img/icons/64x64/resolution.png b/res/img/icons/64x64/resolution.png similarity index 100% rename from img/icons/64x64/resolution.png rename to res/img/icons/64x64/resolution.png diff --git a/img/icons/64x64/session.png b/res/img/icons/64x64/session.png similarity index 100% rename from img/icons/64x64/session.png rename to res/img/icons/64x64/session.png diff --git a/img/icons/64x64/unity.png b/res/img/icons/64x64/unity.png similarity index 100% rename from img/icons/64x64/unity.png rename to res/img/icons/64x64/unity.png diff --git a/img/icons/64x64/x2goclient.png b/res/img/icons/64x64/x2goclient.png similarity index 100% rename from img/icons/64x64/x2goclient.png rename to res/img/icons/64x64/x2goclient.png diff --git a/img/icons/hildon/x2goclient_26.png b/res/img/icons/hildon/x2goclient_26.png similarity index 100% rename from img/icons/hildon/x2goclient_26.png rename to res/img/icons/hildon/x2goclient_26.png diff --git a/img/icons/hildon/x2goclient_40.png b/res/img/icons/hildon/x2goclient_40.png similarity index 100% rename from img/icons/hildon/x2goclient_40.png rename to res/img/icons/hildon/x2goclient_40.png diff --git a/img/icons/hildon/x2goclient_64.png b/res/img/icons/hildon/x2goclient_64.png similarity index 100% rename from img/icons/hildon/x2goclient_64.png rename to res/img/icons/hildon/x2goclient_64.png diff --git a/img/icons/hildon/x2goclient_hildon.svg b/res/img/icons/hildon/x2goclient_hildon.svg similarity index 100% rename from img/icons/hildon/x2goclient_hildon.svg rename to res/img/icons/hildon/x2goclient_hildon.svg diff --git a/img/icons/x2go-mac.icns b/res/img/icons/x2go-mac.icns similarity index 100% rename from img/icons/x2go-mac.icns rename to res/img/icons/x2go-mac.icns diff --git a/img/icons/x2go-win-48.ico b/res/img/icons/x2go-win-48.ico similarity index 100% rename from img/icons/x2go-win-48.ico rename to res/img/icons/x2go-win-48.ico diff --git a/img/icons/x2goclient.xpm b/res/img/icons/x2goclient.xpm similarity index 100% rename from img/icons/x2goclient.xpm rename to res/img/icons/x2goclient.xpm diff --git a/img/png/ico.png b/res/img/png/ico.png similarity index 100% rename from img/png/ico.png rename to res/img/png/ico.png diff --git a/img/png/ico_440x180.png b/res/img/png/ico_440x180.png similarity index 100% rename from img/png/ico_440x180.png rename to res/img/png/ico_440x180.png diff --git a/img/png/ico_mini.png b/res/img/png/ico_mini.png similarity index 100% rename from img/png/ico_mini.png rename to res/img/png/ico_mini.png diff --git a/img/png/macinstaller_background.png b/res/img/png/macinstaller_background.png similarity index 100% rename from img/png/macinstaller_background.png rename to res/img/png/macinstaller_background.png diff --git a/img/png/power-button.png b/res/img/png/power-button.png similarity index 100% rename from img/png/power-button.png rename to res/img/png/power-button.png diff --git a/img/png/sess_ico.png b/res/img/png/sess_ico.png similarity index 100% rename from img/png/sess_ico.png rename to res/img/png/sess_ico.png diff --git a/img/svg/bg-anim.svg b/res/img/svg/bg-anim.svg similarity index 100% rename from img/svg/bg-anim.svg rename to res/img/svg/bg-anim.svg diff --git a/img/svg/bg.svg b/res/img/svg/bg.svg similarity index 100% rename from img/svg/bg.svg rename to res/img/svg/bg.svg diff --git a/img/svg/bg_hildon.svg b/res/img/svg/bg_hildon.svg similarity index 100% rename from img/svg/bg_hildon.svg rename to res/img/svg/bg_hildon.svg diff --git a/img/svg/folder.svg b/res/img/svg/folder.svg similarity index 100% rename from img/svg/folder.svg rename to res/img/svg/folder.svg diff --git a/img/svg/folder_grey.svg b/res/img/svg/folder_grey.svg similarity index 100% rename from img/svg/folder_grey.svg rename to res/img/svg/folder_grey.svg diff --git a/img/svg/line.svg b/res/img/svg/line.svg similarity index 100% rename from img/svg/line.svg rename to res/img/svg/line.svg diff --git a/img/svg/macinstaller_background.svg b/res/img/svg/macinstaller_background.svg similarity index 100% rename from img/svg/macinstaller_background.svg rename to res/img/svg/macinstaller_background.svg diff --git a/img/svg/onlogo.svg b/res/img/svg/onlogo.svg similarity index 100% rename from img/svg/onlogo.svg rename to res/img/svg/onlogo.svg diff --git a/img/svg/passform.svg b/res/img/svg/passform.svg similarity index 100% rename from img/svg/passform.svg rename to res/img/svg/passform.svg diff --git a/img/svg/sessionbut.svg b/res/img/svg/sessionbut.svg similarity index 100% rename from img/svg/sessionbut.svg rename to res/img/svg/sessionbut.svg diff --git a/img/svg/sessionbut_grey.svg b/res/img/svg/sessionbut_grey.svg similarity index 100% rename from img/svg/sessionbut_grey.svg rename to res/img/svg/sessionbut_grey.svg diff --git a/img/svg/unity.svg b/res/img/svg/unity.svg similarity index 100% rename from img/svg/unity.svg rename to res/img/svg/unity.svg diff --git a/img/svg/x2gologo.svg b/res/img/svg/x2gologo.svg similarity index 100% rename from img/svg/x2gologo.svg rename to res/img/svg/x2gologo.svg diff --git a/img/svg/xfce.svg b/res/img/svg/xfce.svg similarity index 100% rename from img/svg/xfce.svg rename to res/img/svg/xfce.svg diff --git a/img/x2go-logos/mksizedsymbols.sh b/res/img/x2go-logos/mksizedsymbols.sh similarity index 100% rename from img/x2go-logos/mksizedsymbols.sh rename to res/img/x2go-logos/mksizedsymbols.sh diff --git a/img/x2go-logos/x2go-logo-colored.svg b/res/img/x2go-logos/x2go-logo-colored.svg similarity index 100% rename from img/x2go-logos/x2go-logo-colored.svg rename to res/img/x2go-logos/x2go-logo-colored.svg diff --git a/img/x2go-logos/x2go-logo-rotated.svg b/res/img/x2go-logos/x2go-logo-rotated.svg similarity index 100% rename from img/x2go-logos/x2go-logo-rotated.svg rename to res/img/x2go-logos/x2go-logo-rotated.svg diff --git a/img/x2go-logos/x2go-logo.svg b/res/img/x2go-logos/x2go-logo.svg similarity index 100% rename from img/x2go-logos/x2go-logo.svg rename to res/img/x2go-logos/x2go-logo.svg diff --git a/img/x2go-logos/x2go-mascot.svg b/res/img/x2go-logos/x2go-mascot.svg similarity index 100% rename from img/x2go-logos/x2go-mascot.svg rename to res/img/x2go-logos/x2go-mascot.svg diff --git a/x2goclient.pro b/x2goclient.pro index 5556de8..3579dc3 100644 --- a/x2goclient.pro +++ b/x2goclient.pro @@ -193,7 +193,7 @@ win32-* { CONFIG += static release } QT += svg network -ICON = img/icons/x2go-mac.icns +ICON = res/img/icons/x2go-mac.icns QMAKE_INFO_PLIST = Info.plist plugin { diff --git a/x2goclient.rc b/x2goclient.rc index f2f6729..82ea93e 100644 --- a/x2goclient.rc +++ b/x2goclient.rc @@ -1,2 +1,2 @@ -IDI_ICON1 ICON DISCARDABLE "img/icons/x2go-win-48.ico" +IDI_ICON1 ICON DISCARDABLE "res/img/icons/x2go-win-48.ico" -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git