From 1e69518af5d63a33bca6aa25fab97aa05042423a Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Sun, 25 Jan 2015 16:36:45 +0100 Subject: [PATCH] Refreshed translations, fixed texts for web browser, work on dowloader. --- localization/rssguard-cs_CZ.ts | 168 +++++----- localization/rssguard-de_DE.ts | 134 ++++---- localization/rssguard-en_GB.ts | 134 ++++---- localization/rssguard-en_US.ts | 486 +++++++++++++++------------- localization/rssguard-fr_FR.ts | 134 ++++---- localization/rssguard-it_IT.ts | 134 ++++---- localization/rssguard-nl_NL.ts | 134 ++++---- localization/rssguard-sv_SE.ts | 134 ++++---- src/network-web/downloadmanager.cpp | 82 +++-- src/network-web/downloadmanager.h | 4 +- src/network-web/downloadmanager.ui | 3 - src/network-web/webview.cpp | 48 +-- src/network-web/webview.h | 2 + 13 files changed, 846 insertions(+), 751 deletions(-) diff --git a/localization/rssguard-cs_CZ.ts b/localization/rssguard-cs_CZ.ts index 73a295981..120182256 100644 --- a/localization/rssguard-cs_CZ.ts +++ b/localization/rssguard-cs_CZ.ts @@ -1,6 +1,6 @@ - + Application @@ -29,17 +29,6 @@ Neznámá chyba. - - DownloadDialog - - Downloading %1 - - - - Downloads - - - DownloadItem @@ -50,22 +39,6 @@ Filename - - Stop - Zastavit - - - Save File - - - - Download canceled: %1 - - - - Download directory (%1) couldn't be created. - - Error opening output file: %1 @@ -74,10 +47,6 @@ Error saving: %1 - - Network Error: %1 - - %1 of %2 (%3/sec) - %4 @@ -91,28 +60,51 @@ - Try again + &Try again - Open file + &Stop + + + + &Open file + + + + Open &folder + + + + Select destination for downloaded file + + + + Download for %1 cancelled + + + + Download directory %1 couldn't be created + + + + Error: %1 + Chyba: %1. {1?} + + + Cannot open folder + + + + Cannot open output folder. Open it manually. DownloadManager - - Form - - Clean up - - - - There are %1 downloads in progress -Do you want to quit anyway? - + Vyčistit %n minutes remaining @@ -132,19 +124,19 @@ Do you want to quit anyway? bytes - + bajtů kB - + MB - + GB - + @@ -212,12 +204,10 @@ Do you want to quit anyway? Titles of feeds/categories. - Feed list header "titles" column tooltip. Názvy kanálů/kategorií. Counts of unread/all meesages. - Feed list header "counts" column tooltip. Počty nepřečtených/všech zpráviček. @@ -1459,7 +1449,7 @@ and/or settings were backed or not. Also make sure that target foder is writable &Downloads - + &Stahování @@ -1542,9 +1532,7 @@ and/or settings were backed or not. Also make sure that target foder is writable Language - Language settings section. ----------- -Language column of language list. + Language settings section. Lokalizace @@ -1602,12 +1590,10 @@ Language column of language list. Code - Lang. code column of language list. Kód Version - Version column of skin list. Verze @@ -1685,7 +1671,6 @@ Language column of language list. Name - Skin list name column. Název @@ -2091,15 +2076,43 @@ Musíte restartovat manuálně. Remove all read messages from all feeds on application exit - + Vymazat všechny přečtené zprávy, když se aplikace vypíná When new message arrives from feed and duplicate exists, then its content is updated and new message is dropped. - + Když se v kanálu objeví nová zpráva a existuje v databázi duplikát, pak jeho obsah je aktualizován a nová zpráva je zahozena. Remove duplicate messages - + Mazat duplicitní zprávy + + + Downloads + Stahování + + + Target directory for downloaded files + Cílový adresář pro stahované soubory + + + Ask for each individual downloaded file + Ptát se u každého stahovaného souboru + + + Save all downloaded files into + Všechny soubory automaticky stahovat do + + + Target directory where all downloaded files are saved + Cílový adresář, kam jsou ukládány všechny stahované soubory + + + &Browse + &Procházet + + + Select downloads target directory + Zvolit cílový adresář pro uložení stahovaných souborů @@ -2242,52 +2255,42 @@ Přejít na web aplikace a stáhnout jej ručně. MessagesModel Id - Tooltip for ID of message. Read - Tooltip for "read" column in msg list. Přečteno Deleted - Tooltip for "deleted" column in msg list. Smazáno Important - Tooltip for "important" column in msg list. Důležité Feed - Tooltip for name of feed for message. Kanál Title - Tooltip for title of message. Nadpis Url - Tooltip for url of message. Author - Tooltip for author of message. Autor Created on - Tooltip for creation date of message. Vytvořeno Contents - Tooltip for contents of message. Obsah @@ -2332,7 +2335,6 @@ Přejít na web aplikace a stáhnout jej ručně. Permanently deleted - Tooltip for "pdeleted" column in msg list. Permanentně smazáno @@ -2589,7 +2591,7 @@ Nepřečtené zprávy: %2 Downloads - + Stahování @@ -2794,31 +2796,39 @@ Nepřečtené zprávy: %2 HTML web pages (*.html) - + HTML stránky (*.html) Select destination file for web page - + Zvolte cílový soubor pro webovou stránku Cannot save web page - + Nelze uložit webovou stránku Web page cannot be saved because destination file is not writtable. - + Webová stránka nemůže být uložena, protože do cíle nelze zapisovat. Save target as... - + Uložit cíl jako... Download content from the hyperlink. - + Stáhnout cíl odkazu. Save page as... - + Uložit stránku jako... + + + Save image to disk. + Uloží obrázek na disk. + + + Save image as... + Uložit obrázek jako... diff --git a/localization/rssguard-de_DE.ts b/localization/rssguard-de_DE.ts index 021c30af3..05d1d9b96 100644 --- a/localization/rssguard-de_DE.ts +++ b/localization/rssguard-de_DE.ts @@ -1,6 +1,6 @@ - + Application @@ -29,17 +29,6 @@ Unbekannter Fehler. - - DownloadDialog - - Downloading %1 - - - - Downloads - - - DownloadItem @@ -50,22 +39,6 @@ Filename - - Stop - Stopp - - - Save File - - - - Download canceled: %1 - - - - Download directory (%1) couldn't be created. - - Error opening output file: %1 @@ -74,10 +47,6 @@ Error saving: %1 - - Network Error: %1 - - %1 of %2 (%3/sec) - %4 @@ -91,29 +60,52 @@ - Try again + &Try again - Open file + &Stop + + + + &Open file + + + + Open &folder + + + + Select destination for downloaded file + + + + Download for %1 cancelled + + + + Download directory %1 couldn't be created + + + + Error: %1 + Fehler: %1. {1?} + + + Cannot open folder + + + + Cannot open output folder. Open it manually. DownloadManager - - Form - - Clean up - - There are %1 downloads in progress -Do you want to quit anyway? - - %n minutes remaining @@ -210,12 +202,10 @@ Do you want to quit anyway? Titles of feeds/categories. - Feed list header "titles" column tooltip. Titel der Feeds/Kategorien. Counts of unread/all meesages. - Feed list header "counts" column tooltip. Anzahl ungelesener/aller Nachrichten. @@ -1530,9 +1520,7 @@ and/or settings were backed or not. Also make sure that target foder is writable Language - Language settings section. ----------- -Language column of language list. + Language settings section. Sprache @@ -1590,12 +1578,10 @@ Language column of language list. Code - Lang. code column of language list. Code Version - Version column of skin list. Version @@ -1673,7 +1659,6 @@ Language column of language list. Name - Skin list name column. Name @@ -2071,6 +2056,34 @@ You have to restart manually. Remove duplicate messages + + Downloads + + + + Target directory for downloaded files + + + + Ask for each individual downloaded file + + + + Save all downloaded files into + + + + Target directory where all downloaded files are saved + + + + &Browse + + + + Select downloads target directory + + FormUpdate @@ -2214,52 +2227,42 @@ Go to application website to obtain it manually. MessagesModel Id - Tooltip for ID of message. ID Read - Tooltip for "read" column in msg list. Lesen Deleted - Tooltip for "deleted" column in msg list. Gelöscht Important - Tooltip for "important" column in msg list. Wichtig Feed - Tooltip for name of feed for message. Feed Title - Tooltip for title of message. Titel Url - Tooltip for url of message. Url Author - Tooltip for author of message. Author Created on - Tooltip for creation date of message. Erstellt am Contents - Tooltip for contents of message. Inhalt @@ -2304,7 +2307,6 @@ Go to application website to obtain it manually. Permanently deleted - Tooltip for "pdeleted" column in msg list. @@ -2791,5 +2793,13 @@ Unread news: %2 Save page as... + + Save image to disk. + + + + Save image as... + + diff --git a/localization/rssguard-en_GB.ts b/localization/rssguard-en_GB.ts index d2d28d448..e73528386 100644 --- a/localization/rssguard-en_GB.ts +++ b/localization/rssguard-en_GB.ts @@ -1,6 +1,6 @@ - + Application @@ -29,17 +29,6 @@ - - DownloadDialog - - Downloading %1 - - - - Downloads - - - DownloadItem @@ -50,22 +39,6 @@ Filename - - Stop - - - - Save File - - - - Download canceled: %1 - - - - Download directory (%1) couldn't be created. - - Error opening output file: %1 @@ -74,10 +47,6 @@ Error saving: %1 - - Network Error: %1 - - %1 of %2 (%3/sec) - %4 @@ -91,29 +60,52 @@ - Try again + &Try again - Open file + &Stop + + + + &Open file + + + + Open &folder + + + + Select destination for downloaded file + + + + Download for %1 cancelled + + + + Download directory %1 couldn't be created + + + + Error: %1 + + + + Cannot open folder + + + + Cannot open output folder. Open it manually. DownloadManager - - Form - - Clean up - - There are %1 downloads in progress -Do you want to quit anyway? - - %n minutes remaining @@ -210,12 +202,10 @@ Do you want to quit anyway? Titles of feeds/categories. - Feed list header "titles" column tooltip. Counts of unread/all meesages. - Feed list header "counts" column tooltip. @@ -1530,9 +1520,7 @@ and/or settings were backed or not. Also make sure that target foder is writable Language - Language settings section. ----------- -Language column of language list. + Language settings section. @@ -1590,12 +1578,10 @@ Language column of language list. Code - Lang. code column of language list. Version - Version column of skin list. @@ -1673,7 +1659,6 @@ Language column of language list. Name - Skin list name column. @@ -2069,6 +2054,34 @@ You have to restart manually. Remove duplicate messages + + Downloads + + + + Target directory for downloaded files + + + + Ask for each individual downloaded file + + + + Save all downloaded files into + + + + Target directory where all downloaded files are saved + + + + &Browse + + + + Select downloads target directory + + FormUpdate @@ -2209,52 +2222,42 @@ Go to application website to obtain it manually. MessagesModel Id - Tooltip for ID of message. Read - Tooltip for "read" column in msg list. Deleted - Tooltip for "deleted" column in msg list. Important - Tooltip for "important" column in msg list. Feed - Tooltip for name of feed for message. Title - Tooltip for title of message. Url - Tooltip for url of message. Author - Tooltip for author of message. Created on - Tooltip for creation date of message. Contents - Tooltip for contents of message. @@ -2299,7 +2302,6 @@ Go to application website to obtain it manually. Permanently deleted - Tooltip for "pdeleted" column in msg list. @@ -2786,5 +2788,13 @@ Unread news: %2 Save page as... + + Save image to disk. + + + + Save image as... + + diff --git a/localization/rssguard-en_US.ts b/localization/rssguard-en_US.ts index f15717040..d5b280547 100644 --- a/localization/rssguard-en_US.ts +++ b/localization/rssguard-en_US.ts @@ -1,6 +1,6 @@ - + Application @@ -34,19 +34,6 @@ - - DownloadDialog - - - Downloading %1 - - - - - Downloads - - - DownloadItem @@ -61,61 +48,78 @@ - Try again - - - - - Open file + &Try again - Stop + &Stop - - Save File + + &Open file - - Download canceled: %1 + + Open &folder - - Download directory (%1) couldn't be created. - - - - + Error opening output file: %1 - + Error saving: %1 - - Network Error: %1 + + Select destination for downloaded file - + + Download for %1 cancelled + + + + + Download directory %1 couldn't be created + + + + + + Cannot open folder + + + + + + Cannot open output folder. Open it manually. + + + + + Error: %1 + + + + %1 of %2 (%3/sec) - %4 - + ? - + %1 of %2 - Download Complete @@ -123,23 +127,12 @@ DownloadManager - - Form - - - - + Clean up - - - There are %1 downloads in progress -Do you want to quit anyway? - - - + %n minutes remaining @@ -147,7 +140,7 @@ Do you want to quit anyway? - + %n seconds remaining @@ -155,22 +148,22 @@ Do you want to quit anyway? - + bytes - + kB - + MB - + GB @@ -260,13 +253,11 @@ Do you want to quit anyway? Titles of feeds/categories. - Feed list header "titles" column tooltip. Counts of unread/all meesages. - Feed list header "counts" column tooltip. @@ -1903,9 +1894,7 @@ and/or settings were backed or not. Also make sure that target foder is writable Language - Language settings section. ----------- -Language column of language list. + Language settings section. @@ -1919,37 +1908,42 @@ Language column of language list. - + + Downloads + + + + Launch %1 on operating system startup - + Check for updates on application startup - + Remove junk Trolltech registry key (HKCU\\Software\\Trolltech) when application quits (Use at your own risk!) - + WARNING: Note that switching to another data storage type will NOT copy existing your data from currently active data storage to newly selected one. - + Database driver - + Use in-memory database as the working database - + Usage of in-memory working database has several advantages and pitfalls. Make sure that you are familiar with these before you turn this feature on. Advantages: <ul> <li>higher speed for feed/message manipulations (especially with thousands of messages displayed),</li> @@ -1964,185 +1958,185 @@ Authors of this application are NOT responsible for lost data. - + Hostname - - + + Port - - + + Username - - + + Password - + Test setup - + Note that speed of used MySQL server and latency of used connection medium HEAVILY influences the final performance of this application. Using slow database connections leads to bad performance when browsing feeds or messages. - + Icons && skins - + Icons - + Icon theme - + Skins - + Active skin: - + Selected skin: - + Tray area && notifications - + Tray icon - + Disable - + Hide main window when it is minimized - + Start application hidden - + Enable - + Tabs - + Open new tabs with left mouse button double-click on tab bar - + Hide tab bar if just one tab is visible - + Close tabs with - + Right mouse button double-click - + Middle mouse button single-click - + Toolbars - + Toolbar for feeds list - + Toolbar for messages list - + Toolbar button style - + Select toolbar to edit - + Internal web browser - + Queue new tabs (with hyperlinks) after the active tab - + Enable JavaScript - + Enable external plugins based on NPAPI - + Auto-load images - + Enable mouse gestures - + Mouse gestures work with middle mouse button. Possible gestures are: <ul> <li>previous web page (drag mouse left),</li> @@ -2153,187 +2147,210 @@ Authors of this application are NOT responsible for lost data. - + External web browser - + <html><head/><body><p>If unchecked, then default system-wide web browser is used.</p></body></html> - + Custom external web browser - + Web browser executable - + Executable file of web browser - + ... - + Executable parameters - + Parameters to executable - + Use sample arguments for - + Select browser - + Note that "%1" (without quotation marks) is placeholder for URL of selected message. - + Proxy - + Type Proxy server type. - + Host - + Hostname or IP of your proxy server - + Your username for proxy server authentication - + Your password for proxy server authentication - + Display password - + Note that these settings are applied only on newly established connections. - + Feeds && categories - + Update all feed on application startup - + Auto-update all feeds every - + minutes - + Feed connection timeout - + Connection timeout is time interval which is reserved for downloading new messages for the feed. If this time interval elapses, then download process is aborted. - + ms - + Message count format in feed list - + Enter format for count of messages displayed next to each feed/category in feed list. Use "%all" and "%unread" strings which are placeholders for the actual count of all (or unread) messages. - + Messages - + Remove all read messages from all feeds on application exit - + When new message arrives from feed and duplicate exists, then its content is updated and new message is dropped. - + Remove duplicate messages - + + Target directory for downloaded files + + + + + Ask for each individual downloaded file + + + + + Save all downloaded files into + + + + + Target directory where all downloaded files are saved + + + + + &Browse + + + + Keep message selection in the middle of the message list viewport - + Use custom date/time format (overrides format loaded from active localization) Code - Lang. code column of language list. Version - Version column of skin list. @@ -2351,227 +2368,231 @@ Authors of this application are NOT responsible for lost data. Name - Skin list name column. - + + Select downloads target directory + + + + Select web browser executable - + Executables (*) File filter for external browser selection dialog. - + Executables (*.*) - + some keyboard shortcuts are not unique - + custom external browser is not set correctly - + Cannot save settings - + Some critical settings are not set. You must fix these settings in order confirm new settings. - + List of errors: %1. - + Critical settings were changed - + Some critical settings were changed and will be applied after the application gets restarted. You have to restart manually. - + Do you want to restart now? - + List of changes: %1. - + Opera 12 or older - + No proxy - + System proxy - + Socks5 - + Http - + language changed - + No connection test triggered so far. - + You did not executed any connection test yet. - + SQLite (embedded database) - + MySQL/MariaDB (dedicated database) - + Hostname of your MySQL server - + Username to login with - + Password for your username - + in-memory database switched - + data storage backend changed - + Hostname is empty. - + Hostname looks ok. - + Username is empty. - + Username looks ok. - + Password is empty. - + Password looks ok. - + (not supported on this platform) - + Disable (Tray icon is not available.) - + no icon theme Label for disabling icon theme. - + Icon only - + Text only - + Text beside icon - + Text under icon - + Follow OS style - + icon theme changed - + skin changed @@ -2750,67 +2771,56 @@ currently installed one. Id - Tooltip for ID of message. Read - Tooltip for "read" column in msg list. Deleted - Tooltip for "deleted" column in msg list. Important - Tooltip for "important" column in msg list. Feed - Tooltip for name of feed for message. Title - Tooltip for title of message. Url - Tooltip for url of message. Author - Tooltip for author of message. Created on - Tooltip for creation date of message. Contents - Tooltip for contents of message. Permanently deleted - Tooltip for "pdeleted" column in msg list. @@ -3035,35 +3045,35 @@ currently installed one. QObject - + LANG_NAME Name of language, e.g. English. English (USA) - + LANG_ABBREV Abbreviation of language, e.g. en. Use ISO 639-1 code here combined with ISO 3166-1 (alpha-2) code. Examples: "cs_CZ", "en_GB", "en_US". en_US - + LANG_VERSION Version of your translation, e.g. 1.0. 1.33.7 - + LANG_AUTHOR Name of translator - optional. Martin Rotter - + LANG_EMAIL Email of translator - optional. @@ -3334,132 +3344,142 @@ Unread news: %2 - + Reload web page - + Reload current web page. - + Print - + Print current web page. - + Copy selection - + Copies current selection into the clipboard. - + Save target as... - + Download content from the hyperlink. - + Copy link url - + Copy link url to clipboard. - + Copy image - + Copy image to clipboard. - - Save page as... + + Save image as... - - Copy image url + + Save image to disk. - Copy image url to clipboard. + Save page as... - Open link in new tab + Copy image url - Open this hyperlink in new tab. - - - - - Follow link + Copy image url to clipboard. + Open link in new tab + + + + + Open this hyperlink in new tab. + + + + + Follow link + + + + Open the hyperlink in this tab. - + Open link in external browser - + Open the hyperlink in external browser. - + Open image in new tab - + Open this image in this tab. - + Web browser - + Image - + Hyperlink diff --git a/localization/rssguard-fr_FR.ts b/localization/rssguard-fr_FR.ts index 60bddb2d1..68d600c99 100644 --- a/localization/rssguard-fr_FR.ts +++ b/localization/rssguard-fr_FR.ts @@ -1,6 +1,6 @@ - + Application @@ -29,17 +29,6 @@ Erreur inconnue. - - DownloadDialog - - Downloading %1 - - - - Downloads - - - DownloadItem @@ -50,22 +39,6 @@ Filename - - Stop - Stop - - - Save File - - - - Download canceled: %1 - - - - Download directory (%1) couldn't be created. - - Error opening output file: %1 @@ -74,10 +47,6 @@ Error saving: %1 - - Network Error: %1 - - %1 of %2 (%3/sec) - %4 @@ -91,29 +60,52 @@ - Try again + &Try again - Open file + &Stop + + + + &Open file + + + + Open &folder + + + + Select destination for downloaded file + + + + Download for %1 cancelled + + + + Download directory %1 couldn't be created + + + + Error: %1 + Erreur : %1. {1?} + + + Cannot open folder + + + + Cannot open output folder. Open it manually. DownloadManager - - Form - - Clean up - - There are %1 downloads in progress -Do you want to quit anyway? - - %n minutes remaining @@ -210,12 +202,10 @@ Do you want to quit anyway? Titles of feeds/categories. - Feed list header "titles" column tooltip. Titres des flux/catégories. Counts of unread/all meesages. - Feed list header "counts" column tooltip. Nombre des messages lus/non-lus. @@ -1531,9 +1521,7 @@ and/or settings were backed or not. Also make sure that target foder is writable Language - Language settings section. ----------- -Language column of language list. + Language settings section. Langage @@ -1591,12 +1579,10 @@ Language column of language list. Code - Lang. code column of language list. Code Version - Version column of skin list. Version @@ -1674,7 +1660,6 @@ Language column of language list. Name - Skin list name column. Nom @@ -2088,6 +2073,34 @@ You have to restart manually. Remove duplicate messages + + Downloads + + + + Target directory for downloaded files + + + + Ask for each individual downloaded file + + + + Save all downloaded files into + + + + Target directory where all downloaded files are saved + + + + &Browse + + + + Select downloads target directory + + FormUpdate @@ -2232,52 +2245,42 @@ Aller sur le site de l'application pour les obtenir manuellement.MessagesModel Id - Tooltip for ID of message. Id Read - Tooltip for "read" column in msg list. Lire Deleted - Tooltip for "deleted" column in msg list. Supprimé Important - Tooltip for "important" column in msg list. Important Feed - Tooltip for name of feed for message. Flux Title - Tooltip for title of message. Titre Url - Tooltip for url of message. Url Author - Tooltip for author of message. Auteur Created on - Tooltip for creation date of message. Crée sur Contents - Tooltip for contents of message. Contenus @@ -2322,7 +2325,6 @@ Aller sur le site de l'application pour les obtenir manuellement. Permanently deleted - Tooltip for "pdeleted" column in msg list. @@ -2809,5 +2811,13 @@ Unread news: %2 Save page as... + + Save image to disk. + + + + Save image as... + + diff --git a/localization/rssguard-it_IT.ts b/localization/rssguard-it_IT.ts index c82f2ce13..e299748a6 100644 --- a/localization/rssguard-it_IT.ts +++ b/localization/rssguard-it_IT.ts @@ -1,6 +1,6 @@ - + Application @@ -29,17 +29,6 @@ Errore sconosciuto. - - DownloadDialog - - Downloading %1 - - - - Downloads - - - DownloadItem @@ -50,22 +39,6 @@ Filename - - Stop - Ferma - - - Save File - - - - Download canceled: %1 - - - - Download directory (%1) couldn't be created. - - Error opening output file: %1 @@ -74,10 +47,6 @@ Error saving: %1 - - Network Error: %1 - - %1 of %2 (%3/sec) - %4 @@ -91,29 +60,52 @@ - Try again + &Try again - Open file + &Stop + + + + &Open file + + + + Open &folder + + + + Select destination for downloaded file + + + + Download for %1 cancelled + + + + Download directory %1 couldn't be created + + + + Error: %1 + Errore: %1. {1?} + + + Cannot open folder + + + + Cannot open output folder. Open it manually. DownloadManager - - Form - - Clean up - - There are %1 downloads in progress -Do you want to quit anyway? - - %n minutes remaining @@ -210,12 +202,10 @@ Do you want to quit anyway? Titles of feeds/categories. - Feed list header "titles" column tooltip. Titoli dei feed/categorie. Counts of unread/all meesages. - Feed list header "counts" column tooltip. Conteggio dei messaggi non letti/tutti. @@ -1530,9 +1520,7 @@ and/or settings were backed or not. Also make sure that target foder is writable Language - Language settings section. ----------- -Language column of language list. + Language settings section. Lingua @@ -1590,12 +1578,10 @@ Language column of language list. Code - Lang. code column of language list. Codice Version - Version column of skin list. Versione @@ -1673,7 +1659,6 @@ Language column of language list. Name - Skin list name column. Nome @@ -2071,6 +2056,34 @@ You have to restart manually. Remove duplicate messages + + Downloads + + + + Target directory for downloaded files + + + + Ask for each individual downloaded file + + + + Save all downloaded files into + + + + Target directory where all downloaded files are saved + + + + &Browse + + + + Select downloads target directory + + FormUpdate @@ -2214,52 +2227,42 @@ Go to application website to obtain it manually. MessagesModel Id - Tooltip for ID of message. Id Read - Tooltip for "read" column in msg list. Leggi Deleted - Tooltip for "deleted" column in msg list. Eliminato Important - Tooltip for "important" column in msg list. Importante Feed - Tooltip for name of feed for message. Feed Title - Tooltip for title of message. Titolo Url - Tooltip for url of message. Url Author - Tooltip for author of message. Autore Created on - Tooltip for creation date of message. Creato il Contents - Tooltip for contents of message. Contenuti @@ -2304,7 +2307,6 @@ Go to application website to obtain it manually. Permanently deleted - Tooltip for "pdeleted" column in msg list. @@ -2791,5 +2793,13 @@ Unread news: %2 Save page as... + + Save image to disk. + + + + Save image as... + + diff --git a/localization/rssguard-nl_NL.ts b/localization/rssguard-nl_NL.ts index 3bddf8dae..4e3fd7c78 100644 --- a/localization/rssguard-nl_NL.ts +++ b/localization/rssguard-nl_NL.ts @@ -1,6 +1,6 @@ - + Application @@ -29,17 +29,6 @@ Onbekende fout. - - DownloadDialog - - Downloading %1 - - - - Downloads - - - DownloadItem @@ -50,22 +39,6 @@ Filename - - Stop - Stop - - - Save File - - - - Download canceled: %1 - - - - Download directory (%1) couldn't be created. - - Error opening output file: %1 @@ -74,10 +47,6 @@ Error saving: %1 - - Network Error: %1 - - %1 of %2 (%3/sec) - %4 @@ -91,29 +60,52 @@ - Try again + &Try again - Open file + &Stop + + + + &Open file + + + + Open &folder + + + + Select destination for downloaded file + + + + Download for %1 cancelled + + + + Download directory %1 couldn't be created + + + + Error: %1 + Fout: %1. {1?} + + + Cannot open folder + + + + Cannot open output folder. Open it manually. DownloadManager - - Form - - Clean up - - There are %1 downloads in progress -Do you want to quit anyway? - - %n minutes remaining @@ -210,12 +202,10 @@ Do you want to quit anyway? Titles of feeds/categories. - Feed list header "titles" column tooltip. Naam van feeds/categorieën. Counts of unread/all meesages. - Feed list header "counts" column tooltip. Aantal van alle ongelezen berichten. @@ -1539,9 +1529,7 @@ Exporteer feeds die je wilt van het geselecteerde bestand. Language - Language settings section. ----------- -Language column of language list. + Language settings section. Taal @@ -1599,12 +1587,10 @@ Language column of language list. Code - Lang. code column of language list. Code Version - Version column of skin list. Versie @@ -1682,7 +1668,6 @@ Language column of language list. Name - Skin list name column. Naam @@ -2099,6 +2084,34 @@ Je moet handmatig herstarten. Remove duplicate messages + + Downloads + + + + Target directory for downloaded files + + + + Ask for each individual downloaded file + + + + Save all downloaded files into + + + + Target directory where all downloaded files are saved + + + + &Browse + + + + Select downloads target directory + + FormUpdate @@ -2243,52 +2256,42 @@ Ga naar RRSguard website en download het handmatig. MessagesModel Id - Tooltip for ID of message. ld Read - Tooltip for "read" column in msg list. Lees Deleted - Tooltip for "deleted" column in msg list. verwijder Important - Tooltip for "important" column in msg list. Belangrijk Feed - Tooltip for name of feed for message. Feed Title - Tooltip for title of message. Titel Url - Tooltip for url of message. Url Author - Tooltip for author of message. Auteur Created on - Tooltip for creation date of message. Gemaakt op Contents - Tooltip for contents of message. Inhoud @@ -2333,7 +2336,6 @@ Ga naar RRSguard website en download het handmatig. Permanently deleted - Tooltip for "pdeleted" column in msg list. @@ -2822,5 +2824,13 @@ Ongelezen nieuws: %2 Save page as... + + Save image to disk. + + + + Save image as... + + diff --git a/localization/rssguard-sv_SE.ts b/localization/rssguard-sv_SE.ts index 2e4482061..1a229b714 100644 --- a/localization/rssguard-sv_SE.ts +++ b/localization/rssguard-sv_SE.ts @@ -1,6 +1,6 @@ - + Application @@ -29,17 +29,6 @@ Okänt fel. - - DownloadDialog - - Downloading %1 - - - - Downloads - - - DownloadItem @@ -50,22 +39,6 @@ Filename - - Stop - Stopp - - - Save File - - - - Download canceled: %1 - - - - Download directory (%1) couldn't be created. - - Error opening output file: %1 @@ -74,10 +47,6 @@ Error saving: %1 - - Network Error: %1 - - %1 of %2 (%3/sec) - %4 @@ -91,29 +60,52 @@ - Try again + &Try again - Open file + &Stop + + + + &Open file + + + + Open &folder + + + + Select destination for downloaded file + + + + Download for %1 cancelled + + + + Download directory %1 couldn't be created + + + + Error: %1 + Fel: %1. {1?} + + + Cannot open folder + + + + Cannot open output folder. Open it manually. DownloadManager - - Form - - Clean up - - There are %1 downloads in progress -Do you want to quit anyway? - - %n minutes remaining @@ -210,12 +202,10 @@ Do you want to quit anyway? Titles of feeds/categories. - Feed list header "titles" column tooltip. Namn på kategorier/flöden. Counts of unread/all meesages. - Feed list header "counts" column tooltip. Antal meddelanden. @@ -1537,9 +1527,7 @@ och/eller inställningar sparades. Tillse också att målmappen inte är skrivsk Language - Language settings section. ----------- -Language column of language list. + Language settings section. Språk @@ -1597,12 +1585,10 @@ Language column of language list. Code - Lang. code column of language list. Språkkod Version - Version column of skin list. Version @@ -1680,7 +1666,6 @@ Language column of language list. Name - Skin list name column. Namn @@ -2097,6 +2082,34 @@ Du måste starta om manuellt. Remove duplicate messages + + Downloads + + + + Target directory for downloaded files + + + + Ask for each individual downloaded file + + + + Save all downloaded files into + + + + Target directory where all downloaded files are saved + + + + &Browse + + + + Select downloads target directory + + FormUpdate @@ -2240,52 +2253,42 @@ Gå till programmets hemsida för att hämta den manuellt. MessagesModel Id - Tooltip for ID of message. ID Read - Tooltip for "read" column in msg list. Läst Deleted - Tooltip for "deleted" column in msg list. Borttaget Important - Tooltip for "important" column in msg list. Viktigt Feed - Tooltip for name of feed for message. Flöde Title - Tooltip for title of message. Titel Url - Tooltip for url of message. URL Author - Tooltip for author of message. Författare Created on - Tooltip for creation date of message. Skapad Contents - Tooltip for contents of message. Innehåll @@ -2330,7 +2333,6 @@ Gå till programmets hemsida för att hämta den manuellt. Permanently deleted - Tooltip for "pdeleted" column in msg list. @@ -2818,5 +2820,13 @@ Olästa nyheter: %2 Save page as... + + Save image to disk. + + + + Save image as... + + diff --git a/src/network-web/downloadmanager.cpp b/src/network-web/downloadmanager.cpp index 19845e0aa..825efd5ea 100644 --- a/src/network-web/downloadmanager.cpp +++ b/src/network-web/downloadmanager.cpp @@ -21,6 +21,7 @@ #include "miscellaneous/application.h" #include "gui/formmain.h" #include "gui/tabwidget.h" +#include "gui/messagebox.h" #include "network-web/silentnetworkaccessmanager.h" #include "network-web/webbrowsernetworkaccessmanager.h" @@ -207,8 +208,19 @@ void DownloadItem::openFile() { void DownloadItem::openFolder() { if (m_output.exists()) { + QString folder = QDir::toNativeSeparators(QFileInfo(m_output.fileName()).absoluteDir().absolutePath()); + +#if defined(Q_OS_WIN32) QString file = QDir::toNativeSeparators(m_output.fileName()); - QProcess::startDetached(QString("explorer.exe /select, \"") + file + "\""); + + if (!QProcess::startDetached(QString("explorer.exe /select, \"") + file + "\"")) { + MessageBox::show(this, QMessageBox::Warning, tr("Cannot open folder"), tr("Cannot open output folder. Open it manually."), QString(), folder); + } +#else + if (!QDesktopServices::openUrl(QUrl::fromLocalFile(folder))) { + MessageBox::show(this, QMessageBox::Warning, tr("Cannot open folder"), tr("Cannot open output folder. Open it manually."), QString(), folder); + } +#endif } } @@ -435,22 +447,6 @@ int DownloadManager::activeDownloads() const return count; } -bool DownloadManager::allowQuit() { - if (activeDownloads() >= 1) { - int choice = QMessageBox::warning(this, QString(), - tr("There are %1 downloads in progress\n" - "Do you want to quit anyway?").arg(activeDownloads()), - QMessageBox::Yes | QMessageBox::No, - QMessageBox::No); - if (choice == QMessageBox::No) { - show(); - return false; - } - } - - return true; -} - void DownloadManager::download(const QNetworkRequest &request, bool request_filename) { if (request.url().isEmpty()) @@ -689,9 +685,7 @@ QString DownloadManager::dataString(qint64 size) } DownloadModel::DownloadModel(DownloadManager *download_manager, QObject *parent) - : QAbstractListModel(parent) - , m_downloadManager(download_manager) -{ + : QAbstractListModel(parent), m_downloadManager(download_manager) { } QVariant DownloadModel::data(const QModelIndex &index, int role) const { @@ -708,53 +702,57 @@ QVariant DownloadModel::data(const QModelIndex &index, int role) const { return QVariant(); } -int DownloadModel::rowCount(const QModelIndex &parent) const -{ - return (parent.isValid()) ? 0 : m_downloadManager->m_downloads.count(); +int DownloadModel::rowCount(const QModelIndex &parent) const { + return parent.isValid() ? 0 : m_downloadManager->m_downloads.count(); } -bool DownloadModel::removeRows(int row, int count, const QModelIndex &parent) -{ - if (parent.isValid()) +bool DownloadModel::removeRows(int row, int count, const QModelIndex &parent) { + if (parent.isValid()) { return false; + } int lastRow = row + count - 1; + for (int i = lastRow; i >= row; --i) { - if (m_downloadManager->m_downloads.at(i)->downloadedSuccessfully() - || m_downloadManager->m_downloads.at(i)->m_ui->m_btnTryAgain->isEnabled()) { + if (m_downloadManager->m_downloads.at(i)->downloadedSuccessfully() || + m_downloadManager->m_downloads.at(i)->m_ui->m_btnTryAgain->isEnabled()) { beginRemoveRows(parent, i, i); m_downloadManager->m_downloads.takeAt(i)->deleteLater(); endRemoveRows(); } } + m_downloadManager->m_autoSaver->changeOccurred(); return true; } -Qt::ItemFlags DownloadModel::flags(const QModelIndex &index) const -{ - if (index.row() < 0 || index.row() >= rowCount(index.parent())) - return 0; - - Qt::ItemFlags defaultFlags = QAbstractItemModel::flags(index); +Qt::ItemFlags DownloadModel::flags(const QModelIndex &index) const { + if (index.row() < 0 || index.row() >= rowCount(index.parent())) { + return Qt::NoItemFlags; + } + Qt::ItemFlags default_flags = QAbstractItemModel::flags(index); DownloadItem *item = m_downloadManager->m_downloads.at(index.row()); - if (item->downloadedSuccessfully()) - return defaultFlags | Qt::ItemIsDragEnabled; - return defaultFlags; + if (item->downloadedSuccessfully()) { + return default_flags | Qt::ItemIsDragEnabled; + } + + return default_flags; } -QMimeData *DownloadModel::mimeData(const QModelIndexList &indexes) const -{ +QMimeData *DownloadModel::mimeData(const QModelIndexList &indexes) const { QMimeData *mimeData = new QMimeData(); QList urls; + foreach (const QModelIndex &index, indexes) { - if (!index.isValid()) + if (!index.isValid()) { continue; - DownloadItem *item = m_downloadManager->m_downloads.at(index.row()); - urls.append(QUrl::fromLocalFile(QFileInfo(item->m_output).absoluteFilePath())); + } + + urls.append(QUrl::fromLocalFile(QFileInfo(m_downloadManager->m_downloads.at(index.row())->m_output).absoluteFilePath())); } + mimeData->setUrls(urls); return mimeData; } diff --git a/src/network-web/downloadmanager.h b/src/network-web/downloadmanager.h index 8dc6e3a1b..18473eb78 100644 --- a/src/network-web/downloadmanager.h +++ b/src/network-web/downloadmanager.h @@ -109,7 +109,6 @@ class DownloadManager : public TabContent { QNetworkAccessManager *networkManager() const; int activeDownloads() const; - bool allowQuit(); RemovePolicy removePolicy() const; void setRemovePolicy(RemovePolicy policy); @@ -128,13 +127,14 @@ class DownloadManager : public TabContent { private slots: void save() const; + void load(); + void updateRow(DownloadItem *item); void updateRow(); void finished(); private: void addItem(DownloadItem *item); - void load(); Ui::DownloadManager *m_ui; AutoSaver *m_autoSaver; diff --git a/src/network-web/downloadmanager.ui b/src/network-web/downloadmanager.ui index c475d0454..286ca4eec 100644 --- a/src/network-web/downloadmanager.ui +++ b/src/network-web/downloadmanager.ui @@ -10,9 +10,6 @@ 300 - - Form - diff --git a/src/network-web/webview.cpp b/src/network-web/webview.cpp index ab40d0073..1efb75345 100755 --- a/src/network-web/webview.cpp +++ b/src/network-web/webview.cpp @@ -144,16 +144,12 @@ void WebView::initializeActions() { // Create needed actions. m_actionReload = pageAction(QWebPage::Reload); m_actionReload->setParent(this); - m_actionReload->setText(tr("Reload web page")); - m_actionReload->setToolTip(tr("Reload current web page.")); m_actionPrint = new QAction(tr("Print"), this); m_actionPrint->setToolTip(tr("Print current web page.")); m_actionCopySelectedItem = pageAction(QWebPage::Copy); m_actionCopySelectedItem->setParent(this); - m_actionCopySelectedItem->setText(tr("Copy selection")); - m_actionCopySelectedItem->setToolTip(tr("Copies current selection into the clipboard.")); #if defined(Q_OS_OS2) m_actionCopySelectedItem->setShortcut(QKeySequence::Copy); @@ -162,48 +158,60 @@ void WebView::initializeActions() { m_actionSaveHyperlinkAs = pageAction(QWebPage::DownloadLinkToDisk); m_actionSaveHyperlinkAs->setParent(this); - m_actionSaveHyperlinkAs->setText(tr("Save target as...")); - m_actionSaveHyperlinkAs->setToolTip(tr("Download content from the hyperlink.")); m_actionCopyLink = pageAction(QWebPage::CopyLinkToClipboard); m_actionCopyLink->setParent(this); - m_actionCopyLink->setText(tr("Copy link url")); - m_actionCopyLink->setToolTip(tr("Copy link url to clipboard.")); m_actionCopyImage = pageAction(QWebPage::CopyImageToClipboard); m_actionCopyImage->setParent(this); - m_actionCopyImage->setText(tr("Copy image")); - m_actionCopyImage->setToolTip(tr("Copy image to clipboard.")); m_actionSaveImageAs = pageAction(QWebPage::DownloadImageToDisk); m_actionSaveImageAs->setParent(this); - m_actionSaveImageAs->setText("Save image as..."); - m_actionSaveImageAs->setToolTip(tr("Save image to disk.")); m_actionSavePageAs = new QAction(qApp->icons()->fromTheme("document-download"), tr("Save page as..."), this); #if QT_VERSION >= 0x040800 m_actionCopyImageUrl = pageAction(QWebPage::CopyImageUrlToClipboard); m_actionCopyImageUrl->setParent(this); - m_actionCopyImageUrl->setText(tr("Copy image url")); - m_actionCopyImageUrl->setToolTip(tr("Copy image url to clipboard.")); #endif m_actionOpenLinkNewTab = pageAction(QWebPage::OpenLinkInNewWindow); m_actionOpenLinkNewTab->setParent(this); - m_actionOpenLinkNewTab->setText(tr("Open link in new tab")); - m_actionOpenLinkNewTab->setToolTip(tr("Open this hyperlink in new tab.")); m_actionOpenLinkThisTab = pageAction(QWebPage::OpenLink); m_actionOpenLinkThisTab->setParent(this); - m_actionOpenLinkThisTab->setText(tr("Follow link")); - m_actionOpenLinkThisTab->setToolTip(tr("Open the hyperlink in this tab.")); m_actionOpenLinkExternally = new QAction(tr("Open link in external browser"), this); - m_actionOpenLinkExternally->setToolTip(tr("Open the hyperlink in external browser.")); m_actionOpenImageNewTab = pageAction(QWebPage::OpenImageInNewWindow); m_actionOpenImageNewTab->setParent(this); + +} + +void WebView::setActionTexts() { + m_actionReload->setText(tr("Reload web page")); + m_actionReload->setToolTip(tr("Reload current web page.")); + m_actionCopySelectedItem->setText(tr("Copy selection")); + m_actionCopySelectedItem->setToolTip(tr("Copies current selection into the clipboard.")); + m_actionSaveHyperlinkAs->setText(tr("Save target as...")); + m_actionSaveHyperlinkAs->setToolTip(tr("Download content from the hyperlink.")); + m_actionCopyLink->setText(tr("Copy link url")); + m_actionCopyLink->setToolTip(tr("Copy link url to clipboard.")); + m_actionCopyImage->setText(tr("Copy image")); + m_actionCopyImage->setToolTip(tr("Copy image to clipboard.")); + m_actionSaveImageAs->setText(tr("Save image as...")); + m_actionSaveImageAs->setToolTip(tr("Save image to disk.")); + +#if QT_VERSION >= 0x040800 + m_actionCopyImageUrl->setText(tr("Copy image url")); + m_actionCopyImageUrl->setToolTip(tr("Copy image url to clipboard.")); +#endif + + m_actionOpenLinkNewTab->setText(tr("Open link in new tab")); + m_actionOpenLinkNewTab->setToolTip(tr("Open this hyperlink in new tab.")); + m_actionOpenLinkThisTab->setText(tr("Follow link")); + m_actionOpenLinkThisTab->setToolTip(tr("Open the hyperlink in this tab.")); + m_actionOpenLinkExternally->setToolTip(tr("Open the hyperlink in external browser.")); m_actionOpenImageNewTab->setText(tr("Open image in new tab")); m_actionOpenImageNewTab->setToolTip(tr("Open this image in this tab.")); } @@ -281,6 +289,7 @@ void WebView::popupContextMenu(const QPoint &pos) { } // Display the menu. + setActionTexts(); context_menu.exec(mapToGlobal(pos)); } @@ -305,7 +314,6 @@ void WebView::mousePressEvent(QMouseEvent *event) { if (link_url.isValid()) { emit linkMiddleClicked(link_url); - // No more handling of event is now needed. Return. return; } else if (image_url.isValid()) { diff --git a/src/network-web/webview.h b/src/network-web/webview.h index 3d3eee18c..554a630af 100644 --- a/src/network-web/webview.h +++ b/src/network-web/webview.h @@ -78,6 +78,8 @@ class WebView : public QWebView { // Initializes all actions. void initializeActions(); + void setActionTexts(); + // Creates necessary connections. void createConnections();