TextManager should not know anything about the SettingsManager

trikset · Jan 27, 2025 · 78df9dd · 78df9dd
1 parent 70c2cad
commit 78df9dd
Show file tree

Hide file tree

Showing 9 changed files with 42 additions and 43 deletions.
diff --git a/qrgui/mainWindow/mainWindow.cpp b/qrgui/mainWindow/mainWindow.cpp
@@ -342,6 +342,7 @@ void MainWindow::connectActions()
 	connect(mUi->tabs, &QTabWidget::currentChanged, this, &MainWindow::sceneSelectionChanged);
 	connect(&*mTextManager, &text::TextManager::textChanged, this, &MainWindow::setTextChanged);
 	connect(&*mTextManager, &text::TextManager::textChanged, mUi->actionUndo, &QAction::setEnabled);
+	connect(&*mTextManager, &text::TextManager::needRefreshRecentFileList, this, &MainWindow::refreshRecentFilesList);
 
 	connect(&*mProjectManager, &ProjectManager::afterOpen, mUi->paletteTree, &PaletteTree::refreshUserPalettes);
 	connect(&*mProjectManager, &ProjectManager::closed, mUi->paletteTree, &PaletteTree::refreshUserPalettes);
@@ -597,6 +598,31 @@ void MainWindow::refreshRecentProjectsList(const QString &fileName)
 	SettingsManager::setValue("recentProjects", previousString);
 }
 
+void MainWindow::refreshRecentFilesList(const QString &fileName) {
+	auto previousString = SettingsManager::value("recentFiles").toString();
+	auto previousList = previousString.split(";", QString::SkipEmptyParts);
+	previousList.removeOne(fileName);
+
+	if (!previousList.isEmpty() && (previousList.size() == mRecentFilesLimit)) {
+		previousList.removeLast();
+	}
+
+	previousString.clear();
+	if (mRecentFilesLimit > 0) {
+		previousList.push_front(fileName);
+		QStringListIterator iterator(previousList);
+		while (iterator.hasNext()) {
+			const auto recentFileName = iterator.next();
+			const QFileInfo fileInfo(recentFileName);
+			if (fileInfo.exists() && fileInfo.isFile()) {
+				previousString = previousString + recentFileName + ";";
+			}
+		}
+	}
+
+	SettingsManager::setValue("recentFiles", previousString);
+}
+
 void MainWindow::openRecentProjectsMenu()
 {
 	mRecentProjectsMenu->clear();

diff --git a/qrgui/mainWindow/mainWindow.h b/qrgui/mainWindow/mainWindow.h
@@ -195,6 +195,7 @@ public slots:
 	void closeStartTab();
 	void closeAllTabs();
 	void refreshRecentProjectsList(const QString &fileName);
+	void refreshRecentFilesList(const QString &fileName);
 	void createDiagram(const QString &idString);
 	/// Creates project with specified root diagram
 	bool createProject(const QString &diagramIdString);

diff --git a/qrgui/textEditor/textManager.cpp b/qrgui/textEditor/textManager.cpp
@@ -30,8 +30,7 @@ using namespace qReal;
 using namespace text;
 
 TextManager::TextManager(SystemEvents &systemEvents, gui::MainWindowInterpretersInterface &mainWindow)
-	: mRecentFilesLimit(SettingsManager::value("recentFilesLimit").toInt())
-	, mMainWindow(mainWindow)
+	: mMainWindow(mainWindow)
 	, mSystemEvents(systemEvents)
 {
 	connect(&mSystemEvents, &SystemEvents::codeTabClosed, this, &TextManager::onTabClosed);
@@ -239,31 +238,6 @@ void TextManager::showInTextEditor(const QFileInfo &fileInfo
 	}
 }
 
-void TextManager::refreshRecentFilesList(const QString &fileName) {
-	auto previousString = SettingsManager::value("recentFiles").toString();
-	auto previousList = previousString.split(";", QString::SkipEmptyParts);
-	previousList.removeOne(fileName);
-
-	if (!previousList.isEmpty() && (previousList.size() == mRecentFilesLimit)) {
-		previousList.removeLast();
-	}
-
-	previousString.clear();
-	if (mRecentFilesLimit > 0) {
-		previousList.push_front(fileName);
-		QStringListIterator iterator(previousList);
-		while (iterator.hasNext()) {
-			const auto recentFileName = iterator.next();
-			const QFileInfo fileInfo(recentFileName);
-			if (fileInfo.exists() && fileInfo.isFile()) {
-				previousString = previousString + recentFileName + ";";
-			}
-		}
-	}
-
-	SettingsManager::setValue("recentFiles", previousString);
-}
-
 void TextManager::showInTextEditor(const QFileInfo &fileInfo, const text::LanguageInfo &language)
 {
 	Q_ASSERT(!fileInfo.completeBaseName().isEmpty());
@@ -280,7 +254,7 @@ void TextManager::showInTextEditor(const QFileInfo &fileInfo, const text::Langua
 		return;
 	}
 
-	refreshRecentFilesList(filePath);
+	emit needRefreshRecentFileList(filePath);
 	area->show();
 
 	// Need to bind diagram and code file only if code is just generated
@@ -331,7 +305,7 @@ bool TextManager::saveText(bool saveAs)
 			emit mSystemEvents.codePathChanged(diagram, path(area), fileInfo);
 		}
 
-		refreshRecentFilesList(fileInfo.absoluteFilePath());
+		emit needRefreshRecentFileList(fileInfo.absoluteFilePath());
 	}
 
 	return true;

diff --git a/qrgui/textEditor/textManager.h b/qrgui/textEditor/textManager.h
@@ -17,7 +17,6 @@
 #include <QtCore/QObject>
 #include <QtCore/QMap>
 #include <QtCore/QMultiHash>
-#include <qrkernel/settingsManager.h>
 #include "qrgui/textEditor/textEditorDeclSpec.h"
 #include "qrgui/textEditor/textManagerInterface.h"
 #include "qrgui/textEditor/codeBlockManager.h"
@@ -82,14 +81,12 @@ private slots:
 	void onTabClosed(const QFileInfo &file);
 
 private:
-
-	void refreshRecentFilesList(const QString &fileName);
 	QMap<QString, text::QScintillaTextEdit*> mText; // No ownership
 	QMap<text::QScintillaTextEdit*, QString> mPath; // No ownership
 
 	/// If default path - true.
 	QMap<QString, bool> mPathType;
-	int mRecentFilesLimit {};
+
 	/// Contains names of generator, which generate each file
 	QMap<QString, QString> mGeneratorName;
 

diff --git a/qrgui/textEditor/textManagerInterface.h b/qrgui/textEditor/textManagerInterface.h
@@ -56,6 +56,7 @@ class QRGUI_TEXT_EDITOR_EXPORT TextManagerInterface : public QObject
 
 signals:
 	void textChanged(text::QScintillaTextEdit *editor, bool changed);
+	void needRefreshRecentFileList(const QString &fileName);
 };
 
 }
diff --git a/qrtranslations/fr/qrgui_mainWindow_fr.ts b/qrtranslations/fr/qrgui_mainWindow_fr.ts
@@ -708,7 +708,7 @@
 <context>
     <name>qReal::MainWindow</name>
     <message>
-        <location filename="../../qrgui/mainWindow/mainWindow.cpp" line="+641"/>
+        <location filename="../../qrgui/mainWindow/mainWindow.cpp" line="+667"/>
         <source>Could not save file, try to save it to another place</source>
         <translation type="unfinished"></translation>
     </message>
@@ -717,7 +717,7 @@
         <translation type="vanished">À propo de QReal</translation>
     </message>
     <message>
-        <location line="-445"/>
+        <location line="-471"/>
         <source>Restore default settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -729,7 +729,7 @@ WARNING: The settings will be restored after application restart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+693"/>
+        <location line="+719"/>
         <location line="+11"/>
         <source>Error</source>
         <translation>Erreur</translation>

diff --git a/qrtranslations/fr/qrgui_textEditor_fr.ts b/qrtranslations/fr/qrgui_textEditor_fr.ts
@@ -4,7 +4,7 @@
 <context>
     <name>qReal::text::TextManager</name>
     <message>
-        <location filename="../../qrgui/textEditor/textManager.cpp" line="+87"/>
+        <location filename="../../qrgui/textEditor/textManager.cpp" line="+86"/>
         <source>Confirmation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14,7 +14,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+218"/>
+        <location line="+193"/>
         <source>All files (*)</source>
         <translation>Tous les fichiers (*)</translation>
     </message>

diff --git a/qrtranslations/ru/qrgui_mainWindow_ru.ts b/qrtranslations/ru/qrgui_mainWindow_ru.ts
@@ -735,7 +735,7 @@
         <translation type="vanished">О QReal</translation>
     </message>
     <message>
-        <location filename="../../qrgui/mainWindow/mainWindow.cpp" line="+890"/>
+        <location filename="../../qrgui/mainWindow/mainWindow.cpp" line="+916"/>
         <location line="+11"/>
         <source>Error</source>
         <translation>Ошибка</translation>
@@ -788,7 +788,7 @@
         <translation>Создать диаграмму</translation>
     </message>
     <message>
-        <location line="-1067"/>
+        <location line="-1093"/>
         <source>Restore default settings</source>
         <translation>Восстановить настройки по-умолчанию</translation>
     </message>
@@ -802,7 +802,7 @@ WARNING: The settings will be restored after application restart</source>
 ВНИМАНИЕ: Настройки будут сброшены после перезапуска приложения</translation>
     </message>
     <message>
-        <location line="+444"/>
+        <location line="+470"/>
         <source>Could not save file, try to save it to another place</source>
         <translation>Не удалось сохранить файл, попробуйте сохранить его в другое место</translation>
     </message>

diff --git a/qrtranslations/ru/qrgui_textEditor_ru.ts b/qrtranslations/ru/qrgui_textEditor_ru.ts
@@ -42,7 +42,7 @@
 <context>
     <name>qReal::text::TextManager</name>
     <message>
-        <location filename="../../qrgui/textEditor/textManager.cpp" line="+87"/>
+        <location filename="../../qrgui/textEditor/textManager.cpp" line="+86"/>
         <source>Confirmation</source>
         <translation>Подтвердите</translation>
     </message>
@@ -56,7 +56,7 @@
         <translation>Сохранить перед закрытием?</translation>
     </message>
     <message>
-        <location line="+218"/>
+        <location line="+193"/>
         <source>All files (*)</source>
         <translation>Все файлы (*)</translation>
     </message>