nomnom-commits Mailing List for NomNom (Page 2)
Brought to you by:
legatvs
Menu
▾
▴
nomnom-commits — Repository commits
You can subscribe to this list here.
| 2011 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(32) |
Nov
(6) |
Dec
|
|---|
|
From: <nom...@li...> - 2011-10-21 05:11:43
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project nomnom.git.
The annotated tag, v0.2.0 has been created
at a5ef33bce38d45fc9e354eb7d348f238764856da (tag)
tagging d9050e2badf01d3aa3d768148aa70a19b771c350 (commit)
replaces 0.1.4
tagged by Toni Gundogdu
on Fri Oct 21 07:50:09 2011 +0300
- Log -----------------------------------------------------------------
nomnom 0.2.0
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iQIcBAABCgAGBQJOoPoBAAoJEN2P/OHKyMCpTmAQAKVMzVwLCtJwwrv+tcZJlqZe
aAVy4bk2jL2cG2MxLQo1GN08KawmDzvXI3IzmtqSIHSDmYgRS3ygcGV+/90z7aEx
oisFts5dc+NZF8Et0yBJLEQkh+rjQ3EAoPq7LeRBMadxH+auJNQKB+Ov8SPEpYL1
L48McLuhT65NaBuD8FedI3DONkZg1E1DoUW5vAsoO2YB0ka5aU+sok1XaWJl0z4a
eNZ14/iCegFw4ZbXM4ujfmvjZ0pSsDJ3uJ6ELtqiozRFxxHaCK6BMkmhe/N77oTI
xYFg5nltTCEiH4Nu6sI6u44wENQX0W6Vsa7kTzHiuGt1ZUIYWJzkNLXydt19LY7m
Ww7INBHL/QbChT/J9/oogAV6ImF3gac8RmUC9ImDWh1DtE1EVuafZIJ5JDFRyJ7Z
hmH7T93NdPj+nnPITs+wJpMXXYGbe986JU2ITQD/E84xaVmeJCnnsg867LjxKgHS
eZhOHo9cX8xDtwp68egKxn7X1asYNaWA3Ws0c+R9g/eFsukCVOgH5lkTP6OfXh7t
p/gNQgbXZ5HTNCL5mV5fCdYpxsWR5tquE9MgvDStUWmLEpVMvG7WkFswvKdV8ZiT
/qU/GMxw4Gz4uN4ucRD/pHSRga65fGJ+GQ6fXisWmhnOLLjwhTay1hxUKnalQTF0
xCIVA1RxssgfQh6R41I9
=roy3
-----END PGP SIGNATURE-----
Toni Gundogdu (41):
#7: fix undefined value for "regexp"
Revise makedist.sh
Impl. support for quvi's --query-formats
Revise parse_quvi_version
Add --category-http to default quvi value
Use GNU Autotools instead of CMake
Revise manual
Revise about dialog
Align lines
Revise YouTube feed integration
Remove log subsystem
Revise translation subsystem
Revise HowtoTranslate, add gen-tr.sh
Remove tips (Reminder) subsystem
Fix Preferences default tab
Remove quvi --support integration
Cleanup util.h
Remove "Overwrite" from context menu
Improve quvi error handling
Use "media" instead of "video"
Use QProcess::errorString instead
Prompt for parsing a feed if the list is empty
Use umph returned output as error message
Rename NFeedInfo -> NFeedProperties
Replace Preferences with NSettingsDialog
Add basic command line support
Add email
Revise .desktop file
Add StartupNotify to .desktop file
Revise manual
Revise README
Revise INSTALL
Revise README.packagers
Add --locale option
Add accelerator note to HowtoTranslate.txt
Use qApp->translate, QT_TR_NOOP instead
Change lrelease options
Update Finnish translation
Bump version to 0.2.0
Add --locale to manual
Update NEWS for 0.2.0
-----------------------------------------------------------------------
repo.or.cz automatic notification. Contact project admin le...@gm...
if you want to unsubscribe, or site admin ad...@re... if you receive
no reply.
--
nomnom.git ("The graphical media download tool")
|
|
From: <nom...@li...> - 2011-10-21 05:11:42
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project nomnom.git.
The branch, maint has been updated
via d9050e2badf01d3aa3d768148aa70a19b771c350 (commit)
via 2e7eafccbda41cff8f6bc246a55c792d0dbc349e (commit)
via 593e443de4a621c133fba62fe5e8b09ae7164243 (commit)
via 18585cfbfbd60b20cce2a2962d58731cc35aee79 (commit)
via ec81c2658381481615c1c37a5bcec90c5ac82ed4 (commit)
via 0ad60925ec932264a6787779c08ec6afba6abc15 (commit)
via a4fab836e2d4e6d6e0d38531b5565b0d9cc6cfa4 (commit)
via 8d39a7458a32aa48c17ce4a52737fd1e16240f42 (commit)
via 14a98bd7a4952326f87cd1e43bef604c80f13acb (commit)
via eb79a0bf54183a26643bfd5f22214571c5a3bb8d (commit)
via 2e880672b0504c69ecbc07fda2fc6cd50e60813c (commit)
via d2271c269575875486870739ee01510d8c663e94 (commit)
via 06d0b4255af50242e5be797e357cb36345cc7648 (commit)
via f941c926238e52a7b704187510769f8a7d91f11f (commit)
via a8910369788b3f3fd96a659e14d36f85ab3bd633 (commit)
via 1ad2eb96c188921c0fcced6eb8f108992e5d6cdb (commit)
via 4cd4e245b42ecb6544aef8fc04c2c50ff3cbdc30 (commit)
via 309ae84d3d069d3c425de6414a00adc26b93d38c (commit)
via 7b174464bfc6553dce9f480879f2b05298933eff (commit)
via 04cd7a41d9996707e4c6247c906c35df4648d678 (commit)
via 49cc661bc8b553d62b73bed771b121f00c341cb1 (commit)
via a54a487fa5a46e481136443ecb86d94a489678ee (commit)
via 723ab50c53f38b22ece19591675af0a055846fae (commit)
via 77b75fdbd3548dc6a3154367793737b135436a29 (commit)
via dd29320db11ddafe8aaf66509424c0664c62c8b3 (commit)
via 8281b8dd9b8ea72fcb15774cdf15d6d837535d90 (commit)
via 89d8b31155d74063334841f0737bd2fe7e333aa1 (commit)
via 815b56d7d8df625759dab1707d8ad7fbdb408746 (commit)
via 4a2d2805886d77d7b10d9bbb030e848ea32ccdf4 (commit)
via 5daa29e055e455012e4d47796bd9aed9356e83ef (commit)
via e6f9ad9512211317c964ed555839a46e9ddaa092 (commit)
via ebd79443e868b5010221fc91a3f4cdeb6eb6bf8a (commit)
via f1305bc08dedf051820e442635d578a161baf983 (commit)
via a8e988c0a3e90c0155969e3bfd532cc4615eee7f (commit)
via cc2ec6cf788e3152eef150d68daa78038849d2dc (commit)
via 7186134b073565d04e5bab261643e505b0e492b9 (commit)
via 8d6a144485c06cabdbaaa2d94d6f2c8c72b60d00 (commit)
via 03834f87e551ff74a33b1cd0fb23145d5fdbf8f0 (commit)
via b2dfa5191e8856655590163be8e7cffc4a2ad784 (commit)
via 68ded6e0dcca810cef0e4528b61676d14926ea06 (commit)
via a703f697d61c36ae4a9bb0326f487cc61105cf8a (commit)
from eeaefa98579f7a3ee73a16ae67a7ee3b945fda72 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 22 +-
CMakeLists.txt | 308 ------
INSTALL | 123 +--
Makefile.am | 38 +
NEWS | 19 +
README | 61 +--
README.packagers | 47 +
autogen.sh | 53 +
config.h.cmake.in | 12 -
configure.ac | 134 +++
doc/CMakeLists.txt | 9 -
doc/HowtoTranslate | 108 --
doc/HowtoTranslate.txt | 143 +++
doc/Makefile.am | 2 +
doc/man1/Makefile.am | 2 +
doc/man1/nomnom.1.pod | 171 ++++
examples/NomNom.conf | 7 +
gen-tr.sh | 53 +
gen-ver.sh | 53 +
i/About.ui | 142 ---
i/LogView.ui | 93 --
i/Preferences.ui | 737 --------------
i/Reminder.ui | 111 ---
i/YoutubeFeed.ui | 173 ----
m4/version.m4 | 1 +
man1/CMakeLists.txt | 33 -
man1/nomnom.1 | 194 ----
man1/nomnom.1.pod | 71 --
nomnom.desktop.in | 8 +-
rc/img/nomnom.xpm => nomnom.xpm | 0
scripts/astyle_cpp.sh | 6 -
scripts/makedist.sh | 30 -
src/DownloadDiag.cpp | 242 +++---
src/DownloadDiag.h | 56 +-
src/Log.cpp | 54 -
src/Log.h | 36 -
src/Makefile.am | 148 +++
src/{Video.cpp => Media.cpp} | 80 +-
src/Media.h | 66 ++
src/NAboutDialog | 1 +
src/NDetect | 1 +
src/NDetectDialog | 1 +
src/NFeed | 1 +
src/NFeedDialog | 1 +
src/NFeedProgressDialog | 1 +
src/NLang | 1 +
src/NSettings | 1 +
src/NSettingsDialog | 1 +
src/NSettingsMutator | 1 +
src/NSysTray | 1 +
src/NTripwireEdit | 1 +
src/NUtil | 1 +
src/ProcProgDiag.cpp | 233 +++---
src/ProcProgDiag.h | 60 +-
src/Recent.cpp | 33 +-
src/Recent.h | 31 +-
src/Video.h | 65 --
src/about/naboutdialog.cpp | 110 +++
src/about/naboutdialog.h | 46 +
src/detect/ndetect.cpp | 244 +++++
src/detect/ndetect.h | 88 ++
src/detect/ndetectdialog.cpp | 208 ++++
src/detect/ndetectdialog.h | 64 ++
src/feed/nfeed.cpp | 58 ++
src/feed/nfeed.h | 48 +
src/feed/nfeeddialog.cpp | 157 +++
src/feed/nfeeddialog.h | 116 +++
src/feed/nfeeddialog_items.cpp | 79 ++
src/feed/nfeeddialog_properties.cpp | 240 +++++
src/feed/nfeedprogressdialog.cpp | 177 ++++
src/feed/nfeedprogressdialog.h | 58 ++
src/i/About.cpp | 116 ---
src/i/About.h | 35 -
src/i/LogView.cpp | 72 --
src/i/LogView.h | 38 -
src/i/MainWindow.cpp | 1033 ++++++++++---------
src/i/MainWindow.h | 86 +-
src/i/Preferences.cpp | 633 ------------
src/i/Preferences.h | 99 --
src/i/Reminder.cpp | 100 --
src/i/Reminder.h | 46 -
src/i/YoutubeFeed.cpp | 211 ----
src/i/YoutubeFeed.h | 50 -
src/lang/nlang.cpp | 288 ++++++
src/lang/nlang.h | 54 +
src/main.cpp | 287 +++++--
{i => src/rc}/MainWindow.ui | 2 +-
{rc => src/rc}/img/README | 0
{rc => src/rc}/img/nomnom.png | Bin 2610 -> 2610 bytes
{rc => src/rc}/nomnom.qrc | 1 +
COPYING => src/rc/text/COPYING | 0
src/settings/nsettings.cpp | 134 +++
src/settings/nsettings.h | 78 ++
src/settings/nsettingsdialog.cpp | 141 +++
src/settings/nsettingsdialog.h | 248 +++++
src/settings/nsettingsdialog_commands.cpp | 344 +++++++
src/settings/nsettingsdialog_download.cpp | 247 +++++
src/settings/nsettingsdialog_options.cpp | 114 +++
.../nsettingsdialog_options_appearance.cpp | 194 ++++
src/settings/nsettingsdialog_options_behaviour.cpp | 110 +++
src/settings/nsettingsdialog_options_systray.cpp | 115 +++
src/settings/nsettingsdialog_proxy.cpp | 131 +++
src/settings/nsettingsmutator.cpp | 119 +++
src/settings/nsettingsmutator.h | 51 +
src/systray/nsystray.cpp | 136 +++
src/systray/nsystray.h | 52 +
src/tips.cpp | 123 ---
src/tips.h | 34 -
src/util.cpp | 545 -----------
src/util.h | 116 ---
src/util/nutil.cpp | 153 +++
src/util/nutil.h | 33 +
src/widgets/ntripwireedit.cpp | 42 +
src/widgets/ntripwireedit.h | 44 +
tr/Makefile.am | 16 +
tr/{nomnom_de.ts => NomNom_de_DE.ts} | 0
tr/NomNom_fi_FI.ts | 789 +++++++++++++++
tr/nomnom_fi.ts | 768 ---------------
uninstall.cmake.in | 21 -
119 files changed, 7526 insertions(+), 6297 deletions(-)
delete mode 100644 CMakeLists.txt
delete mode 100644 ChangeLog
create mode 100644 Makefile.am
create mode 100644 README.packagers
create mode 100755 autogen.sh
delete mode 100644 config.h.cmake.in
create mode 100644 configure.ac
delete mode 100644 doc/CMakeLists.txt
delete mode 100644 doc/HowtoTranslate
create mode 100644 doc/HowtoTranslate.txt
create mode 100644 doc/Makefile.am
create mode 100644 doc/man1/Makefile.am
create mode 100644 doc/man1/nomnom.1.pod
create mode 100644 examples/NomNom.conf
create mode 100755 gen-tr.sh
create mode 100755 gen-ver.sh
delete mode 100644 i/About.ui
delete mode 100644 i/LogView.ui
delete mode 100644 i/Preferences.ui
delete mode 100644 i/Reminder.ui
delete mode 100644 i/YoutubeFeed.ui
create mode 100644 m4/version.m4
delete mode 100644 man1/CMakeLists.txt
delete mode 100644 man1/nomnom.1
delete mode 100644 man1/nomnom.1.pod
rename rc/img/nomnom.xpm => nomnom.xpm (100%)
delete mode 100644 scripts/astyle_cpp.sh
delete mode 100644 scripts/makedist.sh
delete mode 100644 src/Log.cpp
delete mode 100644 src/Log.h
create mode 100644 src/Makefile.am
rename src/{Video.cpp => Media.cpp} (65%)
create mode 100644 src/Media.h
create mode 100644 src/NAboutDialog
create mode 100644 src/NDetect
create mode 100644 src/NDetectDialog
create mode 100644 src/NFeed
create mode 100644 src/NFeedDialog
create mode 100644 src/NFeedProgressDialog
create mode 100644 src/NLang
create mode 100644 src/NSettings
create mode 100644 src/NSettingsDialog
create mode 100644 src/NSettingsMutator
create mode 100644 src/NSysTray
create mode 100644 src/NTripwireEdit
create mode 100644 src/NUtil
delete mode 100644 src/Video.h
create mode 100644 src/about/naboutdialog.cpp
create mode 100644 src/about/naboutdialog.h
create mode 100644 src/detect/ndetect.cpp
create mode 100644 src/detect/ndetect.h
create mode 100644 src/detect/ndetectdialog.cpp
create mode 100644 src/detect/ndetectdialog.h
create mode 100644 src/feed/nfeed.cpp
create mode 100644 src/feed/nfeed.h
create mode 100644 src/feed/nfeeddialog.cpp
create mode 100644 src/feed/nfeeddialog.h
create mode 100644 src/feed/nfeeddialog_items.cpp
create mode 100644 src/feed/nfeeddialog_properties.cpp
create mode 100644 src/feed/nfeedprogressdialog.cpp
create mode 100644 src/feed/nfeedprogressdialog.h
delete mode 100644 src/i/About.cpp
delete mode 100644 src/i/About.h
delete mode 100644 src/i/LogView.cpp
delete mode 100644 src/i/LogView.h
delete mode 100644 src/i/Preferences.cpp
delete mode 100644 src/i/Preferences.h
delete mode 100644 src/i/Reminder.cpp
delete mode 100644 src/i/Reminder.h
delete mode 100644 src/i/YoutubeFeed.cpp
delete mode 100644 src/i/YoutubeFeed.h
create mode 100644 src/lang/nlang.cpp
create mode 100644 src/lang/nlang.h
rename {i => src/rc}/MainWindow.ui (98%)
rename {rc => src/rc}/img/README (100%)
rename {rc => src/rc}/img/nomnom.png (100%)
rename {rc => src/rc}/nomnom.qrc (71%)
copy COPYING => src/rc/text/COPYING (100%)
create mode 100644 src/settings/nsettings.cpp
create mode 100644 src/settings/nsettings.h
create mode 100644 src/settings/nsettingsdialog.cpp
create mode 100644 src/settings/nsettingsdialog.h
create mode 100644 src/settings/nsettingsdialog_commands.cpp
create mode 100644 src/settings/nsettingsdialog_download.cpp
create mode 100644 src/settings/nsettingsdialog_options.cpp
create mode 100644 src/settings/nsettingsdialog_options_appearance.cpp
create mode 100644 src/settings/nsettingsdialog_options_behaviour.cpp
create mode 100644 src/settings/nsettingsdialog_options_systray.cpp
create mode 100644 src/settings/nsettingsdialog_proxy.cpp
create mode 100644 src/settings/nsettingsmutator.cpp
create mode 100644 src/settings/nsettingsmutator.h
create mode 100644 src/systray/nsystray.cpp
create mode 100644 src/systray/nsystray.h
delete mode 100644 src/tips.cpp
delete mode 100644 src/tips.h
delete mode 100644 src/util.cpp
delete mode 100644 src/util.h
create mode 100644 src/util/nutil.cpp
create mode 100644 src/util/nutil.h
create mode 100644 src/widgets/ntripwireedit.cpp
create mode 100644 src/widgets/ntripwireedit.h
create mode 100644 tr/Makefile.am
rename tr/{nomnom_de.ts => NomNom_de_DE.ts} (100%)
create mode 100644 tr/NomNom_fi_FI.ts
delete mode 100644 tr/nomnom_fi.ts
delete mode 100644 uninstall.cmake.in
repo.or.cz automatic notification. Contact project admin le...@gm...
if you want to unsubscribe, or site admin ad...@re... if you receive
no reply.
--
nomnom.git ("The graphical media download tool")
|
|
From: <nom...@li...> - 2011-10-21 05:11:26
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project nomnom.git.
The branch, next has been updated
via d9050e2badf01d3aa3d768148aa70a19b771c350 (commit)
from 2e7eafccbda41cff8f6bc246a55c792d0dbc349e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
NEWS | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 deletions(-)
repo.or.cz automatic notification. Contact project admin le...@gm...
if you want to unsubscribe, or site admin ad...@re... if you receive
no reply.
--
nomnom.git ("The graphical media download tool")
|
|
From: <nom...@li...> - 2011-10-21 05:11:18
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project nomnom.git.
The branch, master has been updated
via d9050e2badf01d3aa3d768148aa70a19b771c350 (commit)
via 2e7eafccbda41cff8f6bc246a55c792d0dbc349e (commit)
via 593e443de4a621c133fba62fe5e8b09ae7164243 (commit)
via 18585cfbfbd60b20cce2a2962d58731cc35aee79 (commit)
via ec81c2658381481615c1c37a5bcec90c5ac82ed4 (commit)
via 0ad60925ec932264a6787779c08ec6afba6abc15 (commit)
via a4fab836e2d4e6d6e0d38531b5565b0d9cc6cfa4 (commit)
via 8d39a7458a32aa48c17ce4a52737fd1e16240f42 (commit)
via 14a98bd7a4952326f87cd1e43bef604c80f13acb (commit)
via eb79a0bf54183a26643bfd5f22214571c5a3bb8d (commit)
via 2e880672b0504c69ecbc07fda2fc6cd50e60813c (commit)
via d2271c269575875486870739ee01510d8c663e94 (commit)
via 06d0b4255af50242e5be797e357cb36345cc7648 (commit)
via f941c926238e52a7b704187510769f8a7d91f11f (commit)
via a8910369788b3f3fd96a659e14d36f85ab3bd633 (commit)
via 1ad2eb96c188921c0fcced6eb8f108992e5d6cdb (commit)
via 4cd4e245b42ecb6544aef8fc04c2c50ff3cbdc30 (commit)
via 309ae84d3d069d3c425de6414a00adc26b93d38c (commit)
via 7b174464bfc6553dce9f480879f2b05298933eff (commit)
via 04cd7a41d9996707e4c6247c906c35df4648d678 (commit)
via 49cc661bc8b553d62b73bed771b121f00c341cb1 (commit)
via a54a487fa5a46e481136443ecb86d94a489678ee (commit)
via 723ab50c53f38b22ece19591675af0a055846fae (commit)
via 77b75fdbd3548dc6a3154367793737b135436a29 (commit)
via dd29320db11ddafe8aaf66509424c0664c62c8b3 (commit)
via 8281b8dd9b8ea72fcb15774cdf15d6d837535d90 (commit)
via 89d8b31155d74063334841f0737bd2fe7e333aa1 (commit)
via 815b56d7d8df625759dab1707d8ad7fbdb408746 (commit)
via 4a2d2805886d77d7b10d9bbb030e848ea32ccdf4 (commit)
via 5daa29e055e455012e4d47796bd9aed9356e83ef (commit)
via e6f9ad9512211317c964ed555839a46e9ddaa092 (commit)
via ebd79443e868b5010221fc91a3f4cdeb6eb6bf8a (commit)
via f1305bc08dedf051820e442635d578a161baf983 (commit)
via a8e988c0a3e90c0155969e3bfd532cc4615eee7f (commit)
via cc2ec6cf788e3152eef150d68daa78038849d2dc (commit)
via 7186134b073565d04e5bab261643e505b0e492b9 (commit)
via 8d6a144485c06cabdbaaa2d94d6f2c8c72b60d00 (commit)
via 03834f87e551ff74a33b1cd0fb23145d5fdbf8f0 (commit)
via b2dfa5191e8856655590163be8e7cffc4a2ad784 (commit)
via 68ded6e0dcca810cef0e4528b61676d14926ea06 (commit)
via a703f697d61c36ae4a9bb0326f487cc61105cf8a (commit)
from eeaefa98579f7a3ee73a16ae67a7ee3b945fda72 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://repo.or.cz/w/nomnom.git/commit/d9050e2badf01d3aa3d768148aa70a19b771c350
commit d9050e2badf01d3aa3d768148aa70a19b771c350
Author: Toni Gundogdu <le...@gm...>
Date: Fri Oct 21 07:48:11 2011 +0300
Update NEWS for 0.2.0
diff --git a/NEWS b/NEWS
index ef7edb1..89c43b5 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,23 @@
+0.2.0 Fri Oct 21 2011 Toni Gundogdu
+
+Changes:
+ - Revise YouTube feed (umph) integration, add support for umph "--all"
+ - Add command (media stream parser, player, ...) detection from $PATH
+ - Add command line options (--detect, --locale, --config-path, ...)
+ - Improve progress dialogs used with quvi and curl commands
+ - Improve error handling with commands
+ - Revise system icon tray integration
+ - Use GNU Autotools instead of CMake
+ - Remove subsystems log and tips
+ - Revise translation subsystem
+ - Update Finnish translation
+ - Revise nomnom.desktop file
+ - Revise settings subsystem
+ - Revise about dialog
+ - Revise manual page
+
+
0.1.4 Sat Jun 18 2011 Toni Gundogdu
Changes:
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 22 +-
CMakeLists.txt | 308 ------
INSTALL | 123 +--
Makefile.am | 38 +
NEWS | 19 +
README | 61 +--
README.packagers | 47 +
autogen.sh | 53 +
config.h.cmake.in | 12 -
configure.ac | 134 +++
doc/CMakeLists.txt | 9 -
doc/HowtoTranslate | 108 --
doc/HowtoTranslate.txt | 143 +++
doc/Makefile.am | 2 +
doc/man1/Makefile.am | 2 +
doc/man1/nomnom.1.pod | 171 ++++
examples/NomNom.conf | 7 +
gen-tr.sh | 53 +
gen-ver.sh | 53 +
i/About.ui | 142 ---
i/LogView.ui | 93 --
i/Preferences.ui | 737 --------------
i/Reminder.ui | 111 ---
i/YoutubeFeed.ui | 173 ----
m4/version.m4 | 1 +
man1/CMakeLists.txt | 33 -
man1/nomnom.1 | 194 ----
man1/nomnom.1.pod | 71 --
nomnom.desktop.in | 8 +-
rc/img/nomnom.xpm => nomnom.xpm | 0
scripts/astyle_cpp.sh | 6 -
scripts/makedist.sh | 30 -
src/DownloadDiag.cpp | 242 +++---
src/DownloadDiag.h | 56 +-
src/Log.cpp | 54 -
src/Log.h | 36 -
src/Makefile.am | 148 +++
src/{Video.cpp => Media.cpp} | 80 +-
src/Media.h | 66 ++
src/NAboutDialog | 1 +
src/NDetect | 1 +
src/NDetectDialog | 1 +
src/NFeed | 1 +
src/NFeedDialog | 1 +
src/NFeedProgressDialog | 1 +
src/NLang | 1 +
src/NSettings | 1 +
src/NSettingsDialog | 1 +
src/NSettingsMutator | 1 +
src/NSysTray | 1 +
src/NTripwireEdit | 1 +
src/NUtil | 1 +
src/ProcProgDiag.cpp | 233 +++---
src/ProcProgDiag.h | 60 +-
src/Recent.cpp | 33 +-
src/Recent.h | 31 +-
src/Video.h | 65 --
src/about/naboutdialog.cpp | 110 +++
src/about/naboutdialog.h | 46 +
src/detect/ndetect.cpp | 244 +++++
src/detect/ndetect.h | 88 ++
src/detect/ndetectdialog.cpp | 208 ++++
src/detect/ndetectdialog.h | 64 ++
src/feed/nfeed.cpp | 58 ++
src/feed/nfeed.h | 48 +
src/feed/nfeeddialog.cpp | 157 +++
src/feed/nfeeddialog.h | 116 +++
src/feed/nfeeddialog_items.cpp | 79 ++
src/feed/nfeeddialog_properties.cpp | 240 +++++
src/feed/nfeedprogressdialog.cpp | 177 ++++
src/feed/nfeedprogressdialog.h | 58 ++
src/i/About.cpp | 116 ---
src/i/About.h | 35 -
src/i/LogView.cpp | 72 --
src/i/LogView.h | 38 -
src/i/MainWindow.cpp | 1033 ++++++++++---------
src/i/MainWindow.h | 86 +-
src/i/Preferences.cpp | 633 ------------
src/i/Preferences.h | 99 --
src/i/Reminder.cpp | 100 --
src/i/Reminder.h | 46 -
src/i/YoutubeFeed.cpp | 211 ----
src/i/YoutubeFeed.h | 50 -
src/lang/nlang.cpp | 288 ++++++
src/lang/nlang.h | 54 +
src/main.cpp | 287 +++++--
{i => src/rc}/MainWindow.ui | 2 +-
{rc => src/rc}/img/README | 0
{rc => src/rc}/img/nomnom.png | Bin 2610 -> 2610 bytes
{rc => src/rc}/nomnom.qrc | 1 +
COPYING => src/rc/text/COPYING | 0
src/settings/nsettings.cpp | 134 +++
src/settings/nsettings.h | 78 ++
src/settings/nsettingsdialog.cpp | 141 +++
src/settings/nsettingsdialog.h | 248 +++++
src/settings/nsettingsdialog_commands.cpp | 344 +++++++
src/settings/nsettingsdialog_download.cpp | 247 +++++
src/settings/nsettingsdialog_options.cpp | 114 +++
.../nsettingsdialog_options_appearance.cpp | 194 ++++
src/settings/nsettingsdialog_options_behaviour.cpp | 110 +++
src/settings/nsettingsdialog_options_systray.cpp | 115 +++
src/settings/nsettingsdialog_proxy.cpp | 131 +++
src/settings/nsettingsmutator.cpp | 119 +++
src/settings/nsettingsmutator.h | 51 +
src/systray/nsystray.cpp | 136 +++
src/systray/nsystray.h | 52 +
src/tips.cpp | 123 ---
src/tips.h | 34 -
src/util.cpp | 545 -----------
src/util.h | 116 ---
src/util/nutil.cpp | 153 +++
src/util/nutil.h | 33 +
src/widgets/ntripwireedit.cpp | 42 +
src/widgets/ntripwireedit.h | 44 +
tr/Makefile.am | 16 +
tr/{nomnom_de.ts => NomNom_de_DE.ts} | 0
tr/NomNom_fi_FI.ts | 789 +++++++++++++++
tr/nomnom_fi.ts | 768 ---------------
uninstall.cmake.in | 21 -
119 files changed, 7526 insertions(+), 6297 deletions(-)
delete mode 100644 CMakeLists.txt
delete mode 100644 ChangeLog
create mode 100644 Makefile.am
create mode 100644 README.packagers
create mode 100755 autogen.sh
delete mode 100644 config.h.cmake.in
create mode 100644 configure.ac
delete mode 100644 doc/CMakeLists.txt
delete mode 100644 doc/HowtoTranslate
create mode 100644 doc/HowtoTranslate.txt
create mode 100644 doc/Makefile.am
create mode 100644 doc/man1/Makefile.am
create mode 100644 doc/man1/nomnom.1.pod
create mode 100644 examples/NomNom.conf
create mode 100755 gen-tr.sh
create mode 100755 gen-ver.sh
delete mode 100644 i/About.ui
delete mode 100644 i/LogView.ui
delete mode 100644 i/Preferences.ui
delete mode 100644 i/Reminder.ui
delete mode 100644 i/YoutubeFeed.ui
create mode 100644 m4/version.m4
delete mode 100644 man1/CMakeLists.txt
delete mode 100644 man1/nomnom.1
delete mode 100644 man1/nomnom.1.pod
rename rc/img/nomnom.xpm => nomnom.xpm (100%)
delete mode 100644 scripts/astyle_cpp.sh
delete mode 100644 scripts/makedist.sh
delete mode 100644 src/Log.cpp
delete mode 100644 src/Log.h
create mode 100644 src/Makefile.am
rename src/{Video.cpp => Media.cpp} (65%)
create mode 100644 src/Media.h
create mode 100644 src/NAboutDialog
create mode 100644 src/NDetect
create mode 100644 src/NDetectDialog
create mode 100644 src/NFeed
create mode 100644 src/NFeedDialog
create mode 100644 src/NFeedProgressDialog
create mode 100644 src/NLang
create mode 100644 src/NSettings
create mode 100644 src/NSettingsDialog
create mode 100644 src/NSettingsMutator
create mode 100644 src/NSysTray
create mode 100644 src/NTripwireEdit
create mode 100644 src/NUtil
delete mode 100644 src/Video.h
create mode 100644 src/about/naboutdialog.cpp
create mode 100644 src/about/naboutdialog.h
create mode 100644 src/detect/ndetect.cpp
create mode 100644 src/detect/ndetect.h
create mode 100644 src/detect/ndetectdialog.cpp
create mode 100644 src/detect/ndetectdialog.h
create mode 100644 src/feed/nfeed.cpp
create mode 100644 src/feed/nfeed.h
create mode 100644 src/feed/nfeeddialog.cpp
create mode 100644 src/feed/nfeeddialog.h
create mode 100644 src/feed/nfeeddialog_items.cpp
create mode 100644 src/feed/nfeeddialog_properties.cpp
create mode 100644 src/feed/nfeedprogressdialog.cpp
create mode 100644 src/feed/nfeedprogressdialog.h
delete mode 100644 src/i/About.cpp
delete mode 100644 src/i/About.h
delete mode 100644 src/i/LogView.cpp
delete mode 100644 src/i/LogView.h
delete mode 100644 src/i/Preferences.cpp
delete mode 100644 src/i/Preferences.h
delete mode 100644 src/i/Reminder.cpp
delete mode 100644 src/i/Reminder.h
delete mode 100644 src/i/YoutubeFeed.cpp
delete mode 100644 src/i/YoutubeFeed.h
create mode 100644 src/lang/nlang.cpp
create mode 100644 src/lang/nlang.h
rename {i => src/rc}/MainWindow.ui (98%)
rename {rc => src/rc}/img/README (100%)
rename {rc => src/rc}/img/nomnom.png (100%)
rename {rc => src/rc}/nomnom.qrc (71%)
copy COPYING => src/rc/text/COPYING (100%)
create mode 100644 src/settings/nsettings.cpp
create mode 100644 src/settings/nsettings.h
create mode 100644 src/settings/nsettingsdialog.cpp
create mode 100644 src/settings/nsettingsdialog.h
create mode 100644 src/settings/nsettingsdialog_commands.cpp
create mode 100644 src/settings/nsettingsdialog_download.cpp
create mode 100644 src/settings/nsettingsdialog_options.cpp
create mode 100644 src/settings/nsettingsdialog_options_appearance.cpp
create mode 100644 src/settings/nsettingsdialog_options_behaviour.cpp
create mode 100644 src/settings/nsettingsdialog_options_systray.cpp
create mode 100644 src/settings/nsettingsdialog_proxy.cpp
create mode 100644 src/settings/nsettingsmutator.cpp
create mode 100644 src/settings/nsettingsmutator.h
create mode 100644 src/systray/nsystray.cpp
create mode 100644 src/systray/nsystray.h
delete mode 100644 src/tips.cpp
delete mode 100644 src/tips.h
delete mode 100644 src/util.cpp
delete mode 100644 src/util.h
create mode 100644 src/util/nutil.cpp
create mode 100644 src/util/nutil.h
create mode 100644 src/widgets/ntripwireedit.cpp
create mode 100644 src/widgets/ntripwireedit.h
create mode 100644 tr/Makefile.am
rename tr/{nomnom_de.ts => NomNom_de_DE.ts} (100%)
create mode 100644 tr/NomNom_fi_FI.ts
delete mode 100644 tr/nomnom_fi.ts
delete mode 100644 uninstall.cmake.in
repo.or.cz automatic notification. Contact project admin le...@gm...
if you want to unsubscribe, or site admin ad...@re... if you receive
no reply.
--
nomnom.git ("The graphical media download tool")
|
|
From: <nom...@li...> - 2011-10-20 10:59:16
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project nomnom.git.
The branch, next has been updated
via 2e7eafccbda41cff8f6bc246a55c792d0dbc349e (commit)
via 593e443de4a621c133fba62fe5e8b09ae7164243 (commit)
from 18585cfbfbd60b20cce2a2962d58731cc35aee79 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://repo.or.cz/w/nomnom.git/commit/2e7eafccbda41cff8f6bc246a55c792d0dbc349e
commit 2e7eafccbda41cff8f6bc246a55c792d0dbc349e
Author: Toni Gundogdu <le...@gm...>
Date: Wed Oct 19 23:56:24 2011 +0300
Add --locale to manual
diff --git a/doc/man1/nomnom.1.pod b/doc/man1/nomnom.1.pod
index acf6716..8561efb 100644
--- a/doc/man1/nomnom.1.pod
+++ b/doc/man1/nomnom.1.pod
@@ -62,6 +62,10 @@ NomNom supports the following command line options.
Prints the path to the local user config file and exits.
+=head2 --locale
+
+Prints the system locale (as returned by Qt) and exits.
+
=head2 --detect
Prints the detected commands and exits.
http://repo.or.cz/w/nomnom.git/commit/593e443de4a621c133fba62fe5e8b09ae7164243
commit 593e443de4a621c133fba62fe5e8b09ae7164243
Author: Toni Gundogdu <le...@gm...>
Date: Wed Oct 19 23:54:29 2011 +0300
Bump version to 0.2.0
diff --git a/m4/version.m4 b/m4/version.m4
index 0224cfa..f609e44 100644
--- a/m4/version.m4
+++ b/m4/version.m4
@@ -1 +1 @@
-m4_define([_NOMNOM_VERSION], [0.1.5])
+m4_define([_NOMNOM_VERSION], [0.2.0])
-----------------------------------------------------------------------
Summary of changes:
doc/man1/nomnom.1.pod | 4 ++++
m4/version.m4 | 2 +-
2 files changed, 5 insertions(+), 1 deletions(-)
repo.or.cz automatic notification. Contact project admin le...@gm...
if you want to unsubscribe, or site admin ad...@re... if you receive
no reply.
--
nomnom.git ("The graphical media download tool")
|
|
From: <nom...@li...> - 2011-10-20 10:43:41
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project nomnom.git.
The branch, next has been updated
via 18585cfbfbd60b20cce2a2962d58731cc35aee79 (commit)
via ec81c2658381481615c1c37a5bcec90c5ac82ed4 (commit)
via 0ad60925ec932264a6787779c08ec6afba6abc15 (commit)
from a4fab836e2d4e6d6e0d38531b5565b0d9cc6cfa4 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://repo.or.cz/w/nomnom.git/commit/18585cfbfbd60b20cce2a2962d58731cc35aee79
commit 18585cfbfbd60b20cce2a2962d58731cc35aee79
Author: Toni Gundogdu <le...@gm...>
Date: Wed Oct 19 18:54:01 2011 +0300
Update Finnish translation
* Use nn::NFeedProperties context for "start index" and
"max. results" tooltips
diff --git a/src/feed/nfeeddialog_properties.cpp b/src/feed/nfeeddialog_properties.cpp
index 589af6a..6faf7d7 100644
--- a/src/feed/nfeeddialog_properties.cpp
+++ b/src/feed/nfeeddialog_properties.cpp
@@ -42,7 +42,7 @@ enum { StartIndexTooltip=0x00, MaxResultsTooltip };
static const char *tooltips[] =
{
- QT_TRANSLATE_NOOP("Tooltip",
+ QT_TRANSLATE_NOOP("nn::NFeedProperties",
"The start index parameter specifies the index of the first matchingn"
"result that should be included in the result set. This parameter usesn"
"a one-based index, meaning the first result is 1, the second resultn"
@@ -53,7 +53,7 @@ static const char *tooltips[] =
"start index parameter to 11 and the max results parameter to 10.n"
" -- YouTube Developer's Guide: Data API Protocol"
),
- QT_TRANSLATE_NOOP("Tooltip",
+ QT_TRANSLATE_NOOP("nn::NFeedProperties",
"The max results parameter specifies the maximum number ofn"
"results that should be included in the result set.nn"
"This parameter works in conjunction with the start index parametern"
diff --git a/tr/NomNom_fi_FI.ts b/tr/NomNom_fi_FI.ts
index 08021c3..2028cc4 100644
--- a/tr/NomNom_fi_FI.ts
+++ b/tr/NomNom_fi_FI.ts
@@ -2,118 +2,42 @@
<!DOCTYPE TS>
<TS version="2.0" language="fi_FI">
<context>
- <name>About</name>
- <message>
- <location filename="../i/About.ui" line="14"/>
- <source>About</source>
- <translation>Tietoja</translation>
- </message>
- <message>
- <location filename="../i/About.ui" line="34"/>
- <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><img src=":/img/nomnom.png" /><span style=" font-family:'Verdana';"> </span><span style=" font-family:'Verdana'; font-size:14pt; font-weight:600;">NomNom</span></p>
-<hr />
-<table border="0" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px;" cellspacing="2" cellpadding="0">
-<tr>
-<td>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Verdana'; font-weight:600;">Version</span><span style=" font-family:'Verdana';"> </span></p></td>
-<td>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Verdana';">: $version</span></p></td></tr>
-<tr>
-<td>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Verdana'; font-weight:600;">quvi</span><span style=" font-family:'Verdana';"> </span></p></td>
-<td>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Verdana';">: $quvi_version</span></p></td></tr>
-<tr>
-<td>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Verdana'; font-weight:600;">Qt</span><span style=" font-family:'Verdana';"> </span></p></td>
-<td>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Verdana';">: $qt_version</span></p></td></tr>
-<tr>
-<td>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Verdana'; font-weight:600;">Config</span><span style=" font-family:'Verdana';"> </span></p></td>
-<td>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Verdana';">: $config_file</span></p></td></tr>
-<tr>
-<td>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Verdana'; font-weight:600;">WWW</span><span style=" font-family:'Verdana';"> </span></p></td>
-<td>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Verdana';">: &lt;</span><a href="http://nomnom.sourceforge.net/"><span style=" font-family:'Verdana'; text-decoration: underline; color:#0000ee;">http://nomnom.sourceforge.net/</span></a><span style=" font-family:'Verdana';">&gt;</span></p></td></tr>
-<tr>
-<td>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Verdana'; font-weight:600;">Git</span><span style=" font-family:'Verdana';"> </span></p></td>
-<td>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Verdana';">: &lt;</span><a href="git://repo.or.cz/nomnom.git"><span style=" text-decoration: underline; color:#0000ff;">git://repo.or.cz/nomnom.git</span></a><span style=" font-family:'Verdana';">&gt;</span></p></td></tr></table>
-<hr />
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Monospace';">Copyright (C) 2010 Toni Gundogdu &lt;</span><a href="le...@gm..."><span style=" text-decoration: underline; color:#0000ff;">le...@gm...</span></a><span style=" font-family:'Monospace';">&gt;.</span></p>
-<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Monospace';"></p>
-<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Monospace';">This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.</span></p>
-<p align="justify" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Monospace';"></p>
-<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Monospace';">This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.</span></p>
-<p align="justify" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Monospace';"></p>
-<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Monospace';">You should have received a copy of the GNU General Public License along with this program. If not, see &lt;</span><a href="http://www.gnu.org/licenses/"><span style=" font-family:'Verdana'; text-decoration: underline; color:#0000ee;">http://www.gnu.org/licenses/</span></a><span style=" font-family:'Monospace';">&gt;.</span></p>
-<hr /></body></html></source>
- <translation></translation>
- </message>
- <message>
- <location filename="../i/About.ui" line="87"/>
- <source>Website coverage reported by quvi:</source>
- <translation>Ohjelma tukee seuraavia sivustoja:</translation>
- </message>
- <message>
- <location filename="../src/i/About.cpp" line="51"/>
- <source>You must specify path to the quvi command.</source>
- <translation>Määrittelemätön polku quvi-komentoon, katso ohjelman asetukset.</translation>
- </message>
-</context>
-<context>
<name>DownloadDialog</name>
<message>
- <location filename="../src/DownloadDiag.cpp" line="81"/>
- <source>Starting download ...</source>
- <translation>Aloitetaan kopiointi...</translation>
- </message>
- <message>
- <location filename="../src/DownloadDiag.cpp" line="140"/>
- <source>Copying at %1, %2</source>
- <translation>Kopioidaan nopeudella %1, %2</translation>
+ <location filename="../src/DownloadDiag.cpp" line="84"/>
+ <source>Starting download...</source>
+ <translation>Kopioidaan...</translation>
</message>
-</context>
-<context>
- <name>LogView</name>
<message>
- <location filename="../i/LogView.ui" line="14"/>
- <source>Log</source>
- <translation>Loki</translation>
+ <location filename="../src/DownloadDiag.cpp" line="95"/>
+ <source>Error while running command:<p>%1</p>Qt error message follows (code #%2):<p>%3</p></source>
+ <translation>Seuraavaa komentoa suorittaessa tapahtui virhe:<p>%1</p>Qt virhe (koodi #%2):<p>%3</p></translation>
</message>
<message>
- <location filename="../i/LogView.ui" line="23"/>
- <source>&Clear</source>
- <translation>&Tyhjennä</translation>
+ <location filename="../src/DownloadDiag.cpp" line="123"/>
+ <source>Copying %1/s, %2</source>
+ <translation>Kopioidaan %1/s, %2</translation>
</message>
<message>
- <location filename="../src/i/LogView.cpp" line="49"/>
- <source>Log cleared.</source>
- <translation>Lokitiedot poistettu.</translation>
+ <location filename="../src/DownloadDiag.cpp" line="149"/>
+ <source>Error while running command:<p>%1</p>curl error message follows:<p>%3</p></source>
+ <translation>Seuraavaa komentoa suorittaessa tapahtui virhe:<p>%1</p>curl virhe:<p>%3</p></translation>
</message>
</context>
<context>
<name>MainWindow</name>
<message>
- <location filename="../i/MainWindow.ui" line="17"/>
+ <location filename="../src/rc/MainWindow.ui" line="17"/>
<source>NomNom</source>
<translation></translation>
</message>
<message>
- <location filename="../i/MainWindow.ui" line="28"/>
+ <location filename="../src/rc/MainWindow.ui" line="28"/>
<source>Drag and drop URLs here</source>
- <translation>Pudota video linkki tähän ikkunaan</translation>
+ <translation>Pudota linkki</translation>
</message>
<message>
- <location filename="../i/MainWindow.ui" line="31"/>
+ <location filename="../src/rc/MainWindow.ui" line="31"/>
<source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
p, li { white-space: pre-wrap; }
@@ -123,646 +47,743 @@ p, li { white-space: pre-wrap; }
<translation></translation>
</message>
<message>
- <location filename="../i/MainWindow.ui" line="44"/>
+ <location filename="../src/rc/MainWindow.ui" line="44"/>
<source>Stream</source>
<translation>Suoratoista</translation>
</message>
<message>
- <location filename="../i/MainWindow.ui" line="49"/>
+ <location filename="../src/rc/MainWindow.ui" line="49"/>
<source>Download</source>
<translation>Kopioi</translation>
</message>
<message>
- <location filename="../src/i/MainWindow.cpp" line="98"/>
- <source>Program started.</source>
- <translation>Ohjelma käynnistetty.</translation>
+ <location filename="../src/i/MainWindow.cpp" line="107"/>
+ <location filename="../src/i/MainWindow.cpp" line="124"/>
+ <source>Address...</source>
+ <translation>Osoite...</translation>
</message>
<message>
- <location filename="../src/i/MainWindow.cpp" line="131"/>
- <location filename="../src/i/MainWindow.cpp" line="151"/>
+ <location filename="../src/i/MainWindow.cpp" line="108"/>
+ <location filename="../src/i/MainWindow.cpp" line="125"/>
<source>Feed...</source>
<translation>Syöte...</translation>
</message>
<message>
- <location filename="../src/i/MainWindow.cpp" line="134"/>
- <location filename="../src/i/MainWindow.cpp" line="154"/>
- <source>Overwrite</source>
- <translation>Ylikirjoita</translation>
- </message>
- <message>
- <location filename="../src/i/MainWindow.cpp" line="136"/>
- <location filename="../src/i/MainWindow.cpp" line="156"/>
- <source>Log...</source>
- <translation>Loki...</translation>
+ <location filename="../src/i/MainWindow.cpp" line="109"/>
+ <location filename="../src/i/MainWindow.cpp" line="126"/>
+ <source>Recent...</source>
+ <translation>Aikaisempi...</translation>
</message>
<message>
- <location filename="../src/i/MainWindow.cpp" line="137"/>
- <location filename="../src/i/MainWindow.cpp" line="157"/>
- <source>Preferences...</source>
+ <location filename="../src/i/MainWindow.cpp" line="111"/>
+ <location filename="../src/i/MainWindow.cpp" line="128"/>
+ <location filename="../src/i/MainWindow.cpp" line="159"/>
+ <source>Settings...</source>
<translation>Asetukset...</translation>
</message>
<message>
- <location filename="../src/i/MainWindow.cpp" line="139"/>
+ <location filename="../src/i/MainWindow.cpp" line="113"/>
<source>About...</source>
<translation>Tietoja...</translation>
</message>
<message>
- <location filename="../src/i/MainWindow.cpp" line="140"/>
- <location filename="../src/i/MainWindow.cpp" line="159"/>
- <location filename="../src/i/MainWindow.cpp" line="185"/>
+ <location filename="../src/i/MainWindow.cpp" line="114"/>
+ <location filename="../src/i/MainWindow.cpp" line="130"/>
+ <location filename="../src/i/MainWindow.cpp" line="167"/>
<source>Quit</source>
- <translation>Lopeta</translation>
+ <translation>Sulje</translation>
</message>
<message>
- <location filename="../src/i/MainWindow.cpp" line="90"/>
- <source>Checking...</source>
- <translation>Tarkastetaan...</translation>
- </message>
- <message>
- <location filename="../src/i/MainWindow.cpp" line="91"/>
- <source>Fetching...</source>
- <translation>Haetaan...</translation>
+ <location filename="../src/i/MainWindow.cpp" line="150"/>
+ <location filename="../src/i/MainWindow.cpp" line="734"/>
+ <source>Show</source>
+ <translation>Näytä</translation>
</message>
<message>
- <location filename="../src/i/MainWindow.cpp" line="92"/>
- <source>Verifying...</source>
- <translation>Todennetaan...</translation>
+ <location filename="../src/i/MainWindow.cpp" line="201"/>
+ <source>Please configure the path to the quvi. See under the "commands" in the settings.</source>
+ <translation>Aseta polku komentoon quvi. Katso asetukset: kohta "komennot".</translation>
</message>
<message>
- <location filename="../src/i/MainWindow.cpp" line="130"/>
- <location filename="../src/i/MainWindow.cpp" line="150"/>
- <source>Address...</source>
- <translation>Osoite...</translation>
+ <location filename="../src/i/MainWindow.cpp" line="217"/>
+ <source>Please configure the path to a media player. See under the "commands" in the settings.</source>
+ <translation>Aseta polku media-toistin komentoon. Katso asetukset: kohta "komennot".</translation>
</message>
<message>
- <location filename="../src/i/MainWindow.cpp" line="132"/>
- <location filename="../src/i/MainWindow.cpp" line="152"/>
- <source>Recent...</source>
- <translation>Aiempi...</translation>
+ <location filename="../src/i/MainWindow.cpp" line="278"/>
+ <location filename="../src/i/MainWindow.cpp" line="316"/>
+ <source>Checking...</source>
+ <translation>Tarkastetaan...</translation>
</message>
<message>
- <location filename="../src/i/MainWindow.cpp" line="183"/>
- <source>Open</source>
- <translation>Avaa</translation>
+ <location filename="../src/i/MainWindow.cpp" line="364"/>
+ <source>Choose format</source>
+ <translation>Valitse muoto</translation>
</message>
<message>
- <location filename="../src/i/MainWindow.cpp" line="334"/>
- <location filename="../src/i/MainWindow.cpp" line="347"/>
+ <location filename="../src/i/MainWindow.cpp" line="365"/>
+ <location filename="../src/i/MainWindow.cpp" line="377"/>
<source>Format:</source>
<translation>Muoto:</translation>
</message>
<message>
- <location filename="../src/i/MainWindow.cpp" line="335"/>
- <location filename="../src/i/MainWindow.cpp" line="342"/>
+ <location filename="../src/i/MainWindow.cpp" line="366"/>
+ <location filename="../src/i/MainWindow.cpp" line="373"/>
<source>Enter your own</source>
- <translation>Anna oma</translation>
+ <translation>Syötä muoto</translation>
</message>
<message>
- <location filename="../src/i/MainWindow.cpp" line="346"/>
+ <location filename="../src/i/MainWindow.cpp" line="376"/>
<source>Enter format</source>
- <translation>Anna muoto</translation>
+ <translation>Syötä muoto</translation>
</message>
<message>
- <location filename="../src/i/MainWindow.cpp" line="365"/>
- <source>Checking ...</source>
- <translation>Tarkastetaan...</translation>
+ <location filename="../src/i/MainWindow.cpp" line="400"/>
+ <location filename="../src/i/MainWindow.cpp" line="507"/>
+ <source>Error while running command:<p>%1</p></source>
+ <translation>Seuraavaa komentoa suorittaessa tapahtui virhe:<p>%1</p></translation>
+ </message>
+ <message>
+ <location filename="../src/i/MainWindow.cpp" line="440"/>
+ <source>Save media as</source>
+ <translation>Tallenna nimellä</translation>
+ </message>
+ <message>
+ <location filename="../src/i/MainWindow.cpp" line="550"/>
+ <source>quvi returned unexpected data</source>
+ <translation>quvi-komento ei palauttanut odotettuja tietoja</translation>
</message>
<message>
- <location filename="../src/i/MainWindow.cpp" line="647"/>
+ <location filename="../src/i/MainWindow.cpp" line="589"/>
+ <source>Language will be changed after you restart the application. Restart now?</source>
+ <translation>Kieli vaihdetaan ohjelman uudelleen käynnistyksen yhteydessä. Käynnistetäänkö ohjelma uudelleen?</translation>
+ </message>
+ <message>
+ <location filename="../src/i/MainWindow.cpp" line="642"/>
<source>No record of recently visited URLs found.</source>
- <translation>Aiempia tietoja ei löytynyt.</translation>
+ <translation>Ei aiempia osoitteita.</translation>
</message>
<message>
- <location filename="../src/i/MainWindow.cpp" line="655"/>
+ <location filename="../src/i/MainWindow.cpp" line="649"/>
<source>Recent URLs</source>
<translation>Aiemmat osoitteet</translation>
</message>
<message>
- <location filename="../src/i/MainWindow.cpp" line="705"/>
- <source>Specify path to the umph(1) command in the Preferences.</source>
- <translation>Määrittelemätön polku quvi-komentoon, katso ohjelman asetukset.</translation>
+ <location filename="../src/i/MainWindow.cpp" line="650"/>
+ <source>Select URL (most recent first):</source>
+ <translation>Valitse osoite (viimeisin ensimmäisenä):</translation>
</message>
<message>
- <location filename="../src/i/MainWindow.cpp" line="714"/>
- <source>Choose from old results?</source>
- <translation>Valitse aiemmin haetuista tiedoista?</translation>
+ <location filename="../src/i/MainWindow.cpp" line="666"/>
+ <source>Address</source>
+ <translation>Osoite</translation>
</message>
<message>
- <location filename="../src/i/MainWindow.cpp" line="275"/>
- <source>You must specify path to the quvi command.</source>
- <translation>Määrittelemätön polku quvi-komentoon, katso ohjelman asetukset.</translation>
+ <location filename="../src/i/MainWindow.cpp" line="666"/>
+ <source>Media page URL:</source>
+ <translation>Internet-osoite:</translation>
</message>
<message>
- <location filename="../src/i/MainWindow.cpp" line="297"/>
- <source>You must specify path to a stream-capable media player command.</source>
- <translation>Määrittelemätön polku suoratoistoon pystyvään komentoon, katso ohjelman asetukset.</translation>
+ <location filename="../src/i/MainWindow.cpp" line="688"/>
+ <source>Please configure the path to a feed reader. See under the "commands" in the settings.</source>
+ <translation>Aseta polku syötetietoja lukevaan komentoon. Katso asetukset: kohta "komennot".</translation>
</message>
+</context>
+<context>
+ <name>Media</name>
<message>
- <location filename="../src/i/MainWindow.cpp" line="333"/>
- <source>Choose format</source>
- <translation>Valitse videomuoto</translation>
+ <location filename="../src/Media.cpp" line="69"/>
+ <source>Uncaught exception at line %1: %2</source>
+ <translation>Tietoja luettaessa rivillä %1: tapahtui virhe %2</translation>
</message>
<message>
- <location filename="../src/i/MainWindow.cpp" line="397"/>
- <location filename="../src/i/MainWindow.cpp" line="500"/>
- <source>Unable to start player command, check the Preferences.</source>
- <translation>Toisto-komennon käynnistäminen epäonnistui, katso ohjelman asetukset.</translation>
+ <location filename="../src/Media.cpp" line="84"/>
+ <source>Expected at least one media link from quvi(1), got none.</source>
+ <translation>quvi-komento ei palauttanut tietoja.</translation>
</message>
+</context>
+<context>
+ <name>ProcessProgressDialog</name>
<message>
- <location filename="../src/i/MainWindow.cpp" line="444"/>
- <source>Save video as</source>
- <translation>Tallenna video nimellä</translation>
+ <location filename="../src/ProcProgDiag.cpp" line="50"/>
+ <source>Checking...</source>
+ <translation>Tarkastetaan...</translation>
</message>
<message>
- <location filename="../src/i/MainWindow.cpp" line="656"/>
- <source>Select URL (most recent first):</source>
- <translation>Valitse osoite (viimeisin ensimmäisenä):</translation>
+ <location filename="../src/ProcProgDiag.cpp" line="51"/>
+ <source>Fetching...</source>
+ <translation>Haetaan...</translation>
</message>
<message>
- <location filename="../src/i/MainWindow.cpp" line="683"/>
- <source>Address</source>
- <translation>Osoite</translation>
+ <location filename="../src/ProcProgDiag.cpp" line="52"/>
+ <source>Verifying...</source>
+ <translation>Todennetaan...</translation>
</message>
<message>
- <location filename="../src/i/MainWindow.cpp" line="683"/>
- <source>Video URL:</source>
- <translation>Video-osoite:</translation>
+ <location filename="../src/ProcProgDiag.cpp" line="105"/>
+ <source>Error while running command:<p>%1</p>Qt error message follows (code #%2):<p>%3</p></source>
+ <translation>Seuraavaa komentoa suorittaessa tapahtui virhe:<p>%1</p>Qt virhe (koodi #%2):<p>%3</p></translation>
</message>
<message>
- <location filename="../src/util.cpp" line="153"/>
- <source>English</source>
- <translation>Suomi</translation>
+ <location filename="../src/ProcProgDiag.cpp" line="155"/>
+ <source>Error while running command:<p>%1</p>quvi error message follows (code #%2):<p>%3</p></source>
+ <translation>Seuraavaa komentoa suorittaessa tapahtui virhe:<p>%1</p>quvi virhe (koodi #%2):<p>%3</p></translation>
</message>
</context>
<context>
- <name>Preferences</name>
+ <name>nn::NAboutDialog</name>
<message>
- <location filename="../i/Preferences.ui" line="14"/>
- <source>Preferences</source>
- <translation>Asetukset</translation>
+ <location filename="../src/about/naboutdialog.cpp" line="44"/>
+ <source><b>Version</b>:</source>
+ <translation><b>Versio</b>:</translation>
</message>
<message>
- <location filename="../i/Preferences.ui" line="24"/>
- <source>&Paths</source>
- <translation>&Polut</translation>
+ <location filename="../src/about/naboutdialog.cpp" line="55"/>
+ <source>&License</source>
+ <translation>&Lisenssi</translation>
</message>
<message>
- <location filename="../i/Preferences.ui" line="30"/>
- <source>&quvi:</source>
- <translation>&quvi:</translation>
+ <location filename="../src/about/naboutdialog.cpp" line="70"/>
+ <source>About</source>
+ <translation>Tietoja</translation>
</message>
+</context>
+<context>
+ <name>nn::NDetect</name>
<message>
- <location filename="../i/Preferences.ui" line="40"/>
- <location filename="../i/Preferences.ui" line="64"/>
- <location filename="../i/Preferences.ui" line="88"/>
- <location filename="../i/Preferences.ui" line="112"/>
- <source><replace with path and any additional options></source>
- <translation></translation>
+ <location filename="../src/detect/ndetect.cpp" line="140"/>
+ <source><b>Find media parser</b> ...</source>
+ <translation><b>Etsitään media-jäsennintä</b> ...</translation>
</message>
<message>
- <location filename="../i/Preferences.ui" line="47"/>
- <location filename="../i/Preferences.ui" line="318"/>
- <source>&Browse...</source>
- <translation>&Selaa...</translation>
+ <location filename="../src/detect/ndetect.cpp" line="148"/>
+ <source><b>Find media player</b> ...</source>
+ <translation><b>Etsitään media-toistinta</p> ...</translation>
</message>
<message>
- <location filename="../i/Preferences.ui" line="95"/>
- <source>Bro&wse...</source>
- <translation>Se&laa...</translation>
+ <location filename="../src/detect/ndetect.cpp" line="156"/>
+ <source><b>Find YouTube feed parser</b> ...</source>
+ <translation><b>Etsitään YouTube-yhteensopivaa syötelukijaa</b> ...</translation>
</message>
<message>
- <location filename="../i/Preferences.ui" line="119"/>
- <source>Brow&se...</source>
- <translation>Sel&aa...</translation>
+ <location filename="../src/detect/ndetect.cpp" line="164"/>
+ <source><b>Find downloader</b> ...</source>
+ <translation><b>Etsitään kopiointi-komentoa</b> ...</translation>
</message>
<message>
- <location filename="../i/Preferences.ui" line="71"/>
- <source>B&rowse...</source>
- <translation>S&elaa...</translation>
+ <location filename="../src/detect/ndetect.cpp" line="181"/>
+ <source>Check for %1 ...</source>
+ <translation>Tarkastetaan %1 ...</translation>
</message>
<message>
- <location filename="../i/Preferences.ui" line="136"/>
- <source><replace with video save directory path></source>
- <translation></translation>
+ <location filename="../src/detect/ndetect.cpp" line="206"/>
+ <source>no</source>
+ <translation>ei löytynyt</translation>
+ </message>
+</context>
+<context>
+ <name>nn::NDetectDialog</name>
+ <message>
+ <location filename="../src/detect/ndetectdialog.cpp" line="44"/>
+ <source>Detect first</source>
+ <translation>Etsi ensimmäinen</translation>
</message>
<message>
- <location filename="../i/Preferences.ui" line="151"/>
- <source>&Filename</source>
- <translation>&Tiedostonimi</translation>
+ <location filename="../src/detect/ndetectdialog.cpp" line="45"/>
+ <source>Detect all</source>
+ <translation>Etsi kaikki</translation>
</message>
<message>
- <location filename="../i/Preferences.ui" line="157"/>
- <source>F&ilename format:</source>
- <translation>T&iedostomuoto:</translation>
+ <location filename="../src/detect/ndetectdialog.cpp" line="59"/>
+ <source>Detection</source>
+ <translation>Etsi</translation>
</message>
<message>
- <location filename="../i/Preferences.ui" line="167"/>
- <source>%t.%s</source>
- <translation></translation>
+ <location filename="../src/detect/ndetectdialog.cpp" line="81"/>
+ <source> <b>Warning</b>: required command not found<br></source>
+ <translation><b>Varoitus:</b> tarvittua komentoa ei löytynyt<br></translation>
</message>
+</context>
+<context>
+ <name>nn::NFeedDialog</name>
<message>
- <location filename="../i/Preferences.ui" line="175"/>
- <location filename="../i/Preferences.ui" line="211"/>
- <location filename="../i/Preferences.ui" line="295"/>
- <source>Default</source>
- <translation>Oletusarvo</translation>
+ <location filename="../src/feed/nfeeddialog.cpp" line="48"/>
+ <source>&Properties</source>
+ <translation>O&minaisuudet</translation>
</message>
<message>
- <location filename="../i/Preferences.ui" line="180"/>
- <source>Title, ID, Suffix</source>
- <translation>Otsikko, tunnus, jälkiliite</translation>
+ <location filename="../src/feed/nfeeddialog.cpp" line="49"/>
+ <source>&Items</source>
+ <translation>&Syötteen sisältö</translation>
</message>
<message>
- <location filename="../i/Preferences.ui" line="185"/>
- <source>Title, ID, Host, Suffix</source>
- <translation>Otsikko, Tunnus, Sivusto, Jälkipääte</translation>
+ <location filename="../src/feed/nfeeddialog.cpp" line="68"/>
+ <source>YouTube feed</source>
+ <translation>YouTube-syöte</translation>
</message>
<message>
- <location filename="../i/Preferences.ui" line="54"/>
- <source>c&url:</source>
- <translation>cu&rl:</translation>
+ <location filename="../src/feed/nfeeddialog.cpp" line="85"/>
+ <source>Please read a feed</source>
+ <translation>Ole hyvä ja hae syöte</translation>
</message>
<message>
- <location filename="../i/Preferences.ui" line="78"/>
- <source>P&layer:</source>
- <translation>To&istin:</translation>
+ <location filename="../src/feed/nfeeddialog.cpp" line="90"/>
+ <source>Please select an item from the list</source>
+ <translation>Ole hyvä ja valitse kohde listasta</translation>
</message>
+</context>
+<context>
+ <name>nn::NFeedProgressDialog</name>
<message>
- <location filename="../i/Preferences.ui" line="102"/>
- <source>u&mph:</source>
- <translation></translation>
+ <location filename="../src/feed/nfeedprogressdialog.cpp" line="53"/>
+ <source>Working...</source>
+ <translation>Työskennellään...</translation>
</message>
<message>
- <location filename="../i/Preferences.ui" line="126"/>
- <source>S&ave videos:</source>
- <translation>Talle&nna hakemistoon:</translation>
+ <location filename="../src/feed/nfeedprogressdialog.cpp" line="79"/>
+ <source>Unexpected data from umph</source>
+ <translation>umph-komento ei palauttanut odotettuja tietoja</translation>
</message>
<message>
- <location filename="../i/Preferences.ui" line="143"/>
- <source>Brows&e...</source>
- <translation>&Valitse...</translation>
+ <location filename="../src/feed/nfeedprogressdialog.cpp" line="87"/>
+ <source>Uncaught exception at line %1: %2</source>
+ <translation>Tietoja lukiessa, rivillä %1: tapahtui virhe %2</translation>
+ </message>
+ <message>
+ <location filename="../src/feed/nfeedprogressdialog.cpp" line="96"/>
+ <source>umph did not return any video entries</source>
+ <translation>umph-komento ei palauttanut tietoja</translation>
+ </message>
+ <message>
+ <location filename="../src/feed/nfeedprogressdialog.cpp" line="121"/>
+ <source>Error while running command:<p>%1</p>Qt error message follows (code #%2):<p>%3</p></source>
+ <translation>Seuraavaa komentoa suoritettassa tapahtui virhe:<p>%1</p>Qt virhe (koodi #%2):<p>%3</p></translation>
</message>
<message>
- <location filename="../i/Preferences.ui" line="193"/>
- <source>Tit&le regexp:</source>
- <translation>Ot&sikko regexp:</translation>
+ <location filename="../src/feed/nfeedprogressdialog.cpp" line="147"/>
+ <source>Error while running command:<p>%1</p>Error message follows (code #%2):<p>%3</p></source>
+ <translation>Seuraavaa komentoa suoritettassa tapahtui virhe:<p>%1</p>Virhe (koodi #%2):<p>%3</p></translation>
+ </message>
+</context>
+<context>
+ <name>nn::NFeedProperties</name>
+ <message>
+ <location filename="../src/feed/nfeeddialog_properties.cpp" line="45"/>
+ <source>The start index parameter specifies the index of the first matching
+result that should be included in the result set. This parameter uses
+a one-based index, meaning the first result is 1, the second result
+is 2 and so forth.
+
+This parameter works in conjunction with the "max. results"
+parameter to determine which results to return. For example, to
+request the second set of 10 results, i.e. results 11-20, set the
+start index parameter to 11 and the max results parameter to 10.
+ -- YouTube Developer's Guide: Data API Protocol</source>
+ <translation></translation>
</message>
<message>
- <location filename="../i/Preferences.ui" line="203"/>
- <source>/(w|s)/g</source>
+ <location filename="../src/feed/nfeeddialog_properties.cpp" line="56"/>
+ <source>The max results parameter specifies the maximum number of
+results that should be included in the result set.
+
+This parameter works in conjunction with the start index parameter
+to determine which results to return. For example, to request the
+second set of 10 results, i.e. results 11-20, set the max results
+parameter to 10 and the start index parameter to 11.
+
+The default value of this parameter is 25, and the maximum value
+is 50. However, for displaying lists of videos, we recommend that
+you set the max results parameter to 10.
+ -- YouTube Developer's Guide: Data API Protocol</source>
<translation></translation>
</message>
<message>
- <location filename="../i/Preferences.ui" line="216"/>
- <source>Word characters only</source>
- <translatorcomment>Parempi käännös paikallaan</translatorcomment>
- <translation>Sana-tyyppiset kirjaimet</translation>
+ <location filename="../src/feed/nfeeddialog_properties.cpp" line="89"/>
+ <source>Uploads</source>
+ <translation>Lataukset</translation>
+ </message>
+ <message>
+ <location filename="../src/feed/nfeeddialog_properties.cpp" line="90"/>
+ <source>Favorites</source>
+ <translation>Suosikit</translation>
</message>
<message>
- <location filename="../i/Preferences.ui" line="221"/>
- <source>Digit characters only</source>
- <translatorcomment>Parempi käännös paikallaan</translatorcomment>
- <translation>Numero-tyyppiset kirjaimet</translation>
+ <location filename="../src/feed/nfeeddialog_properties.cpp" line="91"/>
+ <source>Playlist</source>
+ <translation>Soittolista</translation>
</message>
<message>
- <location filename="../i/Preferences.ui" line="226"/>
- <source>Non-word characters only</source>
- <translatorcomment>Parempi käännös paikallaan</translatorcomment>
- <translation>Poislukien sana-tyyppiset kirjaimet</translation>
+ <location filename="../src/feed/nfeeddialog_properties.cpp" line="98"/>
+ <source>YouTube username or playlist ID depending on your selection</source>
+ <translation>YouTube käyttäjätunnus tai soittolistan tunnus</translation>
</message>
<message>
- <location filename="../i/Preferences.ui" line="231"/>
- <source>Non-digit characters only</source>
- <translatorcomment>Parempi käännös paikallaan</translatorcomment>
- <translation>Poislukien numero-tyyppiset kirjaimet</translation>
+ <location filename="../src/feed/nfeeddialog_properties.cpp" line="107"/>
+ <source>&Get the entire feed</source>
+ <translation>&Hae kaikki</translation>
</message>
<message>
- <location filename="../i/Preferences.ui" line="236"/>
- <source>Non-whitespace characters only</source>
- <translation>Poislukien tyhjät merkit</translation>
+ <location filename="../src/feed/nfeeddialog_properties.cpp" line="109"/>
+ <source>G&et the specified range from the feed</source>
+ <translation>H&ae seuraavat</translation>
</message>
<message>
- <location filename="../i/Preferences.ui" line="244"/>
- <source>Preview:</source>
- <translation>Esikatselu:</translation>
+ <location filename="../src/feed/nfeeddialog_properties.cpp" line="113"/>
+ <source>Please install umph 0.2.0 or later to enable</source>
+ <translation>Asenna umph 0.2.0 tai uudempi versio</translation>
</message>
<message>
- <location filename="../i/Preferences.ui" line="261"/>
- <source>&Refresh</source>
- <translation>Päi&vitä</translation>
+ <location filename="../src/feed/nfeeddialog_properties.cpp" line="128"/>
+ <source>St&art index:</source>
+ <translation>A&loita hakemiston kohdasta:</translation>
</message>
<message>
- <location filename="../i/Preferences.ui" line="282"/>
- <source>Appeara&nce</source>
- <translation>&Ulkoasu</translation>
+ <location filename="../src/feed/nfeeddialog_properties.cpp" line="138"/>
+ <source>&Max. results:</source>
+ <translation>&Enimmäismäärä:</translation>
</message>
<message>
- <location filename="../i/Preferences.ui" line="288"/>
- <source>Program Icon</source>
- <translation>Ohjelma-kuvake</translation>
+ <location filename="../src/feed/nfeeddialog_properties.cpp" line="148"/>
+ <source>Select range</source>
+ <translation>Valitse raja-alue</translation>
</message>
<message>
- <location filename="../i/Preferences.ui" line="300"/>
- <source>Custom</source>
- <translation>Käyttäjän</translation>
+ <location filename="../src/feed/nfeeddialog_properties.cpp" line="192"/>
+ <source>I&D</source>
+ <translation>&tunnus</translation>
</message>
<message>
- <location filename="../i/Preferences.ui" line="329"/>
- <source>Op&tions</source>
- <translation>Asetu&kset</translation>
+ <location filename="../src/feed/nfeeddialog_properties.cpp" line="192"/>
+ <source>for &user</source>
+ <translation>&käyttäjälle</translation>
</message>
<message>
- <location filename="../i/Preferences.ui" line="337"/>
- <source>&Minimize when download starts</source>
- <translation>P&ienennä ikkuna kopioinnin käynnistyessä</translation>
+ <location filename="../src/feed/nfeeddialog_properties.cpp" line="201"/>
+ <source>Please enter %1</source>
+ <translation>Syötä %1</translation>
</message>
+</context>
+<context>
+ <name>nn::NLang</name>
<message>
- <location filename="../i/Preferences.ui" line="344"/>
- <source>M&inimize to system tray</source>
- <translation>Pi&enennä ikkuna järjestelmäpalkkiin</translation>
+ <location filename="../src/lang/nlang.cpp" line="207"/>
+ <source>Select language</source>
+ <translation>Valitse kieli</translation>
</message>
<message>
- <location filename="../i/Preferences.ui" line="351"/>
- <source>Pl&ay video when done downloading</source>
- <translation>Toist&a kopioitu video</translation>
+ <location filename="../src/lang/nlang.cpp" line="208"/>
+ <source>Language:</source>
+ <translation>Kieli:</translation>
+ </message>
+</context>
+<context>
+ <name>nn::NLicenseDialog</name>
+ <message>
+ <location filename="../src/about/naboutdialog.cpp" line="105"/>
+ <source>License</source>
+ <translation>Lisenssi</translation>
</message>
+</context>
+<context>
+ <name>nn::NSettingsAppearance</name>
<message>
- <location filename="../i/Preferences.ui" line="358"/>
- <source>&Stay on top</source>
- <translation>P&ysy muiden ikkunoiden yläpuolella</translation>
+ <location filename="../src/settings/nsettingsdialog_options_appearance.cpp" line="49"/>
+ <source>Application:</source>
+ <translation>Ohjelma:</translation>
</message>
<message>
- <location filename="../i/Preferences.ui" line="365"/>
- <source>S&how reminder when NomNom starts</source>
- <translation>&Näytä muistutukset ohjelman käynnistyessä</translation>
+ <location filename="../src/settings/nsettingsdialog_options_appearance.cpp" line="50"/>
+ <source>Busy:</source>
+ <translation>Työskentelee:</translation>
</message>
<message>
- <location filename="../i/Preferences.ui" line="372"/>
- <source>&Do not prompt for filename</source>
- <translation>Ãlä kysy tallennetta&van tiedoston nimeä</translation>
+ <location filename="../src/settings/nsettingsdialog_options_appearance.cpp" line="51"/>
+ <source>Error:</source>
+ <translation>Virhe:</translation>
</message>
<message>
- <location filename="../i/Preferences.ui" line="383"/>
- <source>Cl&ear recent</source>
- <translation>Poi&sta aiemmat osoitteet</translation>
+ <location filename="../src/settings/nsettingsdialog_options_appearance.cpp" line="53"/>
+ <source>Icons</source>
+ <translation>Kuvakkeet</translation>
</message>
<message>
- <location filename="../i/Preferences.ui" line="401"/>
- <source>Config:</source>
- <translation>Asetukset:</translation>
+ <location filename="../src/settings/nsettingsdialog_options_appearance.cpp" line="71"/>
+ <source>Language</source>
+ <translation>Kieli</translation>
</message>
<message>
- <location filename="../i/Preferences.ui" line="390"/>
- <source>&Language...</source>
- <translation>Kie&li...</translation>
+ <location filename="../src/settings/nsettingsdialog_options_appearance.cpp" line="95"/>
+ <source>Leave empty for application default</source>
+ <translation>Ohjelman vakio-kuvake: jätä kenttä tyhjäksi</translation>
</message>
<message>
- <location filename="../src/i/Preferences.cpp" line="188"/>
- <source>Open directory</source>
- <translation>Avaa hakemisto</translation>
+ <location filename="../src/settings/nsettingsdialog_options_appearance.cpp" line="101"/>
+ <source>Clear</source>
+ <translation>Tyhjennä</translation>
</message>
<message>
- <location filename="../src/i/Preferences.cpp" line="281"/>
+ <location filename="../src/settings/nsettingsdialog_options_appearance.cpp" line="146"/>
<source>Images</source>
- <translation>Kuvatiedostot</translation>
+ <translation>Kuvat</translation>
</message>
<message>
- <location filename="../src/i/Preferences.cpp" line="344"/>
- <source>The language will be changed after you restart NomNom. Restart NomNom?</source>
- <translation>Uusi kieli tulee voimaan ohjelman uudelleen käynnistyessä. Käynnistä ohjelma uudelleen?</translation>
+ <location filename="../src/settings/nsettingsdialog_options_appearance.cpp" line="163"/>
+ <source>Open image</source>
+ <translation>Avaa kuva</translation>
</message>
</context>
<context>
- <name>QObject</name>
+ <name>nn::NSettingsBehaviour</name>
<message>
- <location filename="../src/util.cpp" line="207"/>
- <source>Select language</source>
- <translation>Valitse kieli</translation>
+ <location filename="../src/settings/nsettingsdialog_options_behaviour.cpp" line="54"/>
+ <source>&Keep application window on top</source>
+ <translation>&Pidä ohjelman ikkuna ylimmäisenä</translation>
</message>
<message>
- <location filename="../src/util.cpp" line="208"/>
- <source>Language:</source>
- <translation>Kieli:</translation>
+ <location filename="../src/settings/nsettingsdialog_options_behaviour.cpp" line="57"/>
+ <source>Pla&y media when done downloading</source>
+ <translation>Toi&sta tiedosto kopioinnin päätyttyä</translation>
</message>
<message>
- <location filename="../src/util.cpp" line="273"/>
- <location filename="../src/util.cpp" line="307"/>
- <source>error: %1: %2</source>
- <translation>virhe: %1 %2</translation>
+ <location filename="../src/settings/nsettingsdialog_options_behaviour.cpp" line="60"/>
+ <source>A&sk where to save media</source>
+ <translation>Va&litse nimi tallennettavalle tiedostolle kopioinnin alkaessa</translation>
</message>
<message>
- <location filename="../src/util.cpp" line="369"/>
- <source>Expected Perl-style regular expression, e.g. /pattern/flags</source>
- <translation>Käytä Perl-tyylistä regular expression rakennetta, esim. /pattern/flags</translation>
+ <location filename="../src/settings/nsettingsdialog_options_behaviour.cpp" line="63"/>
+ <source>C&lear record of visited URLs at exit</source>
+ <translation>Unoh&da aiemmat osoitteet ohjelman sulkeutuessa</translation>
</message>
<message>
- <location filename="../src/util.cpp" line="438"/>
- <source>The process failed to start. Either the invoked program is missing, or you may have insufficient permissions to invoke the program.</source>
- <translation>Komennon suorittaminen epäonnistui. Tarkasta ohjelman polku ja käyttöoikeudet ohjelmaan.</translation>
+ <location filename="../src/settings/nsettingsdialog_options_behaviour.cpp" line="66"/>
+ <source>Al&ways replace existing media</source>
+ <translation>&Korvaa aiempi tiedosto kopioinnin alkaessa</translation>
</message>
+</context>
+<context>
+ <name>nn::NSettingsCommands</name>
<message>
- <location filename="../src/util.cpp" line="446"/>
- <source>The process crashed some time after starting successfully.</source>
- <translation>Ohjelman suoritus keskeytyi sen käynnistämisen jälkeen.</translation>
+ <location filename="../src/settings/nsettingsdialog_commands.cpp" line="108"/>
+ <source>Recommended value: "%1"</source>
+ <translation>Suositus: "%1"</translation>
</message>
<message>
- <location filename="../src/util.cpp" line="452"/>
- <source>The last waitFor...() function timed out. The state of QProcess is unchanged, and you can try calling waitFor...() again.</source>
- <translation></translation>
+ <location filename="../src/settings/nsettingsdialog_commands.cpp" line="111"/>
+ <source> %f .. Path to downloaded media file</source>
+ <translation> %f .. Polku kopioituun tiedostoon</translation>
</message>
<message>
- <location filename="../src/util.cpp" line="460"/>
- <source>An error occurred when attempting to write to the process. For example, the process may not be running, or it may have closed its input channel.</source>
- <translation></translation>
+ <location filename="../src/settings/nsettingsdialog_commands.cpp" line="114"/>
+ <source> %u .. Media page URL</source>
+ <translation> %u .. Osoite</translation>
</message>
<message>
- <location filename="../src/util.cpp" line="468"/>
- <source>An error occurred when attempting to read from the process. For example, the process may not be running.</source>
- <translation></translation>
+ <location filename="../src/settings/nsettingsdialog_commands.cpp" line="117"/>
+ <source> %m .. Media stream URL or path to downloaded media file</source>
+ <translation> %m .. Internet-osoite tai polku kopioituun tiedostoon</translation>
</message>
<message>
- <location filename="../src/util.cpp" line="476"/>
- <source>An unknown error occurred. This is the default return value of error().</source>
- <translation></translation>
+ <location filename="../src/settings/nsettingsdialog_commands.cpp" line="143"/>
+ <source>Pa&rse media stream URLs using</source>
+ <translation>&Jäsentele komennolla</translation>
</message>
<message>
- <location filename="../src/util.cpp" line="503"/>
- <source>Choose video</source>
- <translation>Valitse video</translation>
+ <location filename="../src/settings/nsettingsdialog_commands.cpp" line="155"/>
+ <source>Do&wnload using</source>
+ <translation>&Kopioi komennolla</translation>
</message>
<message>
- <location filename="../src/util.cpp" line="504"/>
- <source>Video</source>
- <translation></translation>
+ <location filename="../src/settings/nsettingsdialog_commands.cpp" line="167"/>
+ <source>Pl&ay using</source>
+ <translation>&Toista komennolla</translation>
+ </message>
+ <message>
+ <location filename="../src/settings/nsettingsdialog_commands.cpp" line="179"/>
+ <source>Read &YouTube feeds using</source>
+ <translation>&Lue YouTube-syötteitä komennolla</translation>
</message>
<message>
- <location filename="../src/main.cpp" line="85"/>
- <source>English</source>
- <extracomment>"English" is the default language. This string is not intended to be translated.</extracomment>
- <translation>Suomi</translation>
+ <location filename="../src/settings/nsettingsdialog_commands.cpp" line="208"/>
+ <source>Please enter a custom command</source>
+ <translation>Syötä oma komento</translation>
</message>
<message>
- <location filename="../src/i/Preferences.cpp" line="140"/>
- <source>Browse</source>
- <translation>Selaa</translation>
+ <location filename="../src/settings/nsettingsdialog_commands.cpp" line="53"/>
+ <location filename="../src/settings/nsettingsdialog_commands.cpp" line="205"/>
+ <location filename="../src/settings/nsettingsdialog_commands.cpp" line="239"/>
+ <location filename="../src/settings/nsettingsdialog_commands.cpp" line="277"/>
+ <location filename="../src/settings/nsettingsdialog_commands.cpp" line="324"/>
+ <location filename="../src/settings/nsettingsdialog_commands.cpp" line="329"/>
+ <location filename="../src/settings/nsettingsdialog_commands.cpp" line="334"/>
+ <location filename="../src/settings/nsettingsdialog_commands.cpp" line="339"/>
+ <source>Other</source>
+ <translation>Oma</translation>
</message>
</context>
<context>
- <name>Reminder</name>
+ <name>nn::NSettingsDialog</name>
<message>
- <location filename="../i/Reminder.ui" line="14"/>
- <source>Reminder</source>
- <translation>Muistutus</translation>
+ <location filename="../src/settings/nsettingsdialog.cpp" line="41"/>
+ <source>Op&tions</source>
+ <translation>&Vaihtoehdot</translation>
</message>
<message>
- <location filename="../i/Reminder.ui" line="23"/>
- <source>&Show this dialog again when Nomnom starts</source>
- <translation>&Näytä tämä ikkuna myöhemmin uudelleen ohjelman käynnistyessä</translation>
+ <location filename="../src/settings/nsettingsdialog.cpp" line="42"/>
+ <source>Co&mmands</source>
+ <translation>Ko&mennot</translation>
</message>
<message>
- <location filename="../i/Reminder.ui" line="35"/>
- <source>&Next</source>
- <translation>&Seuraava</translation>
+ <location filename="../src/settings/nsettingsdialog.cpp" line="43"/>
+ <source>&Download</source>
+ <translation>Kop&iointi</translation>
</message>
-</context>
-<context>
- <name>Tips</name>
<message>
- <location filename="../src/tips.cpp" line="31"/>
- <source><p>Looks like you are running NomNom for the first time.</p><p>Please make sure you have installed quvi(1) and curl(1) commands to your system. You will also need a streaming capable media player, e.g. vlc(1).</p><p>Open the Preferences (Ctrl+E) and check that the paths to these commands have been specified correctly. NomNom will need these commands to work properly.</p></source>
- <translation><p>Ohjelmaa suoritetaan ensimmäistä kertaa.</p><p>Ole hyvä ja avaa ohjelman asetukset (Ctrl+E), ja varmista, että polut quv(1)i- ja curl(1) -komentoihin ovat määritelty oikein.<p>Tarkasta myös, että polku suoratoistoon kykenevään media-toistimeen on määritely oikein. Voit käyttää esimerkiksi vlc-ohjelmaa tähän tarkoitukseen.</p></translation>
+ <location filename="../src/settings/nsettingsdialog.cpp" line="45"/>
+ <source>&Proxy</source>
+ <translation>&Välityspalvelin</translation>
</message>
<message>
- <location filename="../src/tips.cpp" line="40"/>
- <source>Right-click opens the context-menu.</source>
- <translation>Hiiren oikeanpuolimmainen painallus ikkunaan avaa ohjelma-valikon.</translation>
+ <location filename="../src/settings/nsettingsdialog.cpp" line="65"/>
+ <source>Settings</source>
+ <translation>Asetukset</translation>
</message>
+</context>
+<context>
+ <name>nn::NSettingsDownload</name>
<message>
- <location filename="../src/tips.cpp" line="43"/>
- <source>You can drag and drop video page URLs onto the window to start the download (or streaming).</source>
- <translation>Voit pudottaa video linkkejä suoraan ohjelman ikkunaan aloittaaksesi kopioinnin (tai suoratoiston).</translation>
+ <location filename="../src/settings/nsettingsdialog_download.cpp" line="51"/>
+ <source>Save downloaded media as</source>
+ <translation>Tallenna nimellä</translation>
</message>
<message>
- <location filename="../src/tips.cpp" line="47"/>
- <source>You can make NomNom "hover" over the other windows. Check the "Stay on top" in the Preferences.</source>
- <translation>Voit asettaa ohjelman pysymään muiden ikkunoiden yläpuolella. Varmista, että "Pysy muiden ikkunoiden yläpuolella&q...
[truncated message content] |
|
From: <nom...@li...> - 2011-10-20 10:25:25
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project nomnom.git.
The branch, next has been updated
via a4fab836e2d4e6d6e0d38531b5565b0d9cc6cfa4 (commit)
via 8d39a7458a32aa48c17ce4a52737fd1e16240f42 (commit)
from 14a98bd7a4952326f87cd1e43bef604c80f13acb (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://repo.or.cz/w/nomnom.git/commit/a4fab836e2d4e6d6e0d38531b5565b0d9cc6cfa4
commit a4fab836e2d4e6d6e0d38531b5565b0d9cc6cfa4
Author: Toni Gundogdu <le...@gm...>
Date: Wed Oct 19 23:21:14 2011 +0300
Add accelerator note to HowtoTranslate.txt
diff --git a/doc/HowtoTranslate.txt b/doc/HowtoTranslate.txt
index 76d2ada..4bfc7ae 100644
--- a/doc/HowtoTranslate.txt
+++ b/doc/HowtoTranslate.txt
@@ -46,6 +46,16 @@ locale is set to the appropriate value, e.g.:
env LANG=de_DE.UTF-8 ./src/nomnom
+
+Key accelerators
+----------------
+
+Please make sure you set accelerators so that they are not in conflict
+with one another. For example, instead of two widgets using the same
+(e.g. Alt+F) use a different combination for the other so that they
+do not interfere with one another.
+
+
Untranslatable strings
----------------------
http://repo.or.cz/w/nomnom.git/commit/8d39a7458a32aa48c17ce4a52737fd1e16240f42
commit 8d39a7458a32aa48c17ce4a52737fd1e16240f42
Author: Toni Gundogdu <le...@gm...>
Date: Wed Oct 19 23:15:04 2011 +0300
Add --locale option
diff --git a/src/main.cpp b/src/main.cpp
index d1c14e3..88d9360 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -69,7 +69,7 @@ static void first_run(QSettings& s)
settings.write();
}
-static bool config_path(const QSettings& s)
+static bool print_config_path(const QSettings& s)
{
std::clog << qPrintable(s.fileName()) << std::endl;
return true;
@@ -82,7 +82,7 @@ static void print_nresult(const nn::detect::NResult& r)
<< std::endl;
}
-static void dump_nresults(const nn::DetectType n, const QString& s)
+static void print_nresults(const nn::DetectType n, const QString& s)
{
nn::detect::NResultList l;
nn::detect::find(n, l);
@@ -93,21 +93,31 @@ static void dump_nresults(const nn::DetectType n, const QString& s)
}
}
-static bool detect_cmds()
+static bool print_cmds()
{
std::clog << "Detect commands from $PATH..." << std::endl;
- dump_nresults(MediaParser, "Media parsers:");
- dump_nresults(MediaPlayer, "Media players:");
- dump_nresults(FeedParser, "Feed parsers:");
- dump_nresults(Downloader, "Downloaders:");
+ print_nresults(MediaParser, "Media parsers:");
+ print_nresults(MediaPlayer, "Media players:");
+ print_nresults(FeedParser, "Feed parsers:");
+ print_nresults(Downloader, "Downloaders:");
}
-static bool version()
+static bool print_locale()
+{
+ std::clog
+ << "System locale:n "
+ << qPrintable(QLocale::system().name())
+ << "nQt translations:n "
+ << qPrintable(QLibraryInfo::location(QLibraryInfo::TranslationsPath))
+ << std::endl;
+}
+
+static bool print_version()
{
std::clog << PACKAGE_VERSION << std::endl;
}
-static bool help()
+static bool print_help()
{
const QString arg0 = QCoreApplication::arguments()[0];
std::clog
@@ -118,6 +128,7 @@ static bool help()
#ifdef ENABLE_VERBOSE
<< " --verbose Turn on verbose outputn"
#endif
+ << " --locale Print system locale (as returned by Qt) and exitn"
<< " --version Print version and exitn"
<< " --help Print help and exit"
<< std::endl;
@@ -134,17 +145,19 @@ static bool parse_args(const QSettings& qs)
foreach (const QString s, args)
{
if (s == "--config-path")
- return config_path(qs);
+ return print_config_path(qs);
else if (s == "--detect")
- return detect_cmds();
+ return print_cmds();
#ifdef ENABLE_VERBOSE
else if (s == "--verbose")
verbose = true;
#endif
+ else if (s == "--locale")
+ return print_locale();
else if (s == "--version")
- return version();
+ return print_version();
else if (s == "--help")
- return help();
+ return print_help();
else
{
std::clog << "error: invalid option: " << qPrintable(s) << std::endl;
-----------------------------------------------------------------------
Summary of changes:
doc/HowtoTranslate.txt | 10 ++++++++++
src/main.cpp | 39 ++++++++++++++++++++++++++-------------
2 files changed, 36 insertions(+), 13 deletions(-)
repo.or.cz automatic notification. Contact project admin le...@gm...
if you want to unsubscribe, or site admin ad...@re... if you receive
no reply.
--
nomnom.git ("The graphical media download tool")
|
|
From: <nom...@li...> - 2011-10-18 19:37:57
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project nomnom.git.
The branch, next has been updated
via 14a98bd7a4952326f87cd1e43bef604c80f13acb (commit)
via eb79a0bf54183a26643bfd5f22214571c5a3bb8d (commit)
via 2e880672b0504c69ecbc07fda2fc6cd50e60813c (commit)
via d2271c269575875486870739ee01510d8c663e94 (commit)
from 06d0b4255af50242e5be797e357cb36345cc7648 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://repo.or.cz/w/nomnom.git/commit/14a98bd7a4952326f87cd1e43bef604c80f13acb
commit 14a98bd7a4952326f87cd1e43bef604c80f13acb
Author: Toni Gundogdu <le...@gm...>
Date: Tue Oct 18 22:22:47 2011 +0300
Revise README.packagers
diff --git a/README.packagers b/README.packagers
index cbe0805..59be41d 100644
--- a/README.packagers
+++ b/README.packagers
@@ -2,15 +2,46 @@
PACKAGERS
=========
-Please consider packaging a preconfigured system wide configuration file
-with nomnom. See "examples/NomNom.conf" for an example of this.
+Prerequisites
+-------------
-nomnom will set the default values (e.g. paths to commands) which may
-not always be correct which is why installing a preconfigured configuration
-file with nomnom is recommended.
+Make sure you read the INSTALL file for the application prerequisites.
-You could also run nomnom, edit the preferences and then reuse the
-configuration file in your package. You can see the path to the config
-file in the Preferences / Other.
-Please see also the manual page notes.
+System wide configuration file
+------------------------------
+
+You can distribute 0.2 without a system wide configuration file.
+
+NomNom was, until 0.2, a tedious application to configure -- which is
+why installing a system wide config file with predefined values was
+previously a recommended step.
+
+You may still do this, if you like. Refer to the Qt documentation
+(look up QSettings) for the typical search paths, e.g. on Unix-like
+systems:
+
+ /etc/xdg/NomNom/NomNom.conf
+ /etc/xdg/NomNom.conf
+ /etc/NomNom.conf
+
+Keep in mind, however, that the "system wide config values" are nothing
+more than recommendations as the users may override them (in settings) at
+anytime.
+
+Example (/etc/NomNom.conf):
+
+ [Settings]
+ ParseUsing=other:
+ ParseUsingOther=/foo/bar^-f -b %u
+
+Make a note of the use of "other". This would make "/foo/bar" to be
+used as the default value for "Parse using" command. The command line
+arguments follow after the "^".
+
+Full list of the supported variables, can be found in:
+
+ $top_srcdir/src/settings/nsettings.cpp
+
+Or take a look at your local user config. Run "nomnom --config-path"
+to find the path to it.
http://repo.or.cz/w/nomnom.git/commit/eb79a0bf54183a26643bfd5f22214571c5a3bb8d
commit eb79a0bf54183a26643bfd5f22214571c5a3bb8d
Author: Toni Gundogdu <le...@gm...>
Date: Tue Oct 18 22:13:09 2011 +0300
Revise INSTALL
diff --git a/INSTALL b/INSTALL
index c3a352a..58408ca 100644
--- a/INSTALL
+++ b/INSTALL
@@ -3,15 +3,12 @@
Prerequisites
=============
-* quvi (0.2.16.1+) <http://quvi.googlecode.com/>
+* quvi (0.2.16.1+) <http://quvi.sourceforge.net/>
* umph (0.1.6+) <http://umph.googlecode.com/>
* curl (7.20.0+) <http://curl.haxx.se/>
* qt (4.6+) <http://qt.nokia.com/>
* media player that supports streaming (e.g. vlc, mplayer)
-Note that nomnom may or may not compile with earlier versions.
-The above versions are the ones that I've tested.
-
Installation from source
========================
@@ -20,7 +17,12 @@ Installation from source
If you are compiling nomnom from the development code from the git
repository, see "Installation from development code", instead.
- --without-manual Do not install manual page(s)
+ --enable-verbose Enable --verbose program option
+ If enabled, the program can use --verbose to
+ turn on verbose output to stderr. Recommended
+ for debugging purposes only.
+
+ --without-manual Do not install manual pages
Installation from development code
@@ -34,5 +36,5 @@ repository. You will need:
* GNU autoconf
* GNU automake
-Once the files have been generated, follow the instructions in "Installation
+Once the files have been generated, follow the instructions of "Installation
from source" above.
http://repo.or.cz/w/nomnom.git/commit/2e880672b0504c69ecbc07fda2fc6cd50e60813c
commit 2e880672b0504c69ecbc07fda2fc6cd50e60813c
Author: Toni Gundogdu <le...@gm...>
Date: Tue Oct 18 20:20:38 2011 +0300
Revise README
diff --git a/README b/README
index 1dd32d2..f3c5785 100644
--- a/README
+++ b/README
@@ -1,20 +1,7 @@
-
-NomNom
-===========
-
NomNom is an application for downloading media from Youtube and other similar
media websites that require flash to view the media content. Media streaming
-or downloading can be started simply by dropping an URL onto the application
-window.
-
-NomNom relies on a number of different other programs: quvi(1) to parse the
-media links, curl(1) to download the media, and a media streaming capable
-player software, such as vlc(1), to stream the media. NomNom is written in
-C++ to use the Qt framework.
-
-The name of the application refers to the sound effect that is made when
-eating something tasty or nutritious.
+or downloading can be started by dropping an URL onto the application window.
Home : <http://nomnom.sourceforge.net/>
gitweb: <http://repo.or.cz/w/nomnom.git>
http://repo.or.cz/w/nomnom.git/commit/d2271c269575875486870739ee01510d8c663e94
commit d2271c269575875486870739ee01510d8c663e94
Author: Toni Gundogdu <le...@gm...>
Date: Tue Oct 18 19:39:09 2011 +0300
Revise manual
diff --git a/doc/man1/nomnom.1.pod b/doc/man1/nomnom.1.pod
index ea0ea9e..acf6716 100644
--- a/doc/man1/nomnom.1.pod
+++ b/doc/man1/nomnom.1.pod
@@ -9,59 +9,149 @@ NomNom - The graphical media download tool
NomNom is an application for downloading media from Youtube and other similar
media websites that require flash to view the media content. Media streaming
-or downloading can be started simply by dropping an URL onto the application
-window.
+or downloading can be started by dropping an URL onto the application window.
-NomNom relies on a number of different other programs: C<quvi(1)> to parse
-the media links, C<curl(1)> to download the media, and a media streaming
-capable player software, such as C<vlc(1)>, to stream the media. NomNom is
-written in C++ to use the Qt framework.
+=head2 Project name
The name of the application refers to the sound effect that is made when
eating something tasty or nutritious.
=head1 GETTING STARTED
- * Right-click on the window to open the context-menu
+=head2 Right-click opens the context-menu
- * Check the configuration (Preferences, Ctrl+E)
+Most the application features can be accessed via this menu.
- - Check the paths to quvi(1), curl(1) and player (e.g. vlc(1))
+=head2 Check the settings (Ctrl+E)
- The default values should work on most systems out of the box.
- Make any changes you see necessary.
+NomNom will attempt to detect the available commands when you run it the
+first time. Going over the settings before use is recommended. The
+dialog will not close (by clicking OK) unless you have entered
+everything needed.
- * Drag and drop media page URLs from, for example, your web browser.
- This starts the download (or streaming if selected).
+=head2 Check that NomNom is set to do what you expect
- * You can make NomNom stay on top of other windows (Preferences / Other).
- This will make it easier to use NomNom if you have limited screen space.
+Make a note of the combobox widget on the main window. You may choose to
+either C<Download> or C<Stream> from the widget.
- * Nomnom resumes file transfers by default (determined by the curl command
- in the Preferences). Check "Overwrite" in the context menu if you want to
- overwrite the existing files.
+=head2 Drop media page URLs to main window
-=head1 FILES
+You could, for example, have a web browser open from which you then drag
+the URLs onto the main window of NomNom. Alternatively, open the
+right-click context-menu and choose C<Address...>.
+
+You may also consider making sure that NomNom stays on top of other
+windows if you are working on a small screen. There is an option for
+this in the application settings.
+
+=head2 NomNom defaults to resume interrupted transfers
+
+See also the L</KNOWN ISSUES> for more about this. You can also choose
+to overwrite any existing media files if you'd prefer this.
+
+=head2 You can grab media page URLs from YouTube feeds
+
+Choose C<Feed...> from the context-menu or hit the key-shortcut (Ctrl+F)
+to open the dialog.
+
+=head1 COMMAND LINE
+
+NomNom supports the following command line options.
+
+=head2 --config-path
+
+Prints the path to the local user config file and exits.
+
+=head2 --detect
+
+Prints the detected commands and exits.
+
+=head2 --verbose
+
+Turns on verbose output. Please make a note that NomNom must be
+configured and built with the C<--enable-verbose> switch for this to be
+available in the application.
+
+=head2 --help
+
+Prints the help and exits.
+
+=head2 --version
+
+Prints the version and exits.
+
+=head1 GLOSSARY
+
+=head2 Media page URL
-=over 4
+NomNom feasts on media page URLs. You can drop these URLs to the
+main window to start the process of downloading (or streaming).
-=item Application settings
+These URLs are known to go around also as C<video page URLs>.
-The location where the application settings are depends on the platform.
-Open the Preferences dialog to see the path to the config file. On a
-typical Unix-like system, the path is typically one of the following:
+=head3 Example
- ~/.config/NomNom/NomNom.conf
- /etc/xdg/NomNom/NomNom.conf
- /etc/xdg/NomNom.conf
- /etc/NomNom.conf
+http://vimeo.com/1485507
+
+=head2 Media stream URL
+
+Not to be confused with L</Media page URL>. The media I<stream> URL is
+the URL to the media resource that is returned by the C<quvi(1)>
+command and then used by NomNom to either download or stream from it.
+
+=head2 YouTube feeds
+
+NomNom can read, with the help of C<umph(1)> command, and grab media
+URLs from YouTube feeds. These feeds may be I<playlists>, user
+I<favorites> and user I<uploads>.
+
+You can open the user-interface by selecting it from the right-click
+context-menu (C<Feed...>) or by hitting the key-shortcut (Ctrl+F).
+
+=head2 YouTube format strings
+
+The YouTube C<fmtNN> string IDs are documented at:
+ http://en.wikipedia.org/wiki/YouTube#Quality_and_codecs
+
+=head1 KNOWN ISSUES
+
+=head2 Resuming partially transferred files may fail
+
+Some websites are known to refuse to work with the HTTP requests to
+resume a file transfer. Either check "Always overwrite existing media
+files" in the settings or remove the existing file manually.
+
+=head2 Using of HTTP proxies
+
+If you use an HTTP proxy, please make sure you have configured all of
+the commands that NomNom uses (see C<settings> and open C<commands>) to
+use the same proxy. Some websites refuse to work with requests coming
+from different sources (IP addresses) trying to access the same
+media stream URL which is may be unique to an IP address.
+
+=head1 TIPS
+
+=head2 Use configuration files
+
+Although it is possible to configure custom commands for NomNom to use
+(via C<settings> and C<commands>), another way is to add appropriate
+configuration files for the commands that NomNom uses.
+
+=head3 Examples
+
+ ~/.quvirc ;# refer to the quvi(1) documentation
+ ~/.umphrc ;# refer to the umph(1) documentation
+ ~/.curlrc ;# refer to the curl(1) documentation
+
+Same goes for whatever media player you choose to use.
+
+=head1 FILES
-NomNom uses the QSettings class to save the application settings, please
-see the following links for the technical details:
- <http://doc.trolltech.com/4.7/qsettings.html>
- <http://doc.trolltech.com/4.7/qsettings.html#platform-specific-notes>
+=head2 Configuration file
-=back
+The location of this file may vary and depends on how Qt was configured.
+You can use the C<--config-path> program option to print it, if you are
+not sure. See also L</COMMAND LINE>.
=head1 LICENSE
-----------------------------------------------------------------------
Summary of changes:
INSTALL | 14 +++--
README | 15 +-----
README.packagers | 49 +++++++++++++---
doc/man1/nomnom.1.pod | 156 ++++++++++++++++++++++++++++++++++++++----------
4 files changed, 172 insertions(+), 62 deletions(-)
repo.or.cz automatic notification. Contact project admin le...@gm...
if you want to unsubscribe, or site admin ad...@re... if you receive
no reply.
--
nomnom.git ("The graphical media download tool")
|
|
From: <nom...@li...> - 2011-10-18 16:02:34
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project nomnom.git.
The branch, next has been updated
via 06d0b4255af50242e5be797e357cb36345cc7648 (commit)
from f941c926238e52a7b704187510769f8a7d91f11f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://repo.or.cz/w/nomnom.git/commit/06d0b4255af50242e5be797e357cb36345cc7648
commit 06d0b4255af50242e5be797e357cb36345cc7648
Author: Toni Gundogdu <le...@gm...>
Date: Tue Oct 18 18:33:54 2011 +0300
Add StartupNotify to .desktop file
diff --git a/nomnom.desktop.in b/nomnom.desktop.in
index 7ad3d60..1b4b9e8 100644
--- a/nomnom.desktop.in
+++ b/nomnom.desktop.in
@@ -5,5 +5,6 @@ Exec=@prefix@/bin/nomnom
Icon=nomnom.xpm
Type=Application
Terminal=false
+StartupNotify=true
Categories=Network;AudioVideo;
Version=@VERSION@
-----------------------------------------------------------------------
Summary of changes:
nomnom.desktop.in | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
repo.or.cz automatic notification. Contact project admin le...@gm...
if you want to unsubscribe, or site admin ad...@re... if you receive
no reply.
--
nomnom.git ("The graphical media download tool")
|
|
From: <nom...@li...> - 2011-10-18 15:30:28
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project nomnom.git.
The branch, next has been updated
via f941c926238e52a7b704187510769f8a7d91f11f (commit)
via a8910369788b3f3fd96a659e14d36f85ab3bd633 (commit)
via 1ad2eb96c188921c0fcced6eb8f108992e5d6cdb (commit)
from 4cd4e245b42ecb6544aef8fc04c2c50ff3cbdc30 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://repo.or.cz/w/nomnom.git/commit/f941c926238e52a7b704187510769f8a7d91f11f
commit f941c926238e52a7b704187510769f8a7d91f11f
Author: Toni Gundogdu <le...@gm...>
Date: Tue Oct 18 18:30:31 2011 +0300
Revise .desktop file
diff --git a/nomnom.desktop.in b/nomnom.desktop.in
index 99a9da5..7ad3d60 100644
--- a/nomnom.desktop.in
+++ b/nomnom.desktop.in
@@ -1,8 +1,9 @@
[Desktop Entry]
Name=NomNom
-Comment=Download media from Youtube, Dailymotion, etc.
+Comment=Download and stream media
Exec=@prefix@/bin/nomnom
Icon=nomnom.xpm
Type=Application
Terminal=false
-Categories=AudioVideo;
+Categories=Network;AudioVideo;
+Version=@VERSION@
http://repo.or.cz/w/nomnom.git/commit/a8910369788b3f3fd96a659e14d36f85ab3bd633
commit a8910369788b3f3fd96a659e14d36f85ab3bd633
Author: Toni Gundogdu <le...@gm...>
Date: Tue Oct 18 18:25:58 2011 +0300
Add email
diff --git a/src/DownloadDiag.cpp b/src/DownloadDiag.cpp
index 4453e66..eda7761 100644
--- a/src/DownloadDiag.cpp
+++ b/src/DownloadDiag.cpp
@@ -1,6 +1,6 @@
/*
* NomNom
- * Copyright (C) 2010-2011 Toni Gundogdu.
+ * Copyright (C) 2010-2011 Toni Gundogdu <le...@gm...>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/DownloadDiag.h b/src/DownloadDiag.h
index fa95328..c768aef 100644
--- a/src/DownloadDiag.h
+++ b/src/DownloadDiag.h
@@ -1,6 +1,6 @@
/*
* NomNom
- * Copyright (C) 2010-2011 Toni Gundogdu.
+ * Copyright (C) 2010-2011 Toni Gundogdu <le...@gm...>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/Media.cpp b/src/Media.cpp
index af9c269..2418ce0 100644
--- a/src/Media.cpp
+++ b/src/Media.cpp
@@ -1,6 +1,6 @@
/*
* NomNom
- * Copyright (C) 2010-2011 Toni Gundogdu.
+ * Copyright (C) 2010-2011 Toni Gundogdu <le...@gm...>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/Media.h b/src/Media.h
index 514debd..03e337c 100644
--- a/src/Media.h
+++ b/src/Media.h
@@ -1,6 +1,6 @@
/*
* NomNom
- * Copyright (C) 2010-2011 Toni Gundogdu.
+ * Copyright (C) 2010-2011 Toni Gundogdu <le...@gm...>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/ProcProgDiag.cpp b/src/ProcProgDiag.cpp
index f10c97b..21ab9d0 100644
--- a/src/ProcProgDiag.cpp
+++ b/src/ProcProgDiag.cpp
@@ -1,6 +1,6 @@
/*
* NomNom
- * Copyright (C) 2010-2011 Toni Gundogdu.
+ * Copyright (C) 2010-2011 Toni Gundogdu <le...@gm...>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/ProcProgDiag.h b/src/ProcProgDiag.h
index 78830a6..0cd1717 100644
--- a/src/ProcProgDiag.h
+++ b/src/ProcProgDiag.h
@@ -1,6 +1,6 @@
/*
* NomNom
- * Copyright (C) 2010-2011 Toni Gundogdu.
+ * Copyright (C) 2010-2011 Toni Gundogdu <le...@gm...>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/Recent.cpp b/src/Recent.cpp
index 48d8860..a4a775e 100644
--- a/src/Recent.cpp
+++ b/src/Recent.cpp
@@ -1,6 +1,6 @@
/*
* NomNom
- * Copyright (C) 2010 Toni Gundogdu.
+ * Copyright (C) 2010 Toni Gundogdu <le...@gm...>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/Recent.h b/src/Recent.h
index 8b172f5..37f971f 100644
--- a/src/Recent.h
+++ b/src/Recent.h
@@ -1,6 +1,6 @@
/*
* NomNom
- * Copyright (C) 2010 Toni Gundogdu.
+ * Copyright (C) 2010 Toni Gundogdu <le...@gm...>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/i/MainWindow.cpp b/src/i/MainWindow.cpp
index a2092b8..cc6104f 100644
--- a/src/i/MainWindow.cpp
+++ b/src/i/MainWindow.cpp
@@ -1,6 +1,6 @@
/*
* NomNom
- * Copyright (C) 2010-2011 Toni Gundogdu.
+ * Copyright (C) 2010-2011 Toni Gundogdu <le...@gm...>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/i/MainWindow.h b/src/i/MainWindow.h
index 4610935..7dbb135 100644
--- a/src/i/MainWindow.h
+++ b/src/i/MainWindow.h
@@ -1,6 +1,6 @@
/*
* NomNom
- * Copyright (C) 2010-2011 Toni Gundogdu.
+ * Copyright (C) 2010-2011 Toni Gundogdu <le...@gm...>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/main.cpp b/src/main.cpp
index 062af18..d1c14e3 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,6 +1,6 @@
/*
* NomNom
- * Copyright (C) 2010-2011 Toni Gundogdu.
+ * Copyright (C) 2010-2011 Toni Gundogdu <le...@gm...>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
http://repo.or.cz/w/nomnom.git/commit/1ad2eb96c188921c0fcced6eb8f108992e5d6cdb
commit 1ad2eb96c188921c0fcced6eb8f108992e5d6cdb
Author: Toni Gundogdu <le...@gm...>
Date: Tue Oct 18 18:04:28 2011 +0300
Add basic command line support
* Support for --config-path, --detect, --verbose, --help
* Add --enable-verbose to configure
"--config-path" prints the path to the local users's config file.
"--detect" prints the detected commands from $PATH.
"--verbose" turns on verbose program output (to stderr).
Program option "--verbose" is disabled by default and can be enabled at
compile time with "--enable-verbose". This allows us to exclude
otherwise unnecessary inclusions of QDebug header and calls to qDebug
and its friends.
diff --git a/configure.ac b/configure.ac
index 3930d77..343bb20 100644
--- a/configure.ac
+++ b/configure.ac
@@ -92,6 +92,13 @@ AC_FUNC_ERROR_AT_LINE
VN=`$srcdir/gen-ver.sh $srcdir`
AC_DEFINE_UNQUOTED([VN],["$VN"], [We have version number from gen-ver.sh])
+# --enable-verbose
+AC_ARG_ENABLE([verbose],
+ AS_HELP_STRING([--enable-verbose], [Enable --verbose program option]))
+
+AS_IF([test "x$enable_verbose" = "xyes"], [
+ AC_DEFINE([ENABLE_VERBOSE], [1], [Enable --verbose option])])
+
# --with-manual
AC_ARG_WITH([manual],
[AS_HELP_STRING([--with-manual],
@@ -117,6 +124,7 @@ AC_MSG_NOTICE([
options:
install prefix: ${prefix}
with manual: ${with_manual}
+ --verbose: ${enable_verbose}
qt:
lrelease: ${LRELEASE}
moc: ${MOC}
diff --git a/src/DownloadDiag.cpp b/src/DownloadDiag.cpp
index e1a4adf..4453e66 100644
--- a/src/DownloadDiag.cpp
+++ b/src/DownloadDiag.cpp
@@ -16,7 +16,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifdef _0
+#include "config.h"
+
+#ifdef ENABLE_VERBOSE
#include <QDebug>
#endif
@@ -59,8 +61,8 @@ QString DownloadDialog::errmsg() const
void DownloadDialog::start(QStringList& args)
{
-#ifdef _0
- qDebug() << __PRETTY_FUNCTION__ << __LINE__ << args;
+#ifdef ENABLE_VERBOSE
+ qDebug() << __PRETTY_FUNCTION__ << __LINE__ << "args=" << args;
#endif
_canceled = false;
@@ -82,8 +84,8 @@ void DownloadDialog::onCurlStarted()
void DownloadDialog::onCurlError(QProcess::ProcessError n)
{
-#ifdef _0
- qDebug() << __PRETTY_FUNCTION__ << __LINE__ << n;
+#ifdef ENABLE_VERBOSE
+ qDebug() << __PRETTY_FUNCTION__ << __LINE__ << "code=" << n;
#endif
if (!_canceled)
{
@@ -105,9 +107,11 @@ static void update_label(QProgressDialog *d, const QString& ln)
QStringList lst = ln.split(" ");
if (lst.count() < 12)
return; // Full line updates only.
-#ifdef _0
- qDebug() << __PRETTY_FUNCTION__ << __LINE__ << lst;
+
+#ifdef ENABLE_VERBOSE
+ qDebug() << __PRETTY_FUNCTION__ << __LINE__ << "lst=" << lst;
#endif
+
enum {PERCENT=0, ETA=10, RATE=11};
QString rate = lst[RATE];
@@ -115,9 +119,11 @@ static void update_label(QProgressDialog *d, const QString& ln)
rate = QString("%1k").arg(rate.toLongLong()/1024.0,2,'f',1);
const QString s = QObject::tr("Copying %1/s, %2").arg(rate).arg(lst[ETA]);
-#ifdef _0
- qDebug() << __PRETTY_FUNCTION__ << __LINE__ << s;
+
+#ifdef ENABLE_VERBOSE
+ qDebug() << __PRETTY_FUNCTION__ << __LINE__ << "s=" << s;
#endif
+
d->setValue(lst[PERCENT].toInt());
d->setLabelText(s);
}
@@ -130,9 +136,11 @@ void DownloadDialog::onCurlReadyRead()
while (_proc.readLine(data, sizeof(data)))
{
const QString ln = QString::fromLocal8Bit(data).simplified();
-#ifdef _0
- qDebug() << __PRETTY_FUNCTION__ << __LINE__ << ln;
+
+#ifdef ENABLE_VERBOSE
+ qDebug() << __PRETTY_FUNCTION__ << __LINE__ << "ln=" << ln;
#endif
+
if (rx_err.indexIn(ln) != -1)
{
_errmsg = tr("Error while running command:<p>%1</p>"
diff --git a/src/Media.cpp b/src/Media.cpp
index ecdff55..af9c269 100644
--- a/src/Media.cpp
+++ b/src/Media.cpp
@@ -16,13 +16,15 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include "config.h"
+
#include <QScriptValueIterator>
#include <QScriptEngine>
#include <QVariant>
#include <QString>
#include <QLabel>
-#ifdef _0
+#ifdef ENABLE_VERBOSE
#include <QDebug>
#endif
@@ -91,12 +93,12 @@ Media::fromJSON (const QString& data, QString& error)
_suffix = v.property ("file_suffix").toString ();
_link = v.property ("url").toString ();
-#ifdef _0
- qDebug ()
- << _length
- << _ctype
- << _suffix
- << _link;
+#ifdef ENABLE_VERBOSE
+ qDebug () << __PRETTY_FUNCTION__ << __LINE__ << "media="
+ << _length
+ << _ctype
+ << _suffix
+ << _link;
#endif
return true;
diff --git a/src/ProcProgDiag.cpp b/src/ProcProgDiag.cpp
index 5cbd7fe..f10c97b 100644
--- a/src/ProcProgDiag.cpp
+++ b/src/ProcProgDiag.cpp
@@ -16,7 +16,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifdef _0
+#include "config.h"
+
+#ifdef ENABLE_VERBOSE
#include <QDebug>
#endif
@@ -68,8 +70,8 @@ QString ProcessProgressDialog::errmsg() const
void ProcessProgressDialog::start(QStringList& args)
{
-#ifdef _0
- qDebug() << __PRETTY_FUNCTION__ << __LINE__ << args;
+#ifdef ENABLE_VERBOSE
+ qDebug() << __PRETTY_FUNCTION__ << __LINE__ << "args=" << args;
#endif
_canceled = false;
@@ -87,15 +89,15 @@ void ProcessProgressDialog::start(QStringList& args)
void ProcessProgressDialog::onProcStarted()
{
-#ifdef _0
+#ifdef ENABLE_VERBOSE
qDebug() << __PRETTY_FUNCTION__ << __LINE__;
#endif
}
void ProcessProgressDialog::onProcError(QProcess::ProcessError n)
{
-#ifdef _0
- qDebug() << __PRETTY_FUNCTION__ << __LINE__ << n;
+#ifdef ENABLE_VERBOSE
+ qDebug() << __PRETTY_FUNCTION__ << __LINE__ << "code=" << n;
#endif
if (!_canceled)
{
@@ -130,8 +132,8 @@ void ProcessProgressDialog::onProcReadyRead()
const QString ln = QString::fromLocal8Bit(data);
update_label(this, ln);
_buffer += ln;
-#ifdef _0
- qDebug() << __PRETTY_FUNCTION__ << __LINE__ << ln;
+#ifdef ENABLE_VERBOSE
+ qDebug() << __PRETTY_FUNCTION__ << __LINE__ << "ln=" << ln;
#endif
}
}
@@ -156,8 +158,8 @@ void ProcessProgressDialog::onProcFinished(int ec, QProcess::ExitStatus es)
.arg(ec)
.arg(rx_error.cap(1).simplified());
}
-#ifdef _0
- qDebug() << __PRETTY_FUNCTION__ << __LINE__ << _errmsg;
+#ifdef ENABLE_VERBOSE
+ qDebug() << __PRETTY_FUNCTION__ << __LINE__ << "errmsg=" << _errmsg;
#endif
emit error();
}
diff --git a/src/Recent.cpp b/src/Recent.cpp
index 3dcbe99..48d8860 100644
--- a/src/Recent.cpp
+++ b/src/Recent.cpp
@@ -16,6 +16,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include "config.h"
+
#include <QSettings>
#include <QDebug>
diff --git a/src/about/naboutdialog.cpp b/src/about/naboutdialog.cpp
index 80ccdca..eac9e9d 100644
--- a/src/about/naboutdialog.cpp
+++ b/src/about/naboutdialog.cpp
@@ -15,6 +15,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include "config.h"
+
#include <QDialogButtonBox>
#include <QPushButton>
#include <QGridLayout>
diff --git a/src/detect/ndetect.cpp b/src/detect/ndetect.cpp
index 162b823..28960fa 100644
--- a/src/detect/ndetect.cpp
+++ b/src/detect/ndetect.cpp
@@ -15,6 +15,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include "config.h"
+
#include <QTextStream>
#include <QStringList>
#include <QProcess>
diff --git a/src/detect/ndetectdialog.cpp b/src/detect/ndetectdialog.cpp
index 35fd0d9..bab1ece 100644
--- a/src/detect/ndetectdialog.cpp
+++ b/src/detect/ndetectdialog.cpp
@@ -15,6 +15,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include "config.h"
+
#include <QDialogButtonBox>
#include <QTextBrowser>
#include <QVBoxLayout>
diff --git a/src/feed/nfeed.cpp b/src/feed/nfeed.cpp
index 3738495..0bb7b0d 100644
--- a/src/feed/nfeed.cpp
+++ b/src/feed/nfeed.cpp
@@ -15,6 +15,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include "config.h"
+
#include <QStringList>
#include <QFileInfo>
#include <QProcess>
diff --git a/src/feed/nfeeddialog.cpp b/src/feed/nfeeddialog.cpp
index bd530c2..b518657 100644
--- a/src/feed/nfeeddialog.cpp
+++ b/src/feed/nfeeddialog.cpp
@@ -15,6 +15,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include "config.h"
+
#include <QCoreApplication>
#include <QDialogButtonBox>
#include <QMessageBox>
diff --git a/src/feed/nfeeddialog_items.cpp b/src/feed/nfeeddialog_items.cpp
index f01757a..4429d76 100644
--- a/src/feed/nfeeddialog_items.cpp
+++ b/src/feed/nfeeddialog_items.cpp
@@ -15,6 +15,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include "config.h"
+
#include <QListWidgetItem>
#include <QListWidget>
#include <QVBoxLayout>
diff --git a/src/feed/nfeeddialog_properties.cpp b/src/feed/nfeeddialog_properties.cpp
index 3d0f024..589af6a 100644
--- a/src/feed/nfeeddialog_properties.cpp
+++ b/src/feed/nfeeddialog_properties.cpp
@@ -15,6 +15,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include "config.h"
+
#include <QDialogButtonBox>
#include <QButtonGroup>
#include <QRadioButton>
diff --git a/src/feed/nfeedprogressdialog.cpp b/src/feed/nfeedprogressdialog.cpp
index 8971363..eca7269 100644
--- a/src/feed/nfeedprogressdialog.cpp
+++ b/src/feed/nfeedprogressdialog.cpp
@@ -15,10 +15,12 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include "config.h"
+
#include <QScriptValueIterator>
#include <QScriptEngine>
-#ifdef _0
+#ifdef ENABLE_VERBOSE
#include <QDebug>
#endif
@@ -49,18 +51,23 @@ NFeedProgressDialog::NFeedProgressDialog(QWidget *parent/*=NULL*/)
bool NFeedProgressDialog::open(QStringList& args)
{
setLabelText(tr("Working..."));
+
_cancelled = false;
+ _args = args;
+
_buffer.clear();
_errmsg.clear();
+
setMaximum(0);
setMinimum(0);
- _args = args;
+
show();
-#ifdef _0
- qDebug() << __PRETTY_FUNCTION__ << __LINE__ << args;
+#ifdef ENABLE_VERBOSE
+ qDebug() << __PRETTY_FUNCTION__ << __LINE__ << "args=" << args;
#endif
_proc->start(args.takeFirst(), args);
exec();
+
return _errmsg.isEmpty();
}
diff --git a/src/i/MainWindow.cpp b/src/i/MainWindow.cpp
index a244588..a2092b8 100644
--- a/src/i/MainWindow.cpp
+++ b/src/i/MainWindow.cpp
@@ -26,7 +26,7 @@
#include <QSettings>
#include <QRegExp>
-#ifdef _0
+#ifdef ENABLE_VERBOSE
#include <QDebug>
#endif
@@ -192,8 +192,8 @@ void MainWindow::handleURL(const QString& url)
QStringList q_args = nn::to_cmd_args(s);
const QString q = q_args.first();
-#ifdef _0
- qDebug() << __PRETTY_FUNCTION__ << __LINE__ << q;
+#ifdef ENABLE_VERBOSE
+ qDebug() << __PRETTY_FUNCTION__ << __LINE__ << "quvi_path=" << q;
#endif
if (q.isEmpty())
@@ -234,9 +234,9 @@ void MainWindow::handleURL(const QString& url)
// Query formats to an URL.
-#ifdef _0
+#ifdef ENABLE_VERBOSE
qDebug() << __PRETTY_FUNCTION__ << __LINE__
- << "have_quvi_feature_query_formats:"
+ << "have_quvi_feature_query_formats="
<< have_quvi_feature_query_formats;
#endif
@@ -270,8 +270,9 @@ void MainWindow::handleURL(const QString& url)
q_args.replaceInStrings("%u", url);
q_args << "-f" << fmt;
-#ifdef _0
- qDebug() << __PRETTY_FUNCTION__ << __LINE__ << q_args;
+
+#ifdef ENABLE_VERBOSE
+ qDebug() << __PRETTY_FUNCTION__ << __LINE__ << "q_args=" << q_args;
#endif
proc->setLabelText(tr("Checking ..."));
@@ -306,8 +307,8 @@ bool MainWindow::queryFormats(QStringList& formats,
args.replaceInStrings("%u", url);
args << "-F";
-#ifdef _0
- qDebug() << __PRETTY_FUNCTION__ << __LINE__ << args;
+#ifdef ENABLE_VERBOSE
+ qDebug() << __PRETTY_FUNCTION__ << __LINE__ << "args=" << args;
#endif
json.clear();
@@ -320,8 +321,8 @@ bool MainWindow::queryFormats(QStringList& formats,
if (failed)
return false;
-#ifdef _0
- qDebug() << __PRETTY_FUNCTION__ << __LINE__ << failed;
+#ifdef ENABLE_VERBOSE
+ qDebug() << __PRETTY_FUNCTION__ << __LINE__ << "failed=" << failed;
#endif
QStringList lns = json.split("n");
@@ -336,9 +337,11 @@ bool MainWindow::queryFormats(QStringList& formats,
<< "default"
<< "best"
<< rx.cap(1).simplified().split("|");
-#ifdef _0
- qDebug() << __PRETTY_FUNCTION__ << __LINE__ << formats;
+
+#ifdef ENABLE_VERBOSE
+ qDebug() << __PRETTY_FUNCTION__ << __LINE__ << "formats=" << formats;
#endif
+
return true;
}
}
@@ -478,8 +481,8 @@ void MainWindow::downloadMedia()
const bool playWhenDone =
settings.value(nn::PlayWhenDoneDownloading).toBool();
-#ifdef _0
- qDebug() << __PRETTY_FUNCTION__ << __LINE__
+#ifdef ENABLE_VERBOSE
+ qDebug() << __PRETTY_FUNCTION__ << __LINE__ << "file="
<< QFileInfo(fpath).size()
<< expected_bytes
<< completeFile
@@ -575,12 +578,12 @@ static void check_window_flags(QWidget *w)
static bool check_language(QWidget *w, const QString& lang)
{
-#ifdef _0
- qDebug() << __PRETTY_FUNCTION__ << __LINE__
- << "lang="
+#ifdef ENABLE_VERBOSE
+ qDebug() << __PRETTY_FUNCTION__ << __LINE__ << "lang="
<< lang
<< settings.value(nn::Language).toString();
#endif
+
if (lang != settings.value(nn::Language).toString())
{
if (nn::ask(w, QObject::tr("Language will be changed after "
@@ -733,9 +736,10 @@ static void update_show_state(QWidget *w)
void MainWindow::closeEvent(QCloseEvent *e)
{
-#ifdef _0
+#ifdef ENABLE_VERBOSE
qDebug() << __PRETTY_FUNCTION__ << __LINE__;
#endif
+
if (settings.value(nn::TerminateInstead).toBool()
|| !systray->isVisible())
{
@@ -761,7 +765,7 @@ void MainWindow::onTerminate()
{
// When systray icon is visible: the default behaviour is to ignore
// calls to 'close' mainwindow unless "terminate instead" is true.
-#ifdef _0
+#ifdef ENABLE_VERBOSE
qDebug() << __PRETTY_FUNCTION__ << __LINE__;
#endif
// Although the line below uses "settings" value "TerminateInstead",
diff --git a/src/lang/nlang.cpp b/src/lang/nlang.cpp
index 1b6038d..0281789 100644
--- a/src/lang/nlang.cpp
+++ b/src/lang/nlang.cpp
@@ -15,6 +15,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include "config.h"
+
#include <cstdlib>
#include <QCoreApplication>
@@ -28,7 +30,7 @@
#include <QRegExp>
#include <QDir>
-#ifdef _0
+#ifdef ENABLE_VERBOSE
#include <QDebug>
#endif
@@ -164,7 +166,7 @@ static bool load(const QString& qmFilePath)
QTranslator *t = new QTranslator;
if (t->load(qmFilePath))
{
-#ifdef _0
+#ifdef ENABLE_VERBOSE
qDebug() << __PRETTY_FUNCTION__ << __LINE__ << qmFilePath;
#endif
qApp->installTranslator(t);
@@ -246,7 +248,8 @@ bool choose_dialog(QWidget *parent, QString& lang)
bool choose(const QString initial/*=""*/)
{
const QLocale l = QLocale::system();
-#ifdef _0
+
+#ifdef ENABLE_VERBOSE
qDebug() << __PRETTY_FUNCTION__ << __LINE__
<< l.language()
<< l.name()
@@ -254,16 +257,18 @@ bool choose(const QString initial/*=""*/)
<< QLocale::countryToString(l.country())
<< QLocale::languageToString(l.language());
#endif
+
foreach(const NResultPair p, qm_files())
{
if (initial.isEmpty())
{
-#ifdef _0
+#ifdef ENABLE_VERBOSE
qDebug() << __PRETTY_FUNCTION__ << __LINE__
<< p.first
<< p.second
<< QLocale::languageToString(l.language());
#endif
+
if (p.first == QLocale::languageToString(l.language()))
return load(p.second);
}
diff --git a/src/main.cpp b/src/main.cpp
index d09dc2f..062af18 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -18,12 +18,14 @@
#include "config.h"
+#include <iostream>
+
#include <QApplication>
#include <QLibraryInfo>
#include <QTranslator>
#include <QSettings>
-#ifdef _0
+#ifdef ENABLE_VERBOSE
#include <QDebug>
#endif
@@ -67,8 +69,123 @@ static void first_run(QSettings& s)
settings.write();
}
+static bool config_path(const QSettings& s)
+{
+ std::clog << qPrintable(s.fileName()) << std::endl;
+ return true;
+}
+
+static void print_nresult(const nn::detect::NResult& r)
+{
+ std::clog << " " << qPrintable(r.first)
+ << " (v" << qPrintable(r.second.second) << ")"
+ << std::endl;
+}
+
+static void dump_nresults(const nn::DetectType n, const QString& s)
+{
+ nn::detect::NResultList l;
+ nn::detect::find(n, l);
+ std::clog << qPrintable(s) << std::endl;
+ foreach (const nn::detect::NResult r, l)
+ {
+ print_nresult(r);
+ }
+}
+
+static bool detect_cmds()
+{
+ std::clog << "Detect commands from $PATH..." << std::endl;
+ dump_nresults(MediaParser, "Media parsers:");
+ dump_nresults(MediaPlayer, "Media players:");
+ dump_nresults(FeedParser, "Feed parsers:");
+ dump_nresults(Downloader, "Downloaders:");
+}
+
+static bool version()
+{
+ std::clog << PACKAGE_VERSION << std::endl;
+}
+
+static bool help()
+{
+ const QString arg0 = QCoreApplication::arguments()[0];
+ std::clog
+ << "Usage: " << qPrintable(arg0) << " [options]n"
+ << "Options:n"
+ << " --config-path Print path to a local user config file and exitn"
+ << " --detect Print detected commands from $PATH and exitn"
+#ifdef ENABLE_VERBOSE
+ << " --verbose Turn on verbose outputn"
+#endif
+ << " --version Print version and exitn"
+ << " --help Print help and exit"
+ << std::endl;
+}
+
+#ifdef ENABLE_VERBOSE
+static bool verbose = false;
+#endif
+
+static bool parse_args(const QSettings& qs)
+{
+ QStringList args = QCoreApplication::arguments();
+ args.takeFirst();
+ foreach (const QString s, args)
+ {
+ if (s == "--config-path")
+ return config_path(qs);
+ else if (s == "--detect")
+ return detect_cmds();
+#ifdef ENABLE_VERBOSE
+ else if (s == "--verbose")
+ verbose = true;
+#endif
+ else if (s == "--version")
+ return version();
+ else if (s == "--help")
+ return help();
+ else
+ {
+ std::clog << "error: invalid option: " << qPrintable(s) << std::endl;
+ return true;
+ }
+ }
+ return false;
+}
+
+#ifdef ENABLE_VERBOSE
+static void new_msg_handler(QtMsgType t, const char *m)
+{
+ if (!verbose)
+ return;
+
+ switch (t)
+ {
+ case QtDebugMsg:
+ default:
+ std::clog << m << std::endl;
+ break;
+ case QtWarningMsg:
+ std::clog << "(w): " << m << std::endl;
+ break;
+ case QtCriticalMsg:
+ std::clog << "(c): " << m << std::endl;
+ break;
+ case QtFatalMsg:
+ std::clog << "(f): " << m << std::endl;
+ abort();
+ break;
+ }
+}
+#endif
+
int main(int argc, char *argv[])
{
+#ifdef ENABLE_VERBOSE
+ qInstallMsgHandler(new_msg_handler);
+#endif
+
QApplication app(argc, argv);
#define APPNAME "NomNom"
#define APPDOMAIN "nomnom.sourceforge.net"
@@ -81,23 +198,32 @@ int main(int argc, char *argv[])
settings.read();
+// Command line args.
+
+ QSettings s;
+
+ if (parse_args(s))
+ return 0;
+
// Qt translation.
QTranslator qtTranslator;
-#ifdef _0
+
+#ifdef ENABLE_VERBOSE
qDebug() << __PRETTY_FUNCTION__ << __LINE__
<< "qt_" + QLocale::system().name()
<< QLibraryInfo::location(QLibraryInfo::TranslationsPath);
#endif
+
qtTranslator.load("qt_" + QLocale::system().name(),
QLibraryInfo::location(QLibraryInfo::TranslationsPath));
+
app.installTranslator(&qtTranslator);
// Application translation.
bool r = false;
- QSettings s;
s.beginGroup("Settings"); // settings/nsettingsmutator.cpp
if (s.contains("Language"))
r = lang::choose(s.value("Language").toString());
diff --git a/src/settings/nsettings.cpp b/src/settings/nsettings.cpp
index 7cf482b..99da9e8 100644
--- a/src/settings/nsettings.cpp
+++ b/src/settings/nsettings.cpp
@@ -15,6 +15,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include "config.h"
+
#include <QStringList>
#include <NSettings>
@@ -83,12 +85,12 @@ static bool apply_regexp(const QString& regexp,
const QString p = cap.at(1);
const bool g = cap.at(2).contains("g");
-#ifdef _0
+#ifdef _1
const bool i = cap.at(2).contains("i");
#endif
QRegExp rx(p);
-#ifdef _0
+#ifdef _1
rx.setCaseSensitivity(i ? Qt::CaseInsensitive : Qt::CaseSensitive);
#endif
diff --git a/src/settings/nsettingsdialog.cpp b/src/settings/nsettingsdialog.cpp
index 35a6b92..10ab3a4 100644
--- a/src/settings/nsettingsdialog.cpp
+++ b/src/settings/nsettingsdialog.cpp
@@ -15,6 +15,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include "config.h"
+
#include <QCoreApplication>
#include <QDialogButtonBox>
#include <QMessageBox>
diff --git a/src/settings/nsettingsdialog_commands.cpp b/src/settings/nsettingsdialog_commands.cpp
index d721ee8..0a4006f 100644
--- a/src/settings/nsettingsdialog_commands.cpp
+++ b/src/settings/nsettingsdialog_commands.cpp
@@ -15,13 +15,15 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include "config.h"
+
#include <QVBoxLayout>
#include <QHBoxLayout>
#include <QComboBox>
#include <QLineEdit>
#include <QLabel>
-#ifdef _0
+#ifdef ENABLE_VERBOSE
#include <QDebug>
#endif
@@ -42,8 +44,8 @@ static void detect_type(const DetectType t, QComboBox *c)
foreach (const NDetectResult p, r)
{
c->addItem(p.first, p.second.first);
-#ifdef _0
- qDebug() << p;
+#ifdef ENABLE_VERBOSE
+ qDebug() << __PRETTY_FUNCTION__ << __LINE__ << p;
#endif
}
}
@@ -257,9 +259,11 @@ static void _read(SettingKey comboKey,
const int n = combo->findText(a[0]);
if (n != -1)
{
-#ifdef _0
+#ifdef ENABLE_VERBOSE
qDebug() << __PRETTY_FUNCTION__ << __LINE__
- << n << a[0] << a[1];
+ << n
+ << a[0]
+ << a[1];
#endif
combo->setItemData(n, a[1]);
combo->setCurrentIndex(n);
diff --git a/src/settings/nsettingsdialog_download.cpp b/src/settings/nsettingsdialog_download.cpp
index 18cee74..5548b70 100644
--- a/src/settings/nsettingsdialog_download.cpp
+++ b/src/settings/nsettingsdialog_download.cpp
@@ -15,6 +15,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include "config.h"
+
#include <QFileDialog>
#include <QGridLayout>
#include <QVBoxLayout>
diff --git a/src/settings/nsettingsdialog_options.cpp b/src/settings/nsettingsdialog_options.cpp
index 326c7fd..24bc01b 100644
--- a/src/settings/nsettingsdialog_options.cpp
+++ b/src/settings/nsettingsdialog_options.cpp
@@ -15,6 +15,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include "config.h"
+
#include <QVBoxLayout>
#include <QTabWidget>
diff --git a/src/settings/nsettingsdialog_options_appearance.cpp b/src/settings/nsettingsdialog_options_appearance.cpp
index c641b01..a1a5dda 100644
--- a/src/settings/nsettingsdialog_options_appearance.cpp
+++ b/src/settings/nsettingsdialog_options_appearance.cpp
@@ -15,6 +15,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include "config.h"
+
#include <QImageReader>
#include <QVBoxLayout>
#include <QHBoxLayout>
diff --git a/src/settings/nsettingsdialog_options_behaviour.cpp b/src/settings/nsettingsdialog_options_behaviour.cpp
index 9379819..3cfd88d 100644
--- a/src/settings/nsettingsdialog_options_behaviour.cpp
+++ b/src/settings/nsettingsdialog_options_behaviour.cpp
@@ -15,6 +15,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include "config.h"
+
#include <QVBoxLayout>
#include <QCheckBox>
diff --git a/src/settings/nsettingsdialog_options_systray.cpp b/src/settings/nsettingsdialog_options_systray.cpp
index 40f5663..6b36196 100644
--- a/src/settings/nsettingsdialog_options_systray.cpp
+++ b/src/settings/nsettingsdialog_options_systray.cpp
@@ -15,6 +15,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include "config.h"
+
#include <QVBoxLayout>
#include <QCheckBox>
#include <QGroupBox>
diff --git a/src/settings/nsettingsdialog_proxy.cpp b/src/settings/nsettingsdialog_proxy.cpp
index 1381afd..043a9b9 100644
--- a/src/settings/nsettingsdialog_proxy.cpp
+++ b/src/settings/nsettingsdialog_proxy.cpp
@@ -25,10 +25,6 @@
#include <QSpinBox>
#include <QLabel>
-#ifdef _0
-#include <QDebug>
-#endif
-
#include <NSettingsMutator>
#include <NSettingsDialog>
diff --git a/src/settings/nsettingsmutator.cpp b/src/settings/nsettingsmutator.cpp
index 311f424..8d78b56 100644
--- a/src/settings/nsettingsmutator.cpp
+++ b/src/settings/nsettingsmutator.cpp
@@ -15,10 +15,12 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include "config.h"
+
#include <QStringList>
#include <QSettings>
-#ifdef _0
+#ifdef ENABLE_VERBOSE
#include <QDebug>
#endif
@@ -82,9 +84,9 @@ void NSettingsMutator::read()
SettingKey k = toKey(key);
if (k != (int)-1)
values[k] = s.value(key);
-#ifdef _0
+#ifdef ENABLE_VERBOSE
else
- qWarning() << __PRETTY_FUNCTION__ << __LINE__ << "Ignored" << key;
+ qWarning() << __PRETTY_FUNCTION__ << __LINE__ << "ignored" << key;
#endif
}
s.endGroup();
diff --git a/src/systray/nsystray.cpp b/src/systray/nsystray.cpp
index 04a5159..8180a1b 100644
--- a/src/systray/nsystray.cpp
+++ b/src/systray/nsystray.cpp
@@ -15,9 +15,11 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include "config.h"
+
#include <QMenu>
-#ifdef _0
+#ifdef ENABLE_VERBOSE
#include <QDebug>
#endif
@@ -110,12 +112,11 @@ QAction *NSysTray::findTrayMenuAction(const QString& text)
if (action->text() == text)
return action;
}
-#ifdef _0
- qWarning() << __PRETTY_FUNCTION__
- << __LINE__
- << "Action"
+#ifdef ENABLE_VERBOSE
+ qWarning() << __PRETTY_FUNCTION__ << __LINE__
+ << "Action ""
<< text
- << "not found in tray menu";
+ << "" not found in tray menu";
#endif
return NULL;
}
diff --git a/src/util/nutil.cpp b/src/util/nutil.cpp
index a9b845c..4b0b1b7 100644
--- a/src/util/nutil.cpp
+++ b/src/util/nutil.cpp
@@ -21,7 +21,7 @@
#include <QMessageBox>
#include <QProcess>
-#ifdef _0
+#ifdef ENABLE_VERBOSE
#include <QDebug>
#endif
@@ -92,7 +92,8 @@ bool check_for_cmd_feature(SettingKey a,
QStringList args = QStringList()
<< to_cmd_args(q).takeFirst()
<< feature;
-#ifdef _0
+
+#ifdef ENABLE_VERBOSE
qDebug() << __PRETTY_FUNCTION__ << __LINE__ << "args=" << args;
#endif
@@ -102,7 +103,7 @@ bool check_for_cmd_feature(SettingKey a,
if (!p->waitForFinished())
return false;
-#ifdef _0
+#ifdef ENABLE_VERBOSE
qDebug() << __PRETTY_FUNCTION__ << __LINE__
<< "exit_status=" << p->exitStatus()
<< "exit_code="<< p->exitCode();
@@ -127,8 +128,8 @@ bool check_for_cmd_feature(SettingKey a,
*/
QStringList to_cmd_args(const QString& s)
{
-#ifdef _0
- qDebug() << __PRETTY_FUNCTION__ << __LINE__ << s;
+#ifdef ENABLE_VERBOSE
+ qDebug() << __PRETTY_FUNCTION__ << __LINE__ << "parse=" << s;
#endif
// $cmd_path:$cmd_args
diff --git a/src/widgets/ntripwireedit.cpp b/src/widgets/ntripwireedit.cpp
index 980c526..0231cc2 100644
--- a/src/widgets/ntripwireedit.cpp
+++ b/src/widgets/ntripwireedit.cpp
@@ -15,6 +15,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include "config.h"
+
#include <QMouseEvent>
#include <QKeyEvent>
#include <QDebug>
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 8 ++
nomnom.desktop.in | 5 +-
src/DownloadDiag.cpp | 32 +++--
src/DownloadDiag.h | 2 +-
src/Media.cpp | 18 ++--
src/Media.h | 2 +-
src/ProcProgDiag.cpp | 24 ++--
src/ProcProgDiag.h | 2 +-
src/Recent.cpp | 4 +-
src/Recent.h | 2 +-
src/about/naboutdialog.cpp | 2 +
src/detect/ndetect.cpp | 2 +
src/detect/ndetectdialog.cpp | 2 +
src/feed/nfeed.cpp | 2 +
src/feed/nfeeddialog.cpp | 2 +
src/feed/nfeeddialog_items.cpp | 2 +
src/feed/nfeeddialog_properties.cpp | 2 +
src/feed/nfeedprogressdialog.cpp | 15 ++-
src/i/MainWindow.cpp | 46 ++++---
src/i/MainWindow.h | 2 +-
src/lang/nlang.cpp | 13 ++-
src/main.cpp | 134 +++++++++++++++++++-
src/settings/nsettings.cpp | 6 +-
src/settings/nsettingsdialog.cpp | 2 +
src/settings/nsettingsdialog_commands.cpp | 14 ++-
src/settings/nsettingsdialog_download.cpp | 2 +
src/settings/nsettingsdialog_options.cpp | 2 +
.../nsettingsdialog_options_appearance.cpp | 2 +
src/settings/nsettingsdialog_options_behaviour.cpp | 2 +
src/settings/nsettingsdialog_options_systray.cpp | 2 +
src/settings/nsettingsdialog_proxy.cpp | 4 -
src/settings/nsettingsmutator.cpp | 8 +-
src/systray/nsystray.cpp | 13 +-
src/util/nutil.cpp | 11 +-
src/widgets/ntripwireedit.cpp | 2 +
35 files changed, 296 insertions(+), 97 deletions(-)
repo.or.cz automatic notification. Contact project admin le...@gm...
if you want to unsubscribe, or site admin ad...@re... if you receive
no reply.
--
nomnom.git ("The graphical media download tool")
|
|
From: <nom...@li...> - 2011-10-12 14:37:26
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project nomnom.git.
The branch, next has been updated
via 309ae84d3d069d3c425de6414a00adc26b93d38c (commit)
from 7b174464bfc6553dce9f480879f2b05298933eff (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://repo.or.cz/w/nomnom.git/commit/309ae84d3d069d3c425de6414a00adc26b93d38c
commit 309ae84d3d069d3c425de6414a00adc26b93d38c
Author: Toni Gundogdu <le...@gm...>
Date: Wed Oct 12 17:33:59 2011 +0300
Rename NFeedInfo -> NFeedProperties
diff --git a/src/Makefile.am b/src/Makefile.am
index a9275e7..484de18 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -59,7 +59,7 @@ qrc_nomnom.cpp:
src= about/naboutdialog.cpp - feed/nfeeddialog_info.cpp + feed/nfeeddialog_properties.cpp feed/nfeeddialog_items.cpp feed/nfeeddialog.cpp feed/nfeedprogressdialog.cpp diff --git a/src/feed/nfeeddialog.cpp b/src/feed/nfeeddialog.cpp
index 980458c..547d7f4 100644
--- a/src/feed/nfeeddialog.cpp
+++ b/src/feed/nfeeddialog.cpp
@@ -35,7 +35,7 @@ NFeedDialog::NFeedDialog(QWidget *parent, const QString& umphPath)
// Toolbox
- NFeedInfo *info = new NFeedInfo(umphPath);
+ NFeedProperties *info = new NFeedProperties(umphPath);
connect(info, SIGNAL(parse(QStringList)), this, SLOT(parse(QStringList)));
NFeedItems *items = new NFeedItems;
@@ -43,8 +43,8 @@ NFeedDialog::NFeedDialog(QWidget *parent, const QString& umphPath)
connect(items, SIGNAL(selected(QString)), this, SLOT(selected(QString)));
_toolbox = new QToolBox;
- _toolbox->addItem(info, tr("&Information"));
- _toolbox->addItem(items, tr("I&tems"));
+ _toolbox->addItem(info, tr("&Properties"));
+ _toolbox->addItem(items, tr("&Items"));
// Button box
diff --git a/src/feed/nfeeddialog.h b/src/feed/nfeeddialog.h
index e2dd3c1..86ad989 100644
--- a/src/feed/nfeeddialog.h
+++ b/src/feed/nfeeddialog.h
@@ -67,11 +67,11 @@ protected:
friend class NFeedDialog;
};
-class NFeedInfo : public NFeedWidget
+class NFeedProperties : public NFeedWidget
{
Q_OBJECT
public:
- NFeedInfo(const QString&, QWidget *parent=NULL);
+ NFeedProperties(const QString&, QWidget *parent=NULL);
protected:
virtual void init();
private slots:
diff --git a/src/feed/nfeeddialog_info.cpp b/src/feed/nfeeddialog_properties.cpp
similarity index 94%
rename from src/feed/nfeeddialog_info.cpp
rename to src/feed/nfeeddialog_properties.cpp
index b81c2bc..a458999 100644
--- a/src/feed/nfeeddialog_info.cpp
+++ b/src/feed/nfeeddialog_properties.cpp
@@ -68,7 +68,8 @@ static const char *tooltips[] =
typedef enum { Uploads=0x00, Favorites, Playlist } Type;
typedef enum { All=0x00, Select } Mode;
-NFeedInfo::NFeedInfo(const QString& umphPath, QWidget *parent/*=NULL*/)
+NFeedProperties::NFeedProperties(const QString& umphPath,
+ QWidget *parent/*=NULL*/)
: NFeedWidget(parent),
_rangeGroup(NULL),
_typeCombo(NULL),
@@ -167,29 +168,29 @@ NFeedInfo::NFeedInfo(const QString& umphPath, QWidget *parent/*=NULL*/)
setLayout(box);
}
-void NFeedInfo::init()
+void NFeedProperties::init()
{
reset();
typeChanged(_typeCombo->currentIndex());
modeChanged(_bgroup->checkedId());
}
-void NFeedInfo::enableRange(bool state/*=true*/)
+void NFeedProperties::enableRange(bool state/*=true*/)
{
_rangeGroup->setEnabled(state);
}
-void NFeedInfo::modeChanged(int n)
+void NFeedProperties::modeChanged(int n)
{
enableRange(n == Select);
}
-void NFeedInfo::typeChanged(int n)
+void NFeedProperties::typeChanged(int n)
{
_identLabel->setText(n == 2 ? tr("I&D") : tr("for &user"));
}
-void NFeedInfo::parse()
+void NFeedProperties::parse()
{
if (_identEdit->text().isEmpty())
{
@@ -224,7 +225,7 @@ void NFeedInfo::parse()
emit parse(args);
}
-void NFeedInfo::reset()
+void NFeedProperties::reset()
{
_typeCombo->setCurrentIndex(0);
_indexSpin->setValue(1);
-----------------------------------------------------------------------
Summary of changes:
src/Makefile.am | 2 +-
src/feed/nfeeddialog.cpp | 6 +++---
src/feed/nfeeddialog.h | 4 ++--
...ddialog_info.cpp => nfeeddialog_properties.cpp} | 15 ++++++++-------
4 files changed, 14 insertions(+), 13 deletions(-)
rename src/feed/{nfeeddialog_info.cpp => nfeeddialog_properties.cpp} (94%)
repo.or.cz automatic notification. Contact project admin le...@gm...
if you want to unsubscribe, or site admin ad...@re... if you receive
no reply.
--
nomnom.git ("The graphical media download tool")
|
|
From: <nom...@li...> - 2011-10-12 09:32:05
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project nomnom.git.
The branch, next has been updated
via 7b174464bfc6553dce9f480879f2b05298933eff (commit)
via 04cd7a41d9996707e4c6247c906c35df4648d678 (commit)
from 49cc661bc8b553d62b73bed771b121f00c341cb1 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://repo.or.cz/w/nomnom.git/commit/7b174464bfc6553dce9f480879f2b05298933eff
commit 7b174464bfc6553dce9f480879f2b05298933eff
Author: Toni Gundogdu <le...@gm...>
Date: Wed Oct 12 12:12:52 2011 +0300
Use umph returned output as error message
* If "error:" was not matched
diff --git a/src/feed/nfeedprogressdialog.cpp b/src/feed/nfeedprogressdialog.cpp
index 1774c49..c82fb4c 100644
--- a/src/feed/nfeedprogressdialog.cpp
+++ b/src/feed/nfeedprogressdialog.cpp
@@ -130,7 +130,7 @@ void NFeedProgressDialog::finished(int ec, QProcess::ExitStatus es)
if (rx.indexIn(_buffer) != -1)
_errmsg = rx.cap(1).simplified();
else
- _errmsg = tr("Unknown error occurred");
+ _errmsg = _buffer;
}
}
cancel();
http://repo.or.cz/w/nomnom.git/commit/04cd7a41d9996707e4c6247c906c35df4648d678
commit 04cd7a41d9996707e4c6247c906c35df4648d678
Author: Toni Gundogdu <le...@gm...>
Date: Wed Oct 12 12:04:35 2011 +0300
Prompt for parsing a feed if the list is empty
diff --git a/src/feed/nfeeddialog.cpp b/src/feed/nfeeddialog.cpp
index 45c6745..980458c 100644
--- a/src/feed/nfeeddialog.cpp
+++ b/src/feed/nfeeddialog.cpp
@@ -77,8 +77,16 @@ void NFeedDialog::done(int n)
{
if (_selected.isEmpty())
{
- _toolbox->setCurrentIndex(1);
- m_info(this, tr("Please select an item from the list"));
+ if (feedItems.count() == 0)
+ {
+ _toolbox->setCurrentIndex(0);
+ m_info(this, tr("Please read a feed"));
+ }
+ else
+ {
+ _toolbox->setCurrentIndex(1);
+ m_info(this, tr("Please select an item from the list"));
+ }
return;
}
}
-----------------------------------------------------------------------
Summary of changes:
src/feed/nfeeddialog.cpp | 12 ++++++++++--
src/feed/nfeedprogressdialog.cpp | 2 +-
2 files changed, 11 insertions(+), 3 deletions(-)
repo.or.cz automatic notification. Contact project admin le...@gm...
if you want to unsubscribe, or site admin ad...@re... if you receive
no reply.
--
nomnom.git ("The graphical media download tool")
|
|
From: legatvs <le...@gm...> - 2011-10-12 06:08:07
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project nomnom.git.
The branch, next has been updated
via 49cc661bc8b553d62b73bed771b121f00c341cb1 (commit)
from a54a487fa5a46e481136443ecb86d94a489678ee (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://repo.or.cz/w/nomnom.git/commit/49cc661bc8b553d62b73bed771b121f00c341cb1
commit 49cc661bc8b553d62b73bed771b121f00c341cb1
Author: Toni Gundogdu <le...@gm...>
Date: Tue Oct 11 14:06:03 2011 +0300
Use QProcess::errorString instead
diff --git a/src/feed/nfeedprogressdialog.cpp b/src/feed/nfeedprogressdialog.cpp
index 27a25f4..1774c49 100644
--- a/src/feed/nfeedprogressdialog.cpp
+++ b/src/feed/nfeedprogressdialog.cpp
@@ -50,6 +50,7 @@ bool NFeedProgressDialog::open(QStringList& args)
_errmsg.clear();
setMaximum(0);
setMinimum(0);
+ _args = args;
show();
_proc->start(args.takeFirst(), args);
exec();
@@ -99,48 +100,16 @@ bool NFeedProgressDialog::results(feed::NFeedList& dst, QString& err)
return true;
}
-static QString to_errmsg(const QProcess::ProcessError e)
+void NFeedProgressDialog::error(QProcess::ProcessError n)
{
- QString s;
- switch (e)
+ if (!_cancelled)
{
- case QProcess::FailedToStart:
- s = QObject::tr("The process failed to start. Either the invoked "
- "program is missing, or you may have insufficient "
- "permissions to invoke the program.");
- break;
- case QProcess::Crashed:
- s = QObject::tr("The process crashed some time after "
- "starting successfully.");
- break;
- case QProcess::Timedout:
- s = QObject::tr("The last waitFor...() function timed out. "
- "The state of QProcess is unchanged, and you "
- "can try calling waitFor...() again.");
- break;
- case QProcess::WriteError:
- s = QObject::tr("An error occurred when attempting to write "
- "to the process. For example, the process may "
- "not be running, or it may have closed its input "
- "channel.");
- break;
- case QProcess::ReadError:
- s = QObject::tr("An error occurred when attempting to read "
- "from the process. For example, the process "
- "may not be running.");
- break;
- case QProcess::UnknownError:
- default:
- s = QObject::tr("An unknown error occurred.");
- break;
+ _errmsg = tr("Error while running command:<p>%1</p>"
+ "Qt error message follows (code #%2):<p>%3</p>")
+ .arg(_args.first())
+ .arg(n)
+ .arg(_proc->errorString());
}
- return s;
-}
-
-void NFeedProgressDialog::error(QProcess::ProcessError e)
-{
- if (!_cancelled)
- _errmsg = to_errmsg(e);
cancel();
}
diff --git a/src/feed/nfeedprogressdialog.h b/src/feed/nfeedprogressdialog.h
index c59c46c..bc4658f 100644
--- a/src/feed/nfeedprogressdialog.h
+++ b/src/feed/nfeedprogressdialog.h
@@ -44,6 +44,7 @@ private slots:
void cleanup();
void read();
private:
+ QStringList _args;
QString _buffer;
QString _errmsg;
QProcess *_proc;
-----------------------------------------------------------------------
Summary of changes:
src/feed/nfeedprogressdialog.cpp | 47 ++++++-------------------------------
src/feed/nfeedprogressdialog.h | 1 +
2 files changed, 9 insertions(+), 39 deletions(-)
repo.or.cz automatic notification. Contact project admin le...@gm...
if you want to unsubscribe, or site admin ad...@re... if you receive
no reply.
--
nomnom.git ("The graphical media download tool")
|
