Merge branch 'testing'

13 files changed, 162 insertions, 18 deletions

diff --git a/abs/core/mythinstall/PKGBUILD b/abs/core/mythinstall/PKGBUILD
index 7a953a5..7f2bef6 100644
--- a/abs/core/mythinstall/PKGBUILD
+++ b/abs/core/mythinstall/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Jams
 pkgname=mythinstall
 pkgver=3
-pkgrel=76
+pkgrel=80
 pkgdesc="LinHES installer/systemconfig GUI."
 arch=('i686'  'x86_64')
 depends=('mythtv>=0.25')
@@ -9,30 +9,31 @@ makedepends=('mythtv>=0.25')
 logofiles=`ls logo*.png`
 source=('install-ui.xml' $logofiles)
 
-build() {
+package() {
 #   It is assumed that you have built the mythtv package in the same 
-    cd $startdir
-    cd -
+    #cd $startdir
+    #cd -
     #install -D MythVantage-app/mythinstall/install-ui.xml $pkgdir/usr/share/mythtv/themes/default/install-ui.xml
     install -D $srcdir/install-ui.xml $pkgdir/usr/share/mythtv/themes/default/install-ui.xml
-    MVBINDIR=$startdir/pkg/usr/MythVantage/bin
+    MVBINDIR=$pkgdir/usr/MythVantage/bin
     mkdir -p $MVBINDIR
     install -m 0755 $startdir/mythinstall.bin $MVBINDIR/MythVantage
     cd $MVBINDIR
     ln -s MythVantage mythvantage
     ln -s MythVantage mythinstall
-    cd -
-    
+    #cd -
+echo $logofiles    
     for i in $logofiles
     do
-       install -D -m 0755 $startdir/$i $startdir/pkg/usr/MythVantage/logos/$i
+       install -D -m 0755 $srcdir/$i $pkgdir/usr/MythVantage/logos/$i
     done
 
 }
 md5sums=('39d6b7bd1ee305c5523a3cf66d4c2338'
-         '137ba1bf74cc13feb1ca0038dc5ed5fc'
-         '1d5064ac3c871f0aa895c95a71ba5c97'
-         'b4f9b52cdd2936e0a8dd4e3dd7cac344'
-         '4e748680e67ff8bd0614fd5c63abda9c'
-         '72fc7d8147c08336dd1064f9051f43ea'
-         'f6705520bc0a6655157cd14efdaac746')
+         '3291ad55fe6d7884fc732313f1cc2924'
+         '80c0326a253df275afbe875a8ec14a3c'
+         '46925d6fbcb7ec1fc51714d03ac6b72d'
+         '27ce7f89a83864dfc5abe23c61964c0c'
+         '2e85a1b9559557dade6e87daf2abb673'
+         '7f3045f740760c828e2e18293c2a4ab1'
+         '91393e9cca0e6168f772fb48c88d3829')
diff --git a/abs/core/mythinstall/checkout_MythVantage.sh b/abs/core/mythinstall/checkout_MythVantage.sh
index ecc7cd0..e0d4b0c 100755
--- a/abs/core/mythinstall/checkout_MythVantage.sh
+++ b/abs/core/mythinstall/checkout_MythVantage.sh
@@ -56,11 +56,14 @@ sed -i "s/mythvantage/LinHES/g" $MYDIR/src/MythVantage-app/mythinstall/mv_common
 
 #echo 'INCLUDEPATH += $$MYTHPATH/mythtv/libs/libmythtv/' >> $MYDIR/src/MythVantage-app/mythinstall/mythinstall.pro
 
+#remove hitchhiker guide to timezones
+patch -N $MYDIR/src/MythVantage-app/mythinstall/misc_settings.cpp < $MYDIR/misc_settings.cpp.patch
+patch -N $MYDIR/src/MythVantage-app/mythinstall/misc_settings.h < $MYDIR/misc_settings.h.patch
+
+#update help screen
+patch -N $MYDIR/src/MythVantage-app/mythinstall/main.cpp < $MYDIR/main.cpp.patch
+
 cd $MYDIR/src/MythVantage-app/mythinstall && qmake
 make || exit 1
 #cd $MYDIR/src/MythVantage-app/mythbeselect && qmake
 #make ||exit 1
-
-
-
-
diff --git a/abs/core/mythinstall/logo-1.png b/abs/core/mythinstall/logo-1.png
index 5a4293c..a63adab 100644
--- a/abs/core/mythinstall/logo-1.png
+++ b/abs/core/mythinstall/logo-1.png
diff --git a/abs/core/mythinstall/logo-2.png b/abs/core/mythinstall/logo-2.png
index cb6f152..2b6e9b7 100644
--- a/abs/core/mythinstall/logo-2.png
+++ b/abs/core/mythinstall/logo-2.png
diff --git a/abs/core/mythinstall/logo-3.png b/abs/core/mythinstall/logo-3.png
index 0a59252..8fff988 100644
--- a/abs/core/mythinstall/logo-3.png
+++ b/abs/core/mythinstall/logo-3.png
diff --git a/abs/core/mythinstall/logo-4.png b/abs/core/mythinstall/logo-4.png
index 6e70af7..81012a3 100644
--- a/abs/core/mythinstall/logo-4.png
+++ b/abs/core/mythinstall/logo-4.png
diff --git a/abs/core/mythinstall/logo-5.png b/abs/core/mythinstall/logo-5.png
index 6f1ac44..8bd708d 100644
--- a/abs/core/mythinstall/logo-5.png
+++ b/abs/core/mythinstall/logo-5.png
diff --git a/abs/core/mythinstall/logo-6.png b/abs/core/mythinstall/logo-6.png
index 4c60fe6..d370e2e 100644
--- a/abs/core/mythinstall/logo-6.png
+++ b/abs/core/mythinstall/logo-6.png
diff --git a/abs/core/mythinstall/logo-7.png b/abs/core/mythinstall/logo-7.png
new file mode 100644
index 0000000..55a6cda
--- /dev/null
+++ b/abs/core/mythinstall/logo-7.png
diff --git a/abs/core/mythinstall/logo_src/ermine.png b/abs/core/mythinstall/logo_src/ermine.png
new file mode 100644
index 0000000..792f7cc
--- /dev/null
+++ b/abs/core/mythinstall/logo_src/ermine.png
diff --git a/abs/core/mythinstall/main.cpp.patch b/abs/core/mythinstall/main.cpp.patch
new file mode 100644
index 0000000..9c4c3ce
--- /dev/null
+++ b/abs/core/mythinstall/main.cpp.patch
@@ -0,0 +1,63 @@
+--- main.cpp.orig	2013-09-18 13:57:34.589499257 +0000
++++ main.cpp	2013-09-18 14:27:59.535328888 +0000
+@@ -445,38 +445,45 @@
+     {
+         DialogBox *dia = NULL;
+         QString prompt;
+-        QString *problems = new QString("			Help Screen");
++        QString *problems = new QString("LinHES Help");
+         problems->append("\n");
+-        problems->append("-------------------------------------------------");
++        problems->append("Visit http://linhes.org for additional help.");
+         problems->append("\n");
+-        problems->append("Alt+h This screen");
++        problems->append("\n");
++        problems->append("------Keyboard Shortcuts---------------------------------");
++        problems->append("\n");
++        problems->append("Alt + h: This Screen");
+         problems->append("\n");
+ #ifdef __MVAPP__
+-        problems->append("F2 open/close  terminal");
++        problems->append("F2: Open/Close Terminal");
+         problems->append("\n");
+-        problems->append("Shift + Return  opens new xterm");
++        problems->append("Shift + Return: Open New Terminal (xterm)");
+         problems->append("\n");
+-        problems->append("Alt+F2 for 2nd desktop  Alt+F1 to go back");
++        problems->append("Alt + F2: Show 2nd desktop  Alt + F1 To Go Back");
+         problems->append("\n");
+-        problems->append("Alt+c Capture myth screenshot");
++        problems->append("Alt + c: Capture Myth Screenshot");
+         problems->append("\n");
+ #else
+-        problems->append("Alt + X  opens new xterm ");
++        problems->append("Alt + x: Open New Terminal (xterm)");
+         problems->append("\n");
+-        problems->append("Alt + m  start mythfrontend");
++        problems->append("Alt + m: Open mythfrontend");
+         problems->append("\n");
+-        problems->append("m will display a popup for power/about");
++        problems->append("m in mythfrontend: Display Power/About Menu");
+         problems->append("\n");
+ #endif
+-        problems->append("Ctrl + Alt + u  unhide  mouse cursor");
++        problems->append("Alt + 1: Start Master mythbackend");
++        problems->append("\n");
++        problems->append("Alt + 2: Stop Master mythbackend");
++        problems->append("\n");
++        problems->append("Alt + 3: Restart Master mythbackend");
+         problems->append("\n");
+-        problems->append("Alt+1 start   masterbackend");
++        problems->append("Alt + s: Open mythtv-setup");
+         problems->append("\n");
+-        problems->append("Alt+2 stop    masterbackend");
++        problems->append("Alt + u: Unhide/Hide Mouse Pointer");
+         problems->append("\n");
+-        problems->append("Alt+3 restart masterbackend");
++        problems->append("Alt + w: Open Web Browser (Chrome if installed)");
+         problems->append("\n");
+-        problems->append("Alt+s  run mythtv-setup");
++        problems->append("Alt + f: Restart Window Manager");
+         problems->append("\n");
+ 
+ 
diff --git a/abs/core/mythinstall/misc_settings.cpp.patch b/abs/core/mythinstall/misc_settings.cpp.patch
new file mode 100644
index 0000000..75c4d8d
--- /dev/null
+++ b/abs/core/mythinstall/misc_settings.cpp.patch
@@ -0,0 +1,57 @@
+--- misc_settings.cpp.orig	2013-09-06 21:04:22.406221919 +0000
++++ misc_settings.cpp	2013-09-06 21:01:01.927900734 +0000
+@@ -74,17 +74,17 @@
+ //         miscsettings_2->addChild(HostZipcode());
+ 
+     TimezoneRegion *timezoneregion = new TimezoneRegion();
+-    TimezoneButton *timezonebutton = new TimezoneButton();
++//    TimezoneButton *timezonebutton = new TimezoneButton();
+ 
+     VerticalConfigurationGroup* miscsettings =
+         new VerticalConfigurationGroup(false, true,false,false);
+-    miscsettings->addChild(timezonebutton);
++//    miscsettings->addChild(timezonebutton);
+     if (  showLabels  && ( hostparm.ThisTimeZone != "" ))
+     {
+         if (MVAPP)
+         {
+             miscsettings->addChild(temptimezone);
+-            timezonebutton->disableButton();
++//            timezonebutton->disableButton();
+         }
+         else
+             miscsettings->addChild(timezoneregion);
+@@ -104,13 +104,13 @@
+ 
+ 
+ 
+-    connect(timezonebutton, SIGNAL(mf_launch_tzgui()),timezoneregion ,SLOT(timezone_gathersettings()));
++//    connect(timezonebutton, SIGNAL(mf_launch_tzgui()),timezoneregion ,SLOT(timezone_gathersettings()));
+ 
+     connect(timezoneregion,SIGNAL(mf_show_tz(QString)),this,SLOT(mf_show_tz(QString)));
+     connect(this,SIGNAL(update_timezone(QString)),timezoneregion,SLOT(update_timezone_values(QString)));
+ 
+     autoLaunchTimer = new QTimer(this);
+-    connect(autoLaunchTimer, SIGNAL(timeout()), timezonebutton, SLOT(launch_tzgui()));
++//    connect(autoLaunchTimer, SIGNAL(timeout()), timezonebutton, SLOT(launch_tzgui()));
+     autoLaunchTimer->start(0);
+ }
+ 
+@@ -191,7 +191,7 @@
+ 
+ 
+ //_______________Misc time timezone
+-
++/*
+ TimezoneButton::TimezoneButton():
+     VerticalConfigurationGroup(false,false,false,false)
+ {
+@@ -211,7 +211,7 @@
+ {
+     TZButton->setEnabled(false);
+ }
+-
++*/
+ //This is used for the timezone
+ QStringList findFilesRecursively ( QStringList paths, QString fileTypes ) {
+     if ( fileTypes.isEmpty() ) fileTypes = "*";
diff --git a/abs/core/mythinstall/misc_settings.h.patch b/abs/core/mythinstall/misc_settings.h.patch
new file mode 100644
index 0000000..10c69fb
--- /dev/null
+++ b/abs/core/mythinstall/misc_settings.h.patch
@@ -0,0 +1,20 @@
+--- misc_settings.h.orig	2013-09-06 20:57:11.240009509 +0000
++++ misc_settings.h	2013-09-06 21:06:16.558645309 +0000
+@@ -35,7 +35,7 @@
+     MiscMainFrame2();
+ };
+ 
+-
++/*
+ class TimezoneButton: public VerticalConfigurationGroup {
+     Q_OBJECT
+ public:
+@@ -48,7 +48,7 @@
+     QString mf_launch_tzgui();
+ 
+ };
+-
++*/
+ class TimezoneRegion: public TriggeredConfigurationGroup {
+     Q_OBJECT
+ public: