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

List:       kde-commits
Subject:    playground/base/plasma/kde-artwork-active
From:       Marco Martin <notmart () gmail ! com>
Date:       2013-03-18 18:06:46
Message-ID: 20130318180646.251E7AC876 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1345063 by mart:

new theme for splashscreen


 M  +2 -15     CMakeLists.txt  
 D             splash/1366x768 (directory)  
 A             splash/images (directory)  
 AM            splash/images/active-logo.png  
 AM            splash/images/busyindicator.png  
 AM            splash/images/busyindicator.svgz  
 AM            splash/images/gradient.png  
 AM            splash/images/noiselight.png  
 M  +15 -231   splash/main.qml  


--- trunk/playground/base/plasma/kde-artwork-active/CMakeLists.txt #1345062:1345063
@@ -16,21 +16,8 @@
               splash/Theme.rc
         DESTINATION ${DATA_INSTALL_DIR}/ksplash/Themes/ActiveAir)
 
-install(FILES splash/${SCREEN_RESOLUTION}/active-logo-1.png
-              splash/${SCREEN_RESOLUTION}/active-logo-2.png
-              splash/${SCREEN_RESOLUTION}/active-logo-3.png
-              splash/${SCREEN_RESOLUTION}/background.png
-              splash/${SCREEN_RESOLUTION}/bottomleft-smallvine-3.png
-              splash/${SCREEN_RESOLUTION}/bottomleft-vine-1.png
-              splash/${SCREEN_RESOLUTION}/bottomleft-vine-2.png
-              splash/${SCREEN_RESOLUTION}/bottomleft-vine-3.png
-              splash/${SCREEN_RESOLUTION}/bottomleft-vine-4.png
-              splash/${SCREEN_RESOLUTION}/bottomleft-vine-5.png
-              splash/${SCREEN_RESOLUTION}/spinner.png
-              splash/${SCREEN_RESOLUTION}/topright-vine-2.png
-              splash/${SCREEN_RESOLUTION}/topright-vine-3.png
-              splash/${SCREEN_RESOLUTION}/topright-vine-4.png
-        DESTINATION ${DATA_INSTALL_DIR}/ksplash/Themes/ActiveAir/images)
+install(DIRECTORY splash/images
+        DESTINATION ${DATA_INSTALL_DIR}/ksplash/Themes/ActiveAir/)
 
 # Lockscreen
 install(DIRECTORY lockscreen/contents
--- trunk/playground/base/plasma/kde-artwork-active/splash/main.qml #1345062:1345063
@@ -22,11 +22,16 @@
 
 Image {
     id: main
-    source: "images/background.png"
+    source: "images/noiselight.png"
+    fillMode: Image.Tile
 
     width: screenSize.width
     height: screenSize.height
 
+    Image {
+        source: "images/gradient.png"
+        anchors.fill: parent
+    }
     /* property declarations --------------------------{{{ */
     property int stage
     /* }}} */
@@ -40,32 +45,12 @@
         stage1BottomLeftVine.opacity = 1
     }
     onStageChanged: {
-        if (stage == 2) {
-            stage1BottomLeftVine.opacity = 0
-            stage2BottomLeftVine.opacity = 1
-
-            stage2TopRightVine.x = -stage2TopRightVine.width
-        } else if (stage == 3) {
-            stage2BottomLeftVine.opacity = 0
-            stage3BottomLeftVine.opacity = 1
-
-            stage3SmallVine.x = 0
-
-            stage2TopRightVine.opacity = 0
-            stage3TopRightVine.opacity = 1
-        } else if (stage == 4) {
-            stage3BottomLeftVine.opacity = 0
-            stage4BottomLeftVine.opacity = 1
-
-            stage3TopRightVine.opacity = 0
-            stage4TopRightVine.opacity = 1
+        if (stage == 4) {
+            kLogo.opacity = 0.2
         } else if (stage == 5) {
-            stage4BottomLeftVine.opacity = 0
-            stage5BottomLeftVine.opacity = 1
+            kLogo.opacity = 0.5
         } else if (stage == 6) {
-            kLogo4.opacity = 1
-            kLogo5.opacity = 1
-            kLogo6.opacity = 1
+            kLogo.opacity = 1
         }
     }
     /* }}} */
@@ -76,217 +61,16 @@
 
     /* child objects ----------------------------------{{{ */
 
-    Image {
-        id: stage1BottomLeftVine
-        x: 0
-        y: (main.height - height) -60
-        source: "images/bottomleft-vine-1.png"
-        opacity: 0
 
-        Behavior on opacity {
-            NumberAnimation {
-                duration: 2000
-                easing {
-                    type: Easing.InOutQuad 
-                }
-            }
-        }
-    }
-    
     Image {
-        id: stage2BottomLeftVine
-        x: 0
-        y: (main.height - height) -60
-        source: "images/bottomleft-vine-2.png"
-        opacity: 0
-
-        Behavior on opacity {
-            NumberAnimation {
-                duration: 800
-                easing {
-                    type: Easing.InOutQuad 
-                }
-            }
-        }
-    }
-    
-    Image {
-        id: stage3BottomLeftVine
-        x: 0
-        y: (main.height - height) -60
-        source: "images/bottomleft-vine-3.png"
-        opacity: 0
-
-        Behavior on opacity {
-            NumberAnimation {
-                duration: 800
-                easing {
-                    type: Easing.InOutQuad 
-                }
-            }
-        }
-    }
-    
-    Image {
-        id: stage4BottomLeftVine
-        x: 0
-        y: (main.height - height) -60
-        source: "images/bottomleft-vine-4.png"
-        opacity: 0
-
-        Behavior on opacity {
-            NumberAnimation {
-                duration: 800
-                easing {
-                    type: Easing.InOutQuad 
-                }
-            }
-        }
-    }
-
-        
-    Image {
-        id: stage5BottomLeftVine
-        x: 0
-        y: (main.height - height) -60
-        source: "images/bottomleft-vine-5.png"
-        opacity: 0
-
-        Behavior on opacity {
-            NumberAnimation {
-                duration: 800
-                easing {
-                    type: Easing.InOutQuad 
-                }
-            }
-        }
-    }
-
-    Image {
-        id: stage3SmallVine
-        x: -width
-        y: (main.height - height) -167
-        source: "images/bottomleft-smallvine-3.png"
-        opacity: 1
-
-        Behavior on x {
-            NumberAnimation {
-                duration: 800
-                easing {
-                    type: Easing.InOutQuad 
-                }
-            }
-        }
-    }
-
-
-    Image {
-        anchors.left: parent.right
-        Image {
-            id: stage2TopRightVine
-            x: 0
-            y: 26
-            source: "images/topright-vine-2.png"
-            opacity: 1
-
-            Behavior on x {
-                NumberAnimation {
-                    duration: 800
-                    easing {
-                        type: Easing.InOutQuad 
-                    }
-                }
-            }
-            Behavior on opacity {
-                NumberAnimation {
-                    duration: 800
-                    easing {
-                        type: Easing.InOutQuad 
-                    }
-                }
-            }
-        }
-    }
-
-    Image {
-        id: stage3TopRightVine
-        x: parent.width-width
-        y: 26
-        source: "images/topright-vine-3.png"
-        opacity: 0
-
-        Behavior on opacity {
-            NumberAnimation {
-                duration: 800
-                easing {
-                    type: Easing.InOutQuad 
-                }
-            }
-        }
-    }
-
-    Image {
-        id: stage4TopRightVine
-        x: parent.width-width
-        y: 26
-        source: "images/topright-vine-4.png"
-        opacity: 0
-
-        Behavior on opacity {
-            NumberAnimation {
-                duration: 800
-                easing {
-                    type: Easing.InOutQuad 
-                }
-            }
-        }
-    }
-
-
-
-    Image {
-        id: kLogo6
+        id: kLogo
         anchors.horizontalCenter: parent.horizontalCenter
         y: 90
-        source: "images/active-logo-3.png"
+        source: "images/active-logo.png"
         opacity: 0
 
         Behavior on opacity {
             NumberAnimation {
-                duration: 3000
-                easing {
-                    type: Easing.InOutQuad 
-                }
-            }
-        }
-    }
-
-    Image {
-        id: kLogo5
-        anchors.horizontalCenter: parent.horizontalCenter
-        y: 90
-        source: "images/active-logo-2.png"
-        opacity: 0
-
-        Behavior on opacity {
-            NumberAnimation {
-                duration: 1500
-                easing {
-                    type: Easing.InOutQuad 
-                }
-            }
-        }
-    }
-
-    Image {
-        id: kLogo4
-        anchors.horizontalCenter: parent.horizontalCenter
-        y: 90
-        source: "images/active-logo-1.png"
-        opacity: 0
-
-        Behavior on opacity {
-            NumberAnimation {
                 duration: 800
                 easing {
                     type: Easing.InOutQuad 
@@ -297,8 +81,8 @@
 
         
     Image {
-        id: spinner
-        source: "images/spinner.png"
+        id: busyindicator
+        source: "images/busyindicator.png"
         anchors.horizontalCenter: parent.horizontalCenter
         smooth: true
         anchors.centerIn: parent
@@ -307,7 +91,7 @@
             from: 0
             to: 360
             duration: 2500
-            running: spinner.opacity > 0
+            running: busyindicator.opacity > 0
             loops: Animation.Infinite
         }
     }
[prev in list] [next in list] [prev in thread] [next in thread] 

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