Patch splashscreen

src/client/UI/Contacts/js/contacts.js

@@ -67,24 +67,20 @@ function populateContacts(contacts)
     console.log("Populating contacts of amount: "+contacts.length);
 
     if(!initializationDone) {
-		splashPage.resetProgress()
 		splashPage.setProgressMax(contacts.length)
 	}
 
     for(var i =0; i<contacts.length; i++)
     {
-		//console.log("APPENDING CONTACT: " + contacts[i].jid + " - " + contacts[i].name)
-		//contacts[i].newContact = false;
-        contactsModel.append(contacts[i]);
 
         if(!initializationDone){
             splashPage.setSubOperation(contacts[i].jid)
-            splashPage.setProgress(i)
+            splashPage.setProgress(i+1)
             breathe()
          }
-        else if(i%4 == 0) {
-            breathe();
-        }
+		//console.log("APPENDING CONTACT: " + contacts[i].jid + " - " + contacts[i].name)
+		//contacts[i].newContact = false;
+        contactsModel.append(contacts[i]);
 
         var cachedConv =   conversations[contacts[i].jid];
         if(cachedConv){

src/client/UI/Misc/WASplash.qml

@@ -1,36 +1,54 @@
-// import QtQuick 1.0 // to target S60 5th Edition or Maemo 5
 import QtQuick 1.1
 import "../common"
 import com.nokia.meego 1.0
 WAPage {
-
     property string operation:qsTr("Initializing")
     property string subOperation:""
     property string version
+    property int stage: 0
     orientationLock: PageOrientation.LockPortrait
+    property int curProgress
+    property int maximumValue
+    property bool showSubProgress: true
+    property int position: 0
 
     function setCurrentOperation(op) {
-		progress.visible = false
-        subOperation = ""
-        operation = qsTr(op)
+		subOperation = ""
+		operation = qsTr(op)
+    }
+
+    function nextStage() {
+	stage++
+	position=0
     }
 
     function setSubOperation(subop) {
         subOperation = subop
     }
 
-	function setProgressMax(val) {
-		progress.maximumValue = val
+    function setProgressMax(val) {
+	maximumValue = val
+    }
+
+    function step() {
+	if (position+1 <= maximumValue) {
+	    position++
+	    setProgress(position)
+	    setOpacity(position)
 	}
+    }
 
-	function setProgress(val) {
-		progress.value = val
-	}
+    function setProgress(val) {
+	    var part = 100/maximumValue
+	    curProgress = parseInt(part*val /10)
+	    progress.source = "images/" + stage + curProgress + "0.png"
+    }
 
-	function resetProgress() {
-        //progress.visible = true
-		progress.value = 0
-	}
+    function setOpacity(val) {
+	    if (!theme.inverted)
+		blackbg.opacity = 1.0 - (1.0/maximumValue) * val
+	    background.opacity = (myBackgroundOpacity/maximumValue/10.0) * val
+    }
 
     onStatusChanged: {
       /*  if(status == PageStatus.Activating){
@@ -41,54 +59,91 @@ WAPage {
               appWindow.showToolBar = true
         }*/
     }
-
+
+    Rectangle {
+	id: whitebg
+	anchors.fill: parent
+	color: "white"
+    }
+
+    Rectangle {
+	id: blackbg
+	anchors.fill: parent
+	color: "black"
+	opacity: 1.0
+
+	transitions: Transition {
+	    NumberAnimation {
+		target: blackbg
+		property: "opacity"
+		from: blackbg.opacity
+		alwaysRunToEnd: true
+		duration: 7000
+	    }
+	}
+    }
+
     Image {
-        id: name
-        source: "../common/images/splash/wasplash90.png"
-        anchors.fill: parent
-        smooth: true
-
+	id: background
+	anchors.fill: parent
+	source: myBackgroundImage!="none" ? (WAConstants.CACHE_PATH+"/"+"background-portrait.jpg" + "?ran=" + Math.random()) : ""
+	fillMode: Image.PreserveAspectCrop
+	opacity: 0
+
+	transitions: Transition {
+	    NumberAnimation {
+		target: background
+		property: "opacity"
+		from: background.opacity
+		alwaysRunToEnd: true
+		duration: 7000
+	    }
+	}
+    }
+
+    Image {
+	id: progress
+	width: 180
+	height: 180
+	anchors.left: parent.left
+	anchors.top: parent.top
+	anchors.topMargin: 246
+	anchors.leftMargin: 150
+	source: "images/100.png"
     }
 
     Column{
+	id: textColumn
         width:parent.width
-		spacing: 20
+	spacing: 20
         y:450
 
         Label{
             text:operation
-            color: "white"
+            color: "gray"
             horizontalAlignment: Text.AlignHCenter
-            font.bold: true
+            //font.bold: true
             width:parent.width
         }
 
-		ProgressBar{
-			id: progress
-			width: 360
-            visible:false
-			anchors.horizontalCenter: parent.horizontalCenter
-			minimumValue: 0
-			platformStyle: ProgressBarStyle {
-				knownTexture: "../common/images/splashprogress.png"
-			}
-        }
-
         Label{
             text:subOperation
             color: "white"
             horizontalAlignment: Text.AlignHCenter
             width:parent.width
+            visible: showSubProgress
         }
     }
 
     Label{
+	id: verlabel
         text:version
         width:parent.width
         horizontalAlignment: Text.AlignHCenter
-        color:"white"
+        color:"#269f1a"
         anchors.bottom: parent.bottom
         anchors.bottomMargin: 20
+	opacity: 0.8
     }
 
 }

src/client/UI/main.qml

@@ -397,7 +397,14 @@ WAStackWindow {
     }
 
     function setSplashOperation(op) {
-        splashPage.setCurrentOperation(op)
+	if (op=="contacts") 
+	    splashPage.setCurrentOperation("Loading Contacts")
+	else if (op=="convs")
+	    splashPage.setCurrentOperation("Loading Conversations")
+	else if (op=="phone")
+	    splashPage.setCurrentOperation("Loading Phone Contacts")
+
+	splashPage.nextStage()
     }
 
     function onInitDone(){
@@ -724,15 +731,17 @@ WAStackWindow {
 
 
     /****Conversation related slots****/
+
+    function conversationsCount(max) {
+      if(!initializationDone)
+	splashPage.setProgressMax(max)
+	splashPage.step()
+    }
 
     function conversationReady(conv){
         //This should be called if and only if conversation start point is backend
         consoleDebug("Got a conv in conversationReady slot: " + conv.jid);
 
-
-        if(!initializationDone)
-            splashPage.setSubOperation(conv.jid)
-
         breathe()
         var conversation = waChats.getOrCreateConversation(conv.jid);
 
@@ -759,7 +768,6 @@ WAStackWindow {
             contact.setConversation(conversation);
 
         }
-
     }
 
     signal reorderConversation(string cjid) //@@THIS IS FUCKING RETARDED!!!!!!!!
@@ -794,6 +802,10 @@ WAStackWindow {
         if(messages.data.length == 1 && messages.data[0].type == 0)
         onPaused(messages.jid)
 
+        if(!initializationDone) {
+            splashPage.setSubOperation(messages.jid)
+	    splashPage.step()
+	}
     }
 
     function checkUnreadMessages() {
@@ -903,6 +915,7 @@ WAStackWindow {
     WASplash{
         id:splashPage
         version:waversion
+        showSubProgress: false
     }
 
     AboutDialog{

src/client/messagestore.py

@@ -33,6 +33,7 @@ class MessageStore(QObject):
 	messageStatusUpdated = QtCore.Signal(str,int,int);
 	messagesReady = QtCore.Signal(dict,bool);
 	conversationReady = QtCore.Signal(dict);
+	conversationsCount = QtCore.Signal(int);
 	conversationExported = QtCore.Signal(str, str); #jid, exportePath
 	conversationMedia = QtCore.Signal(list);
 	conversationGroups = QtCore.Signal(list);
@@ -243,6 +244,8 @@ def loadConversations(self):
 
 		convList = sorted(convList, key=lambda k: k['lastdate']);
 		convList.reverse();
+
+		self.conversationsCount.emit(len(convList));
 
 		for ci in convList:
 			messages = []

src/client/ui.py

@@ -144,6 +144,7 @@ def initConnections(self,store):
 		self.messageStore = MessageStore(self.store);
 		self.messageStore.messagesReady.connect(self.rootObject().messagesReady)
 		self.messageStore.conversationReady.connect(self.rootObject().conversationReady)
+		self.messageStore.conversationsCount.connect(self.rootObject().conversationsCount)
 		self.rootObject().loadMessages.connect(self.messageStore.loadMessages);
 
 
@@ -294,12 +295,12 @@ def populateContacts(self, mode, status=""):
 			self.rootObject().updateContactStatus(status)
 
 		else:
-			if not self.initializationDone:
-				self.splashOperationUpdated.emit("Loading Contacts")
-
 			contacts = self.c.getContacts();
 			self._d("POPULATE CONTACTS: " + str(len(contacts)));
 
+			if not self.initializationDone:
+				self.splashOperationUpdated.emit("contacts")
+
 
 			contactsFiltered = filter(lambda c: c["jid"]!=self.accountJid, contacts)
 			self.rootObject().pushContacts(mode,contactsFiltered);
@@ -310,14 +311,14 @@ def populateContacts(self, mode, status=""):
 
 	def populateConversations(self):
 		if not self.initializationDone:
-			self.splashOperationUpdated.emit("Loading Conversations")
+			self.splashOperationUpdated.emit("convs")
 		self.messageStore.loadConversations()
 
 
 	def populatePhoneContacts(self):
 
 		if not self.initializationDone:
-			self.splashOperationUpdated.emit("Loading Phone Contacts")
+			self.splashOperationUpdated.emit("phone")
 
 		self._d("POPULATE PHONE CONTACTS");
 		contacts = self.c.getPhoneContacts();