Commit 4f891e99 authored by hjk's avatar hjk

debugger: remove the "expert start modes"

This reverts most of 12f7a439. It was a bad idea.

Task-number: QTCREATORBUG-6752
Change-Id: I048749a9dc888f36045f641de8fd2a1e3ae5d979
Reviewed-by: default avatarhjk <qthjk@ovi.com>
parent 73fdc207
......@@ -473,13 +473,6 @@ DebuggerSettings::DebuggerSettings(QSettings *settings)
insertItem(RegisterForPostMortem, item);
#endif
item = new SavedAction(this);
item->setSettingsKey(debugModeGroup, QLatin1String("ProvideMoreStartOptions"));
item->setText(tr("Provide More Options to Start Debugging"));
item->setCheckable(true);
item->setDefaultValue(false);
insertItem(ProvideMoreStartModes, item);
item = new SavedAction(this);
item->setSettingsKey(debugModeGroup, QLatin1String("AllPluginBreakpoints"));
item->setDefaultValue(true);
......
......@@ -114,7 +114,6 @@ enum DebuggerActionCode
UseAddressInStackView,
RegisterForPostMortem,
ProvideMoreStartModes,
// Gdb
LoadGdbInit,
......
......@@ -669,13 +669,6 @@ public slots:
m_returnWindow->header()->resizeSection(section, newSize);
}
void setExpertMode(bool on)
{
m_startLocalProcessAction->setVisible(on);
m_attachToRemoteServerAction->setVisible(on);
m_startRemoteProcessAction->setVisible(on);
m_startRemoteServerAction->setVisible(on);
}
void sourceFilesDockToggled(bool on)
{
......@@ -3146,6 +3139,13 @@ void DebuggerPluginPrivate::extensionsInitialized()
cmd->setAttribute(Command::CA_Hide);
mstart->addAction(cmd, Debugger::Constants::G_START_LOCAL);
// FIXME: The following actions should some be less
// visible in the start menu, but still be "there".
// m_startLocalProcessAction->setVisible(on);
// m_attachToRemoteServerAction->setVisible(on);
// m_startRemoteProcessAction->setVisible(on);
// m_startRemoteServerAction->setVisible(on);
cmd = am->registerAction(m_attachToCoreAction,
"Debugger.AttachCore", globalcontext);
cmd->setAttribute(Command::CA_Hide);
......@@ -3460,10 +3460,6 @@ void DebuggerPluginPrivate::extensionsInitialized()
m_watchersWindow->setVisible(false);
m_returnWindow->setVisible(false);
connect(action(ProvideMoreStartModes), SIGNAL(toggled(bool)),
SLOT(setExpertMode(bool)));
setExpertMode(boolSetting(ProvideMoreStartModes));
// time gdb -i mi -ex 'b debuggerplugin.cpp:800' -ex r -ex q bin/qtcreator.bin
if (!m_scheduledStarts.isEmpty())
QTimer::singleShot(0, this, SLOT(runScheduled()));
......
......@@ -68,7 +68,6 @@ public:
QCheckBox *checkBoxLoadGdbInit;
QLabel *labelDangerous;
QCheckBox *checkBoxTargetAsync;
QCheckBox *checkBoxProvideMoreStartModes;
QCheckBox *checkBoxAutoEnrichParameters;
QCheckBox *checkBoxBreakOnWarning;
QCheckBox *checkBoxBreakOnFatal;
......@@ -145,10 +144,6 @@ public:
"This allows or inhibits reading the user's default\n"
".gdbinit file on debugger startup."));
checkBoxProvideMoreStartModes = new QCheckBox(groupBoxGeneral);
checkBoxProvideMoreStartModes->setText(GdbOptionsPage::tr(
"Show more start modes in the Debug->Start Debugging menu"));
labelDangerous = new QLabel(GdbOptionsPage::tr(
"The options below should be used with care."));
......@@ -216,7 +211,6 @@ public:
formLayout->addRow(checkBoxAdjustBreakpointLocations);
formLayout->addRow(checkBoxUseDynamicType);
formLayout->addRow(checkBoxLoadGdbInit);
formLayout->addRow(checkBoxProvideMoreStartModes);
formLayout->addRow(new QLabel(QString()));
formLayout->addRow(labelDangerous);
formLayout->addRow(checkBoxTargetAsync);
......@@ -293,8 +287,6 @@ QWidget *GdbOptionsPage::createPage(QWidget *parent)
m_ui->checkBoxUseDynamicType);
m_group.insert(debuggerCore()->action(TargetAsync),
m_ui->checkBoxTargetAsync);
m_group.insert(debuggerCore()->action(ProvideMoreStartModes),
m_ui->checkBoxProvideMoreStartModes);
m_group.insert(debuggerCore()->action(AdjustBreakpointLocations),
m_ui->checkBoxAdjustBreakpointLocations);
m_group.insert(debuggerCore()->action(BreakOnWarning),
......@@ -325,7 +317,6 @@ QWidget *GdbOptionsPage::createPage(QWidget *parent)
<< sep << m_ui->groupBoxGeneral->title()
<< sep << m_ui->checkBoxLoadGdbInit->text()
<< sep << m_ui->checkBoxTargetAsync->text()
<< sep << m_ui->checkBoxProvideMoreStartModes->text()
<< sep << m_ui->checkBoxUseDynamicType->text()
<< sep << m_ui->labelGdbWatchdogTimeout->text()
<< sep << m_ui->checkBoxEnableReverseDebugging->text()
......
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