branches/yali/yali-proximate/yali/gui - checkpoint

[Renan Çakırerk]

Author: renan.cakirerk
Date: Wed Sep 22 11:30:32 2010
New Revision: 31973

Modified:
   branches/yali/yali-proximate/yali/gui/Ui/datetimewidget.ui
   branches/yali/yali-proximate/yali/gui/Ui/setupuserswidget.ui
   branches/yali/yali-proximate/yali/gui/YaliWindow.py
Log:
checkpoint

---
 Ui/datetimewidget.ui   |    2 +-
 Ui/setupuserswidget.ui |   10 ++++++++--
 YaliWindow.py          |   29 +++++++++++++++++++++++++++++
 3 files changed, 38 insertions(+), 3 deletions(-)

Modified: branches/yali/yali-proximate/yali/gui/Ui/datetimewidget.ui
=================================================================
--- branches/yali/yali-proximate/yali/gui/Ui/datetimewidget.ui	(original)
+++ branches/yali/yali-proximate/yali/gui/Ui/datetimewidget.ui	Wed Sep 22 11:30:32 2010
@@ -338,7 +338,7 @@
              </font>
             </property>
             <property name="editable">
-             <bool>false</bool>
+             <bool>true</bool>
             </property>
            </widget>
           </item>

Modified: branches/yali/yali-proximate/yali/gui/Ui/setupuserswidget.ui
=================================================================
--- branches/yali/yali-proximate/yali/gui/Ui/setupuserswidget.ui	(original)
+++ branches/yali/yali-proximate/yali/gui/Ui/setupuserswidget.ui	Wed Sep 22 11:30:32 2010
@@ -53,7 +53,7 @@
      <property name="maximumSize">
       <size>
        <width>16777215</width>
-       <height>200</height>
+       <height>16777215</height>
       </size>
      </property>
      <property name="styleSheet">
@@ -66,6 +66,9 @@
       <enum>QFrame::Raised</enum>
      </property>
      <layout class="QHBoxLayout" name="horizontalLayout_6">
+      <property name="spacing">
+       <number>30</number>
+      </property>
       <item>
        <spacer name="horizontalSpacer">
         <property name="orientation">
@@ -113,7 +116,7 @@
         <item>
          <layout class="QHBoxLayout" name="horizontalLayout_3">
           <property name="spacing">
-           <number>30</number>
+           <number>20</number>
           </property>
           <property name="topMargin">
            <number>0</number>
@@ -294,6 +297,9 @@
         <item>
          <widget class="QWidget" name="advancedList" native="true">
           <layout class="QGridLayout" name="gridLayout_2">
+           <property name="spacing">
+            <number>0</number>
+           </property>
            <item row="4" column="0">
             <layout class="QGridLayout">
              <item row="1" column="1">

Modified: branches/yali/yali-proximate/yali/gui/YaliWindow.py
=================================================================
--- branches/yali/yali-proximate/yali/gui/YaliWindow.py	(original)
+++ branches/yali/yali-proximate/yali/gui/YaliWindow.py	Wed Sep 22 11:30:32 2010
@@ -94,6 +94,14 @@
 
         self.ui.helpContentFrame.hide()
 
+        self.effect = QtGui.QGraphicsOpacityEffect(self)
+        self.ui.mainStack.setGraphicsEffect(self.effect)
+        self.effect.setOpacity(1.0)
+
+        self.anime = QTimer(self)
+        self._mutex = QMutex()
+        self.condition = QWaitCondition()
+        self.connect(self.anime, SIGNAL("timeout()"), self.animate)
 
     def mousePressEvent(self, event):
         if event.button() == Qt.RightButton and not self.dontAskCmbAgain:
@@ -218,6 +226,9 @@
             self.stackMove(self.getCurrent(self.stepIncrement))
             self.stepIncrement = 1
 
+        self.animationType = "fade-out"
+        self.anime.start(100)
+
     # execute previous step
     def slotBack(self):
         widget = self.ui.mainStack.currentWidget()
@@ -228,6 +239,10 @@
     # move to id numbered stack
     def stackMove(self, id):
         if not id == self.ui.mainStack.currentIndex() or id==0:
+            self.condition.wait(self._mutex)
+            print "--------- mutex %s" % self._mutex
+            self.animationType = "fade-in"
+            self.anime.start(100)
             self.ui.mainStack.setCurrentIndex(id)
             _w = self.ui.mainStack.currentWidget()
             self.ui.screenName.setText(_w.title)
@@ -237,11 +252,25 @@
             self.ui.helpContent.setText(_w.help)
             # shown functions contain necessary instructions before
             # showing a stack ( updating gui, disabling some buttons etc. )
+
             ctx.mainScreen.processEvents()
             _w.update()
             ctx.mainScreen.processEvents()
             _w.shown()
 
+    def animate(self):
+        if self.animationType == "fade-in":
+            if self.effect.opacity() < 1.0:
+                self.effect.setOpacity(self.effect.opacity() + 0.1)
+            else:
+                self.anime.stop()
+                self._mutex.unlock()
+        if self.animationType == "fade-out":
+            if self.effect.opacity() > 0.0:
+                self.effect.setOpacity(self.effect.opacity() - 0.1)
+            else:
+                self.anime.stop()
+                self._mutex.unlock()
     # create all widgets and add inside stack
     # see runner.py/_all_screens for the list
     def createWidgets(self, screens=[]):