From 014862b773c90fbb75674a296064a02ff3db43fb Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgads@gmail.com>
Date: Sun, 19 Feb 2012 21:32:48 +0200
Subject: [PATCH] Rename Recent Sessions -> Sessions
All available sessions are displayed, not only recent
Change-Id: Ib2bc419526135eff414f7c997b2bf603424aa452
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
---
share/qtcreator/welcomescreen/develop.qml | 30 +++++++++----------
.../{RecentSessions.qml => Sessions.qml} | 0
.../projectexplorer/projectexplorer.cpp | 4 +--
3 files changed, 17 insertions(+), 17 deletions(-)
rename share/qtcreator/welcomescreen/widgets/{RecentSessions.qml => Sessions.qml} (100%)
diff --git a/share/qtcreator/welcomescreen/develop.qml b/share/qtcreator/welcomescreen/develop.qml
index 73c6a50836f..e6ae8f83ed5 100644
--- a/share/qtcreator/welcomescreen/develop.qml
+++ b/share/qtcreator/welcomescreen/develop.qml
@@ -68,9 +68,9 @@ Rectangle {
width: 1
height: line.height
color: "#c4c4c4"
- anchors.left: recentSessions.right
+ anchors.left: sessions.right
anchors.leftMargin: -1
- anchors.top: recentSessions.top
+ anchors.top: sessions.top
}
@@ -81,9 +81,9 @@ Rectangle {
height: 432
id: recentProjects
- anchors.left: recentlyUsedProjects.left
+ anchors.left: recentProjectsTitle.left
- anchors.top: recentlyUsedProjects.bottom
+ anchors.top: recentProjectsTitle.bottom
anchors.topMargin: 20
anchors.bottom: parent.bottom
anchors.bottomMargin: 40
@@ -104,26 +104,26 @@ Rectangle {
}
Text {
- id: recentlyUsedSessions
+ id: sessionsTitle
x: pageCaption.x + pageCaption.textOffset
y: 105
color: "#535353"
- text: qsTr("Recently used sessions")
+ text: qsTr("Sessions")
font.pixelSize: 16
font.family: "Helvetica"
font.bold: true
}
Text {
- id: recentlyUsedProjects
+ id: recentProjectsTitle
x: 406
y: 105
color: "#535353"
- text: qsTr("Recently used Projects")
- anchors.left: recentlyUsedSessions.right
+ text: qsTr("Recent Projects")
+ anchors.left: sessionsTitle.right
anchors.leftMargin: 160
font.bold: true
font.family: "Helvetica"
@@ -139,7 +139,7 @@ Rectangle {
height: 70
anchors.topMargin: 42
- anchors.top: recentSessions.bottom
+ anchors.top: sessions.bottom
LinkedText {
id: openProject
@@ -169,17 +169,17 @@ Rectangle {
}
}
- RecentSessions {
- id: recentSessions
+ Sessions {
+ id: sessions
x: 87
y: 144
width: 274
- anchors.left: recentlyUsedSessions.left
- anchors.right: recentlyUsedProjects.left
+ anchors.left: sessionsTitle.left
+ anchors.right: recentProjectsTitle.left
anchors.rightMargin: 40
- anchors.top: recentlyUsedSessions.bottom
+ anchors.top: sessionsTitle.bottom
anchors.topMargin: 20
model: sessionList
diff --git a/share/qtcreator/welcomescreen/widgets/RecentSessions.qml b/share/qtcreator/welcomescreen/widgets/Sessions.qml
similarity index 100%
rename from share/qtcreator/welcomescreen/widgets/RecentSessions.qml
rename to share/qtcreator/welcomescreen/widgets/Sessions.qml
diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp
index 6b3039cd003..68a354792c7 100644
--- a/src/plugins/projectexplorer/projectexplorer.cpp
+++ b/src/plugins/projectexplorer/projectexplorer.cpp
@@ -620,9 +620,9 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
connect(mfile->menu(), SIGNAL(aboutToShow()),
this, SLOT(updateRecentProjectMenu()));
- // recent session menu
+ // session menu
Core::ActionContainer *msession = am->createMenu(Constants::M_SESSION);
- msession->menu()->setTitle(tr("Recent Sessions"));
+ msession->menu()->setTitle(tr("Sessions"));
msession->setOnAllDisabledBehavior(Core::ActionContainer::Show);
mfile->addMenu(msession, Core::Constants::G_FILE_OPEN);
d->m_sessionMenu = msession->menu();
--
GitLab