diff options
Diffstat (limited to 'src/mainwindow.cpp')
| -rw-r--r-- | src/mainwindow.cpp | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 4fdf306f..5642ad01 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -134,10 +134,12 @@ void MainWindow::postLaunch() // --------- connect signals and slots connect(m_view, SIGNAL(setCurrentTitle(const QString &)), this, SLOT(slotUpdateWindowTitle(const QString &))); connect(m_view, SIGNAL(loadProgress(int)), this, SLOT(slotLoadProgress(int))); - connect(m_view, SIGNAL(geometryChangeRequested(const QRect &)), this, SLOT(geometryChangeRequested(const QRect &))); connect(m_view, SIGNAL(printRequested(QWebFrame *)), this, SLOT(printRequested(QWebFrame *))); - connect(m_view, SIGNAL(menuBarVisibilityChangeRequested(bool)), menuBar(), SLOT(setVisible(bool))); - connect(m_view, SIGNAL(statusBarVisibilityChangeRequested(bool)), statusBar(), SLOT(setVisible(bool))); + + // FIXME: 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))); // status bar messages connect(m_view, SIGNAL(showStatusBarMessage(const QString&)), statusBar(), SLOT(showMessage(const QString&))); @@ -282,10 +284,7 @@ void MainWindow::setupActions() // =================== Tab Actions a = new KAction(KIcon("tab-new"), i18n("New &Tab"), this); - QList<QKeySequence> newTabShortcutList; - newTabShortcutList << QKeySequence(QKeySequence::New); - newTabShortcutList << QKeySequence(QKeySequence::AddTab); - a->setShortcut(KShortcut(newTabShortcutList)); + a->setShortcut(KShortcut(Qt::CTRL + Qt::Key_T, Qt::CTRL + Qt::Key_N)); actionCollection()->addAction(QLatin1String("new_tab"), a); connect(a, SIGNAL(triggered(bool)), m_view, SLOT(newWebView())); @@ -592,7 +591,7 @@ void MainWindow::slotPrivateBrowsing(bool enable) settings->setAttribute(QWebSettings::PrivateBrowsingEnabled, false); MainWindow* win = Application::instance()->mainWindow(); - win->m_lastSearch = QString::null; + win->m_lastSearch.clear(); win->mainView()->clear(); } } @@ -867,9 +866,13 @@ void MainWindow::slotOpenNext() } +// FIXME: this change will be there until rekonq'll have ONE mainwindow +// (probably forever..) void MainWindow::geometryChangeRequested(const QRect &geometry) { - setGeometry(geometry); + Q_UNUSED(geometry) +// setGeometry(geometry); + kDebug() << "No geometry change allowed"; } |