From f2fe84b7c4e29a7c70bb7ebf33bdde9fa77a20d3 Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Wed, 23 Mar 2011 12:16:37 +0100
Subject: [PATCH] debugger: change layout of the "Change Display Format..."
 context submenu

---
 src/plugins/debugger/watchwindow.cpp | 47 ++++++++++++++--------------
 1 file changed, 23 insertions(+), 24 deletions(-)

diff --git a/src/plugins/debugger/watchwindow.cpp b/src/plugins/debugger/watchwindow.cpp
index a2820c59535..d61dcd58b3e 100644
--- a/src/plugins/debugger/watchwindow.cpp
+++ b/src/plugins/debugger/watchwindow.cpp
@@ -302,32 +302,31 @@ void WatchWindow::contextMenuEvent(QContextMenuEvent *ev)
     QAction *showUnprintableOctal = 0;
     QAction *showUnprintableHexadecimal = 0;
     formatMenu.setTitle(tr("Change Display Format..."));
-    if (true /*idx.isValid() && !alternativeFormats.isEmpty() */) {
-        showUnprintableUnicode =
-            formatMenu.addAction(tr("Treat All Characters as Printable"));
-        showUnprintableUnicode->setCheckable(true);
-        showUnprintableUnicode->setChecked(unprintableBase == 0);
-        showUnprintableOctal =
-            formatMenu.addAction(tr("Show Unprintable Characters as Octal"));
-        showUnprintableOctal->setCheckable(true);
-        showUnprintableOctal->setChecked(unprintableBase == 8);
-        showUnprintableHexadecimal =
-            formatMenu.addAction(tr("Show Unprintable Characters as Hexadecimal"));
-        showUnprintableHexadecimal->setCheckable(true);
-        showUnprintableHexadecimal->setChecked(unprintableBase == 16);
+    showUnprintableUnicode =
+        formatMenu.addAction(tr("Treat All Characters as Printable"));
+    showUnprintableUnicode->setCheckable(true);
+    showUnprintableUnicode->setChecked(unprintableBase == 0);
+    showUnprintableOctal =
+        formatMenu.addAction(tr("Show Unprintable Characters as Octal"));
+    showUnprintableOctal->setCheckable(true);
+    showUnprintableOctal->setChecked(unprintableBase == 8);
+    showUnprintableHexadecimal =
+        formatMenu.addAction(tr("Show Unprintable Characters as Hexadecimal"));
+    showUnprintableHexadecimal->setCheckable(true);
+    showUnprintableHexadecimal->setChecked(unprintableBase == 16);
+    if (idx.isValid() /*&& !alternativeFormats.isEmpty() */) {
+        const QString spacer = QLatin1String("     ");
         formatMenu.addSeparator();
         QAction *dummy = formatMenu.addAction(
-            tr("Change Display for Type \"%1\"").arg(type));
+            tr("Change Display for Type \"%1\":").arg(type));
         dummy->setEnabled(false);
-        formatMenu.addSeparator();
-        clearTypeFormatAction = formatMenu.addAction(tr("Automatic"));
+        clearTypeFormatAction = formatMenu.addAction(spacer + tr("Automatic"));
         //clearTypeFormatAction->setEnabled(typeFormat != -1);
         //clearTypeFormatAction->setEnabled(individualFormat != -1);
         clearTypeFormatAction->setCheckable(true);
         clearTypeFormatAction->setChecked(typeFormat == -1);
-        formatMenu.addSeparator();
         for (int i = 0; i != alternativeFormats.size(); ++i) {
-            const QString format = alternativeFormats.at(i);
+            const QString format = spacer + alternativeFormats.at(i);
             QAction *act = new QAction(format, &formatMenu);
             act->setCheckable(true);
             //act->setEnabled(individualFormat != -1);
@@ -338,17 +337,15 @@ void WatchWindow::contextMenuEvent(QContextMenuEvent *ev)
         }
         formatMenu.addSeparator();
         dummy = formatMenu.addAction(
-            tr("Change Display for Object Named \"%1\"").arg(mi0.data().toString()));
+            tr("Change Display for Object Named \"%1\":").arg(mi0.data().toString()));
         dummy->setEnabled(false);
-        formatMenu.addSeparator();
         clearIndividualFormatAction
-            = formatMenu.addAction(tr("Use Display Format Based on Type"));
+            = formatMenu.addAction(spacer + tr("Use Display Format Based on Type"));
         //clearIndividualFormatAction->setEnabled(individualFormat != -1);
         clearIndividualFormatAction->setCheckable(true);
         clearIndividualFormatAction->setChecked(effectiveIndividualFormat == -1);
-        formatMenu.addSeparator();
         for (int i = 0; i != alternativeFormats.size(); ++i) {
-            const QString format = alternativeFormats.at(i);
+            const QString format = spacer + alternativeFormats.at(i);
             QAction *act = new QAction(format, &formatMenu);
             act->setCheckable(true);
             if (i == effectiveIndividualFormat)
@@ -357,7 +354,9 @@ void WatchWindow::contextMenuEvent(QContextMenuEvent *ev)
             individualFormatActions.append(act);
         }
     } else {
-        formatMenu.setEnabled(false);
+        QAction *dummy = formatMenu.addAction(
+            tr("Change Display for Type or Item..."));
+        dummy->setEnabled(false);
     }
 
     const bool actionsEnabled = engine->debuggerActionsEnabled();