Commit Graph

1907 Commits

Author SHA1 Message Date
Daniel Teske
5c04b40860 Don't show the target setup page on adding a subproject
Task-number: QTCREATORBUG-7426
Change-Id: I69232c9cd924a701a5c7b48d124ed2319337ea02
Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
2012-07-03 14:01:17 +02:00
Francois Ferrand
4cac96447d Allow specifying line number when selecting a file with the locator.
When using the file selections locators (OpenDocumentsFilter, FileSystemFilter,
and those inherited from BaseFileFilter), allow specifying the line where to open
the file: like 'file.cpp:654'.

This syntax works for wildcards/incomplete expression as well: toto:423 will match
'toto', and open resulting file at line 423.

Also, fix line extraction in editormanager, to support a single semicolon (without
number) as well as a line explicitely set to 0.

Change-Id: I80e13b59aa9c972f33963cfee81ec04f277fe526
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-06-21 13:03:56 +02:00
Eike Ziller
e3c354d8f2 Make PluginManager mostly static.
Change-Id: Ib938aa4999c7c418a82304c5cca2e8748ef9d228
Reviewed-by: hjk <qthjk@ovi.com>
2012-06-19 16:11:40 +02:00
Yuchen Deng
0d20c5b796 Fix qbs code style
Change-Id: Ia3e4df528d391580064efbeeab75016335a4299d
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-06-19 11:22:40 +02:00
Christian Kandeler
74bedd0583 Message manager: Fix newline handling.
Appending it once is enough.

Change-Id: I6133e4240c3434bc4a08afdb15ad4a1f6416fee4
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-06-08 08:44:51 +02:00
Christian Kandeler
ffb19c510c Fix Core::Id cleanup.
qstrdup() uses new[] to allocate the array.

Change-Id: I014cfb697d792ff7bae5f1fdc58d8e6069f06e14
Reviewed-by: hjk <qthjk@ovi.com>
2012-06-07 18:37:18 +02:00
Eike Ziller
cdd44befff Add ActionContainer::addSeparator(...)
Gets rid of a lot of code duplication.

Change-Id: I2ce38fb38a0b61cb821e0bdc7bcc9a7ccdf9da72
Reviewed-by: hjk <qthjk@ovi.com>
2012-06-05 15:19:30 +02:00
Eike Ziller
ddc0c89bd6 Show warning with continue/cancel in case of many search results
Task-number: QTCREATORBUG-6116
Change-Id: I57a66b8989f1cc4137b02df370704dfe43d392ac
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-06-05 10:08:40 +02:00
kh1
a031d5f686 Sort the search hits to match the actual search term.
The former unsorted list would not fully match the search term,
while searching for QString the actual top hit would be somewhere
in between other search results instead of position one. Make sure
to remove duplicates from the search hits.

Task-number: QTCREATORBUG-5167

Change-Id: I640c3e8d5a5498c5a13c083370a961f458576da5
Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
2012-06-04 12:15:46 +02:00
Eike Ziller
b7c34292f4 Merge remote-tracking branch 'origin/2.5'
Conflicts:
	tests/system/objects.map

Change-Id: Ie6aed14f2f61111d26498ff3684ea4a57e6da59e
2012-06-01 14:06:24 +02:00
Daniel Teske
a97d144a33 Start auto save session timer later and let it occur more then once
Fixes regressions introduced by f059018a8e

Change-Id: I9d590580a9d36ac6980a6d170a119ebe33819262
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-06-01 12:07:06 +02:00
Friedemann Kleint
753acdcf82 tr()-Fixes in master.
- Add missing Q_OBJECTS
- Clean up Android, fix capitalization, remove redundant
  translations.

Change-Id: I24583b7e363ff8f90cad3b8257b676888e8a59db
Reviewed-by: hjk <qthjk@ovi.com>
2012-05-28 00:23:29 +02:00
Eike Ziller
3934347fe9 ActionManager API cleanup.
d-pointer instead of inheritance
static methods

Change-Id: I7b2f0c8b05ad3951e1ff26a7d4e08e195d2dd258
Reviewed-by: hjk <qthjk@ovi.com>
2012-05-25 10:08:24 +02:00
Eike Ziller
71260c3167 Mac: Avoid more Opt+<char> shortcuts.
Change-Id: I1f2ae70ed8b184be6d1467642924289af1b535a9
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-05-23 16:21:36 +02:00
hjk
49ca1643db compile fix on non-mac
Change-Id: I5072f7185ebac9359202ed39463323eddcbc9ceb
Reviewed-by: hjk <qthjk@ovi.com>
2012-05-23 14:37:37 +02:00
Eike Ziller
1781617f8e Get rid of lots of ifdef Q_OS_MAC for shortcuts.
Using a central enum now.

Change-Id: I20d88c9a3f8c62cf33e4b89a3442269f71918b06
Reviewed-by: hjk <qthjk@ovi.com>
2012-05-23 13:47:13 +02:00
Eike Ziller
f6eefeb1d8 Mac: Allow searching for e.g. Cmd+E in shortcut settings.
The tree view shows the fancy special characters for the modifier keys,
so it's not possible to filter for them.

Change-Id: I3f0cab24afe8ccb9a95300e91eb1bc45a0e4313a
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-05-23 12:23:36 +02:00
Eike Ziller
611ed2f251 Rewrite the shortcut settings filtering.
Makes more sense now, is more generic (regarding nesting level), and
even is shorter.

Change-Id: I77ce34aa25655f6b2690964107f4cab018e1d66f
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-05-23 12:13:33 +02:00
hjk
f77cd29e54 IOptionsPage: replace virtual fuctions by data members
Change-Id: I8297df85109b67b79f90c33263a5dc7b89efbb60
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-05-23 10:48:04 +02:00
Eike Ziller
d8429000f0 Fix "New" dialog in dark themes.
Don't explicitly use white, use the "base" color.

Task-number: QTCREATORBUG-7435
Change-Id: I3fcfefd958857146b6f9b2ceef3376d2b582b807
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
2012-05-22 16:10:00 +02:00
hjk
cfa703c692 outputpanemanager: rework
Replace "title combobox" and add a "manage" button.

Change-Id: I5453197b207000e6987b7dffd1858facb4b7f32e
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-05-22 13:12:39 +02:00
hjk
a4f486b8fb manhattanstyle: don't use defines for constants
Change-Id: I19a9b86c37dfcd1be7451d6fe67322a833d7b322
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-05-21 10:09:27 +02:00
Eike Ziller
f1c77a8349 Fix closing document when split and two documents are open.
If one had two documents open, but the same document visible in both
split views, closing the document would lead to an empty view and
strange behavior of the close button while in that state.

Task-number: QTCREATORBUG-7361
Change-Id: I3c0673a82b9d11700326a946a04984a2d6d58fe8
Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
2012-05-21 08:57:20 +02:00
Eike Ziller
d8a0b025b4 Remove dead code.
Change-Id: I693fa221027a10c739bde0d27813a57fefbf836f
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-05-16 14:10:46 +02:00
Eike Ziller
6e7e6acba4 Remove some old TODO items
Change-Id: I43c893176e5a83530f909371fc143dbb0cafd3ba
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-05-16 14:10:01 +02:00
Tobias Hunger
60191a68dc Make ids handle unicode strings
This should not have any effect on existing ASCII-only ids (not
even when it comes to conversion costs), but will make sure that
ids generated from user data (file names, etc) will work.

Change-Id: I0a086ad433190a038f20fe3f98f525ad8c56db81
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-05-16 11:50:54 +02:00
Christian Kandeler
69530f76aa Core: Add "canceled" signal to class FutureProgress.
This allows clients to get notified that the operation has been canceled
by the user without the need to create an additional QFutureWatcher
themselves.

Change-Id: I928f87eef98ce762d77dcc6962c082fe49f38f6e
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-05-15 14:23:12 +02:00
kh1
d762373b95 Make it possible to Show/Hide the sidebar in help mode.
Task-number: QTCREATORBUG-1533

Change-Id: I0ac767db5bcbda12a9d8ba1572ee75881308d0d0
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-05-11 15:14:07 +02:00
hjk
21bf0046c3 editormanager: simplify use of interface
Less code on the user side, same meaning.

Change-Id: I14e54a5d2ed8e024a51cce74eaf7c8419ad544be
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-05-11 13:51:14 +02:00
Konstantin Tokarev
8bad963dee Show editor display names in "Open With" dialog instead of their Id's.
Change-Id: I5cf7b5b53ce05b422aec87f7cf347670133a81a9
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-05-10 18:45:38 +02:00
Friedemann Kleint
ea96c245ce Fix compilation with Qt 5/Windows.
- Adapt to qpa change,
  qtbase:36547f4eff44361f7a6acd0cff107c0e47561f93.
- Implement the progress bar icon for Qt 5/Windows.

Change-Id: I42def27fb5e05a6227ce56dd580a5e669d211855
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-05-09 16:45:59 +02:00
hjk
cad2966498 use Core::Id for IMode::id and IMode::type
Change-Id: Ic7ce5b883e054c6eeba078327042e99e1c556345
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-05-08 10:18:12 +02:00
Christian Kandeler
dfcd427900 Fix compile warning on non-Mac platforms.
Change-Id: I46d0cabe5883269c286a7d0078479c7ed2d3485f
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-05-07 08:38:34 +02:00
Daniel Teske
ceaa99c270 Remove FIXME, there's nothing to fix there
The OutputPane::instance() is explicitly deleted, thus it should not be
deleted via qobject parent/child deletion.

Change-Id: I481e8413ce425298631278049b3fb4fabb3abcd2
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-05-03 17:08:51 +02:00
Eike Ziller
b0e902a7ee Fix warning.
Change-Id: I277d036e9652b5558b5cd39c5a3075af458209e8
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-05-03 13:42:27 +02:00
Tobias Hunger
1cc3a5ecd9 Core: Clean up context
Move the context code into its own implementation file (from id.cpp)

Change-Id: I5e487e0ab0a9b3a33ef32f2d5b7a5d703bded099
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-05-03 13:28:26 +02:00
Eike Ziller
b1216cf376 Merge remote-tracking branch 'origin/2.5'
Conflicts:
	src/plugins/coreplugin/mainwindow.cpp

Change-Id: I975a4208588d174ebb44054de56c5ac8d7c878fe
2012-05-02 13:53:46 +02:00
Daniel Teske
f059018a8e Stop the autosaving session timer on closing Creator
Change-Id: I3b9c791d95d7815a711f72cec08f405fb1cdac7c
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-05-02 12:24:12 +02:00
Eike Ziller
359b0a092b Mac: Build menu stays disabled with Qt 4.8.1 and later
Works around QTBUG-25544

Change-Id: I136aaa403f78e9c3903abc013c3267bc3585f54b
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-05-02 12:19:35 +02:00
Bradley T. Hughes
fb9146a9c3 Compile after qt5/qtbase commit 75a0c7f9
Commit 75a0c7f9b52cde47f20fdc1b89e1264d60350848 in qt5/qtbase changed
some QRegExp methods to be non-const (they were previously const). This
change makes Qt Creator compile again.

Change-Id: Ibc98c678126c3b3189df7fcc043463b940951445
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-04-30 14:32:08 +02:00
Friedemann Kleint
2193915cca Start on a gerrit plugin as a sub-plugin of git.
- Add a gerrit window that shows a list of changes
  and buttons to display, apply or check out
  a change.
- Uses the new Qt 5 Json API or the utils/json
  classes for Qt 4.

Tested-by: Tobias Hunger <tobias.hunger@nokia.com>
Tested-by: Orgad Shaneh <orgads@gmail.com>

Change-Id: I14c6c2c2de8f95fb785752c7319be8638b386a1e
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-04-26 14:34:41 +02:00
Tobias Hunger
df5dab6382 Use Core::Id in project-related objects
Use Core::Id for all the project related objects in favor of plain
QStrings.

Change-Id: I790ab40cb29899efdb49c413a77609486f52e683
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-04-25 11:49:19 +02:00
Eike Ziller
f10ae79263 Move ieditorfactor.cpp and fix qbs build.
Change-Id: I6d1f6bbbc3fef66705b6f0e913857517d125dd1b
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-04-19 17:49:26 +02:00
Oswald Buddenhagen
822233629d Merge remote-tracking branch 'origin/2.5'
Conflicts:
	qtcreator.pri
	src/libs/utils/utils.qbs
	src/plugins/projectexplorer/miniprojecttargetselector.cpp
	src/plugins/qmljseditor/qmljseditor.qbs
	src/plugins/qmljsinspector/qmljsinspector.qbs

Change-Id: Ib239d50c21cb06d3a8e821e03dc093552f40ffab
2012-04-19 16:13:09 +02:00
Joerg Bornemann
0834958063 qbs files updated
Property bindings in ProductModules now need explicit Depends items.
Also, some Qt dependencies were propagated wrongly and are now
added explicitely.

Change-Id: I58cd389eb0ab106004b1d575438d1ad2ff36189f
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
2012-04-18 17:10:55 +02:00
Marco Bubke
56cf850b21 Fix wrong names in the UI
Change-Id: I6635b3a91eed4d34bb477aaeac37709e15059e06
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
2012-04-18 13:32:57 +02:00
Konstantin Tokarev
ec38c829a7 Added default implementation for IEditorFactory::open().
This change allows to avoid massive code duplication along editors.

Change-Id: Ifdc6ae4b44ab399d34193ab8dddfa1f76d65ad11
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-04-18 12:15:56 +02:00
Kai Koehne
979d8f4d2b Core: Fix msvc warning about strdup being deprecated
"warning: C4996: 'strdup': The POSIX name for this item is deprecated.
Instead, use the ISO C++ conformant name: _strdup."

Change-Id: Ic2335664c4d2baf74eaa201ba4a85e8af3575bfb
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-04-17 10:50:23 +02:00
hjk
5b0bf61640 qtcassert: move actual printing to separate function and enforce style
This also allows simple setting of breakpoints on failed asserts.

Change-Id: I6dd84cbfaf659d57e39f3447386cebc0221b2b84
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-04-17 09:53:44 +02:00
Joerg Bornemann
d6465142eb qbs files: build with Qt5
Help plugin and QmlDesigner have been disabled for Qt5.

Change-Id: I9345d0fd00f9a575333dc972cc7adbdf146cd6cb
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-04-10 18:03:37 +02:00