Separate showing and hiding the debugger settings and inspector.

debugger/QT/SkDebuggerGUI.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkDebuggerGUI.h"
 #include "SkForceLinking.h"
 #include "SkGraphics.h"
@@ skipping 26 matching lines @@
     , fActionProfile(this)
     , fActionCancel(this)
     , fActionClearBreakpoints(this)
     , fActionClearDeletes(this)
     , fActionClose(this)
     , fActionCreateBreakpoint(this)
     , fActionDelete(this)
     , fActionDirectory(this)
     , fActionGoToLine(this)
     , fActionInspector(this)
+    , fActionSettings(this)
     , fActionPlay(this)
     , fActionPause(this)
     , fActionRewind(this)
     , fActionSave(this)
     , fActionSaveAs(this)
     , fActionShowDeletes(this)
     , fActionStepBack(this)
     , fActionStepForward(this)
     , fActionZoomIn(this)
     , fActionZoomOut(this)
@@ skipping 18 matching lines @@
     connect(&fActionDirectory, SIGNAL(triggered()), this, SLOT(toggleDirectory()));
     connect(&fDirectoryWidget, SIGNAL(currentItemChanged(QListWidgetItem*, QListWidgetItem*)), this, SLOT(loadFile(QListWidgetItem *)));
     connect(&fActionDelete, SIGNAL(triggered()), this, SLOT(actionDelete()));
     connect(&fListWidget, SIGNAL(itemDoubleClicked(QListWidgetItem*)), this, SLOT(toggleBreakpoint()));
     connect(&fActionRewind, SIGNAL(triggered()), this, SLOT(actionRewind()));
     connect(&fActionPlay, SIGNAL(triggered()), this, SLOT(actionPlay()));
     connect(&fActionStepBack, SIGNAL(triggered()), this, SLOT(actionStepBack()));
     connect(&fActionStepForward, SIGNAL(triggered()), this, SLOT(actionStepForward()));
     connect(&fActionBreakpoint, SIGNAL(triggered()), this, SLOT(actionBreakpoints()));
     connect(&fActionInspector, SIGNAL(triggered()), this, SLOT(actionInspector()));
-    connect(&fActionInspector, SIGNAL(triggered()), this, SLOT(actionSettings()));
+    connect(&fActionSettings, SIGNAL(triggered()), this, SLOT(actionSettings()));
     connect(&fFilter, SIGNAL(activated(QString)), this, SLOT(toggleFilter(QString)));
     connect(&fActionProfile, SIGNAL(triggered()), this, SLOT(actionProfile()));
     connect(&fActionCancel, SIGNAL(triggered()), this, SLOT(actionCancel()));
     connect(&fActionClearBreakpoints, SIGNAL(triggered()), this, SLOT(actionClearBreakpoints()));
     connect(&fActionClearDeletes, SIGNAL(triggered()), this, SLOT(actionClearDeletes()));
     connect(&fActionClose, SIGNAL(triggered()), this, SLOT(actionClose()));
     connect(fSettingsWidget.getVisibilityButton(), SIGNAL(toggled(bool)), this, SLOT(actionCommandFilter()));
 #if SK_SUPPORT_GPU
     connect(fSettingsWidget.getGLCheckBox(), SIGNAL(toggled(bool)), this, SLOT(actionGLWidget(bool)));
 #endif
@@ skipping 603 matching lines @@
     fActionProfile.setText("Profile");
     fActionProfile.setDisabled(true);
 
     QIcon inspector;
     inspector.addFile(QString::fromUtf8(":/inspector.png"),
             QSize(), QIcon::Normal, QIcon::Off);
     fActionInspector.setShortcut(QKeySequence(tr("Ctrl+I")));
     fActionInspector.setIcon(inspector);
     fActionInspector.setText("Inspector");
 
+    QIcon settings;
+    settings.addFile(QString::fromUtf8(":/inspector.png"),
+            QSize(), QIcon::Normal, QIcon::Off);
+    fActionSettings.setShortcut(QKeySequence(tr("Ctrl+G")));
+    fActionSettings.setIcon(settings);
+    fActionSettings.setText("Settings");
+    
     QIcon play;
     play.addFile(QString::fromUtf8(":/play.png"), QSize(),
             QIcon::Normal, QIcon::Off);
     fActionPlay.setShortcut(QKeySequence(tr("Ctrl+P")));
     fActionPlay.setIcon(play);
     fActionPlay.setText("Play");
 
     QIcon pause;
     pause.addFile(QString::fromUtf8(":/pause.png"), QSize(),
             QIcon::Normal, QIcon::Off);
@@ skipping 93 matching lines @@
 
     fSpacer.setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
 
     fToolBar.addAction(&fActionRewind);
     fToolBar.addAction(&fActionStepBack);
     fToolBar.addAction(&fActionPause);
     fToolBar.addAction(&fActionStepForward);
     fToolBar.addAction(&fActionPlay);
     fToolBar.addSeparator();
     fToolBar.addAction(&fActionInspector);
+    fToolBar.addAction(&fActionSettings);
     fToolBar.addSeparator();
     fToolBar.addAction(&fActionProfile);
 
     fToolBar.addSeparator();
     fToolBar.addWidget(&fSpacer);
     fToolBar.addWidget(&fFilter);
     fToolBar.addAction(&fActionCancel);
 
     // TODO(chudy): Remove static call.
     fDirectoryWidgetActive = false;
@@ skipping 24 matching lines @@
     fMenuNavigate.addAction(&fActionGoToLine);
 
     fMenuView.setTitle("View");
     fMenuView.addAction(&fActionBreakpoint);
     fMenuView.addAction(&fActionShowDeletes);
     fMenuView.addAction(&fActionZoomIn);
     fMenuView.addAction(&fActionZoomOut);
 
     fMenuWindows.setTitle("Window");
     fMenuWindows.addAction(&fActionInspector);
+    fMenuWindows.addAction(&fActionSettings);
     fMenuWindows.addAction(&fActionDirectory);
 
     fActionGoToLine.setText("Go to Line...");
     fActionGoToLine.setDisabled(true);
     fMenuBar.addAction(fMenuFile.menuAction());
     fMenuBar.addAction(fMenuEdit.menuAction());
     fMenuBar.addAction(fMenuView.menuAction());
     fMenuBar.addAction(fMenuNavigate.menuAction());
     fMenuBar.addAction(fMenuWindows.menuAction());
 
@@ skipping 116 matching lines @@
     }
 
     // NOTE(chudy): Makes first item unselectable.
     QStandardItemModel* model = qobject_cast<QStandardItemModel*>(
             fFilter.model());
     QModelIndex firstIndex = model->index(0, fFilter.modelColumn(),
             fFilter.rootModelIndex());
     QStandardItem* firstItem = model->itemFromIndex(firstIndex);
     firstItem->setSelectable(false);
 }