Merge lp:~saviq/unity-2d/desktop-title into lp:unity-2d

[Michał Sawicz]

[panel] display "Desktop" label when no application is active

[Łukasz Zemczak (sil2100)]

Works fine for me!

review: Approve (functional)

[Alberto Mardegan (mardy)]

Works fine for me too, and the code looks great.
I've only one concern: when you open the Dash, the title bar still shows "Desktop". But I suppose I will fix that with bug 860400, so I think that the current behaviour is acceptable.

review: Approve

[Florian Boucault (fboucault)]

The code does not seem specific enough to the desktop being focused.
@Alberto: I don't see why this issue is acceptable and how bug #860400 relates.

[Michał Sawicz (saviq)]

@fboucault - bug 860400 relates in the sense that this part of code will be reworked anyway to provide dash window buttons.

=== modified file 'panel/applets/appname/appnameapplet.cpp'
--- panel/applets/appname/appnameapplet.cpp	2011-09-28 13:08:41 +0000
+++ panel/applets/appname/appnameapplet.cpp	2011-09-30 12:40:31 +0000
@@ -36,6 +36,7 @@
 #include <hotkey.h>
 #include <hotkeymonitor.h>
 #include <indicatorentrywidget.h>
+#include <unity2dtr.h>
 
 // Bamf
 #include <bamf-application.h>
@@ -244,12 +245,13 @@
         );
     bool showMenu = isOpened && !d->m_menuBarWidget->isEmpty() && isUserVisibleApp;
     bool showWindowButtons = isOpened && isMaximized;
-    bool showLabel = !(isMaximized && showMenu) && isUserVisibleApp && isOnSameScreen;
+    bool showAppLabel = !(isMaximized && showMenu) && isUserVisibleApp && isOnSameScreen;
+    bool showDesktopLabel = !isUserVisibleApp;
 
     d->m_windowButtonWidget->setVisible(showWindowButtons);
 
-    d->m_label->setVisible(showLabel);
-    if (showLabel) {
+    d->m_label->setVisible(showAppLabel || showDesktopLabel);
+    if (showAppLabel) {
         // Define text
         QString text;
         if (app) {
@@ -272,6 +274,8 @@
         } else {
             d->m_label->setMaximumWidth(QWIDGETSIZE_MAX);
         }
+    } else if (showDesktopLabel) {
+        d->m_label->setText(u2dTr("Desktop", "nautilus"));
     }
 
     d->m_menuBarWidget->setVisible(showMenu);