summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Messages.sh2
-rw-r--r--src/application.cpp1
-rw-r--r--src/application.h1
-rw-r--r--src/autosaver.h1
-rw-r--r--src/bookmarks.h2
-rw-r--r--src/cookiejar.h1
-rw-r--r--src/download.cpp3
-rw-r--r--src/findbar.cpp2
-rw-r--r--src/findbar.h2
-rw-r--r--src/history.cpp1
-rw-r--r--src/history.h21
-rw-r--r--src/mainview.cpp4
-rw-r--r--src/mainview.h1
-rw-r--r--src/mainwindow.cpp8
-rw-r--r--src/mainwindow.h1
-rw-r--r--src/networkaccessmanager.cpp9
-rw-r--r--src/password.ui7
-rw-r--r--src/proxy.ui5
-rw-r--r--src/searchbar.cpp2
-rw-r--r--src/settings.cpp3
-rw-r--r--src/settings_webkit.ui3
-rw-r--r--src/webview.cpp10
-rw-r--r--src/webview.h1
23 files changed, 67 insertions, 24 deletions
diff --git a/src/Messages.sh b/src/Messages.sh
new file mode 100644
index 00000000..b22743a6
--- /dev/null
+++ b/src/Messages.sh
@@ -0,0 +1,2 @@
+#! /bin/sh
+$XGETTEXT *.cpp -o $podir/rekonq.pot
diff --git a/src/application.cpp b/src/application.cpp
index 32561847..5f7892c4 100644
--- a/src/application.cpp
+++ b/src/application.cpp
@@ -205,3 +205,4 @@ KIcon Application::icon(const KUrl &url) const
}
return icon;
}
+
diff --git a/src/application.h b/src/application.h
index a09e008f..e0c7a21c 100644
--- a/src/application.h
+++ b/src/application.h
@@ -23,7 +23,6 @@
#ifndef APPLICATION_H
#define APPLICATION_H
-
// KDE Includes
#include <KUniqueApplication>
#include <KCmdLineArgs>
diff --git a/src/autosaver.h b/src/autosaver.h
index e0de8ea5..b486fcb9 100644
--- a/src/autosaver.h
+++ b/src/autosaver.h
@@ -38,6 +38,7 @@
*
*/
+>>>>>>> master:src/autosaver.h
class AutoSaver : public QObject
{
Q_OBJECT
diff --git a/src/bookmarks.h b/src/bookmarks.h
index 38655133..fef91413 100644
--- a/src/bookmarks.h
+++ b/src/bookmarks.h
@@ -217,7 +217,6 @@ public slots:
* @short Waits for signal that the group with the address has been modified by the caller.
* Waits for signal that the group (or any of its children) with the address
* @p groupAddress (e.g. "/4/5") has been modified by the caller @p caller.
- *
* @param group bookmark group address
* @param caller caller that modified the bookmarks
* @see KBookmarkManager::changed
@@ -236,3 +235,4 @@ private:
};
#endif
+
diff --git a/src/cookiejar.h b/src/cookiejar.h
index 6cd91782..cd2403a2 100644
--- a/src/cookiejar.h
+++ b/src/cookiejar.h
@@ -204,3 +204,4 @@ private:
};
#endif // COOKIEJAR_H
+
diff --git a/src/download.cpp b/src/download.cpp
index 9a5b7a3d..a5aa73bd 100644
--- a/src/download.cpp
+++ b/src/download.cpp
@@ -118,7 +118,7 @@ void DownloadManager::newDownload(const KUrl &srcUrl, const KUrl &destUrl)
const QList<Download *> &DownloadManager::downloads() const
{
return m_downloads;
-};
+}
KUrl DownloadManager::downloadDestination(const QString &filename)
@@ -222,3 +222,4 @@ void Download::slotResult(KJob *job)
// inform the world
emit downloadFinished(job->error());
}
+
diff --git a/src/findbar.cpp b/src/findbar.cpp
index fd15546c..bc22a04c 100644
--- a/src/findbar.cpp
+++ b/src/findbar.cpp
@@ -28,7 +28,6 @@
#include <KIcon>
#include <KPushButton>
#include <klocalizedstring.h>
-#include <KXmlGuiWindow>
// Qt Includes
#include <QtGui/QWidget>
@@ -38,6 +37,7 @@
#include <QtGui/QKeyEvent>
#include <QtCore/QString>
+
FindBar::FindBar(KXmlGuiWindow *mainwindow)
: QWidget(mainwindow)
, m_lineEdit(new KLineEdit(this))
diff --git a/src/findbar.h b/src/findbar.h
index 3fa148e1..a8a78970 100644
--- a/src/findbar.h
+++ b/src/findbar.h
@@ -63,5 +63,5 @@ private:
QCheckBox *m_matchCase;
};
-
#endif
+
diff --git a/src/history.cpp b/src/history.cpp
index 544b1f90..0e822142 100644
--- a/src/history.cpp
+++ b/src/history.cpp
@@ -1465,3 +1465,4 @@ void HistoryTreeModel::sourceRowsRemoved(const QModelIndex &parent, int start, i
endRemoveRows();
}
}
+
diff --git a/src/history.h b/src/history.h
index b2af0891..1b504333 100644
--- a/src/history.h
+++ b/src/history.h
@@ -48,10 +48,15 @@ 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
@@ -161,7 +166,11 @@ 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;
@@ -187,7 +196,11 @@ 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
{
@@ -238,7 +251,11 @@ 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;
@@ -330,7 +347,11 @@ 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;
diff --git a/src/mainview.cpp b/src/mainview.cpp
index 5432fa51..71f81d66 100644
--- a/src/mainview.cpp
+++ b/src/mainview.cpp
@@ -713,4 +713,8 @@ void MainView::mouseDoubleClickEvent(QMouseEvent *event)
return;
}
KTabWidget::mouseDoubleClickEvent(event);
+<<<<<<< HEAD:src/mainview.cpp
}
+=======
+}
+>>>>>>> master:src/mainview.cpp
diff --git a/src/mainview.h b/src/mainview.h
index 372902dd..d3d4948d 100644
--- a/src/mainview.h
+++ b/src/mainview.h
@@ -196,3 +196,4 @@ private:
};
#endif
+
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 7af04da0..5642ad01 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -568,13 +568,13 @@ void MainWindow::slotPrivateBrowsing(bool enable)
if (enable)
{
QString title = i18n("Are you sure you want to turn on private browsing?");
- QString text = "<b>" + title + i18n("</b><br><br>When private browsing in turned on,"
- " webpages are not added to the history,"
+ QString text = "<b>" + title + i18n("</b><br><br>When private browsing is turned on,"
+ " web pages are not added to the history,"
" new cookies are not stored, current cookies cannot be accessed," \
- " site icons will not be stored, session will not be saved, " \
+ " site icons will not be stored, the session will not be saved, " \
" and searches are not added to the pop-up menu in the Google search box." \
" Until you close the window, you can still click the Back and Forward buttons" \
- " to return to the webpages you have opened.");
+ " to return to the web pages you have opened.");
int button = KMessageBox::questionYesNo(this, text, title);
if (button == KMessageBox::Ok)
diff --git a/src/mainwindow.h b/src/mainwindow.h
index cdb7151d..61d8f27b 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -151,3 +151,4 @@ private:
};
#endif // MAINWINDOW_H
+
diff --git a/src/networkaccessmanager.cpp b/src/networkaccessmanager.cpp
index d92edbd6..c9b94a8d 100644
--- a/src/networkaccessmanager.cpp
+++ b/src/networkaccessmanager.cpp
@@ -109,8 +109,9 @@ void NetworkAccessManager::authenticationRequired(QNetworkReply *reply, QAuthent
passwordWidget.iconLabel->setText(QString());
passwordWidget.iconLabel->setPixmap(mainWindow->style()->standardIcon(QStyle::SP_MessageBoxQuestion, 0, mainWindow).pixmap(32, 32));
- QString introMessage = i18n("<qt>Enter username and password for ") +
- Qt::escape(reply->url().toString()) + i18n(" at ") + Qt::escape(reply->url().toString()) + "</qt>";
+ QString introMessage = i18n("<qt>Enter username and password for %1 at %2</qt>",
+ Qt::escape(reply->url().toString()),
+ Qt::escape(reply->url().toString()) );
passwordWidget.introLabel->setText(introMessage);
passwordWidget.introLabel->setWordWrap(true);
@@ -121,6 +122,7 @@ void NetworkAccessManager::authenticationRequired(QNetworkReply *reply, QAuthent
}
}
+
void NetworkAccessManager::proxyAuthenticationRequired(const QNetworkProxy &proxy, QAuthenticator *auth)
{
MainWindow *mainWindow = Application::instance()->mainWindow();
@@ -137,7 +139,7 @@ void NetworkAccessManager::proxyAuthenticationRequired(const QNetworkProxy &prox
proxyWdg.iconLabel->setText(QString());
proxyWdg.iconLabel->setPixmap(mainWindow->style()->standardIcon(QStyle::SP_MessageBoxQuestion, 0, mainWindow).pixmap(32, 32));
- QString introMessage = i18n("<qt>Connect to proxy ") + Qt::escape(proxy.hostName()) + i18n(" using:</qt>");
+ QString introMessage = i18n("<qt>Connect to proxy %1 using:</qt>", Qt::escape(proxy.hostName()) );
proxyWdg.introLabel->setText(introMessage);
proxyWdg.introLabel->setWordWrap(true);
@@ -148,6 +150,7 @@ void NetworkAccessManager::proxyAuthenticationRequired(const QNetworkProxy &prox
}
}
+
#ifndef QT_NO_OPENSSL
void NetworkAccessManager::sslErrors(QNetworkReply *reply, const QList<QSslError> &error)
{
diff --git a/src/password.ui b/src/password.ui
index 028e1683..458c702c 100644
--- a/src/password.ui
+++ b/src/password.ui
@@ -10,16 +10,13 @@
<height>193</height>
</rect>
</property>
- <property name="windowTitle">
- <string>Form</string>
- </property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0" colspan="2">
<layout class="QHBoxLayout">
<item>
<widget class="QLabel" name="iconLabel">
<property name="text">
- <string>DUMMY ICON</string>
+ <string comment="KDE::DoNotExtract">DUMMY ICON</string>
</property>
</widget>
</item>
@@ -32,7 +29,7 @@
</sizepolicy>
</property>
<property name="text">
- <string>INTRO TEXT DUMMY</string>
+ <string comment="KDE::DoNotExtract">INTRO TEXT DUMMY</string>
</property>
</widget>
</item>
diff --git a/src/proxy.ui b/src/proxy.ui
index e7440862..3181b5ab 100644
--- a/src/proxy.ui
+++ b/src/proxy.ui
@@ -10,14 +10,11 @@
<height>153</height>
</rect>
</property>
- <property name="windowTitle">
- <string>Form</string>
- </property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QLabel" name="iconLabel">
<property name="text">
- <string>ICON</string>
+ <string comment="KDE::DoNotExtract">ICON</string>
</property>
</widget>
</item>
diff --git a/src/searchbar.cpp b/src/searchbar.cpp
index 685a8ec5..2110b4d9 100644
--- a/src/searchbar.cpp
+++ b/src/searchbar.cpp
@@ -37,6 +37,7 @@
#include <QtNetwork/QNetworkReply>
#include <QtXml/QXmlStreamReader>
+
SearchBar::SearchBar(QWidget *parent) :
KLineEdit(parent)
, m_networkAccessManager(new QNetworkAccessManager(this))
@@ -129,3 +130,4 @@ void SearchBar::handleNetworkData(QNetworkReply *networkReply)
networkReply->deleteLater();
}
+
diff --git a/src/settings.cpp b/src/settings.cpp
index 990db365..bf1f2e38 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -108,8 +108,10 @@ Private::Private(SettingsDialog *parent)
pageItem->setIcon(webkitIcon);
}
+
// -----------------------------------------------------------------------------------------------------
+
SettingsDialog::SettingsDialog(QWidget *parent)
: KConfigDialog(parent, "rekonfig", ReKonfig::self())
, d(new Private(this))
@@ -209,3 +211,4 @@ void SettingsDialog::setHomeToCurrentPage()
d->generalUi.kcfg_homePage->setText(webView->url().prettyUrl());
}
}
+
diff --git a/src/settings_webkit.ui b/src/settings_webkit.ui
index 362e392a..56ce7839 100644
--- a/src/settings_webkit.ui
+++ b/src/settings_webkit.ui
@@ -10,9 +10,6 @@
<height>360</height>
</rect>
</property>
- <property name="windowTitle">
- <string>Form</string>
- </property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QGroupBox" name="groupBox">
diff --git a/src/webview.cpp b/src/webview.cpp
index 55ed4003..c015a941 100644
--- a/src/webview.cpp
+++ b/src/webview.cpp
@@ -126,6 +126,15 @@ bool WebPage::acceptNavigationRequest(QWebFrame *frame, const QNetworkRequest &r
return false;
}
#endif
+
+ 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..
@@ -498,3 +507,4 @@ void WebView::keyPressEvent(QKeyEvent *event)
QWebView::keyPressEvent(event);
}
+
diff --git a/src/webview.h b/src/webview.h
index 7ab7f994..3742a36d 100644
--- a/src/webview.h
+++ b/src/webview.h
@@ -134,3 +134,4 @@ private:
};
#endif
+
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-03 20:30:13 +0000