From 0e4b2437946b776a1bd0c00ed43b68cec344a1b2 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 4 Sep 2012 02:09:11 -0500
Subject: mythtv: fixed and cleaned some menus. Closes #846

---
 abs/core/mythtv/stable-0.25/git_src/git_hash       |   2 +-
 abs/core/mythtv/stable-0.25/mythtv/PKGBUILD        |   2 +-
 .../stable-0.25/mythtv/menu-xml/HOST_SETTINGS.xml  |  93 +++++++++--------
 .../stable-0.25/mythtv/menu-xml/info_menu.xml      |  76 ++++++++++++++
 .../mythtv/stable-0.25/mythtv/menu-xml/linhes.xml  |   1 +
 .../mythtv/stable-0.25/mythtv/menu-xml/setup.xml   | 111 ---------------------
 6 files changed, 125 insertions(+), 160 deletions(-)
 create mode 100644 abs/core/mythtv/stable-0.25/mythtv/menu-xml/info_menu.xml
 delete mode 100644 abs/core/mythtv/stable-0.25/mythtv/menu-xml/setup.xml

diff --git a/abs/core/mythtv/stable-0.25/git_src/git_hash b/abs/core/mythtv/stable-0.25/git_src/git_hash
index 83e574c..8e5da8e 100644
--- a/abs/core/mythtv/stable-0.25/git_src/git_hash
+++ b/abs/core/mythtv/stable-0.25/git_src/git_hash
@@ -1 +1 @@
-46cab93562429cd19029402a2387f63a72aeb898
+d51927663b67c7c035108270a31bf14aed68bcdb
diff --git a/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD b/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD
index d4daf76..9ccfdbd 100644
--- a/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD
+++ b/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=mythtv
 pkgver=0.25
-pkgrel=12
+pkgrel=13
 commit_hash=`cat ../git_src/git_hash`
 pkgdesc="A Homebrew PVR project $commit_hash"
 arch=('i686' 'x86_64')
diff --git a/abs/core/mythtv/stable-0.25/mythtv/menu-xml/HOST_SETTINGS.xml b/abs/core/mythtv/stable-0.25/mythtv/menu-xml/HOST_SETTINGS.xml
index c436423..895c337 100644
--- a/abs/core/mythtv/stable-0.25/mythtv/menu-xml/HOST_SETTINGS.xml
+++ b/abs/core/mythtv/stable-0.25/mythtv/menu-xml/HOST_SETTINGS.xml
@@ -1,78 +1,77 @@
 <mythmenu name="HOST_SETTINGS">
 
    <button>
-      <type>MV_NETWORK_SETUP_MENU</type>
-      <text>Network Settings</text>
-      <action>EXEC  mythinstall -s network </action>
+      <type>MV_ACCESS_SETUP_MENU</type>
+      <text>Access Control</text>
+      <action>EXEC  mythinstall -s accesscontrol </action>
    </button>
-
+   
    <button>
-      <type>MV_NETWORK_SETUP_MENU</type>
-      <text>DDNS Settings</text>
-      <action>EXEC  mythinstall -s ddns </action>
+      <type>MV_ADVANCED_SETUP_MENU</type>
+      <text>Advanced</text>
+      <action>EXEC  mythinstall -s advanced</action>
    </button>
+
    <button>
-      <type>MV_SYSTEM_SETUP_MENU</type>
-      <text>System Type</text>
-      <action>EXEC  mythinstall -s hostype </action>
+      <type>MV_AUDIO_SETUP_MENU</type>
+      <text>Audio</text>
+       <action>EXEC  mythinstall -s sound </action>
    </button>
 
    <button>
-      <type>MV_SCREENSAVER_SETUP_MENU</type>
-      <text>Screensaver Settings</text>
-      <action>EXEC  mythinstall -s screensaver </action>
+      <type>MV_ADVANCED_X_SETUP_MENU</type>
+      <text>Display</text>
+      <action>EXEC  mythinstall -s advancedX</action>
    </button>
-
+   
    <button>
-      <type>MV_IR_SETUP_MENU</type>
-      <text>Remotes</text>
-       <action>EXEC  mythinstall -s ir </action>
+      <type>MV_NETWORK_SETUP_MENU</type>
+      <text>Dynamic DNS</text>
+      <action>EXEC  mythinstall -s ddns </action>
    </button>
-
+   
    <button>
       <type>MV_MISC_SETUP_MENU</type>
-      <text>Miscellanous Settings</text>
+      <text>Miscellanous</text>
       <action>EXEC  mythinstall -s misc </action>
    </button>
-
+   
    <button>
-      <type>MV_SOFTWARE_MENU</type>
-      <text>Software</text>
-      <action>EXEC  mythinstall -s  plugins,software </action>
+      <type>MV_NETWORK_SETUP_MENU</type>
+      <text>Network</text>
+      <action>EXEC  mythinstall -s network </action>
    </button>
-
-
-
+   
    <button>
-      <type>MV_SHUTDOWN_SETUP_MENU</type>
-      <text>Shutdown Settings</text>
-      <action>EXEC  mythinstall -s sleep </action>
+      <type>MV_IR_SETUP_MENU</type>
+      <text>Remotes</text>
+       <action>EXEC  mythinstall -s ir </action>
    </button>
-
+   
    <button>
-      <type>MV_ADVANCED_X_SETUP_MENU</type>
-      <text>Display Settings</text>
-      <action>EXEC  mythinstall -s advancedX</action>
+      <type>MV_SCREENSAVER_SETUP_MENU</type>
+      <text>Screensaver</text>
+      <action>EXEC  mythinstall -s screensaver </action>
    </button>
-
+   
    <button>
-      <type>MV_ADVANCED_SETUP_MENU</type>
-      <text>Advanced Settings</text>
-      <action>EXEC  mythinstall -s advanced</action>
+      <type>MV_SHUTDOWN_SETUP_MENU</type>
+      <text>Shutdown</text>
+      <action>EXEC  mythinstall -s sleep </action>
    </button>
-
+   
    <button>
-      <type>MV_AUDIO_SETUP_MENU</type>
-      <text>Audio Settings</text>
-       <action>EXEC  mythinstall -s sound </action>
+      <type>MV_SOFTWARE_MENU</type>
+      <text>Software</text>
+      <action>EXEC  mythinstall -s  plugins,software </action>
    </button>
-
+   
    <button>
-      <type>MV_ACCESS_SETUP_MENU</type>
-      <text>Access Control</text>
-      <action>EXEC  mythinstall -s accesscontrol </action>
-   </button>
-
+      <type>MV_SYSTEM_SETUP_MENU</type>
+      <text>System Type</text>
+      <action>EXEC  mythinstall -s hostype </action>
+   </button>   
+   
    <button>
       <type>MV_USER_SETUP_MENU</type>
       <text>User Accounts</text>
diff --git a/abs/core/mythtv/stable-0.25/mythtv/menu-xml/info_menu.xml b/abs/core/mythtv/stable-0.25/mythtv/menu-xml/info_menu.xml
new file mode 100644
index 0000000..017f90b
--- /dev/null
+++ b/abs/core/mythtv/stable-0.25/mythtv/menu-xml/info_menu.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<mythmenu name="INFO">
+
+    <button>
+        <type>NEWS</type>
+        <text>News Feeds</text>
+        <description>Keep up with the news</description>
+        <action>PLUGIN mythnews</action>
+        <depends>mythnews</depends>
+    </button>
+
+    <button>
+        <type>MYTHTWITTER_TIMELINE</type>
+        <text>Twitter</text>
+        <description>Send and receive tweets</description>
+        <action>JUMP MythTwitter_Timeline</action>
+        <depends>mythtwitter</depends>
+    </button>
+
+    <button>
+        <type>WEATHER</type>
+        <text>Weather</text>
+        <action>PLUGIN mythweather</action>
+        <description>Local weather forecast</description>
+        <depends>mythweather</depends>
+    </button>
+
+    <button>
+       <type>WEATHER</type>
+        <text>Weather Station</text>
+        <action>PLUGIN mythwstation</action>
+        <depends>mythwstation</depends>
+    </button>
+
+    <button>
+        <type>WEBPAGE</type>
+        <text>Web</text>
+        <description>Browse the web</description>
+        <action>PLUGIN mythbrowser</action>
+        <depends>mythbrowser</depends>
+    </button>
+
+    <button>
+        <type>RECIPE</type>
+        <text>Recipes</text>
+        <description>Start cooking!</description>
+        <action>PLUGIN mythRecipe</action>
+        <depends>mythrecipe</depends>
+    </button>
+
+    <button>
+        <type>TV_STATUS</type>
+        <text>System Status</text>
+        <description>See what your system is doing</description>
+        <action>TV_STATUS</action>
+    </button>
+
+    <button>
+        <type>ZONEMINDER</type>
+        <text>ZoneMinder</text>
+        <description>Home surveillance</description>
+        <action>PLUGIN mythzoneminder</action>
+        <depends>mythzoneminder</depends>
+ </button>
+
+<!-- 
+ <button>
+        <type>SMOLT</type>
+        <text>Hardware profile</text>
+        <description>Tell us what hardware you have so we can support it</description>
+        <action>PLUGIN mythsmolt</action>
+        <depends>mythsmolt</depends>
+ </button>
+ -->
+
+</mythmenu>
diff --git a/abs/core/mythtv/stable-0.25/mythtv/menu-xml/linhes.xml b/abs/core/mythtv/stable-0.25/mythtv/menu-xml/linhes.xml
index 01b6ffa..342766d 100644
--- a/abs/core/mythtv/stable-0.25/mythtv/menu-xml/linhes.xml
+++ b/abs/core/mythtv/stable-0.25/mythtv/menu-xml/linhes.xml
@@ -34,6 +34,7 @@
    <button>
      <type>LINHES_SETUP</type>
      <text>LinHES Configuration</text>
+     <description>Configure LinHES</description>
      <action>MENU HOST_SETTINGS.xml</action>
    </button>
 
diff --git a/abs/core/mythtv/stable-0.25/mythtv/menu-xml/setup.xml b/abs/core/mythtv/stable-0.25/mythtv/menu-xml/setup.xml
deleted file mode 100644
index f56bb6f..0000000
--- a/abs/core/mythtv/stable-0.25/mythtv/menu-xml/setup.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<mythmenu name="MAIN">
-
-   <button>
-     <type>SETUP_GENERAL</type>
-     <text>1. General</text>
-     <text lang="IT">1. Generale</text>
-     <text lang="PT">1. Geral</text>
-     <text lang="SV">1. Generellt</text>
-     <text lang="JA">1. 一般</text>
-     <text lang="DE">1. Allgemeines</text>
-     <text lang="FI">1. Yleiset</text>
-     <text lang="FR">1. Général</text>
-     <text lang="SI">1. Splošno</text>
-     <text lang="ET">1. Üldine</text>
-     <text lang="NB">1 Generelt</text>
-     <text lang="DK">1. Generelt</text>
-     <text lang="ES">1. General</text>
-     <text lang="CZ">1. Obecný</text>
-     <text lang="RU">1. Общие</text>
-     <action>GENERAL</action>
-   </button>
-
-   <button>
-     <type>SETUP_CAPTURE_CARDS</type>
-     <text>2. Capture cards</text>
-     <text lang="IT">2. Schede di Acquisizione</text>
-     <text lang="PT">2. Placas de Captura</text>
-     <text lang="SV">2. TV-kort</text>
-     <text lang="JA">2. キャプチャカード</text>
-     <text lang="DE">2. TV-Karten</text>
-     <text lang="FI">2. TV-kortit</text>
-     <text lang="FR">2. Cartes d'acquisition</text>
-     <text lang="SI">2. Kartice za zajem</text>
-     <text lang="ET">2. TV-kaardid</text>
-     <text lang="NB">2 TV-kort</text>
-     <text lang="DK">2. TV-kort</text>
-     <text lang="ES">2. Capturadoras</text>
-     <text lang="CZ">2. Zachytávací karty</text>
-     <text lang="RU">2. Карты захвата</text>
-     <action>CAPTURE CARDS</action>
-   </button>
-
-   <button>
-     <type>SETUP_VIDEO_SOURCES</type>
-     <text>3. Video sources</text>
-     <text lang="IT">3. Fonte Video</text>
-     <text lang="PT">3. Fontes de Vídeo</text>
-     <text lang="SV">3. Videokällor</text>
-     <text lang="JA">3. ビデオソース</text>
-     <text lang="DE">3. Videoquellen</text>
-     <text lang="FI">3. Kuvanlähteet</text>
-     <text lang="FR">3. Sources vidéo</text>
-     <text lang="SI">3. Video viri</text>
-     <text lang="ET">3. Videosisendid</text>
-     <text lang="NB">3 Videokilder</text>
-     <text lang="DK">3. Videokilder</text>
-     <text lang="ES">3. Fuentes de Vídeo</text>
-     <text lang="CZ">3. Zdroje obrazu</text>
-     <text lang="RU">3. Видео источники</text>
-     <action>VIDEO SOURCES</action>
-   </button>
-
-   <button>
-     <type>SETUP_INPUT_CONNECTIONS</type>
-     <text>4. Input connections</text>
-     <text lang="IT">4. Connessioni di Ingresso</text>
-     <text lang="PT">4. Ligações de Entrada</text>
-     <text lang="SV">4. Anslutningar</text>
-     <text lang="JA">4. 入力とソースの接続</text>
-     <text lang="DE">4. Verknüpfungen</text>
-     <text lang="FI">4. Sisääntuloasetukset</text>
-     <text lang="FR">4. Entrées Vidéos</text>
-     <text lang="SI">4. Vhodne povezave</text>
-     <text lang="ET">4. Sisendite ühendused</text>
-     <text lang="NB">4 Inndata</text>
-     <text lang="DK">4. Indgange</text>
-     <text lang="ES">4. Conexiones</text>
-     <text lang="CZ">4. Připojení vstupů</text>
-     <text lang="RU">4. Соединение входов</text>
-     <action>CARD INPUTS</action>
-   </button>
-
-   <button>
-     <type>SETUP_CHANNEL_EDITOR</type>
-     <text>5. Channel Editor</text>
-     <text lang="IT">5. Modifica Canali</text>
-     <text lang="SV">5. Kanaleditor</text>
-     <text lang="JA">5. チャンネル設定</text>
-     <text lang="DE">5. Sender bearbeiten</text>
-     <text lang="FI">5. Kanavanviritys</text>
-     <text lang="FR">5. Editeur de chaînes</text>
-     <text lang="SI">5. Urejanje kanalov</text>
-     <text lang="ET">5. Kanaliredaktor</text>
-     <text lang="NB">5 Kanalredigerer</text>
-     <text lang="DK">5. Kanal opsætning</text>
-     <text lang="ES">5. Editor Canales</text>
-     <text lang="CZ">5. Editor kanálů</text>
-     <text lang="RU">5. Редактор каналов</text>
-     <action>CHANNEL EDITOR</action>
-   </button>
-
-   <button>
-     <type>SETUP_STORAGE_GROUPS</type>
-     <text>6. Storage Directories</text>
-     <text lang="IT">6. Cartelle</text>
-     <text lang="FI">Tallennusryhmät</text>
-     <text lang="SV">Lagringsgrupper</text>
-     <action>STORAGE GROUPS</action>
-   </button>
-
-</mythmenu>
-- 
cgit v0.12

