This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2godesktopsharing. from c6dd307 sharetray.cpp: fix misleading if indentation warning. new 896f5c8 Rephrase notifications (we need a i18n run already anyway...). new c6e8908 Add a soothing notification to the local user when the local user actively disconnects the remote user. new e39b50c Don't create empty parameters in .x2godesktopsharing/settings as '<param>=@Invalid()' but really as empty strings. new 72e7eec Fix auto-accept and auto-deny based on whitelists and blacklist. Regression fix for Git commit ef3dfac2. The 4 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: accessdialog.cpp | 4 ++-- debian/changelog | 7 +++++++ sharetray.cpp | 41 ++++++++++++++++++++++++++++++----------- 3 files changed, 39 insertions(+), 13 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2godesktopsharing.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2godesktopsharing. commit 896f5c8364cea786ab210ff1a6b0e87a33ecd06f Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Nov 12 16:07:51 2018 +0100 Rephrase notifications (we need a i18n run already anyway...). --- accessdialog.cpp | 4 ++-- debian/changelog | 1 + sharetray.cpp | 10 +++++----- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/accessdialog.cpp b/accessdialog.cpp index fc2e156..9c05fd9 100644 --- a/accessdialog.cpp +++ b/accessdialog.cpp @@ -31,12 +31,12 @@ AccessWindow::AccessWindow(QString uname, QString hname, QWidget *parent) icon->setPixmap ( QPixmap (":icons/svg/dialog-question.svg") ); vtexticonbox->addWidget(icon, 1, Qt::AlignLeft); QLabel *text = new QLabel(); - text->setText(QString(tr("Accept %1 from %2 ?")).arg(uname).arg(hname)); + text->setText(QString(tr("Accept user \"%1\" from host [%2]?")).arg(uname).arg(hname)); vtexticonbox->addWidget(text, 1, Qt::AlignLeft); hbox->addLayout(vtexticonbox); /* the check box (remember this setting for user X) */ - checkBox=new QCheckBox(QString(tr("Save selection for %1")).arg(uname),this); + checkBox=new QCheckBox(QString(tr("Remember selection for user \"%1\".")).arg(uname),this); hbox->addWidget(checkBox, 1, Qt::AlignLeft); /* dialog buttons */ diff --git a/debian/changelog b/debian/changelog index 1529988..1bb9bf5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,6 +25,7 @@ x2godesktopsharing (3.1.1.5-0x2go1) UNRELEASED; urgency=medium - Replace QMessageBox based access dialog by a QDialog based access dialog. QMessageBox in Qt5 is not suitable for adding a QCheckBox widget into it anymore. + - Rephrase notifications (we need a i18n run already anyway...). * debian/*: + Convert to DH packaging style. Build against Qt5. * debian/control: diff --git a/sharetray.cpp b/sharetray.cpp index 2889f27..9f62445 100644 --- a/sharetray.cpp +++ b/sharetray.cpp @@ -409,7 +409,7 @@ QString ShareTray::getSocketAnswer ( QString message ) QString remote_user=lst[10]; if ( getAccess ( remote_user, client ) ==QDialog::Accepted ) { - trayMessage ( tr ( "Access granted" ),QString ( tr ( "%1(%2): access granted" ) ).arg (remote_user ).arg ( client ) ); + trayMessage ( tr ( "Access granted" ),QString ( tr ( "User \"%1\" ([%2]): Access granted." ) ).arg (remote_user ).arg ( client ) ); //start agent QProcess proc ( this ); lst.removeAt ( 0 );; @@ -432,20 +432,20 @@ QString ShareTray::getSocketAnswer ( QString message ) qDebug() <<"agent pid: "<<pid; AccessAction *act=new AccessAction ( pid,remote_user,client, - QString ( tr ( "Disconnect %1(%2)" ) ).arg ( remote_user ).arg ( client ), + QString ( tr ( "Disconnect \"%1\" (on host [%2])" ) ).arg ( remote_user ).arg ( client ), this ); menu->insertAction ( menu->actions() [0],act ); connect ( act,SIGNAL ( actionActivated ( AccessAction* ) ),this, SLOT ( slotCloseConnection ( AccessAction* ) ) ); trayMessage ( tr ( "Remote connection" ), QString ( - tr ( "%1(%2) connected" ) ).arg ( remote_user ).arg ( client ) ); + tr ( "User \"%1\" ([%2]) is now connected." ) ).arg ( remote_user ).arg ( client ) ); setTrayIcon(); return output; } } trayMessage ( tr ( "Access denied" ),QString ( - tr ( "%1(%2): access denied" ) ).arg ( remote_user ).arg ( client ) ); + tr ( "User \"%1\" ([%2]): Access denied." ) ).arg ( remote_user ).arg ( client ) ); return "DENY access denied user"; } @@ -527,7 +527,7 @@ void ShareTray::slotTimer() { trayMessage ( tr ( "User disconnected" ), QString ( - tr ( "%1(%2) disconnected" ) ).arg ( + tr ( "User \"%1\" ([%2]) disconnected" ) ).arg ( action->user() ).arg ( action->host() ) ); menu->removeAction ( action ); delete action; -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2godesktopsharing.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2godesktopsharing. commit c6e890870564369a9ca4019c4f67cb4f035ed134 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Nov 12 16:08:48 2018 +0100 Add a soothing notification to the local user when the local user actively disconnects the remote user. --- debian/changelog | 2 ++ sharetray.cpp | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index 1bb9bf5..b728ab3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -26,6 +26,8 @@ x2godesktopsharing (3.1.1.5-0x2go1) UNRELEASED; urgency=medium QMessageBox in Qt5 is not suitable for adding a QCheckBox widget into it anymore. - Rephrase notifications (we need a i18n run already anyway...). + - Add a soothing notification to the local user when the local user actively + disconnects the remote user. * debian/*: + Convert to DH packaging style. Build against Qt5. * debian/control: diff --git a/sharetray.cpp b/sharetray.cpp index 9f62445..33841ec 100644 --- a/sharetray.cpp +++ b/sharetray.cpp @@ -468,6 +468,12 @@ void ShareTray::slotServerConnection() void ShareTray::slotCloseConnection ( AccessAction* action ) { kill ( action->pid().toUInt(),15 ); + + trayMessage ( tr ( "User has been disconnected" ), + QString ( + tr ( "User \"%1\" ([%2]) is now disconnected." ) ).arg ( + action->user() ).arg ( action->host() ) ); + menu->removeAction ( action ); delete action; setTrayIcon(); -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2godesktopsharing.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2godesktopsharing. commit 72e7eec2674e63189a7af8cf7b09eb114d25408a Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Nov 12 16:42:06 2018 +0100 Fix auto-accept and auto-deny based on whitelists and blacklist. Regression fix for Git commit ef3dfac2. --- debian/changelog | 2 ++ sharetray.cpp | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 098ba8b..19a176d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -30,6 +30,8 @@ x2godesktopsharing (3.1.1.5-0x2go1) UNRELEASED; urgency=medium disconnects the remote user. - Don't create empty parameters in .x2godesktopsharing/settings as '<param>=@Invalid()' but really as empty strings. + - Fix auto-accept and auto-deny based on whitelists and blacklist. + Regression fix for Git commit ef3dfac2. * debian/*: + Convert to DH packaging style. Build against Qt5. * debian/control: diff --git a/sharetray.cpp b/sharetray.cpp index 490f4b8..034e4cf 100644 --- a/sharetray.cpp +++ b/sharetray.cpp @@ -485,15 +485,15 @@ int ShareTray::getAccess ( QString remote_user, QString host ) // user preferences always supercede system-wide preferences if ( userWhiteList.contains ( remote_user ) ) - return QMessageBox::Yes; + return QDialog::Accepted; if ( userBlackList.contains ( remote_user ) ) - return QMessageBox::No; + return QDialog::Rejected; // system-wide preferences act as defaults for all users, but can be overriden by the user... if ( systemwideWhiteList.contains ( remote_user ) ) - return QMessageBox::Yes; + return QDialog::Accepted; if ( systemwideBlackList.contains ( remote_user ) ) - return QMessageBox::Yes; + return QDialog::Rejected; AccessWindow ad ( remote_user, host, this ); ad.raise(); -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2godesktopsharing.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2godesktopsharing. commit e39b50c551868ebd26dca1fa3f99d26300dceb91 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Nov 12 16:31:58 2018 +0100 Don't create empty parameters in .x2godesktopsharing/settings as '<param>=@Invalid()' but really as empty strings. --- debian/changelog | 2 ++ sharetray.cpp | 17 +++++++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index b728ab3..098ba8b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -28,6 +28,8 @@ x2godesktopsharing (3.1.1.5-0x2go1) UNRELEASED; urgency=medium - Rephrase notifications (we need a i18n run already anyway...). - Add a soothing notification to the local user when the local user actively disconnects the remote user. + - Don't create empty parameters in .x2godesktopsharing/settings as + '<param>=@Invalid()' but really as empty strings. * debian/*: + Convert to DH packaging style. Build against Qt5. * debian/control: diff --git a/sharetray.cpp b/sharetray.cpp index 33841ec..490f4b8 100644 --- a/sharetray.cpp +++ b/sharetray.cpp @@ -612,6 +612,9 @@ void ShareTray::loadSystemSettings() systemwideBlackList= st.value ( "blacklist" ).toStringList(); systemwideWhiteList= st.value ( "whitelist" ).toStringList(); + if ( ( systemwideBlackList.length() > 0 ) && ( systemwideBlackList[0] == "") ) systemwideBlackList.removeFirst(); + if ( ( systemwideWhiteList.length() > 0 ) && ( systemwideWhiteList[0] == "") ) systemwideWhiteList.removeFirst(); + /* the system-wide settings will be loaded on first usage and * copied into the user settings' "group" parameter and further-on * loaded from there... @@ -649,6 +652,9 @@ void ShareTray::loadUserSettings() userBlackList= st.value ( "blacklist" ).toStringList(); userWhiteList= st.value ( "whitelist" ).toStringList(); + if ( ( userBlackList.length() > 0 ) && ( userBlackList[0] == "") ) userBlackList.removeFirst(); + if ( ( userWhiteList.length() > 0 ) && ( userWhiteList[0] == "") ) userWhiteList.removeFirst(); + /* after first usage of x2godesktopsharing, the system-wide settings * get ignored, as they are always loaded */ @@ -674,8 +680,15 @@ void ShareTray::saveUserSettings() QSettings::NativeFormat ); st.setValue ( "group",sharingGroup ); - st.setValue ( "blacklist",userBlackList ); - st.setValue ( "whitelist",userWhiteList ); + if (userBlackList.length() > 0) + st.setValue ( "blacklist",userBlackList ); + else + st.setValue ( "blacklist", "" ); + + if (userWhiteList.length() > 0) + st.setValue ( "whitelist",userWhiteList ); + else + st.setValue ( "whitelist", "" ); } void ShareTray::setTrayIcon() -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2godesktopsharing.git
-
git-admin＠x2go.org