diff options
| author | Caroline Chao <caroline.chao@digia.com> | 2014-09-18 11:43:54 +0200 |
|---|---|---|
| committer | Caroline Chao <caroline.chao@digia.com> | 2014-09-18 11:11:02 +0200 |
| commit | a290fecef128eada3faad5706524fbc2c41d4fe4 (patch) | |
| tree | beafcb7fbdd8aec36dfbee344d63efb70f19c56d | |
| parent | 7e23c3c8ac341349ffb11bda17373b600af9b712 (diff) | |
Update design of the menu
Change-Id: Ia1b41bdd56b5ea209339723f502aa635a9e77d26
Reviewed-by: Niels Weber <niels.weber@digia.com>
| -rw-r--r-- | qml/main.qml | 20 | ||||
| -rw-r--r-- | src/theme.cpp | 5 |
2 files changed, 7 insertions, 18 deletions
diff --git a/qml/main.qml b/qml/main.qml index e1d4e01..dc7230a 100644 --- a/qml/main.qml +++ b/qml/main.qml @@ -80,7 +80,6 @@ ApplicationWindow { anchors.centerIn: parent width: Theme.sizes.menuPopupWidth z: 3 - radius: Theme.margins.twenty ListModel { id: menuModel Component.onCompleted: { @@ -111,17 +110,8 @@ ApplicationWindow { z: 2 height: Theme.sizes.buttonHeight width: parent.width - color: !mouseArea.pressed ? Theme.colors.white_menu : Theme.colors.blue_menu + color: !mouseArea.pressed ? Theme.colors.white : Theme.colors.gray_menu y: Theme.sizes.buttonHeight * index - radius: Theme.margins.twenty - Rectangle { - width: parent.width - property int posStatus: listMenu.firstOrLast(index) - height: Theme.sizes.buttonHeight - (posStatus !== 0 ? Theme.margins.twenty : 0) - y: posStatus === 1 ? Theme.margins.twenty : 0 - color: !mouseArea.pressed ? Theme.colors.white_menu : Theme.colors.blue_menu - } - Text { z: 2 anchors.left: parent.left @@ -130,8 +120,8 @@ ApplicationWindow { anchors.verticalCenterOffset: -separator.height width: parent.width text: name - color: mouseArea.pressed ? Theme.colors.white : Theme.colors.blue_menu - font.pointSize: Theme.fonts.ten_pt + color: mouseArea.pressed ? Theme.colors.gray : Theme.colors.black + font.pointSize: Theme.fonts.eight_pt verticalAlignment: Text.AlignVCenter horizontalAlignment: Text.AlignHCenter } @@ -139,9 +129,9 @@ ApplicationWindow { id: separator visible: index < menuModel.count - 1 anchors.bottom: parent.bottom - height: 1 + height: 2 width: parent.width - color: Theme.colors.gray_menu + color: Theme.colors.lightgray } MouseArea { id: mouseArea diff --git a/src/theme.cpp b/src/theme.cpp index 7bf3cac..94f9aee 100644 --- a/src/theme.cpp +++ b/src/theme.cpp @@ -97,9 +97,8 @@ Theme::Theme(QObject *parent) m_colors->insert(QLatin1String("green"), QVariant("#328930")); m_colors->insert(QLatin1String("qtgreen"), QVariant("#5caa15")); m_colors->insert(QLatin1String("black"), QVariant("#000000")); - m_colors->insert(QLatin1String("blue_menu"), QVariant("#2087fc")); - m_colors->insert(QLatin1String("white_menu"), QVariant("#eeeeee")); - m_colors->insert(QLatin1String("gray_menu"), QVariant("#999999")); + m_colors->insert(QLatin1String("gray_menu"), QVariant("#e5e5e5")); + m_colors->insert(QLatin1String("white_menu"), QVariant("#ffffff")); m_sizes = new QQmlPropertyMap(this); m_sizes->insert(QLatin1String("trackHeaderHeight"), QVariant(applyRatio(270))); |