version Ok
This commit is contained in:
+123
-110
@@ -1,32 +1,10 @@
|
||||
#include "mainwindow.h"
|
||||
#include "ui_mainwindow.h"
|
||||
#include "downloadfile.h"
|
||||
#include "tools.h"
|
||||
#include <iostream>
|
||||
#include <KTreeWidgetSearchLineWidget>
|
||||
#include <pstreams/pstream.h>
|
||||
#include <sstream>
|
||||
#include <string>
|
||||
#include <cstring>
|
||||
#include <iostream>
|
||||
#include <stdio.h>
|
||||
#include <cstdio>
|
||||
#include <QMessageBox>
|
||||
#include <vector>
|
||||
#include <boost/algorithm/string/replace.hpp>
|
||||
#include <QFuture>
|
||||
#include <QtConcurrent>
|
||||
#include <qtconcurrentrun.h>
|
||||
#include <QFileDialog>
|
||||
#include <QThread>
|
||||
#include <QProgressDialog>
|
||||
#include <sys/wait.h>
|
||||
#include <QGuiApplication>
|
||||
#include <QShortcut>
|
||||
|
||||
using namespace std;
|
||||
|
||||
bool display = false;
|
||||
extern QDialog Configuration;
|
||||
extern Ui::Configuration config;
|
||||
|
||||
MainWindow::MainWindow(QWidget *parent)
|
||||
: QMainWindow(parent)
|
||||
@@ -38,34 +16,50 @@ MainWindow::MainWindow(QWidget *parent)
|
||||
QCoreApplication::setApplicationName("RsyncUI");
|
||||
|
||||
// init shortcut
|
||||
|
||||
// QShortcut * shortcut = new QShortcut(QKeySequence("Return"), this);
|
||||
loadSettings();
|
||||
config.setupUi(&Configuration);
|
||||
config.UnitCombobox->addItems({tr("Byte"), tr("KB"), tr("MB"), tr("GB"), tr("TB"), tr("PB")});
|
||||
|
||||
// init of About
|
||||
this->about.description = tr(this->about.description.toStdString().c_str());
|
||||
|
||||
// connectors
|
||||
connect(&downloadO, &downloadFile::progressSignal, ui->progressBar, &QProgressBar::setValue);
|
||||
connect(&downloadO, &downloadFile::finishedSignal, this, &MainWindow::downloadFinished);
|
||||
connect(this, &MainWindow::stopDownloading, &downloadO, &downloadFile::cancelled);
|
||||
//connect(shortcut, SIGNAL(activated()), this, SLOT(returnPressed()));
|
||||
connect(config.buttonBox, SIGNAL(accepted()), this, SLOT(on_buttonBox_accepted()));
|
||||
|
||||
// init of widgets
|
||||
ui->ktreewidgetsearchline->setTreeWidget(ui->treeWidget);
|
||||
ui->ktreewidgetsearchline->setCaseSensitivity(Qt::CaseInsensitive);
|
||||
ui->treeWidget->setHeaderLabels({tr("Path"), tr("Size")} );
|
||||
if (this->settings.contains("connexion/lastServer"))
|
||||
{
|
||||
ui->portEdit->setText(this->settings.value("connexion/port").toString());
|
||||
ui->khistorycombobox->setCurrentText(this->settings.value("connexion/lastServer").toString());
|
||||
}else
|
||||
{
|
||||
ui->portEdit->text() = QString::number(this->connexion.port);
|
||||
ui->khistorycombobox->clear();
|
||||
}
|
||||
|
||||
|
||||
ui->progressBar->hide();
|
||||
|
||||
populateList();
|
||||
}
|
||||
|
||||
void MainWindow::returnPressed()
|
||||
{
|
||||
populateList();
|
||||
}
|
||||
|
||||
MainWindow::~MainWindow()
|
||||
{
|
||||
delete ui;
|
||||
}
|
||||
|
||||
void MainWindow::closeEvent (QCloseEvent *event)
|
||||
{
|
||||
QMessageBox::StandardButton reply;
|
||||
|
||||
saveSettings();
|
||||
|
||||
if (ui->listDownload->count() != 0)
|
||||
{
|
||||
reply = QMessageBox::question(
|
||||
@@ -74,17 +68,17 @@ MainWindow::~MainWindow()
|
||||
tr("Exiting will stop downloading, and will clear the download queue.\n Do you want to exit ?"),
|
||||
QMessageBox::Yes|QMessageBox::No,
|
||||
QMessageBox::No);
|
||||
if (reply == QMessageBox::Yes)
|
||||
if (reply == QMessageBox::No)
|
||||
{
|
||||
event->ignore();
|
||||
return;
|
||||
}else
|
||||
{
|
||||
emit (stopDownloading(this->downloading.pid));
|
||||
waitpid(this->downloading.pid, NULL, WUNTRACED);
|
||||
}
|
||||
}
|
||||
saveSettings();
|
||||
if (this->downloading.pid != 0)
|
||||
{
|
||||
waitpid(this->downloading.pid, NULL, WUNTRACED);
|
||||
}
|
||||
delete ui;
|
||||
event->accept();
|
||||
}
|
||||
|
||||
void MainWindow::populateTree()
|
||||
@@ -110,46 +104,49 @@ void MainWindow::populateList()
|
||||
stringstream ss;
|
||||
QString str;
|
||||
QString server;
|
||||
QString port;
|
||||
int port;
|
||||
|
||||
ui->listWidget->clear();
|
||||
server = ui->khistorycombobox->currentText();
|
||||
this->connexion.server.assign(server.toStdString());
|
||||
ss << ui->portEdit->text().toStdString();
|
||||
ss >> this->connexion.port;
|
||||
|
||||
this->settings.beginGroup("connexion/server");
|
||||
if (this->settings.contains(server))
|
||||
port = ui->portEdit->text().toUInt();
|
||||
if ((server.toStdString() != this->connexion.server) or (port != this->connexion.port))
|
||||
{
|
||||
port = this->settings.value(server).toString();
|
||||
ui->portEdit->setText(port);
|
||||
this->connexion.port = this->settings.value(server).toInt();
|
||||
}
|
||||
ui->listWidget->clear();
|
||||
this->connexion.server.assign(server.toStdString());
|
||||
this->connexion.port = port;
|
||||
|
||||
if (!server.isEmpty() and this->connexion.port > 0 and this->connexion.port < 65536)
|
||||
{
|
||||
if (validateServer(server.toStdString()))
|
||||
this->settings.beginGroup("connexion/server");
|
||||
if (this->settings.contains(server))
|
||||
{
|
||||
//this->settings.beginGroup("connexion/server");
|
||||
if (!this->settings.contains(server))
|
||||
{
|
||||
cout << server.toStdString() << endl;
|
||||
// storing serverURL and port in settings
|
||||
this->settings.setValue(server, this->connexion.port);
|
||||
this->settings.sync();
|
||||
|
||||
// storing in history of combobox
|
||||
ui->khistorycombobox->addToHistory(server);
|
||||
}
|
||||
// "waiting" cursor
|
||||
// load and display rsync services of the rsync server
|
||||
QGuiApplication::setOverrideCursor(Qt::WaitCursor);
|
||||
listServices();
|
||||
QGuiApplication::restoreOverrideCursor(); //setOverrideCursor(Qt::ArrowCursor);
|
||||
port = this->settings.value(server).toUInt();
|
||||
ui->portEdit->setText(QString::number(port));
|
||||
this->connexion.port = port;
|
||||
}
|
||||
|
||||
if (!server.isEmpty() and (port > 0 and port < 65536))
|
||||
{
|
||||
if (validateServer(server.toStdString()))
|
||||
{
|
||||
//this->settings.beginGroup("connexion/server");
|
||||
if (!this->settings.contains(server))
|
||||
{
|
||||
cout << server.toStdString() << endl;
|
||||
// storing serverURL and port in settings
|
||||
this->settings.setValue(server, port);
|
||||
this->settings.sync();
|
||||
|
||||
// storing in history of combobox
|
||||
ui->khistorycombobox->addToHistory(server);
|
||||
}
|
||||
// "waiting" cursor
|
||||
// load and display rsync services of the rsync server
|
||||
QGuiApplication::setOverrideCursor(Qt::WaitCursor);
|
||||
listServices();
|
||||
QGuiApplication::restoreOverrideCursor(); //setOverrideCursor(Qt::ArrowCursor);
|
||||
}
|
||||
}
|
||||
this->settings.endGroup();
|
||||
QGuiApplication::restoreOverrideCursor(); //setOverrideCursor(Qt::ArrowCursor);
|
||||
}
|
||||
this->settings.endGroup();
|
||||
QGuiApplication::restoreOverrideCursor(); //setOverrideCursor(Qt::ArrowCursor);
|
||||
}
|
||||
|
||||
void MainWindow::listServices()
|
||||
@@ -164,7 +161,6 @@ void MainWindow::listServices()
|
||||
redi::ipstream in(cmd, redi::pstreams::pstdout | redi::pstreams::pstderr);
|
||||
while (getline(in.out(), line))
|
||||
{
|
||||
//cout << "stdout: " << line << endl;
|
||||
boost::replace_all(line," ","");
|
||||
boost::replace_all(line, "\t", " - ");
|
||||
v = explode(line, ' ', 3 );
|
||||
@@ -310,24 +306,14 @@ void MainWindow::displayTree()
|
||||
|
||||
}
|
||||
|
||||
void MainWindow::on_khistorycombobox_returnPressed()
|
||||
{
|
||||
//populateList();
|
||||
}
|
||||
|
||||
void MainWindow::on_khistorycombobox_currentIndexChanged(int i)
|
||||
{
|
||||
populateList();
|
||||
}
|
||||
|
||||
void MainWindow::on_portEdit_returnPressed()
|
||||
{
|
||||
//populateList();
|
||||
on_connectButton_clicked();
|
||||
}
|
||||
|
||||
void MainWindow::on_connectButton_clicked()
|
||||
{
|
||||
populateList();
|
||||
populateList();
|
||||
}
|
||||
|
||||
QTreeWidgetItem * MainWindow::addTreeRoot(QString name, QString fileSize)
|
||||
@@ -363,7 +349,7 @@ void MainWindow::on_listWidget_clicked()
|
||||
populateTree();
|
||||
}
|
||||
|
||||
void MainWindow::on_treeWidget_itemDoubleClicked(QTreeWidgetItem *item)
|
||||
void MainWindow::on_treeWidget_itemClicked(QTreeWidgetItem *item)
|
||||
{
|
||||
QFuture<void> future;
|
||||
QFileDialog dialog;
|
||||
@@ -374,24 +360,15 @@ void MainWindow::on_treeWidget_itemDoubleClicked(QTreeWidgetItem *item)
|
||||
{
|
||||
item = item->parent();
|
||||
this->downloading.path = item->text(0).toStdString() + "/" + this->downloading.path;
|
||||
|
||||
};
|
||||
|
||||
//dirPath.append("/Vidéos/");
|
||||
if (this->downloading.savePath.empty())
|
||||
{
|
||||
if (this->downloading.dirPath.toStdString().empty())
|
||||
{
|
||||
this->downloading.dirPath = getenv("HOME");
|
||||
}
|
||||
if (this->downloading.savePath.empty())
|
||||
{
|
||||
on_DefaultSaveFolder_triggered();
|
||||
}
|
||||
if (!this->downloading.savePath.empty() && this->downloading.pid == 0)
|
||||
{
|
||||
startDownloading();
|
||||
}
|
||||
on_DefaultSaveFolder_triggered();
|
||||
}
|
||||
if (!this->downloading.savePath.empty() && this->downloading.pid == 0)
|
||||
{
|
||||
startDownloading();
|
||||
}
|
||||
ui->listDownload->addItem(QString::fromStdString(this->downloading.path));
|
||||
}
|
||||
@@ -458,21 +435,29 @@ void MainWindow::on_listDownload_itemClicked(QListWidgetItem *item)
|
||||
|
||||
void MainWindow::loadSettings()
|
||||
{
|
||||
// restoring geometry and state of wondow and widgets
|
||||
this->restoreGeometry(settings.value("window/geometry").toByteArray());
|
||||
this->restoreState(settings.value("window/state").toByteArray());
|
||||
ui->treeWidget->header()->restoreState(settings.value("treeView/state").toByteArray());
|
||||
ui->splitter->restoreState(settings.value("splitter/state").toByteArray());
|
||||
ui->splitter_2->restoreState(settings.value("splitter2/state").toByteArray());
|
||||
|
||||
// loading connexion settings
|
||||
// loading servers history
|
||||
this->settings.beginGroup("connexion/server");
|
||||
|
||||
QStringList servers = this->settings.allKeys();
|
||||
this->settings.endGroup();
|
||||
this->downloading.dirPath = this->settings.value("Folder").toString();
|
||||
for( const QString &server : servers )
|
||||
{
|
||||
ui->khistorycombobox->addToHistory(server);
|
||||
}
|
||||
|
||||
// loading save path
|
||||
this->downloading.savePath = this->settings.value("Folder").toString().toStdString();
|
||||
|
||||
// loading bandwidth limit
|
||||
this->connexion.bandwidthLimit = this->settings.value("bandwidthlimit").toUInt();
|
||||
this->connexion.bandwidthLimitUnit = this->settings.value("bandwidthlimitunit").toString().toStdString();
|
||||
}
|
||||
|
||||
|
||||
@@ -480,21 +465,21 @@ void MainWindow::saveSettings()
|
||||
{
|
||||
this->settings.setValue("window/geometry", saveGeometry());
|
||||
this->settings.setValue("window/state", saveState());
|
||||
//ui->treeWidget->header()->saveState();
|
||||
this->settings.setValue("treeView/state", ui->treeWidget->header()->saveState());
|
||||
this->settings.setValue("splitter/state", ui->splitter->saveState());
|
||||
this->settings.setValue("splitter2/state", ui->splitter_2->saveState());
|
||||
|
||||
this->settings.setValue("connexion/lastServer", QString::fromStdString(this->connexion.server));
|
||||
this->settings.setValue("connexion/lastPort", QString::number(this->connexion.port));
|
||||
this->settings.sync();
|
||||
}
|
||||
|
||||
void MainWindow::on_actionAbout_triggered()
|
||||
{
|
||||
QString text = this->about.description + "\n\n" +
|
||||
"Licence: " + this->about.licence + "\n" +
|
||||
"Author: " + this->about.author + "\n" +
|
||||
"EMail : " + this->about.email + "\n" +
|
||||
"Source code: " + this->about.git;
|
||||
tr("Licence" ) + ": " + this->about.licence + "\n" +
|
||||
tr("Author") + ": " + this->about.author + "\n" +
|
||||
tr("EMail") + ": " + this->about.email + "\n" +
|
||||
tr("Source code") + ": " + this->about.git;
|
||||
QMessageBox::about(this, this->about.title, text);
|
||||
}
|
||||
|
||||
@@ -508,6 +493,34 @@ void MainWindow::on_DefaultSaveFolder_triggered()
|
||||
QFileDialog dialog;
|
||||
|
||||
this->downloading.savePath = dialog.getExistingDirectory(this, tr("Choose directory to save file"), this->downloading.dirPath, QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks).toStdString();
|
||||
this->downloading.dirPath = this->downloading.savePath.c_str();
|
||||
this->settings.setValue("Folder/", this->downloading.dirPath);
|
||||
// this->downloading.dirPath = this->downloading.savePath.c_str();
|
||||
this->settings.setValue("Folder/", this->downloading.savePath.c_str());
|
||||
this->settings.sync();
|
||||
}
|
||||
|
||||
void MainWindow::on_action_Settings_triggered()
|
||||
{
|
||||
config.UnitCombobox->setCurrentText(QString::fromStdString(this->connexion.bandwidthLimitUnit));
|
||||
config.spinBox->setValue(this->connexion.bandwidthLimit);
|
||||
Configuration.show();
|
||||
}
|
||||
|
||||
void MainWindow::on_buttonBox_accepted()
|
||||
{
|
||||
QString unit;
|
||||
QString bw;
|
||||
|
||||
bw = config.spinBox->text();
|
||||
if (bw.toInt() == 0)
|
||||
{
|
||||
this->connexion.bandwidthLimit = 1000;
|
||||
this->connexion.bandwidthLimitUnit = tr("PB").toStdString();
|
||||
}else
|
||||
{
|
||||
this->connexion.bandwidthLimit = config.spinBox->value();
|
||||
this->connexion.bandwidthLimitUnit = config.UnitCombobox->currentText().toStdString();
|
||||
}
|
||||
this->settings.setValue("bandwidthlimit", this->connexion.bandwidthLimit);
|
||||
this->settings.setValue("bandwidthlimitunit", this->connexion.bandwidthLimitUnit.c_str());
|
||||
this->settings.sync();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user