summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2008-12-14 18:27:17 +0100
committerAndrea Diamantini <adjam7@gmail.com>2008-12-14 18:27:17 +0100
commit19e901a0ca9630b2003dd24ccfa6da54eb70bb09 (patch)
tree6f86b9ef37a17e050c8ccf264cc69bd5865910b4
parentLast changes.. (diff)
downloadrekonq-19e901a0ca9630b2003dd24ccfa6da54eb70bb09.tar.xz
adjusted rekonq name
commented out (hopefully, for now) resizeEvents and focusInEvents in urlbar & searchbar
-rw-r--r--src/autosaver.cpp2
-rw-r--r--src/autosaver.h2
-rw-r--r--src/bookmarks.cpp4
-rw-r--r--src/bookmarks.h2
-rw-r--r--src/browserapplication.cpp2
-rw-r--r--src/browserapplication.h2
-rw-r--r--src/browsermainwindow.cpp4
-rw-r--r--src/cookiejar.cpp2
-rw-r--r--src/cookiejar.h2
-rw-r--r--src/downloadmanager.cpp2
-rw-r--r--src/downloadmanager.h2
-rw-r--r--src/edittableview.cpp2
-rw-r--r--src/edittableview.h2
-rw-r--r--src/edittreeview.cpp2
-rw-r--r--src/edittreeview.h2
-rw-r--r--src/findbar.cpp2
-rw-r--r--src/findbar.h2
-rw-r--r--src/history.cpp2
-rw-r--r--src/history.h2
-rw-r--r--src/main.cpp10
-rw-r--r--src/modelmenu.cpp2
-rw-r--r--src/modelmenu.h2
-rw-r--r--src/networkaccessmanager.cpp2
-rw-r--r--src/networkaccessmanager.h2
-rw-r--r--src/searchbar.cpp46
-rw-r--r--src/searchbar.h7
-rw-r--r--src/settings.cpp2
-rw-r--r--src/settings.h2
-rw-r--r--src/squeezelabel.cpp2
-rw-r--r--src/squeezelabel.h2
-rw-r--r--src/tabwidget.cpp2
-rw-r--r--src/tabwidget.h2
-rw-r--r--src/webview.cpp2
-rw-r--r--src/webview.h2
34 files changed, 69 insertions, 60 deletions
diff --git a/src/autosaver.cpp b/src/autosaver.cpp
index c1164e60..965d550b 100644
--- a/src/autosaver.cpp
+++ b/src/autosaver.cpp
@@ -1,6 +1,6 @@
/* ============================================================
 *
- * This file is a part of the reKonq project
+ * This file is a part of the rekonq project
 *
* Copyright (C) 2007-2008 Trolltech ASA. All rights reserved
* Copyright (C) 2008 by Andrea Diamantini <adjam7 at gmail dot com>
diff --git a/src/autosaver.h b/src/autosaver.h
index 70dca53a..c202bb70 100644
--- a/src/autosaver.h
+++ b/src/autosaver.h
@@ -1,6 +1,6 @@
/* ============================================================
 *
- * This file is a part of the reKonq project
+ * This file is a part of the rekonq project
 *
* Copyright (C) 2007-2008 Trolltech ASA. All rights reserved
* Copyright (C) 2008 by Andrea Diamantini <adjam7 at gmail dot com>
diff --git a/src/bookmarks.cpp b/src/bookmarks.cpp
index e03bf3dc..ec46dd53 100644
--- a/src/bookmarks.cpp
+++ b/src/bookmarks.cpp
@@ -1,6 +1,6 @@
/* ============================================================
 *
- * This file is a part of the reKonq project
+ * This file is a part of the rekonq project
 *
* Copyright (C) 2008 by Andrea Diamantini <adjam7 at gmail dot com>
 *
@@ -51,7 +51,7 @@ QString OwnBookMarks::currentUrl() const
QString OwnBookMarks::currentTitle() const
{
QString title = m_parent->windowTitle();
- return title.remove( " - reKonq" );
+ return title.remove( " - rekonq" );
}
diff --git a/src/bookmarks.h b/src/bookmarks.h
index 950fc8a6..91160321 100644
--- a/src/bookmarks.h
+++ b/src/bookmarks.h
@@ -1,6 +1,6 @@
/* ============================================================
 *
- * This file is a part of the reKonq project
+ * This file is a part of the rekonq project
 *
* Copyright (C) 2008 by Andrea Diamantini <adjam7 at gmail dot com>
 *
diff --git a/src/browserapplication.cpp b/src/browserapplication.cpp
index 8a1ffc5a..52c5e670 100644
--- a/src/browserapplication.cpp
+++ b/src/browserapplication.cpp
@@ -1,6 +1,6 @@
/* ============================================================
 *
- * This file is a part of the reKonq project
+ * This file is a part of the rekonq project
 *
* Copyright (C) 2007-2008 Trolltech ASA. All rights reserved
* Copyright (C) 2008 by Andrea Diamantini <adjam7 at gmail dot com>
diff --git a/src/browserapplication.h b/src/browserapplication.h
index eb6962ef..7f2ef321 100644
--- a/src/browserapplication.h
+++ b/src/browserapplication.h
@@ -1,6 +1,6 @@
/* ============================================================
 *
- * This file is a part of the reKonq project
+ * This file is a part of the rekonq project
 *
* Copyright (C) 2007-2008 Trolltech ASA. All rights reserved
* Copyright (C) 2008 by Andrea Diamantini <adjam7 at gmail dot com>
diff --git a/src/browsermainwindow.cpp b/src/browsermainwindow.cpp
index e9f685cd..7b6bfc05 100644
--- a/src/browsermainwindow.cpp
+++ b/src/browsermainwindow.cpp
@@ -506,9 +506,9 @@ void BrowserMainWindow::slotUpdateStatusbar(const QString &string)
void BrowserMainWindow::slotUpdateWindowTitle(const QString &title)
{
if (title.isEmpty()) {
- setWindowTitle("reKonq");
+ setWindowTitle("rekonq");
} else {
- setWindowTitle(title + " - reKonq");
+ setWindowTitle(title + " - rekonq");
}
}
diff --git a/src/cookiejar.cpp b/src/cookiejar.cpp
index 396052b9..b513f88a 100644
--- a/src/cookiejar.cpp
+++ b/src/cookiejar.cpp
@@ -1,6 +1,6 @@
/* ============================================================
 *
- * This file is a part of the reKonq project
+ * This file is a part of the rekonq project
 *
* Copyright (C) 2007-2008 Trolltech ASA. All rights reserved
* Copyright (C) 2008 by Andrea Diamantini <adjam7 at gmail dot com>
diff --git a/src/cookiejar.h b/src/cookiejar.h
index d3843c51..835700f1 100644
--- a/src/cookiejar.h
+++ b/src/cookiejar.h
@@ -1,6 +1,6 @@
/* ============================================================
 *
- * This file is a part of the reKonq project
+ * This file is a part of the rekonq project
 *
* Copyright (C) 2007-2008 Trolltech ASA. All rights reserved
* Copyright (C) 2008 by Andrea Diamantini <adjam7 at gmail dot com>
diff --git a/src/downloadmanager.cpp b/src/downloadmanager.cpp
index 7584f36a..df990c7b 100644
--- a/src/downloadmanager.cpp
+++ b/src/downloadmanager.cpp
@@ -1,6 +1,6 @@
/* ============================================================
 *
- * This file is a part of the reKonq project
+ * This file is a part of the rekonq project
 *
* Copyright (C) 2007-2008 Trolltech ASA. All rights reserved
* Copyright (C) 2008 by Andrea Diamantini <adjam7 at gmail dot com>
diff --git a/src/downloadmanager.h b/src/downloadmanager.h
index 89981641..1a2e5d30 100644
--- a/src/downloadmanager.h
+++ b/src/downloadmanager.h
@@ -1,6 +1,6 @@
/* ============================================================
 *
- * This file is a part of the reKonq project
+ * This file is a part of the rekonq project
 *
* Copyright (C) 2007-2008 Trolltech ASA. All rights reserved
* Copyright (C) 2008 by Andrea Diamantini <adjam7 at gmail dot com>
diff --git a/src/edittableview.cpp b/src/edittableview.cpp
index 5f60721a..17a01ecc 100644
--- a/src/edittableview.cpp
+++ b/src/edittableview.cpp
@@ -1,6 +1,6 @@
/* ============================================================
 *
- * This file is a part of the reKonq project
+ * This file is a part of the rekonq project
 *
* Copyright (C) 2007-2008 Trolltech ASA. All rights reserved
* Copyright (C) 2008 by Andrea Diamantini <adjam7 at gmail dot com>
diff --git a/src/edittableview.h b/src/edittableview.h
index 48d60d2a..3c2c69db 100644
--- a/src/edittableview.h
+++ b/src/edittableview.h
@@ -1,6 +1,6 @@
/* ============================================================
 *
- * This file is a part of the reKonq project
+ * This file is a part of the rekonq project
 *
* Copyright (C) 2007-2008 Trolltech ASA. All rights reserved
* Copyright (C) 2008 by Andrea Diamantini <adjam7 at gmail dot com>
diff --git a/src/edittreeview.cpp b/src/edittreeview.cpp
index e01843f8..e3f79fc3 100644
--- a/src/edittreeview.cpp
+++ b/src/edittreeview.cpp
@@ -1,6 +1,6 @@
/* ============================================================
 *
- * This file is a part of the reKonq project
+ * This file is a part of the rekonq project
 *
* Copyright (C) 2007-2008 Trolltech ASA. All rights reserved
* Copyright (C) 2008 by Andrea Diamantini <adjam7 at gmail dot com>
diff --git a/src/edittreeview.h b/src/edittreeview.h
index b4a46b6f..fd995b47 100644
--- a/src/edittreeview.h
+++ b/src/edittreeview.h
@@ -1,6 +1,6 @@
/* ============================================================
 *
- * This file is a part of the reKonq project
+ * This file is a part of the rekonq project
 *
* Copyright (C) 2007-2008 Trolltech ASA. All rights reserved
* Copyright (C) 2008 by Andrea Diamantini <adjam7 at gmail dot com>
diff --git a/src/findbar.cpp b/src/findbar.cpp
index 14d52001..b45dc8fa 100644
--- a/src/findbar.cpp
+++ b/src/findbar.cpp
@@ -1,6 +1,6 @@
/* ============================================================
 *
- * This file is a part of the reKonq project
+ * This file is a part of the rekonq project
 *
* Copyright (C) 2008 by Andrea Diamantini <adjam7 at gmail dot com>
 *
diff --git a/src/findbar.h b/src/findbar.h
index 4c0034a6..f8ef183e 100644
--- a/src/findbar.h
+++ b/src/findbar.h
@@ -1,6 +1,6 @@
/* ============================================================
 *
- * This file is a part of the reKonq project
+ * This file is a part of the rekonq project
 *
* Copyright (C) 2008 by Andrea Diamantini <adjam7 at gmail dot com>
 *
diff --git a/src/history.cpp b/src/history.cpp
index 930e73ae..5466963b 100644
--- a/src/history.cpp
+++ b/src/history.cpp
@@ -1,6 +1,6 @@
/* ============================================================
 *
- * This file is a part of the reKonq project
+ * This file is a part of the rekonq project
 *
* Copyright (C) 2007-2008 Trolltech ASA. All rights reserved
* Copyright (C) 2008 by Andrea Diamantini <adjam7 at gmail dot com>
diff --git a/src/history.h b/src/history.h
index 41763b69..acd27192 100644
--- a/src/history.h
+++ b/src/history.h
@@ -1,6 +1,6 @@
/* ============================================================
 *
- * This file is a part of the reKonq project
+ * This file is a part of the rekonq project
 *
* Copyright (C) 2007-2008 Trolltech ASA. All rights reserved
* Copyright (C) 2008 by Andrea Diamantini <adjam7 at gmail dot com>
diff --git a/src/main.cpp b/src/main.cpp
index 304c2301..e2f74b4d 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,6 +1,6 @@
/* ============================================================
 *
- * This file is a part of the reKonq project
+ * This file is a part of the rekonq project
 *
* Copyright (C) 2007-2008 Trolltech ASA. All rights reserved
* Copyright (C) 2008 by Andrea Diamantini <adjam7 at gmail dot com>
@@ -29,9 +29,9 @@
int main(int argc, char **argv)
{
KAboutData aboutData(
- "reKonq",
+ "rekonq",
0,
- ki18n("reKonq"),
+ ki18n("rekonq"),
"0.0.1",
ki18n("A KDE browser webkit based"),
KAboutData::License_GPL,
@@ -41,7 +41,7 @@ int main(int argc, char **argv)
"adjam7@gmail.com" // bug report mail
);
- aboutData.addAuthor(ki18n("Andrea Diamantini"), ki18n("reKonq author"), "adjam7@gmail.com");
+ aboutData.addAuthor(ki18n("Andrea Diamantini"), ki18n("rekonq author"), "adjam7@gmail.com");
aboutData.setProgramIconName("applications-internet");
KCmdLineArgs::init( argc, argv, &aboutData );
@@ -52,7 +52,7 @@ int main(int argc, char **argv)
KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
- BrowserApplication app(args, "reKonq");
+ BrowserApplication app(args, "rekonq");
if (!app.isTheOnlyBrowser())
return 0;
app.newMainWindow();
diff --git a/src/modelmenu.cpp b/src/modelmenu.cpp
index 7c8fb128..f2cd0189 100644
--- a/src/modelmenu.cpp
+++ b/src/modelmenu.cpp
@@ -1,6 +1,6 @@
/* ============================================================
 *
- * This file is a part of the reKonq project
+ * This file is a part of the rekonq project
 *
* Copyright (C) 2007-2008 Trolltech ASA. All rights reserved
* Copyright (C) 2008 by Andrea Diamantini <adjam7 at gmail dot com>
diff --git a/src/modelmenu.h b/src/modelmenu.h
index 61ec370b..fe08e673 100644
--- a/src/modelmenu.h
+++ b/src/modelmenu.h
@@ -1,6 +1,6 @@
/* ============================================================
 *
- * This file is a part of the reKonq project
+ * This file is a part of the rekonq project
 *
* Copyright (C) 2007-2008 Trolltech ASA. All rights reserved
* Copyright (C) 2008 by Andrea Diamantini <adjam7 at gmail dot com>
diff --git a/src/networkaccessmanager.cpp b/src/networkaccessmanager.cpp
index c5967d2a..869a6144 100644
--- a/src/networkaccessmanager.cpp
+++ b/src/networkaccessmanager.cpp
@@ -1,6 +1,6 @@
/* ============================================================
 *
- * This file is a part of the reKonq project
+ * This file is a part of the rekonq project
 *
* Copyright (C) 2007-2008 Trolltech ASA. All rights reserved
* Copyright (C) 2008 by Andrea Diamantini <adjam7 at gmail dot com>
diff --git a/src/networkaccessmanager.h b/src/networkaccessmanager.h
index 45ef1b0d..7d683967 100644
--- a/src/networkaccessmanager.h
+++ b/src/networkaccessmanager.h
@@ -1,6 +1,6 @@
/* ============================================================
 *
- * This file is a part of the reKonq project
+ * This file is a part of the rekonq project
 *
* Copyright (C) 2007-2008 Trolltech ASA. All rights reserved
* Copyright (C) 2008 by Andrea Diamantini <adjam7 at gmail dot com>
diff --git a/src/searchbar.cpp b/src/searchbar.cpp
index 785fcce5..29862e6d 100644
--- a/src/searchbar.cpp
+++ b/src/searchbar.cpp
@@ -1,6 +1,6 @@
/* ============================================================
 *
- * This file is a part of the reKonq project
+ * This file is a part of the rekonq project
 *
* Copyright (C) 2008 by Andrea Diamantini <adjam7 at gmail dot com>
 *
@@ -27,11 +27,17 @@
SearchBar::SearchBar(QWidget *parent) :
QWidget(parent),
- m_lineEdit(0)
+ m_lineEdit(new KLineEdit)
{
- m_lineEdit = new KLineEdit(this);
m_lineEdit->setClearButtonShown( true );
+ m_lineEdit->setFocusProxy( this );
+ setFocusPolicy( Qt::WheelFocus );
+ setMouseTracking( true );
+
+ QSizePolicy policy = sizePolicy();
+ setSizePolicy(QSizePolicy::Preferred, policy.verticalPolicy());
+
QPalette palette;
palette.setColor( QPalette::Text, Qt::gray );
m_lineEdit->setPalette( palette );
@@ -41,7 +47,7 @@ SearchBar::SearchBar(QWidget *parent) :
layout->addWidget(m_lineEdit);
setLayout(layout);
- connect( lineEdit() , SIGNAL( returnPressed() ) , this , SLOT( searchNow() ) );
+ connect( m_lineEdit , SIGNAL( returnPressed() ) , this , SLOT( searchNow() ) );
}
@@ -50,22 +56,22 @@ SearchBar::~SearchBar()
}
-void SearchBar::resizeEvent( QResizeEvent * event )
-{
- QRect rect = m_lineEdit->contentsRect();
-
- int width = rect.width();
-
- int lineEditWidth = BrowserApplication::instance()->mainWindow()->size().width() / 5 ; // FIXME ( OR not?)
-
- m_lineEdit->setGeometry( rect.x() + ( width - lineEditWidth + 8 ),
- rect.y() + 4,
- lineEditWidth,
- m_lineEdit->height()
- );
-
- QWidget::resizeEvent( event );
-}
+// void SearchBar::resizeEvent( QResizeEvent * event )
+// {
+// QRect rect = m_lineEdit->contentsRect();
+//
+// int width = rect.width();
+//
+// int lineEditWidth = BrowserApplication::instance()->mainWindow()->size().width() / 5 ; // FIXME ( OR not?)
+//
+// m_lineEdit->setGeometry( rect.x() + ( width - lineEditWidth + 8 ),
+// rect.y() + 4,
+// lineEditWidth,
+// m_lineEdit->height()
+// );
+//
+// QWidget::resizeEvent( event );
+// }
void SearchBar::searchNow()
diff --git a/src/searchbar.h b/src/searchbar.h
index 96ae282a..67f2bda5 100644
--- a/src/searchbar.h
+++ b/src/searchbar.h
@@ -1,6 +1,6 @@
/* ============================================================
 *
- * This file is a part of the reKonq project
+ * This file is a part of the rekonq project
 *
* Copyright (C) 2008 by Andrea Diamantini <adjam7 at gmail dot com>
 *
@@ -38,11 +38,14 @@ public:
KLineEdit *lineEdit();
+ friend class KLineEdit;
+
public slots:
void searchNow();
protected:
- void resizeEvent( QResizeEvent *);
+// void resizeEvent(QResizeEvent *);
+// void focusInEvent(QFocusEvent *);
private:
KLineEdit *m_lineEdit;
diff --git a/src/settings.cpp b/src/settings.cpp
index 74376ea8..2562530d 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -1,6 +1,6 @@
/* ============================================================
 *
- * This file is a part of the reKonq project
+ * This file is a part of the rekonq project
 *
* Copyright (C) 2007-2008 Trolltech ASA. All rights reserved
* Copyright (C) 2008 by Andrea Diamantini <adjam7 at gmail dot com>
diff --git a/src/settings.h b/src/settings.h
index 9b452610..4c99cd98 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -1,6 +1,6 @@
/* ============================================================
 *
- * This file is a part of the reKonq project
+ * This file is a part of the rekonq project
 *
* Copyright (C) 2007-2008 Trolltech ASA. All rights reserved
* Copyright (C) 2008 by Andrea Diamantini <adjam7 at gmail dot com>
diff --git a/src/squeezelabel.cpp b/src/squeezelabel.cpp
index 334219df..7aa9e177 100644
--- a/src/squeezelabel.cpp
+++ b/src/squeezelabel.cpp
@@ -1,6 +1,6 @@
/* ============================================================
 *
- * This file is a part of the reKonq project
+ * This file is a part of the rekonq project
 *
* Copyright (C) 2007-2008 Trolltech ASA. All rights reserved
* Copyright (C) 2008 by Andrea Diamantini <adjam7 at gmail dot com>
diff --git a/src/squeezelabel.h b/src/squeezelabel.h
index 7baee5f5..a7906270 100644
--- a/src/squeezelabel.h
+++ b/src/squeezelabel.h
@@ -1,6 +1,6 @@
/* ============================================================
 *
- * This file is a part of the reKonq project
+ * This file is a part of the rekonq project
 *
* Copyright (C) 2007-2008 Trolltech ASA. All rights reserved
* Copyright (C) 2008 by Andrea Diamantini <adjam7 at gmail dot com>
diff --git a/src/tabwidget.cpp b/src/tabwidget.cpp
index 54db660a..46724e1e 100644
--- a/src/tabwidget.cpp
+++ b/src/tabwidget.cpp
@@ -1,6 +1,6 @@
/* ============================================================
 *
- * This file is a part of the reKonq project
+ * This file is a part of the rekonq project
 *
* Copyright (C) 2007-2008 Trolltech ASA. All rights reserved
* Copyright (C) 2008 by Andrea Diamantini <adjam7 at gmail dot com>
diff --git a/src/tabwidget.h b/src/tabwidget.h
index 72fbc0a7..1a46371c 100644
--- a/src/tabwidget.h
+++ b/src/tabwidget.h
@@ -1,6 +1,6 @@
/* ============================================================
 *
- * This file is a part of the reKonq project
+ * This file is a part of the rekonq project
 *
* Copyright (C) 2007-2008 Trolltech ASA. All rights reserved
* Copyright (C) 2008 by Andrea Diamantini <adjam7 at gmail dot com>
diff --git a/src/webview.cpp b/src/webview.cpp
index 19bf60ee..dd28124a 100644
--- a/src/webview.cpp
+++ b/src/webview.cpp
@@ -1,6 +1,6 @@
/* ============================================================
 *
- * This file is a part of the reKonq project
+ * This file is a part of the rekonq project
 *
* Copyright (C) 2007-2008 Trolltech ASA. All rights reserved
* Copyright (C) 2008 by Andrea Diamantini <adjam7 at gmail dot com>
diff --git a/src/webview.h b/src/webview.h
index ae5230ce..aa8efb81 100644
--- a/src/webview.h
+++ b/src/webview.h
@@ -1,6 +1,6 @@
/* ============================================================
 *
- * This file is a part of the reKonq project
+ * This file is a part of the rekonq project
 *
* Copyright (C) 2007-2008 Trolltech ASA. All rights reserved
* Copyright (C) 2008 by Andrea Diamantini <adjam7 at gmail dot com>