mirror of
https://invent.kde.org/marcoa/shift-shell.git
synced 2026-07-31 16:54:46 +00:00
separe dialer and dialpad
This commit is contained in:
parent
f776a0f1d3
commit
78156bd626
5 changed files with 94 additions and 25 deletions
|
|
@ -23,6 +23,7 @@ import QtQuick.Layouts 1.1
|
||||||
import org.kde.plasma.core 2.0 as PlasmaCore
|
import org.kde.plasma.core 2.0 as PlasmaCore
|
||||||
import org.kde.plasma.components 2.0 as PlasmaComponents
|
import org.kde.plasma.components 2.0 as PlasmaComponents
|
||||||
import org.nemomobile.voicecall 1.0
|
import org.nemomobile.voicecall 1.0
|
||||||
|
import "../Dialpad"
|
||||||
|
|
||||||
Item {
|
Item {
|
||||||
id: dialer
|
id: dialer
|
||||||
|
|
@ -73,30 +74,8 @@ Item {
|
||||||
fontSizeMode: Text.Fit
|
fontSizeMode: Text.Fit
|
||||||
}
|
}
|
||||||
|
|
||||||
GridLayout {
|
Dialpad {
|
||||||
id: pad
|
|
||||||
columns: 3
|
|
||||||
|
|
||||||
property int buttonHeight: parent.height / 6
|
|
||||||
|
|
||||||
Layout.fillWidth: true
|
|
||||||
Layout.fillHeight: true
|
|
||||||
|
|
||||||
DialerButton { id: one; text: "1" }
|
|
||||||
DialerButton { text: "2" }
|
|
||||||
DialerButton { text: "3" }
|
|
||||||
|
|
||||||
DialerButton { text: "4" }
|
|
||||||
DialerButton { text: "5" }
|
|
||||||
DialerButton { text: "6" }
|
|
||||||
|
|
||||||
DialerButton { text: "7" }
|
|
||||||
DialerButton { text: "8" }
|
|
||||||
DialerButton { text: "9" }
|
|
||||||
|
|
||||||
DialerButton { text: "*"; }
|
|
||||||
DialerButton { text: "0"; sub: "+"; }
|
|
||||||
DialerButton { text: "#" }
|
|
||||||
}
|
}
|
||||||
|
|
||||||
RowLayout {
|
RowLayout {
|
||||||
|
|
@ -1,3 +1,22 @@
|
||||||
|
/*
|
||||||
|
* Copyright 2014 Aaron Seigo <aseigo@kde.org>
|
||||||
|
* Copyright 2014 Marco Martin <mart@kde.org>
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU Library General Public License as
|
||||||
|
* published by the Free Software Foundation; either version 2, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU Library General Public License for more details
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Library General Public
|
||||||
|
* License along with this program; if not, write to the
|
||||||
|
* Free Software Foundation, Inc.,
|
||||||
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
*/
|
||||||
|
|
||||||
import QtQuick 2.0
|
import QtQuick 2.0
|
||||||
import QtQuick.Layouts 1.1
|
import QtQuick.Layouts 1.1
|
||||||
|
|
@ -1,3 +1,23 @@
|
||||||
|
/*
|
||||||
|
* Copyright 2014 Aaron Seigo <aseigo@kde.org>
|
||||||
|
* Copyright 2014 Marco Martin <mart@kde.org>
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU Library General Public License as
|
||||||
|
* published by the Free Software Foundation; either version 2, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU Library General Public License for more details
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Library General Public
|
||||||
|
* License along with this program; if not, write to the
|
||||||
|
* Free Software Foundation, Inc.,
|
||||||
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
*/
|
||||||
|
|
||||||
import QtQuick 2.0
|
import QtQuick 2.0
|
||||||
import QtQuick.Layouts 1.1
|
import QtQuick.Layouts 1.1
|
||||||
import org.kde.plasma.core 2.0 as PlasmaCore
|
import org.kde.plasma.core 2.0 as PlasmaCore
|
||||||
51
dialer/contents/ui/Dialpad/Dialpad.qml
Normal file
51
dialer/contents/ui/Dialpad/Dialpad.qml
Normal file
|
|
@ -0,0 +1,51 @@
|
||||||
|
/*
|
||||||
|
* Copyright 2014 Aaron Seigo <aseigo@kde.org>
|
||||||
|
* Copyright 2014 Marco Martin <mart@kde.org>
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU Library General Public License as
|
||||||
|
* published by the Free Software Foundation; either version 2, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU Library General Public License for more details
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Library General Public
|
||||||
|
* License along with this program; if not, write to the
|
||||||
|
* Free Software Foundation, Inc.,
|
||||||
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import QtQuick 2.0
|
||||||
|
import QtQuick.Layouts 1.1
|
||||||
|
import org.kde.plasma.core 2.0 as PlasmaCore
|
||||||
|
import org.kde.plasma.components 2.0 as PlasmaComponents
|
||||||
|
|
||||||
|
GridLayout {
|
||||||
|
id: pad
|
||||||
|
columns: 3
|
||||||
|
|
||||||
|
property int buttonHeight: parent.height / 6
|
||||||
|
|
||||||
|
Layout.fillWidth: true
|
||||||
|
Layout.fillHeight: true
|
||||||
|
|
||||||
|
DialerButton { id: one; text: "1" }
|
||||||
|
DialerButton { text: "2" }
|
||||||
|
DialerButton { text: "3" }
|
||||||
|
|
||||||
|
DialerButton { text: "4" }
|
||||||
|
DialerButton { text: "5" }
|
||||||
|
DialerButton { text: "6" }
|
||||||
|
|
||||||
|
DialerButton { text: "7" }
|
||||||
|
DialerButton { text: "8" }
|
||||||
|
DialerButton { text: "9" }
|
||||||
|
|
||||||
|
DialerButton { text: "*"; }
|
||||||
|
DialerButton { text: "0"; sub: "+"; }
|
||||||
|
DialerButton { text: "#" }
|
||||||
|
}
|
||||||
|
|
||||||
|
|
@ -115,7 +115,7 @@ ApplicationWindow {
|
||||||
PlasmaExtras.ConditionalLoader {
|
PlasmaExtras.ConditionalLoader {
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
when: root.visible && root.status == 0
|
when: root.visible && root.status == 0
|
||||||
source: Qt.resolvedUrl("Dialer.qml")
|
source: Qt.resolvedUrl("Dialer/Dialer.qml")
|
||||||
opacity: root.status == 0 ? 1 : 0
|
opacity: root.status == 0 ? 1 : 0
|
||||||
Behavior on opacity {
|
Behavior on opacity {
|
||||||
OpacityAnimator {
|
OpacityAnimator {
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue