summaryrefslogtreecommitdiffstats
path: root/tools/designer/src
Commit message (Collapse)AuthorAgeFilesLines
* Fix the remote command delimiter, this has cahnged at some point.kh12010-08-051-1/+1
| | | | | | Task-number: QTBUG-12485 QTBUG-12651 Reviewed-by: ck (cherry picked from commit 2838cfa7809e6b196a1ee1eb71df5894fc57dd6f)
* 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-166-12/+53
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1253-103/+105
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | 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
* | | | | | | QDeclarativeView: Add a Designer plugin.Friedemann Kleint2010-03-024-0/+220
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Jarek Kobus <jkobus@trolltech.com> Acked-by: akennedy <qt-info@nokia.com>
* | | | | | Designer/Resourceview: Suppress warning about QFileInfo on empty path.Friedemann Kleint2010-02-191-0/+2
| |_|_|_|/ |/| | | |
* | | | | Fix compilation with IBM xlC 7:Thiago Macieira2010-02-171-1/+8
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | "../../../../../include/QtCore/../../src/corelib/kernel/qmetatype.h", line 202.49: 1540-0062 (S) The incomplete class "QMetaTypeId<qdesigner_internal::ArrowKeyOperation>" must not be used as a qualifier. So move the Q_DECLARE_METATYPE before the use. Reviewed-By: hjk <qtc-committer@nokia.com>
* | | | Designer: Fix compile for namespaced qt.ck2010-02-164-8/+8
| | | |
* | | | Designer: Implement isDirty()-handling using a QUndoStack.Friedemann Kleint2010-02-165-40/+225
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove Designer-specific handling of isDirty() due to its bug-proneness, use instead an extended QUndoStack.that allows for setting to 'dirty' without commands for some special cases. Task-number: QTBUG-8041
* | | | Designer:Fix undo crash caused by special handling of key move.Friedemann Kleint2010-02-166-90/+177
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-085-7/+32
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-043-5/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-032-2/+9
| | | | | | | | | | | | | | | | | | | | Analogous to windowTitle, etc. Task-number: QTBUG-7822
* | | | Merge remote branch 'origin/4.6' into qt-master-from-4.6Olivier Goffart2010-02-048-12/+11
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/assistant/simpletextviewer/findfiledialog.cpp qmake/generators/symbian/symmake.cpp tools/assistant/lib/qhelpgenerator.cpp tools/assistant/lib/qhelpsearchquerywidget.cpp translations/translations.pri
| * | | Designer/uic/related examples: Fix source code scanning issues II.Friedemann Kleint2010-02-018-12/+11
| | | | | | | | | | | | | | | | | | | | Fix spelling errors, foreach()/QString usage, explicit constructors. Reviewed-By: Joerg Bornemann <joerg.bornemann@trolltech.com>
generated by cgit v0.12 at 2024-11-27 08:40:33 (GMT)