Merge pull request #84 from Nighty3098/InDev

In dev
DXS-GROUP · Jun 4, 2024 · 2851fea · 2851fea
2 parents ba812dc + cfbe629
commit 2851fea
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/src/CodeKeeper/mainwindow.cpp b/src/CodeKeeper/mainwindow.cpp
@@ -101,7 +101,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
     openSettingsBtn->setFixedSize(15, 15);
 
     // sync btn
-    syncDataBtn = new QPushButton(QPixmap(":/retry.png")
+    syncDataBtn = new QPushButton(QPixmap(":/sync.png")
                                           .scaled(font_size.toInt() + 1, font_size.toInt() + 1,
                                                   Qt::KeepAspectRatio, Qt::SmoothTransformation),
                                   "");

diff --git a/src/CodeKeeper/settingsFunc/functional.cpp b/src/CodeKeeper/settingsFunc/functional.cpp
@@ -49,7 +49,8 @@ void SettingsWindow::checkUpdates()
                                "}");
 
     QLabel *iconLabel = new QLabel();
-    iconLabel->setPixmap(QPixmap(":/refresh.png").scaled(100, 100, Qt::KeepAspectRatio, Qt::SmoothTransformation));
+    iconLabel->setPixmap(QPixmap(":/refresh.png")
+                                 .scaled(100, 100, Qt::KeepAspectRatio, Qt::SmoothTransformation));
 
     QLabel *updateInfoLabel = new QLabel();
     updateInfoLabel->setStyleSheet("font-size: " + font_size + "pt;");
@@ -73,7 +74,8 @@ void SettingsWindow::checkUpdates()
         verInfoLabel->setText("Current version: " + currentAppVersion);
     } else {
         updateInfoLabel->setText("A new version of the application is available.");
-        verInfoLabel->setText("Current version: " + currentAppVersion + "\nNew version: " + newAppVersion);
+        verInfoLabel->setText("Current version: " + currentAppVersion
+                              + "\nNew version: " + newAppVersion);
         layout->addWidget(downloadUpdate, 6, 0, 1, 2, Qt::AlignCenter);
     }
 
@@ -90,7 +92,8 @@ void SettingsWindow::checkUpdates()
 
         qDebug() << "File path: " << dir;
 
-        downloadFileFromLatestRelease("Nighty3098", "CodeKeeper", "CodeKeeper", updateInfoLabel, git_user, git_token);
+        downloadFileFromLatestRelease("Nighty3098", "CodeKeeper", "CodeKeeper", updateInfoLabel,
+                                      git_user, git_token);
 
         verInfoLabel->hide();
         downloadUpdate->hide();

diff --git a/src/CodeKeeper/settingswindow.cpp b/src/CodeKeeper/settingswindow.cpp
@@ -257,7 +257,7 @@ SettingsWindow::SettingsWindow(QWidget *parent) : QMainWindow{ parent }
     CisRelease->setChecked(isRelease);
     CisIssue = new QCheckBox("Issues");
     CisIssue->setChecked(isIssue);
-    CisDownloads = new QCheckBox("downloads");
+    CisDownloads = new QCheckBox("Downloads");
     CisDownloads->setChecked(isDownloads);
     CisCommit = new QCheckBox("Commits");
     CisCommit->setChecked(isCommit);
@@ -329,7 +329,7 @@ SettingsWindow::SettingsWindow(QWidget *parent) : QMainWindow{ parent }
     QIcon projectsIco;
 
     aboutIco.addFile(":/about.png");
-    syncIco.addFile(":/refresh.png");
+    syncIco.addFile(":/sync.png");
     storageIco.addFile(":/storage.png");
     paletteIco.addFile(":/palette.png");
     projectsIco.addFile(":/project.png");

diff --git a/src/resources/resources.qrc b/src/resources/resources.qrc
@@ -1,6 +1,7 @@
 <RCC>
     <qresource prefix="/">
     	<file>download.png</file>
+        <file>sync.png</file>
         <file>user.png</file>
         <file>copy.png</file>
         <file>delete.png</file>

diff --git a/src/resources/sync.png b/src/resources/sync.png