Commit 46f2166a authored by Kai Koehne's avatar Kai Koehne Committed by Christiaan Janssen
Browse files

QmlDebugger: Improve Toolbar

Move Play/Pause animations out of Inspector related icons,
and add a visual separator.

Change-Id: Ifec50dbcfb4486205416790710f57bfcc552b637
Reviewed-on: http://codereview.qt.nokia.com/562

Reviewed-by: default avatarQt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: default avatarChristiaan Janssen <christiaan.janssen@nokia.com>
parent 23697dcd
......@@ -214,7 +214,7 @@ void QmlInspectorToolBar::createActions()
m_zoomAction->setCheckable(true);
m_colorPickerAction->setCheckable(true);
am->registerAction(m_inspectorModeAction, Constants::DESIGNMODE_ACTION, context);
am->registerAction(m_inspectorModeAction, Constants::INSPECTORMODE_ACTION, context);
Core::Command *command = am->registerAction(m_playAction, Constants::PLAY_ACTION, context);
command->setAttribute(Core::Command::CA_UpdateIcon);
am->registerAction(m_selectAction, Constants::SELECT_ACTION, context);
......@@ -269,17 +269,19 @@ void QmlInspectorToolBar::createActions()
toolBarLayout->addWidget(toolButton(am->command(Debugger::Constants::STEP)->action()));
toolBarLayout->addWidget(toolButton(am->command(Debugger::Constants::STEPOUT)->action()));
toolBarLayout->addWidget(m_operateByInstructionButton);
toolBarLayout->addWidget(new Utils::StyledSeparator);
toolBarLayout->addStretch(1);
// QML Helpers
toolBarLayout->addWidget(new Utils::StyledSeparator);
toolBarLayout->addWidget(toolButton(am->command(Constants::FROM_QML_ACTION)->action()));
toolBarLayout->addWidget(toolButton(am->command(Constants::SHOW_APP_ON_TOP_ACTION)->action()));
toolBarLayout->addSpacing(10);
toolBarLayout->addWidget(toolButton(am->command(Constants::DESIGNMODE_ACTION)->action()));
m_playButton = toolButton(am->command(Constants::PLAY_ACTION)->action());
m_playButton->setMenu(playSpeedMenu);
toolBarLayout->addWidget(m_playButton);
// Inspector
toolBarLayout->addWidget(new Utils::StyledSeparator);
toolBarLayout->addWidget(toolButton(am->command(Constants::INSPECTORMODE_ACTION)->action()));
toolBarLayout->addWidget(toolButton(am->command(Constants::SELECT_ACTION)->action()));
toolBarLayout->addWidget(toolButton(am->command(Constants::ZOOM_ACTION)->action()));
toolBarLayout->addWidget(toolButton(am->command(Constants::COLOR_PICKER_ACTION)->action()));
......
......@@ -38,7 +38,7 @@ namespace Constants {
const char * const INFO_EXPERIMENTAL = "QmlInspector.Experimental";
const char * const INFO_OUT_OF_SYNC = "QmlInspector.OutOfSyncWarning";
const char * const DESIGNMODE_ACTION = "QmlInspector.DesignMode";
const char * const INSPECTORMODE_ACTION = "QmlInspector.DesignMode";
const char * const PLAY_ACTION = "QmlInspector.Play";
const char * const SELECT_ACTION = "QmlInspector.Select";
const char * const ZOOM_ACTION = "QmlInspector.Zoom";
......
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