From: eshe <jessehakanen@gmail.com>
Date: Tue, 3 Aug 2010 09:07:51 +0000 (+0100)
Subject: Small fixes to theme importing and web page css.
X-Git-Url: http://git.maemo.org/git/?p=jspeed;a=commitdiff_plain;h=118750b1e5f7d3b389ea12276ff3f2f0fa36d8b9

Small fixes to theme importing and web page css.
---

diff --git a/src/themeselector.cpp b/src/themeselector.cpp
index eef6df0..ed73dc8 100644
--- a/src/themeselector.cpp
+++ b/src/themeselector.cpp
@@ -101,6 +101,8 @@ void ThemeSelector::loadFromFile()
     {
         selector_->loadThemes();
         selector_->selectTheme(file);
+        themeSelected_ = true;
+        buttonClicked_ = true;
     }
 }
 
diff --git a/www/css/style.css b/www/css/style.css
index 7384420..8e0d6df 100644
--- a/www/css/style.css
+++ b/www/css/style.css
@@ -1,329 +1,332 @@
-* {
-	border: 0;
-	padding: 0;
-	margin: 0;
-}
-
-h1#top {
-	position: absolute;
-	text-indent: -9999px;
-}
-
-body {
-	background: #fbfbfb url(../img/background.png) repeat-x;
-	font-family: Calibri, Tahoma, Arial, sans-serif;
-	font-size: 17px;
-}
-
-a:link, a:active {
-	color: #296293;
-	text-decoration: none;
-}
-
-a:visited {
-	color: #486278;
-	text-decoration: none;
-}
-
-a:hover {
-	color: #7496b3;
-	text-decoration: underline;
-}
-
-#mainmenu {
-	background: url(../img/logo.png) no-repeat;
-	padding-top: 93px;
-	list-style: none;
-	width: 950px;
-	margin: 0 auto;
-}
-
-#mainmenu li {
-	float: left;
-	text-align: center;
-	width: 165px;
-	height: 37px;
-	font-size: 14px;
-	font-weight: bold;
-}
-
-#mainmenu li a {
-	color: #fff;
-	text-decoration: none;
-	display: block;
-	padding-top: 12px;
-	width: 165px;
-	height: 26px;
-	background: url(../img/button.png) 0px -2px;
-}
-
-#mainmenu li a:focus {
-	outline: none;
-}
-
-#mainmenu li a:hover, #mainmenu li.selected a{
-	background: url(../img/button.png) 0px -43px;
-}
-
-#info {
-	clear: both;
-	background: #8fb1cf url(../img/info-background.png) repeat-x;
-	height: 469px;
-	width: 100%;
-}
-
-#info-content {
-	width: 430px;
-	margin: 0 auto;
-	color: #fff;
-	font-size: 26px;
-	background: url(../img/screenshot.jpg) no-repeat 410px 30px;
-	height: 469px;
-	padding-top: 50px;
-	padding-right: 520px;
-	line-height: 1.3em;
-}
-
-#info-content ul {
-	margin-left: 25px;
-	margin-top: 20px;
-}
-
-#info-content ul li {
-	margin-bottom: 14px;
-	padding-left: 28px;
-	list-style: none;
-	background: url(../img/ball.png) 0px 10px no-repeat;
-}
-
-#bottom {
-	background: url(../img/bottom-background.png) repeat-x;
-	width: 100%;
-	clear: both;
-}
-
-#bottom-content {
-	width: 950px;
-	margin: 0 auto;
-	padding-top: 20px;
-	padding-bottom: 10px;
-}
-
-.bottom-box {
-	width: 250px;
-	float: left;
-	line-height: 1.5em;
-	font-size: 18px;
-	padding-right: 20px;
-	border-left: 1px dotted #949494;
-	padding-left: 25px;
-	margin-bottom: 25px;
-	height: 125px;
-}
-
-#bottom-content .bottom-box:first-child {
-	border-left-width: 0;
-}
-
-.bottom-box h2, .bottom-box h3 {
-	font-size: 20px;
-	margin-bottom: 8px;
-}
-
-.bottom-box p, .bottom-box ul {
-	color: #3c3c3c;
-}
-
-.bottom-box ul li {
-	list-style: none;
-}
-
-#copyright {
-	clear: both;
-	border-top: 1px dotted #949494;
-	margin-left: 20px;
-	padding-top: 15px;
-	width: 900px;
-	color: #999;
-	padding-bottom: 10px;
-	font-size: 16px;
-}
-
-#copyright a {
-	color: #999;
-}
-
-#main {
-	background: #fff url(../img/content-background.png) repeat-x;
-	clear: both;
-	border-bottom: 1px solid #ccc;
-}
-
-#main-content {
-	width: 910px;
-	margin: 0 auto;
-	padding: 30px 40px 10px 20px;
-	line-height: 1.5em;
-	font-family: Tahoma, sans-serif;
-	font-size: 16px;
-}
-
-#main-content h1 {
-	font-size: 24px;
-	margin-bottom: 14px;
-}
-
-#main-content h2 {
-	font-size: 22px;
-	margin-bottom: 14px;
-	margin-top: 25px;
-}
-
-#main-content h3 {
-	font-size: 18px;
-	margin-bottom: 8px;
-	margin-top: 28px;
-	border-bottom: 1px dotted #064070;
-	padding-bottom: 8px;
-}
-
-#main-content h4 {
-	font-size: 17px;
-	margin-top: 8px;
-}
-
-#main-content p {
-	margin-bottom: 0.8em;
-}
-
-#main-content ul {
-	margin-left: 35px;
-}
-
-.theme {
-	float: left;
-	width: 268px;
-	height: 235px;
-	padding: 5px;
-	text-align: center;
-	color: #000;
-	margin-right: 16px;
-	margin-top: 10px;
-	margin-bottom: 20px;
-	background: url(../img/theme-background.png) no-repeat;
-}
-
-.theme img {
-	width: 250px;
-	height: 150px;
-	border: 1px solid #bbb;
-	margin-bottom: 5px;
-	filter:alpha(opacity=80);
-	-moz-opacity:0.8;
-	-khtml-opacity: 0.8;
-	opacity: 0.8;
-}
-
-.theme img, .theme a.download {
-	filter:alpha(opacity=80);
-	-moz-opacity:0.8;
-	-khtml-opacity: 0.8;
-	opacity: 0.8;
-}
-
-.theme div {
-	font-weight: bold;
-	margin-bottom: 4px;
-	font-size: 15px;
-}
-
-.theme a:hover img, .theme a.download:hover {
-	filter:alpha(opacity=100);
-	-moz-opacity:1.0;
-	-khtml-opacity: 1.0;
-	opacity: 1.0;
-}
-
-.theme a.download {
-	text-indent: -9999px;
-	background: url(../img/download-button.png) no-repeat;
-	display: block;
-	margin: 0 auto;
-	width: 119px;
-	height: 34px;
-}
-
-.theme a.download:focus {
-	outline: none;
-}
-
-.clear {
-	clear: both;
-}
-
-pre.code {
-	font-size: 12px;
-	margin-top: 15px;
-	margin-bottom: 15px;
-	max-height: 350px;
-	overflow: auto;
-}
-
-.spec {
-	margin-top: 6px;
-	margin-bottom: 14px;
-	width: 100%;
-	border: 1px solid #ccc;
-	font-size: 14px;
-}
-
-.spec th {
-	text-align: left;
-	font-weight: bold;
-	padding: 2px 6px;
-	white-space: nowrap;
-
-}
-
-.spec pre {
-	font-size: 12px;
-}
-
-.spec td {
-	padding: 1px 6px 1px 6px;
-	vertical-align: top;
-}
-
-.spec .color, .spec .color td, .spec .color th {
-	background-color: #e4eefa;
-}
-
-.spec .col1 {
-	width: 90px;
-}
-
-.spec .col3 {
-	width: 220px;
-}
-
-.contents, .contents ul {
-	margin-left: 20px;
-}
-
-.contents {
-	margin-bottom: 15px;
-}
-
-.imageinfo {
-	border: 1px solid #ccc;
-	padding: 5px;
-	float: left;
-	margin: 10px 15px 30px 0;
-	text-align: center;
-}
-
-.imageinfo p {
-	margin: 0 !important;
-	font-size: 13px;
-	font-weight: bold;
-}
\ No newline at end of file
+* {
+	border: 0;
+	padding: 0;
+	margin: 0;
+}
+
+h1#top {
+	position: absolute;
+	text-indent: -9999px;
+}
+
+body {
+	background: #fbfbfb url(../img/background.png) repeat-x;
+	font-family: Calibri, Granada, Tahoma, Arial, sans-serif;
+	font-size: 17px;
+}
+
+a:link, a:active {
+	color: #296293;
+	text-decoration: none;
+}
+
+a:visited {
+	color: #486278;
+	text-decoration: none;
+}
+
+a:hover {
+	color: #7496b3;
+	text-decoration: underline;
+}
+
+#mainmenu {
+	background: url(../img/logo.png) no-repeat;
+	padding-top: 93px;
+	list-style: none;
+	width: 950px;
+	margin: 0 auto;
+}
+
+#mainmenu li {
+	float: left;
+	text-align: center;
+	width: 165px;
+	height: 37px;
+	font-size: 14px;
+	font-weight: bold;
+}
+
+#mainmenu li a {
+	color: #fff;
+	text-decoration: none;
+	display: block;
+	padding-top: 10px;
+	width: 165px;
+	height: 28px;
+	background: url(../img/button.png) 0px -2px;
+}
+
+#mainmenu li a:focus {
+	outline: none;
+}
+
+#mainmenu li a:hover, #mainmenu li.selected a{
+	background: url(../img/button.png) 0px -43px;
+}
+
+#info {
+	clear: both;
+	background: #8fb1cf url(../img/info-background.png) repeat-x;
+	height: 469px;
+	width: 100%;	
+	min-width: 955px;
+}
+
+#info-content {
+	width: 430px;
+	margin: 0 auto;
+	color: #fff;
+	font-size: 26px;
+	background: url(../img/screenshot.jpg) no-repeat 410px 30px;
+	height: 469px;
+	padding-top: 50px;
+	padding-right: 520px;
+	padding-left: 8px;
+	line-height: 35px;
+}
+
+#info-content ul {
+	margin-left: 25px;
+	margin-top: 20px;
+}
+
+#info-content ul li {
+	margin-bottom: 13px;
+	padding-left: 28px;
+	list-style: none;
+	background: url(../img/ball.png) 0px 10px no-repeat;
+}
+
+#bottom {
+	background: url(../img/bottom-background.png) repeat-x;
+	width: 100%;
+	clear: both;	
+	min-width: 955px;
+}
+
+#bottom-content {
+	width: 950px;
+	margin: 0 auto;
+	padding-top: 20px;
+	padding-bottom: 10px;
+}
+
+.bottom-box {
+	width: 250px;
+	float: left;
+	line-height: 1.5em;
+	font-size: 18px;
+	padding-right: 20px;
+	border-left: 1px dotted #949494;
+	padding-left: 25px;
+	margin-bottom: 25px;
+	height: 125px;
+}
+
+#bottom-content .bottom-box:first-child {
+	border-left-width: 0;
+}
+
+.bottom-box h2, .bottom-box h3 {
+	font-size: 20px;
+	margin-bottom: 8px;
+}
+
+.bottom-box p, .bottom-box ul {
+	color: #3c3c3c;
+}
+
+.bottom-box ul li {
+	list-style: none;
+}
+
+#copyright {
+	clear: both;
+	border-top: 1px dotted #949494;
+	margin-left: 20px;
+	padding-top: 15px;
+	width: 900px;
+	color: #999;
+	padding-bottom: 10px;
+	font-size: 16px;
+}
+
+#copyright a {
+	color: #999;
+}
+
+#main {
+	background: #fff url(../img/content-background.png) repeat-x;
+	clear: both;
+	border-bottom: 1px solid #ccc;
+}
+
+#main-content {
+	width: 910px;
+	margin: 0 auto;
+	padding: 30px 40px 10px 20px;
+	line-height: 1.5em;
+	font-family: Tahoma, sans-serif;
+	font-size: 16px;
+}
+
+#main-content h1 {
+	font-size: 24px;
+	margin-bottom: 14px;
+}
+
+#main-content h2 {
+	font-size: 22px;
+	margin-bottom: 14px;
+	margin-top: 25px;
+}
+
+#main-content h3 {
+	font-size: 18px;
+	margin-bottom: 8px;
+	margin-top: 28px;
+	border-bottom: 1px dotted #064070;
+	padding-bottom: 8px;
+}
+
+#main-content h4 {
+	font-size: 17px;
+	margin-top: 8px;
+}
+
+#main-content p {
+	margin-bottom: 0.8em;
+}
+
+#main-content ul {
+	margin-left: 35px;
+}
+
+.theme {
+	float: left;
+	width: 268px;
+	height: 235px;
+	padding: 5px;
+	text-align: center;
+	color: #000;
+	margin-right: 16px;
+	margin-top: 10px;
+	margin-bottom: 20px;
+	background: url(../img/theme-background.png) no-repeat;
+}
+
+.theme img {
+	width: 250px;
+	height: 150px;
+	border: 1px solid #bbb;
+	margin-bottom: 5px;
+	filter:alpha(opacity=80);
+	-moz-opacity:0.8;
+	-khtml-opacity: 0.8;
+	opacity: 0.8;
+}
+
+.theme img, .theme a.download {
+	filter:alpha(opacity=80);
+	-moz-opacity:0.8;
+	-khtml-opacity: 0.8;
+	opacity: 0.8;
+}
+
+.theme div {
+	font-weight: bold;
+	margin-bottom: 4px;
+	font-size: 15px;
+}
+
+.theme a:hover img, .theme a.download:hover {
+	filter:alpha(opacity=100);
+	-moz-opacity:1.0;
+	-khtml-opacity: 1.0;
+	opacity: 1.0;
+}
+
+.theme a.download {
+	text-indent: -9999px;
+	background: url(../img/download-button.png) no-repeat;
+	display: block;
+	margin: 0 auto;
+	width: 119px;
+	height: 34px;
+}
+
+.theme a.download:focus {
+	outline: none;
+}
+
+.clear {
+	clear: both;
+}
+
+pre.code {
+	font-size: 12px;
+	margin-top: 15px;
+	margin-bottom: 15px;
+	max-height: 350px;
+	overflow: auto;
+}
+
+.spec {
+	margin-top: 6px;
+	margin-bottom: 14px;
+	width: 100%;
+	border: 1px solid #ccc;
+	font-size: 14px;
+}
+
+.spec th {
+	text-align: left;
+	font-weight: bold;
+	padding: 2px 6px;
+	white-space: nowrap;
+
+}
+
+.spec pre {
+	font-size: 12px;
+}
+
+.spec td {
+	padding: 1px 6px 1px 6px;
+	vertical-align: top;
+}
+
+.spec .color, .spec .color td, .spec .color th {
+	background-color: #e4eefa;
+}
+
+.spec .col1 {
+	width: 90px;
+}
+
+.spec .col3 {
+	width: 220px;
+}
+
+.contents, .contents ul {
+	margin-left: 20px;
+}
+
+.contents {
+	margin-bottom: 15px;
+}
+
+.imageinfo {
+	border: 1px solid #ccc;
+	padding: 5px;
+	float: left;
+	margin: 10px 15px 30px 0;
+	text-align: center;
+}
+
+.imageinfo p {
+	margin: 0 !important;
+	font-size: 13px;
+	font-weight: bold;
+}