Skip to content
Snippets Groups Projects
Commit 79d6c96d authored by hjk's avatar hjk
Browse files

debugger: make an option to select terminal application (not used yet)

parent 3cab0024
No related branches found
No related tags found
No related merge requests found
...@@ -422,6 +422,10 @@ DebuggerSettings *theDebuggerSettings() ...@@ -422,6 +422,10 @@ DebuggerSettings *theDebuggerSettings()
item->setText(QObject::tr("Use custom dumpers")); item->setText(QObject::tr("Use custom dumpers"));
item->setCheckable(true); item->setCheckable(true);
item = new DebuggerAction(instance);
instance->insertItem(Terminal, item);
item->setDefaultValue("xterm");
item->setSettingsKey("DebugMode", "Terminal");
item = new DebuggerAction(instance); item = new DebuggerAction(instance);
instance->insertItem(ListSourceFiles, item); instance->insertItem(ListSourceFiles, item);
......
...@@ -141,6 +141,7 @@ enum DebuggerActionCode ...@@ -141,6 +141,7 @@ enum DebuggerActionCode
GdbScriptFile, GdbScriptFile,
GdbAutoRun, GdbAutoRun,
GdbAutoQuit, GdbAutoQuit,
Terminal,
// Watchers & Locals // Watchers & Locals
WatchExpression, WatchExpression,
......
...@@ -268,6 +268,8 @@ QWidget *GdbOptionPage::createPage(QWidget *parent) ...@@ -268,6 +268,8 @@ QWidget *GdbOptionPage::createPage(QWidget *parent)
m_ui.gdbLocationChooser->setPromptDialogTitle(tr("Choose Gdb Location")); m_ui.gdbLocationChooser->setPromptDialogTitle(tr("Choose Gdb Location"));
m_ui.scriptFileChooser->setExpectedKind(Core::Utils::PathChooser::File); m_ui.scriptFileChooser->setExpectedKind(Core::Utils::PathChooser::File);
m_ui.scriptFileChooser->setPromptDialogTitle(tr("Choose Location of Startup Script File")); m_ui.scriptFileChooser->setPromptDialogTitle(tr("Choose Location of Startup Script File"));
m_ui.terminalChooser->setExpectedKind(Core::Utils::PathChooser::Command);
m_ui.terminalChooser->setPromptDialogTitle(tr("Choose Location of Terminal Application"));
theDebuggerAction(GdbLocation) theDebuggerAction(GdbLocation)
->connectWidget(m_ui.gdbLocationChooser); ->connectWidget(m_ui.gdbLocationChooser);
...@@ -275,6 +277,8 @@ QWidget *GdbOptionPage::createPage(QWidget *parent) ...@@ -275,6 +277,8 @@ QWidget *GdbOptionPage::createPage(QWidget *parent)
->connectWidget(m_ui.scriptFileChooser); ->connectWidget(m_ui.scriptFileChooser);
theDebuggerAction(GdbEnvironment) theDebuggerAction(GdbEnvironment)
->connectWidget(m_ui.environmentEdit); ->connectWidget(m_ui.environmentEdit);
theDebuggerAction(Terminal)
->connectWidget(m_ui.terminalChooser);
theDebuggerAction(AllPluginBreakpoints) theDebuggerAction(AllPluginBreakpoints)
->connectWidget(m_ui.radioButtonAllPluginBreakpoints); ->connectWidget(m_ui.radioButtonAllPluginBreakpoints);
...@@ -328,6 +332,7 @@ void GdbOptionPage::apply() ...@@ -328,6 +332,7 @@ void GdbOptionPage::apply()
theDebuggerAction(GdbLocation)->apply(s); theDebuggerAction(GdbLocation)->apply(s);
theDebuggerAction(GdbScriptFile)->apply(s); theDebuggerAction(GdbScriptFile)->apply(s);
theDebuggerAction(GdbEnvironment)->apply(s); theDebuggerAction(GdbEnvironment)->apply(s);
theDebuggerAction(Terminal)->apply(s);
theDebuggerAction(AllPluginBreakpoints)->apply(s); theDebuggerAction(AllPluginBreakpoints)->apply(s);
theDebuggerAction(SelectedPluginBreakpoints)->apply(s); theDebuggerAction(SelectedPluginBreakpoints)->apply(s);
......
...@@ -32,10 +32,21 @@ ...@@ -32,10 +32,21 @@
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="labelGdbLocation"> <widget class="QLabel" name="labelGdbLocation">
<property name="toolTip"> <property name="toolTip">
<string>This is either a full abolute path leading to the gdb binary you intend to use or the name of a gdb binary that wiull be searched in your PATH.</string> <string>This is either a full abolute path leading to the gdb binary you intend to use or the name of a gdb binary that will be searched in your PATH.</string>
</property> </property>
<property name="text"> <property name="text">
<string>Gdb Location:</string> <string>Gdb location:</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="terminalLocation">
<property name="toolTip">
<string>This is either a full abolute path leading to the terminal
you indent to use or the name of a terminal that will be searched in your PATH.</string>
</property>
<property name="text">
<string>Terminal:</string>
</property> </property>
</widget> </widget>
</item> </item>
...@@ -55,7 +66,7 @@ ...@@ -55,7 +66,7 @@
<string>This is either empty or points to a file containing gdb commands that will be executed immediately after gdb starts up.</string> <string>This is either empty or points to a file containing gdb commands that will be executed immediately after gdb starts up.</string>
</property> </property>
<property name="text"> <property name="text">
<string>Gdb Startup Script:</string> <string>Gdb startup script:</string>
</property> </property>
</widget> </widget>
</item> </item>
...@@ -65,6 +76,9 @@ ...@@ -65,6 +76,9 @@
<item row="0" column="1"> <item row="0" column="1">
<widget class="Core::Utils::PathChooser" name="gdbLocationChooser" native="true"/> <widget class="Core::Utils::PathChooser" name="gdbLocationChooser" native="true"/>
</item> </item>
<item row="3" column="1">
<widget class="Core::Utils::PathChooser" name="terminalChooser" native="true"/>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment