GUI: option for ignore inconsistent breakpoints
This commit is contained in:
		
							parent
							
								
									d4e25474d2
								
							
						
					
					
						commit
						f79b8d7db8
					
				|  | @ -58,6 +58,7 @@ void SettingsDialog::LoadSettings() | ||||||
|     settings.engineEnableSourceDebugging = true; |     settings.engineEnableSourceDebugging = true; | ||||||
|     settings.engineEnableTraceRecordDuringTrace = true; |     settings.engineEnableTraceRecordDuringTrace = true; | ||||||
|     settings.engineNoScriptTimeout = false; |     settings.engineNoScriptTimeout = false; | ||||||
|  |     settings.engineIgnoreInconsistentBreakpoints = false; | ||||||
|     settings.exceptionRanges = &realExceptionRanges; |     settings.exceptionRanges = &realExceptionRanges; | ||||||
|     settings.disasmArgumentSpaces = false; |     settings.disasmArgumentSpaces = false; | ||||||
|     settings.disasmMemorySpaces = false; |     settings.disasmMemorySpaces = false; | ||||||
|  | @ -120,6 +121,7 @@ void SettingsDialog::LoadSettings() | ||||||
|     GetSettingBool("Engine", "TraceRecordEnabledDuringTrace", &settings.engineEnableTraceRecordDuringTrace); |     GetSettingBool("Engine", "TraceRecordEnabledDuringTrace", &settings.engineEnableTraceRecordDuringTrace); | ||||||
|     GetSettingBool("Engine", "SkipInt3Stepping", &settings.engineSkipInt3Stepping); |     GetSettingBool("Engine", "SkipInt3Stepping", &settings.engineSkipInt3Stepping); | ||||||
|     GetSettingBool("Engine", "NoScriptTimeout", &settings.engineNoScriptTimeout); |     GetSettingBool("Engine", "NoScriptTimeout", &settings.engineNoScriptTimeout); | ||||||
|  |     GetSettingBool("Engine", "IgnoreInconsistentBreakpoints", &settings.engineIgnoreInconsistentBreakpoints); | ||||||
|     switch(settings.engineCalcType) |     switch(settings.engineCalcType) | ||||||
|     { |     { | ||||||
|     case calc_signed: |     case calc_signed: | ||||||
|  | @ -149,6 +151,7 @@ void SettingsDialog::LoadSettings() | ||||||
|     ui->chkTraceRecordEnabledDuringTrace->setChecked(settings.engineEnableTraceRecordDuringTrace); |     ui->chkTraceRecordEnabledDuringTrace->setChecked(settings.engineEnableTraceRecordDuringTrace); | ||||||
|     ui->chkSkipInt3Stepping->setChecked(settings.engineSkipInt3Stepping); |     ui->chkSkipInt3Stepping->setChecked(settings.engineSkipInt3Stepping); | ||||||
|     ui->chkNoScriptTimeout->setChecked(settings.engineNoScriptTimeout); |     ui->chkNoScriptTimeout->setChecked(settings.engineNoScriptTimeout); | ||||||
|  |     ui->chkIgnoreInconsistentBreakpoints->setChecked(settings.engineIgnoreInconsistentBreakpoints); | ||||||
| 
 | 
 | ||||||
|     //Exceptions tab
 |     //Exceptions tab
 | ||||||
|     char exceptionRange[MAX_SETTING_SIZE] = ""; |     char exceptionRange[MAX_SETTING_SIZE] = ""; | ||||||
|  | @ -283,6 +286,7 @@ void SettingsDialog::SaveSettings() | ||||||
|     BridgeSettingSetUint("Engine", "TraceRecordEnabledDuringTrace", settings.engineEnableTraceRecordDuringTrace); |     BridgeSettingSetUint("Engine", "TraceRecordEnabledDuringTrace", settings.engineEnableTraceRecordDuringTrace); | ||||||
|     BridgeSettingSetUint("Engine", "SkipInt3Stepping", settings.engineSkipInt3Stepping); |     BridgeSettingSetUint("Engine", "SkipInt3Stepping", settings.engineSkipInt3Stepping); | ||||||
|     BridgeSettingSetUint("Engine", "NoScriptTimeout", settings.engineNoScriptTimeout); |     BridgeSettingSetUint("Engine", "NoScriptTimeout", settings.engineNoScriptTimeout); | ||||||
|  |     BridgeSettingSetUint("Engine", "IgnoreInconsistentBreakpoints", settings.engineIgnoreInconsistentBreakpoints); | ||||||
| 
 | 
 | ||||||
|     //Exceptions tab
 |     //Exceptions tab
 | ||||||
|     QString exceptionRange = ""; |     QString exceptionRange = ""; | ||||||
|  | @ -690,3 +694,8 @@ void SettingsDialog::on_chkSidebarWatchLabels_stateChanged(int arg1) | ||||||
| { | { | ||||||
|     settings.guiSidebarWatchLabels = arg1 != Qt::Unchecked; |     settings.guiSidebarWatchLabels = arg1 != Qt::Unchecked; | ||||||
| } | } | ||||||
|  | 
 | ||||||
|  | void SettingsDialog::on_chkIgnoreInconsistentBreakpoints_toggled(bool checked) | ||||||
|  | { | ||||||
|  |     settings.engineIgnoreInconsistentBreakpoints = checked; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | @ -75,6 +75,8 @@ private slots: | ||||||
|     void on_editSymbolStore_textEdited(const QString & arg1); |     void on_editSymbolStore_textEdited(const QString & arg1); | ||||||
|     void on_editSymbolCache_textEdited(const QString & arg1); |     void on_editSymbolCache_textEdited(const QString & arg1); | ||||||
| 
 | 
 | ||||||
|  |     void on_chkIgnoreInconsistentBreakpoints_toggled(bool checked); | ||||||
|  | 
 | ||||||
| private: | private: | ||||||
|     //enums
 |     //enums
 | ||||||
|     enum CalcType |     enum CalcType | ||||||
|  | @ -130,6 +132,7 @@ private: | ||||||
|         bool engineEnableTraceRecordDuringTrace; |         bool engineEnableTraceRecordDuringTrace; | ||||||
|         bool engineSkipInt3Stepping; |         bool engineSkipInt3Stepping; | ||||||
|         bool engineNoScriptTimeout; |         bool engineNoScriptTimeout; | ||||||
|  |         bool engineIgnoreInconsistentBreakpoints; | ||||||
|         //Exception Tab
 |         //Exception Tab
 | ||||||
|         QList<RangeStruct>* exceptionRanges; |         QList<RangeStruct>* exceptionRanges; | ||||||
|         //Disasm Tab
 |         //Disasm Tab
 | ||||||
|  |  | ||||||
|  | @ -33,7 +33,7 @@ | ||||||
|       <bool>true</bool> |       <bool>true</bool> | ||||||
|      </property> |      </property> | ||||||
|      <property name="currentIndex"> |      <property name="currentIndex"> | ||||||
|       <number>0</number> |       <number>1</number> | ||||||
|      </property> |      </property> | ||||||
|      <widget class="QWidget" name="tabEvents"> |      <widget class="QWidget" name="tabEvents"> | ||||||
|       <attribute name="title"> |       <attribute name="title"> | ||||||
|  | @ -303,6 +303,13 @@ | ||||||
|          </property> |          </property> | ||||||
|         </widget> |         </widget> | ||||||
|        </item> |        </item> | ||||||
|  |        <item> | ||||||
|  |         <widget class="QCheckBox" name="chkIgnoreInconsistentBreakpoints"> | ||||||
|  |          <property name="text"> | ||||||
|  |           <string>&Ignore inconsistent breakpoints</string> | ||||||
|  |          </property> | ||||||
|  |         </widget> | ||||||
|  |        </item> | ||||||
|        <item> |        <item> | ||||||
|         <spacer name="verticalSpacer"> |         <spacer name="verticalSpacer"> | ||||||
|          <property name="orientation"> |          <property name="orientation"> | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue