Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline

This commit is contained in:
hjk
2009-01-19 14:12:59 +01:00
4 changed files with 10 additions and 11 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 43 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 47 KiB

View File

@@ -20,9 +20,9 @@
\table \table
\row \row
\o \inlineimage qtcreator-screenshots.png \o \inlineimage qtcreator-screenshots.png
\row \row
\o Qt Creator includes a wide range of useful features. Among them are: \o Qt Creator includes a wide range of useful features. Among them are:
\list 1 \list 1
\o \bold{Smart Code Editor}: The code editor provides syntax \o \bold{Smart Code Editor}: The code editor provides syntax
highlighting as well as code completion. highlighting as well as code completion.
@@ -157,21 +157,19 @@
\section1 Session Management in Qt Creator \section1 Session Management in Qt Creator
### screenshot
In Qt Creator, a session is a collection of loaded projects, opened files, In Qt Creator, a session is a collection of loaded projects, opened files,
editor settings, and so on. When you run Qt Creator, you have a default editor settings, and so on. When you run Qt Creator, you have a default
session. You can create a new session using the \gui{Session Manager...}, session. You can create a new session using the \gui{Session Manager...},
available in the \gui{File -> Session} menu. available in the \gui{File -> Session} menu.
\image qtcreator-session-menu.png
To switch between sessions, select \gui{File -> Session}. If you do not To switch between sessions, select \gui{File -> Session}. If you do not
create and select any session, Qt Creator will always use the default create and select any session, Qt Creator will always use the default
session. session.
\omit \image qtcreator-session-manager.png
session management can also store project dependencies, thorbjorn is
currently working on it
\endomit
\section1 Qt Help Integration \section1 Qt Help Integration

View File

@@ -79,6 +79,7 @@ StackedEditorGroup::StackedEditorGroup(QWidget *parent) :
tl->setMargin(0); tl->setMargin(0);
{ {
m_editorList->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); m_editorList->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
m_editorList->setSizeAdjustPolicy(QComboBox::AdjustToContents);
m_editorList->setMinimumContentsLength(20); m_editorList->setMinimumContentsLength(20);
m_proxyModel.setSourceModel(model()); m_proxyModel.setSourceModel(model());
m_proxyModel.sort(0); m_proxyModel.sort(0);
@@ -296,9 +297,9 @@ void StackedEditorGroup::setCurrentEditor(IEditor *editor)
void StackedEditorGroup::checkEditorStatus() void StackedEditorGroup::checkEditorStatus()
{ {
IEditor *editor = qobject_cast<IEditor *>(sender()); IEditor *editor = qobject_cast<IEditor *>(sender());
if (editor == currentEditor()) if (editor == currentEditor())
updateEditorStatus(editor); updateEditorStatus(editor);
} }
void StackedEditorGroup::updateEditorStatus(IEditor *editor) void StackedEditorGroup::updateEditorStatus(IEditor *editor)