Merge pull request #171 from Nighty3098/InDev

Fix
Nighty3098 · Oct 9, 2024 · df440a2 · df440a2
2 parents 3d407e7 + 3861d55
commit df440a2
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 31 deletions.
diff --git a/src/CodeKeeper/CodeKeeper b/src/CodeKeeper/CodeKeeper
diff --git a/src/CodeKeeper/CodeKeeper_ru_RU.ts b/src/CodeKeeper/CodeKeeper_ru_RU.ts
@@ -447,67 +447,72 @@ Languages</source>
         <translation>Авто синхронизация отключена</translation>
     </message>
     <message>
-        <location filename="keeperFunc/functional.cpp" line="311"/>
+        <location filename="keeperFunc/functional.cpp" line="197"/>
+        <source>Do you really want to delete all the data?</source>
+        <translation>Вы действительно хотите удалить данные?</translation>
+    </message>
+    <message>
+        <location filename="keeperFunc/functional.cpp" line="337"/>
         <source>Select a directory</source>
         <translation>Выбрать директорию</translation>
     </message>
     <message>
-        <location filename="keeperFunc/functional.cpp" line="598"/>
+        <location filename="keeperFunc/functional.cpp" line="624"/>
         <source>Set heading 1</source>
         <translation>Установить заголовок 1</translation>
     </message>
     <message>
-        <location filename="keeperFunc/functional.cpp" line="599"/>
+        <location filename="keeperFunc/functional.cpp" line="625"/>
         <source>Set heading 2</source>
         <translation>Установить заголовок 2</translation>
     </message>
     <message>
-        <location filename="keeperFunc/functional.cpp" line="600"/>
+        <location filename="keeperFunc/functional.cpp" line="626"/>
         <source>Set heading 3</source>
         <translation>Установить заголовок 3</translation>
     </message>
     <message>
-        <location filename="keeperFunc/functional.cpp" line="601"/>
+        <location filename="keeperFunc/functional.cpp" line="627"/>
         <source>List</source>
         <translation>Список</translation>
     </message>
     <message>
-        <location filename="keeperFunc/functional.cpp" line="602"/>
+        <location filename="keeperFunc/functional.cpp" line="628"/>
         <source>Link</source>
         <translation>Ссылка</translation>
     </message>
     <message>
-        <location filename="keeperFunc/functional.cpp" line="603"/>
+        <location filename="keeperFunc/functional.cpp" line="629"/>
         <source>Bold text</source>
         <translation>Жирный</translation>
     </message>
     <message>
-        <location filename="keeperFunc/functional.cpp" line="604"/>
+        <location filename="keeperFunc/functional.cpp" line="630"/>
         <source>Italic text</source>
         <translation>Курсив</translation>
     </message>
     <message>
-        <location filename="keeperFunc/functional.cpp" line="605"/>
+        <location filename="keeperFunc/functional.cpp" line="631"/>
         <source>Strikethrough text</source>
         <translation>Зачёркивание</translation>
     </message>
     <message>
-        <location filename="keeperFunc/functional.cpp" line="606"/>
+        <location filename="keeperFunc/functional.cpp" line="632"/>
         <source>Task</source>
         <translation>Задача</translation>
     </message>
     <message>
-        <location filename="keeperFunc/functional.cpp" line="607"/>
+        <location filename="keeperFunc/functional.cpp" line="633"/>
         <source>Numbered list</source>
         <translation>Пронумерованный список</translation>
     </message>
     <message>
-        <location filename="keeperFunc/functional.cpp" line="608"/>
+        <location filename="keeperFunc/functional.cpp" line="634"/>
         <source>Insert table</source>
         <translation>Вставить таблицу</translation>
     </message>
     <message>
-        <location filename="keeperFunc/functional.cpp" line="609"/>
+        <location filename="keeperFunc/functional.cpp" line="635"/>
         <source>Set quote</source>
         <translation>Вставить выноску</translation>
     </message>
@@ -656,6 +661,7 @@ Languages</source>
         <translation>Отмена</translation>
     </message>
     <message>
+        <location filename="keeperFunc/functional.cpp" line="198"/>
         <location filename="mainwindow.cpp" line="44"/>
         <source>CodeKeeper</source>
         <translation></translation>

diff --git a/src/CodeKeeper/commandPalette.cpp b/src/CodeKeeper/commandPalette.cpp
@@ -55,15 +55,13 @@ CommandPalette::CommandPalette(QWidget *parent) : QMainWindow{parent}
     syncItem = new QListWidgetItem(tr("Sync"));
     helpItem = new QListWidgetItem(tr("Help"));
     aboutItem = new QListWidgetItem(tr("About"));
-    checkUpdatesItem = new QListWidgetItem(tr("Check for updates"));
     clearAllDataItem = new QListWidgetItem(tr("Remove all data"));
     userProfileItem = new QListWidgetItem(tr("User account"));
 
     listItems->addItem(settingsItem);
     listItems->addItem(syncItem);
     listItems->addItem(aboutItem);
     listItems->addItem(helpItem);
-    listItems->addItem(checkUpdatesItem);
     listItems->addItem(clearAllDataItem);
     listItems->addItem(userProfileItem);
 

diff --git a/src/CodeKeeper/keeperFunc/commandsFunc.cpp b/src/CodeKeeper/keeperFunc/commandsFunc.cpp
@@ -63,25 +63,33 @@ void CommandPalette::activateCommand(QListWidgetItem *item)
     MainWindow *mainWindow = static_cast<MainWindow *>(parent());
     SettingsWindow *settingsWindow = static_cast<SettingsWindow *>(parent());
 
-    if (item == settingsItem) {
+    if (item == settingsItem)
+    {
         qDebug() << "Run settings action";
         mainWindow->openSettingsWindow();
-    } else if (item == syncItem) {
+    }
+    else if (item == syncItem)
+    {
         qDebug() << "Run sync action";
         mainWindow->openSyncWindow();
-    } else if (item == helpItem) {
+    }
+    else if (item == helpItem)
+    {
         qDebug() << "Run help action";
         QDesktopServices::openUrl(QUrl("https://github.com/Nighty3098/CodeKeeper/wiki"));
-    } else if (item == aboutItem) {
+    }
+    else if (item == aboutItem)
+    {
         qDebug() << "Run about action";
         QDesktopServices::openUrl(QUrl("https://github.com/Nighty3098/CodeKeeper"));
-    } else if (item == checkUpdatesItem) {
-        qDebug() << "Run updates action";
-        settingsWindow->checkUpdates();
-    } else if (item == clearAllDataItem) {
+    }
+    else if (item == clearAllDataItem)
+    {
         qDebug() << "Run rm_data action";
         mainWindow->deleteAllData();
-    } else if (item == userProfileItem) {
+    }
+    else if (item == userProfileItem)
+    {
         qDebug() << "Run account action";
         mainWindow->fOpenAccountWindow();
     }

diff --git a/src/CodeKeeper/keeperFunc/functional.cpp b/src/CodeKeeper/keeperFunc/functional.cpp
@@ -191,28 +191,38 @@ void MainWindow::createCustomTitlebar()
     }
 }
 
-void MainWindow::deleteAllData() {
+void MainWindow::deleteAllData()
+{
     QMessageBox reply;
     reply.setWindowFlags(Qt::FramelessWindowHint);
     reply.setText(tr("Do you really want to delete all the data?"));
     reply.setWindowTitle(tr("CodeKeeper"));
     reply.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
     reply.setDefaultButton(QMessageBox::No);
 
-    if (reply.exec() == QMessageBox::Yes) {
-        if (QFile::exists(dir)) {
-            if (QFile::remove(dir)) {
+    if (reply.exec() == QMessageBox::Yes)
+    {
+        if (QFile::exists(dir))
+        {
+            if (QFile::remove(dir))
+            {
                 qDebug() << "File" << dir << "deleted";
-            } else {
+            }
+            else
+            {
                 qDebug() << "Error: " << dir;
             }
-        } else {
+        }
+        else
+        {
             qDebug() << "File" << dir << "not found.";
         }
 
         globalSettings->clear();
         qDebug() << "Data deleted";
-    } else {
+    }
+    else
+    {
         qDebug() << "Data deletion cancelled by user.";
     }
 }