x2go-commits November 2013

x2go-commits@lists.x2go.org

2 participants
391 discussions

x2gothinclient.git - master (branch) updated: 1.1.0.0-27-g1beb2c1
by git-admin＠x2go.org 14 Nov '13

14 Nov '13

The branch, master has been updated via 1beb2c19571c775d3b89a13a7398f433ea175749 (commit) from e8db74714aef8044b9f6830b9f7c423756398f30 (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 1beb2c19571c775d3b89a13a7398f433ea175749 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de… [View More]> Date: Thu Nov 14 15:37:32 2013 +0100 make sure VERSION files get installed properly (i.e. not as symlinks) ----------------------------------------------------------------------- Summary of changes: VERSION | 2 +- debian/rules | 4 ++++ debian/x2gothinclient.install | 1 - debian/x2gothinclientmanagement.install | 1 - x2gothinclient/VERSION.x2gothinclient | 1 - .../VERSION.x2gothinclientmanagement | 1 - 6 files changed, 5 insertions(+), 5 deletions(-) delete mode 120000 x2gothinclient/VERSION.x2gothinclient delete mode 120000 x2gothinclientmanagement/VERSION.x2gothinclientmanagement The diff of changes is: diff --git a/VERSION b/VERSION index a6bbdb5..238afc2 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.1.0.0 +1.1.0.1 diff --git a/debian/rules b/debian/rules index afa898a..4d3cf77 100755 --- a/debian/rules +++ b/debian/rules @@ -43,6 +43,10 @@ binary-arch: build-arch dh_installexamples dh_installdirs dh_install + mkdir -p debian/x2gothinclient/usr/share/x2go/versions/ + cp VERSION debian/x2gothinclient/usr/share/x2go/versions/VERSION.x2gothinclient + mkdir -p debian/x2gothinclientmanagement/usr/share/x2go/versions/ + cp VERSION debian/x2gothinclientmanagement/usr/share/x2go/versions/VERSION.x2gothinclientmanagement dh_installinit dh_installman dh_installdebconf diff --git a/debian/x2gothinclient.install b/debian/x2gothinclient.install index f2c48ff..a4fdb03 100644 --- a/debian/x2gothinclient.install +++ b/debian/x2gothinclient.install @@ -1,3 +1,2 @@ x2gothinclient/sbin/x2gothinclientd usr/sbin/ x2gothinclientmanagement/share/etc/* etc/x2go/ -x2gothinclient/VERSION.x2gothinclient usr/share/x2go/versions/ diff --git a/debian/x2gothinclientmanagement.install b/debian/x2gothinclientmanagement.install index a9077fa..ee16044 100644 --- a/debian/x2gothinclientmanagement.install +++ b/debian/x2gothinclientmanagement.install @@ -2,4 +2,3 @@ x2gothinclientmanagement/sbin/x2gothinclient_* usr/sbin/ x2gothinclientmanagement/etc/x2gothinclient_* etc/x2go/ x2gothinclientmanagement/share/etc/ usr/share/x2go/tce/ x2gothinclientmanagement/share/tftpboot usr/share/x2go/tce/ -x2gothinclientmanagement/VERSION.x2gothinclientmanagement usr/share/x2go/versions/ \ No newline at end of file diff --git a/x2gothinclient/VERSION.x2gothinclient b/x2gothinclient/VERSION.x2gothinclient deleted file mode 120000 index 6ff19de..0000000 --- a/x2gothinclient/VERSION.x2gothinclient +++ /dev/null @@ -1 +0,0 @@ -../VERSION \ No newline at end of file diff --git a/x2gothinclientmanagement/VERSION.x2gothinclientmanagement b/x2gothinclientmanagement/VERSION.x2gothinclientmanagement deleted file mode 120000 index 6ff19de..0000000 --- a/x2gothinclientmanagement/VERSION.x2gothinclientmanagement +++ /dev/null @@ -1 +0,0 @@ -../VERSION \ No newline at end of file hooks/post-receive -- x2gothinclient.git (X2Go Thin Client Environment) 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 "x2gothinclient.git" (X2Go Thin Client Environment). [View Less]

1 0

x2gothinclient.git - master (branch) updated: 1.1.0.0-26-ge8db747
by git-admin＠x2go.org 14 Nov '13

14 Nov '13

The branch, master has been updated via e8db74714aef8044b9f6830b9f7c423756398f30 (commit) from 37e9a55ba62ca1078ed00aa4aa2847edc77e9cc6 (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 e8db74714aef8044b9f6830b9f7c423756398f30 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de… [View More]

1 0

x2gothinclient.git - master (branch) updated: 1.1.0.0-25-g37e9a55
by git-admin＠x2go.org 14 Nov '13

14 Nov '13

The branch, master has been updated via 37e9a55ba62ca1078ed00aa4aa2847edc77e9cc6 (commit) from db502cbfd190e2d0975e407ee16baf062c53e990 (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 37e9a55ba62ca1078ed00aa4aa2847edc77e9cc6 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de… [View More]> Date: Thu Nov 14 15:10:36 2013 +0100 Tweak the /etc/os-release more comprehensively. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + debian/x2gothinclient.install | 3 ++- debian/x2gothinclientmanagement.install | 1 + x2gothinclient/VERSION.x2gothinclient | 1 + .../VERSION.x2gothinclientmanagement | 1 + .../etc/x2gothinclient_settings | 3 +++ .../sbin/x2gothinclient_create | 2 +- 7 files changed, 10 insertions(+), 2 deletions(-) create mode 120000 x2gothinclient/VERSION.x2gothinclient create mode 120000 x2gothinclientmanagement/VERSION.x2gothinclientmanagement The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 7ca3a8b..99e369f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,7 @@ x2gothinclient (1.1.0.1-0~x2go1) UNRELEASED; urgency=low init script and ALSA's utils.sh. - Refrain from using "~<user>" when launching X2Go Client as it cannot handle it, yet. Use "~" instead (handable by X2Go Client >= 4.0.1.2). + - Tweak the /etc/os-release more comprehensively. * debian/control: + New bin:package x2gothinclient-chroot. + Make sure x2gothinclient-chroot pulls in editing tools like diff --git a/debian/x2gothinclient.install b/debian/x2gothinclient.install index ee7f973..f2c48ff 100644 --- a/debian/x2gothinclient.install +++ b/debian/x2gothinclient.install @@ -1,2 +1,3 @@ x2gothinclient/sbin/x2gothinclientd usr/sbin/ -x2gothinclientmanagement/share/etc/* etc/x2go/ +x2gothinclientmanagement/share/etc/* etc/x2go/ +x2gothinclient/VERSION.x2gothinclient usr/share/x2go/versions/ diff --git a/debian/x2gothinclientmanagement.install b/debian/x2gothinclientmanagement.install index ee16044..a9077fa 100644 --- a/debian/x2gothinclientmanagement.install +++ b/debian/x2gothinclientmanagement.install @@ -2,3 +2,4 @@ x2gothinclientmanagement/sbin/x2gothinclient_* usr/sbin/ x2gothinclientmanagement/etc/x2gothinclient_* etc/x2go/ x2gothinclientmanagement/share/etc/ usr/share/x2go/tce/ x2gothinclientmanagement/share/tftpboot usr/share/x2go/tce/ +x2gothinclientmanagement/VERSION.x2gothinclientmanagement usr/share/x2go/versions/ \ No newline at end of file diff --git a/x2gothinclient/VERSION.x2gothinclient b/x2gothinclient/VERSION.x2gothinclient new file mode 120000 index 0000000..6ff19de --- /dev/null +++ b/x2gothinclient/VERSION.x2gothinclient @@ -0,0 +1 @@ +../VERSION \ No newline at end of file diff --git a/x2gothinclientmanagement/VERSION.x2gothinclientmanagement b/x2gothinclientmanagement/VERSION.x2gothinclientmanagement new file mode 120000 index 0000000..6ff19de --- /dev/null +++ b/x2gothinclientmanagement/VERSION.x2gothinclientmanagement @@ -0,0 +1 @@ +../VERSION \ No newline at end of file diff --git a/x2gothinclientmanagement/etc/x2gothinclient_settings b/x2gothinclientmanagement/etc/x2gothinclient_settings index d7f942c..ba701c9 100644 --- a/x2gothinclientmanagement/etc/x2gothinclient_settings +++ b/x2gothinclientmanagement/etc/x2gothinclient_settings @@ -21,6 +21,9 @@ # name of this instance of the X2Go TCE (appears during thinclient boot process) TC_PRETTY_NAME="X2Go TCE" +# Adapt to your system!!! This path fits for Debian systems. Or provide the version manually. +TC_VERSION=`cat /usr/share/x2go/versions/VERSION.x2gothinclientmanagement` + # base path for X2Go thin client files TC_BASE="/opt/x2gothinclient" diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_create b/x2gothinclientmanagement/sbin/x2gothinclient_create index f210edf..0f88f44 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_create +++ b/x2gothinclientmanagement/sbin/x2gothinclient_create @@ -204,7 +204,7 @@ fi [ \$? -eq 0 ] && sed -e 's/#ListenAddress ::/AddressFamily inet\nListenAddress 127.0.0.1/' -i /etc/ssh/sshd_config # tweak plymouth -[ \$? -eq 0 ] && test -e /etc/os-release && sed -e 's/PRETTY_NAME=.*/PRETTY_NAME=$TC_PRETTY_NAME/' -i /etc/os-release || echo "PRETTY_NAME=$TC_PRETTY_NAME" >> /etc/os-release +[ \$? -eq 0 ] && test -e /etc/os-release && sed -e 's/PRETTY_NAME=.*/PRETTY_NAME="$TC_PRETTY_NAME"/' -e 's/NAME=.*/NAME="$TC_PRETTY_NAME"/' -e 's/VERSION=.*/VERSION="$TC_VERSION"/' -e 's/VERSION_ID=.*/VERSION_ID="$TC_VERSION"/' -e 's@HOME_URL=.*@HOME_URL="http://wiki.x2go.org"@' -e 's@SUPPORT_URL=.*@SUPPORT_URL="http://wiki.x2go.org/"@' -e 's@BUG_REPORT_URL=.*@BUG_REPORT_URL="http://bugs.x2go.org"@' -i /etc/os-release || echo -e 'PRETTY_NAME="$TC_PRETTY_NAME"\nNAME="$TC_PRETTY_NAME"\n' > /etc/os-release [ \$? -eq 0 ] && test -e /etc/modprobe.d/i915-kms.conf && sed -s 's/modeset=1/modeset=0/' -i /etc/modprobe.d/i915-kms.conf || true [ \$? -eq 0 ] && test -e /etc/modprobe.d/radeon-kms.conf && sed -s 's/modeset=1/modeset=0/' -i /etc/modprobe.d/radeon-kms.conf || true hooks/post-receive -- x2gothinclient.git (X2Go Thin Client Environment) 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 "x2gothinclient.git" (X2Go Thin Client Environment). [View Less]

1 0

x2gothinclient.git - master (branch) updated: 1.1.0.0-24-gdb502cb
by git-admin＠x2go.org 14 Nov '13

14 Nov '13

The branch, master has been updated via db502cbfd190e2d0975e407ee16baf062c53e990 (commit) from 277b1f779a3d6b0f3a11fc7c4ad5b32dc16ac169 (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 db502cbfd190e2d0975e407ee16baf062c53e990 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de… [View More]> Date: Thu Nov 14 14:51:20 2013 +0100 fix spelling of X2Go ----------------------------------------------------------------------- Summary of changes: .../sbin/x2gothinclient_cleanup | 4 ++-- .../sbin/x2gothinclient_create | 2 +- x2gothinclientmanagement/sbin/x2gothinclient_shell | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_cleanup b/x2gothinclientmanagement/sbin/x2gothinclient_cleanup index 5157fb6..d1ebd39 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_cleanup +++ b/x2gothinclientmanagement/sbin/x2gothinclient_cleanup @@ -43,7 +43,7 @@ TC_TFTP_BOOT="${TC_TFTP_BOOT:-/srv/tftp}" exit -2 } -echo "X2go TCE cleanup..." +echo "X2Go TCE cleanup..." echo "-------------------" echo "Hit <RETURN> to purge all X2Go TCE related files (chroot," @@ -85,5 +85,5 @@ test -e "$TC_TFTP_BOOT/pxelinux.cfg" && { } echo -echo "X2go TCE cleanup is DONE." +echo "X2Go TCE cleanup is DONE." echo diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_create b/x2gothinclientmanagement/sbin/x2gothinclient_create index 1bb0bc0..f210edf 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_create +++ b/x2gothinclientmanagement/sbin/x2gothinclient_create @@ -249,5 +249,5 @@ empty_folder "$TC_CHROOT/var/lib/alsa" x2gothinclient_update -echo "X2go Thin Client creation has finished successfully." +echo "X2Go Thin Client creation has finished successfully." echo diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_shell b/x2gothinclientmanagement/sbin/x2gothinclient_shell index ba4ec21..15dc478 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_shell +++ b/x2gothinclientmanagement/sbin/x2gothinclient_shell @@ -87,7 +87,7 @@ ${*:-/bin/$TC_SHELL} umount /root echo -echo "X2go Thin Client Shell has exited." +echo "X2Go Thin Client Shell has exited." echo EOF chmod u+x "$TC_CHROOT/x2go_tce_shell.sh" hooks/post-receive -- x2gothinclient.git (X2Go Thin Client Environment) 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 "x2gothinclient.git" (X2Go Thin Client Environment). [View Less]

1 0

x2goclient.git - master (branch) updated: 4.0.1.1-23-ga965d2b
by git-admin＠x2go.org 14 Nov '13

14 Nov '13

The branch, master has been updated via a965d2bf9d5de13c0e29036078f5b4646a67cd1e (commit) from 174c6c4c29ab92e49403670a5f426f78c9803216 (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 a965d2bf9d5de13c0e29036078f5b4646a67cd1e Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de… [View More]

1 0

x2goclient.git - master (branch) updated: 4.0.1.1-22-g174c6c4
by git-admin＠x2go.org 14 Nov '13

14 Nov '13

The branch, master has been updated via 174c6c4c29ab92e49403670a5f426f78c9803216 (commit) from d01ec3dcc43ab7249a85fb7a391d5c8a7b943c61 (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 174c6c4c29ab92e49403670a5f426f78c9803216 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de… [View More]> Date: Thu Nov 14 11:43:02 2013 +0100 move expandHome into separate file: x2goutils.cpp ----------------------------------------------------------------------- Summary of changes: onmainwindow.cpp | 9 --------- onmainwindow.h | 1 - onmainwindow_privat.h | 1 + sessionbutton.cpp | 3 ++- sessionwidget.cpp | 3 ++- x2goclient.pro | 6 ++++-- 6 files changed, 9 insertions(+), 14 deletions(-) The diff of changes is: diff --git a/onmainwindow.cpp b/onmainwindow.cpp index a309759..53817c2 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -3178,15 +3178,6 @@ void ONMainWindow::continueLDAPSession() sshConnection->executeCommand ( "x2gogetservers", this, SLOT ( slotGetServers ( bool, QString,int ) )); } -QString ONMainWindow::expandHome( QString path ) -{ - path = path.trimmed(); - if ( path.startsWith("~/") || path.startsWith("~\\") ) { - path = path.replace(QString("~"), QDir::homePath()); - } - return path; -} - #ifdef Q_OS_LINUX void ONMainWindow::startDirectRDP() { diff --git a/onmainwindow.h b/onmainwindow.h index 8bc1c6f..7e51291 100644 --- a/onmainwindow.h +++ b/onmainwindow.h @@ -1088,7 +1088,6 @@ private: void printSshDError(); void loadPulseModuleNativeProtocol(); void initEmbedToolBar(); - QString expandHome( QString path ); #ifdef Q_OS_LINUX void startDirectRDP(); #endif diff --git a/onmainwindow_privat.h b/onmainwindow_privat.h index e98b062..fd7876e 100644 --- a/onmainwindow_privat.h +++ b/onmainwindow_privat.h @@ -26,6 +26,7 @@ #include "version.h" #include "x2goclientconfig.h" +#include "x2goutils.h" #include "onmainwindow.h" #include "userbutton.h" #include "exportdialog.h" diff --git a/sessionbutton.cpp b/sessionbutton.cpp index 23b71e3..eb96ff5 100644 --- a/sessionbutton.cpp +++ b/sessionbutton.cpp @@ -17,6 +17,7 @@ #include "sessionbutton.h" #include "x2goclientconfig.h" +#include "x2goutils.h" #include <QFont> #include <QPixmap> @@ -305,7 +306,7 @@ void SessionButton::redraw() ( QVariant ) ":icons/128x128/x2gosession.png" ).toString(); - sessIcon = ONMainWindow::expandHome(sessIcon); + sessIcon = expandHome(sessIcon); QPixmap* pix; if (!par->brokerMode || sessIcon == ":icons/128x128/x2gosession.png") diff --git a/sessionwidget.cpp b/sessionwidget.cpp index 2d3c269..9e54d19 100644 --- a/sessionwidget.cpp +++ b/sessionwidget.cpp @@ -16,6 +16,7 @@ ***************************************************************************/ #include "sessionwidget.h" +#include "x2goutils.h" #include <QBoxLayout> #include <QLineEdit> #include <QPushButton> @@ -507,7 +508,7 @@ void SessionWidget::readConfig() sessIcon=st.setting()->value ( sessionId+"/icon", ( QVariant ) ":icons/128x128/x2gosession.png" ).toString().trimmed(); - sessIcon=ONMainWindow::expandHome(sessIcon); + sessIcon=expandHome(sessIcon); icon->setIcon ( QIcon ( sessIcon ) ); server->setText ( st.setting()->value ( diff --git a/x2goclient.pro b/x2goclient.pro index 4510219..de4d59c 100755 --- a/x2goclient.pro +++ b/x2goclient.pro @@ -66,7 +66,8 @@ HEADERS += configdialog.h \ brokerpassdlg.h \ contest.h \ xsettingswidget.h \ - appdialog.h + appdialog.h \ + x2goutils.h SOURCES += sharewidget.cpp \ settingswidget.cpp\ @@ -101,7 +102,8 @@ SOURCES += sharewidget.cpp \ brokerpassdlg.cpp \ contest.cpp \ xsettingswidget.cpp \ - appdialog.cpp + appdialog.cpp \ + x2goutils.cpp LIBS += -lssh 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 - master (branch) updated: 4.0.1.1-21-gd01ec3d
by git-admin＠x2go.org 14 Nov '13

14 Nov '13

The branch, master has been updated via d01ec3dcc43ab7249a85fb7a391d5c8a7b943c61 (commit) from 2fe3c60ec53e9029a4c3f3a3c4e1dda069c12eac (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 d01ec3dcc43ab7249a85fb7a391d5c8a7b943c61 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de… [View More]> Date: Thu Nov 14 11:42:16 2013 +0100 remove unwanted patch file ----------------------------------------------------------------------- Summary of changes: trayicon-1.patch | 245 ------------------------------------------------------ 1 file changed, 245 deletions(-) delete mode 100644 trayicon-1.patch The diff of changes is: diff --git a/trayicon-1.patch b/trayicon-1.patch deleted file mode 100644 index 1c49ed7..0000000 --- a/trayicon-1.patch +++ /dev/null @@ -1,245 +0,0 @@ -diff -rupN /tmp/x2goclient-3.01/configdialog.cpp x2goclient-3.01/configdialog.cpp ---- /tmp/x2goclient-3.01/configdialog.cpp 2009-11-26 23:22:51.000000000 +0100 -+++ x2goclient-3.01/configdialog.cpp 2011-01-21 17:49:11.000000000 +0100 -@@ -54,6 +54,10 @@ ConfigDialog::ConfigDialog ( QWidget * p - st.beginGroup ( "settings" ); - #endif - -+ trayIconEnabledEdit = new QCheckBox ( tr ( "Minimize to tray after establishing connection" ) ); -+ trayIconEnabledEdit->setChecked ( st.value ( "trayEnabled", false ).toBool() ); -+ frLay->addWidget(trayIconEnabledEdit); -+ - #ifdef USELDAP - if ( !embedMode ) - { -@@ -328,6 +332,8 @@ void ConfigDialog::slot_accepted() - st.beginGroup ( "settings" ); - #endif - -+ st.setValue ( "trayEnabled", trayIconEnabledEdit->isChecked() ); -+ - #ifdef USELDAP - if ( !embedMode ) - { -diff -rupN /tmp/x2goclient-3.01/configdialog.h x2goclient-3.01/configdialog.h ---- /tmp/x2goclient-3.01/configdialog.h 2009-11-10 22:38:21.000000000 +0100 -+++ x2goclient-3.01/configdialog.h 2011-01-21 17:45:17.000000000 +0100 -@@ -77,6 +77,8 @@ class ConfigDialog : public QDialog - ConnectionWidget* conWidg; - SettingsWidget* setWidg; - -+ QCheckBox *trayIconEnabledEdit; -+ - public slots: - void slot_accepted(); - void slot_checkOkStat(); -diff -rupN /tmp/x2goclient-3.01/onmainwindow.cpp x2goclient-3.01/onmainwindow.cpp ---- /tmp/x2goclient-3.01/onmainwindow.cpp 2009-11-27 23:55:06.000000000 +0100 -+++ x2goclient-3.01/onmainwindow.cpp 2011-01-21 17:57:02.000000000 +0100 -@@ -388,6 +383,34 @@ ONMainWindow::ONMainWindow ( QWidget *pa - SLOT ( slot_resize ( const QSize ) ) ); - - slot_resize ( fr->size() ); -+ -+ if(!trayEnabled){ -+ trayIconActiveConnectionMenu = NULL; -+ trayIconConnectionMenu = NULL; -+ trayIcon = NULL; -+ } -+ else{ -+ // setup the tray icon context menu -+ QMenu *trayIconMenu = new QMenu(this); -+ trayIconMenu->addAction(tr("Open client"), -+ this, SLOT(show())); -+ trayIconActiveConnectionMenu = trayIconMenu->addMenu(tr("Active connections")); -+ trayIconConnectionMenu = trayIconMenu->addMenu(tr("Open connection")); -+ -+ trayIconMenu->addSeparator(); -+ trayIconMenu->addAction(tr("Quit"), -+ this, SLOT(trayQuit())); -+ -+ // setup the tray icon itself -+ trayIcon = new QSystemTrayIcon(this); -+ connect(trayIcon, SIGNAL(activated(QSystemTrayIcon::ActivationReason)), -+ this, SLOT(trayIconActivated(QSystemTrayIcon::ActivationReason))); -+ connect(trayIcon, SIGNAL(messageClicked()), this, SLOT(trayMessageClicked())); -+ trayIcon->setContextMenu(trayIconMenu); -+ trayIcon->setIcon(QIcon ( ":icons/128x128/x2go.png") ); -+ trayIcon->setToolTip(tr("Left click to open the X2GoClient window or right click to get the context menu.")); -+ trayIcon->show(); -+ } - } - - ONMainWindow::~ONMainWindow() -@@ -587,7 +610,7 @@ void ONMainWindow::initWidgetsNormal() - connect ( act_edit,SIGNAL ( triggered ( bool ) ),this, - SLOT ( slot_manage() ) ); - connect ( act_exit,SIGNAL ( triggered ( bool ) ),this, -- SLOT ( close() ) ); -+ SLOT ( trayQuit() ) ); - connect ( act_tb,SIGNAL ( toggled ( bool ) ),this, - SLOT ( displayToolBar ( bool ) ) ); - stb=addToolBar ( tr ( "Show toolbar" ) ); -@@ -746,6 +769,26 @@ void ONMainWindow::slot_resize ( const Q - - void ONMainWindow::closeEvent ( QCloseEvent* event ) - { -+ // do not exit application, if tray icon is visible -+ if(!trayIcon || !trayIcon->isVisible()){ -+ trayQuit(); -+ } -+ else{ -+// if(!trayQuitInfoShown){ -+// QMessageBox::information(this, windowTitle(), -+// tr("The program will keep running in the " -+// "system tray. To terminate the program, " -+// "choose <b>Quit</b> in the context menu " -+// "of the system tray entry.")); -+// trayQuitInfoShown = true; -+// } -+ hide(); -+ event->ignore(); -+ } -+} -+ -+void ONMainWindow::trayQuit() -+{ - if ( !startMaximized && !startHidden && !embedMode ) - { - #ifndef Q_OS_WIN -@@ -761,9 +804,9 @@ void ONMainWindow::closeEvent ( QCloseEv - st.setValue ( "mainwindow/pos",QVariant ( pos() ) ); - st.setValue ( "mainwindow/maximized", - QVariant ( isMaximized() ) ); -+// st.setValue ( "trayQuitInfoShown", trayQuitInfoShown); - st.sync(); - } -- QMainWindow::closeEvent ( event ); - if ( nxproxy!=0l ) - { - if ( nxproxy->state() ==QProcess::Running ) -@@ -823,6 +866,10 @@ void ONMainWindow::closeEvent ( QCloseEv - closeEmbedWidget(); - #endif - } -+ -+ // is used, because closeEvent() only hides the window -+ // because of the QSystemTrayIcon -+ qApp->quit(); - } - - void ONMainWindow::loadSettings() -@@ -875,6 +922,9 @@ void ONMainWindow::loadSettings() - #endif - showToolBar=st1.value ( "toolbar/show", ( QVariant ) true ).toBool(); - -+ // tray stuff -+ trayEnabled = st1.value( "trayEnabled", false ).toBool(); -+// trayQuitInfoShown = st1.value( "trayQuitInfoShown", false ).toBool(); - } - QString ONMainWindow::iconsPath ( QString fname ) - { -@@ -2135,6 +2185,7 @@ bool ONMainWindow::startSession ( const - slot_listSessions ( false,message,0 ); - return false; - } -+ - return true; - } - -@@ -3517,6 +3568,9 @@ void ONMainWindow::slot_retResumeSess ( - } - } - } -+ -+ if(trayEnabled) -+ hide(); - } - - -@@ -7957,3 +8011,28 @@ void ONMainWindow::slotHideEmbedToolBarT - showTbTooltip=false; - QToolTip::hideText(); - } -+ -+void ONMainWindow::trayIconActivated(QSystemTrayIcon::ActivationReason reason ) -+{ -+ switch(reason){ -+// use single left click on unix -+// and double click on windows (Is it standard behaviour conform?) -+#ifdef Q_OS_UNIX -+ case QSystemTrayIcon::Trigger: -+#else -+ case QSystemTrayIcon::DoubleClick: -+#endif -+ if(isVisible()) -+ hide(); -+ else -+ show(); -+ break; -+ default: -+ break; -+ } -+} -+ -+void ONMainWindow::trayMessageClicked() -+{ -+ -+} -diff -rupN /tmp/x2goclient-3.01/onmainwindow.h x2goclient-3.01/onmainwindow.h ---- /tmp/x2goclient-3.01/onmainwindow.h 2009-11-26 22:20:26.000000000 +0100 -+++ x2goclient-3.01/onmainwindow.h 2011-01-21 17:29:01.000000000 +0100 -@@ -30,6 +30,7 @@ - #include "LDAPSession.h" - #include "embedwidget.h" - #include <QToolBar> -+#include <QSystemTrayIcon> - - #ifdef Q_OS_WIN - #include <windows.h> -@@ -58,6 +59,7 @@ class QModelIndex; - class sshProcess; - class IMGFrame; - class QStandardItemModel; -+class QMenu; - struct user - { - int uin; -@@ -507,6 +509,13 @@ class ONMainWindow : public QMainWindow - QString defaultSessionId; - QString defaultUserName; - bool defaultUser; -+ -+ // Tray icon stuff -+ QSystemTrayIcon *trayIcon; -+ QMenu *trayIconActiveConnectionMenu, *trayIconConnectionMenu; -+ bool trayEnabled; -+// bool trayQuitInfoShown; -+ - SessionButton* createBut ( const QString& id ); - void placeButtons(); - QString getKdeIconsPath(); -@@ -563,6 +572,23 @@ class ONMainWindow : public QMainWindow - void displayToolBar ( bool ); - void showSessionStatus(); - -+ // tray icon stuff -+ /** -+ * @brief Is called when clicked on the QSystemTrayIcon. -+ */ -+ void trayIconActivated(QSystemTrayIcon::ActivationReason reason); -+ /** -+ * @brief Is called when a message from QSystemTrayIcon is clicked. -+ */ -+ void trayMessageClicked(); -+ /** -+ * @brief Is called when Quit from context menu of QSystemTrayIcon is clicked. -+ * -+ * Prepares everything to quit the application. It has the functionality of -+ * the old (before QSystemTrayIcon is used) closeEvent() function. -+ */ -+ void trayQuit(); -+ - public slots: - void slot_config(); - void slotNewSession(); \ 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

x2gothinclient.git - master (branch) updated: 1.1.0.0-23-g277b1f7
by git-admin＠x2go.org 14 Nov '13

14 Nov '13

The branch, master has been updated via 277b1f779a3d6b0f3a11fc7c4ad5b32dc16ac169 (commit) from d31612857aa5d01ed112f5f3c4cc4c1fee209ddc (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 277b1f779a3d6b0f3a11fc7c4ad5b32dc16ac169 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de… [View More]> Date: Thu Nov 14 11:24:50 2013 +0100 Refrain from using "~<user>" when launching X2Go Client as it cannot handle it, yet. Use "~" instead (handable by X2Go Client >= 4.0.1.2). + Depend on x2goclient (>= 4.0.1.2-0~). * debian/control: + Depend on x2goclient (>= 4.0.1.2-0~). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 +++ debian/control | 2 +- .../share/etc/x2gothinclient_start | 5 ++--- 3 files changed, 6 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 395b45c..7ca3a8b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,10 +17,13 @@ x2gothinclient (1.1.0.1-0~x2go1) UNRELEASED; urgency=low avoid failures when clean tmp files on the read-only NFS root-fs. - Work around Debian bug #729373 during TCE creation. Patch alsa-utils init script and ALSA's utils.sh. + - Refrain from using "~<user>" when launching X2Go Client as it cannot + handle it, yet. Use "~" instead (handable by X2Go Client >= 4.0.1.2). * debian/control: + New bin:package x2gothinclient-chroot. + Make sure x2gothinclient-chroot pulls in editing tools like mc, vim, less via Recommends: field. + + Depend on x2goclient (>= 4.0.1.2-0~). [ Arnold Krille ] * New upstream version (1.1.0.1): diff --git a/debian/control b/debian/control index 4e0f7a7..69f2d15 100644 --- a/debian/control +++ b/debian/control @@ -91,7 +91,7 @@ Depends: ${misc:Depends}, adduser, psmisc, - x2goclient (>= 3.99.3.0-0~), + x2goclient (>= 4.0.1.2-0~), xauth, xinit, locales, diff --git a/x2gothinclientmanagement/share/etc/x2gothinclient_start b/x2gothinclientmanagement/share/etc/x2gothinclient_start index 3ff2b4d..8a8ab74 100755 --- a/x2gothinclientmanagement/share/etc/x2gothinclient_start +++ b/x2gothinclientmanagement/share/etc/x2gothinclient_start @@ -28,7 +28,7 @@ --geometry=fullscreen \ --thinclient \ --haltbt \ - --read-exports-from=~x2gothinclient/export \ + --read-exports-from=~/export \ --background=/etc/x2go/x2goclient-background.svg \ --no-session-edit \ --session=X2Go.Example \ @@ -42,9 +42,8 @@ # --geometry=fullscreen \ # --thinclient \ # --haltbt \ -# --read-exports-from=~x2gothinclient/export \ +# --read-exports-from=~/export \ # --background=/etc/x2go/x2goclient-background.svg \ # --broker-url=https://x2gobroker.intern:8080/plain/zeroconf \ # --broker-autologoff # --add-to-known-hosts & - hooks/post-receive -- x2gothinclient.git (X2Go Thin Client Environment) 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 "x2gothinclient.git" (X2Go Thin Client Environment). [View Less]

1 0

x2goclient.git - master (branch) updated: 4.0.1.1-20-g2fe3c60
by git-admin＠x2go.org 14 Nov '13

14 Nov '13

The branch, master has been updated via 2fe3c60ec53e9029a4c3f3a3c4e1dda069c12eac (commit) from 74913d557824edb1dedc0784223484070399e072 (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 2fe3c60ec53e9029a4c3f3a3c4e1dda069c12eac Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de… [View More]> Date: Thu Nov 14 11:21:06 2013 +0100 improve/fix last commit ----------------------------------------------------------------------- Summary of changes: onmainwindow.cpp | 6 ++++-- sessionbutton.cpp | 1 + sessionwidget.cpp | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/onmainwindow.cpp b/onmainwindow.cpp index 9d1c353..a309759 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -2655,7 +2655,7 @@ void ONMainWindow::slotSelectedFromList ( SessionButton* session ) sid+"/icon", ( QVariant ) ":icons/128x128/x2gosession.png" ).toString(); - + sessIcon=expandHome(sessIcon); command=st->setting()->value ( sid+"/command", @@ -3180,6 +3180,7 @@ void ONMainWindow::continueLDAPSession() QString ONMainWindow::expandHome( QString path ) { + path = path.trimmed(); if ( path.startsWith("~/") || path.startsWith("~\\") ) { path = path.replace(QString("~"), QDir::homePath()); } @@ -4271,7 +4272,7 @@ void ONMainWindow::setTrayIconToSessionIcon(QString info) { else sid="embedded"; - QString imagePath = st->setting()->value(sid + "/icon", (QVariant) QString(":icons/128x128/x2go.png")).toString(); + QString imagePath = expandHome(st->setting()->value(sid + "/icon", (QVariant) QString(":icons/128x128/x2go.png")).toString()); trayIcon->setIcon(QIcon (imagePath)); QString name=st->setting()->value ( sid +"/name").toString() ; @@ -6719,6 +6720,7 @@ bool ONMainWindow::parseParameter ( QString param ) } if (setting == "--session-icon") { + value=expandHome(value); if (! QFile::exists(value)) { printError( param + tr(" (file not exists)")); diff --git a/sessionbutton.cpp b/sessionbutton.cpp index 5204093..23b71e3 100644 --- a/sessionbutton.cpp +++ b/sessionbutton.cpp @@ -305,6 +305,7 @@ void SessionButton::redraw() ( QVariant ) ":icons/128x128/x2gosession.png" ).toString(); + sessIcon = ONMainWindow::expandHome(sessIcon); QPixmap* pix; if (!par->brokerMode || sessIcon == ":icons/128x128/x2gosession.png") diff --git a/sessionwidget.cpp b/sessionwidget.cpp index 0f6ec06..2d3c269 100644 --- a/sessionwidget.cpp +++ b/sessionwidget.cpp @@ -507,6 +507,7 @@ void SessionWidget::readConfig() sessIcon=st.setting()->value ( sessionId+"/icon", ( QVariant ) ":icons/128x128/x2gosession.png" ).toString().trimmed(); + sessIcon=ONMainWindow::expandHome(sessIcon); icon->setIcon ( QIcon ( sessIcon ) ); server->setText ( st.setting()->value ( 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 - master (branch) updated: 4.0.1.1-19-g74913d5
by git-admin＠x2go.org 14 Nov '13

14 Nov '13

The branch, master has been updated via 74913d557824edb1dedc0784223484070399e072 (commit) from 2f53855ca00741af1f2276163201607484ddd861 (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 74913d557824edb1dedc0784223484070399e072 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de… [View More]> Date: Thu Nov 14 10:14:05 2013 +0100 Expand tilde operator for all other file paths handed over to X2Go Client via sessions file or cmdline parameter. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ onmainwindow.cpp | 27 +++++++++++++++++---------- onmainwindow.h | 1 + 3 files changed, 20 insertions(+), 10 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 2d6cd76..ef36c0f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,8 @@ x2goclient (4.0.1.2-0~x2go2) UNRELEASED; urgency=low - Update man page for new --tray-icon cmdline option. - Properly handle (=expand) the "~" character in key filenames. (Brought to attention by Eldamir on IRC. Thanks!). + - Expand tilde operator for all other file paths handed over to X2Go Client + via sessions file or cmdline parameter. * Pull-in packaging changes from Debian. [ Ricardo Díaz Martín ] diff --git a/onmainwindow.cpp b/onmainwindow.cpp index 164b2a6..9d1c353 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -2071,6 +2071,7 @@ void ONMainWindow::slotCreateDesktopIcon ( SessionButton* bt ) ( QVariant ) ":icons/128x128/x2gosession.png" ).toString(); + sessIcon = expandHome(sessIcon); if ( sessIcon.startsWith ( ":icons",Qt::CaseInsensitive ) || !sessIcon.endsWith ( ".png",Qt::CaseInsensitive ) ) { @@ -2681,9 +2682,7 @@ void ONMainWindow::slotSelectedFromList ( SessionButton* session ) currentKey=st->setting()->value ( sid+"/key", ( QVariant ) QString::null ).toString(); - if ( currentKey.startsWith("~") ) { - currentKey = currentKey.replace(QString("~"), QDir::homePath()); - } + currentKey=expandHome(currentKey); autologin=st->setting()->value ( sid+"/autologin", @@ -3179,6 +3178,14 @@ void ONMainWindow::continueLDAPSession() sshConnection->executeCommand ( "x2gogetservers", this, SLOT ( slotGetServers ( bool, QString,int ) )); } +QString ONMainWindow::expandHome( QString path ) +{ + if ( path.startsWith("~/") || path.startsWith("~\\") ) { + path = path.replace(QString("~"), QDir::homePath()); + } + return path; +} + #ifdef Q_OS_LINUX void ONMainWindow::startDirectRDP() { @@ -3423,9 +3430,7 @@ bool ONMainWindow::startSession ( const QString& sid ) sid+"/sshproxykeyfile", QString() ).toString() ); - if ( proxyKey.startsWith("~") ) { - proxyKey = proxyKey.replace(QString("~"), QDir::homePath()); - } + proxyKey=expandHome(proxyKey); proxyserver=(st->setting()->value ( sid+"/sshproxyhost", @@ -6546,7 +6551,7 @@ bool ONMainWindow::parseParameter ( QString param ) } if ( setting=="--session-conf" ) { - ONMainWindow::sessionCfg=value; + ONMainWindow::sessionCfg=expandHome(value); return true; } if ( setting=="--sessionid" ) @@ -6589,13 +6594,13 @@ bool ONMainWindow::parseParameter ( QString param ) } if ( setting=="--read-exports-from" ) { - readExportsFrom=value; + readExportsFrom=expandHome(value); return true; } if ( setting=="--external-login" ) { extLogin=true; - readLoginsFrom=value; + readLoginsFrom=expandHome(value); return true; } if ( setting=="--ssh-port" ) @@ -6682,7 +6687,7 @@ bool ONMainWindow::parseParameter ( QString param ) } if ( setting == "--auth-id") { - QFile file(value); + QFile file(expandHome(value)); if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) { printError ( param + tr(" (can't open file)")); @@ -6726,6 +6731,8 @@ bool ONMainWindow::parseParameter ( QString param ) { QDir dr; + value = expandHome(value); + #ifdef Q_OS_WIN int find=value.indexOf("("); int lind=value.indexOf(")"); diff --git a/onmainwindow.h b/onmainwindow.h index 7e51291..8bc1c6f 100644 --- a/onmainwindow.h +++ b/onmainwindow.h @@ -1088,6 +1088,7 @@ private: void printSshDError(); void loadPulseModuleNativeProtocol(); void initEmbedToolBar(); + QString expandHome( QString path ); #ifdef Q_OS_LINUX void startDirectRDP(); #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). [View Less]

1 0

← Newer
1
...
31
32
33
34
35
36
37
...
40
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits November 2013