Build system changed to Cmake, ORM changed to QxORM, Qt6 compatibility.

core/settings/globalsettings.cpp

@@ -1,5 +1,5 @@
 #include "globalsettings.h"
-#include <define.h>
+#include "../define.h"
 
 GlobalSettings::GlobalSettings(QObject *parent) : QObject(parent)
 {

core/settings/globalsettingsform.cpp

@@ -9,7 +9,6 @@
 #include "../settingsservice.h"
 #include "../seasonservice.h"
 #include "../numberseriesservice.h"
-#include "core-odb.hxx"
 
 GlobalSettingsForm::GlobalSettingsForm(QWidget *parent) :
     FormBinder<GlobalSettings>(parent),
@@ -45,10 +44,16 @@ GlobalSettingsForm::~GlobalSettingsForm()
 
 void GlobalSettingsForm::loadSeasons()
 {
-    ui->season->clear();
     SeasonService srv;
     m_seasons = srv.all();
 
+    fillSeasons();
+}
+
+
+void GlobalSettingsForm::fillSeasons() {
+    ui->season->clear();
+
     foreach (SeasonPtr season, m_seasons) {
         ui->season->addItem(season->name());
 
@@ -76,10 +81,18 @@ bool GlobalSettingsForm::saveRecord()
     SeasonService srvSeason;
     NumberSeriesService srvNumSer;
 
+    foreach (NumberSeriesPtr numSer, m_seriesModel->list()) {
+        srvNumSer.update(numSer);
+    }
+
+    foreach (SeasonPtr season, m_seasons) {
+        srvSeason.update(season);
+    }
+
     SeasonPtr selSeason = m_seasons[ui->season->currentIndex()];
     if (selSeason->id() != Context::instance().currentSeason()->id())
     {
-        if (QMessageBox::question(this, tr("Switch season"), tr("Realy switch active season?")) == QMessageBox::Yes)
+        if (QMessageBox::question(this, tr("Switch season"), tr("Really switch active season?")) == QMessageBox::Yes)
         {
             srvSeason.activate(selSeason);
             Context::instance().setCurrentSeason(selSeason);
@@ -90,14 +103,6 @@ bool GlobalSettingsForm::saveRecord()
         }
     }
 
-    foreach (SeasonPtr season, m_seasons) {
-        srvSeason.update(season);
-    }
-
-    foreach (NumberSeriesPtr numSer, m_seriesModel->list()) {
-        srvNumSer.update(numSer);
-    }
-
     bindToData();
     SettingsService srv("CORE");
     srv.saveSettings(entity());
@@ -141,13 +146,13 @@ void GlobalSettingsForm::on_btnEditName_clicked()
     dialog->show();
 
     connect(dialog, &QDialog::accepted, [this](){
-        this->loadSeasons();
+        this->fillSeasons();
     });
 }
 
 void GlobalSettingsForm::on_btnNew_clicked()
 {
-    if (QMessageBox::question(this, tr("New season"), tr("Realy create new season and switch to it?")) == QMessageBox::Yes)
+    if (QMessageBox::question(this, tr("New season"), tr("Really create new season and switch to it?")) == QMessageBox::Yes)
     {
         SeasonPtr newSeason = SeasonPtr(new Season);
         SeasonNameDialog *dialog = new SeasonNameDialog(newSeason, this);
@@ -177,3 +182,4 @@ void GlobalSettingsForm::on_pushButton_clicked()
         ui->lblLogo->setPixmap(QPixmap(logoPath));
     }
 }
+

core/settings/globalsettingsform.h

@@ -25,6 +25,7 @@ private:
     QList<SeasonPtr> m_seasons;
 
     void loadSeasons();
+    void fillSeasons();
     void loadNumSeries();
 
     // IForm interface

core/settings/globalsettingsform.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>759</width>
-    <height>630</height>
+    <height>640</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -39,6 +39,9 @@
           <string>Contact</string>
          </property>
          <layout class="QFormLayout" name="formLayout">
+          <property name="fieldGrowthPolicy">
+           <enum>QFormLayout::ExpandingFieldsGrow</enum>
+          </property>
           <item row="0" column="0">
            <widget class="QLabel" name="label">
             <property name="text">

core/settings/seasonnamedialog.cpp

@@ -1,7 +1,7 @@
 #include "seasonnamedialog.h"
 #include "ui_seasonnamedialog.h"
 
-SeasonNameDialog::SeasonNameDialog(SeasonPtr season, QWidget *parent) :
+SeasonNameDialog::SeasonNameDialog(const SeasonPtr& season, QWidget *parent) :
     QDialog(parent),
     ui(new Ui::SeasonNameDialog)
 {

core/settings/seasonnamedialog.h

@@ -15,8 +15,8 @@ class SeasonNameDialog : public QDialog
     Q_OBJECT
 
 public:
-    explicit SeasonNameDialog(SeasonPtr season, QWidget *parent = 0);
-    ~SeasonNameDialog();
+    explicit SeasonNameDialog(const SeasonPtr& season, QWidget *parent = 0);
+    ~SeasonNameDialog() override;
 
 private:
     Ui::SeasonNameDialog *ui;
@@ -24,7 +24,7 @@ private:
 
     // QDialog interface
 public slots:
-    void accept();
+    void accept() override;
 };
 
 #endif // SEASONNAMEDIALOG_H