From 97d56f0f6aed224d5a3baffcb787cd06c955cce5 Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter.martinos@gmail.com>
Date: Fri, 20 Dec 2013 14:59:41 +0100
Subject: [PATCH] Update ts files.
---
localization/rssguard_cs.ts | 88 +++++++++++++++++++------------
localization/rssguard_en.ts | 87 +++++++++++++++++++------------
localization/rssguard_nl.ts | 97 ++++++++++++++++++++++-------------
src/gui/feedmessageviewer.cpp | 2 +
src/gui/messagesview.cpp | 35 ++++++++-----
5 files changed, 195 insertions(+), 114 deletions(-)
diff --git a/localization/rssguard_cs.ts b/localization/rssguard_cs.ts
index de0151796..b3d940ed6 100644
--- a/localization/rssguard_cs.ts
+++ b/localization/rssguard_cs.ts
@@ -699,10 +699,6 @@
<source>Feeds & messages</source>
<translation>Kanály & zprávy</translation>
</message>
- <message>
- <source> • some keyboard shortcuts are not unique</source>
- <translation> • některé klávesové zkratky nejsou unikátní</translation>
- </message>
<message>
<source>Some critical settings are not set. You must fix these settings in order confirm new settings.</source>
<translation>Některá kritická nastavení nejsou vyplněna. Musíte je opravit než bude možné dialog potvrdit.</translation>
@@ -713,18 +709,6 @@
<translation>Seznam chyb:
%1.</translation>
</message>
- <message>
- <source> • language changed</source>
- <translation> • jazyk změněn</translation>
- </message>
- <message>
- <source> • icon theme changed</source>
- <translation> • téma ikon změněno</translation>
- </message>
- <message>
- <source> • skin changed</source>
- <translation> • skin změněn</translation>
- </message>
<message>
<source>Feeds</source>
<translation>Kanály</translation>
@@ -774,27 +758,35 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source> ⢠some keyboard shortcuts are not unique</source>
+ <source>Current color</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source> ⢠external browser is not set</source>
+ <source>Executable file of web browser</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source> • external browser is not set</source>
+ <source>Parameters to executable</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source> ⢠language changed</source>
+ <source> u2022 some keyboard shortcuts are not unique</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source> ⢠icon theme changed</source>
+ <source> u2022 external browser is not set</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source> ⢠skin changed</source>
+ <source> u2022 language changed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source> u2022 icon theme changed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source> u2022 skin changed</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -953,16 +945,6 @@
<extracomment>Email of translator - optional.</extracomment>
<translation>rotter.martinos@gmail.com</translation>
</message>
- <message>
- <source>%1
-
-Category type: standard
-Creation date: %2</source>
- <translation>%1
-
-Typ kategorie: standardní
-Datum vytvoření: %2</translation>
- </message>
<message numerus="yes">
<source>%n unread message(s).</source>
<translation>
@@ -971,6 +953,48 @@ Datum vytvoření: %2</translation>
<numerusform>%n nepřečtených zpráv.</numerusform>
</translation>
</message>
+ <message>
+ <source>ATOM 1.0</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>RDF 1.0</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>RSS 0.90/0.91/0.92</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>RSS 2.0/2.0.1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>%1
+
+Category type: standard
+Creation date: %2%3</source>
+ <translation type="unfinished">%1
+
+Typ kategorie: standardní
+Datum vytvoření: %2%3 {1
+?}</translation>
+ </message>
+ <message>
+ <source>
+
+This category does not contain any nested items.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>%1
+
+Feed type: %2
+URL: %3
+Encoding: %4
+Language: %5</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>ShortcutCatcher</name>
diff --git a/localization/rssguard_en.ts b/localization/rssguard_en.ts
index dd07b4c59..c0fa7e70e 100644
--- a/localization/rssguard_en.ts
+++ b/localization/rssguard_en.ts
@@ -692,10 +692,6 @@
<source>Feeds & messages</source>
<translation type="unfinished"></translation>
</message>
- <message utf8="true">
- <source> • some keyboard shortcuts are not unique</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<source>Some critical settings are not set. You must fix these settings in order confirm new settings.</source>
<translation type="unfinished"></translation>
@@ -705,18 +701,6 @@
%1.</source>
<translation type="unfinished"></translation>
</message>
- <message utf8="true">
- <source> • language changed</source>
- <translation type="unfinished"></translation>
- </message>
- <message utf8="true">
- <source> • icon theme changed</source>
- <translation type="unfinished"></translation>
- </message>
- <message utf8="true">
- <source> • skin changed</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<source>Feeds</source>
<translation type="unfinished"></translation>
@@ -766,27 +750,35 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source> ⢠some keyboard shortcuts are not unique</source>
+ <source>Current color</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source> ⢠external browser is not set</source>
- <translation type="unfinished"></translation>
- </message>
- <message utf8="true">
- <source> • external browser is not set</source>
+ <source>Executable file of web browser</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source> ⢠language changed</source>
+ <source>Parameters to executable</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source> ⢠icon theme changed</source>
+ <source> u2022 some keyboard shortcuts are not unique</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source> ⢠skin changed</source>
+ <source> u2022 external browser is not set</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source> u2022 language changed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source> u2022 icon theme changed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source> u2022 skin changed</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -945,13 +937,6 @@
<extracomment>Email of translator - optional.</extracomment>
<translation>rotter.martinos@gmail.com</translation>
</message>
- <message>
- <source>%1
-
-Category type: standard
-Creation date: %2</source>
- <translation type="unfinished"></translation>
- </message>
<message numerus="yes">
<source>%n unread message(s).</source>
<translation type="unfinished">
@@ -959,6 +944,44 @@ Creation date: %2</source>
<numerusform></numerusform>
</translation>
</message>
+ <message>
+ <source>ATOM 1.0</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>RDF 1.0</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>RSS 0.90/0.91/0.92</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>RSS 2.0/2.0.1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>%1
+
+Category type: standard
+Creation date: %2%3</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>
+
+This category does not contain any nested items.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>%1
+
+Feed type: %2
+URL: %3
+Encoding: %4
+Language: %5</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>ShortcutCatcher</name>
diff --git a/localization/rssguard_nl.ts b/localization/rssguard_nl.ts
index 2fc4bfd6d..fcf6df189 100644
--- a/localization/rssguard_nl.ts
+++ b/localization/rssguard_nl.ts
@@ -699,10 +699,6 @@
<source>Feeds & messages</source>
<translation>Feeds & berichten</translation>
</message>
- <message utf8="true">
- <source> • some keyboard shortcuts are not unique</source>
- <translation>...sommige sneltoetsen zijn niet uniek</translation>
- </message>
<message>
<source>Some critical settings are not set. You must fix these settings in order confirm new settings.</source>
<translation>Sommige kritieke instellingen zijn niet instelbaar. Je moet deze nieuwe instellingen bevestigen om op te lossen.</translation>
@@ -713,18 +709,6 @@
<translation>lijst van fouten:
%1.</translation>
</message>
- <message utf8="true">
- <source> • language changed</source>
- <translation>...van taal veranderd</translation>
- </message>
- <message utf8="true">
- <source> • icon theme changed</source>
- <translation>...pictogram thema veranderd</translation>
- </message>
- <message utf8="true">
- <source> • skin changed</source>
- <translation>...skin veranderd</translation>
- </message>
<message>
<source>Feeds</source>
<translation></translation>
@@ -774,28 +758,36 @@
<translation>Opera 12 of ouder</translation>
</message>
<message>
- <source> ⢠some keyboard shortcuts are not unique</source>
- <translation>...sommige sneltoetsen zijn niet uniek</translation>
+ <source>Current color</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source> ⢠external browser is not set</source>
- <translation>...externe browser niet ingesteld</translation>
- </message>
- <message utf8="true">
- <source> • external browser is not set</source>
- <translation>...externe browser niet ingesteld</translation>
+ <source>Executable file of web browser</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source> ⢠language changed</source>
- <translation>...van taal veranderd</translation>
+ <source>Parameters to executable</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source> ⢠icon theme changed</source>
- <translation>...pictogram thema veranderd</translation>
+ <source> u2022 some keyboard shortcuts are not unique</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source> ⢠skin changed</source>
- <translation>... skin veranderd</translation>
+ <source> u2022 external browser is not set</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source> u2022 language changed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source> u2022 icon theme changed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source> u2022 skin changed</source>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -953,13 +945,6 @@
<extracomment>Email of translator - optional.</extracomment>
<translation>elbert.pol@gmail.com</translation>
</message>
- <message>
- <source>%1
-
-Category type: standard
-Creation date: %2</source>
- <translation type="unfinished"></translation>
- </message>
<message numerus="yes">
<source>%n unread message(s).</source>
<translation type="unfinished">
@@ -967,6 +952,44 @@ Creation date: %2</source>
<numerusform></numerusform>
</translation>
</message>
+ <message>
+ <source>ATOM 1.0</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>RDF 1.0</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>RSS 0.90/0.91/0.92</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>RSS 2.0/2.0.1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>%1
+
+Category type: standard
+Creation date: %2%3</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>
+
+This category does not contain any nested items.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>%1
+
+Feed type: %2
+URL: %3
+Encoding: %4
+Language: %5</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>ShortcutCatcher</name>
diff --git a/src/gui/feedmessageviewer.cpp b/src/gui/feedmessageviewer.cpp
index ee6bd99f5..824305fa9 100644
--- a/src/gui/feedmessageviewer.cpp
+++ b/src/gui/feedmessageviewer.cpp
@@ -62,6 +62,8 @@ void FeedMessageViewer::createConnections() {
SIGNAL(triggered()), m_messagesView, SLOT(openSelectedMessagesInternally()));
connect(FormMain::getInstance()->m_ui->m_actionMarkAllMessagesAsRead,
SIGNAL(triggered()), m_messagesView, SLOT(setAllMessagesRead()));
+ connect(FormMain::getInstance()->m_ui->m_actionMarkAllMessagesAsUnread,
+ SIGNAL(triggered()), m_messagesView, SLOT(setAllMessagesUnread()));
connect(FormMain::getInstance()->m_ui->m_actionDeleteAllMessages,
SIGNAL(triggered()), m_messagesView, SLOT(setAllMessagesDeleted()));
}
diff --git a/src/gui/messagesview.cpp b/src/gui/messagesview.cpp
index 948c060bd..5786560a7 100644
--- a/src/gui/messagesview.cpp
+++ b/src/gui/messagesview.cpp
@@ -139,22 +139,31 @@ void MessagesView::initializeContextMenu() {
void MessagesView::mousePressEvent(QMouseEvent *event) {
QTreeView::mousePressEvent(event);
- if (event->button() != Qt::LeftButton) {
- // No need for extra actions on right/middle click.
- return;
- }
+ switch (event->button()) {
+ case Qt::LeftButton: {
+ // Make sure that message importance is switched when user
+ // clicks the "important" column.
+ QModelIndex clicked_index = indexAt(event->pos());
- QModelIndex clicked_index = indexAt(event->pos());
+ if (clicked_index.isValid()) {
+ QModelIndex mapped_index = m_proxyModel->mapToSource(clicked_index);
- if (!clicked_index.isValid()) {
- qDebug("Clicked on invalid index in MessagesView.");
- return;
- }
+ if (mapped_index.column() == MSG_DB_IMPORTANT_INDEX) {
+ m_sourceModel->switchMessageImportance(mapped_index.row());
+ }
+ }
- QModelIndex mapped_index = m_proxyModel->mapToSource(clicked_index);
+ break;
+ }
- if (mapped_index.column() == MSG_DB_IMPORTANT_INDEX) {
- m_sourceModel->switchMessageImportance(mapped_index.row());
+ case Qt::MiddleButton: {
+ // Open selected messages in new tab on mouse middle button click.
+ openSelectedSourceMessagesInternally();
+ break;
+ }
+
+ default:
+ break;
}
}
@@ -162,7 +171,7 @@ void MessagesView::currentChanged(const QModelIndex ¤t,
const QModelIndex &previous) {
QModelIndex mapped_current_index = m_proxyModel->mapToSource(current);
- qDebug("Current row changed, row [%d,%d] source %d %d",
+ qDebug("Current row changed - row [%d,%d] source [%d, %d].",
current.row(), current.column(),
mapped_current_index.row(), mapped_current_index.column());