summaryrefslogtreecommitdiffstats
path: root/tools/designer
Commit message (Collapse)AuthorAgeFilesLines
* 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
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-10-119-45/+45
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (48 commits) qmake: delete .pdb file when making 'distclean' instead of 'clean' qmake: pass include directories to MS resource compiler use specified pkg-config qmake/symbian: Add icons with backslashes in pkg files Make qtconfig help messages translatable remove exec bits again ... Add TIFFClose to QTIffHandler::option() to avoid memory leak [QCocoaView scrollWheel:] can end up recursing infinitely when a scrollWheel event is sent to two stacked MDI windows Added missing QtWebKit example files and some whitespace fixes. Added missing native separator transforms. Doc: tuning search reasult box qdoc: Don't generate html output for png files. Doc: Correcting Windows CE 6.0 to Windows Embedded CE 6.0 Doc: correcting bug - lenght() pointed to setLength() in "See also" section. Correct link is resize() Doc: correct spelling Doc: correcting spelling - qdbusxml2dcpp to qdbusxml2cpp Doc: correcting grammar on the installation pages Doc: correcting broken link to labs Doc: adding note to function QWSKeyboardHandler::processKeycode - that it was added in Qt 4.6 Doc: correcting typo ...
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-10-089-45/+45
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (38 commits) Doc: tuning search reasult box qdoc: Don't generate html output for png files. Doc: Correcting Windows CE 6.0 to Windows Embedded CE 6.0 Doc: correcting bug - lenght() pointed to setLength() in "See also" section. Correct link is resize() Doc: correct spelling Doc: correcting spelling - qdbusxml2dcpp to qdbusxml2cpp Doc: correcting grammar on the installation pages Doc: correcting broken link to labs Doc: adding note to function QWSKeyboardHandler::processKeycode - that it was added in Qt 4.6 Doc: correcting typo Doc: Fixing bug - line too long and not visible. Breaking the line in two Doc: Fixing typo Doc: Fixing snippet bug. Path pointing to the wrong snippet Doc: Fixed doc references to non-existing API Doc: Fix broken links in QSslConfiguration Added a project file for the Getting Started with QML and changed the Clarified the auto connect enumeration regarding which type of Added installation section and fixed some whitespace. Doc: Fixing spacing bug in columns Doc: Fixing bug in QML tutorial ...
| | * 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 a crash when copying empty page-based containers.Friedemann Kleint2010-10-111-5/+12
|/ / | | | | | | | | Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com> Task-number: QTBUG-14208
* | ActiveQt: also make the designer plugin for qaxwidget build in the ↵Patrick Spendrin2010-10-071-1/+1
|/ | | | | | | opensource versions Reviewed-by: Olivier Goffart Merge-Request: 843
* Designer: Minor BT issue: '-' button in Signal/Slot editor not updated.Friedemann Kleint2010-09-231-1/+1
| | | | Reviewed-by: Carlos Manuel Duclos Vergara <carlos.duclos@nokia.com>
* I18n: Fix some lupdate warnings.Friedemann Kleint2010-09-141-2/+4
|
* Tools (uic/rcc): Improve warning messages.Friedemann Kleint2010-09-071-1/+0
| | | | | | | | | Output as 'filename: Warning: message' and make some uic warnings more verbose to make Qt Creator parsing easier. Fix resource warning in Qt Designer. Reviewed-by: dt Rubber-stamped-by: Tobias Hunger <tobias.hunger@nokia.com>
* 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-017-23/+23
| | | | | Merge-request: 2456 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Remove unused source files in designerVictor Ostashevsky2010-08-313-170/+1
| | | | | Merge-request: 2463 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
* Fix the remote command delimiter, this has cahnged at some point.kh12010-08-041-1/+1
| | | | | Task-number: QTBUG-12485 QTBUG-12651 Reviewed-by: ck
* more fine-grained ts targetsOswald Buddenhagen2010-07-151-13/+0
| | | | | | | | | there are now per-language ts-<package>-<lang> and ts-<lang> targets to update only the files relevant for a given language. there is also a ts-all target which does what the old ts target did. the ts-<package> targets are now named ts-<package>-all and should not be used manually - they exist for the convenience of the ts-all target. the ts target is now only a help blurb.
* remove redundand translations project filesOswald Buddenhagen2010-07-123-142/+13
| | | | | | lupdate is now powerful enough to use the real project files. this avoids that the file lists run out of sync (which they did, though not as much as i expected).
* make projects lupdate-friendlyOswald Buddenhagen2010-07-125-15/+15
| | | | | | 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-024-3/+8
| | | | | | | 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
* designer: add sorting in signal-slot editor windowMarek Wieckowski2010-06-092-3/+9
| | | | Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* 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
* REG 4.7: Edit widgets icon no longer in toolbar.Friedemann Kleint2010-05-121-0/+1
| | | | | Task-number: QTBUG-10626 Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
* 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 compile warning.Friedemann Kleint2010-04-191-1/+1
|
* Remove statically allocated pixmaps through the post routineJarek Kobus2010-04-141-4/+14
| | | | | | | | In order to avoid native pixmap object leaking remove statically allocated pixmaps through the post routine. Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Task-number: QTBUG-9815
* Fix writing duplicate headers' properties in designer.Jarek Kobus2010-04-132-65/+0
| | | | | | | | | | | Designer has written verticalHeaderVisible property in ui file twice: once done implicitly while saving the fake properties and once done explicitly inside QDesignerResource by calling saveWidget(QTableView/QTreeView). The latter is removed as it is redundant now. Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Task-number: QTBUG-9351
* 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
* Use unifiedToolBarOnMac, by default don't show some tool action.Jarek Kobus2010-04-134-1/+43
| | | | | | | | | | Some tool actions are hidden by default (undo/redo, cut.copy.paste), the user can bring them back by using View|Toolbars|Configure Toolbars dialog. Reviewed-by: Jens Bache-Wiig <jbache@trolltech.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
* 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>
* Redesigned object and class labels for the Designer propertyeditorJens Bache-Wiig2010-03-242-12/+60
| | | | | | | | | | | We modified the label so that it gets its own row instead of squeezing it into the tool bar. This layout would usually not have room for more than short labels and looked rather unprofessional when used in Creator. The new label is properly elided. We also added a frame to distinguish it from the dock widget label. Reviewed-by: Friedemann Kleint
* Use more standard icons for standard actions in DesignerThorbjørn Lindeijer2010-03-232-3/+11
| | | | | | | | | | Added standard theme icons for Save As, Print, Close, Quit, Recent Files and Clear Recent Files. Also slighly optimize non-X11 platforms by not calling QIcon::fromTheme at all. Reviewed-by: Jens Bache-Wiig <jbache@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
* Merge remote branch 'origin/4.7' into oslo-staging-1Aaron McCarthy2010-03-191-4/+2
|\ | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-03-171-4/+2
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: (190 commits) Fixed Symbian applications with DESTDIR set. Removed a warning about generated rss files. Revert "Temporarily disable problematic dll." Fixed "Cannot install protected application" message on Symbian. Worked around a crash in the elf2e32 postlinker tool. Worked around case differences in Symbian^3 and Gnupoc. Enabled compilation of plugins again. Fixed a building bug where the DLL entry point was undefined. Moved UID2 processing from cpp code to profiles. Added rpp and rsg files to ignore filter. Moved two profiles to the correct directory. Fix build break caused by undefined symbol SetDialogPreference Temporarily disable problematic dll. Use the same concept for per-lib tweaks as armcc Consistently use the * in configure Symbian doesn't have large file support currently, just turn it off Remove largefile config test Make sure that we have all compile flags available always Enabled dependencies for .dso and .lib libraries only. Switched to using DEF_FILE, which is the official variable. ...
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-03-117-2/+236
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf qmake/generators/makefile.h qmake/project.cpp src/3rdparty/webkit/WebCore/WebCore.pro src/src.pro
| | * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-02-231-0/+2
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/features/symbian/qt.prf qmake/Makefile.unix qmake/Makefile.win32 qmake/Makefile.win32-g++ qmake/Makefile.win32-g++-sh qmake/generators/symbian/initprojectdeploy_symbian.cpp src/src.pro
| | * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵axis2010-02-191-1/+8
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge-with-qt-master Conflicts: qmake/generators/symbian/symmake.cpp
| | * \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵axis2010-02-189-129/+401
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge-with-qt-master Conflicts: mkspecs/common/symbian/symbian.conf qmake/Makefile.unix qmake/generators/makefile.cpp
| | * \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-02-167-12/+54
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure mkspecs/common/symbian/symbian.conf mkspecs/features/symbian/application_icon.prf qmake/generators/makefile.cpp qmake/generators/symbian/initprojectdeploy_symbian.cpp qmake/generators/symbian/symmake.cpp tools/assistant/tools/assistant/assistant.pro
| | | * \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-s60axis2010-02-165-21/+25
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/generators/symbian/symmake.cpp tests/auto/qlineedit/tst_qlineedit.cpp tests/benchmarks/benchmarks.pro
| | * | \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qtaxis2010-02-1254-103/+106
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf qmake/generators/makefile.cpp qmake/generators/symbian/symmake.cpp src/3rdparty/webkit/WebCore/WebCore.pro Conflict resolution was heavily based on manual application of commit 9cc4ae77a73bd28ff495f36f26dd87c78b76b976.
| | * | | | | | | Fix linking for armlinkThomas Zander2010-02-041-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | using LIBS += -LanyDir is wrong as that depends on 'ld' accepting -L the correct cross-platform approach is to use QMAKE_LIBDIR += anyDir
* | | | | | | | | 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-184-100/+116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | Use a toolbar for the designer property editorJens Bache-Wiig2010-03-171-1/+4
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes the designer plugin a little bit more consistent. It also helps cosmeticaly in creator as we get a better separation between the tool bar and the treeview. Reviewed-by: thorbjorn
generated by cgit v0.12 at 2024-12-27 09:18:24 (GMT)