From 66fa8ee1438306bf512ac035bd39609861a30b34 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Fri, 22 May 2009 14:23:35 +0200 Subject: FullScreen shortcuts: F11 && CTRL + SHIFT + F --- src/mainwindow.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 83ff514b..3ebd3742 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -153,7 +153,7 @@ void MainWindow::postLaunch() connect(m_view, SIGNAL(loadProgress(int)), this, SLOT(slotLoadProgress(int))); connect(m_view, SIGNAL(printRequested(QWebFrame *)), this, SLOT(printRequested(QWebFrame *))); - // FIXME: these slots will be commented out until rekonq will have just ONE mainwindow + // WARNING: these slots will be commented out until rekonq will have just ONE mainwindow // connect(m_view, SIGNAL(geometryChangeRequested(const QRect &)), this, SLOT(geometryChangeRequested(const QRect &))); // connect(m_view, SIGNAL(menuBarVisibilityChangeRequested(bool)), menuBar(), SLOT(setVisible(bool))); // connect(m_view, SIGNAL(statusBarVisibilityChangeRequested(bool)), statusBar(), SLOT(setVisible(bool))); @@ -227,7 +227,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()); @@ -884,7 +884,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) { -- cgit v1.2.1 From d0c1b9bcbffdfa414e722cd716098de409884746 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Fri, 22 May 2009 14:29:30 +0200 Subject: Removed QDialog instances --- src/mainwindow.cpp | 2 +- src/networkaccessmanager.cpp | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 3ebd3742..4f41652e 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -572,7 +572,7 @@ void MainWindow::printRequested(QWebFrame *frame) QPrinter printer; QPointer dialog = KdePrint::createPrintDialog(&printer, this); - if (dialog->exec() == QDialog::Accepted) + if (dialog->exec() == KDialog::Ok) { frame->print(&printer); } diff --git a/src/networkaccessmanager.cpp b/src/networkaccessmanager.cpp index 6f0e2a3e..cbf263b6 100644 --- a/src/networkaccessmanager.cpp +++ b/src/networkaccessmanager.cpp @@ -41,7 +41,6 @@ // Qt Includes #include -#include #include #include @@ -118,7 +117,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()); @@ -147,7 +146,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()); -- cgit v1.2.1