Commit e327467a authored by con's avatar con
Browse files

Merge remote branch 'origin/2.0'

Conflicts:
	doc/qtcreator.qdoc
	src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.h
parents ec6fc83c e9d18415
doc/images/qtcreator-breakdown.png

58.6 KB | W: | H:

doc/images/qtcreator-breakdown.png

91.4 KB | W: | H:

doc/images/qtcreator-breakdown.png
doc/images/qtcreator-breakdown.png
doc/images/qtcreator-breakdown.png
doc/images/qtcreator-breakdown.png
  • 2-up
  • Swipe
  • Onion skin
doc/images/qtcreator-pprunsettings.png

58.1 KB | W: | H:

doc/images/qtcreator-pprunsettings.png

72.5 KB | W: | H:

doc/images/qtcreator-pprunsettings.png
doc/images/qtcreator-pprunsettings.png
doc/images/qtcreator-pprunsettings.png
doc/images/qtcreator-pprunsettings.png
  • 2-up
  • Swipe
  • Onion skin
doc/images/qtcreator-vcs-commit.png

70.4 KB | W: | H:

doc/images/qtcreator-vcs-commit.png

20.6 KB | W: | H:

doc/images/qtcreator-vcs-commit.png
doc/images/qtcreator-vcs-commit.png
doc/images/qtcreator-vcs-commit.png
doc/images/qtcreator-vcs-commit.png
  • 2-up
  • Swipe
  • Onion skin
doc/images/qtcreator-vcs-gitbranch.png

37.8 KB | W: | H:

doc/images/qtcreator-vcs-gitbranch.png

19.5 KB | W: | H:

doc/images/qtcreator-vcs-gitbranch.png
doc/images/qtcreator-vcs-gitbranch.png
doc/images/qtcreator-vcs-gitbranch.png
doc/images/qtcreator-vcs-gitbranch.png
  • 2-up
  • Swipe
  • Onion skin
doc/images/qtcreator-vcs-pane.png

25.4 KB | W: | H:

doc/images/qtcreator-vcs-pane.png

11.9 KB | W: | H:

doc/images/qtcreator-vcs-pane.png
doc/images/qtcreator-vcs-pane.png
doc/images/qtcreator-vcs-pane.png
doc/images/qtcreator-vcs-pane.png
  • 2-up
  • Swipe
  • Onion skin
This diff is collapsed.
......@@ -85,6 +85,7 @@ macro.QD = "\\e{Qt Designer}"
macro.QL = "\\e{Qt Linguist}"
macro.QC = "\\e{Qt Creator}"
macro.QMLD = "\\e{Qt Quick Designer}"
macro.QQV = "\\e{Qt QML Viewer}"
macro.param = "\\e"
macro.raisedaster.HTML = "<sup>*</sup>"
macro.reg.HTML = "<sup>&reg;</sup>"
......
......@@ -70,7 +70,7 @@ QWidget { //This is a special doubleSpinBox that does color coding for states
id: label;
font.bold: true;
alignment: doubleSpinBox.alignRight ? "Qt::AlignRight | Qt::AlignVCenter" : "Qt::AlignLeft | Qt::AlignVCenter";
fixedWidth: 76
fixedWidth: frame.labelWidth
visible: doubleSpinBox.text != "";
toolTip: text
}
......
import Qt 4.7
import Bauhaus 1.0
//backendValue: backendValues.horizontalVelocity;
//backendValue: backendValues.verticalVelocity;
//backendValue: backendValues.maximumFlickVelocity;
//backendValue: backendValues.overShoot;
//boundsBehavior : enumeration
//contentHeight : int
//contentWidth : int
QWidget {
layout: QVBoxLayout {
topMargin: 0
bottomMargin: 0
leftMargin: 0
rightMargin: 0
spacing: 0
GroupBox {
spacing: 0
GroupBox {
finished: finishedNotify;
caption: qsTr("Flickable")
layout: QVBoxLayout {
topMargin: 15;
bottomMargin: 6;
leftMargin: 0;
rightMargin: 0;
QWidget {
id: contentWidget;
maximumHeight: 220;
layout: QHBoxLayout {
topMargin: 0;
bottomMargin: 0;
leftMargin: 10;
rightMargin: 10;
QWidget {
layout: QVBoxLayout {
topMargin: 0;
bottomMargin: 0;
leftMargin: 0;
rightMargin: 0;
QLabel {
minimumHeight: 20;
text: "Horizontal Velocity:"
font.bold: true;
}
QLabel {
minimumHeight: 20;
text: "Vertical Velocity:"
font.bold: true;
}
QLabel {
minimumHeight: 20;
text: "Maximum Flick Velocity:"
font.bold: true;
}
QLabel {
minimumHeight: 20;
text: "Over Shoot:"
font.bold: true;
}
}
}
QWidget {
layout: QVBoxLayout {
topMargin: 0;
bottomMargin: 0;
leftMargin: 0;
rightMargin: 0;
DoubleSpinBox {
id: horizontalVelocitySpinBox;
objectName: "horizontalVelocitySpinBox";
backendValue: backendValues.horizontalVelocity;
minimumWidth: 30;
minimum: 0.1
maximum: 10
singleStep: 0.1
baseStateFlag: isBaseState;
}
DoubleSpinBox {
id: verticalVelocitySpinBox;
objectName: "verticalVelocitySpinBox";
backendValue: backendValues.verticalVelocity;
minimumWidth: 30;
minimum: 0.1
maximum: 10
singleStep: 0.1
baseStateFlag: isBaseState;
}
DoubleSpinBox {
id: maximumVelocitySpinBox;
objectName: "maximumVelocitySpinBox";
backendValue: backendValues.maximumFlickVelocity;
minimumWidth: 30;
minimum: 0.1
maximum: 10
singleStep: 0.1
baseStateFlag: isBaseState;
}
CheckBox {
id: overshootCheckBox;
text: "overshoot";
backendValue: backendValues.overShoot;
baseStateFlag: isBaseState;
checkable: true;
}
}
}
}
}
caption: qsTr("Flickable")
}
}
}
}
}
\ No newline at end of file
......@@ -2,21 +2,4 @@ import Qt 4.7
import Bauhaus 1.0
QWidget {
layout: QVBoxLayout {
topMargin: 0
bottomMargin: 0
leftMargin: 0
rightMargin: 0
spacing: 0
GroupBox {
GroupBox {
maximumHeight: 200;
finished: finishedNotify;
}
}
}
}
......@@ -56,6 +56,7 @@ QWidget {
layout: HorizontalLayout {
QFontComboBox {
editable: false
id: fontSelector
currentFont.family: backendValue.value
......
......@@ -4,5 +4,5 @@ import Bauhaus 1.0
QLabel {
id: label
alignment: "Qt::AlignRight | Qt::AlignVCenter"
fixedWidth: 76
fixedWidth: frame.labelWidth
}
import Qt 4.7
import Bauhaus 1.0
PropertyFrame {
layout: QVBoxLayout {
topMargin: 0;
bottomMargin: 0;
leftMargin: 0;
rightMargin: 0;
spacing: 0;
Switches {
}
QScrollArea {
horizontalScrollBarPolicy: "Qt::ScrollBarAlwaysOff";
id: standardPane;
content: properyEditorStandard;
QFrame {
minimumHeight: 400;
id: properyEditorStandard
layout: QVBoxLayout {
topMargin: 2;
bottomMargin: 2;
leftMargin: 2;
rightMargin: 2;
Type {
}
HorizontalLine {
}
Geometry {
}
Modifiers {
}
QScrollArea {
}
} // layout
} //QWidget
} //QScrollArea
QScrollArea {
horizontalScrollBarPolicy: "Qt::ScrollBarAlwaysOff";
id: specialPane;
visible: false;
visible: false;
content: properyEditorSpecial;
QFrame {
minimumHeight: 200;
id: properyEditorSpecial
layout: QVBoxLayout {
topMargin: 2;
bottomMargin: 2;
leftMargin: 2;
rightMargin: 2;
Type {
}
QScrollArea {
}
}
}
}
ExtendedPane {
id: extendedPane;
}
LayoutPane {
id: layoutPane;
}
ResetPane {
id: resetPane;
}
}
}
......@@ -2,87 +2,5 @@ import Qt 4.7
import Bauhaus 1.0
QWidget {
layout: QVBoxLayout {
topMargin: 0
bottomMargin: 0
leftMargin: 0
rightMargin: 0
spacing: 0
GroupBox {
GroupBox {
finished: finishedNotify;
caption: qsTr("List View")
layout: QVBoxLayout {
topMargin: 15;
bottomMargin: 6;
leftMargin: 0;
rightMargin: 0;
QWidget {
id: contentWidget;
maximumHeight: 260;
layout: QHBoxLayout {
topMargin: 0;
bottomMargin: 0;
leftMargin: 10;
rightMargin: 10;
QWidget {
layout: QVBoxLayout {
topMargin: 0;
bottomMargin: 0;
leftMargin: 0;
rightMargin: 0;
QLabel {
minimumHeight: 22;
text: "Highlight:"
font.bold: true;
}
QLabel {
minimumHeight: 22;
text: "Spacing:"
font.bold: true;
}
}
}
QWidget {
layout: QVBoxLayout {
topMargin: 0;
bottomMargin: 0;
leftMargin: 0;
rightMargin: 0;
CheckBox {
id: highlightFollowsCurrentItemCheckBox;
text: "Follows";
backendValue: backendValues.highlightFollowsCurrentItem;
baseStateFlag: isBaseState;
checkable: true;
}
SpinBox {
id: spacingSpinBox;
objectName: "spacingSpinBox";
backendValue: backendValues.spacing;
minimumWidth: 30;
minimum: 0;
maximum: 1000;
singleStep: 1;
baseStateFlag: isBaseState;
}
}
}
}
}
}
}
}
}
}
......@@ -5,6 +5,21 @@ WidgetFrame {
id: propertyFrame;
minimumWidth: 300;
property int frameWidth: width
property int labelWidth: 76
onFrameWidthChanged: {
if (frameWidth > 300) {
var moreSpace = (frameWidth - 300) / 3;
var newFixedWidth = 76 + moreSpace;
if (newFixedWidth > 200)
newFixedWidth = 200;
labelWidth = newFixedWidth;
} else {
labelWidth = 76;
}
}
objectName: "propertyEditorFrame"
styleSheetFile: "propertyEditor.css";
}
......@@ -958,7 +958,7 @@ bool CVSPlugin::describe(const QString &repositoryPath,
const QString title = QString::fromLatin1("cvs describe %1").arg(commitId);
Core::IEditor *newEditor = showOutputInEditor(title, output, VCSBase::DiffOutput, entries.front().file, codec);
newEditor->setProperty("describeChange", commitId);
setDiffBaseDirectory(editor, repositoryPath);
setDiffBaseDirectory(newEditor, repositoryPath);
}
return true;
}
......
......@@ -78,18 +78,19 @@ class SessionNameInputDialog : public QDialog
{
Q_OBJECT
public:
SessionNameInputDialog(const QStringList& sessions);
SessionNameInputDialog(const QStringList& sessions, const QString &initialValue = QString());
QString value() const;
private:
QLineEdit *m_newSessionLineEdit;
};
SessionNameInputDialog::SessionNameInputDialog(const QStringList& sessions)
SessionNameInputDialog::SessionNameInputDialog(const QStringList& sessions, const QString &initialValue)
{
QVBoxLayout *hlayout = new QVBoxLayout(this);
QLabel *label = new QLabel(tr("Enter the name of the session:"), this);
hlayout->addWidget(label);
m_newSessionLineEdit = new QLineEdit(this);
m_newSessionLineEdit->setText(initialValue);
m_newSessionLineEdit->setValidator(new SessionValidator(this, sessions));
hlayout->addWidget(m_newSessionLineEdit);
QDialogButtonBox *buttons = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, Qt::Horizontal, this);
......@@ -191,7 +192,7 @@ void SessionDialog::createNew()
void SessionDialog::clone()
{
SessionNameInputDialog newSessionInputDialog(m_sessionManager->sessions());
SessionNameInputDialog newSessionInputDialog(m_sessionManager->sessions(), m_ui.sessionList->currentItem()->text());
newSessionInputDialog.setWindowTitle(tr("New session name"));
if (newSessionInputDialog.exec() == QDialog::Accepted) {
QString newSession = newSessionInputDialog.value();
......@@ -215,7 +216,7 @@ void SessionDialog::remove()
void SessionDialog::rename()
{
SessionNameInputDialog newSessionInputDialog(m_sessionManager->sessions());
SessionNameInputDialog newSessionInputDialog(m_sessionManager->sessions(), m_ui.sessionList->currentItem()->text());
newSessionInputDialog.setWindowTitle(tr("Rename session"));
if (newSessionInputDialog.exec() == QDialog::Accepted) {
m_sessionManager->renameSession(m_ui.sessionList->currentItem()->text(), newSessionInputDialog.value());
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment