MythMusic: tidy up the volume popup.

This also fixes the volume percentage not showing as I intended.
MythTV · Mar 1, 2011 · 6b7ea31 · 6b7ea31
1 parent 3bbf5c6
commit 6b7ea31
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 33 deletions.
diff --git a/mythplugins/mythmusic/mythmusic/musiccommon.cpp b/mythplugins/mythmusic/mythmusic/musiccommon.cpp
@@ -1472,16 +1472,12 @@ MythMusicVolumeDialog::~MythMusicVolumeDialog(void)
 
 bool MythMusicVolumeDialog::Create(void)
 {
-    bool err = false;
-
-    err = LoadWindowFromXML("music-ui.xml", "volume_popup", this);
-
-    if (!err)
-        return false;
+    if (!LoadWindowFromXML("music-ui.xml", "volume_popup", this))
+         return false;
 
-    UIUtilW::Assign(this, m_volText,     "volume_text");
-    UIUtilW::Assign(this, m_volProgress, "volume_progress");
-    UIUtilW::Assign(this, m_muteState,   "mute_state");
+    UIUtilW::Assign(this, m_volText,     "volume");
+    UIUtilW::Assign(this, m_volProgress, "volumeprogress");
+    UIUtilW::Assign(this, m_muteState,   "mutestate");
 
     if (m_volProgress)
          m_volProgress->SetTotal(100);
@@ -1573,11 +1569,7 @@ TrackInfoDialog::~TrackInfoDialog(void)
 
 bool TrackInfoDialog::Create(void)
 {
-    bool err = false;
-
-    err = LoadWindowFromXML("music-ui.xml", "trackdetail_popup", this);
-
-    if (!err)
+    if (!LoadWindowFromXML("music-ui.xml", "trackdetail_popup", this))
         return false;
 
     MetadataMap metadataMap;

diff --git a/mythplugins/mythmusic/theme/default-wide/music-ui.xml b/mythplugins/mythmusic/theme/default-wide/music-ui.xml
@@ -1277,19 +1277,19 @@
         </imagetype>
 
         <progressbar name="progress">
-        <area>170,150,10,10</area>
-        <layout>horizontal</layout>
-        <style>reveal</style>
-        <imagetype name="background">
-            <filename>mm_progress-bg.png</filename>
-        </imagetype>
-        <imagetype name="progressimage">
-            <filename>mm_progress-fg.png</filename>
-        </imagetype>
-    </progressbar>
+            <area>170,150,10,10</area>
+            <layout>horizontal</layout>
+            <style>reveal</style>
+            <imagetype name="background">
+                <filename>mm_progress-bg.png</filename>
+            </imagetype>
+            <imagetype name="progressimage">
+                <filename>mm_progress-fg.png</filename>
+            </imagetype>
+        </progressbar>
     </window>
 
-        <window name="volume_popup">
+    <window name="volume_popup">
         <area>-1,-1,620,165</area>
         <imagetype name="backimg">
             <area>0,0,620,165</area>
@@ -1303,7 +1303,7 @@
             <value>Volume</value>
         </textarea>
 
-        <statetype name="mute_state">
+        <statetype name="mutestate">
             <position>20,90</position>
             <state name="off">
                 <imagetype name="statusimage">
@@ -1317,14 +1317,14 @@
             </state>
         </statetype>
 
-        <progressbar name="volume_progress" from="baseprogressbar">
+        <progressbar name="volumeprogress" from="baseprogressbar">
             <position>60,80</position>
         </progressbar>
 
-        <textarea name="volume_text" from="basetextarea">
+        <textarea name="volume" from="basetextarea">
             <area>70,120,300,30</area>
             <align>left,top</align>
-            <value>0%</value>
+            <template>%VOLUMEPERCENT%</template>
         </textarea>
     </window>
 

diff --git a/mythplugins/mythmusic/theme/default/music-ui.xml b/mythplugins/mythmusic/theme/default/music-ui.xml
@@ -1553,7 +1553,7 @@
             <value>Volume</value>
         </textarea>
 
-        <statetype name="mute_state">
+        <statetype name="mutestate">
             <position>20,90</position>
             <state name="off">
                 <imagetype name="statusimage">
@@ -1567,14 +1567,14 @@
             </state>
         </statetype>
 
-        <progressbar name="volume_progress" from="baseprogressbar">
+        <progressbar name="volumeprogress" from="baseprogressbar">
             <position>60,80</position>
         </progressbar>
 
-        <textarea name="volume_text" from="basetextarea">
+        <textarea name="volume" from="basetextarea">
             <area>70,120,300,30</area>
             <align>left,top</align>
-            <value>0%</value>
+            <template>%VOLUMEPERCENT%</template>
         </textarea>
     </window>