[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdepim/mobile
From: Tobias Koenig <tokoe () kde ! org>
Date: 2010-11-29 10:02:13
Message-ID: 20101129100213.2FBA4AC8A3 () svn ! kde ! org
[Download RAW message or body]
SVN commit 1201982 by tokoe:
Add and integrate KPIM.DecoratedFlickable
DecoratedFlickable provides visual indicators for
being a flickable.
M +3 -2 calendar/ConfigDialog.qml
M +3 -2 contacts/ConfigDialog.qml
M +15 -15 contacts/contact-editor.qml
M +3 -3 contacts/contactgroup-editor.qml
M +4 -2 lib/AboutDialog.qml
M +3 -2 lib/AttachmentList.qml
M +1 -0 lib/CMakeLists.txt
A lib/DecoratedFlickable.qml [License: UNKNOWN]
M +6 -3 lib/SearchDialog.qml
M +3 -3 lib/calendar/incidence-editor.qml
M +1 -0 lib/qmldir
M +3 -2 mail/ConfigDialog.qml
M +3 -3 mail/FilterConfigDialog.qml
M +6 -5 mail/kmail-composer.qml
M +3 -2 tasks/ConfigDialog.qml
--- trunk/KDE/kdepim/mobile/calendar/ConfigDialog.qml #1201981:1201982
@@ -34,13 +34,13 @@
configWidget.load();
}
- QML.Flickable {
+ KPIM.DecoratedFlickable {
id: configWidgetBox
anchors.fill: parent
anchors.topMargin: 25
- flickableDirection: QML.Flickable.VerticalFlick
contentHeight: configWidget.height;
+ content.children: [
QML.Item { // dummy item to make the widget visible with the broken QML version on the N900
anchors.fill: parent
Calendar.ConfigWidget {
@@ -48,6 +48,7 @@
width: parent.width - okButton.width
}
}
+ ]
}
KPIM.Button2 {
--- trunk/KDE/kdepim/mobile/contacts/ConfigDialog.qml #1201981:1201982
@@ -34,13 +34,13 @@
configWidget.load();
}
- QML.Flickable {
+ KPIM.DecoratedFlickable {
id: configWidgetBox
anchors.fill: parent
anchors.topMargin: 25
- flickableDirection: QML.Flickable.VerticalFlick
contentHeight: configWidget.height;
+ content.children: [
QML.Item { // dummy item to make the widget visible with the broken QML version on the N900
anchors.fill: parent
Contacts.ConfigWidget {
@@ -48,6 +48,7 @@
width: parent.width - okButton.width
}
}
+ ]
}
KPIM.Button2 {
--- trunk/KDE/kdepim/mobile/contacts/contact-editor.qml #1201981:1201982
@@ -23,7 +23,7 @@
import org.kde.contacteditors 4.5 as ContactEditors
KPIM.MainView {
- Flickable {
+ KPIM.DecoratedFlickable {
anchors.fill: parent
anchors.topMargin: 40
@@ -31,9 +31,8 @@
anchors.rightMargin: 4;
contentHeight: editorGeneral.height;
- clip: true;
- flickableDirection: "VerticalFlick"
+ content.children: [
Item {
anchors.fill: parent
ContactEditors.ContactEditorGeneral {
@@ -41,6 +40,7 @@
width: parent.width;
}
}
+ ]
}
SlideoutPanelContainer {
@@ -55,12 +55,11 @@
handleHeight: 120
content: [
- Flickable {
+ KPIM.DecoratedFlickable {
anchors.fill: parent;
contentHeight: editorBusiness.height;
- clip: true;
- flickableDirection: "VerticalFlick"
+ content.children: [
Column {
anchors.fill: parent
ContactEditors.ContactEditorBusiness {
@@ -68,6 +67,7 @@
width: parent.width;
}
}
+ ]
}
]
}
@@ -79,12 +79,11 @@
handleHeight: 120
content: [
- Flickable {
+ KPIM.DecoratedFlickable {
anchors.fill: parent;
contentHeight: editorLocation.height;
- clip: true;
- flickableDirection: "VerticalFlick"
+ content.children: [
Column {
anchors.fill: parent
ContactEditors.ContactEditorLocation {
@@ -92,6 +91,7 @@
width: parent.width;
}
}
+ ]
}
]
}
@@ -103,12 +103,11 @@
handleHeight: 100
content: [
- Flickable {
+ KPIM.DecoratedFlickable {
anchors.fill: parent;
contentHeight: editorCrypto.height;
- clip: true;
- flickableDirection: "VerticalFlick"
+ content.children: [
Column {
anchors.fill: parent
ContactEditors.ContactEditorCrypto {
@@ -116,6 +115,7 @@
width: parent.width;
}
}
+ ]
}
]
}
@@ -127,12 +127,11 @@
handleHeight: 100
content: [
- Flickable {
+ KPIM.DecoratedFlickable {
anchors.fill: parent;
contentHeight: editorMore.height;
- clip: true;
- flickableDirection: "VerticalFlick"
+ content.children: [
Column {
anchors.fill: parent
ContactEditors.ContactEditorMore {
@@ -140,6 +139,7 @@
width: parent.width;
}
}
+ ]
}
]
}
--- trunk/KDE/kdepim/mobile/contacts/contactgroup-editor.qml #1201981:1201982
@@ -23,7 +23,7 @@
import org.kde.contacteditors 4.5 as ContactEditors
KPIM.MainView {
- Flickable {
+ KPIM.DecoratedFlickable {
anchors.fill: parent
anchors.topMargin: 40
@@ -31,9 +31,8 @@
anchors.rightMargin: 4;
contentHeight: editor.height;
- clip: true;
- flickableDirection: "VerticalFlick"
+ content.children: [
Item {
anchors.fill: parent
ContactEditors.ContactGroupEditor {
@@ -41,5 +40,6 @@
width: parent.width;
}
}
+ ]
}
}
--- trunk/KDE/kdepim/mobile/lib/AboutDialog.qml #1201981:1201982
@@ -38,11 +38,12 @@
anchors.fill: parent
anchors.topMargin: 40
anchors.leftMargin: 40
- QML.Flickable{
- flickableDirection: QML.Flickable.VerticalFlick
+ KPIM.DecoratedFlickable{
width: parent.width - closeButton.width
height: parent.height
contentHeight: 1700;
+
+ content.children: [
QML.Rectangle{
id: aboutText
QML.Column{
@@ -119,6 +120,7 @@
}
}
}
+ ]
}
}
--- trunk/KDE/kdepim/mobile/lib/AttachmentList.qml #1201981:1201982
@@ -133,16 +133,17 @@
anchors.bottom: parent.bottom
width: _attachmentList.width - attachmentListWidth - 6
- Flickable {
+ KPIM.DecoratedFlickable {
id: previewScrollArea
anchors.fill: parent
contentWidth: previewImage.width
contentHeight: previewImage.height
- clip: true
+ content.children: [
Image {
id: previewImage
source: attachmentListView.currentAttachmentUrl
}
+ ]
}
KPIM.Button {
--- trunk/KDE/kdepim/mobile/lib/CMakeLists.txt #1201981:1201982
@@ -79,6 +79,7 @@
ActiveActionMenuItemDelegate.qml
BulkActionScreen.qml
BulkActionList.qml
+ DecoratedFlickable.qml
FakeAction.qml
FavoriteManager.qml
ActionList.qml
--- trunk/KDE/kdepim/mobile/lib/SearchDialog.qml #1201981:1201982
@@ -30,20 +30,23 @@
color: "white"
visible: guiStateManager.inSearchScreenState
- QML.Flickable {
+ KPIM.DecoratedFlickable {
id: searchWidgetBox
anchors.fill: parent
anchors.topMargin: 25
- flickableDirection: QML.Flickable.VerticalFlick
- contentHeight: searchWidget.height;
+ contentHeight: searchWidget.height
+ content.children: [
QML.Item { // dummy item to make the widget visible with the broken QML version on the N900
anchors.fill: parent
QML.Item {
id: searchWidget
width: parent.width - searchButton.width
+
+ onChildrenChanged: { searchWidgetBox.contentHeight = children[0].height }
}
}
+ ]
}
KPIM.Button2 {
--- trunk/KDE/kdepim/mobile/lib/calendar/incidence-editor.qml #1201981:1201982
@@ -65,7 +65,7 @@
anchors.fill: parent
}
- Flickable {
+ KPIM.DecoratedFlickable {
anchors.top: parent.top
anchors.bottom: collectionCombo.top
anchors.left: parent.left
@@ -75,15 +75,15 @@
anchors.leftMargin: 40;
contentHeight: generalEditor.height;
- clip: true;
- flickableDirection: "VerticalFlick"
+ content.children: [
Item {
IncidenceEditors.GeneralEditor {
id: generalEditor;
anchors.fill: parent
}
}
+ ]
}
IncidenceEditors.CollectionCombo {
--- trunk/KDE/kdepim/mobile/lib/qmldir #1201981:1201982
@@ -40,3 +40,4 @@
SearchDialog 4.5 SearchDialog.qml
SearchResultScreen 4.5 SearchResultScreen.qml
ItemEditButton 4.5 ItemEditButton.qml
+DecoratedFlickable 4.5 DecoratedFlickable.qml
--- trunk/KDE/kdepim/mobile/mail/ConfigDialog.qml #1201981:1201982
@@ -34,13 +34,13 @@
configWidget.load();
}
- QML.Flickable {
+ KPIM.DecoratedFlickable {
id: configWidgetBox
anchors.fill: parent
anchors.topMargin: 25
- flickableDirection: QML.Flickable.VerticalFlick
contentHeight: configWidget.height;
+ content.children: [
QML.Item { // dummy item to make the widget visible with the broken QML version on the N900
anchors.fill: parent
Mail.ConfigWidget {
@@ -48,6 +48,7 @@
width: parent.width - okButton.width
}
}
+ ]
}
KPIM.Button2 {
--- trunk/KDE/kdepim/mobile/mail/FilterConfigDialog.qml #1201981:1201982
@@ -100,16 +100,15 @@
}
}
- QML.Flickable {
+ KPIM.DecoratedFlickable {
id: configWidgetBox
anchors.left: list.right
anchors.right: parent.right
anchors.top: parent.top
anchors.bottom: parent.bottom
- //anchors.topMargin: 25
- flickableDirection: QML.Flickable.VerticalFlick
contentHeight: configWidget.height;
+ content.children: [
QML.Item { // dummy item to make the widget visible with the broken QML version on the N900
anchors.fill: parent
Mail.FilterConfigWidget {
@@ -123,6 +122,7 @@
}
}
}
+ ]
}
QML.Rectangle {
--- trunk/KDE/kdepim/mobile/mail/kmail-composer.qml #1201981:1201982
@@ -24,17 +24,18 @@
KPIM.MainView {
- Flickable {
+ KPIM.DecoratedFlickable {
id: flick
anchors.fill: parent
- flickableDirection: Flickable.VerticalFlick
contentHeight: editorView.contentHeight;
+ content.children: [
EditorView {
id: editorView
enabled: !window.busy
anchors.fill: parent
}
+ ]
}
SlideoutPanelContainer {
@@ -48,13 +49,12 @@
handleHeight: 150
handlePosition: 40
content: [
- Flickable {
+ KPIM.DecoratedFlickable {
id: flickablerecipients
anchors.fill: parent
- flickableDirection: Flickable.VerticalFlick
contentHeight: recipientsEditor.height;
- clip: true;
+ content.children: [
Item {
id: recipientswrapper
anchors.top: parent.top
@@ -71,6 +71,7 @@
anchors.right: parent.right
}
}
+ ]
}
]
}
--- trunk/KDE/kdepim/mobile/tasks/ConfigDialog.qml #1201981:1201982
@@ -34,13 +34,13 @@
configWidget.load();
}
- QML.Flickable {
+ KPIM.DecoratedFlickable {
id: configWidgetBox
anchors.fill: parent
anchors.topMargin: 25
- flickableDirection: QML.Flickable.VerticalFlick
contentHeight: configWidget.height;
+ content.children: [
QML.Item { // dummy item to make the widget visible with the broken QML version on the N900
anchors.fill: parent
Tasks.ConfigWidget {
@@ -48,6 +48,7 @@
width: parent.width - okButton.width
}
}
+ ]
}
KPIM.Button2 {
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic