version Ok
This commit is contained in:
parent
a23ffb6bbe
commit
7546aedec2
@ -27,10 +27,11 @@ HEADERS += \
|
||||
tools.h
|
||||
|
||||
FORMS += \
|
||||
configuration.ui \
|
||||
mainwindow.ui
|
||||
|
||||
TRANSLATIONS += \
|
||||
languages/RsyncUI_fr_FR.ts
|
||||
languages/fr/RsyncUI_fr_FR.ts
|
||||
|
||||
INCLUDEPATH += \
|
||||
/usr/include/KF5
|
||||
|
122
configuration.ui
Normal file
122
configuration.ui
Normal file
@ -0,0 +1,122 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<ui version="4.0">
|
||||
<class>Configuration</class>
|
||||
<widget class="QDialog" name="Configuration">
|
||||
<property name="windowModality">
|
||||
<enum>Qt::WindowModal</enum>
|
||||
</property>
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>400</width>
|
||||
<height>300</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
<string>Configuration</string>
|
||||
</property>
|
||||
<widget class="QWidget" name="gridLayoutWidget">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>9</x>
|
||||
<y>9</y>
|
||||
<width>381</width>
|
||||
<height>251</height>
|
||||
</rect>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="gridLayout">
|
||||
<item row="0" column="1">
|
||||
<widget class="QSpinBox" name="spinBox">
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
||||
</property>
|
||||
<property name="maximum">
|
||||
<number>1024</number>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="0">
|
||||
<widget class="QLabel" name="label1">
|
||||
<property name="text">
|
||||
<string extracomment="Bandwidth limit">Bandwidth limit</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="2">
|
||||
<widget class="QComboBox" name="UnitCombobox">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string extracomment="Unit of bandwidth"/>
|
||||
</property>
|
||||
<property name="currentIndex">
|
||||
<number>-1</number>
|
||||
</property>
|
||||
<property name="maxVisibleItems">
|
||||
<number>5</number>
|
||||
</property>
|
||||
<property name="maxCount">
|
||||
<number>1024</number>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<widget class="QDialogButtonBox" name="buttonBox">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>70</x>
|
||||
<y>260</y>
|
||||
<width>321</width>
|
||||
<height>34</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="standardButtons">
|
||||
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
|
||||
</property>
|
||||
</widget>
|
||||
</widget>
|
||||
<resources/>
|
||||
<connections>
|
||||
<connection>
|
||||
<sender>buttonBox</sender>
|
||||
<signal>accepted()</signal>
|
||||
<receiver>Configuration</receiver>
|
||||
<slot>accept()</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel">
|
||||
<x>248</x>
|
||||
<y>254</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel">
|
||||
<x>157</x>
|
||||
<y>274</y>
|
||||
</hint>
|
||||
</hints>
|
||||
</connection>
|
||||
<connection>
|
||||
<sender>buttonBox</sender>
|
||||
<signal>rejected()</signal>
|
||||
<receiver>Configuration</receiver>
|
||||
<slot>reject()</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel">
|
||||
<x>316</x>
|
||||
<y>260</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel">
|
||||
<x>286</x>
|
||||
<y>274</y>
|
||||
</hint>
|
||||
</hints>
|
||||
</connection>
|
||||
</connections>
|
||||
</ui>
|
@ -41,16 +41,24 @@ void downloadFile::download(MainWindow *mw)
|
||||
vector<string> v;
|
||||
int value;
|
||||
char buffer[4096];
|
||||
|
||||
argv[0] = "/usr/bin/rsync";
|
||||
argv[1] = "--bwlimit=" + mw->connexion.bandwidthLimit;
|
||||
if (mw->connexion.bandwidthLimit == 0)
|
||||
{
|
||||
argv[1] = "--bwlimit=1000P";
|
||||
}else
|
||||
{
|
||||
output << mw->connexion.bandwidthLimit;
|
||||
argv[1] = "--bwlimit=" + output.str() + mw->connexion.bandwidthLimitUnit;
|
||||
}
|
||||
argv[2] = "--port=" + to_string(mw->connexion.port);
|
||||
argv[3] = "-P";
|
||||
argv[4] = mw->connexion.server + "::" + mw->downloading.service + "/" + mw->downloading.path;
|
||||
argv[5] = mw->downloading.savePath + "/";
|
||||
argv[6] = "";
|
||||
|
||||
//unique_ptr<FILE, decltype(&pclose)> pipe(popen(cmd "r"), pclose);
|
||||
//launching downloading thread
|
||||
FILE * fp = popen2(argv, "r", mw->downloading.pid);
|
||||
|
||||
if (!fp)
|
||||
{
|
||||
throw runtime_error("popen2() failed!");
|
||||
@ -64,7 +72,6 @@ void downloadFile::download(MainWindow *mw)
|
||||
return;
|
||||
}
|
||||
line = buffer;
|
||||
//cout << line << endl;
|
||||
pos = line.find('%');
|
||||
if (pos != -1)
|
||||
{
|
||||
@ -74,14 +81,14 @@ void downloadFile::download(MainWindow *mw)
|
||||
{
|
||||
line.erase(0, pos);
|
||||
value = stoi(line);
|
||||
//cout << value << endl;
|
||||
emit progressSignal(value);
|
||||
}
|
||||
}
|
||||
}
|
||||
pclose2(fp, mw->downloading.pid);
|
||||
|
||||
// ProgressBar to 100% and emit signal finished to main application
|
||||
emit progressSignal(100);
|
||||
emit finishedSignal(true);
|
||||
//cout << path << endl;
|
||||
}
|
||||
|
||||
|
@ -2,7 +2,9 @@
|
||||
#define DOWNLOADFILE_H
|
||||
|
||||
#include <QObject>
|
||||
//#include "ui_mainwindow.h"
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <cstdlib>
|
||||
|
||||
class MainWindow;
|
||||
|
||||
|
Binary file not shown.
190
languages/fr/RsyncUI_fr_FR.ts
Normal file
190
languages/fr/RsyncUI_fr_FR.ts
Normal file
@ -0,0 +1,190 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!DOCTYPE TS>
|
||||
<TS version="2.1" language="fr_FR">
|
||||
<context>
|
||||
<name>Configuration</name>
|
||||
<message>
|
||||
<location filename="../../configuration.ui" line="17"/>
|
||||
<source>Configuration</source>
|
||||
<translation>Configuration</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../configuration.ui" line="42"/>
|
||||
<source>Bandwidth limit</source>
|
||||
<extracomment>Bandwidth limit</extracomment>
|
||||
<translation>Limite de bande passante</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>MainWindow</name>
|
||||
<message>
|
||||
<location filename="../../mainwindow.ui" line="21"/>
|
||||
<source>MainWindow</source>
|
||||
<translation>Fenêtre principale</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../mainwindow.ui" line="80"/>
|
||||
<source>Server</source>
|
||||
<oldsource>Serveur</oldsource>
|
||||
<translation>Serveur</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../mainwindow.ui" line="112"/>
|
||||
<source>Port</source>
|
||||
<translation>Port</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../mainwindow.ui" line="168"/>
|
||||
<source>Connection</source>
|
||||
<translation>Connexion</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../mainwindow.ui" line="171"/>
|
||||
<source>Return</source>
|
||||
<translation>Retour</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../mainwindow.ui" line="294"/>
|
||||
<source>%p%</source>
|
||||
<extracomment>Downloading</extracomment>
|
||||
<translation>Téléchargement</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../mainwindow.ui" line="311"/>
|
||||
<location filename="../../mainwindow.ui" line="329"/>
|
||||
<source>Menu</source>
|
||||
<translation>Menu</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../mainwindow.ui" line="318"/>
|
||||
<source>help</source>
|
||||
<translation>Aide</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../mainwindow.ui" line="334"/>
|
||||
<location filename="../../mainwindow.ui" line="337"/>
|
||||
<source>Change save folder</source>
|
||||
<translation>Changer le dossier de destination</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Default save folder</source>
|
||||
<translation type="vanished">Dossier d'enregistrement</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../mainwindow.ui" line="342"/>
|
||||
<source>Bandwidth limit</source>
|
||||
<translation>Limite de bande passante</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../mainwindow.ui" line="347"/>
|
||||
<source>About</source>
|
||||
<translation>À propos</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../mainwindow.ui" line="352"/>
|
||||
<source>About Qt</source>
|
||||
<translation>À propos de Qt</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../mainwindow.ui" line="357"/>
|
||||
<source>Settings</source>
|
||||
<translation>Paramètres</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>debug</source>
|
||||
<translation type="vanished">debug</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../mainwindow.cpp" line="21"/>
|
||||
<source>Byte</source>
|
||||
<translation>Octet</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../mainwindow.cpp" line="21"/>
|
||||
<source>KB</source>
|
||||
<translation>Ko</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../mainwindow.cpp" line="21"/>
|
||||
<source>MB</source>
|
||||
<translation>Mo</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../mainwindow.cpp" line="21"/>
|
||||
<source>GB</source>
|
||||
<translation>Go</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../mainwindow.cpp" line="21"/>
|
||||
<source>TB</source>
|
||||
<translation>To</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../mainwindow.cpp" line="21"/>
|
||||
<location filename="../../mainwindow.cpp" line="517"/>
|
||||
<source>PB</source>
|
||||
<translation>Po</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../mainwindow.cpp" line="35"/>
|
||||
<source>Path</source>
|
||||
<translation>Chemin</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../mainwindow.cpp" line="35"/>
|
||||
<source>Size</source>
|
||||
<translation>Taille</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../mainwindow.cpp" line="68"/>
|
||||
<source>Exiting will stop downloading, and will clear the download queue.
|
||||
Do you want to exit ?</source>
|
||||
<translation>Soritr stoppera le téléchargement et effacera la file des téléchargements.
|
||||
Voulez-vous vraiment sortir du programme ?</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../mainwindow.cpp" line="297"/>
|
||||
<source>server does not exists</source>
|
||||
<translation>Le serveur n'existe pas</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../mainwindow.cpp" line="479"/>
|
||||
<source>Licence</source>
|
||||
<translation>License</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../mainwindow.cpp" line="480"/>
|
||||
<source>Author</source>
|
||||
<translation>Auteur</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../mainwindow.cpp" line="481"/>
|
||||
<source>EMail</source>
|
||||
<translation>Courriel</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../mainwindow.cpp" line="482"/>
|
||||
<source>Source code</source>
|
||||
<translation>Code source</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../mainwindow.cpp" line="495"/>
|
||||
<source>Choose directory to save file</source>
|
||||
<translation>Choisissez le dossier où enregistrer</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../mainwindow.cpp" line="413"/>
|
||||
<source>Do you want to stop downloading and delete this file from download queue ?</source>
|
||||
<translation>Vouslez-vous arrêter le téléchargement et enlever ce fichier de la file de téléchargement ?</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Client for rsync server</source>
|
||||
<translation type="vanished">Client pour serveur rsync</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../mainwindow.cpp" line="425"/>
|
||||
<source>Do you want to delete this file from download queue ?</source>
|
||||
<translation>Voulez-vous enlever ce fichier de la file de téléchargement ?</translation>
|
||||
</message>
|
||||
</context>
|
||||
</TS>
|
9
main.cpp
9
main.cpp
@ -4,21 +4,24 @@
|
||||
#include <KAboutData>
|
||||
#include <KDBusService>
|
||||
#include <QCommandLineParser>
|
||||
#include<QTranslator>
|
||||
#include <QTranslator>
|
||||
#include <QDialog>
|
||||
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
QApplication a(argc, argv);
|
||||
|
||||
QTranslator myappTranslator;
|
||||
|
||||
QLocale localeName = QLocale::system();
|
||||
QString localeFile = "./RsyncUI_" + localeName.name() + ".qm";
|
||||
QString localeFile = "usr/share/locale/" + localeName.name() + "LC_MESSAGES/RsyncUI_" + localeName.name() + ".qm";
|
||||
if (myappTranslator.load(localeFile))
|
||||
{
|
||||
a.installTranslator(&myappTranslator);
|
||||
}
|
||||
|
||||
MainWindow w;
|
||||
|
||||
w.show();
|
||||
return a.exec();
|
||||
}
|
||||
|
233
mainwindow.cpp
233
mainwindow.cpp
@ -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();
|
||||
}
|
||||
|
53
mainwindow.h
53
mainwindow.h
@ -1,15 +1,36 @@
|
||||
#ifndef MAINWINDOW_H
|
||||
#define MAINWINDOW_H
|
||||
|
||||
#include "ui_mainwindow.h"
|
||||
#include "ui_configuration.h"
|
||||
#include "downloadfile.h"
|
||||
#include "tools.h"
|
||||
#include <QMainWindow>
|
||||
#include <string>
|
||||
#include <QTreeWidgetItem>
|
||||
#include <QListWidgetItem>
|
||||
#include "downloadfile.h"
|
||||
#include <QProgressDialog>
|
||||
#include <QSettings>
|
||||
#include <vector>
|
||||
#include <iostream>
|
||||
#include <KTreeWidgetSearchLineWidget>
|
||||
#include <pstreams/pstream.h>
|
||||
#include <sstream>
|
||||
#include <cstring>
|
||||
#include <stdio.h>
|
||||
#include <cstdio>
|
||||
#include <QMessageBox>
|
||||
#include <boost/algorithm/string/replace.hpp>
|
||||
#include <QFuture>
|
||||
#include <qtconcurrentrun.h>
|
||||
#include <QFileDialog>
|
||||
#include <QThread>
|
||||
#include <QProgressDialog>
|
||||
#include <sys/wait.h>
|
||||
#include <QGuiApplication>
|
||||
#include <QShortcut>
|
||||
#include <QCloseEvent>
|
||||
#include <unistd.h>
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
namespace Ui { class MainWindow; }
|
||||
@ -18,7 +39,8 @@ QT_END_NAMESPACE
|
||||
class Connexion
|
||||
{
|
||||
public:
|
||||
std::string bandwidthLimit = "1M";
|
||||
int bandwidthLimit = 0;
|
||||
std::string bandwidthLimitUnit = "";
|
||||
std::string server;
|
||||
int port = 873;
|
||||
};
|
||||
@ -66,27 +88,22 @@ class MainWindow : public QMainWindow
|
||||
void startDownloading();
|
||||
void loadSettings();
|
||||
void saveSettings();
|
||||
void closeEvent (QCloseEvent *event);
|
||||
|
||||
Connexion connexion;
|
||||
Downloading downloading;
|
||||
downloadFile downloadO;
|
||||
QSettings settings;
|
||||
About about;
|
||||
|
||||
QDialog Configuration;
|
||||
Ui::Configuration config;
|
||||
std::vector <QString> serversList;
|
||||
|
||||
private slots:
|
||||
void on_khistorycombobox_returnPressed();
|
||||
|
||||
//void on_portEdit_userTextChanged();
|
||||
|
||||
void on_portEdit_returnPressed();
|
||||
|
||||
//void on_actionDownload_triggered();
|
||||
|
||||
void on_listWidget_clicked();
|
||||
|
||||
void on_treeWidget_itemDoubleClicked(QTreeWidgetItem *item);
|
||||
void on_treeWidget_itemClicked(QTreeWidgetItem *item);
|
||||
|
||||
void downloadFinished();
|
||||
|
||||
@ -102,15 +119,17 @@ class MainWindow : public QMainWindow
|
||||
|
||||
void on_DefaultSaveFolder_triggered();
|
||||
|
||||
void returnPressed();
|
||||
|
||||
void on_connectButton_clicked();
|
||||
|
||||
signals:
|
||||
void stopDownloading(int);
|
||||
void on_action_Settings_triggered();
|
||||
|
||||
|
||||
public slots:
|
||||
void on_buttonBox_accepted();
|
||||
|
||||
signals:
|
||||
void stopDownloading(int);
|
||||
// void accepted();
|
||||
};
|
||||
|
||||
|
||||
|
||||
#endif // MAINWINDOW_H
|
||||
|
@ -136,6 +136,9 @@
|
||||
<property name="inputMethodHints">
|
||||
<set>Qt::ImhPreferNumbers</set>
|
||||
</property>
|
||||
<property name="inputMask">
|
||||
<string/>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string comment="numéro"/>
|
||||
</property>
|
||||
@ -199,19 +202,6 @@
|
||||
</widget>
|
||||
<widget class="QWidget" name="layoutWidget">
|
||||
<layout class="QVBoxLayout" name="verticalLayout">
|
||||
<item>
|
||||
<widget class="KTreeWidgetSearchLine" name="ktreewidgetsearchline">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
|
||||
<horstretch>1</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="inputMethodHints">
|
||||
<set>Qt::ImhNoAutoUppercase</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QTreeWidget" name="treeWidget">
|
||||
<property name="sizePolicy">
|
||||
@ -266,6 +256,19 @@
|
||||
</column>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="KTreeWidgetSearchLine" name="ktreewidgetsearchline">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
|
||||
<horstretch>1</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="inputMethodHints">
|
||||
<set>Qt::ImhNoAutoUppercase</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</widget>
|
||||
@ -308,6 +311,7 @@
|
||||
<string>Menu</string>
|
||||
</property>
|
||||
<addaction name="DefaultSaveFolder"/>
|
||||
<addaction name="action_Settings"/>
|
||||
</widget>
|
||||
<widget class="QMenu" name="menuhelp">
|
||||
<property name="title">
|
||||
@ -327,10 +331,10 @@
|
||||
</action>
|
||||
<action name="DefaultSaveFolder">
|
||||
<property name="text">
|
||||
<string>Default save folder</string>
|
||||
<string>Change save folder</string>
|
||||
</property>
|
||||
<property name="iconText">
|
||||
<string>Default save folder</string>
|
||||
<string>Change save folder</string>
|
||||
</property>
|
||||
</action>
|
||||
<action name="actionBandwidth_limit">
|
||||
@ -348,6 +352,11 @@
|
||||
<string>About Qt</string>
|
||||
</property>
|
||||
</action>
|
||||
<action name="action_Settings">
|
||||
<property name="text">
|
||||
<string>Settings</string>
|
||||
</property>
|
||||
</action>
|
||||
</widget>
|
||||
<customwidgets>
|
||||
<customwidget>
|
||||
|
Loading…
Reference in New Issue
Block a user