This commit is contained in:
Daniel Tartavel 2024-09-05 18:40:00 +02:00
parent b3fff3b68e
commit 553d8ee5ca
4 changed files with 12 additions and 45 deletions

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject> <!DOCTYPE QtCreatorProject>
<!-- Written by QtCreator 9.0.1, 2024-08-22T00:12:24. --> <!-- Written by QtCreator 9.0.1, 2024-08-29T01:07:20. -->
<qtcreator> <qtcreator>
<data> <data>
<variable>EnvironmentId</variable> <variable>EnvironmentId</variable>

View File

@ -121,7 +121,6 @@ MainWindow::MainWindow(QWidget *parent)
connect(this, &MainWindow::stopDownloading, this, &MainWindow::cancelled); connect(this, &MainWindow::stopDownloading, this, &MainWindow::cancelled);
connect(config.buttonBox, SIGNAL(accepted()), this, SLOT(on_buttonBox_accepted())); connect(config.buttonBox, SIGNAL(accepted()), this, SLOT(on_buttonBox_accepted()));
connect(config.comboBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &MainWindow::on_comboBox_currentIndexChanged); connect(config.comboBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &MainWindow::on_comboBox_currentIndexChanged);
connect(ui->khistorycombobox, QOverload<const QString &>::of(&KComboBox::returnPressed), this, &MainWindow::on_return_pressed);
populateList(ui->khistorycombobox->currentText(), ui->portEdit->text().toUInt()); populateList(ui->khistorycombobox->currentText(), ui->portEdit->text().toUInt());
initialization = false; initialization = false;
} }
@ -1566,27 +1565,3 @@ void MainWindow::on_actionHiddenService_triggered()
preparePopulateTree(); preparePopulateTree();
} }
} }
void MainWindow::on_khistorycombobox_currentTextChanged(const QString &server)
{
/*info(DEBUGMACRO, "on_khistorycombobox_currenTextChanged() => Starting connexion to new server");
if (this->initialization == false)
{
populateList(server, connexion.port);
}*/
}
void MainWindow::on_khistorycombobox_editTextChanged(const QString &server)
{
/*info(DEBUGMACRO, "on_khistorycombobox_currenTextChanged() => Starting connexion to new server");
if (this->initialization == false)
{
populateList(server, connexion.port);
}*/
}
void MainWindow::on_return_pressed(const QString &server)
{
info(DEBUGMACRO, "On_return_pressed");
}

View File

@ -54,8 +54,8 @@ class Connexion
public: public:
int bandwidthLimit = 0; int bandwidthLimit = 0;
int bandwidthLimitUnit; int bandwidthLimitUnit;
int contimeout = 20; int contimeout = 20;
QString server; QString server;
QString service; QString service;
QString path; QString path;
QString savePath; QString savePath;
@ -73,8 +73,8 @@ class Downloading
public: public:
QString server; QString server;
QString service; QString service;
QString path; QString path;
QString savePath; QString savePath;
QString user; QString user;
QString password; QString password;
int ipversion = 4; int ipversion = 4;
@ -89,8 +89,8 @@ class About
public: public:
QString version; QString version;
QString author = "Daniel TARTAVEL-JEANNOT"; QString author = "Daniel TARTAVEL-JEANNOT";
QString licence = "GPL_V3"; QString licence = "GPL_V3";
QString description; QString description;
QString email = "dtux@free.fr"; QString email = "dtux@free.fr";
QString git = "https://git.labolyon.fr/dtux/RsyncUI/issues"; QString git = "https://git.labolyon.fr/dtux/RsyncUI/issues";
}; };
@ -102,10 +102,10 @@ class MainWindow : public QMainWindow
public: public:
Ui::MainWindow *ui; Ui::MainWindow *ui;
MainWindow(QWidget *parent = nullptr); MainWindow(QWidget *parent = nullptr);
~MainWindow(); ~MainWindow();
// passwdManager; // passwdManager;
QProgressDialog *progress; QProgressDialog *progress;
Connexion connexion; Connexion connexion;
Connexion downloading; Connexion downloading;
QSettings settings; QSettings settings;
About about; About about;
@ -219,14 +219,6 @@ class MainWindow : public QMainWindow
//void on_treeWidget_itemDoubleClicked(QTreeWidgetItem *item, int column); //void on_treeWidget_itemDoubleClicked(QTreeWidgetItem *item, int column);
//void on_khistorycombobox_currentTextChanged(const QString &arg1);
void on_khistorycombobox_currentTextChanged(const QString &arg1);
void on_khistorycombobox_editTextChanged(const QString &arg1);
void on_return_pressed(const QString &server);
signals: signals:
void stopDownloading(QProcess *); void stopDownloading(QProcess *);
void progressSignal(int); void progressSignal(int);

View File

@ -3,6 +3,6 @@
#include <QString> #include <QString>
QString version = "2.12.1"; QString version = "2.12.2";
#endif // VERSION_H #endif // VERSION_H