Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions Settings/Settings.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -66,21 +66,6 @@ QString randomString(int length) {
return randomString;
}

/**
* @brief configDirectory
* @return
*/
QString configDirectory() {
static const QByteArray nedit_home = qgetenv("NEDIT_NG_HOME");
if (!nedit_home.isEmpty()) {
return QString::fromLocal8Bit(nedit_home);
}

static const QString configDir = QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation);
static const auto filename = QStringLiteral("%1/nedit-ng").arg(configDir);
return filename;
}

}

bool alwaysCheckRelativeTagsSpecs;
Expand Down Expand Up @@ -161,6 +146,21 @@ ShowMatchingStyle showMatching;
TruncSubstitution truncSubstitution;
WrapStyle autoWrap;

/**
* @brief configDirectory
* @return
*/
QString configDirectory() {
static const QByteArray nedit_home = qgetenv("NEDIT_NG_HOME");
if (!nedit_home.isEmpty()) {
return QString::fromLocal8Bit(nedit_home);
}

static const QString configDir = QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation);
static const auto filename = QStringLiteral("%1/nedit-ng").arg(configDir);
return filename;
}

/**
* @brief themeFile
* @return
Expand Down
1 change: 1 addition & 0 deletions Settings/Settings.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ bool savePreferences();
void importSettings(const QString &filename);

// Paths
QString configDirectory();
QString configFile();
QString historyFile();
QString autoLoadMacroFile();
Expand Down
15 changes: 15 additions & 0 deletions src/MainWindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
#include <QActionGroup>
#include <QButtonGroup>
#include <QClipboard>
#include <QDesktopServices>
#include <QInputDialog>
#include <QMessageBox>
#include <QMimeData>
Expand Down Expand Up @@ -380,6 +381,7 @@ void MainWindow::connectSlots() {
connect(ui.action_About, &QAction::triggered, this, &MainWindow::action_About_triggered);
connect(ui.action_About_Qt, &QAction::triggered, this, &MainWindow::action_About_Qt_triggered);
connect(ui.action_Help, &QAction::triggered, this, &MainWindow::action_Help_triggered);
connect(ui.action_Open_Configuration_Directory, &QAction::triggered, this, &MainWindow::action_Open_Configuration_Directory_triggered);

connect(ui.action_Statistics_Line, &QAction::toggled, this, &MainWindow::action_Statistics_Line_toggled);
connect(ui.action_Incremental_Search_Line, &QAction::toggled, this, &MainWindow::action_Incremental_Search_Line_toggled);
Expand Down Expand Up @@ -5574,6 +5576,19 @@ void MainWindow::action_Help_triggered() {
Help::displayTopic(Help::Topic::Start);
}

/**
* @brief MainWindow::action_Open_Configuration_Directory_triggered
*/
void MainWindow::action_Open_Configuration_Directory_triggered() {
const QString configDir = Settings::configDirectory();

// ensure that the folder exists
QDir(configDir).mkpath(QStringLiteral("."));

QUrl url(QStringLiteral("file:///%1").arg(configDir, QUrl::TolerantMode));
QDesktopServices::openUrl(url);
}

/**
* @brief MainWindow::eventFilter
* @param object
Expand Down
1 change: 1 addition & 0 deletions src/MainWindow.h
Original file line number Diff line number Diff line change
Expand Up @@ -418,6 +418,7 @@ class MainWindow final : public QMainWindow {
void action_About_triggered();
void action_About_Qt_triggered();
void action_Help_triggered();
void action_Open_Configuration_Directory_triggered();

private:
void focusChanged(QWidget *from, QWidget *to);
Expand Down
7 changes: 7 additions & 0 deletions src/MainWindow.ui
Original file line number Diff line number Diff line change
Expand Up @@ -482,6 +482,8 @@
<addaction name="separator"/>
<addaction name="action_About"/>
<addaction name="action_About_Qt"/>
<addaction name="separator"/>
<addaction name="action_Open_Configuration_Directory"/>
</widget>
<addaction name="menu_File"/>
<addaction name="menu_Edit"/>
Expand Down Expand Up @@ -1810,6 +1812,11 @@
<string>F1</string>
</property>
</action>
<action name="action_Open_Configuration_Directory">
<property name="text">
<string>Open Configuration &amp;Directory</string>
</property>
</action>
<action name="action_Save_All">
<property name="icon">
<iconset theme="document-save"/>
Expand Down