From 4e574b8a94031ffb3214e9ee811096da15a53893 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Thu, 7 May 2009 01:35:48 +0200 Subject: Fixing forgotten merging issues.. --- src/autosaver.h | 2 -- src/findbar.cpp | 1 + src/history.h | 25 +++---------------------- src/mainview.cpp | 4 ---- src/webview.cpp | 11 ++--------- 5 files changed, 6 insertions(+), 37 deletions(-) (limited to 'src') diff --git a/src/autosaver.h b/src/autosaver.h index b486fcb9..7ce44f78 100644 --- a/src/autosaver.h +++ b/src/autosaver.h @@ -38,7 +38,6 @@ * */ ->>>>>>> master:src/autosaver.h class AutoSaver : public QObject { Q_OBJECT @@ -61,4 +60,3 @@ private: }; #endif // AUTOSAVER_H - diff --git a/src/findbar.cpp b/src/findbar.cpp index bc22a04c..0e312e04 100644 --- a/src/findbar.cpp +++ b/src/findbar.cpp @@ -28,6 +28,7 @@ #include #include #include +#include // Qt Includes #include diff --git a/src/history.h b/src/history.h index 1b504333..dabd6883 100644 --- a/src/history.h +++ b/src/history.h @@ -48,15 +48,10 @@ class HistoryItem { public: HistoryItem() {} -<<<<<<< HEAD:src/history.h - HistoryItem(const QString &u, - const QDateTime &d = QDateTime(), const QString &t = QString()) -======= explicit HistoryItem(const QString &u, const QDateTime &d = QDateTime(), const QString &t = QString() ) ->>>>>>> master:src/history.h : title(t), url(u), dateTime(d) {} inline bool operator==(const HistoryItem &other) const @@ -166,11 +161,8 @@ public: UrlStringRole = Qt::UserRole + 4 }; -<<<<<<< HEAD:src/history.h - HistoryModel(HistoryManager *history, QObject *parent = 0); -======= explicit HistoryModel(HistoryManager *history, QObject *parent = 0); ->>>>>>> master:src/history.h + QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const; QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; int columnCount(const QModelIndex &parent = QModelIndex()) const; @@ -196,11 +188,7 @@ class HistoryFilterModel : public QAbstractProxyModel Q_OBJECT public: -<<<<<<< HEAD:src/history.h - HistoryFilterModel(QAbstractItemModel *sourceModel, QObject *parent = 0); -======= explicit HistoryFilterModel(QAbstractItemModel *sourceModel, QObject *parent = 0); ->>>>>>> master:src/history.h inline bool historyContains(const QString &url) const { @@ -251,11 +239,8 @@ class HistoryMenuModel : public QAbstractProxyModel Q_OBJECT public: -<<<<<<< HEAD:src/history.h - HistoryMenuModel(HistoryTreeModel *sourceModel, QObject *parent = 0); -======= explicit HistoryMenuModel(HistoryTreeModel *sourceModel, QObject *parent = 0); ->>>>>>> master:src/history.h + int columnCount(const QModelIndex &parent) const; int rowCount(const QModelIndex &parent = QModelIndex()) const; QModelIndex mapFromSource(const QModelIndex & sourceIndex) const; @@ -347,11 +332,8 @@ class HistoryTreeModel : public QAbstractProxyModel Q_OBJECT public: -<<<<<<< HEAD:src/history.h - HistoryTreeModel(QAbstractItemModel *sourceModel, QObject *parent = 0); -======= explicit HistoryTreeModel(QAbstractItemModel *sourceModel, QObject *parent = 0); ->>>>>>> master:src/history.h + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; int columnCount(const QModelIndex &parent) const; int rowCount(const QModelIndex &parent = QModelIndex()) const; @@ -422,4 +404,3 @@ private slots: }; #endif // HISTORY_H - diff --git a/src/mainview.cpp b/src/mainview.cpp index 71f81d66..5432fa51 100644 --- a/src/mainview.cpp +++ b/src/mainview.cpp @@ -713,8 +713,4 @@ void MainView::mouseDoubleClickEvent(QMouseEvent *event) return; } KTabWidget::mouseDoubleClickEvent(event); -<<<<<<< HEAD:src/mainview.cpp } -======= -} ->>>>>>> master:src/mainview.cpp diff --git a/src/webview.cpp b/src/webview.cpp index c015a941..5842ae4f 100644 --- a/src/webview.cpp +++ b/src/webview.cpp @@ -91,11 +91,12 @@ bool WebPage::acceptNavigationRequest(QWebFrame *frame, const QNetworkRequest &r // An HTML form was submitted a second time. case QWebPage::NavigationTypeFormResubmitted: kDebug() << "NavigationTypeFormResubmitted"; - + break; // A navigation to another document using a method not listed above. case QWebPage::NavigationTypeOther: kDebug() << "NavigationTypeOther"; + break; // user clicked on a link or pressed return on a focused link. case QWebPage::NavigationTypeLinkClicked: @@ -129,14 +130,6 @@ bool WebPage::acceptNavigationRequest(QWebFrame *frame, const QNetworkRequest &r break; - // An HTML form was submitted a second time. - case QWebPage::NavigationTypeFormResubmitted: - break; - - // A navigation to another document using a method not listed above. - case QWebPage::NavigationTypeOther: - break; - // should be nothing.. default: kDebug() << "Default NON existant case.."; -- cgit v1.2.1 From 7a8309f2f3336740ffcec1d89154750ffa86c7bc Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Thu, 7 May 2009 01:57:35 +0200 Subject: EBN Krazy fixes. 2nd round.. --- src/download.h | 2 +- src/history.cpp | 3 +++ src/lineedit.cpp | 11 +++++------ src/lineedit.h | 5 ++--- src/mainview.cpp | 18 +++++++++++++----- src/mainwindow.cpp | 22 +++++++++++++++++++--- src/modelmenu.cpp | 1 + src/modelmenu.h | 15 ++++++++++++--- src/webview.cpp | 1 - 9 files changed, 56 insertions(+), 22 deletions(-) (limited to 'src') diff --git a/src/download.h b/src/download.h index 0ad01e69..0502d500 100644 --- a/src/download.h +++ b/src/download.h @@ -31,7 +31,7 @@ #include // Qt Includes -#include +#include // Forward Declarations class KJob; diff --git a/src/history.cpp b/src/history.cpp index 0e822142..2bab72d8 100644 --- a/src/history.cpp +++ b/src/history.cpp @@ -45,9 +45,12 @@ #include #include +#include + #include #include +// generic algorithms #include diff --git a/src/lineedit.cpp b/src/lineedit.cpp index c9df7bfa..9ca963af 100644 --- a/src/lineedit.cpp +++ b/src/lineedit.cpp @@ -21,15 +21,14 @@ #include "lineedit.h" #include "lineedit.moc" -// Qt Includes -#include -#include -#include - // KDE Includes #include -// Local Includes +// Qt Includes +#include +#include +#include + LineEdit::LineEdit(QWidget* parent) : KLineEdit(parent) diff --git a/src/lineedit.h b/src/lineedit.h index f1bd8f88..ba18f3db 100644 --- a/src/lineedit.h +++ b/src/lineedit.h @@ -21,17 +21,16 @@ #ifndef LINEEDIT_H #define LINEEDIT_H -// Qt Includes // KDE Includes #include -// Local Includes - +// Forward Declarations class QContextMenuEvent; class QFocusEvent; class QKeyEvent; + class LineEdit : public KLineEdit { Q_OBJECT diff --git a/src/mainview.cpp b/src/mainview.cpp index 5432fa51..8f3bf197 100644 --- a/src/mainview.cpp +++ b/src/mainview.cpp @@ -2,7 +2,7 @@ * * 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 by Paweł Prażak * * @@ -48,10 +48,18 @@ #include // Qt Includes -#include -#include -#include - +#include +#include + +#include +#include +#include +#include +#include +#include + +#include + MainView::MainView(QWidget *parent) diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 5642ad01..5ffaa208 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -64,9 +64,25 @@ // Qt Includes -#include -#include -#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include + MainWindow::MainWindow() diff --git a/src/modelmenu.cpp b/src/modelmenu.cpp index cc43a3f3..57b094ab 100644 --- a/src/modelmenu.cpp +++ b/src/modelmenu.cpp @@ -19,6 +19,7 @@ * ============================================================ */ +// Self Includes #include "modelmenu.h" diff --git a/src/modelmenu.h b/src/modelmenu.h index 3cc657b3..af0d1043 100644 --- a/src/modelmenu.h +++ b/src/modelmenu.h @@ -23,15 +23,24 @@ #ifndef MODELMENU_H #define MODELMENU_H -// Qt Includes -#include -#include // KDE Includes #include #include #include +// Qt Includes +#include +#include + +// Forward Declarations +class QString; +class QWidget; +class QObject; +class QPersistentModelIndex; + +class KIcon; + // A QMenu that is dynamically populated from a QAbstractItemModel class ModelMenu : public KMenu { diff --git a/src/webview.cpp b/src/webview.cpp index 5842ae4f..c90b65d5 100644 --- a/src/webview.cpp +++ b/src/webview.cpp @@ -37,7 +37,6 @@ #include "download.h" #include "history.h" - // KDE Includes #include #include -- cgit v1.2.1 From 9cab6e02598d710e83992610e910acd06c2e2576 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Thu, 7 May 2009 11:16:51 +0200 Subject: EBN Krazy issues. 3rd round... First chech finished! --- src/cookiejar.cpp | 11 ++++++++--- src/cookiejar.h | 4 +--- src/edittableview.cpp | 8 +++++++- src/edittableview.h | 3 ++- src/edittreeview.cpp | 8 ++++++-- src/edittreeview.h | 3 ++- src/history.h | 3 +++ src/modelmenu.h | 7 +++++-- src/networkaccessmanager.cpp | 1 - src/networkaccessmanager.h | 4 ++-- src/panelhistory.h | 7 ++++--- src/searchbar.h | 1 + src/sidepanel.cpp | 1 - src/sidepanel.h | 7 ++++--- src/stackedurlbar.h | 3 ++- src/tabbar.cpp | 4 +++- src/tabbar.h | 4 ++-- src/urlbar.cpp | 19 ++++++++++--------- src/urlbar.h | 14 +++++++------- src/webview.cpp | 22 +++++++++++++++++----- 20 files changed, 86 insertions(+), 48 deletions(-) (limited to 'src') diff --git a/src/cookiejar.cpp b/src/cookiejar.cpp index de7d7d7e..fd823553 100644 --- a/src/cookiejar.cpp +++ b/src/cookiejar.cpp @@ -37,9 +37,14 @@ #include // Qt Includes -#include -#include -#include +#include +#include +#include + +#include +#include + +#include static const unsigned int JAR_VERSION = 23; diff --git a/src/cookiejar.h b/src/cookiejar.h index cd2403a2..03802df1 100644 --- a/src/cookiejar.h +++ b/src/cookiejar.h @@ -24,9 +24,6 @@ #define COOKIEJAR_H -// KDE Includes -#include - // Qt Includes #include #include @@ -37,6 +34,7 @@ class QSortFilterProxyModel; class QKeyEvent; class AutoSaver; +class QUrl; class CookieJar : public QNetworkCookieJar diff --git a/src/edittableview.cpp b/src/edittableview.cpp index bf1ef370..8b9bb12d 100644 --- a/src/edittableview.cpp +++ b/src/edittableview.cpp @@ -19,15 +19,19 @@ * ============================================================ */ - +// Self Includes #include "edittableview.h" + +// Qt Includes #include + EditTableView::EditTableView(QWidget *parent) : QTableView(parent) { } + void EditTableView::keyPressEvent(QKeyEvent *event) { if ((event->key() == Qt::Key_Delete @@ -42,6 +46,7 @@ void EditTableView::keyPressEvent(QKeyEvent *event) } } + void EditTableView::removeOne() { if (!model() || !selectionModel()) @@ -54,6 +59,7 @@ void EditTableView::removeOne() selectionModel()->select(idx, QItemSelectionModel::SelectCurrent | QItemSelectionModel::Rows); } + void EditTableView::removeAll() { if (model()) diff --git a/src/edittableview.h b/src/edittableview.h index dbc9a145..d6f88bfe 100644 --- a/src/edittableview.h +++ b/src/edittableview.h @@ -23,8 +23,10 @@ #ifndef EDITTABLEVIEW_H #define EDITTABLEVIEW_H +// Qt Includes #include + class EditTableView : public QTableView { Q_OBJECT @@ -39,4 +41,3 @@ public slots: }; #endif // EDITTABLEVIEW_H - diff --git a/src/edittreeview.cpp b/src/edittreeview.cpp index 49730d67..5547cdb0 100644 --- a/src/edittreeview.cpp +++ b/src/edittreeview.cpp @@ -19,16 +19,19 @@ * ============================================================ */ - +// Self Includes #include "edittreeview.h" +// Qt includes #include + EditTreeView::EditTreeView(QWidget *parent) : QTreeView(parent) { } + void EditTreeView::keyPressEvent(QKeyEvent *event) { if ((event->key() == Qt::Key_Delete @@ -43,6 +46,7 @@ void EditTreeView::keyPressEvent(QKeyEvent *event) } } + void EditTreeView::removeOne() { if (!model()) @@ -52,10 +56,10 @@ void EditTreeView::removeOne() model()->removeRow(row, ci.parent()); } + void EditTreeView::removeAll() { if (!model()) return; model()->removeRows(0, model()->rowCount(rootIndex()), rootIndex()); } - diff --git a/src/edittreeview.h b/src/edittreeview.h index 5be0dc45..aeb32f37 100644 --- a/src/edittreeview.h +++ b/src/edittreeview.h @@ -22,8 +22,10 @@ #ifndef EDITTREEVIEW_H #define EDITTREEVIEW_H +// Qt Includes #include + class EditTreeView : public QTreeView { Q_OBJECT @@ -38,4 +40,3 @@ public slots: }; #endif // EDITTREEVIEW_H - diff --git a/src/history.h b/src/history.h index dabd6883..1bc1aa91 100644 --- a/src/history.h +++ b/src/history.h @@ -76,6 +76,7 @@ public: // --------------------------------------------------------------------------------------------------------------- +// Forward Declarations class AutoSaver; class HistoryModel; class HistoryFilterModel; @@ -384,6 +385,8 @@ protected: // ------------------------------------------------------------------------------------------ + +// Ui includes #include "ui_history.h" class HistoryDialog : public QDialog, public Ui_HistoryDialog diff --git a/src/modelmenu.h b/src/modelmenu.h index af0d1043..d55bd6ce 100644 --- a/src/modelmenu.h +++ b/src/modelmenu.h @@ -41,7 +41,11 @@ class QPersistentModelIndex; class KIcon; -// A QMenu that is dynamically populated from a QAbstractItemModel +/** + * A KMenu that is dynamically populated + * from a QAbstractItemModel + * + */ class ModelMenu : public KMenu { Q_OBJECT @@ -98,4 +102,3 @@ private: }; #endif // MODELMENU_H - diff --git a/src/networkaccessmanager.cpp b/src/networkaccessmanager.cpp index c9b94a8d..deae42dd 100644 --- a/src/networkaccessmanager.cpp +++ b/src/networkaccessmanager.cpp @@ -165,4 +165,3 @@ void NetworkAccessManager::sslErrors(QNetworkReply *reply, const QListignoreSslErrors(); } #endif - diff --git a/src/networkaccessmanager.h b/src/networkaccessmanager.h index ebcd952d..7da2f54f 100644 --- a/src/networkaccessmanager.h +++ b/src/networkaccessmanager.h @@ -22,8 +22,8 @@ #ifndef NETWORKACCESSMANAGER_H #define NETWORKACCESSMANAGER_H - -#include +// Qt Includes +#include class NetworkAccessManager : public QNetworkAccessManager diff --git a/src/panelhistory.h b/src/panelhistory.h index 89759a84..c6fe1380 100644 --- a/src/panelhistory.h +++ b/src/panelhistory.h @@ -20,12 +20,13 @@ #ifndef PANELHISTORY_H #define PANELHISTORY_H -// Qt Includes -#include - // Local Includes #include "application.h" +// Qt Includes +#include + +// Forward Declarations class QTreeView; class KUrl; class TreeProxyModel; diff --git a/src/searchbar.h b/src/searchbar.h index 3fdf55b4..29588c58 100644 --- a/src/searchbar.h +++ b/src/searchbar.h @@ -34,6 +34,7 @@ class QNetworkReply; /** * This class defines an internet search bar. + * */ class SearchBar : public KLineEdit { diff --git a/src/sidepanel.cpp b/src/sidepanel.cpp index 0fab81c0..85e11920 100644 --- a/src/sidepanel.cpp +++ b/src/sidepanel.cpp @@ -50,4 +50,3 @@ SidePanel::~SidePanel() delete m_panelHistory; } - diff --git a/src/sidepanel.h b/src/sidepanel.h index c0af7827..7c0612ad 100644 --- a/src/sidepanel.h +++ b/src/sidepanel.h @@ -20,12 +20,13 @@ #ifndef SIDEPANEL_H #define SIDEPANEL_H -// Qt Includes -#include - // Local Includes #include "application.h" +// Qt Includes +#include + +// Forward Declarations class KUrl; class PanelHistory; diff --git a/src/stackedurlbar.h b/src/stackedurlbar.h index d3aea16f..ef3392e9 100644 --- a/src/stackedurlbar.h +++ b/src/stackedurlbar.h @@ -26,10 +26,12 @@ // Qt Includes #include +// Forward Declarations class KCompletion; class HistoryCompletionModel; class UrlBar; + class StackedUrlBar : public QStackedWidget { Q_OBJECT @@ -61,4 +63,3 @@ private: }; #endif // STACKEDURLBAR_H - diff --git a/src/tabbar.cpp b/src/tabbar.cpp index be1b05fd..bf3f0b4e 100644 --- a/src/tabbar.cpp +++ b/src/tabbar.cpp @@ -39,7 +39,9 @@ #include // Qt Includes -#include +#include + +#include TabBar::TabBar(QWidget *parent) diff --git a/src/tabbar.h b/src/tabbar.h index 8563793f..14f2e35b 100644 --- a/src/tabbar.h +++ b/src/tabbar.h @@ -26,8 +26,8 @@ // KDE Includes #include -// Qt Includes -#include +// Forward Declarations +class QPoint; /** * Tab bar with a few more features such as diff --git a/src/urlbar.cpp b/src/urlbar.cpp index 29eaed70..e2756aa6 100644 --- a/src/urlbar.cpp +++ b/src/urlbar.cpp @@ -24,15 +24,6 @@ #include "urlbar.h" #include "urlbar.moc" -// Qt Includes -#include -#include - -// KDE Includes -#include -#include -#include - // Local Includes #include "application.h" #include "history.h" @@ -40,6 +31,16 @@ #include "mainwindow.h" #include "webview.h" +// KDE Includes +#include +#include +#include + +// Qt Includes +#include +#include +#include + QColor UrlBar::s_defaultBaseColor; diff --git a/src/urlbar.h b/src/urlbar.h index 236792bd..d8fb9029 100644 --- a/src/urlbar.h +++ b/src/urlbar.h @@ -23,18 +23,18 @@ #ifndef URLBAR_H #define URLBAR_H -// Qt Includes -#include -#include -#include + +// Local Includes +#include "lineedit.h" // KDE Includes #include #include -// Local Includes -#include "lineedit.h" - +// Qt Includes +#include +#include +#include // Forward Declarations class QLinearGradient; diff --git a/src/webview.cpp b/src/webview.cpp index c90b65d5..a8efaa2d 100644 --- a/src/webview.cpp +++ b/src/webview.cpp @@ -45,10 +45,22 @@ #include // Qt Includes -#include -#include -#include -#include +#include +#include +#include +#include +#include + +#include +#include + +#include +#include +#include +#include +#include + +#include WebPage::WebPage(QObject *parent) @@ -210,7 +222,7 @@ void WebPage::handleUnsupportedContent(QNetworkReply *reply) { path = QString("http://doc.trolltech.com/4.5/%1.html").arg(className); } - QUrl url(path); + KUrl url(path); Application::instance()->mainWindow()->loadUrl(url); return; -- cgit v1.2.1 From e70299ee2bc025a94c32153b7aa61b17f73f75a1 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Thu, 7 May 2009 11:37:48 +0200 Subject: Improved contextual menu usability --- src/webview.cpp | 69 ++++++++++++++++++++++++++++++++++++++------------------- 1 file changed, 46 insertions(+), 23 deletions(-) (limited to 'src') diff --git a/src/webview.cpp b/src/webview.cpp index a8efaa2d..4ae3986f 100644 --- a/src/webview.cpp +++ b/src/webview.cpp @@ -375,6 +375,35 @@ void WebView::contextMenuEvent(QContextMenuEvent *event) addBookmarkAction->setData(QVariant()); KMenu menu(this); + + // cut - copy - paste Actions. + // If someone selects text perhaps wanna work with it.. + bool b = false; + + if (result.isContentSelected() && result.isContentEditable()) + { + menu.addAction(webActions()->action("edit_cut")); + b = true; + } + + if (result.isContentSelected()) + { + menu.addAction(webActions()->action("edit_copy")); + b = true; + } + + if (result.isContentEditable()) + { + menu.addAction(webActions()->action("edit_paste")); + b = true; + } + + if(b) + { + menu.addSeparator(); + } + + // link actions bool linkIsEmpty = result.linkUrl().isEmpty(); if (!linkIsEmpty) { @@ -387,48 +416,42 @@ void WebView::contextMenuEvent(QContextMenuEvent *event) menu.addAction(mainwindow->actionByName("view_redisplay")); menu.addSeparator(); + // Developer Extras actions if (page()->settings()->testAttribute(QWebSettings::DeveloperExtrasEnabled)) { menu.addAction(webActions()->action("inspect_element")); menu.addSeparator(); } - menu.addAction(mainwindow->actionByName("history_back")); - menu.addAction(mainwindow->actionByName("history_forward")); - menu.addSeparator(); - - if (result.isContentSelected() && result.isContentEditable()) - { - menu.addAction(webActions()->action("edit_cut")); - } - - if (result.isContentSelected()) - { - menu.addAction(webActions()->action("edit_copy")); - } - - if (result.isContentEditable()) - { - menu.addAction(webActions()->action("edit_paste")); - } - + // save/copy link actions if (!linkIsEmpty) { + menu.addAction(webActions()->action("save_link_as")); + menu.addAction(webActions()->action("copy_link_location")); menu.addSeparator(); + if (!result.pixmap().isNull()) { // TODO Add "View Image" menu.addAction(webActions()->action("save_image_as")); menu.addAction(webActions()->action("copy_this_image")); + menu.addSeparator(); } - menu.addAction(webActions()->action("save_link_as")); - menu.addAction(webActions()->action("copy_link_location")); + } + + // history actions + menu.addAction(mainwindow->actionByName("history_back")); + menu.addAction(mainwindow->actionByName("history_forward")); + + // bookmark link action + if (!linkIsEmpty) + { + menu.addSeparator(); addBookmarkAction->setData(result.linkUrl()); addBookmarkAction->setText(i18n("&Bookmark This Link")); + menu.addAction(addBookmarkAction); } - menu.addSeparator(); - menu.addAction(addBookmarkAction); menu.exec(mapToGlobal(event->pos())); } -- cgit v1.2.1