Browse Source

renaming of tDual acc. new db revison

fiffty-50 4 years ago
parent
commit
b6443bc936
2 changed files with 19 additions and 19 deletions
  1. 4 4
      src/gui/dialogues/newflight.ui
  2. 15 15
      src/gui/dialogues/newflightdialog.cpp

+ 4 - 4
src/gui/dialogues/newflight.ui

@@ -17,7 +17,7 @@
    <item row="0" column="0" colspan="3">
     <widget class="QTabWidget" name="flightDataTabWidget">
      <property name="currentIndex">
-      <number>2</number>
+      <number>0</number>
      </property>
      <widget class="QWidget" name="flightDataTab">
       <attribute name="title">
@@ -270,7 +270,7 @@
         </widget>
        </item>
        <item row="14" column="4" colspan="2">
-        <widget class="QLabel" name="tDualLabel">
+        <widget class="QLabel" name="tDUALLabel">
          <property name="minimumSize">
           <size>
            <width>80</width>
@@ -834,7 +834,7 @@
       <zorder>tofbLabel</zorder>
       <zorder>secondPilotLabel</zorder>
       <zorder>autoDualLabel</zorder>
-      <zorder>tDualLabel</zorder>
+      <zorder>tDUALLabel</zorder>
       <zorder>tPICLabel</zorder>
       <zorder>autoPICLabel</zorder>
       <zorder>tonbLabel</zorder>
@@ -1326,7 +1326,7 @@
         </widget>
        </item>
        <item row="11" column="4">
-        <widget class="QLineEdit" name="tDualTimeLineEdit">
+        <widget class="QLineEdit" name="tDUALTimeLineEdit">
          <property name="minimumSize">
           <size>
            <width>0</width>

+ 15 - 15
src/gui/dialogues/newflightdialog.cpp

@@ -289,7 +289,7 @@ void NewFlightDialog::formFiller(Flight oldFlight)
     }
     //FunctionComboBox
     QList<QLineEdit*> FCB = {ui->tPICTimeLineEdit,  ui->tPICUSTimeLineEdit, ui->tSICTimeLineEdit,
-                             ui->tDualTimeLineEdit, ui->tFITimeLineEdit};
+                             ui->tDUALTimeLineEdit, ui->tFITimeLineEdit};
     for(const auto& le : FCB){
         if(le->text() != "00:00"){
             QString name = le->objectName();
@@ -677,35 +677,35 @@ void NewFlightDialog::collectAdditionalData()
         newData.insert("tPIC", blockMinutes);
         newData.insert("tPICUS", "");
         newData.insert("tSIC", "");
-        newData.insert("tDual", "");
+        newData.insert("tDUAL", "");
         newData.insert("tFI", "");
         break;
     case 1://PICUS
         newData.insert("tPIC", "");
         newData.insert("tPICUS", blockMinutes);
         newData.insert("tSIC", "");
-        newData.insert("tDual", "");
+        newData.insert("tDUAL", "");
         newData.insert("tFI", "");
         break;
     case 2://Co-Pilot
         newData.insert("tPIC", "");
         newData.insert("tPICUS", "");
         newData.insert("tSIC", blockMinutes);
-        newData.insert("tDual", "");
+        newData.insert("tDUAL", "");
         newData.insert("tFI", "");
         break;
     case 3://Dual
         newData.insert("tPIC", "");
         newData.insert("tPICUS", "");
         newData.insert("tSIC", "");
-        newData.insert("tDual", blockMinutes);
+        newData.insert("tDUAL", blockMinutes);
         newData.insert("tFI", "");
         break;
     case 4://Instructor
         newData.insert("tPIC", "");
         newData.insert("tPICUS", "");
         newData.insert("tSIC", "");
-        newData.insert("tDual", "");
+        newData.insert("tDUAL", "");
         newData.insert("tFI", blockMinutes);
     }
     // Pilot Flying
@@ -771,9 +771,9 @@ void NewFlightDialog::fillExtras()
     //zero labels and line edits
     QList<QLineEdit*>   LE = {ui->tSPSETimeLineEdit, ui->tSPMETimeLineEdit, ui->tMPTimeLineEdit,    ui->tIFRTimeLineEdit,
                               ui->tNIGHTTimeLineEdit,ui->tPICTimeLineEdit,  ui->tPICUSTimeLineEdit, ui->tSICTimeLineEdit,
-                              ui->tDualTimeLineEdit, ui->tFITimeLineEdit,};
+                              ui->tDUALTimeLineEdit, ui->tFITimeLineEdit,};
     QList<QLabel*>      LB = {ui->tSPSELabel, ui->tSPMELabel,  ui->tMPLabel,  ui->tIFRLabel,  ui->tNIGHTLabel,
-                              ui->tPICLabel,  ui->tPICUSLabel, ui->tSICLabel, ui->tDualLabel, ui->tFILabel};
+                              ui->tPICLabel,  ui->tPICUSLabel, ui->tSICLabel, ui->tDUALLabel, ui->tFILabel};
     for(const auto& widget : LE) {widget->setText("");}
     for(const auto& widget : LB) {widget->setText("00:00");}
     //Times
@@ -837,8 +837,8 @@ void NewFlightDialog::fillExtras()
         ui->tSICLabel->setText(blockTime);
         break;
     case 3://Dual
-        ui->tDualTimeLineEdit->setText(blockTime);
-        ui->tDualLabel->setText(blockTime);
+        ui->tDUALTimeLineEdit->setText(blockTime);
+        ui->tDUALLabel->setText(blockTime);
         break;
     case 4://Instructor
         ui->tFITimeLineEdit->setText(blockTime);
@@ -898,7 +898,7 @@ void NewFlightDialog::on_buttonBox_accepted()
             DEBUG("Editing entry: " << entry.position.first << " - " << entry.position.second);
             DEBUG("with Data: " << newData);
             DEBUG("Function Times: " << newData.value("tPIC") << newData.value("tPICus") << newData.value("tSIC")
-                  << newData.value("tDual") << newData.value("tFI"));
+                  << newData.value("tDUAL") << newData.value("tFI"));
             break;
         case Db::createNew:
             entry = Flight(newData);
@@ -1561,14 +1561,14 @@ void NewFlightDialog::on_tSICTimeLineEdit_editingFinished()
     }
 }
 
-void NewFlightDialog::on_tDualTimeLineEdit_editingFinished()
+void NewFlightDialog::on_tDUALTimeLineEdit_editingFinished()
 {
-    const auto &le = ui->tDualTimeLineEdit;
+    const auto &le = ui->tDUALTimeLineEdit;
     le->setText(Calc::formatTimeInput(le->text()));
     const auto &text = le->text();
 
     if(isLessOrEqualToTotalTime(text)){
-        newData.insert("tDual",QString::number(Calc::stringToMinutes(text)));
+        newData.insert("tDUAL",QString::number(Calc::stringToMinutes(text)));
     } else {
         le->setText(QString());
     }
@@ -1592,7 +1592,7 @@ void NewFlightDialog::on_manualEditingCheckBox_stateChanged(int arg1)
 {
     QList<QLineEdit*>   LE = {ui->tSPSETimeLineEdit, ui->tSPMETimeLineEdit, ui->tMPTimeLineEdit,    ui->tIFRTimeLineEdit,
                               ui->tNIGHTTimeLineEdit,ui->tPICTimeLineEdit,  ui->tPICUSTimeLineEdit, ui->tSICTimeLineEdit,
-                              ui->tDualTimeLineEdit, ui->tFITimeLineEdit,};
+                              ui->tDUALTimeLineEdit, ui->tFITimeLineEdit,};
     switch (arg1) {
     case 0:
         for(const auto& le : LE){