7af4ea6 · unity8 · git.iko.soy

git.iko.soy/unity8

refactor signal names

commit7af4ea6d7bc9a64692717e6a0486ac866c6b923a authorLukáš Tinkl <lukas.tinkl@canonical.com> dateTue 19 Apr 2016, 22:57 (11 years ago) parent5d97ac9

6 files changed+46−46

compare with xenial

unifiedsplit

qml/Components/PanelState/PanelState.qml+3−3 qml/Components/WindowControlButtons.qml+10−10 qml/Panel/Panel.qml+3−3 qml/Stages/DecoratedWindow.qml+10−10 qml/Stages/DesktopStage.qml+10−10 qml/Stages/WindowDecoration.qml+10−10

qml/Components/PanelState/PanelState.qml+3−3

@@ -25,8 +25,8 @@ QtObject {

2525 property bool dropShadow: false

2626 property int panelHeight: units.gu(3)

2727

28− signal close()

29− signal minimize()

30− signal maximize()

28+ signal closeClicked()

29+ signal minimizeClicked()

30+ signal restoreClicked()

3131 signal focusMaximizedApp()

3232}

qml/Components/WindowControlButtons.qml+10−10

@@ -24,11 +24,11 @@ Row {

2424 // to be set from outside

2525 property bool active: false

2626

27− signal close()

28− signal minimize()

29− signal maximize()

30− signal maximizeVertically()

31− signal maximizeHorizontally()

27+ signal closeClicked()

28+ signal minimizeClicked()

29+ signal maximizeClicked()

30+ signal maximizeVerticallyClicked()

31+ signal maximizeHorizontallyClicked()

3232

3333 MouseArea {

3434 id: closeWindowButton

@@ -36,7 +36,7 @@ Row {

3636 hoverEnabled: true

3737 height: parent.height

3838 width: height

39− onClicked: root.close()

39+ onClicked: root.closeClicked()

4040

4141 Rectangle {

4242 anchors.centerIn: parent

@@ -62,7 +62,7 @@ Row {

6262 hoverEnabled: true

6363 height: parent.height

6464 width: height

65− onClicked: root.minimize()

65+ onClicked: root.minimizeClicked()

6666

6767 Rectangle {

6868 anchors.centerIn: parent

@@ -91,11 +91,11 @@ Row {

9191 acceptedButtons: Qt.LeftButton | Qt.RightButton | Qt.MiddleButton

9292 onClicked: {

9393 if (mouse.button == Qt.LeftButton) {

94− root.maximize();

94+ root.maximizeClicked();

9595 } else if (mouse.button == Qt.RightButton) {

96− root.maximizeHorizontally();

96+ root.maximizeHorizontallyClicked();

9797 } else if (mouse.button == Qt.MiddleButton) {

98− root.maximizeVertically();

98+ root.maximizeVerticallyClicked();

9999 }

100100 }

101101

qml/Panel/Panel.qml+3−3

@@ -126,9 +126,9 @@ Item {

126126 height: indicators.minimizedPanelHeight - anchors.topMargin - anchors.bottomMargin

127127 visible: PanelState.buttonsVisible && parent.containsMouse && !root.locked && !callHint.visible

128128 active: PanelState.buttonsVisible

129− onClose: PanelState.close()

130− onMinimize: PanelState.minimize()

131− onMaximize: PanelState.maximize()

129+ onCloseClicked: PanelState.closeClicked()

130+ onMinimizeClicked: PanelState.minimizeClicked()

131+ onMaximizeClicked: PanelState.restoreClicked()

132132 }

133133 }

134134

qml/Stages/DecoratedWindow.qml+10−10

@@ -46,11 +46,11 @@ FocusScope {

4646 property alias widthIncrement: applicationWindow.widthIncrement

4747 property alias heightIncrement: applicationWindow.heightIncrement

4848

49− signal close()

50− signal maximize()

51− signal maximizeHorizontally()

52− signal maximizeVertically()

53− signal minimize()

49+ signal closeClicked()

50+ signal maximizeClicked()

51+ signal maximizeHorizontallyClicked()

52+ signal maximizeVerticallyClicked()

53+ signal minimizeClicked()

5454 signal decorationPressed()

5555

5656 Rectangle {

@@ -88,11 +88,11 @@ FocusScope {

8888 title: applicationWindow.title

8989 visible: root.decorationShown

9090

91− onClose: root.close();

92− onMaximize: { root.decorationPressed(); root.maximize(); }

93− onMaximizeHorizontally: { root.decorationPressed(); root.maximizeHorizontally(); }

94− onMaximizeVertically: { root.decorationPressed(); root.maximizeVertically(); }

95− onMinimize: root.minimize();

91+ onCloseClicked: root.closeClicked();

92+ onMaximizeClicked: { root.decorationPressed(); root.maximizeClicked(); }

93+ onMaximizeHorizontallyClicked: { root.decorationPressed(); root.maximizeHorizontallyClicked(); }

94+ onMaximizeVerticallyClicked: { root.decorationPressed(); root.maximizeVerticallyClicked(); }

95+ onMinimizeClicked: root.minimizeClicked();

9696 onPressed: root.decorationPressed();

9797 }

9898

qml/Stages/DesktopStage.qml+10−10

@@ -153,9 +153,9 @@ AbstractStage {

153153

154154 Connections {

155155 target: PanelState

156− onClose: { if (priv.focusedAppDelegate) { priv.focusedAppDelegate.close(); } }

157− onMinimize: { if (priv.focusedAppDelegate) { priv.focusedAppDelegate.minimize(); } }

158− onMaximize: { if (priv.focusedAppDelegate) { priv.focusedAppDelegate.restoreFromMaximized(); } }

156+ onCloseClicked: { if (priv.focusedAppDelegate) { priv.focusedAppDelegate.close(); } }

157+ onMinimizeClicked: { if (priv.focusedAppDelegate) { priv.focusedAppDelegate.minimize(); } }

158+ onRestoreClicked: { if (priv.focusedAppDelegate) { priv.focusedAppDelegate.restoreFromMaximized(); } }

159159 onFocusMaximizedApp: {

160160 if (priv.foregroundMaximizedAppDelegate) {

161161 priv.foregroundMaximizedAppDelegate.focus = true;

@@ -606,13 +606,13 @@ AbstractStage {

606606 requestedWidth: appDelegate.requestedWidth

607607 requestedHeight: appDelegate.requestedHeight

608608

609− onClose: { appDelegate.close(); }

610− onMaximize: appDelegate.maximized || appDelegate.maximizedLeft || appDelegate.maximizedRight

611− || appDelegate.maximizedHorizontally || appDelegate.maximizedVertically

612− ? appDelegate.restoreFromMaximized() : appDelegate.maximize()

613− onMaximizeHorizontally: appDelegate.maximizedHorizontally ? appDelegate.restoreFromMaximized() : appDelegate.maximizeHorizontally()

614− onMaximizeVertically: appDelegate.maximizedVertically ? appDelegate.restoreFromMaximized() : appDelegate.maximizeVertically()

615− onMinimize: appDelegate.minimize()

609+ onCloseClicked: { appDelegate.close(); }

610+ onMaximizeClicked: appDelegate.maximized || appDelegate.maximizedLeft || appDelegate.maximizedRight

611+ || appDelegate.maximizedHorizontally || appDelegate.maximizedVertically

612+ ? appDelegate.restoreFromMaximized() : appDelegate.maximize()

613+ onMaximizeHorizontallyClicked: appDelegate.maximizedHorizontally ? appDelegate.restoreFromMaximized() : appDelegate.maximizeHorizontally()

614+ onMaximizeVerticallyClicked: appDelegate.maximizedVertically ? appDelegate.restoreFromMaximized() : appDelegate.maximizeVertically()

615+ onMinimizeClicked: appDelegate.minimize()

616616 onDecorationPressed: { appDelegate.focus = true; }

617617 }

618618

qml/Stages/WindowDecoration.qml+10−10

@@ -29,11 +29,11 @@ MouseArea {

2929 property bool active: false

3030 hoverEnabled: true

3131

32− signal close()

33− signal minimize()

34− signal maximize()

35− signal maximizeHorizontally()

36− signal maximizeVertically()

32+ signal closeClicked()

33+ signal minimizeClicked()

34+ signal maximizeClicked()

35+ signal maximizeHorizontallyClicked()

36+ signal maximizeVerticallyClicked()

3737

3838 onDoubleClicked: root.maximize()

3939

@@ -86,11 +86,11 @@ MouseArea {

8686 id: buttons

8787 height: parent.height

8888 active: root.active

89− onClose: root.close();

90− onMinimize: root.minimize();

91− onMaximize: root.maximize();

92− onMaximizeHorizontally: root.maximizeHorizontally();

93− onMaximizeVertically: root.maximizeVertically();

89+ onCloseClicked: root.closeClicked();

90+ onMinimizeClicked: root.minimizeClicked();

91+ onMaximizeClicked: root.maximizeClicked();

92+ onMaximizeHorizontallyClicked: root.maximizeHorizontallyClicked();

93+ onMaximizeVerticallyClicked: root.maximizeVerticallyClicked();

9494 }

9595

9696 Label {