This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goclient. from 97ecd0a Windows: Only bundle msvcr120.dll new ae7a297 sessionmanagedialog.cpp: enable some debugging and make selected sessions configureable or deletable. Fixes: #909. new 8f93b2a general: bump revision to 4.0.5.0 due to incompatible Windows bug fixes. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: VERSION | 2 +- debian/changelog | 10 ++++---- man/man1/x2goclient.1 | 2 +- src/sessionmanagedialog.cpp | 31 +++++++++++++++++++++---- src/sessionmanagedialog.h | 3 ++- src/version.h | 2 +- x2gobrowserplugin-2.4_1/src/res/x2goplugin.rc | 6 ++--- x2goclient.spec | 2 +- 8 files changed, 41 insertions(+), 17 deletions(-) -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit ae7a2971c567cfde0cdc1162e9823ac5bff7e8b1 Author: Mihai Moldovan <ionic@ionic.de> Date: Tue Jul 28 01:00:03 2015 +0200 sessionmanagedialog.cpp: enable some debugging and make selected sessions configureable or deletable. Fixes: #909. --- debian/changelog | 2 ++ src/sessionmanagedialog.cpp | 31 ++++++++++++++++++++++++++----- src/sessionmanagedialog.h | 3 ++- 3 files changed, 30 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index ab4dad7..fdb1052 100644 --- a/debian/changelog +++ b/debian/changelog @@ -72,6 +72,8 @@ x2goclient (4.0.4.1-0x2go1) UNRELEASED; urgency=low - onmainwindow.cpp: rename "optionsmd" setting to "optionswholedisplay", which is more clear. - xsettingswidget.cpp: fix compile error: settings -> setting. + - sessionmanagedialog.cpp: enable some debugging and make selected + sessions configureable or deletable. Fixes: #909. [ Mike Gabriel ] * debian/control: diff --git a/src/sessionmanagedialog.cpp b/src/sessionmanagedialog.cpp index 59423fa..5ec0331 100644 --- a/src/sessionmanagedialog.cpp +++ b/src/sessionmanagedialog.cpp @@ -18,6 +18,7 @@ #include "x2goclientconfig.h" #include "sessionmanagedialog.h" #include "onmainwindow.h" +#include "x2gologdebug.h" #include <QPushButton> #include <QDir> @@ -119,10 +120,16 @@ SessionManageDialog::SessionManageDialog ( QWidget * parent, setWindowTitle ( tr ( "Session management" ) ); loadSessions(); - connect ( sessions, SIGNAL(itemActivated(QTreeWidgetItem*,int)), - this,SLOT(slot_activated(QTreeWidgetItem*,int)) ); - connect ( sessions,SIGNAL(itemDoubleClicked(QTreeWidgetItem*,int)), - this,SLOT(slot_dclicked(QTreeWidgetItem*,int)) ); + connect (sessions, SIGNAL (itemPressed (QTreeWidgetItem *, int)), + this, SLOT (slot_endisable (QTreeWidgetItem *, int))); + connect (sessions, SIGNAL (itemActivated (QTreeWidgetItem *, int)), + this, SLOT (slot_endisable (QTreeWidgetItem *, int))); + connect (sessions, SIGNAL (itemChanged (QTreeWidgetItem *, int)), + this, SLOT (slot_endisable (QTreeWidgetItem *, int))); + connect (sessions, SIGNAL (currentItemChanged (QTreeWidgetItem *, QTreeWidgetItem *)), + this, SLOT (slot_endisable_ItemChanged_wrapper (QTreeWidgetItem *, QTreeWidgetItem *))); + connect (sessions,SIGNAL (itemDoubleClicked (QTreeWidgetItem *, int)), + this, SLOT (slot_dclicked (QTreeWidgetItem *, int))); } @@ -191,13 +198,19 @@ void SessionManageDialog::initFolders(QTreeWidgetItem* parent, QString path) } -void SessionManageDialog::slot_activated ( QTreeWidgetItem* item, int ) +void SessionManageDialog::slot_endisable ( QTreeWidgetItem* item, int col) { + Q_UNUSED (col); + bool isSess=item->data(0, SESSIONROLE).toBool(); + x2goDebug << "slot_endisable: isSess: " << isSess; + if(!isSess) { currentPath=item->data(0,Qt::UserRole).toString().split("/",QString::SkipEmptyParts).join("/"); + x2goDebug << "slot_endisable: no session, currentPath(?): " << currentPath; } + removeSession->setEnabled ( isSess ); editSession->setEnabled ( isSess ); #if (!defined Q_WS_HILDON) && (!defined Q_OS_DARWIN) @@ -206,6 +219,14 @@ void SessionManageDialog::slot_activated ( QTreeWidgetItem* item, int ) #endif } +void SessionManageDialog::slot_endisable_ItemChanged_wrapper (QTreeWidgetItem *item, QTreeWidgetItem *) { + /* + * The int parameter of slot_endisable is unused anyway, + * just use the default value in this special case. + */ + slot_endisable (item); +} + void SessionManageDialog::slot_dclicked ( QTreeWidgetItem* item, int ) { if(item->data(0, SESSIONROLE).toBool()) diff --git a/src/sessionmanagedialog.h b/src/sessionmanagedialog.h index 1908a1a..84f2992 100644 --- a/src/sessionmanagedialog.h +++ b/src/sessionmanagedialog.h @@ -48,7 +48,8 @@ private: ONMainWindow* par; QString currentPath; private slots: - void slot_activated ( QTreeWidgetItem * item, int); + void slot_endisable (QTreeWidgetItem *item, int col = -1); + void slot_endisable_ItemChanged_wrapper (QTreeWidgetItem *item, QTreeWidgetItem *); void slotNew(); void slot_edit(); void slot_createSessionIcon(); -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 8f93b2ae98a4da5b17c132d0957eaf9ad687c2aa Author: Mihai Moldovan <ionic@ionic.de> Date: Tue Jul 28 01:11:05 2015 +0200 general: bump revision to 4.0.5.0 due to incompatible Windows bug fixes. --- VERSION | 2 +- debian/changelog | 8 ++++---- man/man1/x2goclient.1 | 2 +- src/version.h | 2 +- x2gobrowserplugin-2.4_1/src/res/x2goplugin.rc | 6 +++--- x2goclient.spec | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/VERSION b/VERSION index 45a289d..5787f20 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.0.4.1 +4.0.5.0 diff --git a/debian/changelog b/debian/changelog index fdb1052..cd11e68 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,7 @@ -x2goclient (4.0.4.1-0x2go1) UNRELEASED; urgency=low +x2goclient (4.0.5.0-0x2go1) UNRELEASED; urgency=low [ Mihai Moldovan ] - * New upstream release (4.0.4.1): + * New upstream release (4.0.5.0): - INSTALL: add more verbose instructions on how to build X2Go Client and friends. - onmainwindow.{cpp,h}: rename slotScDaemonOut() and slotScDaemonError() @@ -108,12 +108,12 @@ x2goclient (4.0.4.1-0x2go1) UNRELEASED; urgency=low (Fixes: #696) [ Henning Heinold ] - * New upstream release (4.0.4.1): + * New upstream release (4.0.5.0): - x2goclient.pro: simplify lrelease path preparing for different OS and cross compiling. Fixes: #901. [ Oleksandr Shneyder ] - * New upstream release (4.0.4.1): + * New upstream release (4.0.5.0): - onmainwindow.{cpp,h}: fix multimonitor mode on Windows. Run VcXsrv on selected screen without decorations. diff --git a/man/man1/x2goclient.1 b/man/man1/x2goclient.1 index d82c8a5..6910c5f 100644 --- a/man/man1/x2goclient.1 +++ b/man/man1/x2goclient.1 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2goclient 1 "May 2015" "Version 4.0.4.1" "X2Go Client (Qt4)" +.TH x2goclient 1 "May 2015" "Version 4.0.5.0" "X2Go Client (Qt4)" .SH NAME x2goclient \- Client application to launch server-side X2Go sessions. .SH SYNOPSIS diff --git a/src/version.h b/src/version.h index 69ff560..782dfbf 100644 --- a/src/version.h +++ b/src/version.h @@ -19,6 +19,6 @@ #ifndef VERSION_H #define VERSION_H -#define VERSION "4.0.4.1" +#define VERSION "4.0.5.0" #endif /* !defined (VERSION_H) */ diff --git a/x2gobrowserplugin-2.4_1/src/res/x2goplugin.rc b/x2gobrowserplugin-2.4_1/src/res/x2goplugin.rc index 8671cc1..0fac17d 100644 --- a/x2gobrowserplugin-2.4_1/src/res/x2goplugin.rc +++ b/x2gobrowserplugin-2.4_1/src/res/x2goplugin.rc @@ -1,8 +1,8 @@ 1 TYPELIB "x2goplugin.rc" 1 VERSIONINFO - FILEVERSION 4.0.4.1 - PRODUCTVERSION 4.0.4.1 + FILEVERSION 4.0.5.0 + PRODUCTVERSION 4.0.5.0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -26,7 +26,7 @@ BEGIN VALUE "LegalCopyright", "Copyright � 2010-2015 X2Go Project\0" VALUE "MIMEType", "application/x2go\0" VALUE "OriginalFilename", "npx2goplugin.dll\0" - VALUE "ProductName", "X2GoClient Plug-in 4.0.4.1\0" + VALUE "ProductName", "X2GoClient Plug-in 4.0.5.0\0" VALUE "ProductVersion", "4, 0, 4, 1\0" END END diff --git a/x2goclient.spec b/x2goclient.spec index e159c56..f887209 100644 --- a/x2goclient.spec +++ b/x2goclient.spec @@ -1,5 +1,5 @@ Name: x2goclient -Version: 4.0.4.1 +Version: 4.0.5.0 Release: 0.0x2go1%{?dist} Summary: X2Go Client application (Qt4) -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
-
git-admin＠x2go.org