x2go-commits September 2013

x2go-commits@lists.x2go.org

2 participants
2415 discussions

x2goclient.git - build-main (branch) updated: 4.0.1.0-44-g2b2b554
by git-admin＠x2go.org 11 Sep '13

11 Sep '13

The branch, build-main has been updated via 2b2b554e4bc828ff2ded8fe9f64f157ac49c44cb (commit) from 8437e3713e2d32b18c851898c8dd218e0f0a81de (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/… [View More]changelog | 4 ++++ x2goclient_da.ts | 60 +++++++++++++++++++++++++++--------------------------- 2 files changed, 34 insertions(+), 30 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 51e8eba..43d9efe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,9 @@ x2goclient (4.0.1.1-0~x2go1) UNRELEASED; urgency=low + [ Nicolai Hansen ] + * New upstream version (4.0.1.1): + - Update Danish translation file. + [ Terje Andersen ] * New upstream version (4.0.1.1): - Update Norwegian Bokmaal translation file. diff --git a/x2goclient_da.ts b/x2goclient_da.ts index 12042be..132db74 100644 --- a/x2goclient_da.ts +++ b/x2goclient_da.ts @@ -782,7 +782,7 @@ Public key hash: </translation> <message> <location filename="onmainwindow.cpp" line="50"/> <source>Starting x2goclient...</source> - <translation type="unfinished"></translation> + <translation>Starter x2goclient...</translation> </message> <message> <location filename="onmainwindow.cpp" line="89"/> @@ -830,7 +830,7 @@ Public key hash: </translation> <message> <location filename="onmainwindow.cpp" line="229"/> <source>Starting x2goclient in portable mode... data directory is: </source> - <translation type="unfinished"></translation> + <translation>Starter x2goclient i flyttebar tilstand... data filsti er:</translation> </message> <message> <location filename="onmainwindow.cpp" line="351"/> @@ -851,25 +851,25 @@ Public key hash: </translation> <message> <location filename="onmainwindow.cpp" line="460"/> <source>Started x2goclient.</source> - <translation type="unfinished"></translation> + <translation>Startede x2goclient.</translation> </message> <message> <location filename="onmainwindow.cpp" line="522"/> <location filename="onmainwindow.cpp" line="535"/> <source>Can't load translator: </source> - <translation type="unfinished"></translation> + <translation>Kan ikke åbne translator:</translation> </message> <message> <location filename="onmainwindow.cpp" line="527"/> <location filename="onmainwindow.cpp" line="540"/> <source>Translator: </source> - <translation type="unfinished"></translation> + <translation>Oversætter:</translation> </message> <message> <location filename="onmainwindow.cpp" line="527"/> <location filename="onmainwindow.cpp" line="540"/> <source> installed.</source> - <translation type="unfinished"></translation> + <translation>Installeret.</translation> </message> <message> <location filename="onmainwindow.cpp" line="561"/> @@ -1158,12 +1158,12 @@ Public key hash: </translation> <message> <location filename="onmainwindow.cpp" line="1259"/> <source>Closing x2goclient...</source> - <translation type="unfinished"></translation> + <translation>Lukker x2goclient...</translation> </message> <message> <location filename="onmainwindow.cpp" line="1407"/> <source>Closed x2goclient.</source> - <translation type="unfinished"></translation> + <translation>Lukkede x2goclient.</translation> </message> <message> <location filename="onmainwindow.cpp" line="1678"/> @@ -1203,7 +1203,7 @@ Slå skjult tilstand til?</translation> <message> <location filename="onmainwindow.cpp" line="2152"/> <source>No X2Go sessions found, closing.</source> - <translation type="unfinished"></translation> + <translation>Ingen X2Go sessioner Fundet, Lukker.</translation> </message> <message> <source>X2Go sessions not found</source> @@ -1243,22 +1243,22 @@ Slå skjult tilstand til?</translation> <message> <location filename="onmainwindow.cpp" line="2781"/> <source>Starting connection to server: </source> - <translation type="unfinished"></translation> + <translation>Starter forbindelse til server:</translation> </message> <message> <location filename="onmainwindow.cpp" line="2790"/> <source> to </source> - <translation type="unfinished"></translation> + <translation>til</translation> </message> <message> <location filename="onmainwindow.cpp" line="2835"/> <source>Connection Error(</source> - <translation type="unfinished"></translation> + <translation>Forbindelses Fejl(</translation> </message> <message> <location filename="onmainwindow.cpp" line="2904"/> <source>Couldn't find a SSH connection.</source> - <translation type="unfinished"></translation> + <translation>Kunne ikke finde en SSH forbindelse.</translation> </message> <message> <location filename="onmainwindow.cpp" line="2921"/> @@ -1317,7 +1317,7 @@ Public key hash: </translation> <message> <location filename="onmainwindow.cpp" line="3041"/> <source>Authentication failed: </source> - <translation type="unfinished"></translation> + <translation>Godkendelse Fejlede:</translation> </message> <message> <location filename="onmainwindow.cpp" line="3045"/> @@ -1365,13 +1365,13 @@ Public key hash: </translation> <location filename="onmainwindow.cpp" line="7406"/> <location filename="onmainwindow.cpp" line="7408"/> <source>Connection failed: </source> - <translation type="unfinished"></translation> + <translation>Forbindelse Fejlede:</translation> </message> <message> <location filename="onmainwindow.cpp" line="3458"/> <location filename="onmainwindow.cpp" line="7406"/> <source> - Wrong password.</source> - <translation type="unfinished"></translation> + <translation>Forkert password.</translation> </message> <message> <location filename="onmainwindow.cpp" line="3573"/> @@ -1489,45 +1489,45 @@ Public key hash: </translation> <message> <location filename="onmainwindow.cpp" line="4836"/> <source>New session started</source> - <translation type="unfinished"></translation> + <translation>Ny session er startet</translation> </message> <message> <location filename="onmainwindow.cpp" line="4871"/> <source>Session resumed</source> - <translation type="unfinished"></translation> + <translation>Session genoptaget</translation> </message> <message> <location filename="onmainwindow.cpp" line="5103"/> <location filename="onmainwindow.cpp" line="5107"/> <source>Unable to create folder: </source> - <translation type="unfinished"></translation> + <translation>Ikke i stand til at lave mappe:</translation> </message> <message> <location filename="onmainwindow.cpp" line="5133"/> <location filename="onmainwindow.cpp" line="5137"/> <source>Unable to write file: </source> - <translation type="unfinished"></translation> + <translation>Ikke i stand til at skrive filen:</translation> </message> <message> <location filename="onmainwindow.cpp" line="5406"/> <source>Emergency exit.</source> - <translation type="unfinished"></translation> + <translation>Nødudgang.</translation> </message> <message> <location filename="onmainwindow.cpp" line="5415"/> <source>Waiting for proxy to exit.</source> - <translation type="unfinished"></translation> + <translation>Venter på at proxy lukker.</translation> </message> <message> <location filename="onmainwindow.cpp" line="5418"/> <source>Failed, killing the proxy.</source> - <translation type="unfinished"></translation> + <translation>Fejlede med at dræbe proxy.</translation> </message> <message> <location filename="onmainwindow.cpp" line="6830"/> <location filename="onmainwindow.cpp" line="6835"/> <source>Wrong parameter: </source> - <translation type="unfinished"></translation> + <translation>Forkerte parameter:</translation> </message> <message> <location filename="onmainwindow.cpp" line="7263"/> @@ -1695,12 +1695,12 @@ Ugemte dokumenter vil gå tabt</translation> <message> <location filename="onmainwindow.cpp" line="7359"/> <source>RSA file empty.</source> - <translation type="unfinished"></translation> + <translation>RSA fil er tom.</translation> </message> <message> <location filename="onmainwindow.cpp" line="7368"/> <source>Can not open key: </source> - <translation type="unfinished"></translation> + <translation>Kan ikke åbne nøgle:</translation> </message> <message> <location filename="onmainwindow.cpp" line="7701"/> @@ -1740,7 +1740,7 @@ Ugemte dokumenter vil gå tabt</translation> <message> <location filename="onmainwindow.cpp" line="8062"/> <source>Card not configured.</source> - <translation type="unfinished"></translation> + <translation>Kort er ikke konfigureret.</translation> </message> <message> <location filename="onmainwindow.cpp" line="8066"/> @@ -1813,7 +1813,7 @@ Opdater venligst til en nyere version af x2goserver pakken</translation> <message> <location filename="onmainwindow.cpp" line="9641"/> <source>Error getting window geometry (window closed)?</source> - <translation type="unfinished"></translation> + <translation>Fejl med at hente vindue geomatri (vinduet lukkede)?</translation> </message> <message> <location filename="onmainwindow.cpp" line="9917"/> @@ -2155,7 +2155,7 @@ f.eks: <message> <location filename="ongetpass.cpp" line="79"/> <source>No response received from the remote server. Do you want to terminate the current session?</source> - <translation type="unfinished"></translation> + <translation>Ingen respons modtaget fra fjern server. Vil du dræbe den nuværende session?</translation> </message> </context> <context> @@ -2941,7 +2941,7 @@ lydsystemets forbindelse igennem firewalls</translation> <message> <location filename="xsettingsui.ui" line="61"/> <source> do not use primary clipboard</source> - <translation type="unfinished"></translation> + <translation>brug ikke den primær udklipsholder</translation> </message> <message> <location filename="xsettingsui.ui" line="68"/> 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). [View Less]

1 0

x2goclient.git - build-main (branch) updated: 4.0.1.0-37-g7996b7b
by git-admin＠x2go.org 11 Sep '13

11 Sep '13

The branch, build-main has been updated via 7996b7bf565ba8dd982909db914f984c441d1943 (commit) from e69690eb76cba79754aa8f5e5d285d6562b59b9e (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/… [View More]changelog | 1 + onmainwindow.cpp | 68 +++++++++++++++++++++++++++++++++++++++--------------- onmainwindow.h | 2 ++ 3 files changed, 52 insertions(+), 19 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index c3ea41c..7ab91a9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ x2goclient (4.0.1.1-0~x2go1) UNRELEASED; urgency=low - Use "127.0.0.1" instead of localhost to avoid wrong IPv6 hostname resolution. (Fixes: #151). - Wait for x2gocmdexitmessage to return before closing in hidden mode. + - Support for published applications in X2Go Plugin [ Mike Gabriel ] * New upstream version (4.0.1.1): diff --git a/onmainwindow.cpp b/onmainwindow.cpp index b707d84..fc735ab 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -105,6 +105,7 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent ) config.brokerNoAuth=false; config.brokerAutologin=false; config.brokerAutologoff=false; + config.published=false; cmdAutologin=false; @@ -561,6 +562,9 @@ void ONMainWindow::initWidgetsEmbed() act_shareFolder=new QAction ( QIcon ( ":icons/32x32/file-open.png" ), tr ( "Share folder..." ),this ); + act_showApps=new QAction ( QIcon ( ":icons/32x32/apps.png" ), + tr ( "Applications..." ),this ); + act_suspend=new QAction ( QIcon ( ":icons/32x32/suspend.png" ), tr ( "Suspend" ),this ); @@ -582,6 +586,9 @@ void ONMainWindow::initWidgetsEmbed() connect ( act_shareFolder,SIGNAL ( triggered ( bool ) ),this, SLOT ( slotExportDirectory() ) ); + connect ( act_showApps,SIGNAL ( triggered ( bool ) ),this, + SLOT ( slotAppDialog() ) ); + connect ( act_suspend,SIGNAL ( triggered ( bool ) ),this, SLOT ( slotSuspendSessFromSt() ) ); @@ -659,6 +666,8 @@ void ONMainWindow::initWidgetsEmbed() act_shareFolder->setVisible ( false ); } + act_showApps->setVisible(false); + if ( !managedMode ) { @@ -3727,6 +3736,7 @@ void ONMainWindow::startNewSession() rootless= config.rootless; host=config.server; startEmbedded=false; + resumingSession.published=config.published; if ( st->setting()->value ( sid+"/startembed", ( QVariant ) true ).toBool() ) { @@ -5986,6 +5996,7 @@ void ONMainWindow::runCommand() { command=config.command; rootless=config.rootless; + resumingSession.published=config.published; } if ( rootless ) sessionType="R"; @@ -6272,6 +6283,14 @@ void ONMainWindow::slotReadApplications(bool result, QString output, runApplication(autostartApp); } } + else + { + if(embedMode) + { + act_showApps->setVisible(true); + slotAppDialog(); + } + } } @@ -7548,11 +7567,11 @@ void ONMainWindow::slotExtTimer() x2goDebug<<"Wrong permissions on "<<readLoginsFrom <<":"; x2goDebug<< ( int ) ( QFile::permissions ( - readLoginsFrom+"/." ) ) - <<"must be"<< ( int ) ( QFile::ReadUser|QFile::WriteUser - |QFile::ExeUser|QFile::ReadOwner| - QFile::WriteOwner| - QFile::ExeOwner ) <<endl; + readLoginsFrom+"/." ) ) + <<"must be"<< ( int ) ( QFile::ReadUser|QFile::WriteUser + |QFile::ExeUser|QFile::ReadOwner| + QFile::WriteOwner| + QFile::ExeOwner ) <<endl; if ( extLogin ) extTimer->stop(); @@ -7624,13 +7643,13 @@ void ONMainWindow::slotExportTimer() { x2goDebug<<"Wrong permissions on "<< - readExportsFrom <<":"<<endl; + readExportsFrom <<":"<<endl; x2goDebug<< ( int ) ( QFile::permissions ( - readExportsFrom+"/." ) ) - <<"must be"<< ( int ) ( QFile::ReadUser|QFile::WriteUser - |QFile::ExeUser|QFile::ReadOwner| - QFile::WriteOwner| - QFile::ExeOwner ) <<endl; + readExportsFrom+"/." ) ) + <<"must be"<< ( int ) ( QFile::ReadUser|QFile::WriteUser + |QFile::ExeUser|QFile::ReadOwner| + QFile::WriteOwner| + QFile::ExeOwner ) <<endl; exportTimer->stop(); return; } @@ -9602,10 +9621,10 @@ void ONMainWindow::resizeProxyWinOnDisplay(int disp) QRect geom=QApplication::desktop()->screenGeometry(disp-1); QString geoStr = - "(x: " + QString("%1").arg(geom.x()) + - ", y: "+ QString("%1").arg(geom.y()) + - ", w: "+ QString("%1").arg(geom.width()) + - ", h: "+ QString("%1").arg(geom.height()); + "(x: " + QString("%1").arg(geom.x()) + + ", y: "+ QString("%1").arg(geom.y()) + + ", w: "+ QString("%1").arg(geom.width()) + + ", h: "+ QString("%1").arg(geom.height()); x2goDebug<<"Resizing proxy window to fit Display: " + QString("%1").arg(disp) + " " + geoStr; #ifdef Q_OS_LINUX @@ -9658,10 +9677,10 @@ void ONMainWindow::slotConfigXinerama() lastDisplayGeometry=newGeometry; QString geoStr = - "(x: " + QString("%1").arg(lastDisplayGeometry.x()) + - ", y: "+ QString("%1").arg(lastDisplayGeometry.y()) + - ", w: "+ QString("%1").arg(lastDisplayGeometry.width()) + - ", h: "+ QString("%1").arg(lastDisplayGeometry.height()); + "(x: " + QString("%1").arg(lastDisplayGeometry.x()) + + ", y: "+ QString("%1").arg(lastDisplayGeometry.y()) + + ", w: "+ QString("%1").arg(lastDisplayGeometry.width()) + + ", h: "+ QString("%1").arg(lastDisplayGeometry.height()); x2goDebug<<"New proxy geometry: " + geoStr; QDesktopWidget* root=QApplication::desktop(); @@ -9889,6 +9908,8 @@ void ONMainWindow::slotEmbedWindow() void ONMainWindow::setEmbedSessionActionsEnabled ( bool enable ) { act_shareFolder->setEnabled ( enable ); + if(!enable) + act_showApps->setVisible(enable); act_suspend->setEnabled ( enable ); act_terminate->setEnabled ( enable ); act_embedContol->setEnabled ( enable ); @@ -10018,6 +10039,14 @@ void ONMainWindow::processCfgLine ( QString line ) config.rootless=false; return; } + if ( lst[0]=="published" ) + { + if ( lst[1]=="true" ) + config.published=true; + else + config.published=false; + return; + } if ( lst[0]=="checkexitstatus" ) { if ( lst[1]=="true" ) @@ -10919,6 +10948,7 @@ void ONMainWindow::initEmbedToolBar() stb->addSeparator(); stb->setToolButtonStyle ( Qt::ToolButtonTextUnderIcon ); stb->addAction ( act_shareFolder ); + stb->addAction ( act_showApps ); stb->addAction ( act_reconnect ); stb->addAction ( act_suspend ); stb->addAction ( act_terminate ); diff --git a/onmainwindow.h b/onmainwindow.h index 61e730f..70504d2 100644 --- a/onmainwindow.h +++ b/onmainwindow.h @@ -198,6 +198,7 @@ struct ConfigFile // bool useSnd; bool useFs; + bool published; int conSpeed; QString compMet; int imageQ; @@ -679,6 +680,7 @@ private: QAction *act_abclient; QAction *act_support; QAction *act_shareFolder; + QAction *act_showApps; QAction *act_suspend; QAction *act_terminate; QAction *act_reconnect; 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). [View Less]

1 0

x2goclient.git - build-main (branch) updated: 4.0.1.0-42-g468be3a
by git-admin＠x2go.org 11 Sep '13

11 Sep '13

The branch, build-main has been updated via 468be3aa8d457ec4bc429e76f4c26f4bbf27f0d0 (commit) from 76560c573b75e35a4ceb37e8b441d96747a688c1 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/… [View More]changelog | 1 + icons/16x16/mate.png | Bin 0 -> 774 bytes onmainwindow.cpp | 4 ++++ resources.rcc | 1 + sessionbutton.cpp | 16 ++++++++++++++++ sessionbutton.h | 2 +- sessionwidget.cpp | 1 + sessionwidget.h | 2 +- 8 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 icons/16x16/mate.png The diff of changes is: diff --git a/debian/changelog b/debian/changelog index e23849e..475caf3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,6 +25,7 @@ x2goclient (4.0.1.1-0~x2go1) UNRELEASED; urgency=low X2Go Session Broker after a session has been suspended or terminated. (Fixes: #179). - Enable full access desktop sharing across user accounts. (Fixes: #222). + - Make X2Go Client aware of the MATE desktop environment. [ Heinrich Schuchardt ] * New upstream version (4.0.1.1): diff --git a/icons/16x16/mate.png b/icons/16x16/mate.png new file mode 100644 index 0000000..0a34149 Binary files /dev/null and b/icons/16x16/mate.png differ diff --git a/onmainwindow.cpp b/onmainwindow.cpp index e1af9c6..8399b04 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -6031,6 +6031,10 @@ void ONMainWindow::runCommand() { command="xfce4-session"; } + else if ( command=="MATE" ) + { + command="mate-session"; + } else if ( command=="LXDE" ) { command="startlxde"; diff --git a/resources.rcc b/resources.rcc index 50782f8..cc74d72 100644 --- a/resources.rcc +++ b/resources.rcc @@ -56,6 +56,7 @@ <file>icons/16x16/gnome.png</file> <file>icons/16x16/unity.png</file> <file>icons/16x16/xfce.png</file> + <file>icons/16x16/mate.png</file> <file>icons/16x16/kde.png</file> <file>icons/16x16/new_file.png</file> <file>icons/16x16/resolution.png</file> diff --git a/sessionbutton.cpp b/sessionbutton.cpp index 65351bc..5204093 100644 --- a/sessionbutton.cpp +++ b/sessionbutton.cpp @@ -344,6 +344,7 @@ void SessionButton::redraw() cmdBox->addItem ( "GNOME" ); cmdBox->addItem ( "LXDE" ); cmdBox->addItem ( "XFCE" ); + cmdBox->addItem ( "MATE" ); cmdBox->addItem ( "UNITY" ); cmdBox->addItem ( tr ( "RDP connection" ) ); cmdBox->addItem ( tr ( "XDMCP" ) ); @@ -374,6 +375,11 @@ void SessionButton::redraw() cmdpix.load ( par->iconsPath ( "/16x16/xfce.png" ) ); cmdBox->setCurrentIndex ( XFCE ); } + else if ( command == "MATE" ) + { + cmdpix.load ( par->iconsPath ( "/16x16/mate.png" ) ); + cmdBox->setCurrentIndex ( MATE ); + } else if ( command =="LXDE" ) { cmdpix.load ( par->iconsPath ( "/16x16/lxde.png" ) ); @@ -682,6 +688,11 @@ void SessionButton::slot_cmd_change ( const QString& command ) newRootless=false; pix.load ( par->iconsPath ( "/16x16/xfce.png" ) ); } + else if ( command == "MATE" ) + { + newRootless=false; + pix.load ( par->iconsPath ( "/16x16/mate.png" ) ); + } else if ( command ==tr ( "Connection to local desktop" ) ) { newRootless=false; @@ -730,6 +741,11 @@ void SessionButton::slot_cmd_change ( const QString& command ) cmd="XFCE"; newRootless=false; } + if ( command=="mate-session" ) + { + cmd="MATE"; + newRootless=false; + } if (command== tr("Published applications")) { published=true; diff --git a/sessionbutton.h b/sessionbutton.h index bef550b..1cb5b14 100644 --- a/sessionbutton.h +++ b/sessionbutton.h @@ -32,7 +32,7 @@ class SessionButton : public SVGFrame { Q_OBJECT public: - enum {KDE,GNOME,LXDE,XFCE,UNITY,RDP,XDMCP,SHADOW,PUBLISHED,OTHER,APPLICATION}; + enum {KDE,GNOME,LXDE,XFCE,MATE,UNITY,RDP,XDMCP,SHADOW,PUBLISHED,OTHER,APPLICATION}; SessionButton ( ONMainWindow* mw, QWidget* parent,QString id ); ~SessionButton(); QString id() { diff --git a/sessionwidget.cpp b/sessionwidget.cpp index c78eb0c..62b7ea4 100644 --- a/sessionwidget.cpp +++ b/sessionwidget.cpp @@ -188,6 +188,7 @@ SessionWidget::SessionWidget ( QString id, ONMainWindow * mw, sessBox->addItem ( "GNOME" ); sessBox->addItem ( "LXDE" ); sessBox->addItem ( "XFCE" ); + sessBox->addItem ( "MATE" ); sessBox->addItem ( "UNITY" ); sessBox->addItem ( tr ( "Connect to Windows terminal server" ) ); sessBox->addItem ( tr ( "XDMCP" ) ); diff --git a/sessionwidget.h b/sessionwidget.h index fe2240a..b8e7b1f 100644 --- a/sessionwidget.h +++ b/sessionwidget.h @@ -57,7 +57,7 @@ public slots: #endif private: - enum {KDE,GNOME,LXDE,XFCE,UNITY,RDP,XDMCP,SHADOW,OTHER,APPLICATION,PUBLISHED}; + enum {KDE,GNOME,LXDE,XFCE,MATE,UNITY,RDP,XDMCP,SHADOW,OTHER,APPLICATION,PUBLISHED}; QLineEdit* sessName; QLineEdit* uname; QLineEdit* server; 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). [View Less]

1 0

x2goclient.git - build-main (branch) updated: 4.0.1.0-33-gc8c8e2f
by git-admin＠x2go.org 11 Sep '13

11 Sep '13

The branch, build-main has been updated via c8c8e2febcab710108761ddabeab99364d6d1837 (commit) from 3d6450d24cc3596bfbb9d602bd5e5216e9c99e9d (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/… [View More]

1 0

x2goclient.git - build-main (branch) updated: 4.0.1.0-31-gaf80d22
by git-admin＠x2go.org 11 Sep '13

11 Sep '13

The branch, build-main has been updated via af80d226b539a8edefdc424edd1e51211ad575c3 (commit) from 736ec9e1531886250ab8b7986db9146dc73a7d2d (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/… [View More]

1 0

x2goclient.git - build-main (branch) updated: 4.0.1.0-36-ge69690e
by git-admin＠x2go.org 11 Sep '13

11 Sep '13

The branch, build-main has been updated via e69690eb76cba79754aa8f5e5d285d6562b59b9e (commit) from 047050ec7a4dfe5326a655cbd471ae8b5d35a31b (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/… [View More]

1 0

x2goclient.git - build-main (branch) updated: 4.0.1.0-34-g2f8cdb2
by git-admin＠x2go.org 11 Sep '13

11 Sep '13

The branch, build-main has been updated via 2f8cdb2dd5778cdd8104c6427c25167f7c0c3bf9 (commit) from c8c8e2febcab710108761ddabeab99364d6d1837 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/… [View More]changelog | 1 + debian/control | 20 ++++++++++++++++++++ debian/rules | 3 +++ 3 files changed, 24 insertions(+) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 0ca8369..dd7122b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -30,6 +30,7 @@ x2goclient (4.0.1.1-0~x2go1) UNRELEASED; urgency=low just calling free(). Required under MS Windows as documented in libssh2 API. (Fixes: #243). (For further details see: http://api.libssh.org/master/group__libssh__session.html) + * Provide bin:package with debug symbols for X2Go Client. (Fixes: #255). [ Ezra Bühler ] * New upstream version (4.0.1.1): diff --git a/debian/control b/debian/control index 266f13a..21a806c 100644 --- a/debian/control +++ b/debian/control @@ -49,6 +49,26 @@ Description: X2Go Client application (Qt4) x2goclient is a graphical client (Qt4) for the X2Go system. You can use it to connect to running sessions and start new sessions. +Package: x2goclient-dbg +Priority: extra +Section: debug +Architecture: any +Depends: ${misc:Depends}, x2goclient (= ${binary:Version}) +Description: X2Go Client application (Qt4), debug symbols + X2Go is a serverbased computing environment with + - session resuming + - low bandwidth support + - LDAP support + - client-side mass storage mounting support + - client-side printing support + - audio support + - authentication by smartcard and USB stick + . + x2goclient is a graphical client (Qt4) for the X2Go system. + You can use it to connect to running sessions and start new sessions + . + This package provides the debug symbols for the x2goclient application. + Package: x2goplugin Architecture: any Depends: diff --git a/debian/rules b/debian/rules index 2bbb30a..8d25702 100755 --- a/debian/rules +++ b/debian/rules @@ -14,3 +14,6 @@ override_dh_auto_clean: rm -Rf x2goclient_*.qm override_dh_auto_install: + +override_dh_strip: + dh_strip --dbg-package=x2goclient-dbg \ No newline at end of file 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). [View Less]

1 0

x2goclient.git - build-main (branch) updated: 4.0.1.0-32-g3d6450d
by git-admin＠x2go.org 11 Sep '13

11 Sep '13

The branch, build-main has been updated via 3d6450d24cc3596bfbb9d602bd5e5216e9c99e9d (commit) from af80d226b539a8edefdc424edd1e51211ad575c3 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/… [View More]

1 0

x2goclient.git - build-main (branch) updated: 4.0.1.0-28-g512b85b
by git-admin＠x2go.org 11 Sep '13

11 Sep '13

The branch, build-main has been updated via 512b85b24ca11d37c422d009fb3190c35d30d03e (commit) from b9e540ce5fb9b4e4ea44a26bbc6dc68cde1e5bb5 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/… [View More]changelog | 3 +++ sessionbutton.cpp | 7 +++++++ settingswidget.cpp | 31 +++++++++++++++++++++++-------- settingswidget.h | 2 -- 4 files changed, 33 insertions(+), 10 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 9f1e098..84daa74 100644 --- a/debian/changelog +++ b/debian/changelog @@ -31,6 +31,9 @@ x2goclient (4.0.1.1-0~x2go1) UNRELEASED; urgency=low #165). - Use the session icon as tray icon, pop up notification bubble that informs about current session actions. (Fixes: #177). + - Allow for setting maximum available desktop size as window size via the + session profile card. Unfortunately, this feature is for now only available + on Linux. (Fixes: #214). [ Otto Kjell ] * New upstream version (4.0.1.1): diff --git a/sessionbutton.cpp b/sessionbutton.cpp index 576d491..65351bc 100644 --- a/sessionbutton.cpp +++ b/sessionbutton.cpp @@ -433,8 +433,15 @@ void SessionButton::redraw() for (uint i=0;i<displays;++i) { geomBox->addItem ( tr( "Display " )+QString::number(i+1)); + + //add maximun available area + geomBox->addItem( QString::number(QApplication::desktop()->availableGeometry(i).width()) + "x" + QString::number(QApplication::desktop()->availableGeometry(i).height())); + + } #ifndef Q_WS_HILDON + + geomBox->addItem ( "1440x900" ); geomBox->addItem ( "1280x1024" ); geomBox->addItem ( "1024x768" ); diff --git a/settingswidget.cpp b/settingswidget.cpp index 98cb9b0..15eb91e 100644 --- a/settingswidget.cpp +++ b/settingswidget.cpp @@ -68,16 +68,12 @@ SettingsWidget::SettingsWidget ( QString id, ONMainWindow * mw, custom=new QRadioButton ( tr ( "Window" ),dgb ); #endif display=new QRadioButton ( tr ( "Use whole display" ),dgb ); -#ifdef Q_OS_LINUX maxRes=new QRadioButton ( tr ( "Maximum available" ),dgb ); -#endif radio->addButton ( fs ); radio->addButton ( custom ); radio->setExclusive ( true ); radio->addButton(display); -#ifdef Q_OS_LINUX radio->addButton(maxRes); -#endif width=new QSpinBox ( dgb ); height=new QSpinBox ( dgb ); cbSetDPI=new QCheckBox ( tr ( "Set display DPI" ),dgb ); @@ -110,9 +106,7 @@ SettingsWidget::SettingsWidget ( QString id, ONMainWindow * mw, dwLay->addStretch(); dispLay->addWidget(display); -#ifdef Q_OS_LINUX dispLay->addWidget(maxRes); -#endif dispLay->addSpacing(15); dispLay->addWidget(lDisplay=new QLabel(tr("&Display:"),dgb)); dispLay->addWidget(displayNumber=new QSpinBox(dgb)); @@ -665,8 +659,6 @@ void SettingsWidget::saveSettings() st.setting()->setValue ( sessionId+"/fullscreen", ( QVariant ) fs->isChecked() ); - st.setting()->setValue ( sessionId+"/width", - ( QVariant ) width->value() ); st.setting()->setValue ( sessionId+"/multidisp", ( QVariant ) display->isChecked() ); st.setting()->setValue ( sessionId+"/display", @@ -687,8 +679,31 @@ void SettingsWidget::saveSettings() ( QVariant ) params->text()); #endif #endif + + st.setting()->setValue ( sessionId+"/width", + ( QVariant ) width->value() ); + st.setting()->setValue ( sessionId+"/height", ( QVariant ) height->value() ); + + //if maxRes is checked width and height are setted to max area available + if (maxRes->isChecked() + || st.setting()->value(sessionId + "/multidisp", (QVariant) false).toBool() + || st.setting()->value(sessionId + "/maxdim", (QVariant) false).toBool()) { + + //get screen number + int selectedScreen = st.setting()->value(sessionId + "/display", (QVariant) -1).toInt(); + + //get max available desktop area for selected screen + int height = QApplication::desktop()->availableGeometry(selectedScreen).height(); + int width = QApplication::desktop()->availableGeometry(selectedScreen).width(); + + //save max resolution + st.setting()->setValue (sessionId + "/width", (QVariant) width); + st.setting()->setValue (sessionId + "/height", (QVariant) height); + } + + st.setting()->setValue ( sessionId+"/dpi", ( QVariant ) DPI->value() ); st.setting()->setValue ( sessionId+"/setdpi", diff --git a/settingswidget.h b/settingswidget.h index 590e728..75d6724 100644 --- a/settingswidget.h +++ b/settingswidget.h @@ -68,9 +68,7 @@ private: QLineEdit* type; QRadioButton* custom; QRadioButton* display; -#ifdef Q_OS_LINUX QRadioButton* maxRes; -#endif QRadioButton* arts; QRadioButton* pulse; QRadioButton* esd; 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). [View Less]

1 0

x2goclient.git - build-main (branch) updated: 4.0.1.0-29-ge3b8739
by git-admin＠x2go.org 11 Sep '13

11 Sep '13

The branch, build-main has been updated via e3b87397d75a7e246d29c4f94b1368e092f27207 (commit) from 512b85b24ca11d37c422d009fb3190c35d30d03e (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/… [View More]changelog | 3 +++ man/man1/x2goclient.1 | 3 +++ onmainwindow.cpp | 35 +++++++++++++++++++++++------------ onmainwindow.h | 1 + 4 files changed, 30 insertions(+), 12 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 84daa74..c2dcc38 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,9 @@ x2goclient (4.0.1.1-0~x2go1) UNRELEASED; urgency=low patch was applied. Segfault only occurred if the tray icon was not used. - Show session name in notification bubbles. - Update German translation. + - Add cmdline option --broker-autologoff: Enforce re-authentication against + X2Go Session Broker after a session has been suspended or terminated. + (Fixes: #179). [ Ezra Bühler ] * New upstream version (4.0.1.1): diff --git a/man/man1/x2goclient.1 b/man/man1/x2goclient.1 index 4bbe926..9eb69ae 100644 --- a/man/man1/x2goclient.1 +++ b/man/man1/x2goclient.1 @@ -117,6 +117,9 @@ with \fI--broker-autologin\fR or \fI--broker-ssh-key\fR. For SSH based X2Go Session Brokers. If an SSH agent is available or default key files exist then try those for authentication against the X2Go Session Broker. .TP +\*(T<\fB\-\-broker-autologoff\fR\*(T> +Enforce re-authentication against X2Go Session Broker after a session has been suspended or terminated. +.TP \*(T<\fB\-\-broker-ssh-key=<SSHPRIVKEY>\fR\*(T> For SSH based X2Go Session Brokers. Full path to a valid SSH private key file. .TP diff --git a/onmainwindow.cpp b/onmainwindow.cpp index c2fdeea..c2ee334 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -104,6 +104,7 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent ) appSeparator=0; config.brokerNoAuth=false; config.brokerAutologin=false; + config.brokerAutologoff=false; cmdAutologin=false; @@ -5473,18 +5474,22 @@ void ONMainWindow::slotProxyFinished ( int,QProcess::ExitStatus ) cleanPrintSpool(); if ( !restartResume ) { - if ( !embedMode ) + if ( brokerMode && (!config.brokerAutologoff) ) { - if (!brokerMode) - { - pass->setText ( "" ); - QTimer::singleShot ( 2000,this, - SLOT ( slotShowPassForm() ) ); - } - else - QTimer::singleShot ( 2000,broker, - SLOT ( getUserSessions() ) ); - + x2goDebug<<"Re-reading user's session profiles from broker."; + QTimer::singleShot ( 2000,broker, + SLOT ( getUserSessions() ) ); + } + else if ( brokerMode && config.brokerAutologoff ) + { + x2goDebug<<"Logging off from broker as requested via cmdline."; + QTimer::singleShot(1, this,SLOT(slotGetBrokerAuth())); + } + else if ( !embedMode ) + { + pass->setText ( "" ); + QTimer::singleShot ( 2000,this, + SLOT ( slotShowPassForm() ) ); } } else @@ -6375,6 +6380,12 @@ bool ONMainWindow::parseParameter ( QString param ) return true; } + if ( param == "--broker-autologoff") + { + config.brokerAutologoff=true; + return true; + } + if ( param == "--broker-noauth") { config.brokerNoAuth=true; @@ -8172,7 +8183,7 @@ void ONMainWindow::slotGpgAgentFinished ( int , QProcess::ExitStatus ) x2goDebug<<"SSH-ADD out: "<<sshout; - if(brokerMode) + if(brokerMode && (!config.brokerAutologoff)) { broker->getUserSessions(); } diff --git a/onmainwindow.h b/onmainwindow.h index 86f04ec..61e730f 100644 --- a/onmainwindow.h +++ b/onmainwindow.h @@ -166,6 +166,7 @@ struct ConfigFile bool brokerAuthenticated; bool brokerNoAuth; bool brokerAutologin; + bool brokerAutologoff; QString brokerSshKey; QString iniFile; QString server; 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). [View Less]

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits September 2013