feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline

Browse Source
This commit is contained in:
hjk
2009-01-20 17:14:12 +01:00
parent 667255c4d1 a654dc0b3a
commit d19ba169c2
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/coreplugin/mainwindow.cpp
View File

@@ -203,14 +203,14 @@ MainWindow::MainWindow() :
statusBar()->setProperty("p_styled", true); statusBar()->setProperty("p_styled", true);
} }
void MainWindow::toggleNavigation() void MainWindow::setSidebarVisible(bool visible)
{ {
if (NavigationWidgetPlaceHolder::current()) { if (NavigationWidgetPlaceHolder::current()) {
if (m_navigationWidget->isSuppressed()) { if (m_navigationWidget->isSuppressed() && visible) {
m_navigationWidget->setShown(true); m_navigationWidget->setShown(true);
m_navigationWidget->setSuppressed(false); m_navigationWidget->setSuppressed(false);
} else { } else {
m_navigationWidget->setShown(!m_navigationWidget->isShown()); m_navigationWidget->setShown(visible);
} }
} }
} }
@@ -627,7 +627,7 @@ void MainWindow::registerDefaultActions()
// Toggle Sidebar Action // Toggle Sidebar Action
m_toggleSideBarAction = new QAction(QIcon(Constants::ICON_TOGGLE_SIDEBAR), m_toggleSideBarAction = new QAction(QIcon(Constants::ICON_TOGGLE_SIDEBAR),
tr("Toggle Sidebar"), this); tr("Show Sidebar"), this);
m_toggleSideBarAction->setCheckable(true); m_toggleSideBarAction->setCheckable(true);
cmd = am->registerAction(m_toggleSideBarAction, Constants::TOGGLE_SIDEBAR, m_globalContext); cmd = am->registerAction(m_toggleSideBarAction, Constants::TOGGLE_SIDEBAR, m_globalContext);
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
@@ -635,7 +635,7 @@ void MainWindow::registerDefaultActions()
#else #else
cmd->setDefaultKeySequence(QKeySequence("Alt+0")); cmd->setDefaultKeySequence(QKeySequence("Alt+0"));
#endif #endif
connect(m_toggleSideBarAction, SIGNAL(triggered()), this, SLOT(toggleNavigation())); connect(m_toggleSideBarAction, SIGNAL(triggered(bool)), this, SLOT(setSidebarVisible(bool)));
m_toggleSideBarButton->setDefaultAction(cmd->action()); m_toggleSideBarButton->setDefaultAction(cmd->action());
mwindow->addAction(cmd, Constants::G_WINDOW_PANES); mwindow->addAction(cmd, Constants::G_WINDOW_PANES);
m_toggleSideBarAction->setEnabled(false); m_toggleSideBarAction->setEnabled(false);

2
src/plugins/coreplugin/mainwindow.h
View File

@@ -158,7 +158,7 @@ private slots:
void aboutQtCreator(); void aboutQtCreator();
void aboutPlugins(); void aboutPlugins();
void updateFocusWidget(QWidget *old, QWidget *now); void updateFocusWidget(QWidget *old, QWidget *now);
void toggleNavigation(); void setSidebarVisible(bool visible);
void destroyVersionDialog(); void destroyVersionDialog();
private: private: