diff options
| -rw-r--r-- | src/mainwindow.cpp | 6 | ||||
| -rw-r--r-- | src/networkaccessmanager.cpp | 5 |
2 files changed, 5 insertions, 6 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) { diff --git a/src/networkaccessmanager.cpp b/src/networkaccessmanager.cpp index 7f05bf1c..2eba844a 100644 --- a/src/networkaccessmanager.cpp +++ b/src/networkaccessmanager.cpp @@ -42,7 +42,6 @@ #include <QtCore/QPointer> #include <QtCore/QIODevice> -#include <QtGui/QDialog> #include <QtGui/QStyle> #include <QtGui/QTextDocument> @@ -121,7 +120,7 @@ void NetworkAccessManager::authenticationRequired(QNetworkReply *reply, QAuthent passwordWidget.introLabel->setText(introMessage); passwordWidget.introLabel->setWordWrap(true); - if (dialog->exec() == QDialog::Accepted) + if (dialog->exec() == KDialog::Ok) { auth->setUser(passwordWidget.userNameLineEdit->text()); auth->setPassword(passwordWidget.passwordLineEdit->text()); @@ -150,7 +149,7 @@ void NetworkAccessManager::proxyAuthenticationRequired(const QNetworkProxy &prox proxyWdg.introLabel->setText(introMessage); proxyWdg.introLabel->setWordWrap(true); - if (dialog->exec() == QDialog::Accepted) + if (dialog->exec() == KDialog::Ok) { auth->setUser(proxyWdg.userNameLineEdit->text()); auth->setPassword(proxyWdg.passwordLineEdit->text()); |