[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-08-30 12:42:50
Message-ID: 20100830124250.E12F5AC857 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1169971 by vkrause:

Integrate about dialog in all apps and include the version number in there.

BUG: 248984
BUG: 247786


 M  +1 -2      calendar/korganizer-mobile.qml  
 M  +5 -0      contacts/kaddressbook-mobile.qml  
 M  +4 -3      lib/AboutDialog.qml  
 M  +7 -0      lib/kdeclarativemainview.cpp  
 M  +3 -0      lib/kdeclarativemainview.h  
 M  +4 -0      mail/kmail-mobile.qml  
 M  +5 -0      notes/notes.qml  
 M  +5 -0      tasks/tasks.qml  


--- trunk/KDE/kdepim/mobile/calendar/korganizer-mobile.qml #1169970:1169971
@@ -520,7 +520,6 @@
 
   KPIM.AboutDialog {
     id : aboutDialog
-    anchors.fill : parent
-    visible : false
+    source: backgroundImage.source
   }
 }
--- trunk/KDE/kdepim/mobile/contacts/kaddressbook-mobile.qml #1169970:1169971
@@ -446,4 +446,9 @@
     target: contactGroupView
     onContactGroupRemoved : { goBackToListing(); }
   }
+
+  KPIM.AboutDialog {
+    id : aboutDialog
+    source: backgroundImage.source
 }
+}
--- trunk/KDE/kdepim/mobile/lib/AboutDialog.qml #1169970:1169971
@@ -21,13 +21,14 @@
 
 import Qt 4.7 as QML
 
-QML.Rectangle {
-  color : "lightsteelblue"
+QML.Image {
+  anchors.fill: parent
+  visible: false
 
   //Flickable {
     QML.Text {
       anchors.centerIn : parent
-      text : "This is the about dialog"
+      text : "This is the about dialog\n\n" + application.version
     }
   //}
 
--- trunk/KDE/kdepim/mobile/lib/kdeclarativemainview.cpp #1169970:1169971
@@ -19,6 +19,8 @@
 #include "kdeclarativemainview.h"
 #include "kdeclarativemainview_p.h"
 
+#include "kdepim-version.h"
+
 #include <QtDeclarative/QDeclarativeContext>
 #include <QtDeclarative/QDeclarativeEngine>
 #include <QtGui/QApplication>
@@ -467,3 +469,8 @@
   manager->setSelectionModel( selectionModel );
   manager->createAllActions();
 }
+
+QString KDeclarativeMainView::version() const
+{
+  return i18n( "Version: %1 (%2)\nLast change: %3", QLatin1String( KDEPIM_VERSION ), \
KDEPIM_SVN_REVISION_STRING, KDEPIM_SVN_LAST_CHANGE ); +}
--- trunk/KDE/kdepim/mobile/lib/kdeclarativemainview.h #1169970:1169971
@@ -43,6 +43,7 @@
   Q_OBJECT
   Q_PROPERTY(int numSelectedAccounts READ numSelectedAccounts NOTIFY \
numSelectedAccountsChanged)  Q_PROPERTY(bool isLoadingSelected READ isLoadingSelected \
NOTIFY isLoadingSelectedChanged) +  Q_PROPERTY(QString version READ version CONSTANT)
 
 protected:
   /**
@@ -104,6 +105,8 @@
 
   int numSelectedAccounts();
 
+  QString version() const;
+
 public slots:
   void setSelectedAccount( int row );
   int selectedCollectionRow();
--- trunk/KDE/kdepim/mobile/mail/kmail-mobile.qml #1169970:1169971
@@ -415,4 +415,8 @@
     onMailRemoved : { backToListing(); }
   }
 
+  KPIM.AboutDialog {
+    id : aboutDialog
+    source: backgroundImage.source
 }
+}
--- trunk/KDE/kdepim/mobile/notes/notes.qml #1169970:1169971
@@ -271,4 +271,9 @@
       application.loadFavorite(favName);
     }
   }
+
+  KPIM.AboutDialog {
+    id : aboutDialog
+    source: backgroundImage.source
 }
+}
--- trunk/KDE/kdepim/mobile/tasks/tasks.qml #1169970:1169971
@@ -389,4 +389,9 @@
       application.loadFavorite(favName);
     }
   }
+
+  KPIM.AboutDialog {
+    id : aboutDialog
+    source: backgroundImage.source
 }
+}


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