diff --git a/Main.qml b/Main.qml index 064d655..57cd731 100644 --- a/Main.qml +++ b/Main.qml @@ -25,7 +25,7 @@ Rectangle { PropertyChanges { target: powerFrame; opacity: 1} PropertyChanges { target: sessionFrame; opacity: 0} PropertyChanges { target: userFrame; opacity: 0} - PropertyChanges { target: bgBlur; radius: 20} + PropertyChanges { target: bgBlur; radius: 30} }, State { name: "stateSession" @@ -33,7 +33,7 @@ Rectangle { PropertyChanges { target: powerFrame; opacity: 0} PropertyChanges { target: sessionFrame; opacity: 1} PropertyChanges { target: userFrame; opacity: 0} - PropertyChanges { target: bgBlur; radius: 20} + PropertyChanges { target: bgBlur; radius: 30} }, State { name: "stateUser" @@ -41,7 +41,7 @@ Rectangle { PropertyChanges { target: powerFrame; opacity: 0} PropertyChanges { target: sessionFrame; opacity: 0} PropertyChanges { target: userFrame; opacity: 1} - PropertyChanges { target: bgBlur; radius: 20} + PropertyChanges { target: bgBlur; radius: 30} }, State { name: "stateLogin" @@ -54,7 +54,7 @@ Rectangle { ] transitions: Transition { -// PropertyAnimation { duration: 300; properties: "opacity"; } + PropertyAnimation { duration: 100; properties: "opacity"; } PropertyAnimation { duration: 300; properties: "radius"; } } @@ -65,7 +65,7 @@ Rectangle { source: config.background fillMode: Image.Tile onStatusChanged: { - if (status == Image.Error && source != config.defaultBackground) { + if (status == Image.Error && source !== config.defaultBackground) { source = config.defaultBackground } } @@ -95,7 +95,7 @@ Rectangle { width: parent.width height: parent.height / 3 anchors.top: parent.top - anchors.topMargin: parent.height / 6 + anchors.topMargin: parent.height / 5 PowerFrame { id: powerFrame @@ -221,7 +221,7 @@ Rectangle { width: m_powerButtonSize height: m_powerButtonSize visible: sessionFrame.isMultipleSessions() - source: sessionFrame.getCurrentSessionIconPath() + source: sessionFrame.getCurrentSessionIconIndicator() onClicked: root.state = "stateSession" } diff --git a/PowerFrame.qml b/PowerFrame.qml index f41fae7..ecbbe36 100644 --- a/PowerFrame.qml +++ b/PowerFrame.qml @@ -10,7 +10,8 @@ Item { Row { spacing: 70 - anchors.centerIn: parent + anchors.horizontalCenter: parent.horizontalCenter + anchors.bottom: parent.bottom Item { width: 100 diff --git a/SessionFrame.qml b/SessionFrame.qml index e10cbc3..85a7c92 100644 --- a/SessionFrame.qml +++ b/SessionFrame.qml @@ -19,8 +19,8 @@ Item { return "unknow" } - function getCurrentSessionIconPath() { - return sessionList.currentItem.iconPath + function getCurrentSessionIconIndicator() { + return sessionList.currentItem.iconIndicator; } function isMultipleSessions() { @@ -36,19 +36,24 @@ Item { currentIndex: sessionModel.lastIndex orientation: ListView.Horizontal delegate: Item { - property string iconPath: iconButton.normalImg + property string iconIndicator: iconButton.indicator - width: 150 - height: 120 + width: 250 + height: 150 ImageButton { id: iconButton anchors.top: parent.top anchors.horizontalCenter: parent.horizontalCenter - property var prefix: ("icons/%1_indicator_").arg(getIconName(name)); + width: 100 + height: 100 normalImg: ("%1normal.png").arg(prefix) hoverImg: ("%1hover.png").arg(prefix) pressImg: ("%1press.png").arg(prefix) + + property var prefix: ("icons/sessionicon/%1_").arg(getIconName(name)); + property var indicator: ("icons/%1_indicator_normal.png").arg(getIconName(name)); + onClicked: { selected(index) sessionList.currentIndex = index diff --git a/icons/sessionicon/Deepin_hover.png b/icons/sessionicon/Deepin_hover.png new file mode 100755 index 0000000..723c50d Binary files /dev/null and b/icons/sessionicon/Deepin_hover.png differ diff --git a/icons/sessionicon/Deepin_normal.png b/icons/sessionicon/Deepin_normal.png new file mode 100755 index 0000000..41e64cc Binary files /dev/null and b/icons/sessionicon/Deepin_normal.png differ diff --git a/icons/sessionicon/Deepin_press.png b/icons/sessionicon/Deepin_press.png new file mode 100755 index 0000000..be57427 Binary files /dev/null and b/icons/sessionicon/Deepin_press.png differ diff --git a/icons/sessionicon/enlightenment_hover.png b/icons/sessionicon/enlightenment_hover.png new file mode 100755 index 0000000..0ce59f7 Binary files /dev/null and b/icons/sessionicon/enlightenment_hover.png differ diff --git a/icons/sessionicon/enlightenment_normal.png b/icons/sessionicon/enlightenment_normal.png new file mode 100755 index 0000000..c5190ee Binary files /dev/null and b/icons/sessionicon/enlightenment_normal.png differ diff --git a/icons/sessionicon/enlightenment_press.png b/icons/sessionicon/enlightenment_press.png new file mode 100755 index 0000000..a390987 Binary files /dev/null and b/icons/sessionicon/enlightenment_press.png differ diff --git a/icons/sessionicon/fluxbox_hover.png b/icons/sessionicon/fluxbox_hover.png new file mode 100755 index 0000000..67bccb5 Binary files /dev/null and b/icons/sessionicon/fluxbox_hover.png differ diff --git a/icons/sessionicon/fluxbox_press.png b/icons/sessionicon/fluxbox_press.png new file mode 100755 index 0000000..5a60b12 Binary files /dev/null and b/icons/sessionicon/fluxbox_press.png differ diff --git a/icons/sessionicon/gnome_hover.png b/icons/sessionicon/gnome_hover.png new file mode 100755 index 0000000..932f5d8 Binary files /dev/null and b/icons/sessionicon/gnome_hover.png differ diff --git a/icons/sessionicon/gnome_normal.png b/icons/sessionicon/gnome_normal.png new file mode 100755 index 0000000..04f1314 Binary files /dev/null and b/icons/sessionicon/gnome_normal.png differ diff --git a/icons/sessionicon/gnome_press.png b/icons/sessionicon/gnome_press.png new file mode 100755 index 0000000..edd2298 Binary files /dev/null and b/icons/sessionicon/gnome_press.png differ diff --git a/icons/sessionicon/kde_hover.png b/icons/sessionicon/kde_hover.png new file mode 100755 index 0000000..c47b097 Binary files /dev/null and b/icons/sessionicon/kde_hover.png differ diff --git a/icons/sessionicon/kde_normal.png b/icons/sessionicon/kde_normal.png new file mode 100755 index 0000000..7c8ee72 Binary files /dev/null and b/icons/sessionicon/kde_normal.png differ diff --git a/icons/sessionicon/kde_press.png b/icons/sessionicon/kde_press.png new file mode 100755 index 0000000..2411d07 Binary files /dev/null and b/icons/sessionicon/kde_press.png differ diff --git a/icons/sessionicon/lxde_hover.png b/icons/sessionicon/lxde_hover.png new file mode 100755 index 0000000..e3e58be Binary files /dev/null and b/icons/sessionicon/lxde_hover.png differ diff --git a/icons/sessionicon/lxde_press.png b/icons/sessionicon/lxde_press.png new file mode 100755 index 0000000..d5bc6d8 Binary files /dev/null and b/icons/sessionicon/lxde_press.png differ diff --git a/icons/sessionicon/ubuntu_hover.png b/icons/sessionicon/ubuntu_hover.png new file mode 100755 index 0000000..f8653d6 Binary files /dev/null and b/icons/sessionicon/ubuntu_hover.png differ diff --git a/icons/sessionicon/ubuntu_press.png b/icons/sessionicon/ubuntu_press.png new file mode 100755 index 0000000..f1bcf25 Binary files /dev/null and b/icons/sessionicon/ubuntu_press.png differ diff --git a/icons/sessionicon/unknow_hover.png b/icons/sessionicon/unknow_hover.png new file mode 100755 index 0000000..5e6a70b Binary files /dev/null and b/icons/sessionicon/unknow_hover.png differ diff --git a/icons/sessionicon/unknow_normal.png b/icons/sessionicon/unknow_normal.png new file mode 100755 index 0000000..802b219 Binary files /dev/null and b/icons/sessionicon/unknow_normal.png differ diff --git a/icons/sessionicon/unknow_press.png b/icons/sessionicon/unknow_press.png new file mode 100755 index 0000000..36bbd0b Binary files /dev/null and b/icons/sessionicon/unknow_press.png differ diff --git a/icons/sessionicon/xfce_hover.png b/icons/sessionicon/xfce_hover.png new file mode 100755 index 0000000..226fab4 Binary files /dev/null and b/icons/sessionicon/xfce_hover.png differ diff --git a/icons/sessionicon/xfce_normal.png b/icons/sessionicon/xfce_normal.png new file mode 100755 index 0000000..b2042d9 Binary files /dev/null and b/icons/sessionicon/xfce_normal.png differ diff --git a/icons/sessionicon/xfce_press.png b/icons/sessionicon/xfce_press.png new file mode 100755 index 0000000..d04614c Binary files /dev/null and b/icons/sessionicon/xfce_press.png differ