git.iko.soy/unity8
on xenial help sign in
refactor signal names
7af4ea6Lukáš Tinkl
qml/Components/PanelState/PanelState.qml+3−3
compare with xenial
unifiedsplit
@@ -25,8 +25,8 @@ QtObject {
25 property bool dropShadow: false
25 property bool dropShadow: false
26 property int panelHeight: units.gu(3)
26 property int panelHeight: units.gu(3)
27
27
28− signal close()
28+ signal closeClicked()
29− signal minimize()
29+ signal minimizeClicked()
30− signal maximize()
30+ signal restoreClicked()
31 signal focusMaximizedApp()
31 signal focusMaximizedApp()
32}
32}
qml/Components/WindowControlButtons.qml+10−10
@@ -24,11 +24,11 @@ Row {
24 // to be set from outside
24 // to be set from outside
25 property bool active: false
25 property bool active: false
26
26
27− signal close()
27+ signal closeClicked()
28− signal minimize()
28+ signal minimizeClicked()
29− signal maximize()
29+ signal maximizeClicked()
30− signal maximizeVertically()
30+ signal maximizeVerticallyClicked()
31− signal maximizeHorizontally()
31+ signal maximizeHorizontallyClicked()
32
32
33 MouseArea {
33 MouseArea {
34 id: closeWindowButton
34 id: closeWindowButton
@@ -36,7 +36,7 @@ Row {
36 hoverEnabled: true
36 hoverEnabled: true
37 height: parent.height
37 height: parent.height
38 width: height
38 width: height
39− onClicked: root.close()
39+ onClicked: root.closeClicked()
40
40
41 Rectangle {
41 Rectangle {
42 anchors.centerIn: parent
42 anchors.centerIn: parent
@@ -62,7 +62,7 @@ Row {
62 hoverEnabled: true
62 hoverEnabled: true
63 height: parent.height
63 height: parent.height
64 width: height
64 width: height
65− onClicked: root.minimize()
65+ onClicked: root.minimizeClicked()
66
66
67 Rectangle {
67 Rectangle {
68 anchors.centerIn: parent
68 anchors.centerIn: parent
@@ -91,11 +91,11 @@ Row {
91 acceptedButtons: Qt.LeftButton | Qt.RightButton | Qt.MiddleButton
91 acceptedButtons: Qt.LeftButton | Qt.RightButton | Qt.MiddleButton
92 onClicked: {
92 onClicked: {
93 if (mouse.button == Qt.LeftButton) {
93 if (mouse.button == Qt.LeftButton) {
94− root.maximize();
94+ root.maximizeClicked();
95 } else if (mouse.button == Qt.RightButton) {
95 } else if (mouse.button == Qt.RightButton) {
96− root.maximizeHorizontally();
96+ root.maximizeHorizontallyClicked();
97 } else if (mouse.button == Qt.MiddleButton) {
97 } else if (mouse.button == Qt.MiddleButton) {
98− root.maximizeVertically();
98+ root.maximizeVerticallyClicked();
99 }
99 }
100 }
100 }
101
101
qml/Panel/Panel.qml+3−3
@@ -126,9 +126,9 @@ Item {
126 height: indicators.minimizedPanelHeight - anchors.topMargin - anchors.bottomMargin
126 height: indicators.minimizedPanelHeight - anchors.topMargin - anchors.bottomMargin
127 visible: PanelState.buttonsVisible && parent.containsMouse && !root.locked && !callHint.visible
127 visible: PanelState.buttonsVisible && parent.containsMouse && !root.locked && !callHint.visible
128 active: PanelState.buttonsVisible
128 active: PanelState.buttonsVisible
129− onClose: PanelState.close()
129+ onCloseClicked: PanelState.closeClicked()
130− onMinimize: PanelState.minimize()
130+ onMinimizeClicked: PanelState.minimizeClicked()
131− onMaximize: PanelState.maximize()
131+ onMaximizeClicked: PanelState.restoreClicked()
132 }
132 }
133 }
133 }
134
134
qml/Stages/DecoratedWindow.qml+10−10
@@ -46,11 +46,11 @@ FocusScope {
46 property alias widthIncrement: applicationWindow.widthIncrement
46 property alias widthIncrement: applicationWindow.widthIncrement
47 property alias heightIncrement: applicationWindow.heightIncrement
47 property alias heightIncrement: applicationWindow.heightIncrement
48
48
49− signal close()
49+ signal closeClicked()
50− signal maximize()
50+ signal maximizeClicked()
51− signal maximizeHorizontally()
51+ signal maximizeHorizontallyClicked()
52− signal maximizeVertically()
52+ signal maximizeVerticallyClicked()
53− signal minimize()
53+ signal minimizeClicked()
54 signal decorationPressed()
54 signal decorationPressed()
55
55
56 Rectangle {
56 Rectangle {
@@ -88,11 +88,11 @@ FocusScope {
88 title: applicationWindow.title
88 title: applicationWindow.title
89 visible: root.decorationShown
89 visible: root.decorationShown
90
90
91− onClose: root.close();
91+ onCloseClicked: root.closeClicked();
92− onMaximize: { root.decorationPressed(); root.maximize(); }
92+ onMaximizeClicked: { root.decorationPressed(); root.maximizeClicked(); }
93− onMaximizeHorizontally: { root.decorationPressed(); root.maximizeHorizontally(); }
93+ onMaximizeHorizontallyClicked: { root.decorationPressed(); root.maximizeHorizontallyClicked(); }
94− onMaximizeVertically: { root.decorationPressed(); root.maximizeVertically(); }
94+ onMaximizeVerticallyClicked: { root.decorationPressed(); root.maximizeVerticallyClicked(); }
95− onMinimize: root.minimize();
95+ onMinimizeClicked: root.minimizeClicked();
96 onPressed: root.decorationPressed();
96 onPressed: root.decorationPressed();
97 }
97 }
98
98
qml/Stages/DesktopStage.qml+10−10
@@ -153,9 +153,9 @@ AbstractStage {
153
153
154 Connections {
154 Connections {
155 target: PanelState
155 target: PanelState
156− onClose: { if (priv.focusedAppDelegate) { priv.focusedAppDelegate.close(); } }
156+ onCloseClicked: { if (priv.focusedAppDelegate) { priv.focusedAppDelegate.close(); } }
157− onMinimize: { if (priv.focusedAppDelegate) { priv.focusedAppDelegate.minimize(); } }
157+ onMinimizeClicked: { if (priv.focusedAppDelegate) { priv.focusedAppDelegate.minimize(); } }
158− onMaximize: { if (priv.focusedAppDelegate) { priv.focusedAppDelegate.restoreFromMaximized(); } }
158+ onRestoreClicked: { if (priv.focusedAppDelegate) { priv.focusedAppDelegate.restoreFromMaximized(); } }
159 onFocusMaximizedApp: {
159 onFocusMaximizedApp: {
160 if (priv.foregroundMaximizedAppDelegate) {
160 if (priv.foregroundMaximizedAppDelegate) {
161 priv.foregroundMaximizedAppDelegate.focus = true;
161 priv.foregroundMaximizedAppDelegate.focus = true;
@@ -606,13 +606,13 @@ AbstractStage {
606 requestedWidth: appDelegate.requestedWidth
606 requestedWidth: appDelegate.requestedWidth
607 requestedHeight: appDelegate.requestedHeight
607 requestedHeight: appDelegate.requestedHeight
608
608
609− onClose: { appDelegate.close(); }
609+ onCloseClicked: { appDelegate.close(); }
610− onMaximize: appDelegate.maximized || appDelegate.maximizedLeft || appDelegate.maximizedRight
610+ onMaximizeClicked: appDelegate.maximized || appDelegate.maximizedLeft || appDelegate.maximizedRight
611− || appDelegate.maximizedHorizontally || appDelegate.maximizedVertically
611+ || appDelegate.maximizedHorizontally || appDelegate.maximizedVertically
612− ? appDelegate.restoreFromMaximized() : appDelegate.maximize()
612+ ? appDelegate.restoreFromMaximized() : appDelegate.maximize()
613− onMaximizeHorizontally: appDelegate.maximizedHorizontally ? appDelegate.restoreFromMaximized() : appDelegate.maximizeHorizontally()
613+ onMaximizeHorizontallyClicked: appDelegate.maximizedHorizontally ? appDelegate.restoreFromMaximized() : appDelegate.maximizeHorizontally()
614− onMaximizeVertically: appDelegate.maximizedVertically ? appDelegate.restoreFromMaximized() : appDelegate.maximizeVertically()
614+ onMaximizeVerticallyClicked: appDelegate.maximizedVertically ? appDelegate.restoreFromMaximized() : appDelegate.maximizeVertically()
615− onMinimize: appDelegate.minimize()
615+ onMinimizeClicked: appDelegate.minimize()
616 onDecorationPressed: { appDelegate.focus = true; }
616 onDecorationPressed: { appDelegate.focus = true; }
617 }
617 }
618
618
qml/Stages/WindowDecoration.qml+10−10
@@ -29,11 +29,11 @@ MouseArea {
29 property bool active: false
29 property bool active: false
30 hoverEnabled: true
30 hoverEnabled: true
31
31
32− signal close()
32+ signal closeClicked()
33− signal minimize()
33+ signal minimizeClicked()
34− signal maximize()
34+ signal maximizeClicked()
35− signal maximizeHorizontally()
35+ signal maximizeHorizontallyClicked()
36− signal maximizeVertically()
36+ signal maximizeVerticallyClicked()
37
37
38 onDoubleClicked: root.maximize()
38 onDoubleClicked: root.maximize()
39
39
@@ -86,11 +86,11 @@ MouseArea {
86 id: buttons
86 id: buttons
87 height: parent.height
87 height: parent.height
88 active: root.active
88 active: root.active
89− onClose: root.close();
89+ onCloseClicked: root.closeClicked();
90− onMinimize: root.minimize();
90+ onMinimizeClicked: root.minimizeClicked();
91− onMaximize: root.maximize();
91+ onMaximizeClicked: root.maximizeClicked();
92− onMaximizeHorizontally: root.maximizeHorizontally();
92+ onMaximizeHorizontallyClicked: root.maximizeHorizontallyClicked();
93− onMaximizeVertically: root.maximizeVertically();
93+ onMaximizeVerticallyClicked: root.maximizeVerticallyClicked();
94 }
94 }
95
95
96 Label {
96 Label {