v.0.5

source-android/qml/calendarqml/CalendarDay.qml

@@ -29,8 +29,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import QtQuick 2.0
-import QtQuick.Controls 1.4
+import QtQuick 2.11
+//import QtQuick.Controls 2.4
 
 Item {
     id: calendarDay

source-android/qml/calendarqml/CalendarTab.qml

@@ -30,10 +30,10 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import QtQuick 2.0
-import QtQuick.Controls 2.3
+import QtQuick.Controls 2.4
 import QtQml 2.2
 import Qt.labs.calendar 1.0
-import QtQuick.Controls 1.2 as Oldcontrol
+//import QtQuick.Controls 1.2 as Oldcontrol
 import QtQuick.Layouts 1.3
 import "qrc:/js/service.js" as Service
 import "qrc:/js/helper.js" as Helperjs
@@ -42,9 +42,10 @@ import "qrc:/qml/genericqml"
 
 Rectangle {
     id:calendarrectangle
-    y:1
-    width:root.width-mm
-    height:root.height-5*mm
+//    y:1
+//    width:root.width-mm
+//    height:root.height-5*mm
+    anchors.fill: parent
     color: '#fff'
     property date currentTime: new Date()
     property int offsetTime: currentTime.getTimezoneOffset() * 60 * 1000
@@ -83,30 +84,35 @@ Rectangle {
        }
 
 
-    BlueButton{
+    MButton{
         id:  updateEvents
         anchors.top: parent.top
         anchors.topMargin: 0.5*mm
         anchors.right:calendartabstatusButton.left
         anchors.rightMargin:mm
+        height: 6*mm
+        width: 8*mm
         text:"\uf021"
         onClicked: {
-            
             Service.getEvents(db,login, calendartab,function(){
                showEvents("")
     })}}
 
-    BlueButton{
+    MButton{
         id:  calendartabstatusButton
         anchors.top: parent.top
         anchors.topMargin: 0.5*mm
         anchors.right: parent.right
         anchors.rightMargin:2*mm
+        height: 6*mm
+        width: Math.max(10*mm,implicitWidth)
         text: calendartab.calendartabstatus=="Events"?qsTr("Events"):calendartabstatus
-        Oldcontrol.Menu {
+        Menu {
             id:calendartabmenu
-            Oldcontrol.MenuItem {
+            width: 40*mm
+            MenuItem {
                 text: qsTr("Own Calendar")
+                font.pixelSize: 3*mm
                 onTriggered: {
                     calendartab.calendartabstatus="Events";
                    // calendartabstatusButton.text=qsTr("own Calendar");
@@ -146,6 +152,7 @@ Rectangle {
                 DayOfWeekRow{
                     locale: monthgrid.locale
                     Layout.fillWidth: true
+                    font.pixelSize: 3*mm
                 }
 
                 MonthGrid {

source-android/qml/calendarqml/EventList.qml

@@ -30,7 +30,7 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import QtQuick 2.0
-import QtQuick.Controls 1.2
+import QtQuick.Controls 2.4
 import "qrc:/js/service.js" as Service
 import "qrc:/js/helper.js" as Helperjs
 import "qrc:/qml/genericqml"
@@ -45,12 +45,14 @@ Rectangle{
     y:mm
     property var daylist:[]
 
-    BlueButton{
+    MButton{
        id:closeButton
        anchors.top: parent.top
        anchors.topMargin: 1*mm
        anchors.right: parent.right
        anchors.rightMargin: 1*mm
+       height: 6*mm
+       width: 8*mm
        text: "\uf057"
        onClicked:{eventList.destroy()}
     }