diff options
| author | adjam <adjam@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2009-05-28 10:10:05 +0000 |
|---|---|---|
| committer | adjam <adjam@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2009-05-28 10:10:05 +0000 |
| commit | bdb621bd5e76b656585eed1ff154b3dd43d7383c (patch) | |
| tree | 0ac70cc8977a9afacf23982d983876b999cb796e /src/mainwindow.cpp | |
| parent | Merge branch 'master' into local-svn (diff) | |
| parent | Fixed mainwindow conflicts (diff) | |
| download | rekonq-bdb621bd5e76b656585eed1ff154b3dd43d7383c.tar.xz | |
Merge branch 'master' into local-svn
git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/playground/network/rekonq@973968 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'src/mainwindow.cpp')
| -rw-r--r-- | src/mainwindow.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index db5a768c..73ec3d6d 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -228,7 +228,7 @@ void MainWindow::setupActions() // we all like "short" shortcuts.. ;) a = KStandardAction::fullScreen(this, SLOT(slotViewFullScreen(bool)), this, actionCollection()); - a->setShortcut(KShortcut(Qt::Key_F11)); + a->setShortcut(KShortcut(Qt::Key_F11, Qt::CTRL + Qt::SHIFT + Qt::Key_F)); KStandardAction::home(this, SLOT(slotHome()), actionCollection()); KStandardAction::preferences(this, SLOT(slotPreferences()), actionCollection()); @@ -573,7 +573,7 @@ void MainWindow::printRequested(QWebFrame *frame) QPrinter printer; QPointer<QPrintDialog> dialog = KdePrint::createPrintDialog(&printer, this); - if (dialog->exec() == QDialog::Accepted) + if (dialog->exec() == KDialog::Ok) { frame->print(&printer); } @@ -880,7 +880,7 @@ void MainWindow::slotOpenNext() } -// FIXME: this change will be there until rekonq'll have ONE mainwindow +// WARNING: this change will be there until rekonq'll have ONE mainwindow // (probably forever..) void MainWindow::geometryChangeRequested(const QRect &geometry) { |