The branch, master has been updated via 2849d5c6d15a0ce84035cc7b7290ed6411339214 (commit) from 459bdd89fcd867c68a3c48e99a50bd8a27538b29 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 2849d5c6d15a0ce84035cc7b7290ed6411339214 Author: Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> Date: Fri Mar 15 17:21:23 2013 +0100 add checkbox for -noclipboardprimary argument for internal vcxsrv ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + onmainwindow.cpp | 15 ++++++++---- xsettingsui.ui | 63 +++++++++++++++++++++++++++++++++++---------------- xsettingswidget.cpp | 6 +++-- 4 files changed, 59 insertions(+), 26 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 4d537a1..b6ea983 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,7 @@ x2goclient (4.0.1.0-0~x2go1) UNRELEASED; urgency=low - set passphrase for key to reverse ssh connection fix closing client after getting passphrase (Fixes #137) - support for recent cygwin API on Windows + - add checkbox for -noclipboardprimary argument for internal vcxsrv [ Mike Gabriel ] * New upstream version (4.0.1.0): diff --git a/onmainwindow.cpp b/onmainwindow.cpp index e717c47..840a699 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -8995,20 +8995,27 @@ void ONMainWindow::xorgSettings() xorgFSOptions=(st.setting()->value("optionsfs","-fullscreen -notrayicon -clipboard").toString()); xorgSAppOptions=(st.setting()->value("optionssingle","-multiwindow -notrayicon -clipboard").toString()); + + if (QFile::exists(appDir+"\\vcxsrv")) internalX=VCXSRV; if (QFile::exists(appDir+"\\xming")) internalX=XMING; + + QString primClip; + if(st.setting()->value("noprimaryclip",false).toBool() && internalX==VCXSRV) + primClip=" -noclipboardprimary"; + if (useInternalX) { startXorgOnStart=(internalX==XMING); - xorgOptions="-multiwindow -notrayicon -clipboard"; + xorgOptions="-multiwindow -notrayicon -clipboard"+primClip; if (internalX==VCXSRV) { // xorgWinOptions="-screen 0 %wx%h -notrayicon -clipboard"; - xorgWinOptions="-multiwindow -notrayicon -clipboard"; - xorgFSOptions="-fullscreen -notrayicon -clipboard"; - xorgSAppOptions="-multiwindow -notrayicon -clipboard"; + xorgWinOptions="-multiwindow -notrayicon -clipboard"+primClip; + xorgFSOptions="-fullscreen -notrayicon -clipboard"+primClip; + xorgSAppOptions="-multiwindow -notrayicon -clipboard"+primClip; } } diff --git a/xsettingsui.ui b/xsettingsui.ui index 2a89846..e58ba50 100644 --- a/xsettingsui.ui +++ b/xsettingsui.ui @@ -7,8 +7,8 @@ <rect> <x>0</x> <y>0</y> - <width>521</width> - <height>386</height> + <width>583</width> + <height>495</height> </rect> </property> <property name="windowTitle"> @@ -56,6 +56,13 @@ </widget> </item> <item> + <widget class="QCheckBox" name="cbNoPrimary"> + <property name="text"> + <string> do not use primary clipboard</string> + </property> + </widget> + </item> + <item> <widget class="QRadioButton" name="rbOther"> <property name="text"> <string>use custom X-Server</string> @@ -173,12 +180,12 @@ <slot>setEnabled(bool)</slot> <hints> <hint type="sourcelabel"> - <x>133</x> - <y>43</y> + <x>142</x> + <y>198</y> </hint> <hint type="destinationlabel"> - <x>187</x> - <y>163</y> + <x>196</x> + <y>373</y> </hint> </hints> </connection> @@ -189,12 +196,12 @@ <slot>setVisible(bool)</slot> <hints> <hint type="sourcelabel"> - <x>63</x> - <y>125</y> + <x>83</x> + <y>300</y> </hint> <hint type="destinationlabel"> - <x>67</x> - <y>146</y> + <x>88</x> + <y>332</y> </hint> </hints> </connection> @@ -205,12 +212,12 @@ <slot>setVisible(bool)</slot> <hints> <hint type="sourcelabel"> - <x>132</x> - <y>124</y> + <x>152</x> + <y>300</y> </hint> <hint type="destinationlabel"> - <x>204</x> - <y>149</y> + <x>406</x> + <y>332</y> </hint> </hints> </connection> @@ -221,12 +228,12 @@ <slot>setHidden(bool)</slot> <hints> <hint type="sourcelabel"> - <x>53</x> - <y>124</y> + <x>73</x> + <y>300</y> </hint> <hint type="destinationlabel"> - <x>33</x> - <y>186</y> + <x>53</x> + <y>474</y> </hint> </hints> </connection> @@ -237,8 +244,8 @@ <slot>slotSetExecutable()</slot> <hints> <hint type="sourcelabel"> - <x>481</x> - <y>98</y> + <x>561</x> + <y>269</y> </hint> <hint type="destinationlabel"> <x>498</x> @@ -246,6 +253,22 @@ </hint> </hints> </connection> + <connection> + <sender>rbXming</sender> + <signal>toggled(bool)</signal> + <receiver>cbNoPrimary</receiver> + <slot>setEnabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>68</x> + <y>132</y> + </hint> + <hint type="destinationlabel"> + <x>129</x> + <y>162</y> + </hint> + </hints> + </connection> </connections> <slots> <slot>slotSetExecutable()</slot> diff --git a/xsettingswidget.cpp b/xsettingswidget.cpp index 424c047..f461bde 100644 --- a/xsettingswidget.cpp +++ b/xsettingswidget.cpp @@ -26,6 +26,7 @@ XSettingsWidget::XSettingsWidget(QWidget* parent) X2goSettings st ( "settings" ); rbXming->setChecked(st.setting()->value("useintx",true).toBool()); rbOther->setChecked(!(st.setting()->value("useintx",true).toBool())); + cbNoPrimary->setChecked(st.setting()->value("noprimaryclip",false).toBool()); leExec->setText(st.setting()->value("xexec","C:\\program files\\vcxsrv\\vcxsrv.exe").toString()); leCmdOptions->setText(st.setting()->value("options","-multiwindow -notrayicon -clipboard").toString()); @@ -64,7 +65,7 @@ void XSettingsWidget::setDefaults() leFSMod->setText("-fullscreen -notrayicon -clipboard"); leSingApp->setText("-multiwindow -notrayicon -clipboard"); // spDelay->setValue(3); - + } void XSettingsWidget::saveSettings() @@ -74,9 +75,10 @@ void XSettingsWidget::saveSettings() st.setting()->setValue("xexec",leExec->text()); st.setting()->setValue("options",leCmdOptions->text()); st.setting()->setValue("onstart",cbOnstart->isChecked()); + st.setting()->setValue("noprimaryclip", cbNoPrimary->isChecked()); st.setting()->setValue("optionswin",leWinMod->text()); - st.setting()->setValue("optionsfs",leFSMod->text()); + st.setting()->setValue("optionsfs",leFSMod->text()); st.setting()->setValue("optionssingle",leSingApp->text()); // st.setting()->setValue("delay",spDelay->value()); st.setting()->sync(); hooks/post-receive -- x2goclient.git (X2Go Client) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goclient.git" (X2Go Client).