From 97d56f0f6aed224d5a3baffcb787cd06c955cce5 Mon Sep 17 00:00:00 2001 From: Martin Rotter 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 @@ Feeds & messages Kanály & zprávy - - • some keyboard shortcuts are not unique - • některé klávesové zkratky nejsou unikátní - Some critical settings are not set. You must fix these settings in order confirm new settings. Některá kritická nastavení nejsou vyplněna. Musíte je opravit než bude možné dialog potvrdit. @@ -713,18 +709,6 @@ Seznam chyb: %1. - - • language changed - • jazyk změněn - - - • icon theme changed - • téma ikon změněno - - - • skin changed - • skin změněn - Feeds Kanály @@ -774,27 +758,35 @@ - • some keyboard shortcuts are not unique + Current color - • external browser is not set + Executable file of web browser - • external browser is not set + Parameters to executable - • language changed + u2022 some keyboard shortcuts are not unique - • icon theme changed + u2022 external browser is not set - • skin changed + u2022 language changed + + + + u2022 icon theme changed + + + + u2022 skin changed @@ -953,16 +945,6 @@ Email of translator - optional. rotter.martinos@gmail.com - - %1 - -Category type: standard -Creation date: %2 - %1 - -Typ kategorie: standardní -Datum vytvoření: %2 - %n unread message(s). @@ -971,6 +953,48 @@ Datum vytvoření: %2 %n nepřečtených zpráv. + + ATOM 1.0 + + + + RDF 1.0 + + + + RSS 0.90/0.91/0.92 + + + + RSS 2.0/2.0.1 + + + + %1 + +Category type: standard +Creation date: %2%3 + %1 + +Typ kategorie: standardní +Datum vytvoření: %2%3 {1 +?} + + + + +This category does not contain any nested items. + + + + %1 + +Feed type: %2 +URL: %3 +Encoding: %4 +Language: %5 + + ShortcutCatcher 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 @@ Feeds & messages - - • some keyboard shortcuts are not unique - - Some critical settings are not set. You must fix these settings in order confirm new settings. @@ -705,18 +701,6 @@ %1. - - • language changed - - - - • icon theme changed - - - - • skin changed - - Feeds @@ -766,27 +750,35 @@ - • some keyboard shortcuts are not unique + Current color - • external browser is not set - - - - • external browser is not set + Executable file of web browser - • language changed + Parameters to executable - • icon theme changed + u2022 some keyboard shortcuts are not unique - • skin changed + u2022 external browser is not set + + + + u2022 language changed + + + + u2022 icon theme changed + + + + u2022 skin changed @@ -945,13 +937,6 @@ Email of translator - optional. rotter.martinos@gmail.com - - %1 - -Category type: standard -Creation date: %2 - - %n unread message(s). @@ -959,6 +944,44 @@ Creation date: %2 + + ATOM 1.0 + + + + RDF 1.0 + + + + RSS 0.90/0.91/0.92 + + + + RSS 2.0/2.0.1 + + + + %1 + +Category type: standard +Creation date: %2%3 + + + + + +This category does not contain any nested items. + + + + %1 + +Feed type: %2 +URL: %3 +Encoding: %4 +Language: %5 + + ShortcutCatcher 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 @@ Feeds & messages Feeds & berichten - - • some keyboard shortcuts are not unique - ...sommige sneltoetsen zijn niet uniek - Some critical settings are not set. You must fix these settings in order confirm new settings. Sommige kritieke instellingen zijn niet instelbaar. Je moet deze nieuwe instellingen bevestigen om op te lossen. @@ -713,18 +709,6 @@ lijst van fouten: %1. - - • language changed - ...van taal veranderd - - - • icon theme changed - ...pictogram thema veranderd - - - • skin changed - ...skin veranderd - Feeds @@ -774,28 +758,36 @@ Opera 12 of ouder - • some keyboard shortcuts are not unique - ...sommige sneltoetsen zijn niet uniek + Current color + - • external browser is not set - ...externe browser niet ingesteld - - - • external browser is not set - ...externe browser niet ingesteld + Executable file of web browser + - • language changed - ...van taal veranderd + Parameters to executable + - • icon theme changed - ...pictogram thema veranderd + u2022 some keyboard shortcuts are not unique + - • skin changed - ... skin veranderd + u2022 external browser is not set + + + + u2022 language changed + + + + u2022 icon theme changed + + + + u2022 skin changed + @@ -953,13 +945,6 @@ Email of translator - optional. elbert.pol@gmail.com - - %1 - -Category type: standard -Creation date: %2 - - %n unread message(s). @@ -967,6 +952,44 @@ Creation date: %2 + + ATOM 1.0 + + + + RDF 1.0 + + + + RSS 0.90/0.91/0.92 + + + + RSS 2.0/2.0.1 + + + + %1 + +Category type: standard +Creation date: %2%3 + + + + + +This category does not contain any nested items. + + + + %1 + +Feed type: %2 +URL: %3 +Encoding: %4 +Language: %5 + + ShortcutCatcher 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());