[X2Go-Commits] [x2goclient] 01/02: {ui/xsettingsui.ui, xsettingswidget.cpp}: add new "whole display" option for external X server configuration.
git-admin at x2go.org
git-admin at x2go.org
Sat Jul 25 23:04:20 CEST 2015
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository x2goclient.
commit a6aec7d872ca1a5c386e8e6b0e055a21c06762ff
Author: Mihai Moldovan <ionic at ionic.de>
Date: Sat Jul 25 23:01:35 2015 +0200
{ui/xsettingsui.ui,xsettingswidget.cpp}: add new "whole display" option for external X server configuration.
Part of #883.
---
debian/changelog | 2 ++
src/ui/xsettingsui.ui | 10 ++++++++++
src/xsettingswidget.cpp | 4 ++++
3 files changed, 16 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 6d59ed2..28e66bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -67,6 +67,8 @@ x2goclient (4.0.4.1-0x2go1) UNRELEASED; urgency=low
qtPrepareTool() is not available. This should only happen on EPEL 6,
which ships a broken Qt4 version...
- onmainwindow.cpp: only set multidisplay mode for non-rootless sessions.
+ - {ui/xsettingsui.ui,xsettingswidget.cpp}: add new "whole display" option
+ for external X server configuration. Part of #883.
[ Mike Gabriel ]
* debian/control:
diff --git a/src/ui/xsettingsui.ui b/src/ui/xsettingsui.ui
index 9aa8ffa..48916ca 100644
--- a/src/ui/xsettingsui.ui
+++ b/src/ui/xsettingsui.ui
@@ -163,6 +163,16 @@
<item row="2" column="1">
<widget class="QLineEdit" name="leSingApp"/>
</item>
+ <item row="3" column="0">
+ <widget class="QLabel" name="label_6">
+ <property name="text">
+ <string>whole display:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="1">
+ <widget class="QLineEdit" name="leWholeDisplay"/>
+ </item>
</layout>
</widget>
</item>
diff --git a/src/xsettingswidget.cpp b/src/xsettingswidget.cpp
index 842dca3..7b863d1 100644
--- a/src/xsettingswidget.cpp
+++ b/src/xsettingswidget.cpp
@@ -38,6 +38,8 @@ XSettingsWidget::XSettingsWidget(QWidget* parent)
leWinMod->setText(st.setting()->value("optionswin","-screen 0 %wx%h -notrayicon -clipboard").toString());
leFSMod->setText(st.setting()->value("optionsfs","-fullscreen -notrayicon -clipboard").toString());
leSingApp->setText(st.setting()->value("optionssingle","-multiwindow -notrayicon -clipboard").toString());
+ leWholeDisplay->setText (st.settings ()->value ("optionswholedisplay", "-nodecoration -notrayicon -clipboard -screen 0 @").toString ());
+
// spDelay->setValue(st.setting()->value("delay",3).toInt());
pbExec->setIcon( QPixmap ( ":/img/icons/16x16/file-open.png" ) );
}
@@ -66,6 +68,7 @@ void XSettingsWidget::setDefaults()
leWinMod->setText("-screen 0 %wx%h -notrayicon -clipboard");
leFSMod->setText("-fullscreen -notrayicon -clipboard");
leSingApp->setText("-multiwindow -notrayicon -clipboard");
+ leWholeDisplay->setText ("-nodecoration -notrayicon -clipboard -screen 0 @");
// spDelay->setValue(3);
}
@@ -82,6 +85,7 @@ void XSettingsWidget::saveSettings()
st.setting()->setValue("optionswin",leWinMod->text());
st.setting()->setValue("optionsfs",leFSMod->text());
st.setting()->setValue("optionssingle",leSingApp->text());
+ st.settings ()->setValue ("optionswholedisplay", leWholeDisplay->text ());
// st.setting()->setValue("delay",spDelay->value());
st.setting()->sync();
}
--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
More information about the x2go-commits
mailing list