forked from qt-creator/qt-creator
debugger: make "debugger font size follows main editor optional"
Task-number: QTCREATORBUG-2420
This commit is contained in:
@@ -73,6 +73,8 @@ CommonOptionsPageWidget::CommonOptionsPageWidget
|
|||||||
m_ui.checkBoxCloseBuffersOnExit);
|
m_ui.checkBoxCloseBuffersOnExit);
|
||||||
m_group->insert(dc->action(SwitchModeOnExit),
|
m_group->insert(dc->action(SwitchModeOnExit),
|
||||||
m_ui.checkBoxSwitchModeOnExit);
|
m_ui.checkBoxSwitchModeOnExit);
|
||||||
|
m_group->insert(dc->action(FontSizeFollowsEditor),
|
||||||
|
m_ui.checkBoxFontSizeFollowsEditor);
|
||||||
m_group->insert(dc->action(AutoDerefPointers), 0);
|
m_group->insert(dc->action(AutoDerefPointers), 0);
|
||||||
m_group->insert(dc->action(UseToolTipsInLocalsView), 0);
|
m_group->insert(dc->action(UseToolTipsInLocalsView), 0);
|
||||||
m_group->insert(dc->action(AlwaysAdjustLocalsColumnWidths), 0);
|
m_group->insert(dc->action(AlwaysAdjustLocalsColumnWidths), 0);
|
||||||
@@ -110,6 +112,7 @@ QString CommonOptionsPageWidget::searchKeyWords() const
|
|||||||
const QLatin1Char sep(' ');
|
const QLatin1Char sep(' ');
|
||||||
QTextStream(&rc)
|
QTextStream(&rc)
|
||||||
<< sep << m_ui.checkBoxUseAlternatingRowColors->text()
|
<< sep << m_ui.checkBoxUseAlternatingRowColors->text()
|
||||||
|
<< sep << m_ui.checkBoxFontSizeFollowsEditor->text()
|
||||||
<< sep << m_ui.checkBoxUseToolTipsInMainEditor->text()
|
<< sep << m_ui.checkBoxUseToolTipsInMainEditor->text()
|
||||||
<< sep << m_ui.checkBoxListSourceFiles->text()
|
<< sep << m_ui.checkBoxListSourceFiles->text()
|
||||||
#ifdef Q_OS_WIN
|
#ifdef Q_OS_WIN
|
||||||
|
|||||||
@@ -25,13 +25,23 @@
|
|||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="2" column="0" colspan="2">
|
<item row="2" column="0" colspan="2">
|
||||||
|
<widget class="QCheckBox" name="checkBoxFontSizeFollowsEditor">
|
||||||
|
<property name="text">
|
||||||
|
<string>Debugger font size follows main editor</string>
|
||||||
|
</property>
|
||||||
|
<property name="toolTip">
|
||||||
|
<string>Selecting this results in font size changes in the debugger views whenever the font size in the main editor changes.</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="3" column="0" colspan="2">
|
||||||
<widget class="QCheckBox" name="checkBoxUseToolTipsInMainEditor">
|
<widget class="QCheckBox" name="checkBoxUseToolTipsInMainEditor">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Use tooltips in main editor while debugging</string>
|
<string>Use tooltips in main editor while debugging</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="3" column="0" colspan="2">
|
<item row="4" column="0" colspan="2">
|
||||||
<widget class="QCheckBox" name="checkBoxListSourceFiles">
|
<widget class="QCheckBox" name="checkBoxListSourceFiles">
|
||||||
<property name="toolTip">
|
<property name="toolTip">
|
||||||
<string>Checking this will populate the source file view automatically but might slow down debugger startup considerably.</string>
|
<string>Checking this will populate the source file view automatically but might slow down debugger startup considerably.</string>
|
||||||
@@ -41,7 +51,7 @@
|
|||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="4" column="0" colspan="2">
|
<item row="5" column="0" colspan="2">
|
||||||
<widget class="QCheckBox" name="checkBoxRegisterForPostMortem">
|
<widget class="QCheckBox" name="checkBoxRegisterForPostMortem">
|
||||||
<property name="toolTip">
|
<property name="toolTip">
|
||||||
<string>Register Qt Creator for debugging crashed applications.</string>
|
<string>Register Qt Creator for debugging crashed applications.</string>
|
||||||
@@ -51,7 +61,7 @@
|
|||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="5" column="0" colspan="2">
|
<item row="6" column="0" colspan="2">
|
||||||
<widget class="QCheckBox" name="checkBoxCloseBuffersOnExit">
|
<widget class="QCheckBox" name="checkBoxCloseBuffersOnExit">
|
||||||
<property name="toolTip">
|
<property name="toolTip">
|
||||||
<string>Close temporary buffers on debugger exit.</string>
|
<string>Close temporary buffers on debugger exit.</string>
|
||||||
@@ -61,7 +71,7 @@
|
|||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="6" column="0" colspan="2">
|
<item row="7" column="0" colspan="2">
|
||||||
<widget class="QCheckBox" name="checkBoxSwitchModeOnExit">
|
<widget class="QCheckBox" name="checkBoxSwitchModeOnExit">
|
||||||
<property name="toolTip">
|
<property name="toolTip">
|
||||||
<string>Switch to previous mode on debugger exit.</string>
|
<string>Switch to previous mode on debugger exit.</string>
|
||||||
@@ -71,7 +81,7 @@
|
|||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="7" column="0">
|
<item row="8" column="0">
|
||||||
<widget class="QLabel" name="labelMaximalStackDepth">
|
<widget class="QLabel" name="labelMaximalStackDepth">
|
||||||
<property name="sizePolicy">
|
<property name="sizePolicy">
|
||||||
<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
|
<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
|
||||||
@@ -84,7 +94,7 @@
|
|||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="7" column="1">
|
<item row="9" column="1">
|
||||||
<layout class="QHBoxLayout" name="horizontalLayout">
|
<layout class="QHBoxLayout" name="horizontalLayout">
|
||||||
<item>
|
<item>
|
||||||
<widget class="QSpinBox" name="spinBoxMaximalStackDepth">
|
<widget class="QSpinBox" name="spinBoxMaximalStackDepth">
|
||||||
|
|||||||
@@ -176,6 +176,13 @@ DebuggerSettings::DebuggerSettings(QSettings *settings)
|
|||||||
item->setDefaultValue(false);
|
item->setDefaultValue(false);
|
||||||
insertItem(UseAlternatingRowColors, item);
|
insertItem(UseAlternatingRowColors, item);
|
||||||
|
|
||||||
|
item = new SavedAction(this);
|
||||||
|
item->setText(tr("Debugger Font Size Follows Main Editor"));
|
||||||
|
item->setSettingsKey(debugModeGroup, QLatin1String("FontSizeFollowsEditor"));
|
||||||
|
item->setCheckable(true);
|
||||||
|
item->setDefaultValue(false);
|
||||||
|
insertItem(FontSizeFollowsEditor, item);
|
||||||
|
|
||||||
item = new SavedAction(this);
|
item = new SavedAction(this);
|
||||||
item->setText(tr("Show a Message Box When Receiving a Signal"));
|
item->setText(tr("Show a Message Box When Receiving a Signal"));
|
||||||
item->setSettingsKey(debugModeGroup, QLatin1String("UseMessageBoxForSignals"));
|
item->setSettingsKey(debugModeGroup, QLatin1String("UseMessageBoxForSignals"));
|
||||||
|
|||||||
@@ -91,6 +91,7 @@ enum DebuggerActionCode
|
|||||||
// General
|
// General
|
||||||
SettingsDialog,
|
SettingsDialog,
|
||||||
UseAlternatingRowColors,
|
UseAlternatingRowColors,
|
||||||
|
FontSizeFollowsEditor,
|
||||||
UseMessageBoxForSignals,
|
UseMessageBoxForSignals,
|
||||||
AutoQuit,
|
AutoQuit,
|
||||||
LockView,
|
LockView,
|
||||||
|
|||||||
@@ -1822,6 +1822,8 @@ static void changeFontSize(QWidget *widget, qreal size)
|
|||||||
void DebuggerPluginPrivate::fontSettingsChanged
|
void DebuggerPluginPrivate::fontSettingsChanged
|
||||||
(const TextEditor::FontSettings &settings)
|
(const TextEditor::FontSettings &settings)
|
||||||
{
|
{
|
||||||
|
if (!boolSetting(FontSizeFollowsEditor))
|
||||||
|
return;
|
||||||
qreal size = settings.fontZoom() * settings.fontSize() / 100.;
|
qreal size = settings.fontZoom() * settings.fontSize() / 100.;
|
||||||
changeFontSize(m_breakWindow, size);
|
changeFontSize(m_breakWindow, size);
|
||||||
changeFontSize(m_logWindow, size);
|
changeFontSize(m_logWindow, size);
|
||||||
|
|||||||
Reference in New Issue
Block a user