aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/resourceeditor
Commit message (Collapse)AuthorAgeFilesLines
* ResourceNode: Fix matching on '/' nodeDaniel Teske2014-06-031-1/+1
| | | | | | | | A ResourceTopLevelNode should only prioritize it's own child '/' node. Task-number: QTCREATORBUG-12297 Change-Id: Ia9834d7111622d4558e1a2c21b602b11ff5db139 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* ResourceNodes: Fix adding to prefix '/' nodeDaniel Teske2014-04-071-0/+6
| | | | | Change-Id: I663fd2ae419e6bad990223dd5c2c38dd62e2f35c Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* ProjectTree: Change hasBuildTargets to FolderNode::showInSimpleTreeDaniel Teske2014-03-182-0/+6
| | | | | | | | So that the resource node can override it. Task-number: QTCREATORBUG-11678 Change-Id: Id30d1b99ee23cc18fc29fc99cf0ad7ca919ed527 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* ResourceNode: Remove unnecessary update() callDaniel Teske2014-03-141-4/+0
| | | | | Change-Id: Iea72f2cb02b6b983cb90d4dd09c5e0fc1f8c0c3f Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* ResourceNode: Fix renaming prefixDaniel Teske2014-03-131-1/+1
| | | | | | Task-number: QTCREATORBUG-11719 Change-Id: Ib24dd7bf644bbebca3d9a694ec2b98709cfd6cf2 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Fix warning about truncation from int to bool in resource editor.Friedemann Kleint2014-03-131-1/+1
| | | | | Change-Id: Id7ea03b27e9fd36e5f452736e81992089dfc73b5 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* use new base import style in qbs filesJoerg Bornemann2014-03-111-1/+1
| | | | | | Change-Id: Iecf32122df41f304ec6df538bb0dd8a263238a86 Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* resourceeditor: Make qrc-files' context menu more consistentRobert Loehning2014-03-111-2/+2
| | | | | Change-Id: I97e5354bc892194d34ba968b0428bbc3bfdcd11d Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* ProjectExplorer::New File Use addNewInformation also for context menuDaniel Teske2014-03-102-9/+25
| | | | | | | So that the resourcenode can steal from it's parent Change-Id: I97a21d94c0ddb0d217c48fd69dc808446763837b Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Resource editor: fix capitalization of UI textLeena Miettinen2014-03-071-2/+2
| | | | | Change-Id: I3ff91a79b046d053d6cf0fbc3f016eeb5393809a Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* Core: Make IEditor::id a value member and adjust usershjk2014-02-252-6/+1
| | | | | | Change-Id: I47e457c4a1821c515cd8a740d27bfe005a0c09e6 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Resource Editor: Add missing Q_OBJECT to PrefixLangDialog.Friedemann Kleint2014-02-241-0/+3
| | | | | | | src/plugins/resourceeditor/resourceeditorplugin.cpp:74: Class 'PrefixLangDialog' lacks Q_OBJECT macro Change-Id: I183f670dc851de043e0a16d6060c069a9393ec99 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* ResourceEditor: Remove unused static functionOrgad Shaneh2014-02-201-9/+0
| | | | | Change-Id: Idbf32158993f9f77c4f18e142a46b0e2ca132831 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* Fix qbs buildOrgad Shaneh2014-02-202-1/+4
| | | | | | Change-Id: Ia46ac9dfa010e623d71e77c50f84517db71338ec Reviewed-by: Christian Kandeler <christian.kandeler@digia.com> Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* Fix Qt4 buildOrgad Shaneh2014-02-191-0/+1
| | | | | Change-Id: Ib3cf2d36955ede2d119b67f1f664e456f2724d55 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Resource file in project treeDaniel Teske2014-02-199-2/+909
| | | | | | Task-number: QTCREATORBUG-1346 Change-Id: I0cbb5633ef06a4762c48af46d9da551c67259d70 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* ResourceEditor: Move code from ResourceModel to ResourceFileDaniel Teske2014-02-191-12/+19
| | | | | | | That class is reused by the ResourceNode. Change-Id: I743117f48b3e731365ebd5fa0cf7051f21466777 Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
* ResourceEditor: Small interface tweaks for ResourceNodeDaniel Teske2014-02-192-12/+43
| | | | | Change-Id: I13886ac8e8850efe312d101c154a6add70d780ec Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
* ResourceEditor: Remove even more dead codeDaniel Teske2014-02-182-71/+0
| | | | | Change-Id: I5b2f01b5cdf512f2cc125481f0db999d111c3a54 Reviewed-by: hjk <hjk121@nokiamail.com>
* ResourceEditor: Fix saving of multiple prefixes with different languagesDaniel Teske2014-02-182-20/+4
| | | | | | | Also fix the quadratic peformance. Change-Id: I7287bd23438b4b018a4bf8ee891a4532ec9b4ba8 Reviewed-by: hjk <hjk121@nokiamail.com>
* ResourceModel::changeLang(): Prevent duplicated prefixesDaniel Teske2014-02-171-0/+4
| | | | | | | | Do the same check as changePrefix Change-Id: I8edf6641295c9c38fbcc70fc5610dba275547b8a Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com> Reviewed-by: hjk <hjk121@nokiamail.com>
* ResourceEditor: A prefix is uniquely identified by prefix + languageDaniel Teske2014-02-172-19/+19
| | | | | | | | So add checks for language everwhere. Change-Id: Iba1035065f34d2008b53f1c73518eb5ad5c54850 Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
* ResourceEditor: Remove dead codeDaniel Teske2014-02-176-49/+0
| | | | | | Change-Id: I80456fb855d8af46bae79b77f60a61c31d76e219 Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
* ResourceEditor: Keep compress and threshold attributesDaniel Teske2014-02-172-0/+10
| | | | | | | | These aren't editable but at least keep them the same. Change-Id: I75a907c9523766de2ee671f150b1180ab60cfae9 Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com> Reviewed-by: hjk <hjk121@nokiamail.com>
* IWizard and derived classes: Code cleanupsTobias Hunger2014-02-134-31/+11
| | | | | | | | | | | | | | | There should be no functional changes, just removal of unnecessary code. This includes: * Removal of unused QObject *parent = 0 parameters to constructors * Removal of unnecessary explicits * Removal of unnecessary virtuals * Removal of unnecessary constructors/destructors Some explicits were added though where those were missing. Change-Id: Iab570349ea950dad0a2d01af17bc6175f70832f1 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Clean up single namespace forward-declarationsOrgad Shaneh2014-02-121-3/+1
| | | | | | | | | | | | | | | | | | Done using the following ruby script: Dir.glob('**/*.h').each { |file| if File.file?(file) s = File.read(file) t = s.gsub(/^namespace .+ \{\n\s*class .*;\n\s*\}.*$/) { |m| m.gsub(/\n\s*/, ' ').gsub(/\s*\/\/.*$/, '') } if t != s puts file File.open(file, 'w').write(t) end end } Change-Id: Iffcb966e90eb8e1a625eccd5dd0b94f000ae368e Reviewed-by: hjk <hjk121@nokiamail.com>
* Qbs/qmake: Fix dependencies of pluginsTobias Hunger2014-02-112-1/+6
| | | | | | | | | ... based on output from dependencyinfo.py script Change-Id: I9532f6d259f15c16b62fae0ca18f8a8cad95bd11 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com> Reviewed-by: Christian Stenger <christian.stenger@digia.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Core: Merge Find and Locator into Core pluginhjk2014-01-143-4/+2
| | | | | | | Change-Id: I7053310272235d854c9f409670ff52a10a7add8b Reviewed-by: Christian Kandeler <christian.kandeler@digia.com> Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Editors: Remove useless parent widget argument from create/duplicateEike Ziller2014-01-082-3/+3
| | | | | | | It was never called with a sensible value anyhow, and only complicates things. Change-Id: I005848700b6c00114d91495670d4a0e15a2d2e64 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Merge remote-tracking branch 'origin/3.0'Eike Ziller2014-01-0821-21/+21
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: share/qtcreator/debugger/dumper.cpp share/qtcreator/debugger/dumper_p.h share/qtcreator/debugger/test/main.cpp src/plugins/debugger/gdb/classicgdbengine.cpp src/plugins/debugger/gdb/pythongdbengine.cpp src/plugins/debugger/lldblib/guest/lldbengineguest.cpp src/plugins/debugger/lldblib/guest/lldbengineguest.h src/plugins/debugger/lldblib/guest/main.cpp src/plugins/debugger/lldblib/ipcengineguest.cpp src/plugins/debugger/lldblib/ipcengineguest.h src/plugins/debugger/lldblib/ipcenginehost.cpp src/plugins/debugger/lldblib/ipcenginehost.h src/plugins/debugger/lldblib/lldbenginehost.cpp src/plugins/debugger/lldblib/lldboptionspage.cpp src/plugins/qbsprojectmanager/qbsstep.cpp src/plugins/qbsprojectmanager/qbsstep.h src/plugins/qmlprofiler/canvas/qdeclarativecanvas.cpp src/plugins/qmlprofiler/canvas/qdeclarativecanvas_p.h src/plugins/qmlprofiler/canvas/qdeclarativecontext2d.cpp src/plugins/qmlprofiler/canvas/qdeclarativecontext2d_p.h src/plugins/qmlprofiler/canvas/qmlprofilercanvas.cpp src/plugins/qnx/blackberrycheckdevmodestep.cpp src/plugins/qtsupport/debugginghelper.cpp Change-Id: Ie9fd0a885fb6264a6a8a72daee071b75bcbd2e9d
| * Incremented year in copyright infoRobert Loehning2014-01-0821-21/+21
| | | | | | | | | | | | Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | DocumentManager: Merge {slotE,e}xecuteOpenWithMenuActionhjk2013-11-201-1/+1
|/ | | | | Change-Id: Ia84a428ace4d109a3577a100920c9ae5336cefe8 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* qbs project files: Make use of new qbsSearchPaths property.Christian Kandeler2013-10-091-1/+1
| | | | | Change-Id: I396d970fafea1fd0b4c4d73883796662a1d0064b Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Cleanup IWizard interface and usershjk2013-09-243-12/+10
| | | | | | | Added 639 lines, removed 1391. Change-Id: I15ec7dd056d4f7ad79c6dd6a4181007ad14f6a43 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Core: Clean up FileIconProvider interfacehjk2013-09-132-4/+2
| | | | | Change-Id: I98c3c8796cb887f5bb3c5184854562ff36727836 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Fix some include statements.Christian Kandeler2013-09-042-2/+3
| | | | | | | | In several places, it says '#include "..."' for headers from different libraries/plugins. Change-Id: I96cd74fef9b30163adefe3e1720e0847bed9553a Reviewed-by: hjk <hjk121@nokiamail.com>
* Kill ";;" at end of statementNikolai Kosjar2013-09-041-1/+1
| | | | | Change-Id: I177094f19978e07f85e42b34701d8f03cd26665e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Apply 'static' pattern to VcsManagerhjk2013-09-031-2/+1
| | | | | | | Adapt user and surrounding code. Change-Id: Id2648f82a9cbbd0ad0bfb91f6958b8cee7ea29cc Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Apply 'static' pattern to MimeDatabasehjk2013-09-031-1/+1
| | | | | | | | Also adjust and streamline using and surrounding code. Change-Id: I6a8b05126bdcbb74ff611b21c7cb3c5902a2d5ca Reviewed-by: Tobias Hunger <tobias.hunger@digia.com> Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Remove superfluous include paths from project files.Christian Kandeler2013-09-023-6/+1
| | | | | | | | | | | | | | | | | | | | A lot of our build system files specify unneeded include paths. These roughly fall into the following categories: a) Paths that are already set in more general files such as qtcreator.pri. b) Paths that serve no purpose at all, possibly left over from earlier versions of the project. c) Paths that act as workarounds for wrong include statements of the form '#include "xyz.h"', where xyz.h is not in the same directory as the including file. This patch removes such path specifications and fixes the offending include statements from case c). Tested on Linux, Windows and OSX with qmake and qbs. Change-Id: I039a8449f8a65df0d616b4c08081145c18ae4b15 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Qbs project files: Use groups wherever applicable.Christian Kandeler2013-08-211-22/+24
| | | | | | | Provides better structuring of source files. Change-Id: Ic2d0094312bb7c8da01a1f38270564407fdbefce Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* EditorFactory: Replace some virtual functions with data membershjk2013-08-022-22/+4
| | | | | Change-Id: I014cb57460c4e3a36bf7403960908b5ffec867ff Reviewed-by: David Schulz <david.schulz@digia.com>
* Move IEditor::createNew to IDocument::setContentsEike Ziller2013-07-172-16/+15
| | | | | | | | | The method is for setting the contents, so it belongs to the document, and should be named correspondingly. Change-Id: I40363dc08f11268f530885b512e4a88e8b10d096 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Move IEditor::isTemporary to IDocumentEike Ziller2013-07-121-1/+0
| | | | | | | | | It's a property of the document implementation, not of the specific editor instance working on it. Change-Id: I5c3dd054e21b646e2d94b891916a096d045923f8 Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Move displayName from IEditor to IDocumentEike Ziller2013-07-102-26/+22
| | | | | | | | The display name is not editor instance specific, but belongs to the document. Change-Id: I3c936f04a86e10e6ca30063d85036d85b4b5880e Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* Add QTCREATOR_COMPAT_VERSIONEike Ziller2013-07-091-1/+1
| | | | | | | | | | | Necessary for keeping compatibility within a minor series. When bumping versions, the compatVersion now needs to be taken into account too. Change-Id: I588947f885480889ff2f58481f72db76e3f1a9f1 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Christian Kandeler <christian.kandeler@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Rename IDocument::fileName --> filePathEike Ziller2013-07-092-9/+9
| | | | | | | That is what it actually is, wrt how Qt API calls it. Change-Id: Ied02055debf6aad75556b0d9d22e8ba2f72be555 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Make IDocument::fileName a member with setter.Eike Ziller2013-07-092-18/+15
| | | | | | | | | | Instead of requiring subclasses to implement a method. Also renames IDocument::rename to IDocument::setFileName, since it doesn't really rename any files or such. Change-Id: I1344025c24d2f74a6a983e04fb0a5245f1f37aad Reviewed-by: Daniel Teske <daniel.teske@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Core: Let IDocument also report failed file reload operationsNikolai Kosjar2013-06-241-3/+3
| | | | | Change-Id: I8fa02f2398f59306c49481316fdedf50a1c4e32f Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* Streamline mimetypes.xml filesOrgad Shaneh2013-06-072-3/+0
| | | | | Change-Id: I4f2a28d4732ea496f574e5f51fb1e1633ebca99d Reviewed-by: Eike Ziller <eike.ziller@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-21 04:24:28 +0000