Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 1fa3ec00bc | |||
| b19f545958 | |||
| f882ca5e42 | |||
| c811f3db4f | |||
| fc4f896d86 |
@ -24,6 +24,7 @@ SOURCES += \
|
||||
tools.cpp
|
||||
|
||||
HEADERS += \
|
||||
version.h\
|
||||
downloadfile.h \
|
||||
mainwindow.h \
|
||||
password.h \
|
||||
|
||||
131
RsyncUI.pro.user
131
RsyncUI.pro.user
@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE QtCreatorProject>
|
||||
<!-- Written by QtCreator 9.0.1, 2023-03-18T12:45:23. -->
|
||||
<!-- Written by QtCreator 9.0.1, 2023-05-01T14:24:07. -->
|
||||
<qtcreator>
|
||||
<data>
|
||||
<variable>EnvironmentId</variable>
|
||||
@ -40,7 +40,7 @@
|
||||
<value type="bool" key="EditorConfiguration.PreferSingleLineComments">false</value>
|
||||
<value type="bool" key="EditorConfiguration.ScrollWheelZooming">true</value>
|
||||
<value type="bool" key="EditorConfiguration.ShowMargin">false</value>
|
||||
<value type="int" key="EditorConfiguration.SmartBackspaceBehavior">1</value>
|
||||
<value type="int" key="EditorConfiguration.SmartBackspaceBehavior">0</value>
|
||||
<value type="bool" key="EditorConfiguration.SmartSelectionChanging">true</value>
|
||||
<value type="bool" key="EditorConfiguration.SpacesForTabs">true</value>
|
||||
<value type="int" key="EditorConfiguration.TabKeyBehavior">0</value>
|
||||
@ -52,7 +52,7 @@
|
||||
<value type="bool" key="EditorConfiguration.cleanIndentation">true</value>
|
||||
<value type="bool" key="EditorConfiguration.cleanWhitespace">true</value>
|
||||
<value type="QString" key="EditorConfiguration.ignoreFileTypes">*.md, *.MD, Makefile</value>
|
||||
<value type="bool" key="EditorConfiguration.inEntireDocument">true</value>
|
||||
<value type="bool" key="EditorConfiguration.inEntireDocument">false</value>
|
||||
<value type="bool" key="EditorConfiguration.skipTrailingWhitespace">true</value>
|
||||
<value type="bool" key="EditorConfiguration.tintMarginArea">true</value>
|
||||
</valuemap>
|
||||
@ -71,6 +71,9 @@
|
||||
<valuemap type="QVariantMap" key="AutoTest.CheckStates"/>
|
||||
<value type="int" key="AutoTest.RunAfterBuild">0</value>
|
||||
<value type="bool" key="AutoTest.UseGlobal">true</value>
|
||||
<valuelist type="QVariantList" key="ClangCodeModel.CustomCommandLineKey"/>
|
||||
<value type="bool" key="ClangCodeModel.UseGlobalConfig">true</value>
|
||||
<value type="QString" key="ClangCodeModel.WarningConfigId">Builtin.Questionable</value>
|
||||
<valuemap type="QVariantMap" key="ClangTools">
|
||||
<value type="bool" key="ClangTools.AnalyzeOpenFiles">true</value>
|
||||
<value type="bool" key="ClangTools.BuildBeforeAnalysis">true</value>
|
||||
@ -81,61 +84,24 @@
|
||||
<valuelist type="QVariantList" key="ClangTools.SuppressedDiagnostics"/>
|
||||
<value type="bool" key="ClangTools.UseGlobalSettings">true</value>
|
||||
</valuemap>
|
||||
<valuemap type="QVariantMap" key="CppEditor.QuickFix">
|
||||
<value type="bool" key="UseGlobalSettings">true</value>
|
||||
</valuemap>
|
||||
</valuemap>
|
||||
</data>
|
||||
<data>
|
||||
<variable>ProjectExplorer.Project.Target.0</variable>
|
||||
<valuemap type="QVariantMap">
|
||||
<value type="QString" key="DeviceType">Desktop</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{893f9ca6-0efa-4c08-a4a6-5a818f60a8a0}</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Qt 5.15.7 (qt5)</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Qt 5.15.7 (qt5)</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{a8a6d767-5e05-45c7-b70b-532f99112b6a}</value>
|
||||
<value type="qlonglong" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
|
||||
<value type="qlonglong" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
|
||||
<value type="qlonglong" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
|
||||
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
|
||||
<value type="int" key="EnableQmlDebugging">0</value>
|
||||
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/daniel/develop/RsyncUI6/../build-RsyncUI6-Desktop-Debug</value>
|
||||
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">/home/daniel/develop/build-RsyncUI6-Desktop-Debug</value>
|
||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
|
||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
|
||||
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
|
||||
<value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
|
||||
<valuelist type="QVariantList" key="QtProjectManager.QMakeBuildStep.SelectedAbis"/>
|
||||
</valuemap>
|
||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
|
||||
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
|
||||
</valuemap>
|
||||
<value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
|
||||
</valuemap>
|
||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
|
||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
|
||||
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
|
||||
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
|
||||
</valuemap>
|
||||
<value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
|
||||
</valuemap>
|
||||
<value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
|
||||
<value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
|
||||
<valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.CustomParsers"/>
|
||||
<value type="bool" key="ProjectExplorer.BuildConfiguration.ParseStandardOutput">false</value>
|
||||
<valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Debug</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
|
||||
<value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value>
|
||||
</valuemap>
|
||||
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1">
|
||||
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/daniel/develop/RsyncUI6/../build-RsyncUI6-Desktop-Release</value>
|
||||
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">/home/daniel/develop/build-RsyncUI6-Desktop-Release</value>
|
||||
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/daniel/develop/RsyncUI</value>
|
||||
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">/home/daniel/develop/RsyncUI</value>
|
||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
|
||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
|
||||
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
|
||||
@ -171,51 +137,8 @@
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Release</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
|
||||
<value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
|
||||
<value type="int" key="QtQuickCompiler">0</value>
|
||||
</valuemap>
|
||||
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.2">
|
||||
<value type="int" key="EnableQmlDebugging">0</value>
|
||||
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/daniel/develop/RsyncUI6/../build-RsyncUI6-Desktop-Profile</value>
|
||||
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">/home/daniel/develop/build-RsyncUI6-Desktop-Profile</value>
|
||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
|
||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
|
||||
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
|
||||
<value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
|
||||
<valuelist type="QVariantList" key="QtProjectManager.QMakeBuildStep.SelectedAbis"/>
|
||||
</valuemap>
|
||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
|
||||
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
|
||||
</valuemap>
|
||||
<value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
|
||||
</valuemap>
|
||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
|
||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
|
||||
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
|
||||
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
|
||||
</valuemap>
|
||||
<value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
|
||||
</valuemap>
|
||||
<value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
|
||||
<value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
|
||||
<valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.CustomParsers"/>
|
||||
<value type="bool" key="ProjectExplorer.BuildConfiguration.ParseStandardOutput">false</value>
|
||||
<valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Profile</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
|
||||
<value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
|
||||
<value type="int" key="QtQuickCompiler">0</value>
|
||||
<value type="int" key="SeparateDebugInfo">0</value>
|
||||
</valuemap>
|
||||
<value type="qlonglong" key="ProjectExplorer.Target.BuildConfigurationCount">3</value>
|
||||
<value type="qlonglong" key="ProjectExplorer.Target.BuildConfigurationCount">1</value>
|
||||
<valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
|
||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
|
||||
<value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">0</value>
|
||||
@ -233,34 +156,18 @@
|
||||
<value type="bool" key="Analyzer.Perf.Settings.UseGlobalSettings">true</value>
|
||||
<value type="bool" key="Analyzer.QmlProfiler.Settings.UseGlobalSettings">true</value>
|
||||
<value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value>
|
||||
<valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
|
||||
<value type="QString">0</value>
|
||||
<value type="QString">1</value>
|
||||
<value type="QString">2</value>
|
||||
<value type="QString">3</value>
|
||||
<value type="QString">4</value>
|
||||
<value type="QString">5</value>
|
||||
<value type="QString">6</value>
|
||||
<value type="QString">7</value>
|
||||
<value type="QString">8</value>
|
||||
<value type="QString">9</value>
|
||||
<value type="QString">10</value>
|
||||
<value type="QString">11</value>
|
||||
<value type="QString">12</value>
|
||||
<value type="QString">13</value>
|
||||
<value type="QString">14</value>
|
||||
</valuelist>
|
||||
<valuelist type="QVariantList" key="CustomOutputParsers"/>
|
||||
<value type="int" key="PE.EnvironmentAspect.Base">2</value>
|
||||
<valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:/home/daniel/develop/RsyncUI6/RsyncUI6.pro</value>
|
||||
<value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey">/home/daniel/develop/RsyncUI6/RsyncUI6.pro</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">RsyncUI</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:/home/daniel/develop/RsyncUI/RsyncUI.pro</value>
|
||||
<value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey">/home/daniel/develop/RsyncUI/RsyncUI.pro</value>
|
||||
<value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
|
||||
<value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
|
||||
<value type="bool" key="RunConfiguration.UseLibrarySearchPath">true</value>
|
||||
<value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
|
||||
<value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
|
||||
<value type="QString" key="RunConfiguration.WorkingDirectory.default">/home/daniel/develop/build-RsyncUI6-Desktop-Debug</value>
|
||||
<value type="QString" key="RunConfiguration.WorkingDirectory.default">/home/daniel/develop/RsyncUI</value>
|
||||
</valuemap>
|
||||
<value type="qlonglong" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
|
||||
</valuemap>
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
Name: rsyncui
|
||||
Summary: Client for rsync server
|
||||
Version: 2.11.5
|
||||
Version: 2.11.8
|
||||
Release: %mkrel 1
|
||||
License: GPLv3
|
||||
Group: Networking/Remote access
|
||||
|
||||
@ -67,7 +67,6 @@ void MainWindow::download()
|
||||
//connect(this->downloading.process, SIGNAL(errorOccurred(QProcess::ProcessError error)), this, SLOT(downloadProcessError(QProcess::ProcessError error)));
|
||||
//connect(this->downloading.process, SIGNAL(readyReadStandardError()), this, SLOT(downloadProcessStderr()));
|
||||
connect(this->downloading.process, SIGNAL(readyReadStandardOutput()), this, SLOT(readRsyncOutput()));
|
||||
|
||||
this->downloading.process->start(cmd, param);
|
||||
}
|
||||
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
#include "mainwindow.h"
|
||||
#include <QComboBox>
|
||||
#include <QTextBlock>
|
||||
#include "version.h"
|
||||
|
||||
using namespace std;
|
||||
|
||||
@ -50,8 +51,9 @@ MainWindow::MainWindow(QWidget *parent)
|
||||
AboutW.setupUi(&aboutDialog);
|
||||
|
||||
// text of About
|
||||
this->about.version = version;
|
||||
QString aboutText = tr("<h2>Client for rsync server</h2>") +
|
||||
"<b>" + tr("Version") + ": " + this->about.version + "</b><br>" +
|
||||
"<b>" + tr("Version") + ": " + version + "</b><br>" +
|
||||
"<b>" + tr("Licence") + ": " + this->about.licence + "</b><br>" +
|
||||
"<b>" + tr("Author") + ": " + this->about.author + "</b><br>" +
|
||||
"<b>" + tr("EMail") + ": " + this->about.email + "</b><br>" +
|
||||
@ -240,12 +242,13 @@ void MainWindow::quitApp()
|
||||
void MainWindow::closeEvent (QCloseEvent *event)
|
||||
{
|
||||
QMessageBox msgBox;
|
||||
QCheckBox *cb = new QCheckBox("Don't show this again ?");
|
||||
QCheckBox *cb;
|
||||
|
||||
if (!event->spontaneous() || !isVisible())
|
||||
return;
|
||||
if (trayIcon->isVisible() and this->settings.value("CloseCheckbox").toBool() == false)
|
||||
{
|
||||
cb = new QCheckBox("Don't show this again ?");
|
||||
msgBox.setWindowTitle(a.applicationName());
|
||||
msgBox.setInformativeText(tr("The program will keep running in the "
|
||||
"system tray. To terminate the program, "
|
||||
@ -482,6 +485,7 @@ bool MainWindow::scanDir(QString server, int portN, QTreeWidgetItem *parent, QSt
|
||||
QString filename;
|
||||
QString fileType;
|
||||
QString date;
|
||||
QString dirName = "";
|
||||
QProcess * myProcess;
|
||||
QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
|
||||
bool isDir = false;
|
||||
@ -491,6 +495,7 @@ bool MainWindow::scanDir(QString server, int portN, QTreeWidgetItem *parent, QSt
|
||||
int nChild = 0;
|
||||
bool r;
|
||||
static uint looping;
|
||||
QStringList dirs;
|
||||
|
||||
myProcess = new QProcess(this);
|
||||
myProcess->setProcessChannelMode(QProcess::MergedChannels);
|
||||
@ -554,7 +559,7 @@ bool MainWindow::scanDir(QString server, int portN, QTreeWidgetItem *parent, QSt
|
||||
return false;
|
||||
}
|
||||
|
||||
// extracting name, size and if is dir/file
|
||||
// extracting name, size and is dir/file
|
||||
line = line.simplified();
|
||||
filename = line.section(" ", 4);
|
||||
if (filename != '.')
|
||||
@ -567,8 +572,8 @@ bool MainWindow::scanDir(QString server, int portN, QTreeWidgetItem *parent, QSt
|
||||
{
|
||||
size = sizeA.at(0) + " " + UnitText[0] + " ";
|
||||
}else
|
||||
{ myProcess->setProcessEnvironment(env);
|
||||
|
||||
{
|
||||
myProcess->setProcessEnvironment(env);
|
||||
size = sizeA.at(0) + "," + sizeA.at(1).left(2) + " " + UnitText[sizeA.count()-1] + " ";
|
||||
}
|
||||
|
||||
@ -579,9 +584,19 @@ bool MainWindow::scanDir(QString server, int portN, QTreeWidgetItem *parent, QSt
|
||||
{
|
||||
isDir = false;
|
||||
}
|
||||
|
||||
date = line.section(' ', 2, 2);
|
||||
fileType = getFileType(filename);
|
||||
addTreeItem(filename, size, fullsize, fileType, date, isDir, parent);
|
||||
if (!path.isEmpty())
|
||||
{
|
||||
if (path.endsWith('/'))
|
||||
{
|
||||
path.chop(1);
|
||||
}
|
||||
dirs = path.split('/');
|
||||
dirName = dirs[dirs.size()-1];
|
||||
}
|
||||
addTreeItem(filename, size, fullsize, fileType, date, isDir, dirName, parent);
|
||||
if (passwdOk == false and !this->connexion.password.isEmpty())
|
||||
{
|
||||
this->settings.setValue("Passwords/" + this->connexion.server + "/" + this->connexion.service + "/" + this->connexion.user, true);
|
||||
@ -708,9 +723,9 @@ void MainWindow::on_connectButton_clicked()
|
||||
}
|
||||
|
||||
// add parent in treeview
|
||||
void MainWindow::addTreeItem(QString name, QString fileSize, QString fullsize, QString type, QString date, bool isDir=false, QTreeWidgetItem *parent=nullptr)
|
||||
void MainWindow::addTreeItem(QString name, QString fileSize, QString fullsize, QString type, QString date, bool isDir=false, QString dirName="", QTreeWidgetItem *parent=nullptr)
|
||||
{
|
||||
QFont * font = new QFont();
|
||||
QFont font;
|
||||
|
||||
QTreeWidgetItem *treeItem;
|
||||
if (parent != nullptr)
|
||||
@ -720,30 +735,29 @@ void MainWindow::addTreeItem(QString name, QString fileSize, QString fullsize, Q
|
||||
{
|
||||
treeItem = new QTreeWidgetItem(ui->treeWidget);
|
||||
}
|
||||
|
||||
// item is a file
|
||||
if (QFile::exists(this->downloading.savePath + "/" + name) or QFile::exists(this->downloading.savePath + "/" + dirName + "/" + name))
|
||||
{
|
||||
QBrush b (Qt::green);
|
||||
treeItem->setForeground(0, b);
|
||||
treeItem->setFont(0, font);
|
||||
}else if (this->settings.contains(name))
|
||||
{
|
||||
QBrush b (Qt::red);
|
||||
treeItem->setForeground(0, b);
|
||||
treeItem->setFont(0, font);
|
||||
}
|
||||
|
||||
if (isDir == true)
|
||||
{
|
||||
// item is a dir
|
||||
treeItem->setText(1, tr("Dir"));
|
||||
treeItem->setIcon(0, QIcon::fromTheme("folder"));
|
||||
}else
|
||||
{
|
||||
// item is a file
|
||||
if (QFile::exists(this->downloading.savePath + "/" + name))
|
||||
{
|
||||
QBrush b (Qt::green);
|
||||
treeItem->setForeground(0, b);
|
||||
treeItem->setFont(0, *font);
|
||||
}else
|
||||
{
|
||||
this->settings.beginGroup("Downloaded/");
|
||||
if (this->settings.contains(name))
|
||||
{
|
||||
QBrush b (Qt::red);
|
||||
treeItem->setForeground(0, b);
|
||||
treeItem->setFont(0, *font);
|
||||
}
|
||||
this->settings.endGroup();
|
||||
}
|
||||
treeItem->setText(1,type);
|
||||
}
|
||||
treeItem->setText(0, name);
|
||||
@ -1077,6 +1091,7 @@ void MainWindow::downloadFinished(int exitCode, QProcess::ExitStatus exitStatus)
|
||||
pos = path.lastIndexOf(" => ");
|
||||
this->downloading.server = path.midRef(pos+4).toString();
|
||||
path.resize(pos);
|
||||
this->downloading.port = this->settings.value("connexion/server/" + this->downloading.server).toInt();
|
||||
this->downloading.path = path;
|
||||
|
||||
//getUserPassword(true);
|
||||
@ -1398,3 +1413,4 @@ void MainWindow::on_actionHiddenService_triggered()
|
||||
preparePopulateTree();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
12
mainwindow.h
12
mainwindow.h
@ -88,7 +88,7 @@ class Downloading
|
||||
class About
|
||||
{
|
||||
public:
|
||||
QString version = "2.11.5";
|
||||
QString version;
|
||||
QString author = "Daniel TARTAVEL-JEANNOT";
|
||||
QString licence = "GPL_V3";
|
||||
QString description;
|
||||
@ -120,7 +120,8 @@ class MainWindow : public QMainWindow
|
||||
bool rescan = false;
|
||||
bool stopDlAsked;
|
||||
|
||||
QList<QString> UnitText {
|
||||
QList<QString> UnitText
|
||||
{
|
||||
tr("B"),
|
||||
tr("KB"),
|
||||
tr("MB"),
|
||||
@ -128,7 +129,8 @@ class MainWindow : public QMainWindow
|
||||
tr("TB"),
|
||||
tr("PB")
|
||||
};
|
||||
QList<QChar> bwUnitChar{
|
||||
QList<QChar> bwUnitChar
|
||||
{
|
||||
'K',
|
||||
'M',
|
||||
'T',
|
||||
@ -152,7 +154,7 @@ class MainWindow : public QMainWindow
|
||||
void listServices();
|
||||
bool validateServer(QString server);
|
||||
bool isIpAddress(QString server);
|
||||
void addTreeItem(QString name, QString fileSize, QString fullsize, QString type, QString date, bool isDir, QTreeWidgetItem *parent);
|
||||
void addTreeItem(QString name, QString fileSize, QString fullsize, QString type, QString date, bool isDir, QString dirName, QTreeWidgetItem *parent);
|
||||
bool scanDir(QString server, int portN, QTreeWidgetItem *parent = NULL, QString path = "" );
|
||||
void startDownloading();
|
||||
void loadSettings();
|
||||
@ -199,8 +201,6 @@ class MainWindow : public QMainWindow
|
||||
|
||||
void on_actionDownload_triggered();
|
||||
|
||||
//void downloadingErrorSlot(QString);
|
||||
|
||||
void on_comboBox_currentIndexChanged(int index);
|
||||
|
||||
void on_buttonBox_accepted();
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#include "mainwindow.h"
|
||||
//#include "mainwindow.h"
|
||||
#include "password.h"
|
||||
#include <qt5keychain/keychain.h>
|
||||
#include <qt5keychain/qkeychain_export.h>
|
||||
|
||||
22
password.h
22
password.h
@ -10,26 +10,4 @@ extern QApplication a;
|
||||
void setPassword(QString account, QString pass);
|
||||
QString getPassword(const QString& name);
|
||||
|
||||
/*class Password : QObject
|
||||
{
|
||||
public:
|
||||
QString appName;
|
||||
QKeychain::WritePasswordJob * passwdJob;
|
||||
QKeychain::ReadPasswordJob * readPass;
|
||||
MainWindow * mw;
|
||||
QString password;
|
||||
QSettings passwdSettings{a.applicationName(),a.applicationName()};
|
||||
|
||||
Password();
|
||||
~Password();
|
||||
|
||||
void store(QString, QString);
|
||||
QString read(QString);
|
||||
bool remove(QString);
|
||||
|
||||
private slots:
|
||||
void storeFinished();
|
||||
void readFinished();
|
||||
};*/
|
||||
|
||||
#endif // PASSWORD_H
|
||||
|
||||
37
tools.cpp
37
tools.cpp
@ -8,48 +8,13 @@ using namespace std;
|
||||
extern QMap<int, QString> rsyncErrorStrings;
|
||||
extern QApplication a;
|
||||
|
||||
//Take a string and explode it in array
|
||||
// s => string to explode
|
||||
// c => character separator
|
||||
// n => number of results in array, the last is the rest of string to end
|
||||
const vector<string> explode(const string& s, const char& c, int n = 0)
|
||||
{
|
||||
string buff;
|
||||
vector<string> v;
|
||||
size_t pos = 0;
|
||||
size_t ppos = 0;
|
||||
int i = 0;
|
||||
|
||||
while (i < n - 1)
|
||||
{
|
||||
pos = s.find(c, ppos);
|
||||
if (pos != string::npos)
|
||||
{
|
||||
buff = s.substr(ppos, pos - ppos);
|
||||
if (buff != "")
|
||||
{
|
||||
i++;
|
||||
v.push_back(s.substr(ppos, pos - ppos));
|
||||
}
|
||||
ppos = pos + 1;
|
||||
}else
|
||||
{
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (ppos < s.size())
|
||||
{
|
||||
v.push_back(s.substr(ppos));
|
||||
}
|
||||
return v;
|
||||
}
|
||||
|
||||
// test return code of rsync
|
||||
// return true in case of error
|
||||
bool testRsyncReturn(MainWindow * w, QProcess * myProcess)
|
||||
{
|
||||
if (myProcess->exitStatus() != 0 and w->stopDlAsked != true)
|
||||
{
|
||||
cout << "rsync error: " << myProcess->error() << " : " << myProcess->errorString().toStdString() << endl;
|
||||
QMessageBox::warning(
|
||||
w,
|
||||
a.applicationName(),
|
||||
|
||||
3
tools.h
3
tools.h
@ -1,7 +1,6 @@
|
||||
#ifndef TOOLS_H
|
||||
#define TOOLS_H
|
||||
|
||||
#include "mainwindow.h"
|
||||
#include <string>
|
||||
#include <vector>
|
||||
#include <array>
|
||||
@ -14,8 +13,6 @@
|
||||
|
||||
using namespace std;
|
||||
|
||||
const vector<string> explode(const string& s, const char& c, int n);
|
||||
|
||||
FILE * popen2(array<string,8> argv, string type, int & pid);
|
||||
|
||||
int pclose2(FILE * fp, pid_t pid);
|
||||
|
||||
Reference in New Issue
Block a user