summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTasuku Suzuki <tasuku.suzuki@qt.io>2018-03-15 13:53:50 +0900
committerTasuku Suzuki <tasuku.suzuki@qt.io>2018-03-15 05:14:57 +0000
commit47b530737b4eac0f9d2accb7686ba9d8eb7f76c2 (patch)
treec61e7fc8fe701550247938a7a7a65adf454c7b3a
parente60f1b33452666b2bc2c3aef2fdbcc00f88a8afb (diff)
Improve Windows' specific term "Explorer" in assets context menu
Qt Creator uses "Show Containing Folder" for that. Change-Id: I2af0998232c319bc74bb8dbd9f48619040698f4c Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
-rw-r--r--doc/src/03-studio/3-project-palette.qdoc2
-rw-r--r--src/Authoring/Studio/Palettes/Project/ProjectContextMenu.cpp8
-rw-r--r--src/Authoring/Studio/Palettes/Project/ProjectContextMenu.h2
-rw-r--r--src/Authoring/Studio/Palettes/Project/ProjectView.cpp2
-rw-r--r--src/Authoring/Studio/Palettes/Project/ProjectView.h2
5 files changed, 8 insertions, 8 deletions
diff --git a/doc/src/03-studio/3-project-palette.qdoc b/doc/src/03-studio/3-project-palette.qdoc
index 197a3f82..5eefd264 100644
--- a/doc/src/03-studio/3-project-palette.qdoc
+++ b/doc/src/03-studio/3-project-palette.qdoc
@@ -65,7 +65,7 @@ via the file system. Double-clicking on the folder in the Project
palette will open the folder in the file system.
Alternatively, you may right-click on a project asset and choose
-\c{Show in Explorer}. This will open the folder containing the item
+\c{Show Containing Folder}. This will open the folder containing the item
and also select it in the file system.
\section1 Using Assets
diff --git a/src/Authoring/Studio/Palettes/Project/ProjectContextMenu.cpp b/src/Authoring/Studio/Palettes/Project/ProjectContextMenu.cpp
index 7c8c8a14..ac3095ca 100644
--- a/src/Authoring/Studio/Palettes/Project/ProjectContextMenu.cpp
+++ b/src/Authoring/Studio/Palettes/Project/ProjectContextMenu.cpp
@@ -34,8 +34,8 @@ ProjectContextMenu::ProjectContextMenu(ProjectView *parent, int index)
, m_view(parent)
, m_index(index)
{
- QAction *action = new QAction(tr("Show in Explorer"));
- connect(action, &QAction::triggered, this, &ProjectContextMenu::handleShowInExplorer);
+ QAction *action = new QAction(tr("Show Containing Folder"));
+ connect(action, &QAction::triggered, this, &ProjectContextMenu::handleShowContainingFolder);
addAction(action);
addSeparator();
@@ -66,9 +66,9 @@ ProjectContextMenu::~ProjectContextMenu()
{
}
-void ProjectContextMenu::handleShowInExplorer()
+void ProjectContextMenu::handleShowContainingFolder()
{
- m_view->showInExplorer(m_index);
+ m_view->showContainingFolder(m_index);
}
void ProjectContextMenu::handleCopyPath()
diff --git a/src/Authoring/Studio/Palettes/Project/ProjectContextMenu.h b/src/Authoring/Studio/Palettes/Project/ProjectContextMenu.h
index 965767ac..d68f9e95 100644
--- a/src/Authoring/Studio/Palettes/Project/ProjectContextMenu.h
+++ b/src/Authoring/Studio/Palettes/Project/ProjectContextMenu.h
@@ -41,7 +41,7 @@ public:
virtual ~ProjectContextMenu();
private Q_SLOTS:
- void handleShowInExplorer();
+ void handleShowContainingFolder();
void handleCopyPath();
void handleCopyFullPath();
void handleRefreshImport();
diff --git a/src/Authoring/Studio/Palettes/Project/ProjectView.cpp b/src/Authoring/Studio/Palettes/Project/ProjectView.cpp
index 840295bd..17650d70 100644
--- a/src/Authoring/Studio/Palettes/Project/ProjectView.cpp
+++ b/src/Authoring/Studio/Palettes/Project/ProjectView.cpp
@@ -227,7 +227,7 @@ void ProjectView::startDrag(QQuickItem *item, int row)
QTimer::singleShot(0, item, &QQuickItem::ungrabMouse);
}
-void ProjectView::showInExplorer(int row) const
+void ProjectView::showContainingFolder(int row) const
{
if (row == -1)
return;
diff --git a/src/Authoring/Studio/Palettes/Project/ProjectView.h b/src/Authoring/Studio/Palettes/Project/ProjectView.h
index d743c46b..72458db1 100644
--- a/src/Authoring/Studio/Palettes/Project/ProjectView.h
+++ b/src/Authoring/Studio/Palettes/Project/ProjectView.h
@@ -65,7 +65,7 @@ public:
Q_INVOKABLE void startDrag(QQuickItem *item, int row);
- Q_INVOKABLE void showInExplorer(int row) const;
+ Q_INVOKABLE void showContainingFolder(int row) const;
Q_INVOKABLE void copyPath(int row) const;
Q_INVOKABLE void copyFullPath(int row) const;
Q_INVOKABLE void refreshImport(int row) const;