Skip to content

Commit

Permalink
Add a button to open the config file in a text editor
Browse files Browse the repository at this point in the history
  • Loading branch information
eric-likes-cake committed Mar 23, 2017
1 parent a230b05 commit 9ab9e7d
Show file tree
Hide file tree
Showing 5 changed files with 102 additions and 32 deletions.
102 changes: 70 additions & 32 deletions src/qt/forms/optionsdialog.ui
Expand Up @@ -692,17 +692,34 @@
<item>
<layout class="QHBoxLayout" name="horizontalLayout_Buttons">
<item>
<widget class="QPushButton" name="resetButton">
<property name="toolTip">
<string>Reset all client options to default.</string>
</property>
<property name="text">
<string>&amp;Reset Options</string>
</property>
<property name="autoDefault">
<bool>false</bool>
</property>
</widget>
<layout class="QVBoxLayout" name="verticalLayout_Buttons">
<item>
<widget class="QPushButton" name="openBitcoinConfButton">
<property name="toolTip">
<string>Open the %1 configuration file from the working directory.</string>
</property>
<property name="text">
<string>Open Configuration File</string>
</property>
<property name="autoDefault">
<bool>false</bool>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="resetButton">
<property name="toolTip">
<string>Reset all client options to default.</string>
</property>
<property name="text">
<string>&amp;Reset Options</string>
</property>
<property name="autoDefault">
<bool>false</bool>
</property>
</widget>
</item>
</layout>
</item>
<item>
<spacer name="horizontalSpacer_1">
Expand Down Expand Up @@ -756,27 +773,48 @@
</spacer>
</item>
<item>
<widget class="QPushButton" name="okButton">
<property name="text">
<string>&amp;OK</string>
</property>
<property name="autoDefault">
<bool>false</bool>
</property>
<property name="default">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="cancelButton">
<property name="text">
<string>&amp;Cancel</string>
</property>
<property name="autoDefault">
<bool>false</bool>
</property>
</widget>
<layout class="QVBoxLayout" name="verticalLayout_4">
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QPushButton" name="okButton">
<property name="text">
<string>&amp;OK</string>
</property>
<property name="autoDefault">
<bool>false</bool>
</property>
<property name="default">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="cancelButton">
<property name="text">
<string>&amp;Cancel</string>
</property>
<property name="autoDefault">
<bool>false</bool>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</item>
</layout>
</item>
Expand Down
16 changes: 16 additions & 0 deletions src/qt/guiutil.cpp
Expand Up @@ -417,6 +417,22 @@ void openDebugLogfile()
QDesktopServices::openUrl(QUrl::fromLocalFile(boostPathToQString(pathDebug)));
}

bool openBitcoinConf()
{
boost::filesystem::path pathConfig = GetConfigFile(BITCOIN_CONF_FILENAME);

/* Create the file */
boost::filesystem::ofstream configFile(pathConfig, std::ios_base::app);

if (!configFile.good())
return false;

configFile.close();

/* Open bitcoin.conf with the associated application */
return QDesktopServices::openUrl(QUrl::fromLocalFile(boostPathToQString(pathConfig)));
}

void SubstituteFonts(const QString& language)
{
#if defined(Q_OS_MAC)
Expand Down
3 changes: 3 additions & 0 deletions src/qt/guiutil.h
Expand Up @@ -114,6 +114,9 @@ namespace GUIUtil
// Open debug.log
void openDebugLogfile();

// Open the config file
bool openBitcoinConf();

// Replace invalid default fonts with known good ones
void SubstituteFonts(const QString& language);

Expand Down
12 changes: 12 additions & 0 deletions src/qt/optionsdialog.cpp
Expand Up @@ -232,6 +232,18 @@ void OptionsDialog::on_resetButton_clicked()
}
}

void OptionsDialog::on_openBitcoinConfButton_clicked()
{
/* explain the purpose of the config file */
QMessageBox::information(this, tr("Configuration options"),
tr("The configuration file is used to specify advanced user options which override GUI settings. "
"Additionally, any command-line options will override this configuration file."));

/* show an error if there was some problem opening the file */
if (!GUIUtil::openBitcoinConf())
QMessageBox::critical(this, tr("Error"), tr("The configuration file could not be opened."));
}

void OptionsDialog::on_okButton_clicked()
{
mapper->submit();
Expand Down
1 change: 1 addition & 0 deletions src/qt/optionsdialog.h
Expand Up @@ -47,6 +47,7 @@ private Q_SLOTS:
/* set OK button state (enabled / disabled) */
void setOkButtonState(bool fState);
void on_resetButton_clicked();
void on_openBitcoinConfButton_clicked();
void on_okButton_clicked();
void on_cancelButton_clicked();

Expand Down

0 comments on commit 9ab9e7d

Please sign in to comment.