merged changes from the 0.3.x branch

git-svn-id: file:///home/tobias/sandbox/vdr/--/vdr-pkg/vdr-pkg/menuorg/trunk@6962 cd0d6b48-d4f9-0310-940f-ab8c4eb44d3f

11 files changed, 107 insertions, 14 deletions

diff --git a/HISTORY b/HISTORY
index 9e28ebb..d15c13a 100644
--- a/HISTORY
+++ b/HISTORY
@@ -15,10 +15,19 @@ VDR Plugin 'menuorg' Revision History
 - Fixed charset conversion for menu titles. They will now explicitly be converted
   to VDR's locale charset falling back to ISO8859-2 on conversion errors.
 
+2007-12-11: Version 0.3.1
+
+- Applied I18N-Patch from Thomas Guenther for VDR 1.5.12
+- Fixed Problem with hidden plug-in menu entries or plug-ins without a main menu
+  item
+
+2007-12-17: Version 0.3.2
+
+- Added Italian translation from the Italian VDR Community <vdr-italian@tiscali.it>
+
 UNRELEASED: Version 0.4
 
 - Added optional title attribute for system and plugin menu items
 - Added Setup OSD and Setup parameter load and save routines
 - Added a Seperator Item definition
 - Now an empty submenu can exist
-
diff --git a/README b/README
index c1946f6..c0109e3 100644
--- a/README
+++ b/README
@@ -1,9 +1,14 @@
 This is a plug-in for the Video Disk Recorder (VDR).
 
-Written by:                  Thomas Creutz <thomas.creutz@gmx.de>
-                             Tobias Grimm <tg@e-tobi.net>
+Written by:
+    Thomas Creutz <thomas.creutz@gmx.de>
+    Tobias Grimm <tg@e-tobi.net>
 
-Project's homepage:          http://www.e-tobi.net/blog/pages/vdr-menuorg
+Italian translation:
+    The Italian VDR Community - Gringo <vdr-italian@tiscali.it>
+
+Project's homepage:
+    http://www.e-tobi.net/blog/pages/vdr-menuorg
 
 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
diff --git a/TODO b/TODO
index af1c8bf..36f37c1 100644
--- a/TODO
+++ b/TODO
@@ -1,7 +1,8 @@
 
-Some Stuff that whe would integrade in future version:
+Some stuff that we would integrate in future version:
 
 - Setup OSD for managing the submenu
 - reload the config file when opening mainmenu (only when menu configuration has been changed - checking timestamp of xml!)
 - Enable / Disable in OSD-Setup
 - When leaving a sub menu position the selection to the menu entry (requires the patch to be changed)
+- const correctness!
diff --git a/debian/changelog b/debian/changelog
index dc598d5..d353cc5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,60 @@
-vdr-plugin-menuorg (0.1-1) UNRELEASED; urgency=low
+vdr-plugin-menuorg (0.3.1-1) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
+
+ -- Tobias Grimm <tg@e-tobi.net>  Mon, 26 Nov 2007 21:26:56 +0100
+
+vdr-plugin-menuorg (0.3-7) unstable; urgency=low
+
+  * Fixed 90_menuorg-0.3-1.5.9.dpatch to build with VDR 1.4 as well
+
+ -- Tobias Grimm <tg@e-tobi.net>  Mon, 26 Nov 2007 21:17:41 +0100
+
+vdr-plugin-menuorg (0.3-6) unstable; urgency=low
+
+  * Release for vdrdevel 1.5.12
+
+ -- Thomas Günther <tom@toms-cafe.de>  Tue, 20 Nov 2007 23:46:21 +0100
+
+vdr-plugin-menuorg (0.3-5) unstable; urgency=low
+
+  * Release for vdrdevel 1.5.11
+
+ -- Thomas Günther <tom@toms-cafe.de>  Tue,  6 Nov 2007 23:34:14 +0100
+
+vdr-plugin-menuorg (0.3-4) unstable; urgency=low
+
+  * Release for vdrdevel 1.5.10
+
+ -- Thomas Günther <tom@toms-cafe.de>  Tue, 16 Oct 2007 23:50:55 +0200
+
+vdr-plugin-menuorg (0.3-3) unstable; urgency=low
+
+  * Added 90_menuorg-0.3-1.5.9.dpatch
+
+ -- Thomas Günther <tom@toms-cafe.de>  Wed, 29 Aug 2007 01:44:00 +0200
+
+vdr-plugin-menuorg (0.3-2) unstable; urgency=low
+
+  * Release for vdrdevel 1.5.9
+
+ -- Thomas Günther <tom@toms-cafe.de>  Tue, 28 Aug 2007 01:01:06 +0200
+
+vdr-plugin-menuorg (0.3-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Tobias Grimm <tg@e-tobi.net>  Sat, 25 Aug 2007 21:48:43 +0200
+
+vdr-plugin-menuorg (0.2-1) unstable; urgency=low
+
+  * New upstream release (fixes issue with burn plug-in)
+
+ -- Tobias Grimm <tg@e-tobi.net>  Sat, 25 Aug 2007 20:26:09 +0200
+
+vdr-plugin-menuorg (0.1-1) unstable; urgency=low
+
   * Initial release
 
- -- Tobias Grimm <tg@e-tobi.net>  Sun, 22 Jul 2007 00:25:20 +0200
+ -- Tobias Grimm <tg@e-tobi.net>  Fri, 24 Aug 2007 21:27:05 +0200
 
diff --git a/debian/control b/debian/control
index 6dc55ba..94c8f0a 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: vdr-plugin-menuorg
 Section: misc
 Priority: extra
 Maintainer: Tobias Grimm <tg@e-tobi.net>
-Build-Depends: debhelper (>= 5), vdr-dev (>= 1.4.7-2ctvdr1), libxml++2.6-dev
+Build-Depends: debhelper (>= 5), vdr-dev (>= 1.4.7-2ctvdr1), libxml++2.6-dev, libglibmm-2.4-dev
 Standards-Version: 3.7.2
 
 Package: vdr-plugin-menuorg
@@ -11,8 +11,8 @@ Depends: ${shlibs:Depends}, ${vdr:Depends}
 Conflicts: vdr-plugin-submenu (<< 0.0.2-35)
 Replaces: vdr-plugin-submenu (<< 0.0.2-35)
 Description: A VDR plug-in to reorganize the OSD main menu
- This plug-in for the Linux Video Disc Recorder VDR, allows the main menu in
+ This plug-in for the Linux Video Disc Recorder VDR allows the main menu in
  VDR's On Screen Display to be reorganized. The order of the displayed menu
- items can be changed and sub menus can be created. Besides this, additional
- "command" menu items can be added, that will execute any system commands.
+ items can be changed and sub menus can be created. Besides this additional
+ "command" menu items can be added, which will execute any system commands.
 XB-VDR-Patchlevel: ${vdr:Patchlevel}
diff --git a/debian/examples b/debian/examples
new file mode 100644
index 0000000..e8fc762
--- /dev/null
+++ b/debian/examples
@@ -0,0 +1 @@
+menuorg.xml
diff --git a/debian/install b/debian/install
index 5c38b81..ec489ee 100644
--- a/debian/install
+++ b/debian/install
@@ -1,4 +1,5 @@
 libvdr-menuorg.so.*        usr/lib/vdr/plugins/
 menuorg.xml                usr/share/vdr-plugin-menuorg/
 menuorg.dtd                usr/share/vdr-plugin-menuorg/
+debian/menuorg.xml.minimum usr/share/vdr-plugin-menuorg/
 vdr-submenu2menuorg        usr/bin/
diff --git a/debian/menuorg.xml.minimum b/debian/menuorg.xml.minimum
new file mode 100644
index 0000000..936088b
--- /dev/null
+++ b/debian/menuorg.xml.minimum
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+This is the config file for the Menuorg plug-in.
+
+See /usr/share/doc/vdr-plugin-menurg for examples and a full 
+description of the config file format.
+
+-->
+<menus>
+    <system name="Schedule" />
+    <system name="Channels" />
+    <system name="Timers" />
+    <system name="Recordings" />
+    <system name="Setup" />
+    <system name="Commands" />
+</menus>
diff --git a/debian/postinst b/debian/postinst
index 8f8346d..5c804ef 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -22,7 +22,7 @@ MENUORG_XML=/var/lib/vdr/plugins/menuorg.xml
 case "$1" in
     configure)
         [ -e "$MENUORG_XML" ] || \
-          cp /usr/share/vdr-plugin-menuorg/menuorg.xml "$MENUORG_XML"
+          cp /usr/share/vdr-plugin-menuorg/menuorg.xml.minimum "$MENUORG_XML"
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)
diff --git a/src/i18n.cpp b/src/i18n.cpp
index ab5a7a6..d17cc13 100644
--- a/src/i18n.cpp
+++ b/src/i18n.cpp
@@ -20,6 +20,12 @@
  *
  */
 
+/* 
+ * Translators:
+ *     - Italian translations provided by Gringo <vdr-italian@tiscali.it>
+ *
+ */
+
 #include "i18n.h"
 
 const tI18nPhrase Phrases[] = 
@@ -28,7 +34,7 @@ const tI18nPhrase Phrases[] =
         "Failed to load MenuOrg's config file!",                // 1  English
         "Konnte die MenuOrg Konfigurationsdatei nicht laden",   // 2  Deutsch
         "",                                                     // 3  Slovenski
-        "",                                                     // 4  Italiano
+        "Impossibile caricare il file di configurazione MenuOrg", // 4  Italiano
         "",                                                     // 5  Nederlands
         "",                                                     // 6  Português
         "",                                                     // 7  Français
@@ -207,7 +213,6 @@ const tI18nPhrase Phrases[] =
         "",
         "",
         "",
-        "",
     },
     { NULL }
 };
diff --git a/src/i18n.h b/src/i18n.h
index 739759c..65a1ed1 100644
--- a/src/i18n.h
+++ b/src/i18n.h
@@ -24,6 +24,7 @@
 #define ___I18N__H
 
 #include <vdr/i18n.h>
+#include <vdr/config.h>
 
 extern const tI18nPhrase Phrases[];