Changes: removing dependency from old devel style on Widgets Gallery

20 files changed, 53 insertions, 58 deletions

diff --git a/demos/widgetsgallery/theme/devel/images/DefaultAvatar.png b/demos/widgetsgallery/theme/base/images/DefaultAvatar.png
index 15416ded..15416ded 100644
--- a/demos/widgetsgallery/theme/devel/images/DefaultAvatar.png
+++ b/demos/widgetsgallery/theme/base/images/DefaultAvatar.png
diff --git a/demos/widgetsgallery/theme/devel/images/contacts/avatar-altimeter.png b/demos/widgetsgallery/theme/base/images/contacts/avatar-altimeter.png
index 104aed99..104aed99 100644
--- a/demos/widgetsgallery/theme/devel/images/contacts/avatar-altimeter.png
+++ b/demos/widgetsgallery/theme/base/images/contacts/avatar-altimeter.png
diff --git a/demos/widgetsgallery/theme/devel/images/contacts/avatar-butterfly.png b/demos/widgetsgallery/theme/base/images/contacts/avatar-butterfly.png
index b870fa80..b870fa80 100644
--- a/demos/widgetsgallery/theme/devel/images/contacts/avatar-butterfly.png
+++ b/demos/widgetsgallery/theme/base/images/contacts/avatar-butterfly.png
diff --git a/demos/widgetsgallery/theme/devel/images/contacts/avatar-cat.png b/demos/widgetsgallery/theme/base/images/contacts/avatar-cat.png
index f0238ff0..f0238ff0 100644
--- a/demos/widgetsgallery/theme/devel/images/contacts/avatar-cat.png
+++ b/demos/widgetsgallery/theme/base/images/contacts/avatar-cat.png
diff --git a/demos/widgetsgallery/theme/devel/images/contacts/avatar-fly.png b/demos/widgetsgallery/theme/base/images/contacts/avatar-fly.png
index 4d7de806..4d7de806 100644
--- a/demos/widgetsgallery/theme/devel/images/contacts/avatar-fly.png
+++ b/demos/widgetsgallery/theme/base/images/contacts/avatar-fly.png
diff --git a/demos/widgetsgallery/theme/devel/images/contacts/avatar-jets.png b/demos/widgetsgallery/theme/base/images/contacts/avatar-jets.png
index 103e7a50..103e7a50 100644
--- a/demos/widgetsgallery/theme/devel/images/contacts/avatar-jets.png
+++ b/demos/widgetsgallery/theme/base/images/contacts/avatar-jets.png
diff --git a/demos/widgetsgallery/theme/devel/images/contacts/avatar-pig.png b/demos/widgetsgallery/theme/base/images/contacts/avatar-pig.png
index 483aabc3..483aabc3 100644
--- a/demos/widgetsgallery/theme/devel/images/contacts/avatar-pig.png
+++ b/demos/widgetsgallery/theme/base/images/contacts/avatar-pig.png
diff --git a/demos/widgetsgallery/theme/devel/images/contacts/avatar-pigeon.png b/demos/widgetsgallery/theme/base/images/contacts/avatar-pigeon.png
index 4e9fe127..4e9fe127 100644
--- a/demos/widgetsgallery/theme/devel/images/contacts/avatar-pigeon.png
+++ b/demos/widgetsgallery/theme/base/images/contacts/avatar-pigeon.png
diff --git a/demos/widgetsgallery/theme/devel/images/contacts/avatar-sunset.png b/demos/widgetsgallery/theme/base/images/contacts/avatar-sunset.png
index 48c1151a..48c1151a 100644
--- a/demos/widgetsgallery/theme/devel/images/contacts/avatar-sunset.png
+++ b/demos/widgetsgallery/theme/base/images/contacts/avatar-sunset.png
diff --git a/demos/widgetsgallery/theme/devel/images/contacts/names.txt b/demos/widgetsgallery/theme/base/images/contacts/names.txt
index abb7a434..abb7a434 100644
--- a/demos/widgetsgallery/theme/devel/images/contacts/names.txt
+++ b/demos/widgetsgallery/theme/base/images/contacts/names.txt
diff --git a/demos/widgetsgallery/theme/devel/images/grape.jpg b/demos/widgetsgallery/theme/base/images/grape.jpg
index ca57fc1e..ca57fc1e 100644
--- a/demos/widgetsgallery/theme/devel/images/grape.jpg
+++ b/demos/widgetsgallery/theme/base/images/grape.jpg
diff --git a/demos/widgetsgallery/theme/devel/images/list-item-div-bg-selected.png b/demos/widgetsgallery/theme/base/images/list-item-div-bg-selected.png
index 77e52fbc..77e52fbc 100644
--- a/demos/widgetsgallery/theme/devel/images/list-item-div-bg-selected.png
+++ b/demos/widgetsgallery/theme/base/images/list-item-div-bg-selected.png
diff --git a/demos/widgetsgallery/theme/devel/images/list-item-div-bg.png b/demos/widgetsgallery/theme/base/images/list-item-div-bg.png
index 9c6dcb58..9c6dcb58 100644
--- a/demos/widgetsgallery/theme/devel/images/list-item-div-bg.png
+++ b/demos/widgetsgallery/theme/base/images/list-item-div-bg.png
diff --git a/demos/widgetsgallery/theme/devel/images/star.png b/demos/widgetsgallery/theme/base/images/star.png
index 4da5a469..4da5a469 100644
--- a/demos/widgetsgallery/theme/devel/images/star.png
+++ b/demos/widgetsgallery/theme/base/images/star.png
diff --git a/demos/widgetsgallery/theme/devel/svg/Widgets-Gallery-Graphics.svg b/demos/widgetsgallery/theme/base/svg/Widgets-Gallery-Graphics.svg
index 42364fdd..bba00386 100644
--- a/demos/widgetsgallery/theme/devel/svg/Widgets-Gallery-Graphics.svg
+++ b/demos/widgetsgallery/theme/base/svg/Widgets-Gallery-Graphics.svg
@@ -1,48 +1,48 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->

-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">

-<svg version="1.1" id="level1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"

-	 width="688px" height="264px" viewBox="0 0 688 264" enable-background="new 0 0 688 264" xml:space="preserve">

-<g id="Widgets-Gallery-Button-Background">

-	<g opacity="0.03">

-		<g>

-			<g>

-				<path fill="#FFFFFF" d="M159.835,139.873c0,4.4,3.6,8,8,8h398c4.4,0,8-3.6,8-8v-72c0-4.4-3.6-8-8-8h-398c-4.4,0-8,3.6-8,8

-					V139.873z"/>

-			</g>

-			<defs>

-				<filter id="Adobe_OpacityMaskFilter" filterUnits="userSpaceOnUse" x="159.835" y="59.873" width="414" height="88">

-					

-						<feColorMatrix  type="matrix" values="-1 0 0 0 1  0 -1 0 0 1  0 0 -1 0 1  0 0 0 1 0" color-interpolation-filters="sRGB" result="source"/>

-				</filter>

-			</defs>

-		</g>

-	</g>

-	<g opacity="0.15">

-		<g>

-			<g>

-				<defs>

-					<path id="SVGID_2_" d="M565.835,60.873c3.86,0,7,3.141,7,7v72c0,3.859-3.14,7-7,7h-398c-3.86,0-7-3.141-7-7v-72

-						c0-3.859,3.14-7,7-7H565.835 M565.835,59.873h-398c-4.399,0-8,3.6-8,8v72c0,4.4,3.601,8,8,8h398c4.399,0,8-3.6,8-8v-72

-						C573.835,63.473,570.234,59.873,565.835,59.873L565.835,59.873z"/>

-				</defs>

-				<clipPath id="SVGID_3_">

-					<use xlink:href="#SVGID_2_"  overflow="visible"/>

-				</clipPath>

-				<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="366.8354" y1="147.873" x2="366.8354" y2="59.8735">

-					<stop  offset="0" style="stop-color:#FFFFFF"/>

-					<stop  offset="0.0859" style="stop-color:#F7F7F7"/>

-					<stop  offset="0.2181" style="stop-color:#E2E2E2"/>

-					<stop  offset="0.3803" style="stop-color:#BEBEBE"/>

-					<stop  offset="0.566" style="stop-color:#8D8D8D"/>

-					<stop  offset="0.7717" style="stop-color:#4E4E4E"/>

-					<stop  offset="0.9913" style="stop-color:#030303"/>

-					<stop  offset="1" style="stop-color:#000000"/>

-				</linearGradient>

-				<path clip-path="url(#SVGID_3_)" fill="url(#SVGID_4_)" d="M159.835,67.873c0-4.4,3.601-8,8-8h398c4.399,0,8,3.6,8,8v72

-					c0,4.4-3.601,8-8,8h-398c-4.399,0-8-3.6-8-8V67.873z"/>

-			</g>

-		</g>

-	</g>

-</g>

-</svg>

+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="level1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="688px" height="264px" viewBox="0 0 688 264" enable-background="new 0 0 688 264" xml:space="preserve">
+<g id="Widgets-Gallery-Button-Background">
+	<g opacity="0.03">
+		<g>
+			<g>
+				<path fill="#FFFFFF" d="M159.835,139.873c0,4.4,3.6,8,8,8h398c4.4,0,8-3.6,8-8v-72c0-4.4-3.6-8-8-8h-398c-4.4,0-8,3.6-8,8
+					V139.873z"/>
+			</g>
+			<defs>
+				<filter id="Adobe_OpacityMaskFilter" filterUnits="userSpaceOnUse" x="159.835" y="59.873" width="414" height="88">
+					
+						<feColorMatrix  type="matrix" values="-1 0 0 0 1  0 -1 0 0 1  0 0 -1 0 1  0 0 0 1 0" color-interpolation-filters="sRGB" result="source"/>
+				</filter>
+			</defs>
+		</g>
+	</g>
+	<g opacity="0.15">
+		<g>
+			<g>
+				<defs>
+					<path id="SVGID_2_" d="M565.835,60.873c3.86,0,7,3.141,7,7v72c0,3.859-3.14,7-7,7h-398c-3.86,0-7-3.141-7-7v-72
+						c0-3.859,3.14-7,7-7H565.835 M565.835,59.873h-398c-4.399,0-8,3.6-8,8v72c0,4.4,3.601,8,8,8h398c4.399,0,8-3.6,8-8v-72
+						C573.835,63.473,570.234,59.873,565.835,59.873L565.835,59.873z"/>
+				</defs>
+				<clipPath id="SVGID_3_">
+					<use xlink:href="#SVGID_2_"  overflow="visible"/>
+				</clipPath>
+				<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="366.8354" y1="147.873" x2="366.8354" y2="59.8735">
+					<stop  offset="0" style="stop-color:#FFFFFF"/>
+					<stop  offset="0.0859" style="stop-color:#F7F7F7"/>
+					<stop  offset="0.2181" style="stop-color:#E2E2E2"/>
+					<stop  offset="0.3803" style="stop-color:#BEBEBE"/>
+					<stop  offset="0.566" style="stop-color:#8D8D8D"/>
+					<stop  offset="0.7717" style="stop-color:#4E4E4E"/>
+					<stop  offset="0.9913" style="stop-color:#030303"/>
+					<stop  offset="1" style="stop-color:#000000"/>
+				</linearGradient>
+				<path clip-path="url(#SVGID_3_)" fill="url(#SVGID_4_)" d="M159.835,67.873c0-4.4,3.601-8,8-8h398c4.399,0,8,3.6,8,8v72
+					c0,4.4-3.601,8-8,8h-398c-4.399,0-8-3.6-8-8V67.873z"/>
+			</g>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/demos/widgetsgallery/theme/devel/svg/multimedia-overlays.svg b/demos/widgetsgallery/theme/base/svg/multimedia-overlays.svg
index 384c218c..384c218c 100644
--- a/demos/widgetsgallery/theme/devel/svg/multimedia-overlays.svg
+++ b/demos/widgetsgallery/theme/base/svg/multimedia-overlays.svg
diff --git a/demos/widgetsgallery/theme/devel/style/widgetsgallery.css b/demos/widgetsgallery/theme/devel/style/widgetsgallery.css
deleted file mode 100644
index e69de29b..00000000
--- a/demos/widgetsgallery/theme/devel/style/widgetsgallery.css
+++ /dev/null
diff --git a/demos/widgetsgallery/theme/theme.pri b/demos/widgetsgallery/theme/theme.pri
index dee7c11b..ec3389ae 100644
--- a/demos/widgetsgallery/theme/theme.pri
+++ b/demos/widgetsgallery/theme/theme.pri
@@ -4,10 +4,5 @@ basetheme.files = ./theme/base/*
 basetheme.path = $$M_THEME_DIR/base/meegotouch/widgetsgallery/
 basetheme.CONFIG += no_check_exist
 
-develtheme.files = ./theme/devel/*
-develtheme.path = $$M_THEME_DIR/devel/meegotouch/widgetsgallery/
-develtheme.CONFIG += no_check_exist
-
 INSTALLS += \
     basetheme \
-    develtheme \
diff --git a/demos/widgetsgallery/utils.cpp b/demos/widgetsgallery/utils.cpp
index da600d72..b64196f8 100644
--- a/demos/widgetsgallery/utils.cpp
+++ b/demos/widgetsgallery/utils.cpp
@@ -32,7 +32,7 @@ namespace Utils
         appDir.cdUp();
         appDir.cd("share");
         appDir.cd("themes");
-        appDir.cd("devel");
+        appDir.cd("base");
         appDir.cd("meegotouch");
         appDir.cd("widgetsgallery");
         appDir.cd("images");
@@ -50,7 +50,7 @@ namespace Utils
         appDir.cdUp();
         appDir.cd("share");
         appDir.cd("themes");
-        appDir.cd("devel");
+        appDir.cd("base");
         appDir.cd("meegotouch");
         appDir.cd("widgetsgallery");
         appDir.cd("images");
@@ -67,7 +67,7 @@ namespace Utils
         appDir.cdUp();
         appDir.cd("share");
         appDir.cd("themes");
-        appDir.cd("devel");
+        appDir.cd("base");
         appDir.cd("meegotouch");
         appDir.cd("widgetsgallery");
         appDir.cd("images");
diff --git a/demos/widgetsgallery/widgetsgallery.pro b/demos/widgetsgallery/widgetsgallery.pro
index 04ffb914..ba98ec09 100644
--- a/demos/widgetsgallery/widgetsgallery.pro
+++ b/demos/widgetsgallery/widgetsgallery.pro
@@ -164,8 +164,8 @@ services.files = $$OUT_PWD/$${myname}.service
 services.path = $$M_DBUS_SERVICES_DIR
 testsxml.files = tests.xml
 testsxml.path = $$M_INSTALL_DATA/meegotouch-demos-widgetsgallery-tests/
-DEFINES += CONTACTS_DIR=\"\\\"$$M_THEME_DIR/devel/meegotouch/widgetsgallery/images/contacts/\\\"\"
-DEFINES += IMAGES_DIR=\"\\\"$$M_THEME_DIR/devel/meegotouch/widgetsgallery/images/\\\"\"
+DEFINES += CONTACTS_DIR=\"\\\"$$M_THEME_DIR/base/meegotouch/widgetsgallery/images/contacts/\\\"\"
+DEFINES += IMAGES_DIR=\"\\\"$$M_THEME_DIR/base/meegotouch/widgetsgallery/images/\\\"\"
 DEFINES += MEDIA_DIR=\"\\\"$$M_INSTALL_DATA/widgetsgallery/media\\\"\"
 
 data_files.files = data/*