Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Marco Bubke
flatpak-qt-creator
Commits
a556ddad
Commit
a556ddad
authored
Dec 11, 2008
by
hjk
Browse files
start sanitizing gdb options dialog
parent
fff956db
Changes
9
Hide whitespace changes
Inline
Side-by-side
src/plugins/debugger/debugger.pro
View file @
a556ddad
...
...
@@ -58,7 +58,6 @@ SOURCES += attachexternaldialog.cpp \
gdbengine
.
cpp
\
gdbmi
.
cpp
\
gdboptionpage
.
cpp
\
gdbtypemacros
.
cpp
\
gdbengine
.
h
\
moduleshandler
.
cpp
\
moduleswindow
.
cpp
\
...
...
@@ -79,7 +78,6 @@ FORMS += attachexternaldialog.ui \
breakcondition
.
ui
\
mode
.
ui
\
gdboptionpage
.
ui
\
gdbtypemacros
.
ui
\
startexternaldialog
.
ui
\
RESOURCES
+=
debugger
.
qrc
...
...
src/plugins/debugger/debuggerplugin.cpp
View file @
a556ddad
...
...
@@ -183,7 +183,6 @@ DebuggerPlugin::DebuggerPlugin()
{
m_pm
=
0
;
m_generalOptionPage
=
0
;
m_typeMacroPage
=
0
;
m_locationMark
=
0
;
m_manager
=
0
;
}
...
...
@@ -202,7 +201,6 @@ void DebuggerPlugin::shutdown()
//qDebug() << "DebuggerPlugin::~DebuggerPlugin";
removeObject
(
m_debugMode
);
removeObject
(
m_generalOptionPage
);
removeObject
(
m_typeMacroPage
);
// FIXME: when using the line below, BreakWindow etc gets deleted twice.
// so better leak for now...
...
...
@@ -212,9 +210,6 @@ void DebuggerPlugin::shutdown()
delete
m_generalOptionPage
;
m_generalOptionPage
=
0
;
delete
m_typeMacroPage
;
m_typeMacroPage
=
0
;
delete
m_locationMark
;
m_locationMark
=
0
;
...
...
@@ -409,13 +404,10 @@ bool DebuggerPlugin::initialize(const QStringList &arguments, QString *error_mes
mdebug
->
addAction
(
cmd
);
m_generalOptionPage
=
0
;
m_typeMacroPage
=
0
;
// FIXME:
m_generalOptionPage
=
new
GdbOptionPage
(
&
theGdbSettings
());
addObject
(
m_generalOptionPage
);
m_typeMacroPage
=
new
TypeMacroPage
(
&
theGdbSettings
());
addObject
(
m_typeMacroPage
);
m_locationMark
=
0
;
...
...
src/plugins/debugger/debuggerplugin.h
View file @
a556ddad
...
...
@@ -54,7 +54,6 @@ namespace Internal {
class
DebuggerManager
;
class
DebugMode
;
class
GdbOptionPage
;
class
TypeMacroPage
;
class
LocationMark
;
class
DebuggerPlugin
:
public
ExtensionSystem
::
IPlugin
...
...
@@ -103,7 +102,6 @@ private:
ExtensionSystem
::
PluginManager
*
m_pm
;
GdbOptionPage
*
m_generalOptionPage
;
TypeMacroPage
*
m_typeMacroPage
;
QString
m_previousMode
;
LocationMark
*
m_locationMark
;
...
...
src/plugins/debugger/gdbengine.h
View file @
a556ddad
...
...
@@ -80,7 +80,7 @@ enum DataDumperState
DataDumperUnavailable
,
};
// FIXME: Move to extra file?
class
GdbSettings
{
public:
...
...
src/plugins/debugger/gdboptionpage.cpp
View file @
a556ddad
...
...
@@ -58,7 +58,11 @@ GdbOptionPage::GdbOptionPage(GdbSettings *settings)
#if defined(Q_OS_WIN32)
defaultCommand
.
append
(
".exe"
);
#endif
QString
defaultScript
=
coreIFace
->
resourcePath
()
+
QLatin1String
(
"/gdb/qt4macros"
);
m_settings
->
m_gdbCmd
=
s
->
value
(
"Location"
,
defaultCommand
).
toString
();
m_settings
->
m_scriptFile
=
s
->
value
(
"ScriptFile"
,
defaultScript
).
toString
();
m_settings
->
m_gdbEnv
=
s
->
value
(
"Environment"
,
""
).
toString
();
m_settings
->
m_autoRun
=
s
->
value
(
"AutoRun"
,
true
).
toBool
();
m_settings
->
m_autoQuit
=
s
->
value
(
"AutoQuit"
,
true
).
toBool
();
...
...
@@ -72,36 +76,56 @@ QString GdbOptionPage::name() const
QString
GdbOptionPage
::
category
()
const
{
return
"Debugger
|Gdb
"
;
return
"Debugger"
;
}
QString
GdbOptionPage
::
trCategory
()
const
{
return
tr
(
"Debugger
|Gdb
"
);
return
tr
(
"Debugger"
);
}
QWidget
*
GdbOptionPage
::
createPage
(
QWidget
*
parent
)
{
QWidget
*
w
=
new
QWidget
(
parent
);
m_ui
.
setupUi
(
w
);
m_ui
.
gdbEdit
->
setText
(
m_settings
->
m_gdbCmd
);
m_ui
.
envEdit
->
setText
(
m_settings
->
m_gdbEnv
);
m_ui
.
gdb
Location
Edit
->
setText
(
m_settings
->
m_gdbCmd
);
m_ui
.
env
ironment
Edit
->
setText
(
m_settings
->
m_gdbEnv
);
m_ui
.
autoStartBox
->
setChecked
(
m_settings
->
m_autoRun
);
m_ui
.
autoQuitBox
->
setChecked
(
m_settings
->
m_autoQuit
);
connect
(
m_ui
.
pushButtonBrowse
,
SIGNAL
(
clicked
()),
this
,
SLOT
(
browse
()));
m_ui
.
gdbStartupScriptEdit
->
setText
(
m_settings
->
m_scriptFile
);
// FIXME
m_ui
.
autoStartBox
->
hide
();
m_ui
.
autoQuitBox
->
hide
();
m_ui
.
environmentEdit
->
hide
();
m_ui
.
labelEnvironment
->
hide
();
connect
(
m_ui
.
browseForGdbButton
,
SIGNAL
(
clicked
()),
this
,
SLOT
(
browseForGdb
()));
connect
(
m_ui
.
browseForScriptButton
,
SIGNAL
(
clicked
()),
this
,
SLOT
(
browseForScript
()));
return
w
;
}
void
GdbOptionPage
::
browse
()
void
GdbOptionPage
::
browse
ForGdb
()
{
QString
fileName
=
QFileDialog
::
getOpenFileName
(
m_ui
.
pushButtonBrowse
,
QString
fileName
=
QFileDialog
::
getOpenFileName
(
m_ui
.
browseForGdbButton
,
"Browse for gdb executable"
);
if
(
fileName
.
isEmpty
())
return
;
m_settings
->
m_gdbCmd
=
fileName
;
m_ui
.
gdbEdit
->
setText
(
fileName
);
m_ui
.
gdbLocationEdit
->
setText
(
fileName
);
}
void
GdbOptionPage
::
browseForScript
()
{
QString
fileName
=
QFileDialog
::
getOpenFileName
(
m_ui
.
browseForGdbButton
,
"Browse for gdb startup script"
);
if
(
fileName
.
isEmpty
())
return
;
m_settings
->
m_scriptFile
=
fileName
;
m_ui
.
gdbStartupScriptEdit
->
setText
(
fileName
);
}
void
GdbOptionPage
::
finished
(
bool
accepted
)
...
...
@@ -109,10 +133,11 @@ void GdbOptionPage::finished(bool accepted)
if
(
!
accepted
)
return
;
m_settings
->
m_gdbCmd
=
m_ui
.
gdbEdit
->
text
();
m_settings
->
m_gdbEnv
=
m_ui
.
envEdit
->
text
();
m_settings
->
m_gdbCmd
=
m_ui
.
gdb
Location
Edit
->
text
();
m_settings
->
m_gdbEnv
=
m_ui
.
env
ironment
Edit
->
text
();
m_settings
->
m_autoRun
=
m_ui
.
autoStartBox
->
isChecked
();
m_settings
->
m_autoQuit
=
m_ui
.
autoQuitBox
->
isChecked
();
m_settings
->
m_scriptFile
=
m_ui
.
gdbStartupScriptEdit
->
text
();
Core
::
ICore
*
coreIFace
=
m_pm
->
getObject
<
Core
::
ICore
>
();
if
(
!
coreIFace
||
!
coreIFace
->
settings
())
...
...
src/plugins/debugger/gdboptionpage.h
View file @
a556ddad
...
...
@@ -35,7 +35,6 @@
#define GDBOPTIONPAGE_H
#include "ui_gdboptionpage.h"
#include "ui_gdbtypemacros.h"
#include <coreplugin/dialogs/ioptionspage.h>
...
...
@@ -63,7 +62,8 @@ public:
void
finished
(
bool
accepted
);
public
slots
:
void
browse
();
void
browseForGdb
();
void
browseForScript
();
private:
ExtensionSystem
::
PluginManager
*
m_pm
;
...
...
@@ -72,6 +72,7 @@ private:
GdbSettings
*
m_settings
;
};
#if 0
class TypeMacroPage : public Core::IOptionsPage
{
Q_OBJECT
...
...
@@ -100,6 +101,7 @@ private:
GdbSettings *m_settings;
QWidget *m_widget;
};
#endif
}
// namespace Internal
}
// namespace Debugger
...
...
src/plugins/debugger/gdboptionpage.ui
View file @
a556ddad
...
...
@@ -7,7 +7,7 @@
<x>
0
</x>
<y>
0
</y>
<width>
433
</width>
<height>
2
16
</height>
<height>
2
33
</height>
</rect>
</property>
<property
name=
"windowTitle"
>
...
...
@@ -23,7 +23,7 @@
<item>
<widget
class=
"QGroupBox"
name=
"groupBox"
>
<property
name=
"title"
>
<string>
Gdb Debug Op
tions
</string>
<string>
Loca
tions
</string>
</property>
<layout
class=
"QGridLayout"
>
<property
name=
"margin"
>
...
...
@@ -33,33 +33,36 @@
<number>
6
</number>
</property>
<item
row=
"0"
column=
"1"
>
<widget
class=
"QLineEdit"
name=
"gdbEdit"
/>
<widget
class=
"QLineEdit"
name=
"gdb
Location
Edit"
/>
</item>
<item
row=
"1"
column=
"1"
colspan=
"2"
>
<widget
class=
"QLineEdit"
name=
"envEdit"
/>
<widget
class=
"QLineEdit"
name=
"env
ironment
Edit"
/>
</item>
<item
row=
"0"
column=
"0"
>
<widget
class=
"QLabel"
name=
"label"
>
<widget
class=
"QLabel"
name=
"labelGdbLocaltion"
>
<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>
</property>
<property
name=
"text"
>
<string>
Gdb Location:
</string>
</property>
<property
name=
"buddy"
>
<cstring>
gdbEdit
</cstring>
<cstring>
gdb
Location
Edit
</cstring>
</property>
</widget>
</item>
<item
row=
"1"
column=
"0"
>
<widget
class=
"QLabel"
name=
"label
_2
"
>
<widget
class=
"QLabel"
name=
"label
Environment
"
>
<property
name=
"text"
>
<string>
Environment:
</string>
</property>
<property
name=
"buddy"
>
<cstring>
envEdit
</cstring>
<cstring>
env
ironment
Edit
</cstring>
</property>
</widget>
</item>
<item
row=
"0"
column=
"2"
>
<widget
class=
"QPushButton"
name=
"
pushButtonBrowse
"
>
<widget
class=
"QPushButton"
name=
"
browseForGdbButton
"
>
<property
name=
"text"
>
<string/>
</property>
...
...
@@ -72,6 +75,36 @@
</property>
</widget>
</item>
<item
row=
"2"
column=
"1"
>
<widget
class=
"QLineEdit"
name=
"gdbStartupScriptEdit"
/>
</item>
<item
row=
"2"
column=
"2"
>
<widget
class=
"QToolButton"
name=
"browseForScriptButton"
>
<property
name=
"minimumSize"
>
<size>
<width>
21
</width>
<height>
23
</height>
</size>
</property>
<property
name=
"text"
>
<string>
...
</string>
</property>
<property
name=
"icon"
>
<iconset
resource=
"../coreplugin/core.qrc"
>
<normaloff>
:/qworkbench/images/fileopen.png
</normaloff>
:/qworkbench/images/fileopen.png
</iconset>
</property>
</widget>
</item>
<item
row=
"2"
column=
"0"
>
<widget
class=
"QLabel"
name=
"labelGdbStartupScript"
>
<property
name=
"toolTip"
>
<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
name=
"text"
>
<string>
Gdb Startup Script:
</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
...
...
src/plugins/debugger/gdbtypemacros.ui
View file @
a556ddad
<ui version="4.0" >
<author></author>
<comment></comment>
<exportmacro></exportmacro>
<?xml version="1.0" encoding="UTF-8"?>
<ui
version=
"4.0"
>
<class>
TypeMacroPage
</class>
<widget class="QWidget" name="TypeMacroPage"
>
<property name="geometry"
>
<widget
class=
"QWidget"
name=
"TypeMacroPage"
>
<property
name=
"geometry"
>
<rect>
<x>
0
</x>
<y>
0
</y>
<width>
519
</width>
<height>23
8
</height>
<height>
2
6
3
</height>
</rect>
</property>
<property name="windowTitle"
>
<property
name=
"windowTitle"
>
<string>
Form
</string>
</property>
<layout class="QVBoxLayout" >
<property name="margin" >
<number>9</number>
</property>
<property name="spacing" >
<layout
class=
"QVBoxLayout"
>
<property
name=
"spacing"
>
<number>
6
</number>
</property>
<property
name=
"margin"
>
<number>
9
</number>
</property>
<item>
<widget class="QGroupBox" name="groupBox" >
<property name="title" >
<string>Script File</string>
</property>
<layout class="QHBoxLayout" >
<property name="margin" >
<number>9</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item>
<widget class="QLineEdit" name="scriptEdit" />
</item>
<item>
<widget class="QToolButton" name="scriptButton" >
<property name="minimumSize" >
<size>
<width>21</width>
<height>23</height>
</size>
</property>
<property name="text" >
<string>...</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<layout class="QGridLayout" >
<property name="margin" >
<layout
class=
"QGridLayout"
>
<property
name=
"margin"
>
<number>
0
</number>
</property>
<property name="spacing"
>
<property
name=
"spacing"
>
<number>
6
</number>
</property>
<item row="0" column="0" colspan="2"
>
<widget class="QTreeWidget" name="treeWidget"
>
<property name="rootIsDecorated"
>
<item
row=
"0"
column=
"0"
colspan=
"2"
>
<widget
class=
"QTreeWidget"
name=
"treeWidget"
>
<property
name=
"rootIsDecorated"
>
<bool>
false
</bool>
</property>
<column>
<property name="text"
>
<property
name=
"text"
>
<string>
Type
</string>
</property>
</column>
<column>
<property name="text"
>
<property
name=
"text"
>
<string>
Macro
</string>
</property>
</column>
</widget>
</item>
<item row="1" column="2"
>
<widget class="QToolButton" name="addButton"
>
<property name="minimumSize"
>
<item
row=
"1"
column=
"2"
>
<widget
class=
"QToolButton"
name=
"addButton"
>
<property
name=
"minimumSize"
>
<size>
<width>
21
</width>
<height>
23
</height>
</size>
</property>
<property name="text"
>
<property
name=
"text"
>
<string>
+
</string>
</property>
<property name="icon" >
<iconset resource="gdbdebugger.qrc" >:/gdbdebugger/images/newitem.png</iconset>
<property
name=
"icon"
>
<iconset>
<normaloff>
:/gdbdebugger/images/newitem.png
</normaloff>
:/gdbdebugger/images/newitem.png
</iconset>
</property>
</widget>
</item>
<item row="2" column="0"
>
<widget class="QLabel" name="label_2"
>
<property name="text"
>
<item
row=
"2"
column=
"0"
>
<widget
class=
"QLabel"
name=
"label_2"
>
<property
name=
"text"
>
<string>
Macro Name:
</string>
</property>
</widget>
</item>
<item row="3" column="0"
>
<widget class="QLabel" name="label_3"
>
<property name="text"
>
<item
row=
"3"
column=
"0"
>
<widget
class=
"QLabel"
name=
"label_3"
>
<property
name=
"text"
>
<string>
Parse as:
</string>
</property>
</widget>
</item>
<item row="2" column="1"
>
<widget class="QLineEdit" name="macroEdit"
/>
<item
row=
"2"
column=
"1"
>
<widget
class=
"QLineEdit"
name=
"macroEdit"
/>
</item>
<item row="0" column="2"
>
<layout class="QVBoxLayout"
>
<property name="
margin"
>
<item
row=
"0"
column=
"2"
>
<layout
class=
"QVBoxLayout"
>
<property
name=
"
spacing"
>
<number>
0
</number>
</property>
<property name="
spacing"
>
<property
name=
"
margin"
>
<number>
0
</number>
</property>
<item>
<widget class="QToolButton" name="delButton"
>
<property name="minimumSize"
>
<widget
class=
"QToolButton"
name=
"delButton"
>
<property
name=
"minimumSize"
>
<size>
<width>
21
</width>
<height>
23
</height>
</size>
</property>
<property name="text"
>
<property
name=
"text"
>
<string>
-
</string>
</property>
<property name="icon" >
<iconset resource="gdbdebugger.qrc" >:/gdbdebugger/images/delete.png</iconset>
<property
name=
"icon"
>
<iconset>
<normaloff>
:/gdbdebugger/images/delete.png
</normaloff>
:/gdbdebugger/images/delete.png
</iconset>
</property>
</widget>
</item>
<item>
<spacer>
<property name="orientation"
>
<property
name=
"orientation"
>
<enum>
Qt::Vertical
</enum>
</property>
<property name="sizeHint" >
<property
name=
"sizeHint"
stdset=
"0"
>
<size>
<width>
20
</width>
<height>
40
</height>
...
...
@@ -150,25 +119,25 @@
</item>
</layout>
</item>
<item row="1" column="1"
>
<widget class="QLineEdit" name="typeEdit"
/>
<item
row=
"1"
column=
"1"
>
<widget
class=
"QLineEdit"
name=
"typeEdit"
/>
</item>
<item row="1" column="0"
>
<widget class="QLabel" name="label"
>
<property name="text"
>
<item
row=
"1"
column=
"0"
>
<widget
class=
"QLabel"
name=
"label"
>
<property
name=
"text"
>
<string>
Type:
</string>
</property>
</widget>
</item>
<item row="3" column="1"
>
<widget class="QComboBox" name="parseAsBox"
>
<item
row=
"3"
column=
"1"
>
<widget
class=
"QComboBox"
name=
"parseAsBox"
>
<item>
<property name="text"
>
<property
name=
"text"
>
<string>
ASCII (char *)
</string>
</property>
</item>
<item>
<property name="text"
>
<property
name=
"text"
>
<string>
Unicode (short)
</string>
</property>
</item>
...
...
@@ -178,9 +147,8 @@
</item>
</layout>
</widget>
<pixmapfunction></pixmapfunction>
<resources>
<include location="gdbdebugger.qrc"
/>
<include
location=
"gdbdebugger.qrc"
/>
</resources>
<connections/>
</ui>
src/plugins/git/settingspage.cpp
View file @
a556ddad
...
...
@@ -77,7 +77,7 @@ QString SettingsPage::name() const
return
tr
(
"General"
);
}
QString
SettingsPage
::
category
()
const
QString
SettingsPage
::
category
()
const
{
return
QLatin1String
(
"Git"
);
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment