diff --git a/RsyncUI.pro.user b/RsyncUI.pro.user index b2e3ace..bd1b565 100644 --- a/RsyncUI.pro.user +++ b/RsyncUI.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId diff --git a/mainwindow.cpp b/mainwindow.cpp index 92dd886..f95ad74 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -121,7 +121,6 @@ MainWindow::MainWindow(QWidget *parent) connect(this, &MainWindow::stopDownloading, this, &MainWindow::cancelled); connect(config.buttonBox, SIGNAL(accepted()), this, SLOT(on_buttonBox_accepted())); connect(config.comboBox, QOverload::of(&QComboBox::currentIndexChanged), this, &MainWindow::on_comboBox_currentIndexChanged); - connect(ui->khistorycombobox, QOverload::of(&KComboBox::returnPressed), this, &MainWindow::on_return_pressed); populateList(ui->khistorycombobox->currentText(), ui->portEdit->text().toUInt()); initialization = false; } @@ -1566,27 +1565,3 @@ void MainWindow::on_actionHiddenService_triggered() 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"); -} diff --git a/mainwindow.h b/mainwindow.h index 2d05a8c..249be1d 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -54,8 +54,8 @@ class Connexion public: int bandwidthLimit = 0; int bandwidthLimitUnit; - int contimeout = 20; - QString server; + int contimeout = 20; + QString server; QString service; QString path; QString savePath; @@ -73,8 +73,8 @@ class Downloading public: QString server; QString service; - QString path; - QString savePath; + QString path; + QString savePath; QString user; QString password; int ipversion = 4; @@ -89,8 +89,8 @@ class About public: QString version; QString author = "Daniel TARTAVEL-JEANNOT"; - QString licence = "GPL_V3"; - QString description; + QString licence = "GPL_V3"; + QString description; QString email = "dtux@free.fr"; QString git = "https://git.labolyon.fr/dtux/RsyncUI/issues"; }; @@ -102,10 +102,10 @@ class MainWindow : public QMainWindow public: Ui::MainWindow *ui; MainWindow(QWidget *parent = nullptr); - ~MainWindow(); - // passwdManager; - QProgressDialog *progress; - Connexion connexion; + ~MainWindow(); + // passwdManager; + QProgressDialog *progress; + Connexion connexion; Connexion downloading; QSettings settings; About about; @@ -219,14 +219,6 @@ class MainWindow : public QMainWindow //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: void stopDownloading(QProcess *); void progressSignal(int); diff --git a/version.h b/version.h index 8a5a969..bd78656 100644 --- a/version.h +++ b/version.h @@ -3,6 +3,6 @@ #include -QString version = "2.12.1"; +QString version = "2.12.2"; #endif // VERSION_H