Road to 0.9.7 part 1 (Help window without translations and small form…

… generation improvements)
SiekamCebule · Sep 11, 2023 · d06f217 · d06f217
1 parent 446ead5
commit d06f217
Show file tree

Hide file tree

Showing 28 changed files with 1,104 additions and 218 deletions.
diff --git a/sj-sim.pro b/sj-sim.pro
@@ -45,6 +45,7 @@ SOURCES += \
     source/UI/EditorWidgets/WindsGeneratorSettingsWidgetInputItem.cpp \
     source/UI/FormGenerator/JumperFormGeneratorsSettingsTableModel.cpp \
     source/UI/FormGenerator/JumpersFormGeneratorConfigWindow.cpp \
+    source/UI/HelpWindow.cpp \
     source/UI/JumpManipulation/JumpManipulatorConfigWindow.cpp \
     source/UI/ResultsShowing/JumpDataDetailedInfoWindow.cpp \
     source/UI/Competition/CompetitionConfigWindow.cpp \
@@ -174,6 +175,7 @@ HEADERS += \
     source/UI/EditorWidgets/WindsGeneratorSettingsWidgetInputItem.h \
     source/UI/FormGenerator/JumperFormGeneratorsSettingsTableModel.h \
     source/UI/FormGenerator/JumpersFormGeneratorConfigWindow.h \
+    source/UI/HelpWindow.h \
     source/UI/JumpManipulation/JumpManipulatorConfigWindow.h \
     source/UI/ResultsShowing/JumpDataDetailedInfoWindow.h \
     source/UI/Competition/CompetitionConfigWindow.h \
@@ -286,6 +288,7 @@ FORMS += \
     source/UI/EditorWidgets/WindsGeneratorSettingsEditorWidget.ui \
     source/UI/EditorWidgets/WindsGeneratorSettingsWidgetInputItem.ui \
     source/UI/FormGenerator/JumpersFormGeneratorConfigWindow.ui \
+    source/UI/HelpWindow.ui \
     source/UI/JumpManipulation/JumpManipulatorConfigWindow.ui \
     source/UI/ResultsShowing/JumpDataDetailedInfoWindow.ui \
     source/UI/Competition/CompetitionConfigWindow.ui \

diff --git a/source/UI/Competition/CompetitionConfigWindow.cpp b/source/UI/Competition/CompetitionConfigWindow.cpp
@@ -120,6 +120,15 @@ CompetitionConfigWindow::CompetitionConfigWindow(short type, QWidget *parent, Si
             {
                 seasonCompetitionJumpers.push_back(jp);
             }
+            for(auto & list : simulationSave->getJumpersListsReference())
+            {
+                if(list.getIsDefault() == false)
+                {
+                    for(auto & jp : list.getJumpersReference()){
+                        MyFunctions::removeFromVector(seasonCompetitionJumpers, jp);
+                    }
+                }
+            }
         }
         jumpersListView->setSeasonJumpers(&seasonCompetitionJumpers);
     }

diff --git a/source/UI/Competition/CompetitionManagerWindow.cpp b/source/UI/Competition/CompetitionManagerWindow.cpp
@@ -1297,6 +1297,14 @@ void CompetitionManagerWindow::on_pushButton_coachGate_clicked()
         ui->spinBox_actualGate->setValue(manager->getActualCoachGate());
         manager->setActualGate(manager->getActualGate() + howMany);
     }
+    else if(howMany == 0 && ok)
+    {
+        manager->setCoachGateForNextJumper(false);
+        updateToAdvanceDistanceLabel();
+        updateToBeatDistanceLabel();
+
+        ui->spinBox_actualGate->setValue(manager->getActualGate());
+    }
 }
 
 QVector<Wind> CompetitionManagerWindow::getActualWinds() const

diff --git a/source/UI/DatabaseEditor/ListModels/JumpersListsListModel.cpp b/source/UI/DatabaseEditor/ListModels/JumpersListsListModel.cpp
@@ -28,10 +28,21 @@ QVariant JumpersListsListModel::data(const QModelIndex &index, int role) const
         return jumpersLists->at(index.row()).getName() + " (" + QString::number(jumpersLists->at(index.row()).getJumpers().count()) + tr(" zawodników)");
     }
     else if(role == Qt::FontRole){
-        return QFont("Quicksand Medium", 11, 600);
+        QFont font("Quicksand Medium", 11, 600);
+        if(jumpersLists->at(index.row()).getIsDefault())
+            font.setBold(true);
+        return font;
     }
     else if(role == Qt::BackgroundRole){
-        return QColor(qRgb(253, 253, 253));
+        return QColor("white");
+        if(jumpersLists->at(index.row()).getIsDefault())
+        {
+            return QColor(qRgb(22, 77, 250));
+        }
+        else
+        {
+            return QColor(qRgb(11, 5, 210));
+        }
     }
     else if(role == Qt::ForegroundRole){
         return QColor(qRgb(30, 30, 30));

diff --git a/source/UI/EditorWidgets/JumpersListEditorWindow.cpp b/source/UI/EditorWidgets/JumpersListEditorWindow.cpp
@@ -2,12 +2,13 @@
 #include "ui_JumpersListEditorWindow.h"
 #include "../../utilities/functions.h"
 
-JumpersListEditorWindow::JumpersListEditorWindow(QWidget *parent, QString name) :
+JumpersListEditorWindow::JumpersListEditorWindow(QWidget *parent, QString name, bool isDefault) :
     QDialog(parent),
     ui(new Ui::JumpersListEditorWindow)
 {
     ui->setupUi(this);
     ui->lineEdit->setText(name);
+    ui->checkBox_default->setChecked(isDefault);
 
     selectedJumpersListView = new DatabaseItemsListView(DatabaseItemsListView::SeasonJumpersItems, false, false, true);
     selectedJumpersListView->setSeasonJumpers(&selectedJumpers);
@@ -65,6 +66,11 @@ QString JumpersListEditorWindow::getNameFromLineEdit()
     return ui->lineEdit->text();
 }
 
+bool JumpersListEditorWindow::getIsDefaultFromCheckBox()
+{
+    return ui->checkBox_default->isChecked();
+}
+
 void JumpersListEditorWindow::updateUnselectedJumpers()
 {
     unselectedJumpers.clear();

diff --git a/source/UI/EditorWidgets/JumpersListEditorWindow.h b/source/UI/EditorWidgets/JumpersListEditorWindow.h
@@ -15,10 +15,11 @@ class JumpersListEditorWindow : public QDialog
     Q_OBJECT
 
 public:
-    explicit JumpersListEditorWindow(QWidget *parent = nullptr, QString name = "");
+    explicit JumpersListEditorWindow(QWidget *parent = nullptr, QString name = "", bool isDefault = false);
     ~JumpersListEditorWindow();
 
     QString getNameFromLineEdit();
+    bool getIsDefaultFromCheckBox();
     void updateUnselectedJumpers();
 
 signals:

diff --git a/source/UI/EditorWidgets/JumpersListEditorWindow.ui b/source/UI/EditorWidgets/JumpersListEditorWindow.ui
@@ -109,6 +109,26 @@ border: none;
      </item>
     </layout>
    </item>
+   <item>
+    <widget class="QCheckBox" name="checkBox_default">
+     <property name="font">
+      <font>
+       <family>Quicksand SemiBold</family>
+       <pointsize>10</pointsize>
+       <bold>false</bold>
+      </font>
+     </property>
+     <property name="styleSheet">
+      <string notr="true">color: rgb(105, 46, 0);</string>
+     </property>
+     <property name="text">
+      <string>Domyślnie dodawaj tych zawodników do listy startowej</string>
+     </property>
+     <property name="checked">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
    <item>
     <widget class="QTextEdit" name="textEdit_shortcuts">
      <property name="sizePolicy">

diff --git a/source/UI/FormGenerator/JumpersFormGeneratorConfigWindow.ui b/source/UI/FormGenerator/JumpersFormGeneratorConfigWindow.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Dialog</string>
+   <string>Konfiguracja generatora formy</string>
   </property>
   <property name="styleSheet">
    <string notr="true">background-color: rgb(245, 245, 245);

diff --git a/source/UI/HelpWindow.cpp b/source/UI/HelpWindow.cpp
@@ -0,0 +1,16 @@
+#include "HelpWindow.h"
+#include "ui_HelpWindow.h"
+
+HelpWindow::HelpWindow(QWidget *parent) :
+    QDialog(parent),
+    ui(new Ui::HelpWindow)
+{
+    ui->setupUi(this);
+    ui->textBrowser->setOpenLinks(false);
+    ui->textBrowser->setOpenExternalLinks(false);
+}
+
+HelpWindow::~HelpWindow()
+{
+    delete ui;
+}
diff --git a/source/UI/HelpWindow.h b/source/UI/HelpWindow.h
@@ -0,0 +1,22 @@
+#ifndef HELPWINDOW_H
+#define HELPWINDOW_H
+
+#include <QDialog>
+
+namespace Ui {
+class HelpWindow;
+}
+
+class HelpWindow : public QDialog
+{
+    Q_OBJECT
+
+public:
+    explicit HelpWindow(QWidget *parent = nullptr);
+    ~HelpWindow();
+
+private:
+    Ui::HelpWindow *ui;
+};
+
+#endif // HELPWINDOW_H