feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

CMake: Use setup functions for a few more cmake related items

Browse Source 
Change-Id: I7a1bbea9507d7d168584348a51d557f4a910de47
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
This commit is contained in:
hjk
2024-01-29 14:27:33 +01:00
parent cc64c84b5f
commit 5646aae859
7 changed files with 69 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
View File

@@ -803,11 +803,20 @@ void CMakeBuildStep::updateDeploymentData()
// CMakeBuildStepFactory // CMakeBuildStepFactory
CMakeBuildStepFactory::CMakeBuildStepFactory() class CMakeBuildStepFactory final : public BuildStepFactory
{ {
registerStep<CMakeBuildStep>(Constants::CMAKE_BUILD_STEP_ID); public:
setDisplayName(Tr::tr("CMake Build", "Display name for CMakeProjectManager::CMakeBuildStep id.")); CMakeBuildStepFactory()
setSupportedProjectType(Constants::CMAKE_PROJECT_ID); {
registerStep<CMakeBuildStep>(Constants::CMAKE_BUILD_STEP_ID);
setDisplayName(Tr::tr("CMake Build", "Display name for CMakeProjectManager::CMakeBuildStep id."));
setSupportedProjectType(Constants::CMAKE_PROJECT_ID);
}
};
void setupCMakeBuildStep()
{
static CMakeBuildStepFactory theCMakeBuildStepFactory;
} }
} // CMakeProjectManager::Internal } // CMakeProjectManager::Internal

6
src/plugins/cmakeprojectmanager/cmakebuildstep.h
View File

@@ -118,10 +118,6 @@ private:
std::optional<QString> m_configuration; std::optional<QString> m_configuration;
}; };
class CMakeBuildStepFactory : public ProjectExplorer::BuildStepFactory void setupCMakeBuildStep();
{
public:
CMakeBuildStepFactory();
};
} // CMakeProjectManager::Internal } // CMakeProjectManager::Internal

58
src/plugins/cmakeprojectmanager/cmakeeditor.cpp
View File

@@ -25,14 +25,13 @@
#include <texteditor/basehoverhandler.h> #include <texteditor/basehoverhandler.h>
#include <texteditor/textdocument.h> #include <texteditor/textdocument.h>
#include <texteditor/texteditor.h>
#include <texteditor/texteditoractionhandler.h> #include <texteditor/texteditoractionhandler.h>
#include <utils/mimeconstants.h> #include <utils/mimeconstants.h>
#include <utils/textutils.h> #include <utils/textutils.h>
#include <utils/tooltip/tooltip.h> #include <utils/tooltip/tooltip.h>
#include <QTextDocument>
#include <functional> #include <functional>
using namespace Core; using namespace Core;
@@ -501,38 +500,45 @@ void CMakeHoverHandler::operateTooltip(TextEditorWidget *editorWidget, const QPo
setToolTip(m_helpToolTip); setToolTip(m_helpToolTip);
} }
//
// CMakeEditorFactory // CMakeEditorFactory
//
CMakeEditorFactory::CMakeEditorFactory() class CMakeEditorFactory final : public TextEditorFactory
{ {
setId(Constants::CMAKE_EDITOR_ID); public:
setDisplayName(::Core::Tr::tr("CMake Editor")); CMakeEditorFactory()
addMimeType(Utils::Constants::CMAKE_MIMETYPE); {
addMimeType(Utils::Constants::CMAKE_PROJECT_MIMETYPE); setId(Constants::CMAKE_EDITOR_ID);
setDisplayName(::Core::Tr::tr("CMake Editor"));
addMimeType(Utils::Constants::CMAKE_MIMETYPE);
addMimeType(Utils::Constants::CMAKE_PROJECT_MIMETYPE);
setEditorCreator([] { return new CMakeEditor; }); setEditorCreator([] { return new CMakeEditor; });
setEditorWidgetCreator([] { return new CMakeEditorWidget; }); setEditorWidgetCreator([] { return new CMakeEditorWidget; });
setDocumentCreator(createCMakeDocument); setDocumentCreator(createCMakeDocument);
setIndenterCreator(createCMakeIndenter); setIndenterCreator(createCMakeIndenter);
setUseGenericHighlighter(true); setUseGenericHighlighter(true);
setCommentDefinition(Utils::CommentDefinition::HashStyle); setCommentDefinition(Utils::CommentDefinition::HashStyle);
setCodeFoldingSupported(true); setCodeFoldingSupported(true);
setCompletionAssistProvider(new CMakeFileCompletionAssistProvider); setCompletionAssistProvider(new CMakeFileCompletionAssistProvider);
setAutoCompleterCreator([] { return new CMakeAutoCompleter; }); setAutoCompleterCreator([] { return new CMakeAutoCompleter; });
setEditorActionHandlers(TextEditorActionHandler::UnCommentSelection setEditorActionHandlers(TextEditorActionHandler::UnCommentSelection
| TextEditorActionHandler::FollowSymbolUnderCursor | TextEditorActionHandler::FollowSymbolUnderCursor
| TextEditorActionHandler::Format); | TextEditorActionHandler::Format);
addHoverHandler(new CMakeHoverHandler); addHoverHandler(new CMakeHoverHandler);
ActionContainer *contextMenu = ActionManager::createMenu(Constants::M_CONTEXT); ActionContainer *contextMenu = ActionManager::createMenu(Constants::M_CONTEXT);
contextMenu->addAction(ActionManager::command(TextEditor::Constants::FOLLOW_SYMBOL_UNDER_CURSOR)); contextMenu->addAction(ActionManager::command(TextEditor::Constants::FOLLOW_SYMBOL_UNDER_CURSOR));
contextMenu->addSeparator(Context(Constants::CMAKE_EDITOR_ID)); contextMenu->addSeparator(Context(Constants::CMAKE_EDITOR_ID));
contextMenu->addAction(ActionManager::command(TextEditor::Constants::UN_COMMENT_SELECTION)); contextMenu->addAction(ActionManager::command(TextEditor::Constants::UN_COMMENT_SELECTION));
}
};
void setupCMakeEditor()
{
static CMakeEditorFactory theCMakeEditorFactory;
} }
} // CMakeProjectManager::Internal } // CMakeProjectManager::Internal

8
src/plugins/cmakeprojectmanager/cmakeeditor.h
View File

@@ -3,14 +3,8 @@
#pragma once #pragma once
#include <texteditor/texteditor.h>
namespace CMakeProjectManager::Internal { namespace CMakeProjectManager::Internal {
class CMakeEditorFactory : public TextEditor::TextEditorFactory void setupCMakeEditor();
{
public:
CMakeEditorFactory();
};
} // CMakeProjectManager::Internal } // CMakeProjectManager::Internal

9
src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp
View File

@@ -52,11 +52,7 @@ public:
Action::AlwaysEnabled/*handled manually*/ Action::AlwaysEnabled/*handled manually*/
}; };
CMakeSettingsPage settingsPage;
CMakeBuildStepFactory buildStepFactory;
CMakeBuildConfigurationFactory buildConfigFactory; CMakeBuildConfigurationFactory buildConfigFactory;
CMakeEditorFactory editorFactor;
CMakeInstallStepFactory installStepFactory; CMakeInstallStepFactory installStepFactory;
CMakeBuildTargetFilter cMakeBuildTargetFilter; CMakeBuildTargetFilter cMakeBuildTargetFilter;
CMakeOpenTargetFilter cMakeOpenTargetFilter; CMakeOpenTargetFilter cMakeOpenTargetFilter;
@@ -78,6 +74,11 @@ class CMakeProjectPlugin final : public ExtensionSystem::IPlugin
{ {
setupCMakeToolManager(this); setupCMakeToolManager(this);
setupCMakeSettingsPage();
setupCMakeBuildStep();
setupCMakeEditor();
d = new CMakeProjectPluginPrivate; d = new CMakeProjectPluginPrivate;
setupCMakeManager(); setupCMakeManager();

24
src/plugins/cmakeprojectmanager/cmakesettingspage.cpp
View File

@@ -10,6 +10,7 @@
#include <coreplugin/dialogs/ioptionspage.h> #include <coreplugin/dialogs/ioptionspage.h>
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
#include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectexplorerconstants.h>
#include <utils/detailswidget.h> #include <utils/detailswidget.h>
@@ -652,17 +653,24 @@ void CMakeToolConfigWidget::currentCMakeToolChanged(const QModelIndex &newCurren
m_makeDefButton->setEnabled(m_currentItem && (!m_model.defaultItemId().isValid() || m_currentItem->m_id != m_model.defaultItemId())); m_makeDefButton->setEnabled(m_currentItem && (!m_model.defaultItemId().isValid() || m_currentItem->m_id != m_model.defaultItemId()));
} }
//
// CMakeSettingsPage // CMakeSettingsPage
//
CMakeSettingsPage::CMakeSettingsPage() class CMakeSettingsPage final : public Core::IOptionsPage
{ {
setId(Constants::Settings::TOOLS_ID); public:
setDisplayName(Tr::tr("Tools")); CMakeSettingsPage()
setDisplayCategory("CMake"); {
setCategory(Constants::Settings::CATEGORY); setId(Constants::Settings::TOOLS_ID);
setWidgetCreator([] { return new CMakeToolConfigWidget; }); setDisplayName(Tr::tr("Tools"));
setDisplayCategory("CMake");
setCategory(Constants::Settings::CATEGORY);
setWidgetCreator([] { return new CMakeToolConfigWidget; });
}
};
void setupCMakeSettingsPage()
{
static CMakeSettingsPage theCMakeSettingsPage;
} }
} // CMakeProjectManager::Internal } // CMakeProjectManager::Internal

8
src/plugins/cmakeprojectmanager/cmakesettingspage.h
View File

@@ -3,14 +3,8 @@
#pragma once #pragma once
#include <coreplugin/dialogs/ioptionspage.h>
namespace CMakeProjectManager::Internal { namespace CMakeProjectManager::Internal {
class CMakeSettingsPage final : public Core::IOptionsPage void setupCMakeSettingsPage();
{
public:
CMakeSettingsPage();
};
} // CMakeProjectManager::Internal } // CMakeProjectManager::Internal