Fix codestyle

glacier-phone.pro

@@ -1,7 +1,5 @@
 TARGET = glacier-phone
 
-CONFIG += sailfishapp
-
 SOURCES += src/glacier-phone.cpp
 
 OTHER_FILES += qml/glacier-phone.qml \
@@ -11,16 +9,6 @@ OTHER_FILES += qml/glacier-phone.qml \
     translations/*.ts \
     glacier-phone.desktop
 
-SAILFISHAPP_ICONS = 86x86 108x108 128x128 256x256
-
-# to disable building translations every time, comment out the
-# following CONFIG line
-CONFIG += sailfishapp_i18n
-
-# German translation is enabled as an example. If you aren't
-# planning to localize your app, remember to comment out the
-# following TRANSLATIONS line. And also do not forget to
-# modify the localized app name in the the .desktop file.
 TRANSLATIONS += translations/glacier-phone-de.ts
 
 DISTFILES += \

qml/CallButton.qml

@@ -11,10 +11,7 @@ Button{
     property string fontFamily : "IonIcons"
     property var glyph : Ionicons.Icon.person_add
     property string buttonColor: "#1f1f1f"
-    style: ButtonStyle {
-        roundedButton: true
-        bgColor: buttonColor
-    }
+
     width: size.dp(86)
     height: width
     Text {

qml/CallPage.qml

@@ -13,10 +13,10 @@ Rectangle{
     color: "#151515"
 
     FontLoader {
-        source: "res/fontawesome-webfont.ttf"
+        source: "/usr/share/glacier-phone/res/fontawesome-webfont.ttf"
     }
     FontLoader {
-        source: "res/ionicons.ttf"
+        source: "/usr/share/glacier-phone/res/ionicons.ttf"
     }
 
     Rectangle{
@@ -37,7 +37,7 @@ Rectangle{
         asynchronous : true
         fillMode: Image.PreserveAspectCrop
         clip: true
-        source: "res/defaultCallerImage.png"
+        source: "/usr/share/glacier-phone/res/defaultCallerImage.png"
     }
 
     Item{

qml/ContactsDelegate.qml

@@ -23,14 +23,14 @@ Item {
         width: height
         Image{
             id: callerPictureImage
-            source: "res/tempCallers/" + contactImage
+            source: "/usr/share/glacier-phone/res/tempCallers/" + contactImage
             width: size.dp(75)
             height: width
             anchors.centerIn: parent
             onStatusChanged: {
                 if (status == Image.Error)
                 {
-                    source = "res/defaultContact.png";
+                    source = "/usr/share/glacier-phone/res/defaultContact.png";
                 }
             }
             visible: false

qml/Dialer.qml

@@ -33,11 +33,7 @@ Item {
                 height: parent.height
                 Button{
                     anchors.horizontalCenter: parent.horizontalCenter
-                    style: ButtonStyle {
-                        roundedButton: true
-                        bgColor: "#63ad32"
-                        centerColor : "#c7ff94"
-                    }
+
                     width: size.dp(256)
                     height: size.dp(86)
                     Text {
@@ -51,11 +47,6 @@ Item {
             }
 
             Button{
-                x: parent.width - (parent.width/3)
-                style: ButtonStyle {
-                    roundedButton: true
-                    bgColor: "#808080"
-                }
                 width: size.dp(86)
                 height: size.dp(86)
                 Text {
@@ -82,9 +73,7 @@ Item {
 
         Button{
             id: carrierSelection
-            style: ButtonStyle {
-                bgColor: "transparent"
-            }
+
             width: parent.height
             height: width
 
@@ -110,9 +99,7 @@ Item {
         Button{
             id: dialerBackspace
             anchors.right: parent.right
-            style: ButtonStyle {
-                bgColor: "transparent"
-            }
+
             width: parent.height
             height: width
 
@@ -130,10 +117,10 @@ Item {
         }
 
         FontLoader {
-            source: "res/fontawesome-webfont.ttf"
+            source: "/usr/share/glacier-phone/res/fontawesome-webfont.ttf"
         }
         FontLoader {
-            source: "res/ionicons.ttf"
+            source: "/usr/share/glacier-phone/res/ionicons.ttf"
         }
 
         Component {
@@ -146,7 +133,7 @@ Item {
                     implicitHeight: size.dp(50)
                     implicitWidth: size.dp(320)
                     BorderImage {
-                        source: "res/textinput.png"
+                        source: "/usr/share/glacier-phone/res/textinput.png"
                         border.left: size.dp(8)
                         border.right: size.dp(8)
                         anchors.bottom: parent.bottom

qml/Dialpad.qml

@@ -22,10 +22,7 @@ Item{
         Repeater {
             model: dialerModel
             delegate: Button {
-                style: ButtonStyle {
-                    roundedButton: true
-                    bgColor: "transparent"
-                }
+
                 Layout.fillWidth: true
                 Layout.fillHeight: true
                 onClicked: {

rpm/glacier-phone.spec

@@ -1,13 +1,5 @@
-# 
-# Do NOT Edit the Auto-generated Part!
-# Generated by: spectacle version 0.27
-# 
-
 Name:       glacier-phone
 
-# >> macros
-# << macros
-
 %{!?qtc_qmake:%define qtc_qmake %qmake}
 %{!?qtc_qmake5:%define qtc_qmake5 %qmake5}
 %{!?qtc_make:%define qtc_make make}