[repo.or.cz] nomnom.git branch next updated: 0.1.4-35-ga4fab83

[<nom...@li...>]

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")