dev name is now mandatory

lumiscosity · Dec 30, 2024 · 6221e76 · 6221e76
1 parent 2b049ba
commit 6221e76
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 10 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -55,7 +55,7 @@ jobs:
     name: 'Linux/Flatpak'
     runs-on: ubuntu-latest
     container:
-      image: bilelmoussaoui/flatpak-github-actions:kde-6.8
+      image: bilelmoussaoui/flatpak-github-actions:kde-6.7
       options: --privileged
     steps:
     - uses: actions/checkout@v4

diff --git a/src/directorydialog.cpp b/src/directorydialog.cpp
@@ -34,18 +34,22 @@ void DirectoryDialog::on_origPushButton_clicked() {
     QString path = QFileDialog::getExistingDirectory(this, "Select the original copy directory");
     if (!path.isEmpty()){
         ui->origLabel->setText(path);
-        ui->buttonBox->buttons()[0]->setEnabled(path != ui->workLabel->text() && ui->workLabel->text() != "...");
+        ui->buttonBox->buttons()[0]->setEnabled(path != ui->workLabel->text() && ui->workLabel->text() != "..." && !ui->nameLineEdit->text().isEmpty());
     }
 }
 
 void DirectoryDialog::on_workPushButton_clicked() {
     QString path = QFileDialog::getExistingDirectory(this, "Select the work copy directory");
     if (!path.isEmpty()){
         ui->workLabel->setText(path);
-        ui->buttonBox->buttons()[0]->setEnabled(path != ui->origLabel->text() && ui->origLabel->text() != "...");
+        ui->buttonBox->buttons()[0]->setEnabled(path != ui->origLabel->text() && ui->origLabel->text() != "..." && !ui->nameLineEdit->text().isEmpty());
     }
 }
 
+void DirectoryDialog::on_nameLineEdit_textChanged(const QString &text) {
+    ui->buttonBox->buttons()[0]->setEnabled(ui->workLabel->text() != ui->origLabel->text() && ui->origLabel->text() != "..." && ui->workLabel->text() != "..." && !text.isEmpty());
+}
+
 QString DirectoryDialog::orig() {
     return ui->origLabel->text();
 }
@@ -86,3 +90,7 @@ std::string DirectoryDialog::encoding() {
         return "UTF-8";
     }
 }
+
+QString DirectoryDialog::dev_name() {
+    return ui->nameLineEdit->text();
+}
diff --git a/src/directorydialog.h b/src/directorydialog.h
@@ -17,7 +17,6 @@
 
 #pragma once
 
-#include "lcf/saveopt.h"
 #include <QDialog>
 
 namespace Ui {
@@ -34,10 +33,11 @@ class DirectoryDialog : public QDialog {
     QString orig();
     QString work();
     std::string encoding();
-    lcf::EngineVersion engine();
+    QString dev_name();
 private slots:
     void on_origPushButton_clicked();
     void on_workPushButton_clicked();
+    void on_nameLineEdit_textChanged(const QString &text);
 
 private:
     Ui::DirectoryDialog *ui;

diff --git a/src/directorydialog.ui b/src/directorydialog.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>423</width>
-    <height>223</height>
+    <height>264</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -128,6 +128,16 @@
    </item>
    <item>
     <layout class="QVBoxLayout" name="verticalLayout">
+     <item>
+      <widget class="QLabel" name="nameLabel">
+       <property name="text">
+        <string>Developer name</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLineEdit" name="nameLineEdit"/>
+     </item>
      <item>
       <widget class="QLabel" name="encodingLabel">
        <property name="text">

diff --git a/src/main.cpp b/src/main.cpp
@@ -32,7 +32,7 @@ int main(int argc, char *argv[]) {
         p.gendiff(d.orig(), d.work(), d.encoding());
         if (p.exec()) {
             ChangelogWidget c(d.work());
-            c.set_text(p.genlog(d.orig(), d.work(), d.encoding()));
+            c.set_text(p.genlog(d.orig(), d.work(), d.encoding(), d.dev_name()));
             c.show();
             a.exec();
         }

diff --git a/src/pickerwidget.cpp b/src/pickerwidget.cpp
@@ -317,13 +317,13 @@ void PickerWidget::gendiff(QString orig_path, QString work_path, std::string enc
     }
 }
 
-QString PickerWidget::genlog(QString orig_path, QString work_path, std::string encoding) {
+QString PickerWidget::genlog(QString orig_path, QString work_path, std::string encoding, QString dev_name) {
     // create log header
     QStringList log;
     std::unique_ptr<lcf::rpg::TreeMap> maptree = lcf::LMT_Reader::Load(QString(work_path + "/RPG_RT.lmt").toUtf8().data(), encoding);
     log.append("|=|=|=|=|=|=|=|=|=|=|=|=|=|=|=|=|=|=|=|=|=|=|=|=|=|");
     log.append("");
-    log.append("Developer:");
+    log.append("Developer: " + dev_name);
     log.append("Date: " + QDate::currentDate().toString("dd/MMM/yyyy"));
     log.append("");
     log.append("---------------------------------------------------");

diff --git a/src/pickerwidget.h b/src/pickerwidget.h
@@ -39,7 +39,7 @@ class PickerWidget : public QDialog {
 
     void addModelItem(QString folder, QString name, QString type, int id = 0);
     void gendiff(QString orig_path, QString work_path, std::string encoding);
-    QString genlog(QString orig_path, QString work_path, std::string encoding);
+    QString genlog(QString orig_path, QString work_path, std::string encoding, QString dev_name);
     void genmapmeta(QStringList &bgm, QStringList &connections, QString path, int id, std::string encoding);
 private:
     Ui::PickerWidget *ui;