Commit 126b3de1 authored by kh1's avatar kh1
Browse files

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

parents 71b3985c b560e240
......@@ -11,8 +11,8 @@ layout: QVBoxLayout {
leftMargin: 10;
rightMargin: 10;
property var effect: backendValues == null || backendValues.effect === undefined ? null : backendValues.effect
property var complexNode : effect === null ? null : effect.complexNode
property var effect: backendValues.effect
property var complexNode: effect.complexNode
QWidget {
maximumHeight: 40;
......@@ -23,7 +23,7 @@ layout: QVBoxLayout {
}
QComboBox {
enabled: isBaseState;
property var type: complexNode == null ? null : complexNode.type
property var type: backendValues.effect.complexNode.type
property var dirty;
id: effectComboBox;
items : { [
......@@ -35,21 +35,29 @@ layout: QVBoxLayout {
] }
onCurrentTextChanged: {
print("currentTextChanged before dirty");
if (dirty) //avoid recursion;
return;
if (complexNode != null && complexNode.exists)
complexNode.remove();
print("currentTextChanged");
if (backendValues.effect.complexNode.exists)
backendValues.effect.complexNode.remove();
if (currentText == "None") {
print("none");
;
} else if (complexNode != null) {
complexNode.add("Qt/" + currentText);
} else if (backendValues.effect.complexNode != null) {
print("add");
backendValues.effect.complexNode.add("Qt/" + currentText);
}
}
onTypeChanged: {
dirty = true;
if (complexNode != null && complexNode.type != "")
currentText = complexNode.type;
if (backendValues.effect.complexNode.exists)
currentText = backendValues.effect.complexNode.type;
else
currentText = "None";
dirty = false;
......@@ -70,7 +78,7 @@ layout: QVBoxLayout {
topMargin: 12;
IntEditor {
id: blurRadius;
backendValue: properties == null ? null : properties.blurRadius;
backendValue: backendValues.effect.complexNode.exists ? backendValues.effect.complexNode.properties.blurRadius : 0;
caption: "Blur Radius:"
baseStateFlag: isBaseState;
......@@ -87,7 +95,7 @@ layout: QVBoxLayout {
DoubleSpinBox {
id: OpcacityEffectSpinBox;
objectName: "OpcacityEffectSpinBox";
backendValue: properties == null ? null : properties.opacity;
backendValue: backendValues.effect.complexNode.exists ? backendValues.effect.complexNode.properties.opacity : 0;
minimum: 0;
maximum: 1;
singleStep: 0.1;
......@@ -122,7 +130,7 @@ layout: QVBoxLayout {
topMargin: 12;
IntEditor {
id: pixelSize;
backendValue: properties == null ? null : properties.pixelSize;
backendValue: backendValues.effect.complexNode.exists ? backendValues.effect.complexNode.properties.pixelSize : 0;
caption: "Pixel Size:"
baseStateFlag: isBaseState;
......@@ -140,7 +148,7 @@ layout: QVBoxLayout {
topMargin: 12;
IntEditor {
id: blurRadiusShadow;
backendValue: properties == null ? null : properties.blurRadius;
backendValue: backendValues.effect.complexNode.exists ? backendValues.effect.complexNode.properties.blurRadius : 0
caption: "Blur Radius:"
baseStateFlag: isBaseState;
......@@ -164,7 +172,7 @@ layout: QVBoxLayout {
IntEditor {
id: xOffset;
backendValue: properties == null ? 0 : properties.xOffset;
backendValue: backendValues.effect.complexNode.exists ? backendValues.effect.complexNode.properties.xOffset : 0
caption: "x Offset: "
baseStateFlag: isBaseState;
......@@ -175,7 +183,7 @@ layout: QVBoxLayout {
IntEditor {
id: yOffset;
backendValue: properties == null ? 0 : properties.yOffset;
backendValue: backendValues.effect.complexNode.exists ? backendValues.effect.complexNode.properties.yOffset : 0
caption: "y Offset: "
baseStateFlag: isBaseState;
......
......@@ -6,10 +6,9 @@
}
QScrollBar::handle:vertical {
background: qlineargradient(x1: 0, y1: 0, x2: 0.5, y2: 0, x3: 0.8, y3: 0,
background: qlineargradient(x1: 0, y1: 0, x2: 0.5, y2: 0
stop: 0 #cEcEcE,
stop: 1 #8E8E8E,
stop: 2 #101010);
stop: 1 #8E8E8E);
min-height: 20px;
border-radius: 10px;
}
......
......@@ -210,8 +210,13 @@ bool QMakeStep::processFinished(int exitCode, QProcess::ExitStatus status)
void QMakeStep::setUserArguments(const QStringList &arguments)
{
if (m_userArgs == arguments)
return;
m_userArgs = arguments;
emit userArgumentsChanged();
qt4BuildConfiguration()->emitQMakeBuildConfigurationChanged();
}
QStringList QMakeStep::userArguments()
......
......@@ -132,9 +132,11 @@ void MaemoInteractiveSshConnection::runCommand(const QString &command)
const char * const error = lastError();
if (error)
throw MaemoSshException(tr("SSH error: %1").arg(error));
const char * output = ssh.readAndReset(channel(), alloc);
const char * const output = ssh.readAndReset(channel(), alloc);
if (output) {
emit remoteOutput(QString::fromUtf8(output));
if (!done)
done = strstr(output, m_prompt) != 0;
delete[] output;
}
} while (!done && !stopRequested());
......
......@@ -6,7 +6,6 @@ SUPPORT_QT_MAEMO = $$(QTCREATOR_WITH_MAEMO)
# INCLUDEPATH += $$PWD/../../../libs/3rdparty/net7ssh/src
# INCLUDEPATH += $$PWD/../../../libs/3rdparty/botan/build
# LIBS += -l$$qtLibraryTarget(Net7ssh) -l$$qtLibraryTarget(Botan)
HEADERS += $$PWD/maemorunconfiguration.h \
$$PWD/maemomanager.h \
$$PWD/maemotoolchain.h \
......
......@@ -316,6 +316,11 @@ void Qt4BuildConfiguration::setQMakeBuildConfiguration(QtVersion::QmakeBuildConf
emit targetInformationChanged();
}
void Qt4BuildConfiguration::emitQMakeBuildConfigurationChanged()
{
emit qmakeBuildConfigurationChanged();
}
void Qt4BuildConfiguration::getConfigCommandLineArguments(QStringList *addedUserConfigs, QStringList *removedUserConfigs) const
{
QtVersion::QmakeBuildConfigs defaultBuildConfiguration = qtVersion()->defaultBuildConfig();
......
......@@ -90,6 +90,9 @@ public:
QtVersion::QmakeBuildConfigs qmakeBuildConfiguration() const;
void setQMakeBuildConfiguration(QtVersion::QmakeBuildConfigs config);
// used by qmake step to notify that the qmake args have changed
// not really nice
void emitQMakeBuildConfigurationChanged();
void getConfigCommandLineArguments(QStringList *addedUserConfigs, QStringList *removedUserConfigs) const;
// Those functions are used in a few places.
......
Supports Markdown
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