summaryrefslogtreecommitdiff
path: root/src/plugins/bookmarks
Commit message (Collapse)AuthorAgeFilesLines
* Contact -> qt-project.orgEike Ziller2012-07-197-21/+7
| | | | | Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Fix qbs code styleYuchen Deng2012-06-191-4/+1
| | | | | Change-Id: Ia3e4df528d391580064efbeeab75016335a4299d Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Add ActionContainer::addSeparator(...)Eike Ziller2012-06-051-8/+2
| | | | | | | Gets rid of a lot of code duplication. Change-Id: I2ce38fb38a0b61cb821e0bdc7bcc9a7ccdf9da72 Reviewed-by: hjk <qthjk@ovi.com>
* tr()-Fixes in master.Friedemann Kleint2012-05-281-0/+1
| | | | | | | | | - Add missing Q_OBJECTS - Clean up Android, fix capitalization, remove redundant translations. Change-Id: I24583b7e363ff8f90cad3b8257b676888e8a59db Reviewed-by: hjk <qthjk@ovi.com>
* ActionManager API cleanup.Eike Ziller2012-05-251-10/+9
| | | | | | | | d-pointer instead of inheritance static methods Change-Id: I7b2f0c8b05ad3951e1ff26a7d4e08e195d2dd258 Reviewed-by: hjk <qthjk@ovi.com>
* Mac: Avoid more Opt+<char> shortcuts.Eike Ziller2012-05-231-1/+2
| | | | | | Change-Id: I1f2ae70ed8b184be6d1467642924289af1b535a9 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Get rid of lots of ifdef Q_OS_MAC for shortcuts.Eike Ziller2012-05-231-15/+3
| | | | | | | Using a central enum now. Change-Id: I20d88c9a3f8c62cf33e4b89a3442269f71918b06 Reviewed-by: hjk <qthjk@ovi.com>
* editormanager: simplify use of interfacehjk2012-05-111-4/+1
| | | | | | | Less code on the user side, same meaning. Change-Id: I14e54a5d2ed8e024a51cce74eaf7c8419ad544be Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Merge remote-tracking branch 'origin/2.5'Eike Ziller2012-05-071-0/+2
|\
| * BaseTextMark: Use (explicit) two phase initilizationDaniel Teske2012-05-031-0/+2
| | | | | | | | | | | | | | | | | | Fixes a bug where the text in the bookmarks view is missing on initial adding a bookmark. Change-Id: Iefbf05e6124c0b4e911aa8d67beaa82ceeac8e21 Reviewed-by: hjk <qthjk@ovi.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* | qbs files: use Qt5 module dependenciesJoerg Bornemann2012-04-101-1/+1
| | | | | | | | | | | | | | | | | | | | Renamed gui -> widgets. Renamed declarative -> quick1. With qbs the usage of qt.widgets and qt.quick1 with Qt4 is supported. Change-Id: I6cadaf34527f1f880d74ced7d2d18dd9801b7de1 Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
* | Merge remote-tracking branch 'origin/2.5'Eike Ziller2012-04-052-1/+12
|\ \ | |/
| * BaseTextMark: Support renaming filesDaniel Teske2012-04-052-1/+12
| | | | | | | | | | Change-Id: I8d712f76fca5d8f5ecad70f1485228e21c00648d Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* | Merge remote-tracking branch 'origin/2.5'Oswald Buddenhagen2012-03-082-7/+6
|\ \ | |/ | | | | | | | | needed due to QA-related changes. Change-Id: Ie29699fa9dc494dc3849175ccf9523377efcb1e9
| * CompileDaniel Teske2012-03-081-2/+2
| | | | | | | | | | Change-Id: If409190fd7e54d9461ab15a2ef546fb0a21cd646 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
| * Bookmark: Remove unused member m_fileInfoDaniel Teske2012-03-082-5/+4
| | | | | | | | | | Change-Id: Ic39bac854f4ca99ee342578262f9fd28baaf85fa Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* | Merge remote-tracking branch 'origin/2.5'Eike Ziller2012-03-081-2/+2
|\ \ | |/ | | | | | | | | | | Conflicts: src/plugins/remotelinux/startgdbserverdialog.cpp Change-Id: I69597e20d5372e9baf12ac09fc20d39406683f9e
| * Normalized connect()sRobert Loehning2012-03-061-2/+2
| | | | | | | | | | | | Change-Id: Id353ab140a46e06ffc3abf667ab3b234e749e17c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* | Port Qt Creator to the new plugin system of Qt 5.Friedemann Kleint2012-03-021-0/+1
|/ | | | | | | | | | - Add Q_PLUGIN_METADATA for Qt 5, use Q_EXPORT_PLUGIN for Qt 4. - Generate the Json files for Qt 5 from the pluginspec files by using a XSLT sheet. Change-Id: I8653f182ae7d61615971c093df10b84fb06c2172 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Marks: If there are more then 3 marks, paint the highest priorityDaniel Teske2012-03-011-1/+1
| | | | | | | | | Also make the mark area 2 pixels wider so that 3 marks fit. And adjust the priorities of marks, so that bookmarks and breakpoints are visible even if there are multiple tasks on the line. Change-Id: Ie8e3e7fa4db262c4243fb61772b6373ea283f1c9 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* qbs: CleanupOrgad Shaneh2012-02-281-4/+1
| | | | | | | | | * Removed utils, extensionsystem and aggregation dependencies for plugins that depend on Core * Capitalized Find and CPlusPlus Change-Id: I505e5f46976f26da47ad778860f103b173668b1c Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Bookmark: Use ITextMark::lineNumber() instead of tracking linenumberDaniel Teske2012-02-222-10/+4
| | | | | Change-Id: I476041991fbcc4a540f62d8221846375cdf52dea Reviewed-by: hjk <qthjk@ovi.com>
* add qbs filesJoerg Bornemann2012-02-201-0/+39
| | | | | Change-Id: If6bf71797ae81655d24a77e6badb86a77312af38 Reviewed-by: hjk <qthjk@ovi.com>
* Rename IFile->IDocument and FileManager->DocumentManagerEike Ziller2012-02-202-6/+6
| | | | | | | | And adapt the other API respectively. Change-Id: I1e04e555409be09242db6890f9e013396f83aeed Reviewed-by: Bill King <bill.king@nokia.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Fix BaseTextmark lineNumber trackingDaniel Teske2012-02-151-0/+1
| | | | | | | | | | | The following sequence would add the BaseTextmark to the wrong line: 1) Add a mark on line x 2) Move line x down by addign newlines above 3) Close and reopen the file => Mark would be readded to line x Change-Id: Ia5d580b5893331974fb908e367b74df69fbb6572 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Removed module names from #include directives.Erik Verbruggen2012-02-156-22/+22
| | | | | | | | Getting the #include directives ready for Qt5. This includes the new-project wizards. Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Optimize BaseTextMarkDaniel Teske2012-02-142-2/+1
| | | | | | | | | Instead of each BaseTextMark being a QObject and being connected to editorOpened, centralize that and distribute the signal to only the BaseTextMarks that need it. Change-Id: I3f2783c34a25d78aa335418236850436028bfdf3 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* SessionManager::loadSession inline impl functions and rewriteDaniel Teske2012-02-131-1/+1
| | | | | | | | | | | The order of actions and thus the state at which the signals are emitted has changed. The aboutToUnloadSession comes before the actual saving now. Also the aboutToLoadSession is after restoring values but before restoring projects and editors. Change-Id: I3eae66cffae970f00535d8d6e2bb11a6ca645456 Reviewed-by: hjk <qthjk@ovi.com> Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* SessionManager: More useless null checksDaniel Teske2012-01-311-10/+2
| | | | | Change-Id: Ice94b56ffda04babbb66317f77d5b121f72b051f Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* Long live the king!hjk2012-01-267-7/+7
| | | | | Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* Replace Q_WS_MAC with Q_OS_MAC.Morten Johan Sorvig2012-01-261-3/+3
| | | | | | | | | | | | | | | We want to carry over all mac-specific code paths to Qt 5. WS_MAC is no longer set; OS_MAC is. This change is compatible with Qt 4 builds since OS_MAC is set whenever WS_MAC is. (OS_MAC would also be set for the theoretical X11/Mac platform, but that's anyway not a supported configuration for Creator) Change-Id: Ib25d8c4e83e7e27d911124cd48aa17fdb875923f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Use new static ICore interface.hjk2012-01-242-5/+4
| | | | | Change-Id: I9b690d9b150c8d162b15370f9f8986267c9128f1 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* Showing native dir separators in bookmark tooltip.Alessandro Portale2012-01-091-1/+2
| | | | | | | To me, forward slashes still look strange on Windows. Change-Id: I68926de965f94963ccfe71e2040cb0c75c0d05ac Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
* Editor: Bookmark when Shift-clicking the gutterLeandro Melo2011-12-023-4/+20
| | | | | | | Task-number: QTCREATORBUG-2852 Change-Id: If539f812bce76c1c1e7b63e7133e2a7c962990ea Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Merge remote-tracking branch 'origin/2.4'Eike Ziller2011-11-117-14/+14
|\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/libs/qmljs/qmljsinterpreter.cpp src/libs/qmljs/qmljsinterpreter.h src/plugins/debugger/qml/scriptconsole.cpp src/plugins/git/gitplugin.cpp src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas.cpp src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas_p.h Change-Id: Iad59c8d87c72a21c79c047e374c0ab689998af39
| * all: s/info@qt.nokia.com/qt-info@nokia.com/hjk2011-11-037-14/+14
| | | | | | | | | | Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* | use Core::Id for ids in INavigationWidgetFactoryhjk2011-11-102-3/+3
|/ | | | | Change-Id: Ic793e01edf6a4d2fe61baadb3aa5bef817436d35 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* s/error_message/errorMessage/ghjk2011-09-211-1/+1
| | | | | | Change-Id: I9a91028fb7c00a20843d99ece659ec8b7acc7710 Reviewed-on: http://codereview.qt-project.org/5312 Reviewed-by: hjk <qthjk@ovi.com>
* core: rename uniqueidmanager.{cpp,h} as the class UniqueIdManager is gonehjk2011-09-051-1/+1
| | | | | | | Change-Id: Iffe04bc3bb0103cbac605f0734bbfd66eb7fd854 Reviewed-on: http://codereview.qt.nokia.com/4215 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: hjk <qthjk@ovi.com>
* Highlight matches when opening editor from advanced text search.Eike Ziller2011-08-091-1/+3
| | | | | | | | | | When you close the search pane it will remove the highlight, even if the find tool bar is open with a different search, though. Task-number: QTCREATORBUG-2606 Change-Id: I7defe15c844d37ae80ab66c6b9e68e1ef1afdf92 Reviewed-on: http://codereview.qt.nokia.com/2786 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* debugger, bookmarks: use char[] for string constantshjk2011-07-151-11/+11
| | | | | | Change-Id: I2ef319e4556da1b93ae82afd597e0445d1f81d8d Reviewed-on: http://codereview.qt.nokia.com/1692 Reviewed-by: hjk <qthjk@ovi.com>
* Fix/add copyright headersTobias Hunger2011-05-067-7/+7
| | | | Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
* Merge branch '2.2'Oswald Buddenhagen2011-04-147-98/+91
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/debugger/gdb/pythongdbengine.cpp src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.h src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.cpp src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.h src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.cpp src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp src/plugins/qt4projectmanager/qt-s60/qt4symbiantargetfactory.cpp src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp src/plugins/qt4projectmanager/qt4target.cpp src/plugins/qt4projectmanager/qt4target.h src/plugins/qt4projectmanager/qtoptionspage.h src/plugins/qt4projectmanager/qtversionmanager.cpp src/plugins/welcome/welcomemode.cpp
| * Update license.hjk2011-04-137-98/+91
| |
* | core: make context and widget IContext data membershjk2011-04-142-20/+5
| |
* | bookmarks: minor style changeshjk2011-04-062-6/+5
| |
* | texteditor: simplify basetextmark architecturehjk2011-03-212-10/+4
|/ | | | | | | | | | | | ITextMark is not abstract anymore and has an icon and a priority. This means separate breakpoint and location marker classes that are only "plain" marks with icons and priorities are not needed. BaseTextMark directly inherits from ITextMark, instead of owning an ITextMark derived InternalMark. Also, there is now ITextMark::paint() to make it a bit more flexible then icon()[->paint()]
* texteditor: give priorities to mark to ensure z-order when drawinghjk2011-03-021-0/+1
|
* texteditor: merge ITextEditable into ITextEditorhjk2011-02-221-1/+1
| | | | | | | | rename BastTextEditor->BaseTextEditorWidget, BaseTextEditorEditable->BaseTextEditor rename BaseTextEditor{,Widget} subclasses rename editableInterface->editorInterface rename createEditableInterface->createEditor minor cleanups after renamings
* It's 2011 now.con2011-01-128-8/+8
| | | | Reviewed-by: hjk
View Lorry Controller Status