[X2Go-Commits] [x2goclient] 01/01: src/onmainwindow.cpp: always create close button, but either hide or show it based upon whether --closebt was provided or not.
git-admin at x2go.org
git-admin at x2go.org
Sat Jan 27 13:30:17 CET 2018
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository x2goclient.
commit 4463a0abc055611989c99bb43d6b2d771a3882b5
Author: Mihai Moldovan <ionic at ionic.de>
Date: Sat Jan 27 13:29:49 2018 +0100
src/onmainwindow.cpp: always create close button, but either hide or show it based upon whether --closebt was provided or not.
---
debian/changelog | 2 ++
src/onmainwindow.cpp | 40 +++++++++++++++++++++++++---------------
2 files changed, 27 insertions(+), 15 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index ef42b11..837e082 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -65,6 +65,8 @@ x2goclient (4.1.1.1-0x2go1) UNRELEASED; urgency=medium
slotSuspendSessFromSt () even if no session has previously been started.
- src/onmainwindow.cpp: only initialize directRDP variable if platform is
Linux. Fixes compile failures on Windows and OS X.
+ - src/onmainwindow.cpp: always create close button, but either hide or
+ show it based upon whether --closebt was provided or not.
[ Oleksandr Shneyder ]
* New upstream version (4.1.1.1):
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index f3bfc74..97d9602 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -528,25 +528,35 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent )
connect(bHalt,SIGNAL(clicked()),this, SLOT(slotShutdownThinClient()));
}
+
+ bClose = new QPushButton (bgFrame);
+ QPixmap p (":/img/png/close-button.png");
+ bClose->setIcon (p);
+ bClose->setFocusPolicy (Qt::NoFocus);
+ bClose->setFixedSize (32,32);
+
+ if (showHaltBtn)
+ {
+ bClose->move (40,10);
+ }
+ else
+ {
+ bClose->move (10,10);
+ }
+
+ bClose->setEnabled (true);
+
if (showCloseBtn)
{
- bClose = new QPushButton (bgFrame);
- QPixmap p (":/img/png/close-button.png");
- bClose->setIcon (p);
- bClose->setFocusPolicy (Qt::NoFocus);
- bClose->setFixedSize (32,32);
- if (showHaltBtn)
- {
- bClose->move (40,10);
- }
- else
- {
- bClose->move (10,10);
- }
- bClose->setEnabled (true);
bClose->show ();
- connect (bClose, SIGNAL (clicked ()), this, SLOT (slotCloseButton ()));
}
+ else
+ {
+ bClose->hide ();
+ }
+
+ connect (bClose, SIGNAL (clicked ()), this, SLOT (slotCloseButton ()));
+
if (brokerMode)
{
--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
More information about the x2go-commits
mailing list