[mythtv] Latest CVS

Michael Kedl kedlm at knology.net
Tue Mar 11 23:22:35 EST 2003


guess I'm to slow :-)

but, here is a "cvs diff -u" patch for #2, to allow re-reading the exit
key

Hope its ok, C++ is not my favorite language.

I can't figure out the height/width issue (#1 from previous email);
maybe my kde3.1 has some flaky qt stuff.

Cheers,
Mike



On Tue, 2003-03-11 at 21:58, Isaac Richards wrote:
> On Tuesday 11 March 2003 09:00 pm, Michael Kedl wrote:
> > 3) resizing doesn't quite work right away either; garbages my fonts until I
> > exit and restart
> > I'll look for this too....
> 
> I was already working on this, just committed a fix to CVS.
> 
> Isaac
> 
> _______________________________________________
> mythtv-dev mailing list
> mythtv-dev at snowman.net
> http://www.snowman.net/mailman/listinfo/mythtv-dev
-- 
Michael Kedl <kedlm at knology.net>
-------------- next part --------------
? patch
Index: themedmenu.cpp
===================================================================
RCS file: /var/lib/cvs/MC/libs/libmyth/themedmenu.cpp,v
retrieving revision 1.27
diff -u -3 -p -u -r1.27 themedmenu.cpp
--- themedmenu.cpp	12 Mar 2003 02:53:43 -0000	1.27
+++ themedmenu.cpp	12 Mar 2003 04:20:39 -0000
@@ -41,18 +41,8 @@ ThemedMenu::ThemedMenu(const char *cdir,
     menulevel = 0;
 
     callback = NULL;
-    int allowsd = gContext->GetNumSetting("AllowQuitShutdown");
-    killable = (allowsd == 4);
+    reloadExitKey();
 
-    if (allowsd == 1)
-        exitModifier = Qt::ControlButton;
-    else if (allowsd == 2)
-        exitModifier = Qt::MetaButton;
-    else if (allowsd == 3)
-        exitModifier = Qt::AltButton;
-    else
-        exitModifier = -1;
-    
     parseSettings(dir, "theme.xml");
 
     parseMenu(menufile);
@@ -77,6 +67,21 @@ ThemedMenu::~ThemedMenu(void)
     }
 }
 
+void ThemedMenu::reloadExitKey(void)
+{
+    int allowsd = gContext->GetNumSetting("AllowQuitShutdown");
+    killable = (allowsd == 4);
+
+    if (allowsd == 1)
+        exitModifier = Qt::ControlButton;
+    else if (allowsd == 2)
+        exitModifier = Qt::MetaButton;
+    else if (allowsd == 3)
+        exitModifier = Qt::AltButton;
+    else
+        exitModifier = -1;
+}
+
 QString ThemedMenu::getFirstText(QDomElement &element)
 {
     for (QDomNode dname = element.firstChild(); !dname.isNull();
@@ -1230,7 +1235,8 @@ void ThemedMenu::ReloadTheme(void)
 {
     buttonList.clear();
     buttonRows.clear();
-  
+    reloadExitKey();
+
     QMap<QString, ButtonIcon>::Iterator it;
     for (it = allButtonIcons.begin(); it != allButtonIcons.end(); ++it)
     {
Index: themedmenu.h
===================================================================
RCS file: /var/lib/cvs/MC/libs/libmyth/themedmenu.h,v
retrieving revision 1.20
diff -u -3 -p -u -r1.20 themedmenu.h
--- themedmenu.h	11 Mar 2003 21:34:12 -0000	1.20
+++ themedmenu.h	12 Mar 2003 04:20:39 -0000
@@ -63,6 +63,7 @@ class ThemedMenu : public MythDialog
 
     QString getSelection() { return selection; }
 
+    void reloadExitKey(void);
     void ReloadTheme(void);
 
   protected:


More information about the mythtv-dev mailing list