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

List:       kde-commits
Subject:    KDE/kdepim/mobile
From:       Volker Krause <vkrause () kde ! org>
Date:       2010-11-11 12:46:53
Message-ID: 20101111124653.B2814AC89E () svn ! kde ! org
[Download RAW message or body]

SVN commit 1195524 by vkrause:

Cleanup bulk action screen related code duplication in preparation for
putting it into a QML.Loader.


 M  +1 -8      calendar/korganizer-mobile.qml  
 M  +1 -8      contacts/kaddressbook-mobile.qml  
 M  +3 -2      lib/BulkActionScreen.qml  
 M  +1 -10     mail/kmail-mobile.qml  
 M  +2 -14     notes/notes.qml  
 M  +1 -7      tasks/tasks.qml  


--- trunk/KDE/kdepim/mobile/calendar/korganizer-mobile.qml #1195523:1195524
@@ -571,11 +571,7 @@
   KPIM.BulkActionScreen {
     id : bulkActionScreen
     visible : guiStateManager.inBulkActionScreenState
-    anchors.top: parent.top
-    anchors.topMargin : 12
-    anchors.bottom: parent.bottom
-    anchors.left: parent.left
-    anchors.right : parent.right
+    anchors.fill: parent
     backgroundImage : backgroundImage.source
 
     actionListWidth : 1/3 * parent.width
@@ -588,10 +584,7 @@
       checkModel : _itemActionModel
       anchors.fill : parent
     }
-    onBackClicked : {
-      guiStateManager.popState();
     }
-  }
 
   KPIM.SearchResultScreen {
     id : searchResultScreen
--- trunk/KDE/kdepim/mobile/contacts/kaddressbook-mobile.qml #1195523:1195524
@@ -373,11 +373,7 @@
   KPIM.BulkActionScreen {
     id : bulkActionScreen
     visible : guiStateManager.inBulkActionScreenState
-    anchors.top: parent.top
-    anchors.topMargin : 12
-    anchors.bottom: parent.bottom
-    anchors.left: parent.left
-    anchors.right : parent.right
+    anchors.fill: parent
     backgroundImage : backgroundImage.source
 
     actionListWidth : 1/3 * parent.width
@@ -390,10 +386,7 @@
       checkModel : _itemActionModel
       anchors.fill : parent
     }
-    onBackClicked : {
-      guiStateManager.popState();
     }
-  }
 
   KPIM.SearchResultScreen {
     id : searchResultScreen
--- trunk/KDE/kdepim/mobile/lib/BulkActionScreen.qml #1195523:1195524
@@ -34,7 +34,8 @@
   property alias actionModel : actionList.actionModel
   default property alias actions: actionList.children
 
-  signal backClicked()
+  anchors.fill: parent
+  anchors.topMargin : 12
 
   QML.Image {
     id: _backgroundImage
@@ -45,7 +46,7 @@
     anchors.top : parent.top
     anchors.bottom : selectAllButton.top
     anchors.left : parent.left
-    onBackClicked : parent.backClicked()
+    onBackClicked : guiStateManager.popState()
     onTriggered : {
       //mainPanel.complete(name)
     }
--- trunk/KDE/kdepim/mobile/mail/kmail-mobile.qml #1195523:1195524
@@ -52,8 +52,6 @@
     }
   }
 
-  QML.SystemPalette { id: palette; colorGroup: "Active" }
-
   QML.Rectangle {
       id : newMailPage
       anchors.right : kmailMobile.right
@@ -633,11 +631,7 @@
   KPIM.BulkActionScreen {
     id : bulkActionScreen
     visible : guiStateManager.inBulkActionScreenState
-    anchors.top: parent.top
-    anchors.topMargin : 12
-    anchors.bottom: parent.bottom
-    anchors.left: parent.left
-    anchors.right : parent.right
+    anchors.fill: parent
     backgroundImage : backgroundImage.source
     property bool initialized : false
 
@@ -651,9 +645,6 @@
       checkModel : _itemActionModel
       anchors.fill : parent
     }
-    onBackClicked : {
-      guiStateManager.popState();
-    }
 
     onVisibleChanged: {
       if ( visible == true && initialized == false ) {
--- trunk/KDE/kdepim/mobile/notes/notes.qml #1195523:1195524
@@ -28,8 +28,6 @@
 KPIM.MainView {
   id: notesMobile
 
-  QML.SystemPalette { id: palette; colorGroup: "Active" }
-
   QML.Connections {
     target: guiStateManager
     onGuiStateChanged: { updateContextActionStates() }
@@ -319,10 +317,7 @@
     id : bulkActionScreen
     visible : guiStateManager.inBulkActionScreenState
     anchors.top: parent.top
-    anchors.topMargin : 12
-    anchors.bottom: parent.bottom
-    anchors.left: parent.left
-    anchors.right : parent.right
+    anchors.fill: parent
     backgroundImage : backgroundImage.source
 
     actionListWidth : 1/3 * parent.width
@@ -336,18 +331,11 @@
       anchors.fill : parent
       showDeleteButton: false
     }
-    onBackClicked : {
-      guiStateManager.popState();
     }
-  }
 
   KPIM.SearchResultScreen {
     id : searchResultScreen
-    anchors.top: parent.top
-    anchors.topMargin : 12
-    anchors.bottom: parent.bottom
-    anchors.left: parent.left
-    anchors.right : parent.right
+    anchors.fill: parent
 
     itemView: NotesListView {
       id: searchNotesListView
--- trunk/KDE/kdepim/mobile/tasks/tasks.qml #1195523:1195524
@@ -360,11 +360,8 @@
   KPIM.BulkActionScreen {
     id : bulkActionScreen
     visible : guiStateManager.inBulkActionScreenState
-    anchors.top: parent.top
     anchors.topMargin : 12
-    anchors.bottom: parent.bottom
-    anchors.left: parent.left
-    anchors.right : parent.right
+    anchors.fill: parent
     backgroundImage : backgroundImage.source
 
     actionListWidth : 1/3 * parent.width
@@ -378,10 +375,7 @@
       anchors.fill : parent
       showCompletionSlider: false
     }
-    onBackClicked : {
-      guiStateManager.popState()
     }
-  }
 
   KPIM.SearchResultScreen {
     id : searchResultScreen
[prev in list] [next in list] [prev in thread] [next in thread]