v.0.5

source-android/qml/newsqml/SmileyDialog.qml

@@ -29,9 +29,10 @@
 //  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.7
-import QtQuick.Controls 1.2
-import QtQuick.Controls.Styles 1.4
+import QtQuick 2.11
+import QtQuick.Controls 2.4
+import QtQuick.Layouts 1.11
+//import QtQuick.Controls.Styles 1.4
 import "qrc:/js/smiley.js" as Smileyjs
 import "qrc:/js/helper.js" as Helperjs
 import "qrc:/qml/genericqml"
@@ -42,8 +43,10 @@ Rectangle{
     width: messageColumn.width-5*mm
     height:root.height/2
     
-    BlueButton{
+    Button{
        id:closeButton
+       height: 6*mm
+       width: 8*mm
        anchors.top: parent.top
        anchors.topMargin: 1*mm
        anchors.right: parent.right
@@ -52,34 +55,57 @@ Rectangle{
        onClicked:{smileyDialog.visible=false}
     }
 
-    TabView{
+
+    TabBar {
+      id: smileybar
+      width: parent.width
+      height: 9*mm
+      position:TabBar.Header
+      TabButton {
+          text:qsTr("Unicode")
+          font.pixelSize: 2*mm
+      }
+      TabButton {
+          text:  qsTr("Standard")
+          font.pixelSize: 2*mm
+      }
+      TabButton {
+          text:  qsTr("Addon")
+          font.pixelSize: 2*mm
+      }
+    
+      TabButton {
+          text:  qsTr("Adult")
+          font.pixelSize: 2*mm
+      }
+  }
+
+
+    StackLayout{
         id:smileyTabView
-        tabPosition: Qt.BottomEdge
+        currentIndex: smileybar.currentIndex
         anchors.top: closeButton.bottom
         anchors.topMargin: 1*mm
         width: smileyDialog.width-2*mm
         height: smileyDialog.height-7*mm
-        currentIndex: 0
-        style: TabViewStyle {
-            frameOverlap: 1
-            tab: Rectangle {
-               color: "white"
-               implicitWidth: smileyTabView.width/4-2*mm
-               implicitHeight: 4*mm
-               Text { id: text
-                  anchors.centerIn: parent
-                  text: styleData.title
-                  color: "dark grey"
-                  font.pixelSize:2.5*mm
-                  font.bold: styleData.selected
-               }
-            }
-            frame: Rectangle { color: "light grey" }
-            tabsAlignment:Qt.AlignHCenter
-         }
+//        style: TabViewStyle {
+//            frameOverlap: 1
+//            tab: Rectangle {
+//               color: "white"
+//               implicitWidth: smileyTabView.width/4-2*mm
+//               implicitHeight: 4*mm
+//               Text { id: text
+//                  anchors.centerIn: parent
+//                  text: styleData.title
+//                  color: "dark grey"
+//                  font.pixelSize:2.5*mm
+//                  font.bold: styleData.selected
+//               }
+//            }
+//            frame: Rectangle { color: "light grey" }
+//            tabsAlignment:Qt.AlignHCenter
+//         }
 
-        Tab{
-           title: qsTr("Unicode")
            Rectangle{
                id: htmlGridTab
                GridView {
@@ -101,9 +127,7 @@ Rectangle{
                    }
                }
            }
-         }
-      Tab{
-        title: qsTr("Standard")
+
         Rectangle{
             id: coreGridTab
             GridView {
@@ -127,9 +151,7 @@ Rectangle{
                 }
              }
          }
-      }
-      Tab{
-        title: qsTr("Addon")
+
         Rectangle{
             id: addonGridTab
             GridView {
@@ -151,9 +173,8 @@ Rectangle{
                 }
             }
         }
-    }
-    Tab{
-        title: qsTr("Adult")
+
+
         Rectangle{
             id: adultGridTab
             GridView {
@@ -175,7 +196,7 @@ Rectangle{
                 }
             }
         }
-      }
+
       
 
       
@@ -218,6 +239,4 @@ Rectangle{
                 }
             }
          }
-         
-         
     }