Merge branch 'master' of github.com:MythTV/mythtv

MythTV · Dec 3, 2010 · 863b74f · 863b74f
2 parents c8b1c9d + 55f8420
commit 863b74f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/mythplugins/mythmusic/mythmusic/smartplaylist.cpp b/mythplugins/mythmusic/mythmusic/smartplaylist.cpp
@@ -20,6 +20,7 @@ using namespace std;
 #include <dialogbox.h>
 #include <mythdialogs.h>
 #include <mythdb.h>
+#include <mythuihelper.h>
 
 struct SmartPLField
 {
@@ -897,6 +898,8 @@ SmartPlaylistEditor::SmartPlaylistEditor(MythMainWindow *parent, const char *nam
     Q3VBoxLayout *vbox = new Q3VBoxLayout(this, (int)(15 * wmult));
     Q3HBoxLayout *hbox = new Q3HBoxLayout(vbox, (int)(0 * wmult));
 
+    setFont(GetMythUI()->GetMediumFont());
+
     // Window title
     QString message = tr("Smart Playlist Editor");
     QLabel *label = new QLabel(message, this);
@@ -1673,6 +1676,8 @@ SmartPLResultViewer::SmartPLResultViewer(MythMainWindow *parent, const char *nam
     Q3VBoxLayout *vbox = new Q3VBoxLayout(this, (int)(20 * wmult));
     Q3HBoxLayout *hbox = new Q3HBoxLayout(vbox, (int)(10 * wmult));
 
+    setFont(GetMythUI()->GetMediumFont());
+
     // Window title
     QString message = tr("Smart Playlist Result Viewer");
     QLabel *label = new QLabel(message, this);

diff --git a/myththemes/.gitignore b/myththemes/.gitignore