Ticket #72: default_theme.diff

libs/libmyth/mythcontext.cpp

@@ -1396 +1396 @@
     if (dir.exists())
         return testdir;
 
-    testdir = "../menutest/" + themename;
+    testdir = d->m_installprefix + "/share/mythtv/themes/G.A.N.T.";
     dir.setPath(testdir);
-    if (dir.exists())
+    if (dir.exists()){
+        cerr<<"Defaulting to G.A.N.T. theme"<<endl;
         return testdir;
+        }
 
 
     // Don't complain about the "default" theme being missing
@@ -1409 +1411 @@
         dir.setPath(testdir);
         if (dir.exists())
             return testdir;
-    }
+        dir.setPath(testdir);
     
     cerr << "Could not find theme: " << themename << endl;
-    return "";
+        }
 }
 QString MythContext::GetMenuThemeDir(void)
 {

programs/mythuitest/main.cpp

@@ -25 +25 @@
     if (themedir == "")
     {
         cerr << "Couldn't find theme " << themename << endl;
-        exit(0);
+        cerr << "loading Titivillus as default theme"<<endl;
+        themename = "Titivillus";
+        themedir = gContext->FindThemeDir("/usr/local/share/mythtv/themes");
+        cout<< themedir<<themename<<endl;
+        //exit(0);
     }
 
     gContext->LoadQtConfig();