The branch, master has been updated via b9935be788b48a2afb5a8d48ee6e9f8565c4bfc3 (commit) via f1fb104bc7ce1a3d93792b3594566a8870d139a3 (commit) from 55a3e49f61962b158d96cd87fb6d322744b68e4f (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 b9935be788b48a2afb5a8d48ee6e9f8565c4bfc3 Author: Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> Date: Wed Nov 7 10:55:13 2012 +0100 do not show "RDP Settings" group box in plugin mode commit f1fb104bc7ce1a3d93792b3594566a8870d139a3 Author: Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> Date: Wed Nov 7 10:36:40 2012 +0100 fixing error "Failed to resolve hostname" in plugin mode ----------------------------------------------------------------------- Summary of changes: debian/changelog | 6 ++++-- onmainwindow.cpp | 9 ++++++--- settingswidget.cpp | 27 +++++++++++++++------------ 3 files changed, 25 insertions(+), 17 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 549d539..33cad6a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -x2goclient (3.99.3.0-0~x2go1) UNRELEASED; urgency=low +x2goclient (3.99.3.0-0~x2go3) UNRELEASED; urgency=low [ Mike Gabriel ] * New upstream version (3.99.3.0): @@ -83,13 +83,15 @@ x2goclient (3.99.3.0-0~x2go1) UNRELEASED; urgency=low - SshProcess is only usable over SshMasterConnection - Fixing SSH proxy support for Windows - Hide system tray icon before close + - fixing error "Failed to resolve hostname" in plugin mode + - do not show "RDP Settings" group box in plugin mode [ Ricardo Diaz ] * New upstream version (3.99.3.0): - Add Spanish translation file. - Update Spanish translation file. - -- Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> Wed, 05 Sep 2012 11:40:47 +0200 + -- Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> Wed, 07 Nov 2012 10:54:38 +0100 x2goclient (3.99.2.2-0~x2go2) unstable; urgency=low diff --git a/onmainwindow.cpp b/onmainwindow.cpp index 5e8d3e9..bdd8a55 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -3212,8 +3212,11 @@ bool ONMainWindow::startSession ( const QString& sid ) st=new X2goSettings(config.iniFile, QSettings::IniFormat); passForm->setEnabled ( false ); - host=st->setting()->value ( sid+"/host", - ( QVariant ) QString::null ).toString(); + if(!embedMode) + host=st->setting()->value ( sid+"/host", + ( QVariant ) QString::null ).toString(); + else + host=config.server; if(brokerMode) { sshPort=config.sshport; @@ -5771,7 +5774,7 @@ void ONMainWindow::runCommand() } else if ( command=="XFCE" ) { - command="xfce4-session"; + command="xfce4-session"; } else if ( command=="LXDE" ) { diff --git a/settingswidget.cpp b/settingswidget.cpp index 6d35cd8..12ac5f1 100644 --- a/settingswidget.cpp +++ b/settingswidget.cpp @@ -45,9 +45,6 @@ SettingsWidget::SettingsWidget ( QString id, ONMainWindow * mw, QGroupBox *dgb=new QGroupBox ( tr ( "&Display" ),this ); kgb=new QGroupBox ( tr ( "&Keyboard" ),this ); sbgr=new QGroupBox ( tr ( "Sound" ),this ); -#ifdef Q_OS_LINUX - rdpBox=new QGroupBox ( tr ( "RDP Client" ),this ); -#endif #endif QVBoxLayout *dbLay = new QVBoxLayout ( dgb ); QVBoxLayout *sndLay=new QVBoxLayout ( sbgr ); @@ -232,12 +229,13 @@ SettingsWidget::SettingsWidget ( QString id, ONMainWindow * mw, pulse->hide(); esd->setChecked ( true ); #endif - #ifndef Q_WS_HILDON setLay->addWidget ( dgb ); setLay->addWidget ( kgb ); setLay->addWidget ( sbgr ); #ifdef Q_OS_LINUX +#ifdef CFGCLIENT + rdpBox=new QGroupBox ( tr ( "RDP Client" ),this ); setLay->addWidget ( rdpBox ); rRdesktop=new QRadioButton ("rdesktop",rdpBox ); rRdesktop->setChecked(true); @@ -256,11 +254,17 @@ SettingsWidget::SettingsWidget ( QString id, ONMainWindow * mw, params=new QLineEdit(rdpBox); rdpLay->addWidget(cmdLine,4,0,1,2); rdpLay->addWidget(params,2,1); + connect (rClient, SIGNAL(buttonClicked(int)), this, SLOT(updateCmdLine())); + connect (radio, SIGNAL(buttonClicked(int)), this, SLOT(updateCmdLine())); + connect (params, SIGNAL(textChanged(QString)), this, SLOT(updateCmdLine())); + connect (width, SIGNAL(valueChanged(int)), this, SLOT(updateCmdLine())); + connect (height, SIGNAL(valueChanged(int)), this, SLOT(updateCmdLine())); +#endif //CFGCLIENT #endif //Q_OS_LINUX #else setLay->addWidget ( tabSettings ); // cbClientPrint->hide(); -#endif +#endif //Q_WS_HILDON setLay->addWidget ( cbClientPrint ); setLay->addStretch(); @@ -302,13 +306,6 @@ SettingsWidget::SettingsWidget ( QString id, ONMainWindow * mw, connect ( cbDefSndPort,SIGNAL ( toggled ( bool ) ),this, SLOT ( slot_sndDefPortChecked ( bool ) ) ); -#ifdef Q_OS_LINUX - connect (rClient, SIGNAL(buttonClicked(int)), this, SLOT(updateCmdLine())); - connect (radio, SIGNAL(buttonClicked(int)), this, SLOT(updateCmdLine())); - connect (params, SIGNAL(textChanged(QString)), this, SLOT(updateCmdLine())); - connect (width, SIGNAL(valueChanged(int)), this, SLOT(updateCmdLine())); - connect (height, SIGNAL(valueChanged(int)), this, SLOT(updateCmdLine())); -#endif kbd->setChecked ( true ); custom->setChecked ( true ); readConfig(); @@ -535,6 +532,7 @@ void SettingsWidget::readConfig() } #ifdef Q_OS_LINUX +#ifdef CFGCLIENT maxRes->setChecked(st.setting()->value ( sessionId+"/maxdim", false).toBool()); QString client=st.setting()->value ( sessionId+"/rdpclient","rdesktop").toString(); if(client=="rdesktop") @@ -543,6 +541,7 @@ void SettingsWidget::readConfig() rXfreeRDP->setChecked(true); params->setText(st.setting()->value ( sessionId+"/directrdpsettings","").toString()); #endif +#endif cbSetDPI->setChecked ( @@ -668,6 +667,7 @@ void SettingsWidget::saveSettings() ( QVariant ) displayNumber->value() ); #ifdef Q_OS_LINUX +#ifdef CFGCLIENT st.setting()->setValue ( sessionId+"/maxdim", ( QVariant ) maxRes->isChecked() ); @@ -680,6 +680,7 @@ void SettingsWidget::saveSettings() st.setting()->setValue ( sessionId+"/directrdpsettings", ( QVariant ) params->text()); #endif +#endif st.setting()->setValue ( sessionId+"/height", ( QVariant ) height->value() ); st.setting()->setValue ( sessionId+"/dpi", @@ -731,6 +732,7 @@ void SettingsWidget::setServerSettings(QString server, QString port, QString use void SettingsWidget::updateCmdLine() { +#ifdef CFGCLIENT QString client="xfreerdp"; QString userOpt; if (user.length()>0) @@ -758,5 +760,6 @@ void SettingsWidget::updateCmdLine() grOpt=" -g "+QString::number(width->value())+"x"+QString::number(height->value()); } cmdLine->setText(client +" "+params->text()+ grOpt +userOpt+" -p <"+tr("password")+"> "+ server+":"+port ); +#endif } #endif 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).
-
git-admin＠x2go.org