[X2Go-Commits] [x2goclient] 02/04: Move icons/ to img/icons/ and update references in:

git-admin at x2go.org git-admin at x2go.org
Sat Feb 14 00:22:19 CET 2015


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch feature/cleanup
in repository x2goclient.

commit 9d1e1e6715779afde6ea46b6c1ab81ef7563d24e
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sat Feb 14 00:04:44 2015 +0100

    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
---
 COPYRIGHT.x2go-logos        |   10 +--
 Makefile                    |   14 ++---
 debian/changelog            |    6 ++
 debian/x2goclient.install   |   14 ++---
 macbuild.sh                 |    2 +-
 nsis/x2goclient.nsi         |    4 +-
 resources.rcc               |  142 +++++++++++++++++++++----------------------
 src/appdialog.cpp           |   22 +++----
 src/folderbutton.cpp        |    2 +-
 src/folderexplorer.cpp      |    4 +-
 src/onmainwindow.cpp        |   72 +++++++++++-----------
 src/sessionbutton.cpp       |    4 +-
 src/sessionexplorer.cpp     |    4 +-
 src/sessionmanagedialog.cpp |    2 +-
 src/sessionwidget.cpp       |    4 +-
 src/ui/helpdialog.ui        |    2 +-
 src/xsettingswidget.cpp     |    2 +-
 x2goclient.pro              |    2 +-
 x2goclient.rc               |    2 +-
 19 files changed, 160 insertions(+), 154 deletions(-)

diff --git a/COPYRIGHT.x2go-logos b/COPYRIGHT.x2go-logos
index 29a67a8..2b21e9f 100644
--- a/COPYRIGHT.x2go-logos
+++ b/COPYRIGHT.x2go-logos
@@ -13,10 +13,10 @@ License:   GPL-2.0+
 Copyright: 2005-2015 Heinz-M. Grasesing
 <heinz-m.graesing at obviously-nice.de>
 License:   GPL-2.0+
-Files:     icons/16x16/x2goclient.png
-           icons/32x32/x2goclient.png
-           icons/48x48/x2goclient.png
-           icons/64x64/x2goclient.png
-           icons/128x128/x2goclient.png
+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
 Copyright: 2005-2015 Heinz-M. Graesing <heinz-m.graesing at obviously-nice.de>
 License:   GPL-2.0+
diff --git a/Makefile b/Makefile
index 5437c3e..4f95d9c 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) icons/x2goclient.xpm          $(DESTDIR)$(SHAREDIR)/x2goclient/icons/x2goclient.xpm
-	$(INSTALL_FILE) icons/128x128/x2goclient.png  $(DESTDIR)$(SHAREDIR)/x2goclient/icons/x2goclient.png
-	$(INSTALL_FILE) icons/128x128/x2gosession.png $(DESTDIR)$(SHAREDIR)/x2goclient/icons/x2gosession.png
-	$(INSTALL_FILE) icons/128x128/x2goclient.png  $(DESTDIR)$(SHAREDIR)/icons/hicolor/128x128/apps/x2goclient.png
-	$(INSTALL_FILE) icons/16x16/x2goclient.png    $(DESTDIR)$(SHAREDIR)/icons/hicolor/16x16/apps/x2goclient.png
-	$(INSTALL_FILE) icons/64x64/x2goclient.png    $(DESTDIR)$(SHAREDIR)/icons/hicolor/64x64/apps/x2goclient.png
-	$(INSTALL_FILE) icons/32x32/x2goclient.png    $(DESTDIR)$(SHAREDIR)/icons/hicolor/32x32/apps/x2goclient.png
+	$(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_plugin:
 	$(INSTALL_DIR) $(DESTDIR)$(MOZPLUGDIR)/
diff --git a/debian/changelog b/debian/changelog
index 2afe203..0412fe2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -118,6 +118,12 @@ 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.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Thu, 27 Nov 2014 12:01:43 +0100
 
diff --git a/debian/x2goclient.install b/debian/x2goclient.install
index 8a9b052..04ba470 100644
--- a/debian/x2goclient.install
+++ b/debian/x2goclient.install
@@ -1,9 +1,9 @@
 client_build/x2goclient       usr/bin
 desktop/x2goclient.desktop    usr/share/applications/
-icons/x2goclient.xpm          usr/share/x2goclient/icons/
-icons/128x128/x2goclient.png     usr/share/x2goclient/icons/
-icons/128x128/x2gosession.png    usr/share/x2goclient/icons/
-icons/128x128/x2goclient.png     usr/share/icons/hicolor/128x128/apps/
-icons/16x16/x2goclient.png       usr/share/icons/hicolor/16x16/apps/
-icons/64x64/x2goclient.png       usr/share/icons/hicolor/64x64/apps/
-icons/32x32/x2goclient.png       usr/share/icons/hicolor/32x32/apps/
+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/
diff --git a/macbuild.sh b/macbuild.sh
index 70084e6..115718c 100755
--- a/macbuild.sh
+++ b/macbuild.sh
@@ -64,5 +64,5 @@ $PKG_DMG \
 	--copy "./LICENSE" \
 	--copy "./COPYING" \
 	--symlink "/Applications: " \
-	--icon "./icons/x2go-mac.icns" \
+	--icon "./img/icons/x2go-mac.icns" \
 	--format "UDBZ"
diff --git a/nsis/x2goclient.nsi b/nsis/x2goclient.nsi
index 11d385c..285a80c 100755
--- a/nsis/x2goclient.nsi
+++ b/nsis/x2goclient.nsi
@@ -15,8 +15,8 @@
   Name "x2goclient ${VERSION}"
   Caption "x2goclient ${VERSION}"
   OutFile "x2goclient-${VERSION}-setup.exe"
-  !define MUI_ICON icons\win-install.ico
-  !define MUI_UNICON icons\win-uninstall.ico
+  !define MUI_ICON img\icons\win-install.ico
+  !define MUI_UNICON img\icons\win-uninstall.ico
   ;Default installation folder
   InstallDir "$PROGRAMFILES\x2goclient"
   
diff --git a/resources.rcc b/resources.rcc
index 6c818ae..048cf2e 100644
--- a/resources.rcc
+++ b/resources.rcc
@@ -15,77 +15,77 @@
        <file>png/sess_ico.png</file>
        <file>png/ico_440x180.png</file>
        <file>png/power-button.png</file>
-       <file>icons/128x128/x2go.png</file>
-       <file>icons/128x128/folder.png</file>
-       <file>icons/128x128/x2gosession.png</file>
-       <file>icons/128x128/create_file.png</file>
-       <file>icons/128x128/lxde.png</file>
-       <file>icons/128x128/preferences.png</file>
-       <file>icons/128x128/rdp.png</file>
-       <file>icons/64x64/audio.png</file>
-       <file>icons/64x64/personal.png</file>
-       <file>icons/64x64/create_file.png</file>
-       <file>icons/64x64/lxde.png</file>
-       <file>icons/64x64/preferences.png</file>
-       <file>icons/64x64/rdp.png</file>
-       <file>icons/32x32/edit.png</file>
-       <file>icons/32x32/edit_settings.png</file>
-       <file>icons/32x32/exit.png</file>
-       <file>icons/32x32/file-open.png</file>
-       <file>icons/32x32/new_file.png</file>
-       <file>icons/32x32/create_file.png</file>
-       <file>icons/32x32/lxde.png</file>
-       <file>icons/32x32/preferences.png</file>
-       <file>icons/32x32/rdp.png</file>
-       <file>icons/32x32/reconnect.png</file>
-       <file>icons/32x32/tbhide.png</file>
-       <file>icons/32x32/tbshow.png</file>
-       <file>icons/32x32/attach.png</file>
-       <file>icons/32x32/detach.png</file>
-       <file>icons/32x32/suspend.png</file>
-       <file>icons/32x32/stop.png</file>
-       <file>icons/32x32/auth.png</file>
-       <file>icons/32x32/x2goclient.png</file>
-       <file>icons/32x32/resolution.png</file>
-       <file>icons/32x32/contest.png</file>
-       <file>icons/32x32/apps.png</file>
-       <file>icons/32x32/open_dir.png</file>
-       <file>icons/32x32/suspend_session.png</file>
-       <file>icons/32x32/stop_session.png</file>
-       <file>icons/16x16/audio.png</file>
-       <file>icons/16x16/file-open.png</file>
-       <file>icons/16x16/delete.png</file>
-       <file>icons/16x16/edit.png</file>
-       <file>icons/16x16/gnome.png</file>
-       <file>icons/16x16/unity.png</file>
-       <file>icons/16x16/xfce.png</file>
-       <file>icons/16x16/mate.png</file>
-       <file>icons/16x16/kde.png</file>
-       <file>icons/16x16/cinnamon.png</file>
-       <file>icons/16x16/trinity.png</file>
-       <file>icons/16x16/openbox.png</file>
-       <file>icons/16x16/icewm.png</file>
-       <file>icons/16x16/new_file.png</file>
-       <file>icons/16x16/resolution.png</file>
-       <file>icons/16x16/session.png</file>
-       <file>icons/16x16/x2go.png</file>
-       <file>icons/16x16/tbshow.png</file>
-       <file>icons/16x16/X.png</file>
-       <file>icons/16x16/create_file.png</file>
-       <file>icons/16x16/lxde.png</file>
-       <file>icons/16x16/preferences.png</file>
-       <file>icons/16x16/rdp.png</file>
-       <file>icons/22x22/applications-development.png</file>
-       <file>icons/22x22/applications-education.png</file>
-       <file>icons/22x22/applications-games.png</file>
-       <file>icons/22x22/applications-graphics.png</file>
-       <file>icons/22x22/applications-internet.png</file>
-       <file>icons/22x22/applications-multimedia.png</file>
-       <file>icons/22x22/applications-office.png</file>
-       <file>icons/22x22/applications-other.png</file>
-       <file>icons/22x22/applications-system.png</file>
-       <file>icons/22x22/applications-utilities.png</file>
-       <file>icons/22x22/preferences-system.png</file>
+       <file>img/icons/128x128/x2go.png</file>
+       <file>img/icons/128x128/folder.png</file>
+       <file>img/icons/128x128/x2gosession.png</file>
+       <file>img/icons/128x128/create_file.png</file>
+       <file>img/icons/128x128/lxde.png</file>
+       <file>img/icons/128x128/preferences.png</file>
+       <file>img/icons/128x128/rdp.png</file>
+       <file>img/icons/64x64/audio.png</file>
+       <file>img/icons/64x64/personal.png</file>
+       <file>img/icons/64x64/create_file.png</file>
+       <file>img/icons/64x64/lxde.png</file>
+       <file>img/icons/64x64/preferences.png</file>
+       <file>img/icons/64x64/rdp.png</file>
+       <file>img/icons/32x32/edit.png</file>
+       <file>img/icons/32x32/edit_settings.png</file>
+       <file>img/icons/32x32/exit.png</file>
+       <file>img/icons/32x32/file-open.png</file>
+       <file>img/icons/32x32/new_file.png</file>
+       <file>img/icons/32x32/create_file.png</file>
+       <file>img/icons/32x32/lxde.png</file>
+       <file>img/icons/32x32/preferences.png</file>
+       <file>img/icons/32x32/rdp.png</file>
+       <file>img/icons/32x32/reconnect.png</file>
+       <file>img/icons/32x32/tbhide.png</file>
+       <file>img/icons/32x32/tbshow.png</file>
+       <file>img/icons/32x32/attach.png</file>
+       <file>img/icons/32x32/detach.png</file>
+       <file>img/icons/32x32/suspend.png</file>
+       <file>img/icons/32x32/stop.png</file>
+       <file>img/icons/32x32/auth.png</file>
+       <file>img/icons/32x32/x2goclient.png</file>
+       <file>img/icons/32x32/resolution.png</file>
+       <file>img/icons/32x32/contest.png</file>
+       <file>img/icons/32x32/apps.png</file>
+       <file>img/icons/32x32/open_dir.png</file>
+       <file>img/icons/32x32/suspend_session.png</file>
+       <file>img/icons/32x32/stop_session.png</file>
+       <file>img/icons/16x16/audio.png</file>
+       <file>img/icons/16x16/file-open.png</file>
+       <file>img/icons/16x16/delete.png</file>
+       <file>img/icons/16x16/edit.png</file>
+       <file>img/icons/16x16/gnome.png</file>
+       <file>img/icons/16x16/unity.png</file>
+       <file>img/icons/16x16/xfce.png</file>
+       <file>img/icons/16x16/mate.png</file>
+       <file>img/icons/16x16/kde.png</file>
+       <file>img/icons/16x16/cinnamon.png</file>
+       <file>img/icons/16x16/trinity.png</file>
+       <file>img/icons/16x16/openbox.png</file>
+       <file>img/icons/16x16/icewm.png</file>
+       <file>img/icons/16x16/new_file.png</file>
+       <file>img/icons/16x16/resolution.png</file>
+       <file>img/icons/16x16/session.png</file>
+       <file>img/icons/16x16/x2go.png</file>
+       <file>img/icons/16x16/tbshow.png</file>
+       <file>img/icons/16x16/X.png</file>
+       <file>img/icons/16x16/create_file.png</file>
+       <file>img/icons/16x16/lxde.png</file>
+       <file>img/icons/16x16/preferences.png</file>
+       <file>img/icons/16x16/rdp.png</file>
+       <file>img/icons/22x22/applications-development.png</file>
+       <file>img/icons/22x22/applications-education.png</file>
+       <file>img/icons/22x22/applications-games.png</file>
+       <file>img/icons/22x22/applications-graphics.png</file>
+       <file>img/icons/22x22/applications-internet.png</file>
+       <file>img/icons/22x22/applications-multimedia.png</file>
+       <file>img/icons/22x22/applications-office.png</file>
+       <file>img/icons/22x22/applications-other.png</file>
+       <file>img/icons/22x22/applications-system.png</file>
+       <file>img/icons/22x22/applications-utilities.png</file>
+       <file>img/icons/22x22/preferences-system.png</file>
        <file>txt/packs</file>
        <file>txt/encodings</file>
        <file>x2goclient_da.qm</file>
diff --git a/src/appdialog.cpp b/src/appdialog.cpp
index a9dc739..0d2a5f6 100644
--- a/src/appdialog.cpp
+++ b/src/appdialog.cpp
@@ -99,57 +99,57 @@ void AppDialog::loadApps()
         {
         case Application::MULTIMEDIA:
             if (!media)
-                media=initTopItem(tr("Multimedia"), QPixmap(":/icons/22x22/applications-multimedia.png"));
+                media=initTopItem(tr("Multimedia"), QPixmap(":/img/icons/22x22/applications-multimedia.png"));
             parent=media;
             break;
         case Application::DEVELOPMENT:
             if (!dev)
-                dev=initTopItem(tr("Development"), QPixmap(":/icons/22x22/applications-development.png"));
+                dev=initTopItem(tr("Development"), QPixmap(":/img/icons/22x22/applications-development.png"));
             parent=dev;
             break;
         case Application::EDUCATION:
             if (!edu)
-                edu=initTopItem(tr("Education"), QPixmap(":/icons/22x22/applications-education.png"));
+                edu=initTopItem(tr("Education"), QPixmap(":/img/icons/22x22/applications-education.png"));
             parent=edu;
             break;
         case Application::GAME:
             if (!game)
-                game=initTopItem(tr("Game"), QPixmap(":/icons/22x22/applications-games.png"));
+                game=initTopItem(tr("Game"), QPixmap(":/img/icons/22x22/applications-games.png"));
             parent=game;
             break;
         case Application::GRAPHICS:
             if (!graph)
-                graph=initTopItem(tr("Graphics"), QPixmap(":/icons/22x22/applications-graphics.png"));
+                graph=initTopItem(tr("Graphics"), QPixmap(":/img/icons/22x22/applications-graphics.png"));
             parent=graph;
             break;
         case Application::NETWORK:
             if (!net)
-                net=initTopItem(tr("Network"), QPixmap(":/icons/22x22/applications-internet.png"));
+                net=initTopItem(tr("Network"), QPixmap(":/img/icons/22x22/applications-internet.png"));
             parent=net;
             break;
         case Application::OFFICE:
             if (!office)
-                office=initTopItem(tr("Office"), QPixmap(":/icons/22x22/applications-office.png"));
+                office=initTopItem(tr("Office"), QPixmap(":/img/icons/22x22/applications-office.png"));
             parent=office;
             break;
         case Application::SETTINGS:
             if (!set)
-                set=initTopItem(tr("Settings"), QPixmap(":/icons/22x22/preferences-system.png"));
+                set=initTopItem(tr("Settings"), QPixmap(":/img/icons/22x22/preferences-system.png"));
             parent=set;
             break;
         case Application::SYSTEM:
             if (!sys)
-                sys=initTopItem(tr("System"), QPixmap(":/icons/22x22/applications-system.png"));
+                sys=initTopItem(tr("System"), QPixmap(":/img/icons/22x22/applications-system.png"));
             parent=sys;
             break;
         case Application::UTILITY:
             if (!util)
-                util=initTopItem(tr("Utility"), QPixmap(":/icons/22x22/applications-utilities.png"));
+                util=initTopItem(tr("Utility"), QPixmap(":/img/icons/22x22/applications-utilities.png"));
             parent=util;
             break;
         case Application::OTHER:
             if (!other)
-                other=initTopItem(tr("Other"), QPixmap(":/icons/22x22/applications-other.png"));
+                other=initTopItem(tr("Other"), QPixmap(":/img/icons/22x22/applications-other.png"));
             parent=other;
             break;
         }
diff --git a/src/folderbutton.cpp b/src/folderbutton.cpp
index ebdc917..c6b571a 100644
--- a/src/folderbutton.cpp
+++ b/src/folderbutton.cpp
@@ -106,7 +106,7 @@ void FolderButton::loadIcon()
     else
         st= new X2goSettings( "sessions" );
 
-    QString sessIcon=":icons/128x128/folder.png";
+    QString sessIcon=":/img/icons/128x128/folder.png";
     QPixmap* pix;
 
     QString normPath=(path+"/"+name).split("/",QString::SkipEmptyParts).join("::");
diff --git a/src/folderexplorer.cpp b/src/folderexplorer.cpp
index c9fcaf5..8694d77 100644
--- a/src/folderexplorer.cpp
+++ b/src/folderexplorer.cpp
@@ -29,7 +29,7 @@ FolderExplorer::FolderExplorer(QString path, SessionExplorer* explorer, QWidget*
     this->explorer=explorer;
     root=new QTreeWidgetItem(treeWidget);
     root->setText(0,"/");
-    root->setIcon(0,QIcon(":icons/128x128/folder.png"));
+    root->setIcon(0,QIcon(":/img/icons/128x128/folder.png"));
     currentPath=path;
     initFolders(root, "");
     root->setExpanded(true);
@@ -144,7 +144,7 @@ void FolderExplorer::slotNewFolder()
     QTreeWidgetItem* it=new QTreeWidgetItem(menuItem);
     QString name=tr("New Folder");
     it->setText(0,name);
-    it->setIcon(0, QIcon(":icons/128x128/folder.png"));
+    it->setIcon(0, QIcon(":/img/icons/128x128/folder.png"));
     QString normPath=(menuItem->data(0,Qt::UserRole).toString()+"/"+name).split("/",QString::SkipEmptyParts).join("/");
     it->setData(0,Qt::UserRole, normPath+"/");
     treeWidget->clearSelection();
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index 6dadd87..0373679 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -385,7 +385,7 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent )
 
     }
 
-    act_abclient=new QAction ( QIcon ( ":icons/32x32/x2goclient.png" ),
+    act_abclient=new QAction ( QIcon ( ":/img/icons/32x32/x2goclient.png" ),
                                tr ( "About X2GO client" ),this );
 
 
@@ -587,25 +587,25 @@ void ONMainWindow::initWidgetsEmbed()
 #endif
 
 
-    act_shareFolder=new QAction ( QIcon ( ":icons/32x32/file-open.png" ),
+    act_shareFolder=new QAction ( QIcon ( ":/img/icons/32x32/file-open.png" ),
                                   tr ( "Share folder..." ),this );
 
-    act_showApps=new QAction ( QIcon ( ":icons/32x32/apps.png" ),
+    act_showApps=new QAction ( QIcon ( ":/img/icons/32x32/apps.png" ),
                                tr ( "Applications..." ),this );
 
-    act_suspend=new QAction ( QIcon ( ":icons/32x32/suspend.png" ),
+    act_suspend=new QAction ( QIcon ( ":/img/icons/32x32/suspend.png" ),
                               tr ( "Suspend" ),this );
 
-    act_terminate=new QAction ( QIcon ( ":icons/32x32/stop.png" ),
+    act_terminate=new QAction ( QIcon ( ":/img/icons/32x32/stop.png" ),
                                 tr ( "Terminate" ),this );
-    act_reconnect=new QAction ( QIcon ( ":icons/32x32/reconnect.png" ),
+    act_reconnect=new QAction ( QIcon ( ":/img/icons/32x32/reconnect.png" ),
                                 tr ( "Reconnect" ),this );
     act_reconnect->setEnabled ( false );
 
-    act_embedContol=new QAction ( QIcon ( ":icons/32x32/detach.png" ),
+    act_embedContol=new QAction ( QIcon ( ":/img/icons/32x32/detach.png" ),
                                   tr ( "Detach X2Go window" ),this );
 
-    act_embedToolBar=new QAction ( QIcon ( ":icons/32x32/tbhide.png" ),
+    act_embedToolBar=new QAction ( QIcon ( ":/img/icons/32x32/tbhide.png" ),
                                    tr ( "Minimize toolbar" ),this );
 
 
@@ -792,7 +792,7 @@ void ONMainWindow::initWidgetsNormal()
     act_new->setShortcut ( tr ( "Ctrl+N" ) );
 
 
-    setWindowIcon ( QIcon ( ":icons/128x128/x2go.png" ) );
+    setWindowIcon ( QIcon ( ":/img/icons/128x128/x2go.png" ) );
     act_edit=new QAction ( QIcon ( iconsPath ( "/32x32/edit.png" ) ),
                            tr ( "Session management..." ),this );
     act_edit->setShortcut ( tr ( "Ctrl+E" ) );
@@ -996,7 +996,7 @@ void ONMainWindow::slotGetBrokerAuth()
 {
     pass->clear();
     login->clear();
-    QString pixFile=":icons/128x128/x2gosession.png";
+    QString pixFile=":/img/icons/128x128/x2gosession.png";
     if (SPixFile!=QString::null)
         pixFile=SPixFile;
     QPixmap pix(pixFile);
@@ -1078,27 +1078,27 @@ void ONMainWindow::trayIconInit()
             trayIconActiveConnectionMenu = trayIconMenu->addMenu(tr("Not connected"));
 
             appMenu[Application::MULTIMEDIA]=initTrayAppMenu(tr("Multimedia"),
-                                             QPixmap(":/icons/22x22/applications-multimedia.png"));
+                                             QPixmap(":/img/icons/22x22/applications-multimedia.png"));
             appMenu[Application::DEVELOPMENT]=initTrayAppMenu(tr("Development"),
-                                              QPixmap(":/icons/22x22/applications-development.png"));
+                                              QPixmap(":/img/icons/22x22/applications-development.png"));
             appMenu[Application::EDUCATION]=initTrayAppMenu(tr("Education"),
-                                            QPixmap(":/icons/22x22/applications-education.png"));
+                                            QPixmap(":/img/icons/22x22/applications-education.png"));
             appMenu[Application::GAME]=initTrayAppMenu(tr("Game"),
-                                       QPixmap(":/icons/22x22/applications-games.png"));
+                                       QPixmap(":/img/icons/22x22/applications-games.png"));
             appMenu[Application::GRAPHICS]=initTrayAppMenu(tr("Graphics"),
-                                           QPixmap(":/icons/22x22/applications-graphics.png"));
+                                           QPixmap(":/img/icons/22x22/applications-graphics.png"));
             appMenu[Application::NETWORK]=initTrayAppMenu(tr("Network"),
-                                          QPixmap(":/icons/22x22/applications-internet.png"));
+                                          QPixmap(":/img/icons/22x22/applications-internet.png"));
             appMenu[Application::OFFICE]=initTrayAppMenu(tr("Office"),
-                                         QPixmap(":/icons/22x22/applications-office.png"));
+                                         QPixmap(":/img/icons/22x22/applications-office.png"));
             appMenu[Application::SETTINGS]=initTrayAppMenu(tr("Settings"),
-                                           QPixmap(":/icons/22x22/preferences-system.png"));
+                                           QPixmap(":/img/icons/22x22/preferences-system.png"));
             appMenu[Application::SYSTEM]=initTrayAppMenu(tr("System"),
-                                         QPixmap(":/icons/22x22/applications-system.png"));
+                                         QPixmap(":/img/icons/22x22/applications-system.png"));
             appMenu[Application::UTILITY]=initTrayAppMenu(tr("Utility"),
-                                          QPixmap(":/icons/22x22/applications-utilities.png"));
+                                          QPixmap(":/img/icons/22x22/applications-utilities.png"));
             appMenu[Application::OTHER]=initTrayAppMenu(tr("Other"),
-                                        QPixmap(":/icons/22x22/applications-other.png"));
+                                        QPixmap(":/img/icons/22x22/applications-other.png"));
             appSeparator=trayIconActiveConnectionMenu->addSeparator();
 
 
@@ -1132,7 +1132,7 @@ void ONMainWindow::trayIconInit()
             connect(trayIcon, SIGNAL(messageClicked()), this, SLOT(trayMessageClicked()));
 
             trayIcon->setContextMenu(trayIconMenu);
-            trayIcon->setIcon(QIcon ( ":icons/128x128/x2go.png") );
+            trayIcon->setIcon(QIcon ( ":/img/icons/128x128/x2go.png") );
             trayIcon->setToolTip(tr("Left mouse button to hide/restore - Right mouse button to display context menu"));
         }
 
@@ -1225,7 +1225,7 @@ QString ONMainWindow::findTheme ( QString /*theme*/ )
 
 QString ONMainWindow::getKdeIconsPath()
 {
-    return ":/icons";
+    return ":/img/icons";
 }
 
 void ONMainWindow::slotResize ( const QSize sz )
@@ -1580,7 +1580,7 @@ QString ONMainWindow::iconsPath ( QString fname )
     /*    QFile fl(this->kdeIconsPath+fname);
     	if(fl.exists())
     	return kdeIconsPath+fname;*/
-    return ( QString ) ":/icons"+fname;
+    return ( QString ) ":/img/icons"+fname;
 }
 
 void ONMainWindow::displayUsers()
@@ -2535,7 +2535,7 @@ void ONMainWindow::slotSelectedFromList ( SessionButton* session )
 
         sessIcon=st->setting()->value (
                      sid+"/icon",
-                     ( QVariant ) ":icons/128x128/x2gosession.png"
+                     ( QVariant ) ":/img/icons/128x128/x2gosession.png"
                  ).toString();
         sessIcon=expandHome(sessIcon);
 
@@ -2587,7 +2587,7 @@ void ONMainWindow::slotSelectedFromList ( SessionButton* session )
         server=config.server;
         userName=config.user;
         sshPort=config.sshport;
-        sessIcon=":icons/128x128/x2gosession.png";
+        sessIcon=":/img/icons/128x128/x2gosession.png";
         sessionName=config.session;
         currentKey=config.key;
     }
@@ -4204,7 +4204,7 @@ void ONMainWindow::setTrayIconToSessionIcon(QString info) {
             sid="embedded";
 
         if (!keepTrayIcon) {
-            QString imagePath = expandHome(st->setting()->value(sid + "/icon", (QVariant) QString(":icons/128x128/x2go.png")).toString());
+            QString imagePath = expandHome(st->setting()->value(sid + "/icon", (QVariant) QString(":/img/icons/128x128/x2go.png")).toString());
             trayIcon->setIcon(QIcon (imagePath));
         }
 
@@ -5472,7 +5472,7 @@ void ONMainWindow::slotProxyFinished ( int,QProcess::ExitStatus )
 #endif
     //set tray icon to default
     if (trayIcon && !keepTrayIcon)
-        trayIcon->setIcon(QIcon ( ":icons/128x128/x2go.png") );
+        trayIcon->setIcon(QIcon ( ":/img/icons/128x128/x2go.png") );
 
 
     if ( embedMode )
@@ -10342,7 +10342,7 @@ void ONMainWindow::slotDetachProxyWindow()
     bgFrame->show();
     setStatStatus();
     act_embedContol->setText ( tr ( "Attach X2Go window" ) );
-    act_embedContol->setIcon ( QIcon ( ":icons/32x32/attach.png" ) );
+    act_embedContol->setIcon ( QIcon ( ":/img/icons/32x32/attach.png" ) );
 #ifdef Q_OS_LINUX
     //if QX11EmbedContainer cannot embed window, check if window exists
     //and reconnect
@@ -10368,7 +10368,7 @@ void ONMainWindow::slotAttachProxyWindow()
         setStatStatus();
         act_embedContol->setText ( tr ( "Detach X2Go window" ) );
         act_embedContol->setIcon (
-            QIcon ( ":icons/32x32/detach.png" ) );
+            QIcon ( ":/img/icons/32x32/detach.png" ) );
         QTimer::singleShot ( 100, this, SLOT ( slotEmbedWindow() ) );
     }
     else
@@ -10943,25 +10943,25 @@ void ONMainWindow::initStatusDlg()
 
     sbApps=new QToolButton (sessionStatusDlg );
     sbApps->setToolTip(tr ( "Applications..." ));
-    sbApps->setIcon(QPixmap(":/icons/32x32/apps.png"));
+    sbApps->setIcon(QPixmap(":/img/icons/32x32/apps.png"));
     sbApps->setAutoRaise(true);
     sbApps->setFocusPolicy(Qt::NoFocus);
 
     sbExp=new QToolButton (sessionStatusDlg );
-    sbExp->setIcon(QPixmap(":/icons/32x32/open_dir.png"));
+    sbExp->setIcon(QPixmap(":/img/icons/32x32/open_dir.png"));
     sbExp->setToolTip (tr ("Share folder..." ));
     sbExp->setAutoRaise(true);
     sbExp->setFocusPolicy(Qt::NoFocus);
 
     sbSusp=new QToolButton (sessionStatusDlg );
-    sbSusp->setIcon(QPixmap(":/icons/32x32/suspend_session.png"));
+    sbSusp->setIcon(QPixmap(":/img/icons/32x32/suspend_session.png"));
     sbSusp->setToolTip(tr ( "Abort" ));
     sbSusp->setAutoRaise(true);
     sbSusp->setFocusPolicy(Qt::NoFocus);
 
 
     sbTerm=new QToolButton (sessionStatusDlg );
-    sbTerm->setIcon(QPixmap(":/icons/32x32/stop_session.png"));
+    sbTerm->setIcon(QPixmap(":/img/icons/32x32/stop_session.png"));
     sbTerm->setToolTip(tr ( "Terminate" ));
     sbTerm->setAutoRaise(true);
     sbTerm->setFocusPolicy(Qt::NoFocus);
@@ -11460,7 +11460,7 @@ void ONMainWindow::slotEmbedToolBar()
     {
         stb->clear();
         act_embedToolBar->setIcon (
-            QIcon ( ":icons/16x16/tbshow.png" ) );
+            QIcon ( ":/img/icons/16x16/tbshow.png" ) );
         stb->addAction ( act_embedToolBar );
         stb->setToolButtonStyle ( Qt::ToolButtonIconOnly );
         stb->widgetForAction (
@@ -11476,7 +11476,7 @@ void ONMainWindow::slotEmbedToolBar()
     {
         initEmbedToolBar();
         act_embedToolBar->setIcon (
-            QIcon ( ":icons/32x32/tbhide.png" ) );
+            QIcon ( ":/img/icons/32x32/tbhide.png" ) );
         act_embedToolBar->setText ( tr ( "Minimize toolbar" ) );
     }
     embedTbVisible=!embedTbVisible;
diff --git a/src/sessionbutton.cpp b/src/sessionbutton.cpp
index 693b782..f20e579 100644
--- a/src/sessionbutton.cpp
+++ b/src/sessionbutton.cpp
@@ -313,12 +313,12 @@ void SessionButton::redraw()
     QString sessIcon=st->setting()->value (
                          sid+"/icon",
                          ( QVariant )
-                         ":icons/128x128/x2gosession.png"
+                         ":/img/icons/128x128/x2gosession.png"
                      ).toString();
     sessIcon = expandHome(sessIcon);
     QPixmap* pix;
 
-    if (!par->brokerMode || sessIcon == ":icons/128x128/x2gosession.png")
+    if (!par->brokerMode || sessIcon == ":/img/icons/128x128/x2gosession.png")
         pix=new QPixmap( sessIcon );
     else
     {
diff --git a/src/sessionexplorer.cpp b/src/sessionexplorer.cpp
index 3e1f688..fcdd719 100644
--- a/src/sessionexplorer.cpp
+++ b/src/sessionexplorer.cpp
@@ -170,10 +170,10 @@ void SessionExplorer::slotCreateDesktopIcon ( SessionButton* bt )
     QString sessIcon=st.setting()->value (
                          bt->id() +"/icon",
                          ( QVariant )
-                         ":icons/128x128/x2gosession.png"
+                         ":/img/icons/128x128/x2gosession.png"
                      ).toString();
     sessIcon = expandHome(sessIcon);
-    if ( sessIcon.startsWith ( ":icons",Qt::CaseInsensitive ) ||
+    if ( sessIcon.startsWith ( ":/img/icons",Qt::CaseInsensitive ) ||
             !sessIcon.endsWith ( ".png",Qt::CaseInsensitive ) )
     {
         sessIcon="/usr/share/x2goclient/icons/x2gosession.png";
diff --git a/src/sessionmanagedialog.cpp b/src/sessionmanagedialog.cpp
index 0efa73c..49016bf 100644
--- a/src/sessionmanagedialog.cpp
+++ b/src/sessionmanagedialog.cpp
@@ -148,7 +148,7 @@ void SessionManageDialog::loadSessions()
 
     root=new QTreeWidgetItem(sessions);
     root->setText(0,"/");
-    root->setIcon(0,QIcon(":icons/128x128/folder.png"));
+    root->setIcon(0,QIcon(":/img/icons/128x128/folder.png"));
     initFolders(root, "");
     root->setExpanded(true);
     root->setData(0, SESSIONROLE , false);
diff --git a/src/sessionwidget.cpp b/src/sessionwidget.cpp
index 708b25c..e49b718 100644
--- a/src/sessionwidget.cpp
+++ b/src/sessionwidget.cpp
@@ -547,7 +547,7 @@ void SessionWidget::readConfig()
 
     sessIcon=st.setting()->value (
                  sessionId+"/icon",
-                 ( QVariant ) ":icons/128x128/x2gosession.png" ).toString().trimmed();
+                 ( QVariant ) ":/img/icons/128x128/x2gosession.png" ).toString().trimmed();
     sessIcon=expandHome(sessIcon);
     icon->setIcon ( QIcon ( sessIcon ) );
 
@@ -777,7 +777,7 @@ void SessionWidget::setDefaults()
     cmdCombo->lineEdit()->selectAll();
     slot_changeCmd ( 0 );
     cmd->setEnabled ( false );
-    sessIcon=":icons/128x128/x2gosession.png";
+    sessIcon=":/img/icons/128x128/x2gosession.png";
     icon->setIcon ( QIcon ( sessIcon ) );
     sshPort->setValue (
         mainWindow->getDefaultSshPort().toInt() );
diff --git a/src/ui/helpdialog.ui b/src/ui/helpdialog.ui
index 0a32254..fae9098 100644
--- a/src/ui/helpdialog.ui
+++ b/src/ui/helpdialog.ui
@@ -15,7 +15,7 @@
   </property>
   <property name="windowIcon">
    <iconset resource="resources.rcc">
-    <normaloff>:/icons/32x32/x2goclient.png</normaloff>:/icons/32x32/x2goclient.png</iconset>
+    <normaloff>:/img/icons/32x32/x2goclient.png</normaloff>:/img/icons/32x32/x2goclient.png</iconset>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
diff --git a/src/xsettingswidget.cpp b/src/xsettingswidget.cpp
index a3c5132..3ea0c52 100644
--- a/src/xsettingswidget.cpp
+++ b/src/xsettingswidget.cpp
@@ -37,7 +37,7 @@ XSettingsWidget::XSettingsWidget(QWidget* parent)
     leFSMod->setText(st.setting()->value("optionsfs","-fullscreen -notrayicon -clipboard").toString());
     leSingApp->setText(st.setting()->value("optionssingle","-multiwindow -notrayicon -clipboard").toString());
 //     spDelay->setValue(st.setting()->value("delay",3).toInt());
-    pbExec->setIcon( QPixmap ( ":/icons/16x16/file-open.png" ) );
+    pbExec->setIcon( QPixmap ( ":/img/icons/16x16/file-open.png" ) );
 }
 
 XSettingsWidget::~XSettingsWidget()
diff --git a/x2goclient.pro b/x2goclient.pro
index 23579d2..f96fac9 100644
--- a/x2goclient.pro
+++ b/x2goclient.pro
@@ -193,7 +193,7 @@ win32-* {
   CONFIG += static release
 }
 QT += svg network
-ICON = icons/x2go-mac.icns
+ICON = img/icons/x2go-mac.icns
 QMAKE_INFO_PLIST = Info.plist
 
 plugin {
diff --git a/x2goclient.rc b/x2goclient.rc
index d9fd10f..f2f6729 100644
--- a/x2goclient.rc
+++ b/x2goclient.rc
@@ -1,2 +1,2 @@
-IDI_ICON1   ICON    DISCARDABLE    "icons/x2go-win-48.ico"
+IDI_ICON1   ICON    DISCARDABLE    "img/icons/x2go-win-48.ico"
 

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git


More information about the x2go-commits mailing list