summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2009-01-29 11:59:45 +0100
committerAndrea Diamantini <adjam7@gmail.com>2009-01-29 11:59:45 +0100
commitba12e93de03b052ade877b0ddfaef125579e15eb (patch)
tree7283d833f5f4ba45c5ebcdc3e655a23a93116696
parent1st lines of docs (diff)
downloadrekonq-ba12e93de03b052ade877b0ddfaef125579e15eb.tar.xz
Definitely fixed FindBar (orat least, I hope so)
Add some comments
-rw-r--r--TODO6
-rw-r--r--src/findbar.cpp1
-rw-r--r--src/mainwindow.cpp50
-rw-r--r--src/mainwindow.h7
-rw-r--r--src/webview.cpp2
5 files changed, 34 insertions, 32 deletions
diff --git a/TODO b/TODO
index e8fa7215..27134e5c 100644
--- a/TODO
+++ b/TODO
@@ -19,11 +19,11 @@ ROAD to 0.0.3 (third release)
- dbus support
- new application class!!
---- REMOVE ALL FOCUS TO QStackedWidget in mainview!!
---- improve searchbar features
+++- REMOVE ALL FOCUS TO QStackedWidget in mainview!!
+++- improve searchbar features
++- bookmarks line
--- fix sessions && ui dimension
---- fix KConfigXT use
+--- fix KConfigXT use (proxy, fonts and so on..)
+ ----------------------------------------------------
diff --git a/src/findbar.cpp b/src/findbar.cpp
index 449e24fa..df5b5bc7 100644
--- a/src/findbar.cpp
+++ b/src/findbar.cpp
@@ -58,7 +58,6 @@ FindBar::FindBar(KXmlGuiWindow *mainwindow)
m_lineEdit = new KLineEdit(this);
setFocusProxy(m_lineEdit);
m_lineEdit->setMaximumWidth( 250 );
-// connect( m_lineEdit, SIGNAL( returnPressed() ), mainwindow, SLOT( slotFind() ) );
connect( m_lineEdit, SIGNAL( textChanged(const QString &) ), mainwindow, SLOT( slotFind(const QString &) ) );
layout->addWidget( m_lineEdit );
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index c7c1a47e..294bf589 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -652,17 +652,17 @@ void MainWindow::slotToggleInspector(bool enable)
}
-void MainWindow::slotSwapFocus()
-{
- if ( currentTab()->hasFocus() )
- {
- m_view->currentLineEdit()->setFocus();
- }
- else
- {
- currentTab()->setFocus();
- }
-}
+// void MainWindow::slotSwapFocus()
+// {
+// if ( currentTab()->hasFocus() )
+// {
+// m_view->currentLineEdit()->setFocus();
+// }
+// else
+// {
+// currentTab()->setFocus();
+// }
+// }
MainView *MainWindow::tabWidget() const
@@ -723,20 +723,20 @@ void MainWindow::slotAboutToShowBackMenu()
}
-void MainWindow::slotShowWindow()
-{
- if (KAction *action = qobject_cast<KAction*>(sender()))
- {
- QVariant v = action->data();
- if (v.canConvert<int>())
- {
- int offset = qvariant_cast<int>(v);
- QList<MainWindow*> windows = BrowserApplication::instance()->mainWindows();
- windows.at(offset)->activateWindow();
- windows.at(offset)->currentTab()->setFocus();
- }
- }
-}
+// void MainWindow::slotShowWindow()
+// {
+// if (KAction *action = qobject_cast<KAction*>(sender()))
+// {
+// QVariant v = action->data();
+// if (v.canConvert<int>())
+// {
+// int offset = qvariant_cast<int>(v);
+// QList<MainWindow*> windows = BrowserApplication::instance()->mainWindows();
+// windows.at(offset)->activateWindow();
+// windows.at(offset)->currentTab()->setFocus();
+// }
+// }
+// }
void MainWindow::slotOpenActionUrl(QAction *action)
diff --git a/src/mainwindow.h b/src/mainwindow.h
index 2ec5c1bd..fa96eb0e 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -75,15 +75,16 @@ private slots:
void slotUpdateWindowTitle(const QString &title = QString());
void slotOpenLocation();
void slotAboutToShowBackMenu();
+ void geometryChangeRequested(const QRect &geometry);
// history related
void slotOpenActionUrl(QAction *action);
void slotOpenPrevious();
void slotOpenNext();
- void slotShowWindow();
- void slotSwapFocus();
- void geometryChangeRequested(const QRect &geometry);
+/* void slotShowWindow();
+ void slotSwapFocus();*/
+
// File Menu slots
diff --git a/src/webview.cpp b/src/webview.cpp
index 436db54e..a4ca8211 100644
--- a/src/webview.cpp
+++ b/src/webview.cpp
@@ -191,6 +191,8 @@ WebView::WebView(QWidget* parent)
// TODO : improve and KDE-ize this menu
+// 1. Add link to bookmarks
+// 2. Add "save link as" action
void WebView::contextMenuEvent(QContextMenuEvent *event)
{
QWebHitTestResult r = page()->mainFrame()->hitTestContent(event->pos());