x64dbg/x64dbg
x64dbg
/
x64dbg
1
0
Fork 0
Code Releases 2 Activity

GUI: deprecate local help file + fixed release script

This commit is contained in:
mrexodia 2017-08-01 19:23:15 +02:00
parent 7530c01bf9
commit 6059511296
No known key found for this signature in database
GPG Key ID: FC89E0AAA0C1AAD8
5 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
release.bat
View File

@ -65,7 +65,7 @@ mkdir %RELEASEDIR%\release\x64
xcopy deps\x32 %RELEASEDIR%\release\x32 /S /Y
xcopy deps\x64 %RELEASEDIR%\release\x64 /S /Y
copy help\x64dbg.chm %RELEASEDIR%\
copy help\x64dbg.chm %RELEASEDIR%\release\
copy bin\x96dbg.exe %RELEASEDIR%\release\
copy bin\mnemdb.json %RELEASEDIR%\release\
copy bin\errordb.txt %RELEASEDIR%\release\

12
src/gui/Src/Gui/MainWindow.cpp
View File

@ -1526,9 +1526,15 @@ void MainWindow::changeCommandLine()
void MainWindow::displayManual()
{
// Open the Windows CHM in the upper directory
if(!QDesktopServices::openUrl(QUrl(QUrl::fromLocalFile(QString("%1/../x64dbg.chm").arg(QCoreApplication::applicationDirPath())))))
SimpleErrorBox(this, tr("Error"), tr("Manual cannot be opened. Please check if x64dbg.chm exists and ensure there is no other problems with your system."));
duint setting = 0;
if(BridgeSettingGetUint("Misc", "UseLocalHelpFile", &setting) && setting)
{
// Open the Windows CHM in the upper directory
if(!QDesktopServices::openUrl(QUrl(QUrl::fromLocalFile(QString("%1/../x64dbg.chm").arg(QCoreApplication::applicationDirPath())))))
SimpleErrorBox(this, tr("Error"), tr("Manual cannot be opened. Please check if x64dbg.chm exists and ensure there is no other problems with your system."));
}
else
QDesktopServices::openUrl(QUrl("http://help.x64dbg.com"));
}
void MainWindow::canClose()

8
src/gui/Src/Gui/SettingsDialog.cpp
View File

@ -292,7 +292,9 @@ void SettingsDialog::LoadSettings()
bJitAutoOld = settings.miscSetJITAuto;
GetSettingBool("Misc", "Utf16LogRedirect", &settings.miscUtf16LogRedirect);
GetSettingBool("Misc", "UseLocalHelpFile", &settings.miscUseLocalHelpFile);
ui->chkUtf16LogRedirect->setChecked(settings.miscUtf16LogRedirect);
ui->chkUseLocalHelpFile->setChecked(settings.miscUseLocalHelpFile);
}
void SettingsDialog::SaveSettings()
@ -385,6 +387,7 @@ void SettingsDialog::SaveSettings()
BridgeSettingSet("Symbols", "CachePath", ui->editSymbolCache->text().toUtf8().constData());
BridgeSettingSet("Misc", "HelpOnSymbolicNameUrl", ui->editHelpOnSymbolicNameUrl->text().toUtf8().constData());
BridgeSettingSetUint("Misc", "Utf16LogRedirect", settings.miscUtf16LogRedirect);
BridgeSettingSetUint("Misc", "UseLocalHelpFile", settings.miscUseLocalHelpFile);
BridgeSettingFlush();
Config()->load();
@ -811,3 +814,8 @@ void SettingsDialog::on_chkShowExitConfirmation_toggled(bool checked)
{
settings.guiShowExitConfirmation = checked;
}
void SettingsDialog::on_chkUseLocalHelpFile_toggled(bool checked)
{
settings.miscUseLocalHelpFile = checked;
}

2
src/gui/Src/Gui/SettingsDialog.h
View File

@ -88,6 +88,7 @@ private slots:
void on_editSymbolCache_textEdited(const QString & arg1);
void on_chkUtf16LogRedirect_toggled(bool checked);
void on_chkShowGraphRva_toggled(bool checked);
void on_chkUseLocalHelpFile_toggled(bool checked);
private:
//enums
@ -178,6 +179,7 @@ private:
bool miscSymbolStore;
bool miscSymbolCache;
bool miscUtf16LogRedirect;
bool miscUseLocalHelpFile;
};
//variables

7
src/gui/Src/Gui/SettingsDialog.ui
View File

@ -748,6 +748,13 @@
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="chkUseLocalHelpFile">
<property name="text">
<string>Use local help file (x64dbg.chm)</string>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer_3">
<property name="orientation">