Commit Graph

40 Commits

Author SHA1 Message Date
Oswald Buddenhagen
dc3c156cac Merge branch '2.2'
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
2011-04-14 12:39:31 +02:00
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
Daniel Molkentin
a22ad73b9a Prevent improper sizing of MiniProjectTargetSelector
The selector would sometimes be too high (if projects were removed),
and sometimes show vertical scrollbars (if projects were added). This
problem was limited to the first time that the widget was opened on
all platforms but on OS X, where it could be observed persistently
and where its lack potentially can cause problems due to ed5d10a.

Reviewed-by: con
Task-Number: QTCREATORBUG-1792
2011-04-12 16:40:24 +02:00
dt
51a5c41f5d Target Selector: Make project names unique
If the displayName() is not unique we include the filename.

Task-Nr: QTCREATORBUG-329
2011-03-30 16:33:31 +02:00
Daniel Molkentin
ed5d10a114 Calculate proper size hint for target Creator.
Task-Number: QTCREATORBUG-4172

Reviewed-by: Robert Loehning
2011-03-24 17:06:38 +01:00
con
d1023c7614 It's 2011 now.
Reviewed-by: hjk
2011-01-12 09:46:24 +01:00
con
b1bcf081d8 Merge branch '2.1'
Conflicts:
	src/plugins/coreplugin/basemode.cpp
	src/plugins/coreplugin/basemode.h
	src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.cpp
	src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.h
	src/plugins/debugger/cdb/cdbsymbolpathlisteditor.cpp
	src/plugins/debugger/debuggeragents.cpp
	src/plugins/debugger/debuggeruiswitcher.cpp
	src/plugins/debugger/debuggeruiswitcher.h
	src/plugins/projectexplorer/buildconfigdialog.cpp
	src/plugins/qmldesigner/components/propertyeditor/colorwidget.cpp
	src/plugins/qmldesigner/components/propertyeditor/colorwidget.h
	src/plugins/qmldesigner/designercore/include/enumeratormetainfo.h
	src/plugins/qmldesigner/designercore/include/modelutilities.h
	src/plugins/qmldesigner/designercore/include/nodeinstance.h
	src/plugins/qmldesigner/designercore/include/propertymetainfo.h
	src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.h
	src/plugins/qmldesigner/designercore/instances/graphicsviewnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.h
	src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/qmlviewnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.h
	src/plugins/qmldesigner/designercore/metainfo/enumeratormetainfo.cpp
	src/plugins/qmldesigner/designercore/metainfo/propertymetainfo.cpp
	src/plugins/qmldesigner/designercore/model/modelutilities.cpp
	src/plugins/snippets/inputwidget.cpp
	src/plugins/snippets/snippetscompletion.cpp
	src/plugins/snippets/snippetscompletion.h
	src/plugins/snippets/snippetspec.cpp
	src/plugins/snippets/snippetsplugin.cpp
	src/plugins/snippets/snippetswindow.cpp
	src/plugins/snippets/snippetswindow.h
	src/plugins/texteditor/snippetsparser.cpp
	src/tools/qml/qmldom/main.cpp
	tests/manual/trk/runner.cpp
	tests/manual/trk/trkolddevice.cpp
	tests/manual/trk/trkolddevice.h
	tests/manual/trk/trkserver.cpp
2010-12-17 17:00:53 +01:00
con
04e32b0049 License headers. 2010-12-17 16:03:42 +01:00
Tobias Hunger
cf3a418cd8 Fix spelling in comments
Krazy was complaining about those.
2010-11-03 12:45:34 +01:00
Friedemann Kleint
6063fb84c2 Fix exported headers in Core and TextEditor.
- Unexport Core::Internal::MainWindow and remove its includes.
- Move RssFetcher from Core::Internal to Core.
- Unexport CopyTaskHandler.
- Move TextEditor's completion support and Refactor Overlay
  helper classes from TextEditor::Internal to TextEditor as they
  are exported.
- Move internal BaseTextBlockSelection into private header.
- Unexport TextEditorOverlay as they are not used.
2010-11-01 16:29:45 +01:00
dt
488e8334cd Sort names in mini target selector
Task-Nr: QTCREATORBUG-1935
2010-08-30 17:12:40 +02:00
dt
24f12ede99 The Minitargetselector shouldn't set a new startup project
Instead let the project explorer plugin handle that.

Reviewed-By: danimo
2010-08-30 16:47:34 +02:00
Friedemann Kleint
e8c0d0c162 Yet another include purging spree. 2010-07-13 16:36:37 +02:00
Friedemann Kleint
647c5d9b63 ProjectExplorer: Header cleanup in Taskwindow.
Introduce TaskWindowPrivate, add and reformat some
comments.
2010-05-27 13:28:07 +02:00
hjk
385034722c fix latest merge from 2.0 2010-05-27 12:18:32 +02:00
hjk
5805788290 Merge remote branch 'origin/2.0'
Conflicts:
	src/plugins/projectexplorer/miniprojecttargetselector.cpp
	src/plugins/qmldesigner/designercore/model/modeltotextmerger.cpp
	src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemosshthread.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemosshthread.h
	tests/manual/gdbdebugger/simple/app.cpp
2010-05-27 11:11:53 +02:00
Jens Bache-Wiig
61cf2d0a39 Fix issues with long project names in the minitargetselector
It's impossible to use very long names and some clipping
occurs due to incorrect size hints on QLabel.
- Made the popup minimum width depend on the longest
project name entered. (it will not shrink)
- The build and run labels have increased minimum size hints.
- Combobox tooltip will be set to the project name as to
  make it possible to expand long names.

Task-number: QTCREATORBUG-1278
RevBy: joao
2010-05-21 18:32:49 +02:00
dt
a60d55bdad Sort build & run configurations in the ui
Implement a BuildConfigurationModel which does the sorting.
Extend the RunConfigurationModel to do sorting.

Make the mini target selector and project page use both of those models.

Task-Nr: QTCREATORBUG-1235
2010-04-30 11:55:03 +02:00
Daniel Molkentin
9c8079f091 Keep targets in the minitargetselector sync with the project settings
Task-number: QTCREATORBUG-1097
Reviewed-by: dt
2010-04-12 18:26:29 +02:00
Tobias Hunger
81c8540bd7 Do not add linebreaks into the MPTS tooltips
This stops projects with long project names from being displayed like
this:

 Project:
 longprojectName
 Target: Something

Thanks to Roberto for the suggestion.
2010-03-30 17:29:06 +02:00
Jens Bache-Wiig
f014f3a424 Improve icon and label behavior for target selector
I modified the text margins, removed the inconsistent
"No project" label and made sure we fall back to
the default computer icon when no project is open.
2010-03-19 18:41:21 +01:00
Jens Bache-Wiig
531ce89f80 Fix tool tips for target selector
Using non capitalized text this time as this is
what we have decided to standardize on for future versions.
2010-03-09 13:36:50 +01:00
Jens Bache-Wiig
76fe997a45 Improve focus and keyboard interaction with projectselector
This kills the event filter since it is not really neccessary.
Most combo boxes should be disabled by default now. I Removed
redundant focus widgets from the keyboard chain and I
indicate that the list has focus by saturation.
2010-03-09 11:14:19 +01:00
Jens Bache-Wiig
e2f79dd0c0 Disable project selector combo box when not needed
When we only have one option available, it makes no sense to
enable the combo box.
2010-03-08 14:40:42 +01:00
hjk
9595504bda Long live the king! 2010-03-05 11:28:13 +01:00
Daniel Molkentin
5aa3625e94 Fix incorrect slot connection.
Reviewed-By: Robert Loehning
2010-03-04 17:00:24 +01:00
Jens Bache-Wiig
35a09f2efe Fix button toggle of the miniproject selector on Windows
The problem is that on windows, mouse events are replayed
if you click outside a popup to close it. If you hit the
project selector button to toggle it, this will cause
the popup to reopen on mouse release. Which we do not want.
Hence we set the DontReplay flag on mouseClick.

A similar workaround can be found in QComboBox.
2010-03-02 18:38:58 +01:00
Jens Bache-Wiig
a2ec8cc939 Fix missing tabfocus with manhattanstyle
I added a new focus rect for combo boxes
with manhattan style. To reduce the visual
impact I follow the same policy we use on
windows where we do not show the focus rect
unless it is called upon by tabfocus.
2010-03-01 17:29:12 +01:00
con
5e6700e708 Don't show focus rect in target selector on Mac. 2010-02-25 13:08:19 +01:00
Jens Bache-Wiig
b7650d343e Fix an icon centering problem on the actionbar
The actualPixmapSize is different
from the resulting pixmap when using
svg icons. This seems to be a bug
in Qt, but using the resulting pixmap
is safe for now.
2010-02-24 19:56:33 +01:00
Jens Bache-Wiig
7af1e21144 Improved styling of project target selector 2010-02-24 19:25:44 +01:00
con
04d90d9563 Show target overlay icon only in the active target button. 2010-02-23 16:52:44 +01:00
Tobias Hunger
35bcc49bdf Sort targets in miniprojecttargetselector
... based on their display names

Reviewed-by: Daniel Molkentin
2010-02-22 18:07:20 +01:00
Jens Bache-Wiig
1ea114b414 Make the panel action sunken when panel is open 2010-02-22 14:36:45 +01:00
con
d8def18362 Give targets a tool tip property.
Use that for showing details about connected Symbian devices.
Also update the icon with an (not-)connected overlay icon.
Graphics design pending.
2010-02-09 19:07:26 +01:00
con
9f3ac20bd2 Add a tool tip for the target selector button. 2010-02-09 17:45:56 +01:00
con
40bfe13779 Remove some duplicate connects. 2010-02-09 17:43:51 +01:00
Tobias Hunger
d1bdfcc363 Integrate target support
* Ease cross device development by introducing 'targets' which
   group build- and runsettings that are valid for this one target

 Most of the kudos for the code review go to dt. Con, thorbjorn,
 ckandler and others did also review parts of this patch.

Reviewed-by: dt
2010-02-09 16:57:37 +01:00
Daniel Molkentin
dbc295a07f Fixes for FancyActionBar and TargetSelector.
- Improved icon and text positioning
- Improved readability and some gfx glitches on windows and mac
- Removed drop down functionality from Run/Debug/Build buttons
2010-01-22 18:04:42 +01:00
Daniel Molkentin
c4d1553da4 Add first version of a new sidebar, including project selector.
The project selector also allows to select targets.
However, this is not yet used, since the necessary
changes are still being stabilized.

Done-with: con
2010-01-21 21:13:10 +01:00