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

List:       kde-commits
Subject:    [kstars/socis2014-skyguides] kstars: Added skyguides subdirectory to CMakeLists
From:       Gioacchino Mazzurco <gio () eigenlab ! org>
Date:       2014-06-30 21:14:59
Message-ID: E1X1iuh-0005vp-D4 () scm ! kde ! org
[Download RAW message or body]

Git commit 1056cd247bb7eb6364c21b8ceb7e5bfc40dcb1ea by Gioacchino Mazzurco.
Committed on 29/06/2014 at 18:11.
Pushed by gmazzurco into branch 'socis2014-skyguides'.

Added skyguides subdirectory to CMakeLists
Added firsts qml interfaces trys
Added ecmple guides

M  +2    -1    kstars/CMakeLists.txt
A  +1    -0    kstars/skyguides/CMakeLists.txt
A  +7    -0    kstars/skyguides/example_guides/jupiter_documentary/index.html
A  +-    --    kstars/skyguides/example_guides/jupiter_documentary/thumbnail.png
A  +7    -0    kstars/skyguides/example_guides/jupiter_the_big/index.html
A  +-    --    kstars/skyguides/example_guides/jupiter_the_big/thumbnail.png
A  +9    -0    kstars/skyguides/qml/CMakeLists.txt
A  +9    -0    kstars/skyguides/qml/GuideViewer.qml     [License: UNKNOWN]  *
A  +78   -0    kstars/skyguides/qml/GuidesListView.qml     [License: UNKNOWN]  *

The files marked with a * at the end have a non valid license. Please read: \
http://techbase.kde.org/Policies/Licensing_Policy and use the headers which are \
listed at that page.


http://commits.kde.org/kstars/1056cd247bb7eb6364c21b8ceb7e5bfc40dcb1ea

diff --git a/kstars/CMakeLists.txt b/kstars/CMakeLists.txt
index 8797a48..d982faa 100644
--- a/kstars/CMakeLists.txt
+++ b/kstars/CMakeLists.txt
@@ -1,7 +1,8 @@
 add_subdirectory( data )
 add_subdirectory( icons )
 add_subdirectory( htmesh )
-add_subdirectory( tools/whatsinteresting/qml)
+add_subdirectory( skyguides )
+add_subdirectory( tools/whatsinteresting/qml )
 
 Find_package(ZLIB REQUIRED)
 Find_package(Threads REQUIRED)
diff --git a/kstars/skyguides/CMakeLists.txt b/kstars/skyguides/CMakeLists.txt
new file mode 100644
index 0000000..401e47c
--- /dev/null
+++ b/kstars/skyguides/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory( qml )
diff --git a/kstars/skyguides/example_guides/jupiter_documentary/index.html \
b/kstars/skyguides/example_guides/jupiter_documentary/index.html new file mode 100644
index 0000000..b5d6341
--- /dev/null
+++ b/kstars/skyguides/example_guides/jupiter_documentary/index.html
@@ -0,0 +1,7 @@
+<html>
+    <head></head>
+    <body>
+        <!--<script>window.qml.qmlCall();</script>-->
+        <iframe width="98%" height="98%" \
src="http://www.youtube.com/embed/Z1tIS-S-Mqw" frameborder="0" \
allowfullscreen></iframe> +    </body>
+</html>
diff --git a/kstars/skyguides/example_guides/jupiter_documentary/thumbnail.png \
b/kstars/skyguides/example_guides/jupiter_documentary/thumbnail.png new file mode \
100644 index 0000000..9f7d1c4
Binary files /dev/null and \
                b/kstars/skyguides/example_guides/jupiter_documentary/thumbnail.png \
                differ
diff --git a/kstars/skyguides/example_guides/jupiter_the_big/index.html \
b/kstars/skyguides/example_guides/jupiter_the_big/index.html new file mode 100644
index 0000000..a55da27
--- /dev/null
+++ b/kstars/skyguides/example_guides/jupiter_the_big/index.html
@@ -0,0 +1,7 @@
+<html>
+    <head></head>
+    <body>
+        <!--<script>window.qml.qmlCall();</script>-->
+        <iframe width="594" height="394" \
src="http://www.youtube.com/embed/s56pxa9lpvo" frameborder="0" \
allowfullscreen></iframe> +    </body>
+</html>
diff --git a/kstars/skyguides/example_guides/jupiter_the_big/thumbnail.png \
b/kstars/skyguides/example_guides/jupiter_the_big/thumbnail.png new file mode 100644
index 0000000..8bd63bf
Binary files /dev/null and \
                b/kstars/skyguides/example_guides/jupiter_the_big/thumbnail.png \
                differ
diff --git a/kstars/skyguides/qml/CMakeLists.txt \
b/kstars/skyguides/qml/CMakeLists.txt new file mode 100644
index 0000000..363e888
--- /dev/null
+++ b/kstars/skyguides/qml/CMakeLists.txt
@@ -0,0 +1,9 @@
+#install_files
+
+install( FILES wiview.qml ScrollBar.qml
+         leftArrow.png
+         settingsIcon.png
+         reloadIcon.png
+         next.png
+         previous.png
+         DESTINATION  ${DATA_INSTALL_DIR}/kstars/skyguides/qml )
diff --git a/kstars/skyguides/qml/GuideViewer.qml \
b/kstars/skyguides/qml/GuideViewer.qml new file mode 100644
index 0000000..22f0f76
--- /dev/null
+++ b/kstars/skyguides/qml/GuideViewer.qml
@@ -0,0 +1,9 @@
+import QtQuick 1.0
+import QtWebKit 1.0
+
+WebView
+{
+	url: "file:///home/gioacchino/Development/kstars/kstars/skyguides/example_guides/jupiter_the_big/index.html"
 +	height: 400
+	width: 600
+}
diff --git a/kstars/skyguides/qml/GuidesListView.qml \
b/kstars/skyguides/qml/GuidesListView.qml new file mode 100644
index 0000000..ebf9ff0
--- /dev/null
+++ b/kstars/skyguides/qml/GuidesListView.qml
@@ -0,0 +1,78 @@
+import QtQuick 1.0
+
+Rectangle
+{
+	width: 210
+	height: 400
+
+	ListModel
+	{
+		id: guidesModel
+
+		ListElement
+		{
+			name: "Jupiter Tempests"
+			path: "file:///home/gioacchino/Development/kstars/kstars/skyguides/example_guides/jupiter_the_big/"
 +		}
+		
+		ListElement {
+			name: "Jupiter the Big"
+			path: "file:///home/gioacchino/Development/kstars/kstars/skyguides/example_guides/jupiter_documentary/"
 +		}
+		
+		ListElement
+		{
+			name: "Jupiter Eye"
+			path: "file:///home/gioacchino/Development/kstars/kstars/skyguides/example_guides/jupiter_the_big/"
 +		}
+	}
+
+	ListView
+	{
+		height: parent.height - anchors.margins * 2
+		width: parent.width - anchors.margins * 2
+		anchors.margins: 8
+		anchors.top: parent.top
+		anchors.left: parent.left
+
+		spacing: 10
+		model: guidesModel
+		delegate: Column
+		{
+			Rectangle
+			{
+				width: parent.parent.parent.width
+				height: 150
+				color: "grey"
+				border.color: "black"
+				border.width: 5
+				radius: 10
+				
+				Text
+				{
+					anchors.top: parent.top
+					anchors.left: parent.left
+					anchors.margins: 6
+					id: titleText
+					text: name
+					font.bold: true
+				}
+				
+				Image
+				{
+					width: parent.width - 6
+					anchors.margins: 3
+					anchors.top: titleText.bottom
+					anchors.left: parent.left
+					source: path + "thumbnail.png"
+				}
+				
+				MouseArea
+				{
+					
+					onClicked: console.log("button clicked")
+				}
+			}
+		}
+	}
+}


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

Configure | About | News | Add a list | Sponsored by KoreLogic