From 5944fa01d76b7624bb88672c48dd4c597e3c4f02 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Fri, 14 Nov 2008 12:12:35 +0100 Subject: searchbar --> findbar Yes, I know it's a search bar and finding is not granted. But I need to distingue between this and the "other" searchbar.. --- src/findbar.h | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 src/findbar.h (limited to 'src/findbar.h') diff --git a/src/findbar.h b/src/findbar.h new file mode 100644 index 00000000..214a06e2 --- /dev/null +++ b/src/findbar.h @@ -0,0 +1,53 @@ +/* ============================================================ + * + * This file is a part of the reKonq project + * + * Copyright (C) 2008 by Andrea Diamantini + * + * + * This program is free software; you can redistribute it + * and/or modify it under the terms of the GNU General + * Public License as published by the Free Software Foundation; + * either version 2, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the + * GNU General Public License for more details. + * + * ============================================================ */ + +#ifndef FINDBAR_H +#define FINDBAR_H + +#include + +#include + +class FindBar : public QWidget +{ + Q_OBJECT + +public: + FindBar(QWidget *parent = 0); + ~FindBar(); + +public slots: + void clear(); + void showFind(); + void slotFindNext(); + void slotFindPrevious(); + +protected: + void resizeEvent(QResizeEvent *event); + +private slots: + void frameChanged(int frame); + +private: + void initializeFindWidget(); + + KLineEdit *m_lineEdit; +}; + +#endif -- cgit v1.2.1 From ec154e126f4ae0febbbb7fef298ca6d98aee836d Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Fri, 28 Nov 2008 10:35:19 +0100 Subject: New findbar implementation. Now it will be shown with CTRL+F, but NOT hidden with ESC button. Also doesn't search --- src/findbar.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/findbar.h') diff --git a/src/findbar.h b/src/findbar.h index 214a06e2..05dbf820 100644 --- a/src/findbar.h +++ b/src/findbar.h @@ -21,16 +21,18 @@ #define FINDBAR_H #include +#include #include -class FindBar : public QWidget +class FindBar : public KToolBar { Q_OBJECT public: FindBar(QWidget *parent = 0); ~FindBar(); + KLineEdit *lineEdit(); public slots: void clear(); @@ -38,9 +40,6 @@ public slots: void slotFindNext(); void slotFindPrevious(); -protected: - void resizeEvent(QResizeEvent *event); - private slots: void frameChanged(int frame); @@ -48,6 +47,7 @@ private: void initializeFindWidget(); KLineEdit *m_lineEdit; + QWidget *m_centralWidget; }; #endif -- cgit v1.2.1 From bc901b1e79acf8c49fb76c3aeabbf59a49fc8276 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Fri, 28 Nov 2008 10:58:12 +0100 Subject: Various adjustments. Nothing really important.Various adjustments. Nothing really important... --- src/findbar.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'src/findbar.h') diff --git a/src/findbar.h b/src/findbar.h index 05dbf820..bd3c5960 100644 --- a/src/findbar.h +++ b/src/findbar.h @@ -40,9 +40,6 @@ public slots: void slotFindNext(); void slotFindPrevious(); -private slots: - void frameChanged(int frame); - private: void initializeFindWidget(); -- cgit v1.2.1 From d62176f7f2a6a204b5017bc661fff2d3a9f76e6e Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Sun, 30 Nov 2008 17:30:57 +0100 Subject: - Ported historyMenu to KAction - some adjs on urlbar - added TODO file to remember things --- src/findbar.h | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'src/findbar.h') diff --git a/src/findbar.h b/src/findbar.h index bd3c5960..ece34f83 100644 --- a/src/findbar.h +++ b/src/findbar.h @@ -23,26 +23,28 @@ #include #include -#include +#include class FindBar : public KToolBar { Q_OBJECT public: - FindBar(QWidget *parent = 0); + FindBar(QMainWindow *parent); ~FindBar(); KLineEdit *lineEdit(); public slots: void clear(); - void showFind(); - void slotFindNext(); - void slotFindPrevious(); + void showFindBar(); + +protected Q_SLOTS: + void keyPressEvent(QKeyEvent* event); -private: - void initializeFindWidget(); +signals: + void searchString(const QString &); +private: KLineEdit *m_lineEdit; QWidget *m_centralWidget; }; -- cgit v1.2.1 From 75e3a98bb31afe389a5ac63b8f82423d019721a8 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Sat, 6 Dec 2008 10:25:23 +0100 Subject: more KDE-like menubar(s).. --- src/findbar.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/findbar.h') diff --git a/src/findbar.h b/src/findbar.h index ece34f83..4c0034a6 100644 --- a/src/findbar.h +++ b/src/findbar.h @@ -23,14 +23,14 @@ #include #include -#include +#include class FindBar : public KToolBar { Q_OBJECT public: - FindBar(QMainWindow *parent); + FindBar(KMainWindow *parent); ~FindBar(); KLineEdit *lineEdit(); -- cgit v1.2.1 From 19e901a0ca9630b2003dd24ccfa6da54eb70bb09 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Sun, 14 Dec 2008 18:27:17 +0100 Subject: adjusted rekonq name commented out (hopefully, for now) resizeEvents and focusInEvents in urlbar & searchbar --- src/findbar.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/findbar.h') 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  * -- cgit v1.2.1 From 9cbf281f4df98feec4325dac050cc633e3bbfe2f Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Tue, 30 Dec 2008 16:52:23 +0100 Subject: Fixed FindBar crash && refactored to look like kate searchbar --- src/findbar.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/findbar.h') diff --git a/src/findbar.h b/src/findbar.h index f8ef183e..4c73767c 100644 --- a/src/findbar.h +++ b/src/findbar.h @@ -23,14 +23,14 @@ #include #include -#include +#include class FindBar : public KToolBar { Q_OBJECT public: - FindBar(KMainWindow *parent); + FindBar(KXmlGuiWindow *parent); ~FindBar(); KLineEdit *lineEdit(); -- cgit v1.2.1 From 6cf7ab65f009f07cdc0ded9ec377665c124a84ac Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Thu, 8 Jan 2009 02:35:46 +0100 Subject: Created mainview! Other minor adjs.. --- src/findbar.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/findbar.h') diff --git a/src/findbar.h b/src/findbar.h index 4c73767c..d70a9de1 100644 --- a/src/findbar.h +++ b/src/findbar.h @@ -20,9 +20,9 @@ #ifndef FINDBAR_H #define FINDBAR_H +// KDE Includes #include #include - #include class FindBar : public KToolBar -- cgit v1.2.1 From feb5472021e697aa2722806a4a46ec56dfa1579f Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Tue, 27 Jan 2009 12:21:11 +0100 Subject: We now have the FINAL search bar!! Yeah!!! --- src/findbar.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/findbar.h') diff --git a/src/findbar.h b/src/findbar.h index d70a9de1..f2c59ce9 100644 --- a/src/findbar.h +++ b/src/findbar.h @@ -25,12 +25,12 @@ #include #include -class FindBar : public KToolBar +class FindBar : public QWidget // KateViewHelpers.h { Q_OBJECT public: - FindBar(KXmlGuiWindow *parent); + FindBar(KXmlGuiWindow *mainwindow); ~FindBar(); KLineEdit *lineEdit(); @@ -46,7 +46,6 @@ signals: private: KLineEdit *m_lineEdit; - QWidget *m_centralWidget; }; #endif -- cgit v1.2.1 From 39409ac6a2880ad815d6096231d0fcdcfd2547f6 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Sun, 22 Mar 2009 10:21:09 +0100 Subject: Fixed Copyright intro --- src/findbar.h | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) (limited to 'src/findbar.h') diff --git a/src/findbar.h b/src/findbar.h index f2c59ce9..4763944b 100644 --- a/src/findbar.h +++ b/src/findbar.h @@ -1,21 +1,23 @@ /* ============================================================ - * - * This file is a part of the rekonq project - * - * Copyright (C) 2008 by Andrea Diamantini - * - * - * This program is free software; you can redistribute it - * and/or modify it under the terms of the GNU General - * Public License as published by the Free Software Foundation; - * either version 2, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the - * GNU General Public License for more details. - * - * ============================================================ */ +* +* This file is a part of the rekonq project +* +* Copyright (C) 2008 by Andrea Diamantini +* +* +* This program is free software; you can redistribute it +* and/or modify it under the terms of the GNU General +* Public License as published by the Free Software Foundation; +* either version 2, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* ============================================================ */ + + #ifndef FINDBAR_H #define FINDBAR_H -- cgit v1.2.1 From a934072cf9695e46e793898102590322f43c0733 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Sat, 28 Mar 2009 15:53:26 +0100 Subject: astyle. First round.. --- src/findbar.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/findbar.h') diff --git a/src/findbar.h b/src/findbar.h index 4763944b..66286cec 100644 --- a/src/findbar.h +++ b/src/findbar.h @@ -39,7 +39,7 @@ public: public slots: void clear(); void showFindBar(); - + protected Q_SLOTS: void keyPressEvent(QKeyEvent* event); -- cgit v1.2.1 From 7a93d8a59aa0f693ae533a35b0bc3e4607d3f5ff Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Thu, 9 Apr 2009 19:03:50 +0200 Subject: Refactoring find bar following (a bit) Pawel suggestions.. Applied match Case search --- src/findbar.h | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'src/findbar.h') diff --git a/src/findbar.h b/src/findbar.h index 66286cec..dd42c7d9 100644 --- a/src/findbar.h +++ b/src/findbar.h @@ -27,14 +27,20 @@ #include #include -class FindBar : public QWidget // KateViewHelpers.h +// Qt Includes +#include +#include + + +class FindBar : public QWidget { Q_OBJECT public: FindBar(KXmlGuiWindow *mainwindow); ~FindBar(); - KLineEdit *lineEdit(); + KLineEdit *lineEdit() const; + bool matchCase() const; public slots: void clear(); @@ -48,6 +54,8 @@ signals: private: KLineEdit *m_lineEdit; + QCheckBox *m_matchCase; }; + #endif -- cgit v1.2.1 From 7557af13f9f904cb9a6240d2101fb14e1ffdca99 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Wed, 22 Apr 2009 01:33:28 +0200 Subject: Fixing Copyrights --- src/findbar.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/findbar.h') diff --git a/src/findbar.h b/src/findbar.h index dd42c7d9..3ff92631 100644 --- a/src/findbar.h +++ b/src/findbar.h @@ -2,7 +2,8 @@ * * This file is a part of the rekonq project * -* Copyright (C) 2008 by Andrea Diamantini +* Copyright (C) 2008-2009 by Andrea Diamantini +* Copyright (C) 2009 rekonq team. Please, see AUTHORS file for details * * * This program is free software; you can redistribute it -- cgit v1.2.1 From e52ed70c8e6e1abd8adc27dd0052328fa5f4deff Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Sun, 26 Apr 2009 23:51:25 +0200 Subject: Including moc files && lineedit class Q_OBJECT fix --- src/findbar.h | 1 - 1 file changed, 1 deletion(-) (limited to 'src/findbar.h') diff --git a/src/findbar.h b/src/findbar.h index 3ff92631..15a82e1e 100644 --- a/src/findbar.h +++ b/src/findbar.h @@ -3,7 +3,6 @@ * This file is a part of the rekonq project * * Copyright (C) 2008-2009 by Andrea Diamantini -* Copyright (C) 2009 rekonq team. Please, see AUTHORS file for details * * * This program is free software; you can redistribute it -- cgit v1.2.1 From 06b2dc0ce6ec6dd4cb090c22e2f9f8521138146b Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Wed, 6 May 2009 03:09:23 +0200 Subject: EBN Krazy fixes. 1st round.. --- src/findbar.h | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'src/findbar.h') diff --git a/src/findbar.h b/src/findbar.h index 15a82e1e..3fa148e1 100644 --- a/src/findbar.h +++ b/src/findbar.h @@ -22,14 +22,20 @@ #ifndef FINDBAR_H #define FINDBAR_H + // KDE Includes #include #include -#include // Qt Includes -#include -#include +#include +#include +#include + +// Forward Declarations +class KXmlGuiWindow; +class QKeyEvent; +class QString; class FindBar : public QWidget -- cgit v1.2.1