From 835512146832cf03a3280d91c19cdf0319d83b32 Mon Sep 17 00:00:00 2001 From: David Fries Date: Fri, 11 Jul 2014 12:31:35 -0500 Subject: Doc: .*Style attachment correction The .*Style is attached to the control not the other way around. Change-Id: Ia9158463d86881997e917c26427cb62beb8e5edc Reviewed-by: J-P Nurmi --- src/controls/Private/Style.qml | 2 +- src/controls/Styles/Base/BusyIndicatorStyle.qml | 2 +- src/controls/Styles/Base/ButtonStyle.qml | 2 +- src/controls/Styles/Base/CalendarStyle.qml | 2 +- src/controls/Styles/Base/CheckBoxStyle.qml | 2 +- src/controls/Styles/Base/ComboBoxStyle.qml | 2 +- src/controls/Styles/Base/GroupBoxStyle.qml | 2 +- src/controls/Styles/Base/ProgressBarStyle.qml | 2 +- src/controls/Styles/Base/RadioButtonStyle.qml | 2 +- src/controls/Styles/Base/ScrollViewStyle.qml | 2 +- src/controls/Styles/Base/SliderStyle.qml | 2 +- src/controls/Styles/Base/SpinBoxStyle.qml | 2 +- src/controls/Styles/Base/TabViewStyle.qml | 2 +- src/controls/Styles/Base/TableViewStyle.qml | 2 +- src/controls/Styles/Base/TextAreaStyle.qml | 2 +- src/controls/Styles/Base/TextFieldStyle.qml | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) (limited to 'src') diff --git a/src/controls/Private/Style.qml b/src/controls/Private/Style.qml index 53497517..519ea958 100644 --- a/src/controls/Private/Style.qml +++ b/src/controls/Private/Style.qml @@ -48,6 +48,6 @@ import QtQuick.Controls.Private 1.0 */ AbstractStyle { - /*! The control attached to this style */ + /*! The control this style is attached to. */ readonly property Item control: __control } diff --git a/src/controls/Styles/Base/BusyIndicatorStyle.qml b/src/controls/Styles/Base/BusyIndicatorStyle.qml index ce8550db..7e6e75f8 100644 --- a/src/controls/Styles/Base/BusyIndicatorStyle.qml +++ b/src/controls/Styles/Base/BusyIndicatorStyle.qml @@ -72,7 +72,7 @@ import QtQuick.Controls.Private 1.0 Style { id: indicatorstyle - /*! The \l BusyIndicator attached to this style. */ + /*! The \l BusyIndicator this style is attached to. */ readonly property BusyIndicator control: __control /*! This defines the appearance of the busy indicator. */ diff --git a/src/controls/Styles/Base/ButtonStyle.qml b/src/controls/Styles/Base/ButtonStyle.qml index 566f93e5..426e7f61 100644 --- a/src/controls/Styles/Base/ButtonStyle.qml +++ b/src/controls/Styles/Base/ButtonStyle.qml @@ -76,7 +76,7 @@ import QtQuick.Controls.Private 1.0 Style { id: buttonstyle - /*! The \l {QtQuick.Controls::}{Button} attached to this style. */ + /*! The \l {QtQuick.Controls::}{Button} this style is attached to. */ readonly property Button control: __control /*! The padding between the background and the label components. */ diff --git a/src/controls/Styles/Base/CalendarStyle.qml b/src/controls/Styles/Base/CalendarStyle.qml index 15a80d9b..e393c125 100644 --- a/src/controls/Styles/Base/CalendarStyle.qml +++ b/src/controls/Styles/Base/CalendarStyle.qml @@ -125,7 +125,7 @@ Style { id: calendarStyle /*! - The Calendar attached to this style. + The Calendar this style is attached to. */ readonly property Calendar control: __control diff --git a/src/controls/Styles/Base/CheckBoxStyle.qml b/src/controls/Styles/Base/CheckBoxStyle.qml index c8592b76..5702ca75 100644 --- a/src/controls/Styles/Base/CheckBoxStyle.qml +++ b/src/controls/Styles/Base/CheckBoxStyle.qml @@ -76,7 +76,7 @@ import QtQuick.Controls.Private 1.0 Style { id: checkboxStyle - /*! The \l CheckBox attached to this style. */ + /*! The \l CheckBox this style is attached to. */ readonly property CheckBox control: __control /*! This defines the text label. */ diff --git a/src/controls/Styles/Base/ComboBoxStyle.qml b/src/controls/Styles/Base/ComboBoxStyle.qml index de78dc02..2701e2a8 100644 --- a/src/controls/Styles/Base/ComboBoxStyle.qml +++ b/src/controls/Styles/Base/ComboBoxStyle.qml @@ -70,7 +70,7 @@ Style { */ property int renderType: Text.NativeRendering - /*! The \l ComboBox attached to this style. */ + /*! The \l ComboBox this style is attached to. */ readonly property ComboBox control: __control /*! The padding between the background and the label components. */ diff --git a/src/controls/Styles/Base/GroupBoxStyle.qml b/src/controls/Styles/Base/GroupBoxStyle.qml index 545ca07b..2adc18d0 100644 --- a/src/controls/Styles/Base/GroupBoxStyle.qml +++ b/src/controls/Styles/Base/GroupBoxStyle.qml @@ -50,7 +50,7 @@ import QtQuick.Controls.Private 1.0 */ Style { - /*! The \l GroupBox attached to this style. */ + /*! The \l GroupBox this style is attached to. */ readonly property GroupBox control: __control /*! The margin from the content item to the groupbox. */ diff --git a/src/controls/Styles/Base/ProgressBarStyle.qml b/src/controls/Styles/Base/ProgressBarStyle.qml index ec379884..88f04304 100644 --- a/src/controls/Styles/Base/ProgressBarStyle.qml +++ b/src/controls/Styles/Base/ProgressBarStyle.qml @@ -111,7 +111,7 @@ import QtQuick.Controls.Private 1.0 Style { id: progressBarStyle - /*! The \l ProgressBar attached to this style. */ + /*! The \l ProgressBar this style is attached to. */ readonly property ProgressBar control: __control /*! A value in the range [0-1] indicating the current progress. */ diff --git a/src/controls/Styles/Base/RadioButtonStyle.qml b/src/controls/Styles/Base/RadioButtonStyle.qml index 86b7c816..3fda616a 100644 --- a/src/controls/Styles/Base/RadioButtonStyle.qml +++ b/src/controls/Styles/Base/RadioButtonStyle.qml @@ -75,7 +75,7 @@ import QtQuick.Controls.Private 1.0 Style { id: radiobuttonStyle - /*! The \l RadioButton attached to this style. */ + /*! The \l RadioButton this style is attached to. */ readonly property RadioButton control: __control /*! This defines the text label. */ diff --git a/src/controls/Styles/Base/ScrollViewStyle.qml b/src/controls/Styles/Base/ScrollViewStyle.qml index 8c17e35a..875f46e7 100644 --- a/src/controls/Styles/Base/ScrollViewStyle.qml +++ b/src/controls/Styles/Base/ScrollViewStyle.qml @@ -51,7 +51,7 @@ import QtQuick.Controls.Private 1.0 Style { id: root - /*! The \l ScrollView attached to this style. */ + /*! The \l ScrollView this style is attached to. */ readonly property ScrollView control: __control /*! This property controls the frame border padding of the scrollView. */ diff --git a/src/controls/Styles/Base/SliderStyle.qml b/src/controls/Styles/Base/SliderStyle.qml index 1e2750fb..a4c4f0ea 100644 --- a/src/controls/Styles/Base/SliderStyle.qml +++ b/src/controls/Styles/Base/SliderStyle.qml @@ -82,7 +82,7 @@ import QtQuick.Controls.Private 1.0 Style { id: styleitem - /*! The \l Slider attached to this style. */ + /*! The \l Slider this style is attached to. */ readonly property Slider control: __control padding { top: 0 ; left: 0 ; right: 0 ; bottom: 0 } diff --git a/src/controls/Styles/Base/SpinBoxStyle.qml b/src/controls/Styles/Base/SpinBoxStyle.qml index ffd30a58..f3c3ea60 100644 --- a/src/controls/Styles/Base/SpinBoxStyle.qml +++ b/src/controls/Styles/Base/SpinBoxStyle.qml @@ -66,7 +66,7 @@ import QtQuick.Controls.Private 1.0 Style { id: spinboxStyle - /*! The \l SpinBox attached to this style. */ + /*! The \l SpinBox this style is attached to. */ readonly property SpinBox control: __control /*! The content margins of the text field. */ diff --git a/src/controls/Styles/Base/TabViewStyle.qml b/src/controls/Styles/Base/TabViewStyle.qml index ad1d3856..4e6e2ccc 100644 --- a/src/controls/Styles/Base/TabViewStyle.qml +++ b/src/controls/Styles/Base/TabViewStyle.qml @@ -81,7 +81,7 @@ import QtQuick.Controls.Private 1.0 Style { - /*! The \l ScrollView attached to this style. */ + /*! The \l ScrollView this style is attached to. */ readonly property TabView control: __control /*! This property holds whether the user can move the tabs. diff --git a/src/controls/Styles/Base/TableViewStyle.qml b/src/controls/Styles/Base/TableViewStyle.qml index b59a38ca..602049c4 100644 --- a/src/controls/Styles/Base/TableViewStyle.qml +++ b/src/controls/Styles/Base/TableViewStyle.qml @@ -54,7 +54,7 @@ import QtQuick.Controls.Private 1.0 ScrollViewStyle { id: root - /*! The \l TableView attached to this style. */ + /*! The \l TableView this style is attached to. */ readonly property TableView control: __control /*! The text color. */ diff --git a/src/controls/Styles/Base/TextAreaStyle.qml b/src/controls/Styles/Base/TextAreaStyle.qml index 774f5cc6..3a2479d0 100644 --- a/src/controls/Styles/Base/TextAreaStyle.qml +++ b/src/controls/Styles/Base/TextAreaStyle.qml @@ -64,7 +64,7 @@ import QtQuick.Controls.Private 1.0 ScrollViewStyle { id: style - /*! The \l TextArea attached to this style. */ + /*! The \l TextArea this style is attached to. */ readonly property TextArea control: __control /*! The current font. */ diff --git a/src/controls/Styles/Base/TextFieldStyle.qml b/src/controls/Styles/Base/TextFieldStyle.qml index 4fe0d0a9..9b0e5728 100644 --- a/src/controls/Styles/Base/TextFieldStyle.qml +++ b/src/controls/Styles/Base/TextFieldStyle.qml @@ -68,7 +68,7 @@ import QtQuick.Controls.Private 1.0 Style { id: style - /*! The \l TextField attached to this style. */ + /*! The \l TextField this style is attached to. */ readonly property TextField control: __control /*! The content margins of the text field. */ -- cgit v1.2.1 From 6a7a824b970d12471f9219c84a57eb91231c59fe Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Tue, 9 Sep 2014 16:16:00 +0200 Subject: TableView: fix tab navigation Task-number: QTBUG-41202 Change-Id: I13c420dd1443c152053ac331da7bfe5a9fbc9603 Reviewed-by: Mitch Curtis --- src/controls/TableView.qml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/controls/TableView.qml b/src/controls/TableView.qml index c621236d..b225408f 100644 --- a/src/controls/TableView.qml +++ b/src/controls/TableView.qml @@ -792,9 +792,11 @@ ScrollView { root.activated(currentRow); } - delegate: Item { + delegate: FocusScope { id: rowItemContainer + activeFocusOnTab: false + property Item rowItem // We recycle instantiated row items to speed up list scrolling -- cgit v1.2.1