use Style constants as default for NavigationButton

diff --git a/cm-ui/components/NavigationBar.qml b/cm-ui/components/NavigationBar.qml
index c5fe3be8895f7b10e49b265624c5c0633c052e17..e145a916472e9bb370e03c813a5fab99a4a14285 100644 (file)
--- a/cm-ui/components/NavigationBar.qml
+++ b/cm-ui/components/NavigationBar.qml
@@ -18,12 +18,6 @@ Item {
       width: parent.width
 
       NavigationButton {
-        iconHeight: Style.heightNavigationButtonIcon
-        iconWidth: Style.widthNavigationButtonIcon
-        descriptionHeight: Style.heightNavigationButtonDescription
-        descriptionWidth: Style.widthNavigationButtonDescription
-        color: Style.colourNavigationBarFont
-        background: Style.colourNavigationBarBackground
         hoverColor: "#993333"
         iconCharacter: "\uf0c9"
         description: ""
@@ -31,12 +25,6 @@ Item {
       }
 
       NavigationButton {
-        iconHeight: Style.heightNavigationButtonIcon
-        iconWidth: Style.widthNavigationButtonIcon
-        descriptionHeight: Style.heightNavigationButtonDescription
-        descriptionWidth: Style.widthNavigationButtonDescription
-        color: Style.colourNavigationBarFont
-        background: Style.colourNavigationBarBackground
         hoverColor: "#dc8a00"
         iconCharacter: "\uf015"
         description: "Dashboard"
@@ -44,12 +32,6 @@ Item {
       }
 
       NavigationButton {
-        iconHeight: Style.heightNavigationButtonIcon
-        iconWidth: Style.widthNavigationButtonIcon
-        descriptionHeight: Style.heightNavigationButtonDescription
-        descriptionWidth: Style.widthNavigationButtonDescription
-        color: Style.colourNavigationBarFont
-        background: Style.colourNavigationBarBackground
         hoverColor: "#dccd00"
         iconCharacter: "\uf234"
         description:"New Client"
@@ -57,12 +39,6 @@ Item {
       }
 
       NavigationButton {
-        iconHeight: Style.heightNavigationButtonIcon
-        iconWidth: Style.widthNavigationButtonIcon
-        descriptionHeight: Style.heightNavigationButtonDescription
-        descriptionWidth: Style.widthNavigationButtonDescription
-        color: Style.colourNavigationBarFont
-        background: Style.colourNavigationBarBackground
         hoverColor: "#8aef63"
         iconCharacter: "\uf002"
         description: "Find Client"

diff --git a/cm-ui/components/NavigationButton.qml b/cm-ui/components/NavigationButton.qml
index e660a00df44578ceb22cfc447f0432133456a75d..0f6c1c271587ec6ad05616442cfa5129b5142401 100644 (file)
--- a/cm-ui/components/NavigationButton.qml
+++ b/cm-ui/components/NavigationButton.qml
@@ -8,13 +8,13 @@ Item {
   id: top
   property alias iconCharacter: textIcon.text
   property alias description: textDescription.text
-  property color color: "#ff0000"
-  property color background: "#00ff00"
+  property color color: Style.colourNavigationBarFont
+  property color background: Style.colourNavigationBarBackground
   property color hoverColor: "#0000ff"
-  property real iconWidth: 0
-  property real descriptionWidth: 0
-  property real iconHeight: 0
-  property real descriptionHeight: 0
+  property real iconWidth: Style.widthNavigationButtonIcon
+  property real descriptionWidth: Style.widthNavigationButtonDescription
+  property real iconHeight: Style.heightNavigationButtonIcon
+  property real descriptionHeight: Style.heightNavigationButtonDescription
   height: Math.max(iconHeight, descriptionHeight)
   width: parent.width