[X2Go-Commits] [x2goclient] 01/02: Revert "Add "clipboard" parameter to session profile and to command line options. Replace qCritical() with printError() by argument parsing."
git-admin at x2go.org
git-admin at x2go.org
Mon Jun 30 17:15:44 CEST 2014
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository x2goclient.
commit 84decf01e9915a454a3895b6f4734160b500885f
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Mon Jun 30 17:12:04 2014 +0200
Revert "Add "clipboard" parameter to session profile and to command line options. Replace qCritical() with printError() by argument parsing."
This reverts commit ca8724654564726b30bc59dbb9496bd837cc06e0.
Conflicts (resolved by Mike Gabriel):
debian/changelog
---
debian/changelog | 2 -
onmainwindow.cpp | 106 +++++++++++++++++++---------------------------------
onmainwindow.h | 6 ---
settingswidget.cpp | 55 +--------------------------
settingswidget.h | 5 ---
5 files changed, 40 insertions(+), 134 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 5bcd7af..19e3e2f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -45,8 +45,6 @@ x2goclient (4.0.2.1-0x2go1) UNRELEASED; urgency=low
enabled.
- Fork x2goclient on windows and terminate child processes if x2go client
crashed. (Fixes: #159).
- - Add "clipboard" parameter to session profile and to command line options.
- Replace qCritical() with printError() by argument parsing.
- Update translation files.
- Update russian translation.
- Update string "&Clipboard Mode" and translate in russian translation file.
diff --git a/onmainwindow.cpp b/onmainwindow.cpp
index 6f2e89c..835c835 100644
--- a/onmainwindow.cpp
+++ b/onmainwindow.cpp
@@ -102,7 +102,6 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent )
defaultPack="16m-jpeg";
defaultQuality=9;
defaultLayout<<tr ( "us" );
- defaultClipboardMode="both";
defaultKbdType="auto";
defaultCmd="KDE";
defaultSshPort=sshPort=clientSshPort="22";
@@ -3716,7 +3715,6 @@ void ONMainWindow::startNewSession()
QString layout;
QString type;
QString command;
- QString clipMode=defaultClipboardMode;
QString xdmcpServer;
runRemoteCommand=true;
QString host=QString::null;
@@ -3813,9 +3811,6 @@ void ONMainWindow::startNewSession()
speed=st->setting()->value ( sid+"/speed",
( QVariant ) defaultLink ).toInt();
- clipMode=st->setting()->value ( sid+"/clipboard",
- ( QVariant ) defaultClipboardMode ).toString();
-
usekbd=st->setting()->value ( sid+"/usekbd",
( QVariant ) defaultSetKbd ).toBool();
layout=st->setting()->value ( sid+"/layout",
@@ -4045,9 +4040,7 @@ void ONMainWindow::startNewSession()
cmd+=sessTypeStr+QString::number ( shadowMode ) +"XSHAD"+
shadowUser+"XSHAD"+shadowDisplay;
}
-
resumingSession.fullscreen=fullscreen;
- cmd+=" "+clipMode;
x2goDebug<<"Executing remote command: "<<cmd;
@@ -4075,8 +4068,6 @@ void ONMainWindow::resumeSession ( const x2goSession& s )
QString host=s.server;
bool rootless=false;
- QString clipMode=defaultClipboardMode;
-
QString pack;
bool fullscreen;
int height;
@@ -4138,10 +4129,6 @@ void ONMainWindow::resumeSession ( const x2goSession& s )
defaultQuality ).toInt();
speed=st->setting()->value ( sid+"/speed",
( QVariant ) defaultLink ).toInt();
-
- clipMode=st->setting()->value ( sid+"/clipboard",
- ( QVariant ) defaultClipboardMode ).toString();
-
usekbd=st->setting()->value ( sid+"/usekbd",
( QVariant ) defaultSetKbd ).toBool();
layout=st->setting()->value ( sid+"/layout",
@@ -4302,7 +4289,6 @@ void ONMainWindow::resumeSession ( const x2goSession& s )
cmd += "1";
else
cmd += "0";
- cmd +=" "+clipMode;
sshConnection->executeCommand ( cmd, this, SLOT ( slotRetResumeSess ( bool, QString,
int ) ));
@@ -6807,10 +6793,6 @@ bool ONMainWindow::parseParameter ( QString param )
{
return linkParameter ( value );
}
- if ( setting=="--clipboard" )
- {
- return clipboardParameter ( value );
- }
if ( setting=="--sound" )
{
return soundParameter ( value );
@@ -7065,28 +7047,13 @@ bool ONMainWindow::linkParameter ( QString value )
defaultLink=LAN;
else
{
- printError( tr (
- "wrong value for argument\"--link\""
- ).toLocal8Bit().data() );
+ qCritical (
+ "%s",tr (
+ "wrong value for argument\"--link\""
+ ).toLocal8Bit().data() );
return false;
}
return true;
-}
-
-bool ONMainWindow::clipboardParameter ( QString value )
-{
- if ( value=="both" || value=="client" || value=="server"||value == "none")
- {
- defaultClipboardMode=value;
- return true;
- }
- else
- {
- printError( tr (
- "wrong value for argument\"--clipboard\""
- ).toLocal8Bit().data() );
- return false;
- }
}
@@ -7098,8 +7065,9 @@ bool ONMainWindow::soundParameter ( QString val )
defaultUseSound=false;
else
{
- printError( tr ( "wrong value for "
- "argument\"--sound\"" ).toLocal8Bit().data() );
+ qCritical (
+ "%s",tr ( "wrong value for "
+ "argument\"--sound\"" ).toLocal8Bit().data() );
return false;
}
return true;
@@ -7114,9 +7082,10 @@ bool ONMainWindow::geometry_par ( QString val )
QStringList res=val.split ( "x" );
if ( res.size() !=2 )
{
- printError( tr (
- "wrong value for argument\"--geometry\"" ).
- toLocal8Bit().data() );
+ qCritical (
+ "%s",tr (
+ "wrong value for argument\"--geometry\"" ).
+ toLocal8Bit().data() );
return false;
}
bool o1,o2;
@@ -7124,9 +7093,10 @@ bool ONMainWindow::geometry_par ( QString val )
defaultHeight=res[1].toInt ( &o2 );
if ( ! ( defaultWidth >0 && defaultHeight >0 && o1 && o2 ) )
{
- printError( tr (
- "wrong value for argument\"--geometry\"" ).
- toLocal8Bit().data() );
+ qCritical (
+ "%s",tr (
+ "wrong value for argument\"--geometry\"" ).
+ toLocal8Bit().data() );
return false;
}
}
@@ -7141,9 +7111,10 @@ bool ONMainWindow::setKbd_par ( QString val )
defaultSetKbd=false;
else
{
- printError( tr (
- "wrong value for argument\"--set-kbd\"" ).
- toLocal8Bit().data() );
+ qCritical (
+ "%s",tr (
+ "wrong value for argument\"--set-kbd\"" ).
+ toLocal8Bit().data() );
return false;
}
return true;
@@ -7157,9 +7128,10 @@ bool ONMainWindow::ldapParameter ( QString val )
QStringList lst=ldapstring.split ( ':',QString::SkipEmptyParts );
if ( lst.size() !=3 )
{
- printError( tr (
- "wrong value for argument\"--ldap\"" ).
- toLocal8Bit().data() );
+ qCritical (
+ "%s",tr (
+ "wrong value for argument\"--ldap\"" ).
+ toLocal8Bit().data() );
return false;
}
ldapOnly=true;
@@ -7178,9 +7150,10 @@ bool ONMainWindow::ldap1Parameter ( QString val )
QStringList lst=ldapstring.split ( ':',QString::SkipEmptyParts );
if ( lst.size() !=2 )
{
- printError( tr (
- "wrong value for argument\"--ldap1\"" ).
- toLocal8Bit().data() );
+ qCritical (
+ "%s",tr (
+ "wrong value for argument\"--ldap1\"" ).
+ toLocal8Bit().data() );
return false;
}
ldapServer1=lst[0];
@@ -7196,10 +7169,10 @@ bool ONMainWindow::ldap2Parameter ( QString val )
QStringList lst=ldapstring.split ( ':',QString::SkipEmptyParts );
if ( lst.size() !=2 )
{
- printError(
- tr (
- "wrong value for argument\"--ldap2\"" ).
- toLocal8Bit().data() );
+ qCritical ( "%s",
+ tr (
+ "wrong value for argument\"--ldap2\"" ).
+ toLocal8Bit().data() );
return false;
}
ldapServer2=lst[0];
@@ -7251,7 +7224,8 @@ bool ONMainWindow::packParameter ( QString val )
}
}
file.close();
- printError ( tr("wrong value for argument\"--pack\"" ));
+ qCritical ( "%s",tr ( "wrong value for argument\"--pack\"" ).
+ toLocal8Bit().data() );
return false;
}
@@ -7325,8 +7299,6 @@ void ONMainWindow::showHelp()
"default 'adsl'\n"
"--pack=<packmethod>\t\t set default pack method, default "
"'16m-jpeg-9'\n"
- "--clipboard=<both|client|server|none>\t set default clipboard mode, "
- "default 'both'\n"
"--kbd-layout=<layout>\t\t set default keyboard layout or layouts\n"
"\t\t\t\t comma separated\n"
"--kbd-type=<typed>\t\t set default keyboard type\n"
@@ -7336,7 +7308,7 @@ void ONMainWindow::showHelp()
"applications\" mode\n"
"--session-conf=<file>\t\t path to alternative session config\n"
"--tray-icon\t\t\t force to show session trayicon\n"
- "--close-disconnect\t\t close X2Go Client after disconnect\n"
+ "--close-disconnect\t\t close X2Go Client after disconnect\n";
"--hide-foldersharing\t\t\t hide all folder sharing related options\n";
qCritical ( "%s",helpMsg.toLocal8Bit().data() );
@@ -11420,7 +11392,7 @@ void ONMainWindow::printSshDError_startupFailure()
"If you see this message, please report a bug against\n"
"the X2Go bugtracker."
- ),
+ ),
QMessageBox::Ok,QMessageBox::NoButton );
#else
if ( closeEventSent )
@@ -11432,7 +11404,7 @@ void ONMainWindow::printSshDError_startupFailure()
"Please ask your system administrator to provide the SSH\n"
"service on your computer."
- ),
+ ),
QMessageBox::Ok,QMessageBox::NoButton );
#endif
}
@@ -11443,7 +11415,7 @@ void ONMainWindow::printSshDError_noHostPubKey()
return;
QMessageBox::critical ( 0l,tr ( "SSH Error" ),
tr ( "SSH daemon failed to open the application's public host key."
- ),
+ ),
QMessageBox::Ok,QMessageBox::NoButton );
}
@@ -11454,7 +11426,7 @@ void ONMainWindow::printSshDError_noExportPubKey()
QMessageBox::critical ( 0l,tr ( "SSH Error" ),
tr ( "SSH daemon failed to open the application's public key\n"
"used for exporting folders and printers."
- ),
+ ),
QMessageBox::Ok,QMessageBox::NoButton );
}
@@ -11465,7 +11437,7 @@ void ONMainWindow::printSshDError_noAuthorizedKeysFile()
QMessageBox::critical ( 0l,tr ( "SSH Error" ),
tr ( "SSH daemon failed to open the application's\n"
"authoized_keys file."
- ),
+ ),
QMessageBox::Ok,QMessageBox::NoButton );
}
diff --git a/onmainwindow.h b/onmainwindow.h
index 88b5da7..1764993 100644
--- a/onmainwindow.h
+++ b/onmainwindow.h
@@ -424,10 +424,6 @@ public:
{
return defaultSshPort;
}
- QString getDefaultClipboardMode()
- {
- return defaultClipboardMode;
- }
QString getDefaultKbdType()
{
return defaultKbdType;
@@ -602,7 +598,6 @@ private:
QStringList defaultLayout;
QString selectedLayout;
QString defaultKbdType;
- QString defaultClipboardMode;
QString defaultCmd;
bool defaultSetDPI;
uint defaultDPI;
@@ -892,7 +887,6 @@ private:
x2goSession getSelectedSession();
bool parseParameter ( QString param );
bool linkParameter ( QString value );
- bool clipboardParameter ( QString value );
bool geometry_par ( QString value );
bool setKbd_par ( QString value );
bool ldapParameter ( QString value );
diff --git a/settingswidget.cpp b/settingswidget.cpp
index 5b634a1..4add99c 100644
--- a/settingswidget.cpp
+++ b/settingswidget.cpp
@@ -49,13 +49,11 @@ SettingsWidget::SettingsWidget ( QString id, ONMainWindow * mw,
tabSettings->addTab ( sbgr,tr ( "Sound" ) );
#else
QGroupBox *dgb=new QGroupBox ( tr ( "&Display" ),this );
- clipGr=new QGroupBox ( tr ( "&Clipboard Mode" ),this );
kgb=new QGroupBox ( tr ( "&Keyboard" ),this );
sbgr=new QGroupBox ( tr ( "Sound" ),this );
#endif
QVBoxLayout *dbLay = new QVBoxLayout ( dgb );
- QVBoxLayout *sndLay=new QVBoxLayout ( sbgr );
- QVBoxLayout *cbLay=new QVBoxLayout ( clipGr );
+ QVBoxLayout *sndLay=new QVBoxLayout ( sbgr );
QHBoxLayout* sLay=new QHBoxLayout ( );
QVBoxLayout* sLay_sys=new QVBoxLayout ( );
QVBoxLayout* sLay_opt=new QVBoxLayout ( );
@@ -152,20 +150,6 @@ SettingsWidget::SettingsWidget ( QString id, ONMainWindow * mw,
#endif
- rbClipBoth=new QRadioButton(tr("Bidirectional copy and paste"), clipGr);
- rbClipClient=new QRadioButton(tr("Copy and paste from client to server"), clipGr);
- rbClipServer=new QRadioButton(tr("Copy and paste from server to client"), clipGr);
- rbClipNone=new QRadioButton(tr("Disable clipboard completely"), clipGr);
- cbLay->addWidget(rbClipBoth);
- cbLay->addWidget(rbClipClient);
- cbLay->addWidget(rbClipServer);
- cbLay->addWidget(rbClipNone);
- QButtonGroup* clipRadioGroup=new QButtonGroup(clipGr);
- clipRadioGroup->addButton(rbClipBoth);
- clipRadioGroup->addButton(rbClipClient);
- clipRadioGroup->addButton(rbClipServer);
- clipRadioGroup->addButton(rbClipNone);
-
rbKbdAuto=new QRadioButton(tr("Auto detect keyboard settings"),kgb);
rbKbdNoSet=new QRadioButton(tr("Do not configure keyboard"),kgb);
@@ -256,7 +240,6 @@ SettingsWidget::SettingsWidget ( QString id, ONMainWindow * mw,
#endif
#ifndef Q_WS_HILDON
setLay->addWidget ( dgb );
- setLay->addWidget ( clipGr );
setLay->addWidget ( kgb );
setLay->addWidget ( sbgr );
#ifdef Q_OS_LINUX
@@ -347,7 +330,6 @@ void SettingsWidget::slot_kbdClicked()
void SettingsWidget::setDirectRdp(bool direct)
{
cbClientPrint->setVisible(!direct);
- clipGr->setVisible(!direct);
kgb->setVisible(!direct);
sbgr->setVisible(!direct);
cbSetDPI->setVisible(!direct);
@@ -586,26 +568,6 @@ void SettingsWidget::readConfig()
st.setting()->value ( sessionId+"/dpi",
( QVariant ) mainWindow->getDefaultDPI() ).toUInt() );
- QString clipboard=st.setting()->value ( sessionId+"/clipboard",
- ( QVariant ) mainWindow->getDefaultClipboardMode()
- ).toString();
- if(clipboard =="both")
- {
- rbClipBoth->setChecked(true);
- }
- if(clipboard =="client")
- {
- rbClipClient->setChecked(true);
- }
- if(clipboard =="server")
- {
- rbClipServer->setChecked(true);
- }
- if(clipboard =="none")
- {
- rbClipNone->setChecked(true);
- }
-
QString ktype=st.setting()->value ( sessionId+"/type",
( QVariant ) mainWindow->getDefaultKbdType()
).toString();
@@ -713,8 +675,6 @@ void SettingsWidget::setDefaults()
DPI->setValue ( mainWindow->getDefaultDPI() );
DPI->setEnabled ( mainWindow->getDefaultSetDPI() );
- rbClipBoth->setChecked(true);
-
rbKbdAuto->setChecked ( mainWindow->getDefaultSetKbd() );
rbKbdNoSet->setChecked ( !mainWindow->getDefaultSetKbd() );
rbKbdSet->setChecked (false );
@@ -792,19 +752,6 @@ void SettingsWidget::saveSettings()
st.setting()->setValue ( sessionId+"/xinerama",
( QVariant ) cbXinerama->isChecked() );
- QString clipMode;
- if(rbClipBoth->isChecked())
- clipMode="both";
- if(rbClipClient->isChecked())
- clipMode="client";
- if(rbClipServer->isChecked())
- clipMode="server";
- if(rbClipNone->isChecked())
- clipMode="none";
- st.setting()->setValue ( sessionId+"/clipboard",
- ( QVariant ) clipMode );
-
-
st.setting()->setValue ( sessionId+"/usekbd",
( QVariant ) !rbKbdNoSet->isChecked() );
diff --git a/settingswidget.h b/settingswidget.h
index 9036529..816a762 100644
--- a/settingswidget.h
+++ b/settingswidget.h
@@ -98,11 +98,6 @@ private:
QList <QMainWindow*> identWins;
QGroupBox *kgb;
QGroupBox *sbgr;
- QGroupBox *clipGr;
- QRadioButton *rbClipBoth;
- QRadioButton *rbClipServer;
- QRadioButton *rbClipClient;
- QRadioButton *rbClipNone;
#ifdef Q_OS_LINUX
QGroupBox *rdpBox;
--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
More information about the x2go-commits
mailing list