This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2gokdriveclient. from 53b52d0 x2gokdriveclient.spec: add version file to list of installed files. new 2efbc15 x2gokdriveclient.spec: fix package name, whoops. new 9e5ed0c resources.qrc: move to res/. new 3236275 res/resources.qrc: remove res/ prefix. new c9fe239 src/{client,extwin,menuframe}.cpp: remove res/ prefix from resource locations. new 00c2c4a res/: move image files to res/img/. new 514d8b8 src/{client,extwin,menuframe}.cpp: add img/ prefix to image files. new 33b7422 x2gokdriveclient.pro: adapt to new layout. The 7 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 8 ++++++++ res/{ => img}/application-menu.svg | 0 res/{ => img}/minimize.svg | 0 res/{ => img}/network-disconnect.svg | 0 res/{ => img}/pin.svg | 0 res/{ => img}/randr.svg | 0 res/{ => img}/view-fullscreen.svg | 0 res/{ => img}/view-restore.svg | 0 res/{ => img}/view.svg | 0 res/{ => img}/x2gobg.svg | 0 res/{ => img}/x2goclient.png | Bin res/{ => img}/x2gologo.svg | 0 res/resources.qrc | 14 ++++++++++++++ resources.qrc | 14 -------------- src/client.cpp | 14 +++++++------- src/extwin.cpp | 2 +- src/menuframe.cpp | 8 ++++---- x2gokdriveclient.pro | 22 ++++++++++++++++------ x2gokdriveclient.spec | 2 +- 19 files changed, 51 insertions(+), 33 deletions(-) rename res/{ => img}/application-menu.svg (100%) rename res/{ => img}/minimize.svg (100%) rename res/{ => img}/network-disconnect.svg (100%) rename res/{ => img}/pin.svg (100%) rename res/{ => img}/randr.svg (100%) rename res/{ => img}/view-fullscreen.svg (100%) rename res/{ => img}/view-restore.svg (100%) rename res/{ => img}/view.svg (100%) rename res/{ => img}/x2gobg.svg (100%) rename res/{ => img}/x2goclient.png (100%) rename res/{ => img}/x2gologo.svg (100%) create mode 100644 res/resources.qrc delete mode 100644 resources.qrc -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdriveclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gokdriveclient. commit 2efbc15b917db39b927f8ccb3dc0a65ca8e27ff5 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Feb 24 17:30:37 2023 +0100 x2gokdriveclient.spec: fix package name, whoops. --- debian/changelog | 1 + x2gokdriveclient.spec | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 1cf349d..86e206b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -90,6 +90,7 @@ x2gokdriveclient (0.0.0.1-0x2go1) UNRELEASED; urgency=medium - x2gokdriveclient.spec: add Enhances: x2goclient. - Makefile: install VERSION file into SHAREDIR/x2go/versions/. - x2gokdriveclient.spec: add version file to list of installed files. + - x2gokdriveclient.spec: fix package name, whoops. * debian/rules: + Let qmake add general Qt {C{,XX},L}FLAGS instead of overriding them. Especially needed for C++11 support. diff --git a/x2gokdriveclient.spec b/x2gokdriveclient.spec index 0fd3fdc..3c413d1 100644 --- a/x2gokdriveclient.spec +++ b/x2gokdriveclient.spec @@ -1,4 +1,4 @@ -Name: x2goclientclient +Name: x2gokdriveclient Version: 0.0.0.1 Release: 0.0x2go1%{?dist} -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdriveclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gokdriveclient. commit 9e5ed0c1ca4ee06b24ddd0ab0931ef7defd6382a Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Feb 24 17:43:26 2023 +0100 resources.qrc: move to res/. --- debian/changelog | 1 + resources.qrc => res/resources.qrc | 0 2 files changed, 1 insertion(+) diff --git a/debian/changelog b/debian/changelog index 86e206b..30923ce 100644 --- a/debian/changelog +++ b/debian/changelog @@ -91,6 +91,7 @@ x2gokdriveclient (0.0.0.1-0x2go1) UNRELEASED; urgency=medium - Makefile: install VERSION file into SHAREDIR/x2go/versions/. - x2gokdriveclient.spec: add version file to list of installed files. - x2gokdriveclient.spec: fix package name, whoops. + - resources.qrc: move to res/. * debian/rules: + Let qmake add general Qt {C{,XX},L}FLAGS instead of overriding them. Especially needed for C++11 support. diff --git a/resources.qrc b/res/resources.qrc similarity index 100% rename from resources.qrc rename to res/resources.qrc -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdriveclient.git
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
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gokdriveclient. commit 3236275fa9a34bb083c6e4d7c1227a87f81d60cc Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Feb 24 17:44:35 2023 +0100 res/resources.qrc: remove res/ prefix. --- debian/changelog | 1 + res/resources.qrc | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/debian/changelog b/debian/changelog index 30923ce..fdcd988 100644 --- a/debian/changelog +++ b/debian/changelog @@ -92,6 +92,7 @@ x2gokdriveclient (0.0.0.1-0x2go1) UNRELEASED; urgency=medium - x2gokdriveclient.spec: add version file to list of installed files. - x2gokdriveclient.spec: fix package name, whoops. - resources.qrc: move to res/. + - res/resources.qrc: remove res/ prefix. * debian/rules: + Let qmake add general Qt {C{,XX},L}FLAGS instead of overriding them. Especially needed for C++11 support. diff --git a/res/resources.qrc b/res/resources.qrc index 8bcf0d1..027852d 100644 --- a/res/resources.qrc +++ b/res/resources.qrc @@ -1,14 +1,14 @@ <RCC> <qresource> - <file>res/x2goclient.png</file> - <file>res/x2gobg.svg</file> - <file>res/application-menu.svg</file> - <file>res/network-disconnect.svg</file> - <file>res/randr.svg</file> - <file>res/minimize.svg</file> - <file>res/view.svg</file> - <file>res/pin.svg</file> - <file>res/view-fullscreen.svg</file> - <file>res/view-restore.svg</file> + <file>x2goclient.png</file> + <file>x2gobg.svg</file> + <file>application-menu.svg</file> + <file>network-disconnect.svg</file> + <file>randr.svg</file> + <file>minimize.svg</file> + <file>view.svg</file> + <file>pin.svg</file> + <file>view-fullscreen.svg</file> + <file>view-restore.svg</file> </qresource> </RCC> -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdriveclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gokdriveclient. commit 00c2c4a13bd580e34e7bf5788ed73439e99234db Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Feb 24 17:53:23 2023 +0100 res/: move image files to res/img/. --- debian/changelog | 1 + res/{ => img}/application-menu.svg | 0 res/{ => img}/minimize.svg | 0 res/{ => img}/network-disconnect.svg | 0 res/{ => img}/pin.svg | 0 res/{ => img}/randr.svg | 0 res/{ => img}/view-fullscreen.svg | 0 res/{ => img}/view-restore.svg | 0 res/{ => img}/view.svg | 0 res/{ => img}/x2gobg.svg | 0 res/{ => img}/x2goclient.png | Bin res/{ => img}/x2gologo.svg | 0 12 files changed, 1 insertion(+) diff --git a/debian/changelog b/debian/changelog index 9aa2552..58968dc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -95,6 +95,7 @@ x2gokdriveclient (0.0.0.1-0x2go1) UNRELEASED; urgency=medium - res/resources.qrc: remove res/ prefix. - src/{client,extwin,menuframe}.cpp: remove res/ prefix from resource locations. + - res/: move image files to res/img/. * debian/rules: + Let qmake add general Qt {C{,XX},L}FLAGS instead of overriding them. Especially needed for C++11 support. diff --git a/res/application-menu.svg b/res/img/application-menu.svg similarity index 100% rename from res/application-menu.svg rename to res/img/application-menu.svg diff --git a/res/minimize.svg b/res/img/minimize.svg similarity index 100% rename from res/minimize.svg rename to res/img/minimize.svg diff --git a/res/network-disconnect.svg b/res/img/network-disconnect.svg similarity index 100% rename from res/network-disconnect.svg rename to res/img/network-disconnect.svg diff --git a/res/pin.svg b/res/img/pin.svg similarity index 100% rename from res/pin.svg rename to res/img/pin.svg diff --git a/res/randr.svg b/res/img/randr.svg similarity index 100% rename from res/randr.svg rename to res/img/randr.svg diff --git a/res/view-fullscreen.svg b/res/img/view-fullscreen.svg similarity index 100% rename from res/view-fullscreen.svg rename to res/img/view-fullscreen.svg diff --git a/res/view-restore.svg b/res/img/view-restore.svg similarity index 100% rename from res/view-restore.svg rename to res/img/view-restore.svg diff --git a/res/view.svg b/res/img/view.svg similarity index 100% rename from res/view.svg rename to res/img/view.svg diff --git a/res/x2gobg.svg b/res/img/x2gobg.svg similarity index 100% rename from res/x2gobg.svg rename to res/img/x2gobg.svg diff --git a/res/x2goclient.png b/res/img/x2goclient.png similarity index 100% rename from res/x2goclient.png rename to res/img/x2goclient.png diff --git a/res/x2gologo.svg b/res/img/x2gologo.svg similarity index 100% rename from res/x2gologo.svg rename to res/img/x2gologo.svg -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdriveclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gokdriveclient. commit 33b742294bfe03729c47da0e2a292a2086c39dff Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Feb 24 17:56:32 2023 +0100 x2gokdriveclient.pro: adapt to new layout. --- debian/changelog | 1 + x2gokdriveclient.pro | 22 ++++++++++++++++------ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 53ee657..e265e91 100644 --- a/debian/changelog +++ b/debian/changelog @@ -97,6 +97,7 @@ x2gokdriveclient (0.0.0.1-0x2go1) UNRELEASED; urgency=medium locations. - res/: move image files to res/img/. - src/{client,extwin,menuframe}.cpp: add img/ prefix to image files. + - x2gokdriveclient.pro: adapt to new layout. * debian/rules: + Let qmake add general Qt {C{,XX},L}FLAGS instead of overriding them. Especially needed for C++11 support. diff --git a/x2gokdriveclient.pro b/x2gokdriveclient.pro index 6ef1844..ea92480 100644 --- a/x2gokdriveclient.pro +++ b/x2gokdriveclient.pro @@ -4,7 +4,7 @@ TEMPLATE = app TARGET = x2gokdriveclient -INCLUDEPATH += . +INCLUDEPATH += src CONFIG += console c++11 QT += widgets @@ -16,16 +16,26 @@ QT += x11extras LIBS += -lxcb -lxcb-xfixes } -RESOURCES += resources.qrc +RESOURCES += res/resources.qrc # Input -SOURCES += main.cpp client.cpp displayarea.cpp menuframe.cpp screenidentifier.cpp extwin.cpp -HEADERS += client.h displayarea.h menuframe.h screenidentifier.h extwin.h +HEADERS += src/client.h \ + src/displayarea.h \ + src/menuframe.h \ + src/screenidentifier.h \ + src/extwin.h + +SOURCES += src/main.cpp \ + src/client.cpp \ + src/displayarea.cpp \ + src/menuframe.cpp \ + src/screenidentifier.cpp \ + src/extwin.cpp linux { -SOURCES += xcbclip.cpp -HEADERS += xcbclip.h +HEADERS += src/xcbclip.h +SOURCES += src/xcbclip.cpp } windows { -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdriveclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gokdriveclient. commit 514d8b8e4420648701a3e8f3c9a7b041513cebc6 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Feb 24 17:55:10 2023 +0100 src/{client,extwin,menuframe}.cpp: add img/ prefix to image files. --- debian/changelog | 1 + src/client.cpp | 14 +++++++------- src/extwin.cpp | 2 +- src/menuframe.cpp | 8 ++++---- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/debian/changelog b/debian/changelog index 58968dc..53ee657 100644 --- a/debian/changelog +++ b/debian/changelog @@ -96,6 +96,7 @@ x2gokdriveclient (0.0.0.1-0x2go1) UNRELEASED; urgency=medium - src/{client,extwin,menuframe}.cpp: remove res/ prefix from resource locations. - res/: move image files to res/img/. + - src/{client,extwin,menuframe}.cpp: add img/ prefix to image files. * 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 aaa45a9..15433a7 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(:/x2gobg.svg) 0 0 0 0 stretch stretch;}"); + displayArea->setStyleSheet("QFrame#DisplayArea{background-color:black;border-image:url(:/img/x2gobg.svg) 0 0 0 0 stretch stretch;}"); displayArea->show(); setCentralWidget(displayArea); - setWindowIcon(QIcon(":/x2goclient.png")); + setWindowIcon(QIcon(":/img/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(":/randr.svg"), tr("Multiple monitors"),this, SLOT(slotEnableRandr())); + actRandr=menu->addAction(QIcon(":/img/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(":/view-fullscreen.svg"), tr("Monitor ")+QString::number(i+1) ,this, SLOT(slotDisplayFS())); + actDisp[i]=menu->addAction(QIcon(":/img/view-fullscreen.svg"), tr("Monitor ")+QString::number(i+1) ,this, SLOT(slotDisplayFS())); connect(actDisp[i], SIGNAL(hovered()), this, SLOT (slotIdentifyScreen())); } - actFS=menu->addAction(QIcon(":/view-fullscreen.svg"), tr("All monitors"),this, SLOT(slotFS())); + actFS=menu->addAction(QIcon(":/img/view-fullscreen.svg"), tr("All monitors"),this, SLOT(slotFS())); menu->addSeparator(); - actRestore=menu->addAction(QIcon(":/view-restore.svg"), tr("Restore") ,this, SLOT(slotRestore())); + actRestore=menu->addAction(QIcon(":/img/view-restore.svg"), tr("Restore") ,this, SLOT(slotRestore())); menuBar()->addSeparator(); actDisconnect=menuCon->addAction( tr("Disconnect"),this, SLOT(slotDisconnect())); - actDisconnect->setIcon(QIcon(":/network-disconnect.svg")); + actDisconnect->setIcon(QIcon(":/img/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 f74e2bd..87f86ef 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(":/x2goclient.png")); + setWindowIcon(QIcon(":/img/x2goclient.png")); this->extWinId=extWinId; this->client=client; windowType=wt; diff --git a/src/menuframe.cpp b/src/menuframe.cpp index 079a7a9..2fd8b37 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(":/pin.svg")); + bPin->setIcon(QIcon(":/img/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(":/view.svg")); + viewMenu->setIcon(QIcon(":/img/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(":/network-disconnect.svg")); + bDisc->setIcon(QIcon(":/img/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(":/minimize.svg")); + bMin->setIcon(QIcon(":/img/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
-
git-admin＠x2go.org