diff --git a/src/localkiwixserver.cpp b/src/localkiwixserver.cpp index 3845dd9..fb51060 100644 --- a/src/localkiwixserver.cpp +++ b/src/localkiwixserver.cpp @@ -68,6 +68,7 @@ void LocalKiwixServer::runOrStopServer() m_port = ui->PortChooser->text().toInt(); m_ipAddress = (ui->IpChooser->currentText() != "0.0.0.0") ? ui->IpChooser->currentText() : QString::fromStdString(mp_server->getBestPublicIp()); mp_server->setPort(m_port); + KiwixApp::instance()->getSettingsManager()->setKiwixServerPort(m_port); mp_server->setAddress(ui->IpChooser->currentText().toStdString()); ui->IpAddress->setText("http://" + m_ipAddress + ":" + QString::number(m_port)); if (!mp_server->start()) { diff --git a/src/settingsview.cpp b/src/settingsview.cpp index 23719f8..924a22e 100644 --- a/src/settingsview.cpp +++ b/src/settingsview.cpp @@ -13,15 +13,12 @@ SettingsView::SettingsView(QWidget *parent) file.open(QFile::ReadOnly); QString styleSheet = QString(file.readAll()); ui->widget->setStyleSheet(styleSheet); - connect(ui->serverPortSpinBox, QOverload::of(&QSpinBox::valueChanged), this, &SettingsView::setKiwixServerPort); connect(ui->zoomPercentSpinBox, QOverload::of(&QSpinBox::valueChanged), this, &SettingsView::setZoom); connect(ui->browseButton, &QPushButton::clicked, this, &SettingsView::browseDownloadDir); connect(ui->resetButton, &QPushButton::clicked, this, &SettingsView::resetDownloadDir); connect(KiwixApp::instance()->getSettingsManager(), &SettingsManager::downloadDirChanged, this, &SettingsView::onDownloadDirChanged); connect(KiwixApp::instance()->getSettingsManager(), &SettingsManager::zoomChanged, this, &SettingsView::onZoomChanged); - connect(KiwixApp::instance()->getSettingsManager(), &SettingsManager::portChanged, this, &SettingsView::onServerPortChanged); ui->settingsLabel->setText(gt("settings")); - ui->serverPortLabel->setText(gt("port-for-local-kiwix-server-setting")); ui->zoomPercentLabel->setText(gt("zoom-level-setting")); ui->downloadDirLabel->setText(gt("download-directory-setting")); ui->resetButton->setText(gt("reset")); @@ -29,7 +26,6 @@ SettingsView::SettingsView(QWidget *parent) } void SettingsView::init(int port, int zoomPercent, const QString &dir) { - ui->serverPortSpinBox->setValue(port); ui->zoomPercentSpinBox->setValue(zoomPercent); ui->downloadDirPath->setText(dir); } @@ -83,11 +79,6 @@ void SettingsView::setZoom(int zoomPercent) KiwixApp::instance()->getSettingsManager()->setZoomFactor(zoomFactor); } -void SettingsView::setKiwixServerPort(int port) -{ - KiwixApp::instance()->getSettingsManager()->setKiwixServerPort(port); -} - void SettingsView::onDownloadDirChanged(const QString &dir) { ui->downloadDirPath->setText(dir); @@ -98,8 +89,3 @@ void SettingsView::onZoomChanged(qreal zoomFactor) qreal zoomPercent = zoomFactor * 100; ui->zoomPercentSpinBox->setValue(zoomPercent); } - -void SettingsView::onServerPortChanged(int port) -{ - ui->serverPortSpinBox->setValue(port); -} diff --git a/src/settingsview.h b/src/settingsview.h index 0e80c22..542dfe0 100644 --- a/src/settingsview.h +++ b/src/settingsview.h @@ -18,8 +18,6 @@ public Q_SLOTS: void setZoom(int zoomPercent); void onDownloadDirChanged(const QString &dir); void onZoomChanged(qreal zoomFactor); - void onServerPortChanged(int port); - void setKiwixServerPort(int port); private: bool confirmDialogDownloadDir(const QString& dir); diff --git a/ui/settings.ui b/ui/settings.ui index 178e720..63447af 100644 --- a/ui/settings.ui +++ b/ui/settings.ui @@ -57,62 +57,6 @@ - - - - - - Port for local kiwix server: - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - false - - - - - - - - - 1 - - - 65535 - - - - - - - - - true - - - QFrame::Plain - - - Qt::Horizontal - - -