Commit Graph

1907 Commits

Author SHA1 Message Date
David Schulz
1035224774 Editor: Fix: "Open File With..." with empty File
and no extension is now handled as a plain text file.

Task-number: QTCREATORBUG-7591
Change-Id: I21471315cb6144f27c374e0919fd16e62f7d8f2a
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2012-09-18 15:52:14 +02:00
Daniel Teske
77288af63e IdCache: Use delete[] for memory qstrdup allocated
Change-Id: Id39e31191116196e1a9385e0d22bef0bfbb6c861
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-09-13 17:38:03 +02:00
Daniel Teske
ff6e9333ad Make IOutputPane behaviour more granular
The commit looks big, but it's mostly trivial. Also any build/run
related popups are now "flashes" if the current mode has no placeholder.

Task-number: QTCREATORBUG-7875
Change-Id: I3af40557f7af01798f905c0d1829423c80058cb6
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-09-13 17:37:02 +02:00
Alessandro Portale
6c55cb458f Hide the Mode Tab Icons when they become too small
When resizing the Qt Creator main window to a smaller size, at some
point the mode tab icons will shrink to fit all tabs into the window.
The icon size will if necessary shrink to tiny sizes below 8px,
which is pointless.

Let's add some code that hides the icons when a tab becomes smaller
than a certain size.

Task-Number: QTCREATORBUG-7879

Change-Id: I590379a2ec52a8a86e998c08b29d54aca800e542
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
2012-09-13 15:35:53 +02:00
Oswald Buddenhagen
e730e2bb8a Merge remote-tracking branch 'gerrit/2.6'
Conflicts:
	src/libs/utils/environment.cpp
	src/plugins/android/androidtoolchain.cpp
	src/plugins/projectexplorer/gcctoolchain.cpp
	src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
	src/plugins/qtsupport/baseqtversion.cpp
	src/shared/proparser/qmakeevaluator.cpp

Change-Id: I554e96445a4d2b9ba0cc173ecd766091ee921aa2
2012-09-12 17:27:37 +02:00
Daniel Teske
91a9a2414d OutputPane: Flash the output button instead of switching to edit mode
That is if the current mode has no OutputPanePlaceHolder, then we don't
switch modes, but flash the button. Also if the button is not visible,
we make it visible. The button doesn't autohide though.

Task-number: QTCREATORBUG-7272
Change-Id: I5ceacd2a17d1ece744f28952819c34bfcfdd5e7b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-09-12 12:06:53 +02:00
Eike Ziller
5ac721dd58 Merge remote-tracking branch 'origin/2.6'
Conflicts:
	qtcreator.pri
	qtcreator.qbp
	src/libs/utils/utils.pro

Change-Id: I6f0aba746f915d8c51dcf9372f7d9f593562fc2b
2012-09-11 14:02:03 +02:00
Eike Ziller
b56b1c7d59 Revert "Introduce $$QTC_PREFIX instead of abusing $(INSTALL_ROOT)."
It depends on and mixes in changes made in another change on gerrit
that is not merged, so it breaks the package build.

This reverts commit c29bf6f652.

Change-Id: Ibb251150909271f3e119f05a1691832aae8ac633
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-09-07 10:02:40 +02:00
David Schulz
da14147f2c Editor: Set default editor file text encoding to UTF-8
because Qt5 requires it

Task-number: QTCREATORBUG-7420

Change-Id: I0823c4701d5f1fef202fb38e423275bb9d3a66fe
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-09-07 09:23:11 +02:00
Daniel Molkentin
c29bf6f652 Introduce $$QTC_PREFIX instead of abusing $(INSTALL_ROOT).
Reason: $INSTALL_ROOT is only meant to be used by packagers
to temporarily put the contents into a different location,
which is needed for fakeroot packaging.

QTC_PREFIX is not a qmake variable, and defaults to
/usr/local. On Windows the default prefix is "QtCreator",
since "make install" is expected to be used in
a packaging context only where either INSTALL_ROOT
should be used or QTC_PREFIX should be set to the
absolute destination path where e.g. an installer
generator will pick it up.

Change-Id: Ifa4950340e58e34726c53f5417adcc7b50828ce1
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-09-05 16:37:42 +02:00
Eike Ziller
887456e38a Merge remote-tracking branch 'origin/2.6'
Conflicts:
	src/plugins/madde/maemodeployconfigurationwidget.cpp
	src/plugins/madde/maemoglobal.cpp
	src/plugins/madde/maemoinstalltosysrootstep.cpp
	src/plugins/madde/maemopublisherfremantlefree.cpp
	src/plugins/madde/qt4maemodeployconfiguration.cpp
	src/plugins/qt4projectmanager/librarydetailscontroller.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp
	src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
	src/plugins/qt4projectmanager/qt4project.cpp
	src/plugins/qtsupport/baseqtversion.cpp
	src/plugins/remotelinux/abstractremotelinuxdeployservice.h
	src/plugins/remotelinux/deploymentinfo.cpp
	src/plugins/remotelinux/remotelinuxdeployconfigurationfactory.cpp
	src/plugins/remotelinux/remotelinuxrunconfiguration.cpp
	src/plugins/remotelinux/remotelinuxrunconfigurationfactory.cpp

Change-Id: I2560b528596f284e7b45a2260d8d3037891c5d17
2012-09-04 18:04:16 +02:00
Orgad Shaneh
1faea8a0b3 Read-only file dialog: Use VCS terms if applicable
Also add keyboard accelerators

Change-Id: Icea8af6af7e5d94623ba7782c375977bbab17f22
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-09-04 16:02:23 +02:00
Hüseyin Kozan
a753126959 Close opened files by middle click.
Change-Id: I548c62d6a043677e3989ec9f9082f2dcd731fae1
Reviewed-by: Dmitry Savchenko <dmitry.a.sav@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-09-03 09:46:30 +02:00
Oswald Buddenhagen
a32e243e61 Merge branch '2.6'
Conflicts:
	src/libs/utils/consoleprocess_unix.cpp

Change-Id: I196f61e882bfce94e165d9c724bffee9df1011b7
2012-08-30 20:43:02 +02:00
Friedemann Kleint
5c4fddc6a5 Detect Linux terminal by checking a number of known terminals.
Change the behaviour of defaultTerminalEmulator() to already
return the run option in line with terminalEmulator().

Change the QLineEdit in settings to an editable
combo offering the available terminals.

Change-Id: I333ef08ad06934bcd9fcafb50ff1eced1af6293a
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@nokia.com>
2012-08-30 15:49:40 +02:00
Tobias Hunger
f47a916c53 Save settings on mode changes
This partly addresses QTCREATORBUG-7754: Settings are lost way less
often this way. We do not really want to save whenever settings might
have been touched, so this seems like a good compromise to me.

Most modes at least have some view specific settings that need saving,
so lets just save everything on each mode change. Settings are only
written to disk if they really changed nowadays, so this should be fine.

Task-number: QTCREATORBUG-7754
Change-Id: I26ae18cae38754da6c79a8b870ffae2e681db7c1
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-08-29 10:12:57 +02:00
Oswald Buddenhagen
6529e874e4 Merge remote-tracking branch 'origin/2.6'
Conflicts:
	src/plugins/remotelinux/deploymentinfo.cpp

Change-Id: I92af9f9f558a76db78f838b0ccdfb8ad3d47af25
2012-08-28 15:13:32 +02:00
Christian Kandeler
e669f05406 Utils: Introduce HostOsInfo class.
The class' member functions are intended to be used
instead of the Q_OS_* macros in all contexts where
the latter are not syntactically required.
This lowers the likelihood of changes made on one
platform breaking the build on another, e.g. due to
the code model missing symbols in #ifdef'ed out code
when refactoring.

Change-Id: I4a54788591b4c8f8d589b8368a6c683d4155c9fa
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-27 17:00:03 +02:00
Kai Koehne
c636fc2efe Core: Fix MSVC compiler warning about strdup
Fix

 warning: C4996: 'strdup': The POSIX name for this item is deprecated. Instead, use the ISO C++ conformant name: _strdup.

 By just using qstrdup.

Change-Id: I40664b6ed763b27951d983ec13dcc638270a1beb
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-27 12:55:06 +02:00
Eike Ziller
bc67246432 Merge remote-tracking branch 'origin/2.6' 2012-08-23 15:52:15 +02:00
hjk
08cc1e7d6a historycompleter: make key explicit
Change-Id: I1560e379639a02a2decf46c4e6b015bd6042c6b7
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-23 14:59:14 +02:00
Tobias Hunger
a68352f013 Change configuration saving
* Save initial configuration after all the plugins are done with
  their delayed initialization

* Save configuration when the autosave timer triggers. The disks
  are in use at that time anyway and saving can be turned off
  completely

* Save settings when closing the options page dialog

Change-Id: Idcf9ad61e8f9b94899c580d5a855a883a62f8dc0
Reviewed-by: Majid Khan <mkhan3189@gmail.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2012-08-20 17:19:25 +02:00
Aleksey Sidorov
457c289100 Fix possibly memory corruption
text.toUtf8() create a temporary QByteArray object, which is then destroyed and
const char *utfString may be corrupted.

Change-Id: Icd6584675c0c6e25423d25129d3b6fc8b055ebf0
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-08-20 08:30:45 +02:00
Eike Ziller
efefa2eb17 Merge remote-tracking branch 'origin/2.6' 2012-08-06 16:19:35 +02:00
hjk
6a7cf405bd rename QtDebug to QDebug
More uniform.

Change-Id: I1c6057981f4c2b3170a4e69f0674fe4caf1143a2
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
2012-08-06 14:55:08 +02:00
hjk
83e573f2ec use new id comparison operators to reduce line noise and save cycles
Change-Id: I2e7d81a4efb75877901d29964df4f71314e951b4
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-08-06 10:37:43 +02:00
hjk
7ca93f9b1e coreid: add overload for ==(const char *)
Saves code on caller side and cycles for the hashing.

Change-Id: I9d0c739b44a4611a4d70d33cf2798e0b078a72b5
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-08-06 09:14:25 +02:00
Eike Ziller
d9f8a25f80 Merge remote-tracking branch 'origin/2.6' 2012-08-02 07:41:18 +02:00
hjk
b9c7456486 core: adapt to changed syntax to include help in Qt 5
Change-Id: Ia821f870c16518f016c78fcf25dda30889a07122
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-08-01 15:24:50 +02:00
Orgad Shaneh
93756975e1 Context cleanup
Change-Id: I5e228acda32e8924d6a9bed13ea34182fff1dbb1
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-01 10:43:15 +02:00
Eike Ziller
9b3f183568 Merge remote-tracking branch 'origin/2.6' 2012-07-31 10:59:24 +02:00
Friedemann Kleint
506df46f0b Fix linking of the core plugin on Windows.
DestroyIcon needs user32.dll.

Introduced by e0f16c3093 .

Change-Id: I636d1741a6fa7fb7eb35e51a513ad88950f606f6
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
2012-07-30 12:47:05 +02:00
Eike Ziller
e0f16c3093 Windows: Fix resource leak
Task-number: QTCREATORBUG-7385

Change-Id: I9c6e72a83e8761d32b1f9f94594e4e5d22f48b28
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
2012-07-30 10:10:34 +02:00
Konstantin Tokarev
16cf161d82 Changed URL to qt-project.org in pluginspecs.
Also, it's 2012 now.

Change-Id: I69a8d1d77658b2bb2cb547362d5e3163385cab3b
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-07-30 07:44:48 +02:00
Friedemann Kleint
bf980649d2 tr()-Fixes for 2.6.
- ProjectExplorer::Profile should appear as 'Target' in the UI.
- Fix messagebox title capitalization
- Fix Q_DECLARE_TR_FUNCTIONS to contain fully qualified class
  names, add where applicable to replace
  QCoreApplication::translate().
- Introduce message utility function for the commonly used
  'No tool chain set up for this profile' message to
  ToolChainProfileInformation.
- Introduce message utility functions related to adding files
  to version control to VcsManager to be shared by QmlJsEditor.
- Fix typos.
- Remove QObject::tr(), QCoreApplication::tr().
- Do not translate diagnostic console warnings of
  QmlProfiler.

Change-Id: I6cee717a504796ef39f6eae58f552c5c8630adf3
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-07-27 17:08:12 +02:00
Eike Ziller
656ecfbf59 Merge remote-tracking branch 'origin/2.6' 2012-07-26 19:54:03 +02:00
Robert Loehning
ed7c80d4c6 Normalized connect()s
Change-Id: Ieb95bd04026d4a8ba824e6355031954332654e99
Reviewed-by: hjk <qthjk@ovi.com>
2012-07-26 16:12:43 +02:00
Yuchen Deng
a1228e2ffd qbs files: Install logo images
Change-Id: I3297dc4ec8ad5c1f9c88767a7189ca5730bf80f5
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-07-26 11:46:40 +02:00
Francois Ferrand
7b8cd42729 Disable theming of menu bar.
This causes strange look e.g. with Ambiance theme on linux.

Change-Id: I9f56ca0c43d474a1db6f79c78e7d3653ea44ca46
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-07-25 10:40:36 +02:00
Konstantin Tokarev
728579ef52 Added VCS integration to ResourceEditor.
Made add and remove operations of ResourceEditor VCS-aware. Also, remove
operation now can remove files from filesystem.

FileUtils::removeFile() and VcsManager::promptToAdd functions were
extracted from ProjectExplorer to prevent code duplication.
RemoveFileDialog was also moved to coreplugin.

Change-Id: Ia51127288030e52ce9475b369e56ea034dfa5d1e
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-07-19 22:26:47 +02:00
Konstantin Tokarev
d18bf468ad Changed return type of :ICore::mainWindow() to QWidget*
Also removed all <QMainWindow> includes which are not needed
anymore.

Change-Id: I393c9a62a5c6df95d9f35d872e1473a4f13bcdc4
Reviewed-by: hjk <qthjk@ovi.com>
2012-07-19 15:15:53 +02:00
Eike Ziller
e0e8cf3ada Contact -> qt-project.org
Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-07-19 13:23:21 +02:00
Robert Loehning
faf7ba6274 Compile fix for Windows
Change-Id: I0305e78dfc20ce398a06dac32c6368bfa1ec8b63
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-07-18 13:54:27 +02:00
hjk
7ba0a4de9c debugger: add dumper for Core::Id
Change-Id: Ibcc5b0e80acf037ed87b79ae4f52a1b0677388eb
Reviewed-by: hjk <qthjk@ovi.com>
2012-07-18 12:39:54 +02:00
Konstantin Tokarev
eef043e055 Implemented file rename in ResourceEditor.
Renaming supports version control.

To prevent code duplication part of ProjectExplorerPlugin::renameFile
implementation was separated into FileUtils::renameFile.

Change-Id: I28481bea89d0824339e5db025ceb7216713bd5a0
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-07-18 11:46:54 +02:00
Andre Hartmann
db265b1fa9 Find: Display "This change cannot be undone" only once.
Every click on Search Again displayed an additional warning message bar.

If the bar is closed with the cross button, it reappears on Search
Again.

This implementation extended InfoBar with a reuseable method
bool containsInfo(const QString &id).

Task-number: QTCREATORBUG-6873

Change-Id: I1de100d3526b861fc2de190e32f903795fed52c0
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-07-12 08:45:59 +02:00
Konstantin Tokarev
c9a31beda0 Fixed qbs build.
Change-Id: I043b60b55ab39742b599e7f0d70a444366f03bef
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-07-09 14:17:08 +02:00
Konstantin Tokarev
67c4788755 Moved CommandButton to Core and made some improvements to it.
Added constructor taking Id, use command description if toolTipBase
is not set.

Change-Id: I56d774e9c194c6f1eb90583f4a13ed75db540ba3
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-07-09 14:11:33 +02:00
Francois Ferrand
8a57b7bcbf Support badge on output panel buttons.
These are used to indicate number of issues and todos.

Change-Id: I320b6c0f5835570f0b5e5898fb140bd8266090c8
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-05 17:23:51 +02:00
Francois Ferrand
54569d5931 Support flashing output pane button.
- Add API to IOutputPane to 'flash' the panel button, if it is not open.
- Flash panel button when an error is added.

Change-Id: I842a1d789f28111be85bf4ffc1daf497bfbdc809
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-05 17:23:45 +02:00