From faf34c3ae6ce020d05de83f19aea048c7c10c752 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Fri, 3 Sep 2010 08:59:20 +0200
Subject: [PATCH] Fix Opening .ui file from "Recent Files" to go to 'Design'
mode.
On that occasion, rename Designer to show up as 'Form Editor'
instead of Xml Editor in 'Open With'.
Task-number: QTCREATORBUG-2246
---
src/plugins/coreplugin/mainwindow.cpp | 11 ++++-------
src/plugins/designer/designerconstants.h | 2 +-
2 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/src/plugins/coreplugin/mainwindow.cpp b/src/plugins/coreplugin/mainwindow.cpp
index c7338cdb1b5..c6c038efcff 100644
--- a/src/plugins/coreplugin/mainwindow.cpp
+++ b/src/plugins/coreplugin/mainwindow.cpp
@@ -1269,13 +1269,10 @@ void MainWindow::aboutToShowRecentFiles()
void MainWindow::openRecentFile()
{
- QAction *action = qobject_cast<QAction*>(sender());
- if (!action)
- return;
- QString fileName = action->data().toString();
- if (!fileName.isEmpty()) {
- editorManager()->openEditor(fileName);
- editorManager()->ensureEditorManagerVisible();
+ if (const QAction *action = qobject_cast<const QAction*>(sender())) {
+ const QString fileName = action->data().toString();
+ if (!fileName.isEmpty())
+ editorManager()->openEditor(fileName);
}
}
diff --git a/src/plugins/designer/designerconstants.h b/src/plugins/designer/designerconstants.h
index 7c2166eca8f..08595f08a31 100644
--- a/src/plugins/designer/designerconstants.h
+++ b/src/plugins/designer/designerconstants.h
@@ -39,7 +39,7 @@ const char * const INFO_READ_ONLY = "DesignerXmlEditor.ReadOnly";
const char * const K_DESIGNER_XML_EDITOR_ID = "FormEditor.DesignerXmlEditor";
const char * const C_DESIGNER_XML_EDITOR = "Designer Xml Editor";
const char * const DESIGNER_XML_EDITOR_ID ="DesignerXmlEditor";
-const char * const C_DESIGNER_XML_DISPLAY_NAME = QT_TRANSLATE_NOOP("Designer", "Xml Editor");
+const char * const C_DESIGNER_XML_DISPLAY_NAME = QT_TRANSLATE_NOOP("Designer", "Form Editor");
const char * const SETTINGS_CATEGORY = "P.Designer";
const char * const SETTINGS_CATEGORY_ICON = ":/core/images/category_design.png";
--
GitLab