summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* iOS: only show menu if the control got active focusRichard Moe Gustavsen2014-12-081-0/+1
| | | | | | | | | | | If the control looses active focus, we start a timer to update menu visibility. But when the timer fires and we do the actual update, we didn't test for active focus, which meant that we would show the menu when we really meant to close it. Change-Id: I6881e62be3a6cf4d82489663bc6d848d1dcf57d2 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Document how to select a specific Android themeJ-P Nurmi2014-12-012-1/+20
| | | | | | | Change-Id: If6d72a65b01453e2f2ea76026ec158c98e80421e Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Caroline Chao <caroline.chao@theqtcompany.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Fix StackView focus handlingJ-P Nurmi2014-11-281-1/+1
| | | | | | | | | | Make StackView a FocusScope so inner focus changes don't have undesired side effects in other parts of the application. Task-number: QTBUG-42506 Change-Id: I0d901083196cf90f236a24e1dcd2e91bd9f320db Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: Caroline Chao <caroline.chao@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.4.0' into 5.4Frederik Gladhorn2014-11-2721-20/+151
|\ | | | | | | Change-Id: I4c81a7852e7041328b7cfa320e907cc3cb863f04
| * Take all offsets into account also with PlatformMenuv5.4.05.4.0Laszlo Agocs2014-11-241-0/+1
| | | | | | | | | | | | Task-number: QTBUG-42314 Change-Id: I7e63d744bbed4a5c254d6cffdc8aba4c5e37d5c3 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
| * Only make scrollbars non-interactive on mobile devices.Jan Arve Saether2014-11-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Before this patch, I could not adjust the scrollbars in a ScrollArea on a Windows 8.1 desktop computer just because it had a touch screen. The same problem was observed on Linux (with touch screen). Task-number: QTBUG-42806 Change-Id: I6f35c40b0362820d7c1685e1b6fc8474432237eb Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
| * Android 5.0: add missing state transitionsv5.4.0-rc1J-P Nurmi2014-11-202-5/+76
| | | | | | | | | | | | | | | | | | | | | | | | Android 5.0 introduced control state change transitions. Without this change, CheckBoxes and RadioButtons don't transition between checked and unchecked states as appropriate. Task-number: QTBUG-42520 Change-Id: If2aa70898e72b78f105732cc4ee5c9674cc6082c Reviewed-by: BogDan Vatra <bogdan@kde.org> Reviewed-by: Caroline Chao <caroline.chao@theqtcompany.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
| * Doc: added brief statement for group menusNico Vertriest2014-11-181-0/+1
| | | | | | | | | | | | Task-number: QTBUG-40362 Change-Id: I94d869e9d38c5d958df4abd1e17f219cfa3ce16a Reviewed-by: Martin Smith <martin.smith@digia.com>
| * Doc: Corrected brief statements for overview pagesNico Vertriest2014-11-144-0/+4
| | | | | | | | | | | | Task-number: QTBUG-42682 Change-Id: I14b60415f5a1bfdc0874013de707560a944c0824 Reviewed-by: Martin Smith <martin.smith@digia.com>
| * Doc: Fixed the \image referenceVenu2014-11-131-1/+1
| | | | | | | | | | | | | | | | An earlier commit renamed the image that was referred but this reference was not updated. Change-Id: Ic4b6e9d6d1e01835e53a4fd4640ae45b105898fd Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
| * Merge "Merge remote-tracking branch 'origin/5.4' into 5.4.0" into ↵Jani Heikkinen2014-11-1115-86/+99
| |\ | | | | | | | | | refs/staging/5.4.0
| | * Merge remote-tracking branch 'origin/5.4' into 5.4.0Oswald Buddenhagen2014-11-1015-86/+99
| | |\ | | | | | | | | | | | | Change-Id: I278a90bb0049a96008700f4e0128bd95c0fae1fd
| * | | Fix text selection on desktopJ-P Nurmi2014-11-112-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So far, text selection handles were only provided by mobile specific styles. The new Flat style is an exception that provides text selection handles for mobile, but is still intended to be usable on desktop too. The text selection handling code thus needs not only to check whether the text selection handles exist, but also whether it's a mobile platform. This fixes text selection on desktop. Change-Id: Ibda2045ca42970e7db692d2e8370ac0dba21625a Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
| * | | Doc: Update gallery screenshotsCaroline Chao2014-11-106-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To match the updated example. Display a screenshot for both Android and OS X in the gallery example documentation. Change-Id: I37e56437bb54248a4d500810c56ce8a8ba15b4d2 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com> Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
| * | | Android 5.0: apply tint colorJ-P Nurmi2014-11-101-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this change checkboxes, radio buttons, slider handle etc. are black on Android 5.0. This change applies the tint color so that the controls become green/cyan as appropriate. Task-number: QTBUG-42520 Change-Id: Ib8bd9d279f34e0f7951b311f398bc1fb11f7b1ba Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
| * | | Android/SwitchStyle: hide thumb text on Android 5.0J-P Nurmi2014-11-101-0/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: Ied63a5bd58a88f097ac9e20f30c21d45f45a2f46 Reviewed-by: Caroline Chao <caroline.chao@theqtcompany.com>
| * | | Android/SwitchStyle: use TextMetrics instead of FontMetricsJ-P Nurmi2014-11-101-5/+11
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Ensures that the thumb text width is correctly calculated regardless of QML's arbitrary binding evaluation order. Change-Id: I71526db963fec6d54ad717f46382537591268e37 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: Caroline Chao <caroline.chao@theqtcompany.com>
| * | Doc: add a note about the tickmarksEnabled propertyCaroline Chao2014-11-101-0/+2
| | | | | | | | | | | | | | | Change-Id: I61e6029c813fd0258a24c6ea547190808f42edc9 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | | FontDialog: layout tweaks to fit better on small screensShawn Rutledge2014-11-251-26/+26
| | | | | | | | | | | | | | | Change-Id: Ic6b5d69a15e67fae70b375fe84d4f094203f20c3 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* | | Dialogs: add qt.quick.dialogs.window logging categoryShawn Rutledge2014-11-251-4/+27
| | | | | | | | | | | | | | | | | | | | | | | | Logging everything having to do with the dialog window or fake window decoration, visibility, geometry and geometry dependencies. Change-Id: Ibf657f917cc04fac3b59ad756f2427434e7b8a23 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* | | Fix Spinbox missing value change if minimumValue is setFilippo Cucchetto2014-11-251-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | The Spinbox validator considered invalid an intermediate value preventing the user for inserting a valid value. Task-number: QTBUG-42342 Change-Id: I24d2f9f7d6fb9d5d4f96f81821b37a30421665a3 Reviewed-by: Filippo Cucchetto <filippocucchetto@gmail.com> Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | | Fixed missing mouse event when the Menu control is dismissedFilippo Cucchetto2014-11-241-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QQuickPopupWindow doesn't forward the mouse event to the transient window if the menu is dismissed Task-number: QTBUG-40391 Change-Id: I2e5fd8b64c63d005445f9fd5e8b36e47b04c1e8b Reviewed-by: Filippo Cucchetto <filippocucchetto@gmail.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
* | | Dialogs: added qt.quick.dialogs.registration logging categoryShawn Rutledge2014-11-211-23/+9
| | | | | | | | | | | | | | | | | | | | | It's easier to turn on debugging instead of uncommenting #define. Change-Id: Ia1d39934c6dd30dd9fe850d109debfdda7a740da Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* | | Format TableView's detailed description code snippet.Mitch Curtis2014-11-131-16/+33
| |/ |/| | | | | | | | | | | | | It doesn't look very nice (missing spaces, several statements per line). Change-Id: I2d7de5148498a25e4ade0125e66a64a688da688b Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
* | Slider: don't clamp to the initial press pointJ-P Nurmi2014-11-071-1/+1
| | | | | | | | | | Change-Id: I5115bbab670f534dae44eb19c2208aff21293889 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* | Doc: Language editsVenu2014-11-071-6/+5
| | | | | | | | | | | | | | Changed the section title and removed a redundant sentence. Change-Id: I16ac77e2df61f488f1feda60d043f6ed95af7f6c Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | Android: fix missing cursor handleJ-P Nurmi2014-11-071-45/+30
| | | | | | | | | | Change-Id: Iefd5ed9b662423c25d5dcad011d93b2336da794a Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* | Let the cursor handle be visible regardless of selectionJ-P Nurmi2014-11-074-3/+4
| | | | | | | | | | | | | | | | | | | | The cursor handle is visible on Android even when there's no selection. Let the style decide when to show/hide the handles, but make sure to disable the corresponding MouseArea when a handle is hidden. Change-Id: I211c122998223ad25279bee2841c5b5e14d4c48e Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
* | Revise the Table View exampleJ-P Nurmi2014-11-062-4/+28
| | | | | | | | | | | | | | | | | | | | | | A simple sortable and searchable table view example that also fits a mobile screen. The old "example" is demoted as a manual test app. Task-number: QTBUG-41253 Change-Id: I746c8e5871c35a184748abbb4427ca3d160ffc8e Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Caroline Chao <caroline.chao@theqtcompany.com>
* | Remove the SplitView exampleJ-P Nurmi2014-11-052-14/+0
| | | | | | | | | | | | | | | | This example served no purpose. A similar snippet can be found in SplitView docs, in the detailed description. Change-Id: Ic53e5bbe8c0c46c7cf9a0002f12ad6c229028388 Reviewed-by: Caroline Chao <caroline.chao@theqtcompany.com>
* | Slider: fix tap-to-set-value on touch screensJ-P Nurmi2014-11-051-4/+5
| | | | | | | | | | | | Change-Id: I7784b3a8266f889bc2079da4c64096eb9d50d6f5 Task-number: QTBUG-42252 Reviewed-by: Caroline Chao <caroline.chao@theqtcompany.com>
* | Android: text entry implicit size fits 20 charactersJ-P Nurmi2014-11-053-7/+22
| | | | | | | | | | | | | | | | | | | | | | A native unlayouted EditText control fits 20 characters by default. Let Qt Quick Controls Android Style use the same metrics instead of adjusting to the textual contents. This gives empty TextField, SpinBox and ComboBox sensible implicit sizes instead of shrinking them down to something unusable. Change-Id: I3cd3948aa3d64daada9d0b7d773cebb6627263f6 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* | Correct sizing of combobox itemsMarco Martin2014-11-042-2/+4
|/ | | | | | | | | | | | | | | | | | The qstyle can set as preferred size for itemview items a different size than the text height depending from the result of sizeFromContents( CT_ItemViewItem, .. Examples of styles that do this, are Oxygen and Breeze, in order to have a bit more spacing. This makes the combobox render incorrectly. This patch makes use of the size hint of the qstyle instead of the text height. Since the height can be more than the font height, the text (and optional icon) are now drawn vertically centered in the delegate. Change-Id: I898d85c994d5760979750c2f3a5dafd83f1e3cbd Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Fix up Slider documentation.Mitch Curtis2014-11-031-6/+6
| | | | | Change-Id: I85022aff7e3618aed49b8fbd4d1a817081a14982 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* TextArea: Make selection persistentGabriel de Dietrich2014-10-311-0/+1
| | | | | | | | Losing focus is no reason to lose the user's input. This is how desktop platforms work. Most mobile platforms work the same way. Change-Id: Ifea1051cd79ea9d0213adfd4f02c18b5573e7823 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* Slider: Hover only on the handleGabriel de Dietrich2014-10-311-16/+25
| | | | | | | | | | Most styles rely on the handle being hovered, not the whole slider. [ChangeLog][Slider] The hovered property is set only when the handle is hovered, not anymore on the groove Change-Id: I749b076c98fba8e344218e46637ec00d24c0250c Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* EditMenu iOS: don't show menu item 'select' when input field is emptyRichard Moe Gustavsen2014-10-301-1/+1
| | | | | | | | Make sure that we don't show the 'select' menu item if there is no word that can be selected. Change-Id: I24aec2f3b77a1bcdd1e71b5b2a853992476eb936 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* EditMenu iOS: show edit menu upon pressnhold on empty input fieldRichard Moe Gustavsen2014-10-301-1/+2
| | | | | | | | | | | | If you press and hold on an input field that doesn't have focus, we select the word under the cursor, which will make the menu show. But if the field is empty, no word can be selected, so therefore no menu will show. This patch will check for this special case, and show the menu if you pressnhold on an empty input field. Change-Id: I7d2c137765471cb1ff1dc4f7e34577e5e1317dc0 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* ToolBar: fix spacing between menu button & contentJ-P Nurmi2014-10-301-1/+1
| | | | | Change-Id: I0e46e77186a8572c63c3eed7a99f35b948b87de3 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* Revert "qquickrangemodel: don't emit signals before component is completed"J-P Nurmi2014-10-303-36/+16
| | | | | | | | | | | This reverts commit 774f2aa14e8742d77bb92968b06fab4dc35d79b4 that broke sliders (auto test for RangeModel included to prevent that from happening again) in the Qt Quick Enterprise Controls gallery. Some sliders with a hard-coded range [0..360] and value 240 ended up having a value of 0 at Component.onCompleted. Change-Id: Ib3024c51c0552ac06528ba47b08e1a33a5f48324 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* Layouts: increase the default spacing on mobile platformsJ-P Nurmi2014-10-301-2/+9
| | | | | | Change-Id: I7aff0236a08465c05559bd8a2e8a60b556fbc4ba Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
* Dialogs: FileDialog can only be modal on WindowsShawn Rutledge2014-10-302-0/+16
| | | | | | | The autotest has been failing on Windows because of this. Change-Id: I6ec42a256455d7a71a522fa7e75dc44f93b741ea Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Make the cursor and selection handle delegates private for nowJ-P Nurmi2014-10-3017-55/+66
| | | | | | | | | | | | | | | | | | The API is not ideal, we don't want to lock this thing down like as it is now. All styles implemented so far created CursorHandleStyle.qml and SelectionHandleStyle.qml so perhaps that's the better way to go. Furthermore, there's never going to be multiple occurrences of the handle pairs, so it should be one shared instance. Thus, the relevant style delegates probably shouldn't be sprinkled around various control styles... So, for now, the most pragmatic solution is to make the handles and cursors internal since we don't have time to revamp it before 5.4.0. Change-Id: Ib9fcc4a431bb510c8c55a760159f4d6a631554b3 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
* Placeholder text in TextField disappears on TextField tap.Samuel Nevala2014-10-301-1/+1
| | | | | | | | | | Instead of TextInput.inputMethodComposingtext and TextInput.text.length use TextInput.displayText.length to determine if placeholder should be visible. Task-number: QTBUG-40534 Change-Id: I0de2cb65c7c59d54365172b9233a5aba0f067ff5 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* text input: fix disabling of action logic when there is a menu assignedJ-P Nurmi2014-10-292-4/+4
| | | | | | | | The "menu.source" check added by 38b908a is always true even for an empty url => use "menu.item" instead. Change-Id: Ic9004dff18c848a720ea1c414b2921158a367778 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
* FileDialog: several logic corrections in handling the enter keyShawn Rutledge2014-10-292-11/+16
| | | | | | | | | | | | | | | | | | | | A "save as" dialog does not need to validate existence of the file. When the user presses enter in the text field at the top, and the text field contains a path to a directory, it usually means enter the directory; but if the dialog is for choosing a directory, then pressing enter will mean enter the directory if the dialog is not already viewing that one, or else accept the current directory as the choice if the table view does not have focus on some other row. When the user presses enter in table view, go down into a directory only if a directory is selected; otherwise accept the current selection. When the user clicks a row in the table, copy the path of that row into the text field so that it is possible to edit the path before pressing Enter or OK (behavior similar to a native dialog that has an editable path, such as GTK). Task-number: QTBUG-39435 Change-Id: Ibd5e988624c5b1072a12239d681cbdc812e0a697 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* Don't deploy Widget*Dialog.qml on touch platformsShawn Rutledge2014-10-291-5/+12
| | | | | | | | If qmlimportscanner sees these files, it will assume that the widgets module is necessary. Change-Id: I5cf9ab7f8686bd1988cd7c16d35b5f04ad2e92a8 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
* Android: fix GroupBoxStyle top marginJ-P Nurmi2014-10-281-4/+6
| | | | | | | | GroupBoxStyle was using checkmark indicator's height even when the GroupBox was not checkable => too much spacing. Change-Id: Ic68d8428471b8835cd92f44610a0d8b281bcc734 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* Dialogs: don't use widgets on mobile touch-based platformsShawn Rutledge2014-10-281-2/+14
| | | | | | | | It doesn't make sense to use widget-based dialogs in a QtQuick app on a mobile platform because widgets are not optimized for touch. Change-Id: I8659f247eb6e75ca827e8b42a0fb1e7f65dceee1 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* TextInput: disable activation logic when there is a menu assignedRichard Moe Gustavsen2014-10-272-0/+8
| | | | | | | | | The edit menu has it's own logic for when to show the menu, when to activate the input field etc upon press/release/click. So if there is a menu, don't interfere with its logic. Change-Id: If6af1e7b8f6bc68c66836846969cfe6bcee56de4 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
View Lorry Controller Status