summaryrefslogtreecommitdiffstats
path: root/tools/designer/src/lib
Commit message (Collapse)AuthorAgeFilesLines
* Designer/QFormBuilder::save(): Fix traversal of QGridLayout/QFormLayoutFriedemann Kleint2012-01-311-28/+95
| | | | | | | Remove redundant code in qdesigner_resource ass well. Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com> Task-number: QTBUG-13683
* Designer: Do not translate page object names of QMdiArea.Friedemann Kleint2012-01-311-2/+2
| | | | | | and page-based containers. Task-number: QTBUG-18244
* Designer: Specify 'notr' attribute for buttongroup name.Friedemann Kleint2012-01-311-0/+1
| | | | Such that the name does not show up in lupdate.
* Designer: Check for 0-spacing when loading grid settings.Friedemann Kleint2012-01-311-6/+14
| | | | Task-number: QTBUG-17542
* Update licenseheader text in source filesJyri Tahtela2011-05-13259-4343/+4343
| | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-03-221-2/+4
|\ | | | | | | | | | | Conflicts: doc/src/declarative/declarativeui.qdoc doc/src/examples/qml-examples.qdoc
| * Designer: Fix a bug affecting tab reordering of promoted tab widgets.Friedemann Kleint2011-03-151-2/+4
| | | | | | | | | | | | | | | | | | | | Event filter was added twice due to widget initialization being done twice caused by recursion of WidgetFactory::createWidget() in the case of a fallback to promotion when a custom widget plugin is missing. Task-number: QTBUG-18121 Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
* | Doc: Ensured that code snippets have appropriate file names.David Boddie2011-02-085-17/+17
|/ | | | | This helps them to be marked up correctly in cases where code markers are available.
* Fix a crash when undoing form layoutJarek Kobus2011-02-012-10/+15
| | | | | | | | | | | | | | In a rare case when breaking a layout might make widgets overlap, the internal heuristic failed when recreating an original layout during undo. Some widgets were removed from the grid. The patch fixes this heuristic (makes sure we don't remove other widgets). Creating a form layout from overlapping widgets works better now. Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Task-number: QTCREATORBUG-3616
* Update copyright year to 2011.Jason McDonald2011-01-10259-259/+259
| | | | Reviewed-by: Trust Me
* Workaround for QFileSystemWatcher regressionJarek Kobus2010-10-141-3/+3
| | | | | | | Don't call removePath() when it was not added before. Reviewed-by: con <qtc-committer@nokia.com> Task-number: QTBUG-14435
* Doc: Fixed the in-repository licenses for the documentation.David Boddie2010-10-049-45/+45
| | | | | | In the repository, we should always use the No Commercial license alongside the GNU Free Documentation License for documentation files.
* Designer: Fix action editor scrolling.Friedemann Kleint2010-09-061-2/+4
| | | | | | | | | In overwritten virtual QAbstractItemView::currentChanged, invoke base implementation. Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com> Task-number: QTCREATORBUG-2249
* Wrap translatable messages with tr() in assistant, designer and linguistVictor Ostashevsky2010-09-011-2/+2
| | | | | Merge-request: 2456 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Designer: Prevent rich text from being copied into style sheets.Friedemann Kleint2010-08-051-0/+1
| | | | | Reviewed-by: Lasse Holmstedt <lasse.holmstedt@nokia.com> Task-number: QTCREATORBUG-1952
* make projects lupdate-friendlyOswald Buddenhagen2010-07-121-5/+5
| | | | | | lupdate currently doesn't parse .qmake.cache, so it lacks QT_SOURCE_TREE. so use relative paths in include statements and (the relevant) include paths instead.
* Designer: Fix compiler warnings.Friedemann Kleint2010-07-022-3/+6
| | | | | | | Warnings introduced by 312c028d44a80f5d6029eb166a0de731f8452525 and gcc 4.5. Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
* Prohibit some property names to be used for dynamic propertiesJarek Kobus2010-06-221-0/+4
| | | | | | | | Since they are used internally for some legacy stuff. We prohibit "groupButtonId" and "database". Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Task-number: QTBUG-11584
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-06-211-1/+16
|\
| * Designer: Prevent QButtonGroup from being added for Q3ButtonGroup.Friedemann Kleint2010-06-211-1/+16
| | | | | | | | | | | | | | The internal QButtonGroup used by Q3ButtonGroup interferes with saving mechanism for QButtonGroup (introduced in 4.5). Reviewed-by: Jarek Kobus <jkobus@trolltech.com> Task-number: QTBUG-11431
* | Doc: Relicensed the documentation under the GNU FDL version 1.3.David Boddie2010-06-219-225/+99
|/ | | | | Reviewed-by: Trust Me Requested-by: Legal
* Remove obsolete and broken qvfb skins.Jason McDonald2010-05-192-4/+1
| | | | Reviewed-by: Trust Me
* Fix cosmetic issue in designer filter editsJens Bache-Wiig2010-05-181-1/+1
| | | | | | | This makes the icon position similar to Qt Creator and more consistent. Reviewed-by: trustme
* Backport a fix to Designer filterwidgetJens Bache-Wiig2010-04-292-3/+3
| | | | | | | Using static here is obviously incorrect as the animations are done per widget. Reviewed-by: danimo
* Backport a few fixes to the Designer filteredit from CreatorJens Bache-Wiig2010-04-201-4/+10
| | | | | | | First problem is that there are too many animations triggered. Second problem is that it doesnt reflect the disabled state. Reviewed-by: thorbjorn
* Fix dealing with the default dynamic properties of string type.Jarek Kobus2010-04-131-7/+15
| | | | | | | | Fixed showing, changing and resetting of default dynamic properties of string and keysequence type. Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Task-number: QTBUG-9603
* Designer: Fix broken resource view filtering.Friedemann Kleint2010-03-261-1/+1
| | | | | | | Another side effect of 62c72ed2fd4aa6f5e62a190abf2dde2ba0f5ff0b . Task-number: QTBUG-9262 Initial-patch-by: Jarek Kobus <jkobus@trolltech.com>
* Designer: Fix broken resource view.Friedemann Kleint2010-03-231-1/+2
| | | | | | Resource handling broken as a side effect of 62c72ed2fd4aa6f5e62a190abf2dde2ba0f5ff0b . Task-number: QTBUG-9262
* Dont force height for filter widgetJens Bache-Wiig2010-03-181-7/+0
| | | | | | This had some negative side effects when used in Qt Creator and since the kde icon now fits nicely without this workaround I will remove it for now.
* Redesigned filter widgetsJens Bache-Wiig2010-03-182-100/+115
| | | | | | | | | | | | | | | | I redesigned the filter widget so that the reset button is contained within the line edit and only shown when edited. This is typically what KDE and GNOME does. The base icon also changed to use platform dependant icons on X11 and a new clear icon for other platforms. Since hinttext is now a feature of QLineEdit, I could safely remove this code as well. Unfortunately Oxygen is reporting incorrect contents margins for line edits. In essence it incorrectly offsets the frame so I had to add some magic to support that in particular. Reviewed-by: ogoffart
* Apply the stdset attribute for resource propertiesJarek Kobus2010-03-151-3/+8
| | | | | | | | In case of resource property we recreate a dom property using resource builder. We had forgot to apply stdset attribute for that case. Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Task-number: QTBUG-8881
* Fix compileJarek Kobus2010-03-041-0/+1
| | | | Missing header added
* Make QLabel::text a reloadable propertyJarek Kobus2010-03-043-2/+15
| | | | | | | | | | | | | In this way we can correctly load / reload a label in case it contains a rich text with a reference to the image taken from resources. Since QLabel::setText() ignores the call in case we try to set the same text, we force the reload by setting the empty string in between. For performance reasons we do it only in cases when the text value contains :/ (only in this case it might have a reference to the resources). Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Task-number: QTBUG-8347
* Designer/Resourceview: Suppress warning about QFileInfo on empty path.Friedemann Kleint2010-02-191-0/+2
|
* Designer:Fix undo crash caused by special handling of key move.Friedemann Kleint2010-02-164-28/+64
| | | | | | | | | Remove special handling and storing of commands. Customize SetPropertyCommand such that it is able to perform a transformation of the new value., thus, the same (relative) distance can be used on all widgets and the normal command merging mechanism can be used to merge subsequent moves correctly. Task-number: QTBUG-8213
* Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-125-21/+25
|\
| * Fix warnings ~QX11PixmapData(): QPixmap objects must be destroyed..Friedemann Kleint2010-02-095-21/+25
| | | | | | | | | | Reviewed-by: Trond Kjernåsen <trond@trolltech.com> Task-number: QTBUG-8046
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-02-083-5/+29
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1: A few trivial optimizations Rewrote bookmark handling, the previous code was just plain awful. Small style cleanup. Fix some warnings. Designer: Emit QDesignerPropertyEditorInterface::propertyChanged(). Designer: Support the 'windowOpacity'-property for forms. Expanded tst_QFileSystemModel::rootPath() to check directories ending in "." or ".." Assistant: Treat "unfiltered" filter in a apecial way. Assistant: Give meaningful context to translations. Fixed handling of paths containing ".." in QFileSystemModel on Windows. QAbstractItemModel docs: Fix typo. Assistant: Eliminate private tr contexts.
| * Designer: Emit QDesignerPropertyEditorInterface::propertyChanged().Friedemann Kleint2010-02-042-3/+21
| | | | | | | | | | | | | | | | | | Broken by introduction of new signal with extended parameters. Emit both signals and block against each other. Tested against Eclipse integration. Reviewed-by: Jarek Kobus <jkobus@trolltech.com> Task-number: QTBUG-7764
| * Designer: Support the 'windowOpacity'-property for forms.Friedemann Kleint2010-02-031-2/+8
| | | | | | | | | | Analogous to windowTitle, etc. Task-number: QTBUG-7822
* | Designer/uic/related examples: Fix source code scanning issues II.Friedemann Kleint2010-02-011-1/+1
| | | | | | | | | | Fix spelling errors, foreach()/QString usage, explicit constructors. Reviewed-By: Joerg Bornemann <joerg.bornemann@trolltech.com>
* | Designer: Fix source code scanning issues.Friedemann Kleint2010-01-2821-34/+34
|/ | | | | Fix spelling errors, foreach()/QString usage, explicit constructors. Reviewed-By: Joerg Bornemann <joerg.bornemann@trolltech.com>
* Designer: Fixed a crash when previewing in a non-existent style.Friedemann Kleint2010-01-211-0/+2
| | | | | Task-number: QTBUG-7432 Reviewed-by: Jarek Kobus <jkobus@trolltech.com>
* Update copyright year to 2010Jason McDonald2010-01-06259-259/+259
| | | | Reviewed-by: Trust Me
* Designer: Show actions in action editor in QKeySequence::NativeTextFriedemann Kleint2009-12-141-1/+1
| | | | | format as in Property editor and elsewhere for consistence. Task-number: QTBUG-6760
* Merge oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-11-1912-67/+75
|\
| * Ran the script utils/normalizeOlivier Goffart2009-11-1811-66/+66
| | | | | | | | Over src/ tools/ examples/ and demos/
| * QMenu: make the menu follow its parent/caused layout directionThierry Bastian2009-11-181-1/+9
| | | | | | | | | | | | | | The autotest are included Task-number: QTBUG-5884 Reviewed-by: ogoffart
* | uic/Designer: Use correct margin defaults for custom page-based containers.Friedemann Kleint2009-11-104-51/+62
|/ | | | | | | | | | | | | | | | | Designer-formbuilder/uic incorrectly considered custom containers that do not inherit a known page-based container (say QTabWidget) as instances of QLayoutWidget, giving them a default margin of 0. Add a check for the custom widget <container>-element to the checks for QLayoutWidget in uic/formbuilder. In the formbuilder, introduce a new data structure to store custom widget information instead of using 3 separate hashes. Adapt one autotest baseline (Qt 3). Reviewed-by: Jarek Kobus <jkobus@trolltech.com> Task-number: QTBUG-5335
* Designer: Fix potential crash when moving pages of a QTabWidgetFriedemann Kleint2009-10-271-0/+3
| | | | | | | ... which has movable=true, conflicting with its internal drag and drop. Introduce 'movable' as fake property. Reviewed-by: Jarek Kobus <jkobus@trolltech.com> Task-number: QT-1788