[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [marble] /: legend: fix styling for cities checkbox
From:       Thibaut Gridel <tgridel () free ! fr>
Date:       2014-01-04 21:43:01
Message-ID: E1VzYzl-0003y0-Uy () scm ! kde ! org
[Download RAW message or body]

Git commit 58bbd746decdd1f96be6863c988c8d97dd79a2a5 by Thibaut Gridel.
Committed on 04/01/2014 at 20:17.
Pushed by tgridel into branch 'master'.

legend: fix styling for cities checkbox

M  +4    -3    data/legend.html
M  +3    -4    src/lib/marble/MarbleLegendBrowser.cpp

http://commits.kde.org/marble/58bbd746decdd1f96be6863c988c8d97dd79a2a5

diff --git a/data/legend.html b/data/legend.html
index bb0ca17..3f7d2dc 100644
--- a/data/legend.html
+++ b/data/legend.html
@@ -17,7 +17,8 @@
     string of your choice.
 -->
 
-<H4> <!--Locations checkbox--><a href="checkbox:cities"><span \
style="text-decoration: none"><img src="checkbox:cities">&nbsp;</span></a> Populated \
Places</H4> +<div class="well well-small well-legend">
+  <label class="section-head"><a href="checkbox:cities"/><span>Populated \
Places</span></label>  <div>
     <i>Population:</i>
   </div>
@@ -85,7 +86,7 @@
       </td>
     </tr>
   </table>
-<p>
+<br/>
   <div>
     <i>Capitals:</i>
   </div>
@@ -101,7 +102,7 @@
   <div>
     White:&nbsp;None
   </div>
-
+</div>
 <!-- The following comment gives a hint to the MarbleLegendBrowser where further 
      legend items which get generated from DGML should get inserted.
      So DO NOT DELETE this comment: -->
diff --git a/src/lib/marble/MarbleLegendBrowser.cpp \
b/src/lib/marble/MarbleLegendBrowser.cpp index b160272..4fa7f0c 100644
--- a/src/lib/marble/MarbleLegendBrowser.cpp
+++ b/src/lib/marble/MarbleLegendBrowser.cpp
@@ -250,16 +250,15 @@ void MarbleLegendBrowser::translateHtml( QString & html )
 
 void MarbleLegendBrowser::reverseSupportCheckboxes(QString &html)
 {
-    const QString old = "<H4> <!--Locations checkbox--><a \
href=\"checkbox:cities\"><span style=\"text-decoration: none\"><img \
src=\"checkbox:cities\">&nbsp;</span></a> Populated Places</H4>"; +    const QString \
old = "<a href=\"checkbox:cities\"/>";  
     QString checked = "";
     if (d->m_checkBoxMap["cities"])
         checked = "checked";
 
     const QString repair = ""
-            "<div class=\"spec\"><h3><input type=\"checkbox\" "
-            "onchange=\"Marble.setCheckedProperty(this.value, this.checked);\" "
-            + checked + " name=\"cities\" value=\"cities\" />Populated \
Places</h3></div>\n"; +            "<input type=\"checkbox\" "
+            "onchange=\"Marble.setCheckedProperty(this.value, this.checked);\" " + \
checked + " name=\"cities\" value=\"cities\" />";  
     html.replace(old, repair);
 }


[prev in list] [next in list] [prev in thread] [next in thread]