Skip to content
GitLab
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
b14a2082
Commit
b14a2082
authored
Mar 17, 2010
by
Lasse Holmstedt
Browse files
Made debugger menu items disabled in QML inspector mode
parent
7d423d5f
Changes
5
Hide whitespace changes
Inline
Side-by-side
src/plugins/debugger/debuggeractions.cpp
View file @
b14a2082
...
...
@@ -163,6 +163,7 @@ DebuggerSettings *DebuggerSettings::instance()
item
->
setText
(
tr
(
"Operate by Instruction"
));
item
->
setCheckable
(
true
);
item
->
setDefaultValue
(
false
);
item
->
setSettingsKey
(
debugModeGroup
,
QLatin1String
(
"OperateByInstruction"
));
item
->
setIcon
(
QIcon
(
":/debugger/images/SingleInstructionMode.png"
));
item
->
setToolTip
(
tr
(
"This switches the debugger to instruction-wise "
"operation mode. In this mode, stepping operates on single "
...
...
src/plugins/debugger/debuggermanager.cpp
View file @
b14a2082
...
...
@@ -466,6 +466,10 @@ void DebuggerManager::init()
connect
(
this
,
SIGNAL
(
emitShowOutput
(
int
,
QString
)),
d
->
m_outputWindow
,
SLOT
(
showOutput
(
int
,
QString
)),
Qt
::
QueuedConnection
);
// UI Switcher
connect
(
DebuggerUISwitcher
::
instance
(),
SIGNAL
(
languageChanged
(
QString
)),
this
,
SLOT
(
languageChanged
(
QString
)));
// Tooltip
//QTreeView *tooltipView = qobject_cast<QTreeView *>(d->m_tooltipWindow);
//tooltipView->setModel(d->m_watchHandler->model(TooltipsWatch));
...
...
@@ -1925,6 +1929,14 @@ void DebuggerManager::fontSettingsChanged(const TextEditor::FontSettings &settin
changeFontSize
(
d
->
m_threadsWindow
,
size
);
}
// only update necessary menu items on language change
void
DebuggerManager
::
languageChanged
(
const
QString
&
debuggerLanguage
)
{
const
bool
debuggerIsCPP
=
(
debuggerLanguage
==
Constants
::
LANG_CPP
);
d
->
m_actions
.
reverseDirectionAction
->
setEnabled
(
debuggerIsCPP
);
theDebuggerAction
(
OperateByInstruction
)
->
setEnabled
(
debuggerIsCPP
);
}
//////////////////////////////////////////////////////////////////////
//
// AbstractDebuggerEngine
...
...
src/plugins/debugger/debuggermanager.h
View file @
b14a2082
...
...
@@ -280,6 +280,7 @@ public slots: // FIXME
void
reloadFullStack
();
void
operateByInstructionTriggered
();
void
startFailed
();
void
languageChanged
(
const
QString
&
debuggerLanguage
);
private:
Internal
::
ModulesHandler
*
modulesHandler
()
const
;
...
...
src/plugins/debugger/debuggeruiswitcher.cpp
View file @
b14a2082
...
...
@@ -126,7 +126,6 @@ int DebuggerUISwitcher::activeLanguageId() const
{
return
d
->
m_activeLanguage
;
}
void
DebuggerUISwitcher
::
modeChanged
(
Core
::
IMode
*
mode
)
{
d
->
m_isActiveMode
=
(
mode
->
id
()
==
Debugger
::
Constants
::
MODE_DEBUG
);
...
...
src/plugins/qmljseditor/qmljseditor.cpp
View file @
b14a2082
...
...
@@ -650,6 +650,8 @@ QmlJSTextEditor::QmlJSTextEditor(QWidget *parent) :
connect
(
m_semanticHighlighter
,
SIGNAL
(
changed
(
QmlJSEditor
::
Internal
::
SemanticInfo
)),
this
,
SLOT
(
updateSemanticInfo
(
QmlJSEditor
::
Internal
::
SemanticInfo
)));
setRequestMarkEnabled
(
false
);
}
QmlJSTextEditor
::~
QmlJSTextEditor
()
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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