This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit c24a33455299239111c40b3f9bfa052831ffffac Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Dec 23 20:27:46 2017 +0100 src/settingswidgets.cpp: don't incorrectly enable whole display settings in single display setups. Let debugging mode override this behavior, though. --- debian/changelog | 3 +++ src/settingswidget.cpp | 16 +++++++++------- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4eed318..478faea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -42,6 +42,9 @@ x2goclient (4.1.1.1-0x2go1) UNRELEASED; urgency=medium - src/onmainwindow.cpp: remove client-side LD_LIBRARY_PATH meddling. Nothing of value is in that directory and nxproxy hasn't needed that for years. + - src/settingswidgets.cpp: don't incorrectly enable whole display settings + in single display setups. Let debugging mode override this behavior, + though. [ Oleksandr Shneyder ] * New upstream version (4.1.1.1): diff --git a/src/settingswidget.cpp b/src/settingswidget.cpp index 9e9d69d..5715c88 100644 --- a/src/settingswidget.cpp +++ b/src/settingswidget.cpp @@ -115,7 +115,7 @@ SettingsWidget::SettingsWidget ( QString id, ONMainWindow * mw, displayNumber->setMinimum(1); displayNumber->setMaximum(QApplication::desktop()->screenCount()); - if (!multiDisp) + if ((!multiDisp) || (mainWindow->debugging)) { displayNumber->hide(); lDisplay->hide(); @@ -308,12 +308,15 @@ void SettingsWidget::setDirectRdp(bool direct, bool isXDMCP) kgb->setVisible(!direct); cbSetDPI->setVisible(!direct); cbXinerama->setVisible(!direct); - display->setVisible(!direct); maxRes->setVisible(direct); DPI->setVisible(!direct); - lDisplay->setVisible(!direct); - displayNumber->setVisible(!direct); - pbIdentDisp->setVisible(!direct); + + bool whole_display_enable = ((!direct) && ((multiDisp) || (mainWindow->debugging))); + display->setVisible(whole_display_enable); + lDisplay->setVisible(whole_display_enable); + displayNumber->setVisible(whole_display_enable); + pbIdentDisp->setVisible(whole_display_enable); + hLine1->setVisible(!direct); hLine2->setVisible(!direct); rdpBox->setVisible(direct && !isXDMCP); @@ -401,8 +404,7 @@ void SettingsWidget::readConfig() st.setting()->value ( sessionId+"/height", ( QVariant ) mainWindow->getDefaultHeight() ).toInt() ); - if (multiDisp) - { + if ((multiDisp) || (mainWindow->debugging)) { bool md=st.setting()->value ( sessionId+"/multidisp", ( QVariant ) false).toBool(); if (md) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git