SHS/qtcreator
4
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: SHS:v15
Branches Tags
SHS:master SHS:v18 SHS:v15 SHS:v8 SHS:v6
..
compare: SHS:v18
Branches Tags
SHS:v18 SHS:v15 SHS:v8 SHS:v6 SHS:master

2 Commits
v15 ... v18

Author SHA1 Message Date
peri4
1b6fac05be second try 2025-09-30 14:33:31 +03:00
peri4
b1a73990e6 first try for v18 2025-09-30 14:26:26 +03:00
3 changed files with 8 additions and 9 deletions
Expand all files Collapse all files

7
project_fs/projectfilesystemplugin.cpp
View File

@@ -30,7 +30,7 @@ namespace ProjectFilesystemPlugin {
// Delete members
}
bool ProjectFilesystemPluginPlugin::initialize(const QStringList &arguments, QString *errorString)
Utils::Result<> ProjectFilesystemPluginPlugin::initialize(const QStringList &arguments)
{
// Register objects in the plugin manager's object pool
// Load settings
@@ -40,7 +40,6 @@ namespace ProjectFilesystemPlugin {
// depends on have initialized their members.
Q_UNUSED(arguments)
Q_UNUSED(errorString)
/*auto action = new QAction(tr("ProjectFilesystemPlugin Action"), this);
Core::Command *cmd = Core::ActionManager::registerAction(action, Constants::ACTION_ID,
@@ -57,12 +56,12 @@ namespace ProjectFilesystemPlugin {
//addAutoReleasedObject(new ProjectFSWidgetFactory());
(new ProjectFSWidgetFactory())->setParent(this);
return true;
return Utils::ResultOk;
}
void ProjectFilesystemPluginPlugin::extensionsInitialized()
{
Utils::globalMacroExpander()->registerPrefix("ProjectFilesystem", "Project filesystem plugin", [](QString v) -> QString {return v;} );
Utils::globalMacroExpander()->registerPrefix("ProjectFilesystem", "ProjectFilesystem", "Project filesystem plugin", [](QString v) -> QString {return v;} );
Utils::globalMacroExpander()->registerFileVariables("ProjectFilesystem", "Selected item",
[]() -> Utils::FilePath { return Utils::FilePath::fromString(projectfs_menu_target.absoluteFilePath());}, true);
// Retrieve objects from the plugin manager's object pool

2
project_fs/projectfilesystemplugin.h
View File

@@ -17,7 +17,7 @@ namespace ProjectFilesystemPlugin {
ProjectFilesystemPluginPlugin();
~ProjectFilesystemPluginPlugin();
bool initialize(const QStringList &arguments, QString *errorString) override;
Utils::Result<> initialize(const QStringList &arguments) override;
void extensionsInitialized() override;
ShutdownFlag aboutToShutdown() override;

8
project_fs/projectfilesystemwidget.cpp
View File

@@ -309,7 +309,7 @@ void ProjectFilesystemWidget::createProjectTree(void * p) {
if (!p) return;
ProjectExplorer::Project * pr = (ProjectExplorer::Project *)p;
QTreeWidgetItem * ri = new QTreeWidgetItem();
QString dir = pr->projectDirectory().toString();
QString dir = pr->projectDirectory().toUrlishString();
QFile logo(dir + "/logo.png");
if (logo.exists())
ri->setIcon(0, QIcon(logo.fileName()));
@@ -341,7 +341,7 @@ void ProjectFilesystemWidget::filterClicked() {
void ProjectFilesystemWidget::currentFileChanged() {
Core::IDocument * cd = Core::EditorManager::instance()->currentDocument();
if (!cd) return;
QString np = cd->filePath().toString();
QString np = cd->filePath().toUrlishString();
QTreeWidgetItem * ti = item_map.value(np);
if (!ti) return;
tree->setCurrentItem(ti);
@@ -357,7 +357,7 @@ void ProjectFilesystemWidget::startupProjectChanged() {
QTreeWidgetItem * ti = tree->topLevelItem(i);
ti->setFont(0, f);
if (!sp) continue;
if (sp->projectDirectory().toString() == ti->data(0, roleFullPath).toString())
if (sp->projectDirectory().toUrlishString() == ti->data(0, roleFullPath).toString())
ti->setFont(0, bf);
}
}
@@ -496,7 +496,7 @@ void ProjectFilesystemWidget::on_actionOpen_external_triggered() {
void ProjectFilesystemWidget::on_actionShow_external_triggered() {
if (projectfs_menu_target.path().isEmpty()) return;
Core::FileUtils::showInGraphicalShell(Core::ICore::mainWindow(), Utils::FilePath::fromString(projectfs_menu_target.absoluteFilePath()));
Core::FileUtils::showInGraphicalShell(Utils::FilePath::fromString(projectfs_menu_target.absoluteFilePath()));
}