summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add qtquickcontrols-calendar-example.png.wip/calendarMitch Curtis2014-02-101-0/+0
| | | | | Change-Id: Iafd4d6bb122928d3b3a86843b792f650ed6f5264 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* Correct Calendar's selectedDate documentation.Mitch Curtis2014-02-031-1/+1
| | | | | | | date => selectedDate Change-Id: I5a1ad4a1d47fd72c5b98b8f821f071343140aa43 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* Add calendar example.Mitch Curtis2014-02-0311-0/+623
| | | | | | | An example of Calendar used with an SQL model to view events. Change-Id: I54887dcedf4ea6bbb12c7c35fe968ff13821b696 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* Fix MouseArea in delegates.Mitch Curtis2014-02-031-13/+13
| | | | | | | | 9e9c84a67c543a887289a02f00e32451d72b45bc broke it after a bad merge conflict resolution. Change-Id: Icb068ec8299aeb1fe4b118fade9c74266aac9b20 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* Add week numbers.Mitch Curtis2014-02-034-96/+186
| | | | | Change-Id: Ib413019da88c24bebf6169b60b2088b1920f1ae4 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* Fix gaps shown when calendar size is not perfect.Mitch Curtis2014-02-038-290/+391
| | | | | | | | Use a Repeater instead of GridView, and copy what QCalendarWidget does. Change-Id: I2b734dbdee417be28c103cfa73ce34cd91319990 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com> Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* Document selectPreviousDay and selectNextDay.Mitch Curtis2014-01-311-0/+6
| | | | | Change-Id: I2237d8ffb4565b03ef6f125a421c19917e019e66 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* Allow keyboard navigation keys to be customized.Mitch Curtis2014-01-314-54/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds select* functions. These functions encapsulate the common methods of interacting with the calendar via the keyboard, so that it is possible to specify custom navigation keys: Calendar { id: calendar Keys.onLeftPressed: {} Keys.onRightPressed: {} Keys.onUpPressed: {} Keys.onDownPressed: {} Keys.onPressed: { if (event.key === Qt.Key_W) { calendar.selectPreviousWeek(); event.accepted = true; } else if (...) { ... } ... } } Change-Id: Ic82660f657eaadacd9a170baf07efbabf3eda332 Reviewed-by: Liang Qi <liang.qi@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Add home, end, page up, page down key navigation.Mitch Curtis2014-01-302-5/+89
| | | | | Change-Id: I3c22288381eb56dfae2a074be56f0d42df78825c Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Add grid line functionality.Mitch Curtis2014-01-214-160/+191
| | | | | Change-Id: I37fa8ad7f752b4d125c6f8984b76a41e81762dd4 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* Ensure all of Calendar's style components are within its bounds.Mitch Curtis2014-01-203-187/+160
| | | | | Change-Id: I998e44eec81716aa04f37870d767f70dc70b0195 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* Convert headerDelegate into weekdayDelegate.Mitch Curtis2014-01-177-50/+36
| | | | | | | | This allows us to hide CalendarHeaderModel, as we instead provide a delegate for each weekday. Change-Id: I246826bef5993fa5b70ad906acdf5c7854a681ba Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Improve styling API.Mitch Curtis2014-01-173-29/+36
| | | | | | | Be more consistent with the other controls' styles. Change-Id: I2c385774ae780c7341a4f72cf38ecdd6030cc274 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Convert QML CalendarModel to C++ QQuickCalendarModel.Mitch Curtis2014-01-1713-273/+370
| | | | | | | | | | | | | | | | | | | | | | This makes the model property private. The motivation behind this is: 1) We don't want to expose C++ classes in Qt Quick Controls. 2) Given 1), an alternative that allows users to use their own custom models for the Calendar involves: - Making the model property a var that accepts any type of model that provides a DateRole. - Having two functions in Calendar: indexAt(date) and dateAt(index), which any custom models have to implement if they use a different indexing system than QQuickCalendarModel's. - Forcing the user to populate their own dates. This shouldn't happen, as the code to do it is almost always going to be the same. It ends up being ugly. Instead, if users want to integrate things like events into their Calendar, they should store their own model for that separately; the styling code supports this. An example demonstrating this will be added later. Change-Id: I79ffb354ac26b42882f3352df4342d3fa1203832 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* Restore button sizes.Mitch Curtis2014-01-161-0/+4
| | | | | Change-Id: Ifd1905438e9312849f8cff3db5229ba5a1361ea9 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* Add a Desktop style for Calendar componentDavid Edmundson2014-01-123-1/+167
| | | | | | | | Calendar was hardcoded to the base style. This patch changes it to use the newly created Desktop API which should match QCalendarWidget Change-Id: Icd34ce781b535cdb5ca6e898626281e1958a7704 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* Add Calendar and supporting components.Mitch Curtis2013-12-0616-0/+1782
| | | | | | | | | | Adds: Calendar, CalendarModel, CalendarHeaderModel, CalendarStyle, RangedDate, DateUtils and relevant tests. Task-number: QTBUG-29948 Change-Id: Ibdd3923c514908cf8707f8572748e43a6eadbdfc Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* Pass a valid style option to fetch default frame widthDavid Edmundson2013-12-041-1/+1
| | | | | | | This is useful for oxygen to return the correct size Change-Id: I0476f89f68eabf4c1a8611623095213c8f70cef2 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-11-2941-142/+663
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I626baf91e8bb9e9816346fdb842c0d577ca23d77
| * Revise main() in examplesJ-P Nurmi2013-11-2820-56/+69
| | | | | | | | | | | | | | | | | | | | | | | | Replace the inconvenient QT_QUICK_CONTROLS_EXAMPLE_MAIN macro with a simpler macro that merely defines the actual application type. This way it's easier to do tweaks to main() when for example testing a different application font size. Moreover, browsing the example code becomes more convenient (especially online). Task-number: QTBUG-35083 Change-Id: I8203816a9112bf29b4661baa86bf4a196554db05 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| * TextField: Fix binding loop for property fontCaroline Chao2013-11-271-1/+1
| | | | | | | | | | Change-Id: I752595495a3cb1347eb5f43dcf8ff36044a02e02 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| * Fix disabled text color of an editable ComboBoxJ-P Nurmi2013-11-271-4/+3
| | | | | | | | | | Change-Id: I2b38fa17434796be65a88d7c8d14ff94a7e2b233 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| * Docs: add missing \since 5.2 to TextFieldStyle::renderTypeJ-P Nurmi2013-11-271-0/+1
| | | | | | | | | | Change-Id: I1a8691a2ef06cc188be11e2f6d04973f9e1f9270 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| * Make TextFieldStyle and SpinBoxStyle respect font sizeJens Bache-Wiig2013-11-264-9/+28
| | | | | | | | | | | | | | | | | | | | This makes both the controls respect a custom font size. Before this patch these controls would only support the global application font. Task-number: QTBUG-34750 Change-Id: I200a14adba5b75088ab54ba691430330d9226ada Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
| * ComboBox: Call resolveTextValue() after any model changeGabriel de Dietrich2013-11-262-10/+14
| | | | | | | | | | | | | | | | Particularly if the nature of the model has changed (e.g., from null to array). Task-number: QTBUG-34936 Change-Id: If07690a8836dcd786ed7a32afda1e344d048d31f Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
| * Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-11-268-4/+224
| |\ | | | | | | | | | Change-Id: I470ff77e4a52f37263c8f0d9bf789f10c643d659
| | * Set more window flags to keep Windows from omitting titlebar & buttonsv5.2.0-rc1Shawn Rutledge2013-11-231-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | This should not be necessary, but Windows does not treat the missing Qt::CustomizeWindowHint the same as the other platforms do. Task-number: QTBUG-35049 Change-Id: I81dc645dc1acf29b6ff4d5fc04f5dd3db94b0133 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| | * Revert "ApplicationWindow has the WindowFullscreenButtonHint flag by default"Jens Bache-Wiig2013-11-221-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 29d1b0d209ebb267c5a6ac8402c33892c09b8de6. This patch caused a regression resulting in QTBUG-35049 and should be reverted until we have a better fix. Change-Id: I76f9fa9859742a63f33757456c64f70183c76178 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
| | * SpinBox: add editingFinished signalLiang Qi2013-11-223-1/+105
| | | | | | | | | | | | | | | | | | | | | | | | Autotest is included. Task-number: QTBUG-34780 Change-Id: I2da9d57b409c24cbf1d90ce42da9b4071dd6dac8 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
| | * TextField: add editingFinished signalLiang Qi2013-11-223-1/+108
| | | | | | | | | | | | | | | | | | | | | | | | Autotest is included. Task-number: QTBUG-34780 Change-Id: I19e73ca0c988a9d294aca52f9c0eabb9274f40d7 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
| | * Fix retina rendering issues with Qt Quick ControlsJens Bache-Wiig2013-11-201-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | We need to scale the texture size since it has twice the pixel count on retina macs. Task-number: QTBUG-34922 Change-Id: I38ff316016ccb1e609037598f7107d62b3ba4295 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
| * | Bump MODULE_VERSION to 5.2.1Sergio Ahumada2013-11-251-1/+1
| | | | | | | | | | | | | | | | | | Change-Id: Ica5c8a62a6b4ac522530431b387a4aedb0f75d4f Reviewed-by: Matti Paaso <matti.paaso@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * | Fix TableView scrolling problemJ-P Nurmi2013-11-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TableView was specifying its content width based on item rows' width. Item rows get dynamically loaded and destroyed while scrolling, and it sometimes applied a width of a half-(de)constructed item row. That made the horizontal scrollbar jump to the beginning. This patch makes TableView use header row's (static) width for specifying the content width. Task-number: QTBUG-34344 Change-Id: I797f0f5d294fbb8c95b2836f9aec0dc14c32bc6b Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| * | Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-11-189-30/+303
| |\ \ | | |/ | | | | | | Change-Id: Ifce0bd8b87bc58a4708b7e682a27aaeaba9fbd53
| | * SpinBox: get active focus when up or down was pressedLiang Qi2013-11-152-0/+75
| | | | | | | | | | | | | | | | | | | | | | | | This behavior also needs activeFocusOnPress was true. Task-number: QTBUG-34773 Change-Id: I681c1cb20c1803e3bf7f60af5cdf45ae3fe34dae Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
| | * Fix plugins.qmltypesThomas Hartmann2013-11-151-0/+157
| | | | | | | | | | | | | | | | | | | | | | | | We have to "forward" declare QQuickText to get Label working in the code model. Change-Id: Ie8a032d4266d6923f56da7051b207f47090f180e Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
| | * TextEditor example: use the MessageDialog for the About boxShawn Rutledge2013-11-151-30/+6
| | | | | | | | | | | | | | | | | | Change-Id: I0813b7d392dfe7143d438b4057c5d787d223ad5e Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
| | * Make sure menu bar has a parent windowEskil Abrahamsen Blomfeldt2013-11-151-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Android we depend on the parent window of the menu bar to know when to show which menu bar. The menu bar parent was set in the onVisibleChanged signal of the background item, but this visible property is never changed. Adding a signal handler for the visible property of the window as well fixes the issue. Task-number: QTBUG-34681 Change-Id: I2cbafabe165420fd1697fbe51a8f393eb5158ffd Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
| | * ApplicationWindow has the WindowFullscreenButtonHint flag by defaultShawn Rutledge2013-11-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It should be possible to go fullscreen by default in most applications, unless there is a reason not to, in which case the developer can turn this flag back off. It's also not so intuitive to turn it on, because one needs to remember to specify Qt.Window as well, to avoid losing the toolbar. So making it the default avoids some mistakes/surprises. Furthermore QWidget has this flag by default. Task-number: QTBUG-33607 Change-Id: I350ffb38459d2a305353efe0db29335fe354a441 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com> Reviewed-by: Liang Qi <liang.qi@digia.com>
| | * Gallery example: add an About boxShawn Rutledge2013-11-134-0/+62
| |/ | | | | | | | | Change-Id: Ie683c9d6dca577193f6a5a2cee40916b263719d6 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
| * Make BusyIndicator style use threaded animationsJens Bache-Wiig2013-11-085-28/+20
| | | | | | | | | | | | | | | | | | This uses a graphic that will work even when the application is busy. It should still work pretty well on most light and dark backgrounds. Change-Id: I5506120140fe37cdfbd7d88004f5ad3d817b5aed Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* | Prepare to move the gridlayout engine so it can be shared.Jan Arve Saether2013-11-296-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | Currently, the gridlayout engine is duplicated in QtQuick.Layouts module and in QtWidgets module. The plan is to move the gridlayout engine from QtWidgets to QtGui and export it privately from there. However, that would produce linkage errors when linking the QtQuick.Layouts module. As a temporary solution we put the gridlayout engine in a namespace until the move has been completed. Change-Id: I8b43583cadff8846b5ed275f7fb5614737d903ad Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* | Add ComboBoxStyle::renderTypeJ-P Nurmi2013-11-273-2/+20
| | | | | | | | | | Change-Id: I59c145d0826926b096faae7b01390e9201b5e28f Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devSergio Ahumada2013-11-0853-363/+1624
|\ \ | |/ | | | | Change-Id: I678a00ebdf769eaa87d43214c2a32c303d3877ca
| * Update changelog for Qt 5.2Caroline Chao2013-11-081-0/+37
| | | | | | | | | | Change-Id: If3e03b628906857985d0f5bd49e71fcd1aced0fa Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
| * Fix warning in Tests_TabView::test_mousePressOnTabBarCaroline Chao2013-11-081-1/+1
| | | | | | | | | | | | Task-number: QTBUG-34666 Change-Id: I13506cc7504c71d9411e2b100bec803abb2eaccd Reviewed-by: Liang Qi <liang.qi@digia.com>
| * Tests: Fix warning in activeFocusOnTab testCaroline Chao2013-11-071-0/+0
| | | | | | | | | | | | | | Missing image. Change-Id: I3c52d7d60690346bed4002dee5c6b0844194784f Reviewed-by: Liang Qi <liang.qi@digia.com>
| * Optimize TableView by using ImageProviderJens Bache-Wiig2013-11-078-13/+110
| | | | | | | | | | | | | | | | | | This optimizes tableview as we were not able to utilize the image atlas efficiently without it. Change-Id: I3cce48b7557d843fb057cc1597dc4363c35bdef8 Reviewed-by: Caroline Chao <caroline.chao@digia.com> Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
| * Doc: Updated url variable in qdocconf files.Jerome Pasion2013-11-062-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In 5.2, the HTML output is in a flatter structure and when they are hosted in qt-project.org/doc, the documentation will be found at http://qt-project.org/doc/qt-$QT_VER The url variable is used by projects outside of Qt 5 which need to link to Qt 5 documentation, such as Qt Creator. Task-number: QTBUG-34584 Change-Id: Ifb9ba5c4a0e78b6170c448ec97f0bec8fa80bdfe Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Fix input method committingFrederik Gladhorn2013-11-061-1/+5
| | | | | | | | | | | | | | | | | | On mobile devices the virtual keyboard would in some situations not have words committed yet - this leads to the last word after a space being cut off when querying for the text property. Change-Id: I23d81154f3bed1dd287f24c3c5f958cf4335475c Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
View Lorry Controller Status