From c0ac04e93805863c9cfc92291cd4147c532e7a34 Mon Sep 17 00:00:00 2001 From: Nighty3098 <154594695+Nighty3098@users.noreply.github.com> Date: Fri, 19 Apr 2024 16:18:49 +0700 Subject: [PATCH 01/14] Create clang_format.yml --- .github/workflows/clang_format.yml | 31 ++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 .github/workflows/clang_format.yml diff --git a/.github/workflows/clang_format.yml b/.github/workflows/clang_format.yml new file mode 100644 index 00000000..e942f208 --- /dev/null +++ b/.github/workflows/clang_format.yml @@ -0,0 +1,31 @@ +name: Clang Format + +on: + push: + branches: + - main + - InDev + pull_request: + +jobs: + clang-format: + runs-on: ubuntu-latest + + steps: + - name: Checkout repository + uses: actions/checkout@v2 + with: + fetch-depth: 0 # Fetch the entire repository history + + - name: Setup Clang-Format + uses: tamasfe/setup-clang-format@v1 + + - name: Format C++ files + run: | + find . -type f -name '*.cpp' -o -name '*.hpp' -exec clang-format -i -style=file {} + + + - name: Upload formatted files + uses: actions/upload-artifact@v2 + with: + name: formatted-files + path: . From c0d26ce1d909fa656bc3a03960a43ba2c369e8c9 Mon Sep 17 00:00:00 2001 From: Nighty3098 <154594695+Nighty3098@users.noreply.github.com> Date: Fri, 19 Apr 2024 16:21:02 +0700 Subject: [PATCH 02/14] Update clang_format.yml --- .github/workflows/clang_format.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/clang_format.yml b/.github/workflows/clang_format.yml index e942f208..88112001 100644 --- a/.github/workflows/clang_format.yml +++ b/.github/workflows/clang_format.yml @@ -18,7 +18,7 @@ jobs: fetch-depth: 0 # Fetch the entire repository history - name: Setup Clang-Format - uses: tamasfe/setup-clang-format@v1 + uses: jidicula/clang-format-action@v1 - name: Format C++ files run: | From 07d03cd96a88ed742437965e9f441d900cdb81f1 Mon Sep 17 00:00:00 2001 From: Nighty3098 <154594695+Nighty3098@users.noreply.github.com> Date: Fri, 19 Apr 2024 16:23:40 +0700 Subject: [PATCH 03/14] Update clang_format.yml --- .github/workflows/clang_format.yml | 36 +++++++++--------------------- 1 file changed, 10 insertions(+), 26 deletions(-) diff --git a/.github/workflows/clang_format.yml b/.github/workflows/clang_format.yml index 88112001..c04b62a8 100644 --- a/.github/workflows/clang_format.yml +++ b/.github/workflows/clang_format.yml @@ -1,31 +1,15 @@ -name: Clang Format - -on: - push: - branches: - - main - - InDev - pull_request: +name: clang-format Check +on: [push, pull_request] jobs: - clang-format: + formatting-check: + name: Formatting Check runs-on: ubuntu-latest - steps: - - name: Checkout repository - uses: actions/checkout@v2 - with: - fetch-depth: 0 # Fetch the entire repository history - - - name: Setup Clang-Format - uses: jidicula/clang-format-action@v1 - - - name: Format C++ files - run: | - find . -type f -name '*.cpp' -o -name '*.hpp' -exec clang-format -i -style=file {} + - - - name: Upload formatted files - uses: actions/upload-artifact@v2 + - uses: actions/checkout@v3 + - name: Run clang-format style check for C/C++/Protobuf programs. + uses: jidicula/clang-format-action@v4.11.0 with: - name: formatted-files - path: . + clang-format-version: '13' + check-path: '.' + fallback-style: 'Mozilla' From 22525b2ea8b5e1bf0876fd86eb44f06b2e9442ca Mon Sep 17 00:00:00 2001 From: Nighty3098 <154594695+Nighty3098@users.noreply.github.com> Date: Fri, 19 Apr 2024 16:29:18 +0700 Subject: [PATCH 04/14] Update clang_format.yml --- .github/workflows/clang_format.yml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/.github/workflows/clang_format.yml b/.github/workflows/clang_format.yml index c04b62a8..5281d13d 100644 --- a/.github/workflows/clang_format.yml +++ b/.github/workflows/clang_format.yml @@ -1,15 +1,16 @@ -name: clang-format Check +name: test-clang-format on: [push, pull_request] jobs: - formatting-check: - name: Formatting Check + build: runs-on: ubuntu-latest + steps: - - uses: actions/checkout@v3 - - name: Run clang-format style check for C/C++/Protobuf programs. - uses: jidicula/clang-format-action@v4.11.0 + - uses: actions/checkout@v2 + - uses: DoozyX/clang-format-lint-action@v0.17 with: - clang-format-version: '13' - check-path: '.' - fallback-style: 'Mozilla' + source: '.' + exclude: './src/CodeKeeper/3rdParty/' + extensions: 'cpp' + clangFormatVersion: 17 + style: chromium From 0c7431aae02db0e3d13301b3ece1305977ad1a11 Mon Sep 17 00:00:00 2001 From: Nighty3098 <154594695+Nighty3098@users.noreply.github.com> Date: Fri, 19 Apr 2024 16:32:24 +0700 Subject: [PATCH 05/14] Update clang_format.yml From 6e94b90bfb503cee33cff1e6bd821bfaf43ffb48 Mon Sep 17 00:00:00 2001 From: Nighty3098 <154594695+Nighty3098@users.noreply.github.com> Date: Fri, 19 Apr 2024 16:35:10 +0700 Subject: [PATCH 06/14] Update clang_format.yml --- .github/workflows/clang_format.yml | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/.github/workflows/clang_format.yml b/.github/workflows/clang_format.yml index 5281d13d..555ac523 100644 --- a/.github/workflows/clang_format.yml +++ b/.github/workflows/clang_format.yml @@ -1,16 +1,14 @@ -name: test-clang-format +name: clang-format Check on: [push, pull_request] - jobs: - build: + formatting-check: + name: Formatting Check runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - uses: DoozyX/clang-format-lint-action@v0.17 + - uses: actions/checkout@v3 + - name: Run clang-format style check for C/C++/Protobuf programs. + uses: jidicula/clang-format-action@v4.11.0 with: - source: '.' - exclude: './src/CodeKeeper/3rdParty/' - extensions: 'cpp' - clangFormatVersion: 17 - style: chromium + clang-format-version: '13' + check-path: 'src' + fallback-style: 'Mozilla' From e3063f4a85af97f19e706f1258c98b9e4e3874f9 Mon Sep 17 00:00:00 2001 From: Nighty3098 <154594695+Nighty3098@users.noreply.github.com> Date: Fri, 19 Apr 2024 16:40:51 +0700 Subject: [PATCH 07/14] Update clang_format.yml --- .github/workflows/clang_format.yml | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/.github/workflows/clang_format.yml b/.github/workflows/clang_format.yml index 555ac523..c1aa6f61 100644 --- a/.github/workflows/clang_format.yml +++ b/.github/workflows/clang_format.yml @@ -1,14 +1,23 @@ -name: clang-format Check +name: Run clang-format Linter on: [push, pull_request] + jobs: - formatting-check: - name: Formatting Check + build: runs-on: ubuntu-latest + steps: - - uses: actions/checkout@v3 - - name: Run clang-format style check for C/C++/Protobuf programs. - uses: jidicula/clang-format-action@v4.11.0 + - uses: actions/checkout@v2 + - uses: DoozyX/clang-format-lint-action@v0.16.2 with: - clang-format-version: '13' - check-path: 'src' - fallback-style: 'Mozilla' + source: '.' + exclude: './src/CodeKeeper/3rdParty' + extensions: 'h,cpp,c' + clangFormatVersion: 16 + inplace: True + - uses: EndBug/add-and-commit@v9 + with: + author_name: Nighty3098 + author_email: night3098game@gmail.com + message: 'Committing clang-format changes' + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 524904d45e27971d5c6f79b061f471cf9b502db7 Mon Sep 17 00:00:00 2001 From: Nighty3098 <154594695+Nighty3098@users.noreply.github.com> Date: Fri, 19 Apr 2024 16:43:31 +0700 Subject: [PATCH 08/14] Update clang_format.yml --- .github/workflows/clang_format.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/clang_format.yml b/.github/workflows/clang_format.yml index c1aa6f61..3fd1da57 100644 --- a/.github/workflows/clang_format.yml +++ b/.github/workflows/clang_format.yml @@ -1,5 +1,5 @@ name: Run clang-format Linter -on: [push, pull_request] +on: [push, pull_request, fork] jobs: build: From 81e60b2a3a2236254b3735f6bfbbedb7925aefdd Mon Sep 17 00:00:00 2001 From: Nighty3098 <154594695+Nighty3098@users.noreply.github.com> Date: Fri, 19 Apr 2024 16:45:05 +0700 Subject: [PATCH 09/14] Update clang_format.yml --- .github/workflows/clang_format.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/clang_format.yml b/.github/workflows/clang_format.yml index 3fd1da57..e183ccf3 100644 --- a/.github/workflows/clang_format.yml +++ b/.github/workflows/clang_format.yml @@ -20,4 +20,4 @@ jobs: author_email: night3098game@gmail.com message: 'Committing clang-format changes' env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.GIT_TOKEN }} From d5ac5f2ab7f31ce316379b0bd422a68afb0699e4 Mon Sep 17 00:00:00 2001 From: Nighty3098 Date: Fri, 19 Apr 2024 10:35:23 +0000 Subject: [PATCH 10/14] Committing clang-format changes --- src/CodeKeeper/keeperFunc/projectsFunc.cpp | 10 ++- src/CodeKeeper/mainwindow.h | 86 ++++++++++------------ src/CodeKeeper/moc_predefs.h | 14 ++-- src/CodeKeeper/settingswindow.h | 12 +-- src/CodeKeeper/sql_db/projectsDB.cpp | 11 ++- src/CodeKeeper/syncwindow.h | 10 +-- 6 files changed, 69 insertions(+), 74 deletions(-) diff --git a/src/CodeKeeper/keeperFunc/projectsFunc.cpp b/src/CodeKeeper/keeperFunc/projectsFunc.cpp index c0f06dad..5f89a527 100644 --- a/src/CodeKeeper/keeperFunc/projectsFunc.cpp +++ b/src/CodeKeeper/keeperFunc/projectsFunc.cpp @@ -83,7 +83,9 @@ void MainWindow::openProject(QListWidget *listWidget, QListWidgetItem *item) QString PStatus = listWidget->objectName(); QStringList projectData = GetProjectData(&PTitle, &PStatus, &PGit); - qDebug() << "Open project: " << projectData[0] << " " << projectData[1] << " " << projectData[2] << " " << projectData[3] << " " << projectData[4] << " " << projectData[5]; + qDebug() << "Open project: " << projectData[0] << " " << projectData[1] << " " + << projectData[2] << " " << projectData[3] << " " << projectData[4] << " " + << projectData[5]; QGridLayout mainLayout(&dialog); @@ -160,7 +162,8 @@ void MainWindow::openProject(QListWidget *listWidget, QListWidgetItem *item) item->setText(itemText); qDebug() << itemText; - updateProjectData(&projectTitle, &projectLink, &projectDocumentation, ¬eT, &projectCreatedTime, &PCreatedTime, &PGit); + updateProjectData(&projectTitle, &projectLink, &projectDocumentation, ¬eT, + &projectCreatedTime, &PCreatedTime, &PGit); dialog.close(); }); @@ -168,8 +171,7 @@ void MainWindow::openProject(QListWidget *listWidget, QListWidgetItem *item) QObject::connect(cancelBtn, &QPushButton::clicked, [&]() { dialog.close(); }); dialog.exec(); - } - else { + } else { qDebug() << "Error"; } } diff --git a/src/CodeKeeper/mainwindow.h b/src/CodeKeeper/mainwindow.h index 168c6b75..193852f5 100644 --- a/src/CodeKeeper/mainwindow.h +++ b/src/CodeKeeper/mainwindow.h @@ -12,28 +12,31 @@ #include "settingswindow.h" #include "syncwindow.h" -class CustomIconProvider : public QFileIconProvider { - public: - QIcon icon(IconType type) const override { +class CustomIconProvider : public QFileIconProvider +{ +public: + QIcon icon(IconType type) const override + { switch (type) { - case QFileIconProvider::IconType::Computer: - return QIcon(":/home_dir.png"); - case QFileIconProvider::IconType::Trashcan: - return QIcon(":/trash.png"); - case QFileIconProvider::IconType::File: - return QIcon(":/document.png"); - case QFileIconProvider::IconType::Folder: - return QIcon(":/folder.png"); - default: - return QFileIconProvider::icon(type); + case QFileIconProvider::IconType::Computer: + return QIcon(":/home_dir.png"); + case QFileIconProvider::IconType::Trashcan: + return QIcon(":/trash.png"); + case QFileIconProvider::IconType::File: + return QIcon(":/document.png"); + case QFileIconProvider::IconType::Folder: + return QIcon(":/folder.png"); + default: + return QFileIconProvider::icon(type); } } }; -class MainWindow : public QMainWindow { +class MainWindow : public QMainWindow +{ Q_OBJECT - public: +public: QSettings *globalSettings; bool isVisibleNotesList; @@ -48,7 +51,7 @@ class MainWindow : public QMainWindow { MainWindow(QWidget *parent = nullptr); ~MainWindow(); - private slots: +private slots: void openSettingsWindow(); void openFolder(); @@ -69,23 +72,18 @@ class MainWindow : public QMainWindow { void removeTask(); void on_listWidget_itemClicked(QListWidgetItem *item); - void renameItemOnDoubleClick(QListWidget *listWidget, - QListWidgetItem *item); + void renameItemOnDoubleClick(QListWidget *listWidget, QListWidgetItem *item); void onNoteDoubleClicked(); void updateTasksProgress(QTabWidget *tasksTab, QListWidget *incompleteTasks, - QListWidget *inprocessTasks, - QListWidget *completeTasks, + QListWidget *inprocessTasks, QListWidget *completeTasks, QProgressBar *tasksProgress); void getTotalTasks(QTabWidget *tasksTab, QListWidget *incompleteTasks, - QListWidget *inprocessTasks, - QListWidget *completeTasks); + QListWidget *inprocessTasks, QListWidget *completeTasks); - void getTotalProjects(QTabWidget *tasksTab, - QListWidget *notStartedProjects, - QListWidget *startedProjects, - QListWidget *finishedProjects, - QListWidget *finishlineProjects); + void getTotalProjects(QTabWidget *tasksTab, QListWidget *notStartedProjects, + QListWidget *startedProjects, QListWidget *finishedProjects, + QListWidget *finishlineProjects); void loadDocumentations(QDir path, QComboBox &comboBox); void openProject(QListWidget *listWidget, QListWidgetItem *item); @@ -124,49 +122,42 @@ class MainWindow : public QMainWindow { void updateProjectStatus(QString *status, QString *createdTime, QString *oldTime); void removeProjectFromDB(QString *git_url, QString *status, QString *createdTime); void saveProjectToDB(QString *title, QString *git_url, QString *status, QString *createdTime); - void updateProjectData(QString *title, QString *git_url, QString *doc, QString *note, QString *createdTime, QString *oldTime, QString *oldGit); + void updateProjectData(QString *title, QString *git_url, QString *doc, QString *note, + QString *createdTime, QString *oldTime, QString *oldGit); void onMovingProjectFrom(QListWidgetItem *item, QListWidget *list); void onMovingProjectTo(QListWidgetItem *item, QListWidget *list); - - protected: +protected: void mousePressEvent(QMouseEvent *event) override { - if (event->button() == Qt::LeftButton) - { + if (event->button() == Qt::LeftButton) { m_dragPosition = event->globalPos() - frameGeometry().topLeft(); event->accept(); - } - else - { + } else { QMainWindow::mousePressEvent(event); } } void mouseMoveEvent(QMouseEvent *event) override { - if (event->buttons() & Qt::LeftButton) - { + if (event->buttons() & Qt::LeftButton) { move(event->globalPos() - m_dragPosition); event->accept(); - } - else - { + } else { QMainWindow::mouseMoveEvent(event); } } - private: +private: QWidget *centralWidget; QGridLayout *mainLayout; QTabWidget *tabs; QHBoxLayout *winControlL; - QSizeGrip* sizeGrip; - QSizeGrip* sizeGrip2; - QSizeGrip* sizeGrip3; - QSizeGrip* sizeGrip4; - + QSizeGrip *sizeGrip; + QSizeGrip *sizeGrip2; + QSizeGrip *sizeGrip3; + QSizeGrip *sizeGrip4; QPushButton *maximizeBtn; QPushButton *closeBtn; @@ -175,7 +166,6 @@ class MainWindow : public QMainWindow { bool isFullScreen; QPoint m_dragPosition; - // ======================================================== // main tab QLabel *mainTitle; @@ -262,4 +252,4 @@ class MainWindow : public QMainWindow { SettingsWindow *settingsWindow; }; -#endif // MAINWINDOW_H +#endif // MAINWINDOW_H diff --git a/src/CodeKeeper/moc_predefs.h b/src/CodeKeeper/moc_predefs.h index b8af5ad0..fbe267fc 100644 --- a/src/CodeKeeper/moc_predefs.h +++ b/src/CodeKeeper/moc_predefs.h @@ -10,7 +10,7 @@ #define __UINT_LEAST8_TYPE__ unsigned char #define __SIZEOF_FLOAT80__ 16 #define __BFLT16_DENORM_MIN__ 9.18354961579912115600575419704879436e-41BF16 -#define __INTMAX_C(c) c ## L +#define __INTMAX_C(c) c##L #define __CHAR_BIT__ 8 #define __UINT8_MAX__ 0xff #define __SCHAR_WIDTH__ 8 @@ -81,7 +81,7 @@ #define __SCHAR_MAX__ 0x7f #define __FLT128_MANT_DIG__ 113 #define __WCHAR_MIN__ (-__WCHAR_MAX__ - 1) -#define __INT64_C(c) c ## L +#define __INT64_C(c) c##L #define __SSP_STRONG__ 3 #define __GCC_ATOMIC_POINTER_LOCK_FREE 2 #define __ATOMIC_SEQ_CST 5 @@ -202,7 +202,7 @@ #define __FLT16_MIN_10_EXP__ (-4) #define __FLT64X_DECIMAL_DIG__ 21 #define __DEC128_MIN__ 1E-6143DL -#define __REGISTER_PREFIX__ +#define __REGISTER_PREFIX__ #define __UINT16_MAX__ 0xffff #define __FLT128_HAS_INFINITY__ 1 #define __FLT32_MIN__ 1.17549435082228750796873653722224568e-38F32 @@ -212,7 +212,7 @@ #define __FLT_MANT_DIG__ 24 #define __LDBL_DECIMAL_DIG__ 21 #define __VERSION__ "13.2.1 20230801" -#define __UINT64_C(c) c ## UL +#define __UINT64_C(c) c##UL #define __cpp_unicode_characters 201411L #define _STDC_PREDEF_H 1 #define __INT_LEAST32_MAX__ 0x7fffffff @@ -251,14 +251,14 @@ #define __FLT_RADIX__ 2 #define __INT_LEAST16_TYPE__ short int #define __LDBL_EPSILON__ 1.08420217248550443400745280086994171e-19L -#define __UINTMAX_C(c) c ## UL +#define __UINTMAX_C(c) c##UL #define __FLT16_DIG__ 3 #define __k8 1 #define __FLT32X_MIN__ 2.22507385850720138309023271733240406e-308F32x #define __SIG_ATOMIC_MAX__ 0x7fffffff #define __cpp_constexpr 201603L #define __GCC_ATOMIC_WCHAR_T_LOCK_FREE 2 -#define __USER_LABEL_PREFIX__ +#define __USER_LABEL_PREFIX__ #define __STDC_IEC_60559_BFP__ 201404L #define __SIZEOF_PTRDIFF_T__ 8 #define __FLT64X_HAS_INFINITY__ 1 @@ -400,7 +400,7 @@ #define __cpp_runtime_arrays 198712L #define __FLT32_DIG__ 6 #define __UINT64_TYPE__ long unsigned int -#define __UINT32_C(c) c ## U +#define __UINT32_C(c) c##U #define __cpp_alias_templates 200704L #define __FLT_DENORM_MIN__ 1.40129846432481707092372958328991613e-45F #define __FLT128_IS_IEC_60559__ 1 diff --git a/src/CodeKeeper/settingswindow.h b/src/CodeKeeper/settingswindow.h index b9133a81..42ef1515 100644 --- a/src/CodeKeeper/settingswindow.h +++ b/src/CodeKeeper/settingswindow.h @@ -5,9 +5,10 @@ #include #include -class SettingsWindow : public QMainWindow { +class SettingsWindow : public QMainWindow +{ Q_OBJECT - public: +public: explicit SettingsWindow(QWidget *parent = nullptr); ~SettingsWindow(); QSettings *globalSettings; @@ -25,7 +26,7 @@ class SettingsWindow : public QMainWindow { bool isHostB; bool isAutoSyncB; - private slots: +private slots: void closeEvent(QCloseEvent *event); void QuitW(); void checkUpdates(); @@ -34,8 +35,7 @@ class SettingsWindow : public QMainWindow { void setFontPr2(); - - private: +private: QWidget *centralWidget; QVBoxLayout *mainLayout; QTabWidget *tabs; @@ -85,4 +85,4 @@ class SettingsWindow : public QMainWindow { QPushButton *openFolder; }; -#endif // SETTINGSWINDOW_H +#endif // SETTINGSWINDOW_H diff --git a/src/CodeKeeper/sql_db/projectsDB.cpp b/src/CodeKeeper/sql_db/projectsDB.cpp index 88ab5a9a..a078c6d9 100644 --- a/src/CodeKeeper/sql_db/projectsDB.cpp +++ b/src/CodeKeeper/sql_db/projectsDB.cpp @@ -29,7 +29,8 @@ QStringList MainWindow::GetProjectData(QString *title, QString *status, QString QStringList projectData; QSqlQuery query; - if (query.exec("SELECT * FROM projects WHERE status = '" + *status + "' AND title = '" + *title + "' AND git_url = '" + *git_url + "'")) { + if (query.exec("SELECT * FROM projects WHERE status = '" + *status + "' AND title = '" + *title + + "' AND git_url = '" + *git_url + "'")) { if (query.next()) { projectData << query.value("title").toString(); projectData << query.value("git_url").toString(); @@ -39,8 +40,7 @@ QStringList MainWindow::GetProjectData(QString *title, QString *status, QString projectData << query.value("createdTime").toString(); qDebug() << "Load project: " << projectData; } - } - else { + } else { qDebug() << "Error querying projects database:" << query.lastError(); } return projectData; @@ -51,7 +51,10 @@ void MainWindow::updateProjectData(QString *title, QString *git_url, QString *do { QSqlQuery query; - if (!query.exec("UPDATE projects SET title = '" + *title + "', git_url = '" + *git_url + "', projectDoc = '" + *doc + "', note = '" + *note + "', createdTime = '" + *createdTime + "' WHERE createdTime = '" + *oldTime + "' AND git_url = '" + oldGit + "'")) { + if (!query.exec("UPDATE projects SET title = '" + *title + "', git_url = '" + *git_url + + "', projectDoc = '" + *doc + "', note = '" + *note + "', createdTime = '" + + *createdTime + "' WHERE createdTime = '" + *oldTime + "' AND git_url = '" + + oldGit + "'")) { qDebug() << query.lastError(); } else { qDebug() << "Sucsessfull updated"; diff --git a/src/CodeKeeper/syncwindow.h b/src/CodeKeeper/syncwindow.h index dc0da800..34a00a46 100644 --- a/src/CodeKeeper/syncwindow.h +++ b/src/CodeKeeper/syncwindow.h @@ -3,18 +3,18 @@ #include -class SyncWindow : public QMainWindow { +class SyncWindow : public QMainWindow +{ Q_OBJECT public: SyncWindow(QWidget *parent = nullptr); ~SyncWindow(); - private slots: +private slots: - protected: - - private: +protected: +private: }; #endif // MAINWINDOW_H From d94c3a48a06c83f899a299f6a263473abf62c0f4 Mon Sep 17 00:00:00 2001 From: Nighty3098 <154594695+Nighty3098@users.noreply.github.com> Date: Fri, 19 Apr 2024 17:42:09 +0700 Subject: [PATCH 11/14] Create build_project.yml --- .github/workflows/build_project.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 .github/workflows/build_project.yml diff --git a/.github/workflows/build_project.yml b/.github/workflows/build_project.yml new file mode 100644 index 00000000..c7bccc5b --- /dev/null +++ b/.github/workflows/build_project.yml @@ -0,0 +1,10 @@ +name: Run clang-format Linter +on: [push, pull_request, fork] + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - name: building + run: bash build.sh From 3fe059625b0516d9815d7eb1f7fb7993f178b504 Mon Sep 17 00:00:00 2001 From: Nighty3098 <154594695+Nighty3098@users.noreply.github.com> Date: Fri, 19 Apr 2024 17:42:48 +0700 Subject: [PATCH 12/14] Update build_project.yml --- .github/workflows/build_project.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_project.yml b/.github/workflows/build_project.yml index c7bccc5b..5ccb4a86 100644 --- a/.github/workflows/build_project.yml +++ b/.github/workflows/build_project.yml @@ -7,4 +7,4 @@ jobs: steps: - name: building - run: bash build.sh + run: bash CodeKeeper/build.sh From 43b5d931309b852542e2f07cac94197bb9652fcf Mon Sep 17 00:00:00 2001 From: Nighty3098 <154594695+Nighty3098@users.noreply.github.com> Date: Fri, 19 Apr 2024 17:44:03 +0700 Subject: [PATCH 13/14] Update build_project.yml --- .github/workflows/build_project.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_project.yml b/.github/workflows/build_project.yml index 5ccb4a86..76a982f1 100644 --- a/.github/workflows/build_project.yml +++ b/.github/workflows/build_project.yml @@ -1,4 +1,4 @@ -name: Run clang-format Linter +name: Build project on: [push, pull_request, fork] jobs: From 7d7eec7057980fc4139137c24eebe2b2eeb676e4 Mon Sep 17 00:00:00 2001 From: Nighty3098 Date: Fri, 19 Apr 2024 17:53:30 +0700 Subject: [PATCH 14/14] Fix --- src/CodeKeeper/.gitignore | 1 + src/CodeKeeper/keeperFunc/projectsFunc.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/CodeKeeper/.gitignore b/src/CodeKeeper/.gitignore index 4a0b530a..324d4361 100644 --- a/src/CodeKeeper/.gitignore +++ b/src/CodeKeeper/.gitignore @@ -2,6 +2,7 @@ # ---------------------------------------------------------------------------- *~ +*.db *.autosave *.a *.core diff --git a/src/CodeKeeper/keeperFunc/projectsFunc.cpp b/src/CodeKeeper/keeperFunc/projectsFunc.cpp index 5f89a527..723b7ab1 100644 --- a/src/CodeKeeper/keeperFunc/projectsFunc.cpp +++ b/src/CodeKeeper/keeperFunc/projectsFunc.cpp @@ -72,7 +72,7 @@ void MainWindow::openProject(QListWidget *listWidget, QListWidgetItem *item) QDialog dialog(this); dialog.setFixedSize(400, 460); dialog.setWindowTitle(tr("Edit project")); - dialog.setWindowFlags(Qt::Window | Qt::FramelessWindowHint); + dialog->setWindowFlags(windowFlags() | Qt::FramelessWindowHint); QString data = item->text(); QStringList splitData = data.split("\n");