From a7170af0cead99bb29972bc13aab0c03c8f0ef11 Mon Sep 17 00:00:00 2001 From: Marco Martin Date: Tue, 3 Sep 2013 15:54:11 +0200 Subject: [PATCH] hardcoded enum values-- --- .../configuration/PanelConfiguration.qml | 24 +++++++++---------- .../panelconfiguration/EdgeHandle.qml | 8 +++---- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/qmlpackages/desktop/contents/configuration/PanelConfiguration.qml b/qmlpackages/desktop/contents/configuration/PanelConfiguration.qml index c739532b9..0fb46a521 100644 --- a/qmlpackages/desktop/contents/configuration/PanelConfiguration.qml +++ b/qmlpackages/desktop/contents/configuration/PanelConfiguration.qml @@ -37,16 +37,16 @@ PlasmaCore.FrameSvgItem { state: { switch (panel.location) { //TopEdge - case 3: + case PlasmaCore.Types.TopEdge: return "TopEdge" //LeftEdge - case 5: + case PlasmaCore.Types.LeftEdge: return "LeftEdge" //RightEdge - case 6: + case PlasmaCore.Types.RightEdge: return "RightEdge" //BottomEdge - case 4: + case PlasmaCore.Types.BottomEdge: default: return "BottomEdge" } @@ -87,19 +87,19 @@ PlasmaCore.FrameSvgItem { to: { switch (panel.location) { //TopEdge - case 3: + case PlasmaCore.Types.TopEdge: return 0 break //LeftEdge - case 5: + case PlasmaCore.Types.LeftEdge: return 0 break; //RightEdge - case 6: + case PlasmaCore.Types.RightEdge: return panel.screenGeometry.x + panel.screenGeometry.width - panel.width break; //BottomEdge - case 4: + case PlasmaCore.Types.BottomEdge: default: return panel.screenGeometry.y + panel.screenGeometry.height - panel.height } @@ -113,19 +113,19 @@ PlasmaCore.FrameSvgItem { to: { switch (panel.location) { //TopEdge - case 3: + case PlasmaCore.Types.TopEdge: return panel.height break //LeftEdge - case 5: + case PlasmaCore.Types.LeftEdge: return panel.width break; //RightEdge - case 6: + case PlasmaCore.Types.RightEdge: return panel.screenGeometry.x + panel.screenGeometry.width - panel.width - configDialog.width break; //BottomEdge - case 4: + case PlasmaCore.Types.BottomEdge: default: return panel.screenGeometry.y + panel.screenGeometry.height - panel.height - configDialog.height } diff --git a/qmlpackages/desktop/contents/configuration/panelconfiguration/EdgeHandle.qml b/qmlpackages/desktop/contents/configuration/panelconfiguration/EdgeHandle.qml index 14db7e479..8f939b15d 100644 --- a/qmlpackages/desktop/contents/configuration/panelconfiguration/EdgeHandle.qml +++ b/qmlpackages/desktop/contents/configuration/panelconfiguration/EdgeHandle.qml @@ -83,12 +83,12 @@ PlasmaComponents.ToolButton { if (panel.location == 3) { return; } else { - newLocation = 3; //FIXME: Plasma::TopEdge; + newLocation = PlasmaCore.Types.TopEdge; } } else if (panel.location == 6) { return; } else { - newLocation = 6; //FIXME: Plasma::RightEdge; + newLocation = PlasmaCore.Types.RightEdge; } } else { @@ -96,12 +96,12 @@ PlasmaComponents.ToolButton { if (panel.location == 5) { return; } else { - newLocation = 5; //FIXME: Plasma::LeftEdge; + newLocation = PlasmaCore.Types.LeftEdge; } } else if(panel.location == 4) { return; } else { - newLocation = 4; //FIXME: Plasma::BottomEdge; + newLocation = PlasmaCore.Types.BottomEdge; } } panel.location = newLocation