Commit 75c20e4d authored by Christian Kandeler's avatar Christian Kandeler Committed by hjk

Run configuration: Make debugger aspect display more configurable.

Change-Id: I4da0d92552146b9fa7a2236bce2f2ed0c9fe6147
Reviewed-by: default avatarhjk <qthjk@ovi.com>
parent cbc133d5
...@@ -212,12 +212,18 @@ DebuggerRunConfigWidget::DebuggerRunConfigWidget(RunConfiguration *runConfigurat ...@@ -212,12 +212,18 @@ DebuggerRunConfigWidget::DebuggerRunConfigWidget(RunConfiguration *runConfigurat
connect(m_debugServerPort, SIGNAL(valueChanged(int)), connect(m_debugServerPort, SIGNAL(valueChanged(int)),
SLOT(qmlDebugServerPortChanged(int))); SLOT(qmlDebugServerPortChanged(int)));
if (m_aspect->isDisplaySuppressed())
hide();
if (m_aspect->areQmlDebuggingOptionsSuppressed()) { if (m_aspect->areQmlDebuggingOptionsSuppressed()) {
m_debugServerPortLabel->hide(); m_debugServerPortLabel->hide();
m_debugServerPort->hide(); m_debugServerPort->hide();
m_useQmlDebugger->hide(); m_useQmlDebugger->hide();
} }
if (m_aspect->areCppDebuggingOptionsSuppressed())
m_useCppDebugger->hide();
if (m_aspect->isQmlDebuggingSpinboxSuppressed()) { if (m_aspect->isQmlDebuggingSpinboxSuppressed()) {
m_debugServerPort->hide(); m_debugServerPort->hide();
m_debugServerPortLabel->hide(); m_debugServerPortLabel->hide();
......
...@@ -203,7 +203,9 @@ DebuggerRunConfigurationAspect::DebuggerRunConfigurationAspect(RunConfiguration ...@@ -203,7 +203,9 @@ DebuggerRunConfigurationAspect::DebuggerRunConfigurationAspect(RunConfiguration
m_useCppDebugger(true), m_useCppDebugger(true),
m_useQmlDebugger(AutoEnableQmlDebugger), m_useQmlDebugger(AutoEnableQmlDebugger),
m_qmlDebugServerPort(Constants::QML_DEFAULT_DEBUG_SERVER_PORT), m_qmlDebugServerPort(Constants::QML_DEFAULT_DEBUG_SERVER_PORT),
m_suppressDisplay(false),
m_suppressQmlDebuggingOptions(false), m_suppressQmlDebuggingOptions(false),
m_suppressCppDebuggingOptions(false),
m_suppressQmlDebuggingSpinbox(false) m_suppressQmlDebuggingSpinbox(false)
{} {}
...@@ -212,7 +214,9 @@ DebuggerRunConfigurationAspect::DebuggerRunConfigurationAspect(DebuggerRunConfig ...@@ -212,7 +214,9 @@ DebuggerRunConfigurationAspect::DebuggerRunConfigurationAspect(DebuggerRunConfig
m_useCppDebugger(other->m_useCppDebugger), m_useCppDebugger(other->m_useCppDebugger),
m_useQmlDebugger(other->m_useQmlDebugger), m_useQmlDebugger(other->m_useQmlDebugger),
m_qmlDebugServerPort(other->m_qmlDebugServerPort), m_qmlDebugServerPort(other->m_qmlDebugServerPort),
m_suppressDisplay(other->m_suppressDisplay),
m_suppressQmlDebuggingOptions(other->m_suppressQmlDebuggingOptions), m_suppressQmlDebuggingOptions(other->m_suppressQmlDebuggingOptions),
m_suppressCppDebuggingOptions(other->m_suppressCppDebuggingOptions),
m_suppressQmlDebuggingSpinbox(other->m_suppressQmlDebuggingSpinbox) m_suppressQmlDebuggingSpinbox(other->m_suppressQmlDebuggingSpinbox)
{} {}
...@@ -262,21 +266,41 @@ void DebuggerRunConfigurationAspect::setQmllDebugServerPort(uint port) ...@@ -262,21 +266,41 @@ void DebuggerRunConfigurationAspect::setQmllDebugServerPort(uint port)
m_qmlDebugServerPort = port; m_qmlDebugServerPort = port;
} }
void DebuggerRunConfigurationAspect::suppressDisplay()
{
m_suppressDisplay = true;
}
void DebuggerRunConfigurationAspect::suppressQmlDebuggingOptions() void DebuggerRunConfigurationAspect::suppressQmlDebuggingOptions()
{ {
m_suppressQmlDebuggingOptions = true; m_suppressQmlDebuggingOptions = true;
} }
void DebuggerRunConfigurationAspect::suppressCppDebuggingOptions()
{
m_suppressCppDebuggingOptions = true;
}
void DebuggerRunConfigurationAspect::suppressQmlDebuggingSpinbox() void DebuggerRunConfigurationAspect::suppressQmlDebuggingSpinbox()
{ {
m_suppressQmlDebuggingSpinbox = true; m_suppressQmlDebuggingSpinbox = true;
} }
bool DebuggerRunConfigurationAspect::isDisplaySuppressed() const
{
return m_suppressDisplay;
}
bool DebuggerRunConfigurationAspect::areQmlDebuggingOptionsSuppressed() const bool DebuggerRunConfigurationAspect::areQmlDebuggingOptionsSuppressed() const
{ {
return m_suppressQmlDebuggingOptions; return m_suppressQmlDebuggingOptions;
} }
bool DebuggerRunConfigurationAspect::areCppDebuggingOptionsSuppressed() const
{
return m_suppressCppDebuggingOptions;
}
bool DebuggerRunConfigurationAspect::isQmlDebuggingSpinboxSuppressed() const bool DebuggerRunConfigurationAspect::isQmlDebuggingSpinboxSuppressed() const
{ {
return m_suppressQmlDebuggingSpinbox; return m_suppressQmlDebuggingSpinbox;
......
...@@ -112,9 +112,13 @@ public: ...@@ -112,9 +112,13 @@ public:
bool useQmlDebugger() const; bool useQmlDebugger() const;
uint qmlDebugServerPort() const; uint qmlDebugServerPort() const;
void setQmllDebugServerPort(uint port); void setQmllDebugServerPort(uint port);
void suppressDisplay();
void suppressQmlDebuggingOptions(); void suppressQmlDebuggingOptions();
void suppressCppDebuggingOptions();
void suppressQmlDebuggingSpinbox(); void suppressQmlDebuggingSpinbox();
bool isDisplaySuppressed() const;
bool areQmlDebuggingOptionsSuppressed() const; bool areQmlDebuggingOptionsSuppressed() const;
bool areCppDebuggingOptionsSuppressed() const;
bool isQmlDebuggingSpinboxSuppressed() const; bool isQmlDebuggingSpinboxSuppressed() const;
RunConfiguration *runConfiguration(); RunConfiguration *runConfiguration();
...@@ -126,7 +130,9 @@ public: ...@@ -126,7 +130,9 @@ public:
bool m_useCppDebugger; bool m_useCppDebugger;
QmlDebuggerStatus m_useQmlDebugger; QmlDebuggerStatus m_useQmlDebugger;
uint m_qmlDebugServerPort; uint m_qmlDebugServerPort;
bool m_suppressDisplay;
bool m_suppressQmlDebuggingOptions; bool m_suppressQmlDebuggingOptions;
bool m_suppressCppDebuggingOptions;
bool m_suppressQmlDebuggingSpinbox; bool m_suppressQmlDebuggingSpinbox;
}; };
......
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