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

Fix some more actions that were enabled at startup without a reason.

Browse Source
This commit is contained in:
con
2011-01-31 15:18:16 +01:00
parent 6bea521e6b
commit 301f15ee6b
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -602,6 +602,7 @@ void MainWindow::registerDefaultActions()
// Save Action // Save Action
icon = QIcon::fromTheme(QLatin1String("document-save"), QIcon(Constants::ICON_SAVEFILE)); icon = QIcon::fromTheme(QLatin1String("document-save"), QIcon(Constants::ICON_SAVEFILE));
QAction *tmpaction = new QAction(icon, tr("&Save"), this); QAction *tmpaction = new QAction(icon, tr("&Save"), this);
tmpaction->setEnabled(false);
cmd = am->registerAction(tmpaction, Constants::SAVE, globalContext); cmd = am->registerAction(tmpaction, Constants::SAVE, globalContext);
cmd->setDefaultKeySequence(QKeySequence::Save); cmd->setDefaultKeySequence(QKeySequence::Save);
cmd->setAttribute(Command::CA_UpdateText); cmd->setAttribute(Command::CA_UpdateText);
@@ -611,6 +612,7 @@ void MainWindow::registerDefaultActions()
// Save As Action // Save As Action
icon = QIcon::fromTheme(QLatin1String("document-save-as")); icon = QIcon::fromTheme(QLatin1String("document-save-as"));
tmpaction = new QAction(icon, tr("Save &As..."), this); tmpaction = new QAction(icon, tr("Save &As..."), this);
tmpaction->setEnabled(false);
cmd = am->registerAction(tmpaction, Constants::SAVEAS, globalContext); cmd = am->registerAction(tmpaction, Constants::SAVEAS, globalContext);
#ifdef Q_WS_MAC #ifdef Q_WS_MAC
cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+Shift+S"))); cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+Shift+S")));
@@ -631,6 +633,7 @@ void MainWindow::registerDefaultActions()
// Print Action // Print Action
icon = QIcon::fromTheme(QLatin1String("document-print")); icon = QIcon::fromTheme(QLatin1String("document-print"));
tmpaction = new QAction(icon, tr("&Print..."), this); tmpaction = new QAction(icon, tr("&Print..."), this);
tmpaction->setEnabled(false);
cmd = am->registerAction(tmpaction, Constants::PRINT, globalContext); cmd = am->registerAction(tmpaction, Constants::PRINT, globalContext);
cmd->setDefaultKeySequence(QKeySequence::Print); cmd->setDefaultKeySequence(QKeySequence::Print);
mfile->addAction(cmd, Constants::G_FILE_PRINT); mfile->addAction(cmd, Constants::G_FILE_PRINT);

4
src/plugins/coreplugin/navigationwidget.cpp
View File

@@ -208,6 +208,7 @@ void NavigationWidget::setFactories(const QList<INavigationWidgetFactory *> fact
d->m_factoryModel->appendRow(newRow); d->m_factoryModel->appendRow(newRow);
} }
d->m_factoryModel->sort(0); d->m_factoryModel->sort(0);
updateToggleText();
} }
int NavigationWidget::storedWidth() int NavigationWidget::storedWidth()
@@ -224,7 +225,7 @@ void NavigationWidget::updateToggleText()
{ {
bool haveData = d->m_factoryModel->rowCount(); bool haveData = d->m_factoryModel->rowCount();
d->m_toggleSideBarAction->setVisible(haveData); d->m_toggleSideBarAction->setVisible(haveData);
d->m_toggleSideBarAction->setEnabled(haveData); d->m_toggleSideBarAction->setEnabled(haveData && NavigationWidgetPlaceHolder::m_current);
if (isShown()) if (isShown())
d->m_toggleSideBarAction->setToolTip(tr("Hide Sidebar")); d->m_toggleSideBarAction->setToolTip(tr("Hide Sidebar"));
@@ -234,7 +235,6 @@ void NavigationWidget::updateToggleText()
void NavigationWidget::placeHolderChanged(NavigationWidgetPlaceHolder *holder) void NavigationWidget::placeHolderChanged(NavigationWidgetPlaceHolder *holder)
{ {
d->m_toggleSideBarAction->setEnabled(holder);
d->m_toggleSideBarAction->setChecked(holder && isShown()); d->m_toggleSideBarAction->setChecked(holder && isShown());
updateToggleText(); updateToggleText();
} }