[X2Go-Commits] [x2gokdriveclient] 02/03: src/{client, extwin, menuframe}.cpp: reference image files via subdirectories.

[git-admin at x2go.org]

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

x2go pushed a commit to branch master
in repository x2gokdriveclient.

commit 28ecf2324d7eef554bc392caaf283fbc24c3ec85
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Fri Feb 24 18:09:31 2023 +0100

    src/{client,extwin,menuframe}.cpp: reference image files via subdirectories.
---
 debian/changelog  |  2 ++
 src/client.cpp    | 14 +++++++-------
 src/extwin.cpp    |  2 +-
 src/menuframe.cpp |  6 +++---
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a573bba..c16cb28 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -99,6 +99,8 @@ x2gokdriveclient (0.0.0.1-0x2go1) UNRELEASED; urgency=medium
     - src/{client,extwin,menuframe}.cpp: add img/ prefix to image files.
     - x2gokdriveclient.pro: adapt to new layout.
     - res/img/: create svg and img subdirectories, move files to them.
+    - src/{client,extwin,menuframe}.cpp: reference image files via
+      subdirectories.
   * debian/rules:
     + Let qmake add general Qt {C{,XX},L}FLAGS instead of overriding them.
       Especially needed for C++11 support.
diff --git a/src/client.cpp b/src/client.cpp
index 15433a7..e379961 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -265,10 +265,10 @@ void Client::initDesktopMode()
     setGeometry(0,0,800,600);
     displayArea=new DisplayArea(this,this);
     displayArea->setObjectName("DisplayArea");
-    displayArea->setStyleSheet("QFrame#DisplayArea{background-color:black;border-image:url(:/img/x2gobg.svg) 0 0 0 0 stretch stretch;}");
+    displayArea->setStyleSheet("QFrame#DisplayArea{background-color:black;border-image:url(:/img/svg/x2gobg.svg) 0 0 0 0 stretch stretch;}");
     displayArea->show();
     setCentralWidget(displayArea);
-    setWindowIcon(QIcon(":/img/x2goclient.png"));
+    setWindowIcon(QIcon(":/img/png/x2goclient.png"));
     QMenu* menuCon=menuBar()->addMenu(tr("&Connection"));
     menu=menuBar()->addMenu(tr("&View"));
     FSMenuBar=new MenuFrame(this, menu);
@@ -277,22 +277,22 @@ void Client::initDesktopMode()
     connect(FSMenuBar, SIGNAL(editCaption()), this, SLOT(editWindowTitle()));
     connect(this, SIGNAL(windowTitleChanged(const QString &)), FSMenuBar, SLOT(setCaption(const QString &)));
 
-    actRandr=menu->addAction(QIcon(":/img/randr.svg"), tr("Multiple monitors"),this, SLOT(slotEnableRandr()));
+    actRandr=menu->addAction(QIcon(":/img/svg/randr.svg"), tr("Multiple monitors"),this, SLOT(slotEnableRandr()));
     actRandr->setCheckable(true);
     menu->addSeparator();
     for(int i=0;i<4;++i)
     {
-        actDisp[i]=menu->addAction(QIcon(":/img/view-fullscreen.svg"), tr("Monitor ")+QString::number(i+1) ,this, SLOT(slotDisplayFS()));
+        actDisp[i]=menu->addAction(QIcon(":/img/svg/view-fullscreen.svg"), tr("Monitor ")+QString::number(i+1) ,this, SLOT(slotDisplayFS()));
         connect(actDisp[i], SIGNAL(hovered()), this, SLOT (slotIdentifyScreen()));
     }
 
-    actFS=menu->addAction(QIcon(":/img/view-fullscreen.svg"), tr("All monitors"),this, SLOT(slotFS()));
+    actFS=menu->addAction(QIcon(":/img/svg/view-fullscreen.svg"), tr("All monitors"),this, SLOT(slotFS()));
     menu->addSeparator();
-    actRestore=menu->addAction(QIcon(":/img/view-restore.svg"), tr("Restore") ,this, SLOT(slotRestore()));
+    actRestore=menu->addAction(QIcon(":/img/svg/view-restore.svg"), tr("Restore") ,this, SLOT(slotRestore()));
     menuBar()->addSeparator();
 
     actDisconnect=menuCon->addAction( tr("Disconnect"),this, SLOT(slotDisconnect()));
-    actDisconnect->setIcon(QIcon(":/img/network-disconnect.svg"));
+    actDisconnect->setIcon(QIcon(":/img/svg/network-disconnect.svg"));
     actDisconnect->setToolTip(tr("Disconnect"));
     connect(menu,SIGNAL(aboutToShow()), this, SLOT(slotSetupMenu()));
     setWindowTitle(mainWndTitle);
diff --git a/src/extwin.cpp b/src/extwin.cpp
index 87f86ef..6acd111 100644
--- a/src/extwin.cpp
+++ b/src/extwin.cpp
@@ -37,7 +37,7 @@ ExtWin::ExtWin(uint32_t extWinId, Client *client, QWidget* parent, uint8_t wt, Q
 //     displayArea->setStyleSheet("QFrame#DisplayArea{background-color:black;}");
     displayArea->show();
     setCentralWidget(displayArea);
-    setWindowIcon(QIcon(":/img/x2goclient.png"));
+    setWindowIcon(QIcon(":/img/png/x2goclient.png"));
     this->extWinId=extWinId;
     this->client=client;
     windowType=wt;
diff --git a/src/menuframe.cpp b/src/menuframe.cpp
index 2fd8b37..615de04 100644
--- a/src/menuframe.cpp
+++ b/src/menuframe.cpp
@@ -115,7 +115,7 @@ MenuFrame::MenuFrame(QWidget* parent, QMenu* menu):QFrame(parent)
      viewMenu->setMenu(menu);
      viewMenu->setPopupMode(QToolButton::InstantPopup);
      viewMenu->setToolTip(tr("View"));
-     viewMenu->setIcon(QIcon(":/img/view.svg"));
+     viewMenu->setIcon(QIcon(":/img/svg/view.svg"));
 
      capt=new RotatedLabel("", this);
      capt->setToolTip(tr("Double click to change window title\nDrag to change position"));
@@ -124,14 +124,14 @@ MenuFrame::MenuFrame(QWidget* parent, QMenu* menu):QFrame(parent)
 
      bDisc=new QToolButton(this);
      bDisc->setToolTip(tr("Disconnect"));
-     bDisc->setIcon(QIcon(":/img/network-disconnect.svg"));
+     bDisc->setIcon(QIcon(":/img/svg/network-disconnect.svg"));
      Client* client=(Client*)parent;
      connect(bDisc, SIGNAL(clicked(bool)),client, SLOT(slotDisconnect()));
 
 
      bMin=new QToolButton(this);
      bMin->setToolTip(tr("Minimize"));
-     bMin->setIcon(QIcon(":/img/minimize.svg"));
+     bMin->setIcon(QIcon(":/img/svg/minimize.svg"));
      connect(bMin, SIGNAL(clicked(bool)),client, SLOT(showMinimized()));
 
      QSettings s( "Obviously Nice","x2gokdriveclient");

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdriveclient.git