This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gokdriveclient. commit c9fe2397cd0eaff66f1e3daac0ac3880a3052f01 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Feb 24 17:47:36 2023 +0100 src/{client,extwin,menuframe}.cpp: remove res/ prefix from resource locations. --- debian/changelog | 2 ++ src/client.cpp | 14 +++++++------- src/extwin.cpp | 2 +- src/menuframe.cpp | 8 ++++---- 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/debian/changelog b/debian/changelog index fdcd988..9aa2552 100644 --- a/debian/changelog +++ b/debian/changelog @@ -93,6 +93,8 @@ x2gokdriveclient (0.0.0.1-0x2go1) UNRELEASED; urgency=medium - x2gokdriveclient.spec: fix package name, whoops. - resources.qrc: move to res/. - res/resources.qrc: remove res/ prefix. + - src/{client,extwin,menuframe}.cpp: remove res/ prefix from resource + locations. * 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 cba4fe1..aaa45a9 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(:res/x2gobg.svg) 0 0 0 0 stretch stretch;}"); + displayArea->setStyleSheet("QFrame#DisplayArea{background-color:black;border-image:url(:/x2gobg.svg) 0 0 0 0 stretch stretch;}"); displayArea->show(); setCentralWidget(displayArea); - setWindowIcon(QIcon(":res/x2goclient.png")); + setWindowIcon(QIcon(":/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(":res/randr.svg"), tr("Multiple monitors"),this, SLOT(slotEnableRandr())); + actRandr=menu->addAction(QIcon(":/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(":res/view-fullscreen.svg"), tr("Monitor ")+QString::number(i+1) ,this, SLOT(slotDisplayFS())); + actDisp[i]=menu->addAction(QIcon(":/view-fullscreen.svg"), tr("Monitor ")+QString::number(i+1) ,this, SLOT(slotDisplayFS())); connect(actDisp[i], SIGNAL(hovered()), this, SLOT (slotIdentifyScreen())); } - actFS=menu->addAction(QIcon(":res/view-fullscreen.svg"), tr("All monitors"),this, SLOT(slotFS())); + actFS=menu->addAction(QIcon(":/view-fullscreen.svg"), tr("All monitors"),this, SLOT(slotFS())); menu->addSeparator(); - actRestore=menu->addAction(QIcon(":res/view-restore.svg"), tr("Restore") ,this, SLOT(slotRestore())); + actRestore=menu->addAction(QIcon(":/view-restore.svg"), tr("Restore") ,this, SLOT(slotRestore())); menuBar()->addSeparator(); actDisconnect=menuCon->addAction( tr("Disconnect"),this, SLOT(slotDisconnect())); - actDisconnect->setIcon(QIcon(":res/network-disconnect.svg")); + actDisconnect->setIcon(QIcon(":/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 a529462..f74e2bd 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(":res/x2goclient.png")); + setWindowIcon(QIcon(":/x2goclient.png")); this->extWinId=extWinId; this->client=client; windowType=wt; diff --git a/src/menuframe.cpp b/src/menuframe.cpp index 4cdf5be..079a7a9 100644 --- a/src/menuframe.cpp +++ b/src/menuframe.cpp @@ -87,7 +87,7 @@ MenuFrame::MenuFrame(QWidget* parent, QMenu* menu):QFrame(parent) setObjectName("FSMenuBar"); bPin=new QToolButton(this); - bPin->setIcon(QIcon(":res/pin.svg")); + bPin->setIcon(QIcon(":/pin.svg")); bPin->setCheckable(true); bPin->setToolTip(tr("Pin menu bar")); @@ -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(":res/view.svg")); + viewMenu->setIcon(QIcon(":/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(":res/network-disconnect.svg")); + bDisc->setIcon(QIcon(":/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(":res/minimize.svg")); + bMin->setIcon(QIcon(":/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