Commit 79ad4534 authored by Daniel Molkentin's avatar Daniel Molkentin
Browse files

Reapply 22d6dfa4

without 'manage sessions' button after Jens' relayouting.

Change-Id: Ida3e2e01a2ecae258be026bab22c76ede26020f6
Reviewed-on: http://codereview.qt.nokia.com/1889

Reviewed-by: default avatarQt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: default avatarDaniel Molkentin <daniel.molkentin@nokia.com>
parent e2d02bfb
...@@ -53,8 +53,10 @@ HeaderItemView { ...@@ -53,8 +53,10 @@ HeaderItemView {
function fullSessionName() function fullSessionName()
{ {
var newSessionName = sessionName var newSessionName = sessionName
if (model.currentSession) if (model.lastSession && sessionList.isDefaultVirgin())
newSessionName = qsTr("%1 (current session)").arg(newSessionName); newSessionName = qsTr("%1 (last session)").arg(sessionName);
else if (model.activeSession && !sessionList.isDefaultVirgin())
newSessionName = qsTr("%1 (current session)").arg(sessionName);
return newSessionName; return newSessionName;
} }
...@@ -69,7 +71,6 @@ HeaderItemView { ...@@ -69,7 +71,6 @@ HeaderItemView {
Text { Text {
id: fileNameText id: fileNameText
text: parent.fullSessionName() text: parent.fullSessionName()
font.italic: model.defaultSession
elide: Text.ElideMiddle elide: Text.ElideMiddle
anchors.left: parent.left anchors.left: parent.left
anchors.right: arrowImage.right anchors.right: arrowImage.right
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment