diff --git a/src/Lib/client.cpp b/src/Lib/client.cpp
index 1f1685c..5d9bd23 100755
--- a/src/Lib/client.cpp
+++ b/src/Lib/client.cpp
@@ -158,12 +158,12 @@ void lc::Client::OpenTerminal( const QString &argCommand, const bool &argOpenAsR
arguments = new QStringList;
if ( !argOpenAsRoot ) {
*arguments << "-e"
- << QString{ "'" + settings->sshCmd + " -i " + settings->pkeyPathUser + " "
- + settings->userNameOnClients + "@" + ip + "'"};
+ << QString{ settings->sshCmd + " -i " + settings->pkeyPathUser + " "
+ + settings->userNameOnClients + "@" + ip };
} else {
*arguments << "-e" <<
- QString{ "'" + settings->sshCmd + " -i " + settings->pkeyPathRoot
- + " " + "root@" + ip + "'"};
+ QString{ settings->sshCmd + " -i " + settings->pkeyPathRoot
+ + " " + "root@" + ip};
}
if ( !argCommand.isEmpty() ) {
diff --git a/src/Lib/settings.h b/src/Lib/settings.h
index b2851f4..edc6023 100755
--- a/src/Lib/settings.h
+++ b/src/Lib/settings.h
@@ -48,6 +48,7 @@ public:
const int defaultReceiptIndex = 0;
const QString browserCmd;
+ const QString clientBrowserCmd;
const QString dvipsCmd;
const QString fileMngr;
const QString killallCmd;
@@ -84,7 +85,6 @@ public:
const QStringList installedLaTeXHeaders;
const QStringList installedZTreeVersions;
const quint16 clientHelpNotificationServerPort = 0;
- const QString clientBrowserCmd;
private:
static bool CheckPathAndComplain( const QString &argPath, const QString &argVariableName,
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index ea14205..816eb75 100755
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -429,6 +429,7 @@ void lc::MainWindow::on_PBOpenFilesystem_clicked() {
delete userToBeUsed;
}
+// Issue open terminal call
void lc::MainWindow::on_PBOpenTerminal_clicked() {
QString pkeyPathUser;
if ( ui->RBUseUserRoot->isChecked() ) {
@@ -816,6 +817,20 @@ void lc::MainWindow::GetNewDataTargetPath() {
}
}
+// Dummy function for enabling anonymous receipts section in UI
+void lc::MainWindow::on_CBReceiptsHeader_activated(int argIndex)
+{
+ Q_UNUSED( argIndex );
+ ui->CBReceiptsHeader->setStyleSheet( "" );
+}
+
+// Anonymous receipients header check box
+void lc::MainWindow::on_ChBPrintanonymousreceipts_clicked()
+{
+ ui->LReplaceParticipantNames->setEnabled(true);
+ ui->CBReplaceParticipantNames->setEnabled(true);
+}
+
// Start session button actions
void lc::MainWindow::on_PBStartSession_clicked() {
@@ -875,15 +890,13 @@ void lc::MainWindow::on_PBStartSession_clicked() {
ui->SBPort->setValue(newPort);
}
-// Anonymous receipients header check box
-void lc::MainWindow::on_ChBPrintanonymousreceipts_clicked()
+void lc::MainWindow::on_PBKillzLeaf_clicked()
{
- ui->LReplaceParticipantNames->setEnabled(true);
- ui->CBReplaceParticipantNames->setEnabled(true);
-}
-
-void lc::MainWindow::on_CBReceiptsHeader_activated(int argIndex)
-{
- Q_UNUSED( argIndex );
- ui->CBReceiptsHeader->setStyleSheet( "" );
+ QModelIndexList activated_items = ui->TVClients->selectionModel()->selectedIndexes();
+ for ( QModelIndexList::ConstIterator it = activated_items.cbegin(); it != activated_items.cend(); ++it ) {
+ if ( ( *it ).data( Qt::DisplayRole ).type() != 0 ) {
+ Client *client = static_cast< Client* >( ( *it ).data( Qt::UserRole ).value< void * >() );
+ client->KillZLeaf();
+ }
+ }
}
diff --git a/src/mainwindow.h b/src/mainwindow.h
index 9b8c210..154afef 100755
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -128,6 +128,7 @@ private slots:
void on_CBDataTargetPath_activated( int argIndex );
void on_CBReceiptsHeader_activated(int argIndex);
void on_ChBPrintanonymousreceipts_clicked();
+ void on_PBKillzLeaf_clicked();
};
}
diff --git a/src/mainwindow.ui b/src/mainwindow.ui
index d283eba..6be33ee 100755
--- a/src/mainwindow.ui
+++ b/src/mainwindow.ui
@@ -64,7 +64,7 @@
- 1
+ 2
true
@@ -1075,7 +1075,7 @@
false
- true
+ false
true
@@ -1090,7 +1090,7 @@
false
- true
+ false
35