Skip to content

Commit 5ceb67e

Browse files
committed
Let --dump and -doxyfile write to the launch directory
1 parent 35a3576 commit 5ceb67e

2 files changed

Lines changed: 11 additions & 6 deletions

File tree

addon/doxywizard/doxywizard.cpp

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -334,6 +334,12 @@ void MainWindow::updateWorkingDir()
334334
setWorkingDir(m_workingDir->text());
335335
}
336336

337+
void MainWindow::setLanguage(const QString &langCode)
338+
{
339+
m_settings.setValue(QString::fromLatin1("language/code"), langCode);
340+
m_settings.sync();
341+
}
342+
337343
void MainWindow::manual()
338344
{
339345
QDesktopServices::openUrl(QUrl(QString::fromLatin1("https://www.doxygen.org/manual/index.html")));
@@ -1040,6 +1046,7 @@ int main(int argc,char **argv)
10401046

10411047
{
10421048
qDebug() << "Starting doxywizard...";
1049+
QString initialPath = QDir::currentPath();
10431050

10441051
if (langSet)
10451052
{
@@ -1079,11 +1086,13 @@ int main(int argc,char **argv)
10791086

10801087
if (dumpFlag)
10811088
{
1089+
main.setWorkingDir(initialPath);
10821090
main.dump();
10831091
}
10841092
if (doxyfileFlag)
10851093
{
10861094
QString fn = QString::fromLatin1("Doxyfile_%1").arg(DoxygenWizard::langCode);
1095+
main.setWorkingDir(initialPath);
10871096
main.saveConfig(fn);
10881097
}
10891098
if (dumpFlag ||doxyfileFlag) exit(0);

addon/doxywizard/doxywizard.h

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,8 @@ class MainWindow : public QMainWindow
4646
void outputLogText(QString text);
4747
void outputLogFinish();
4848
void dump();
49-
void setLanguage(const QString &langCode)
50-
{
51-
m_settings.setValue(QString::fromLatin1("language/code"), langCode);
52-
m_settings.sync();
53-
}
49+
void setWorkingDir(const QString &dirName);
50+
void setLanguage(const QString &langCode);
5451
void saveConfig(const QString &fileName);
5552

5653
public slots:
@@ -86,7 +83,6 @@ class MainWindow : public QMainWindow
8683
void addRecentFileList(const QString &fileName);
8784
void updateRecentFile(void);
8885
void updateConfigFileName(const QString &fileName);
89-
void setWorkingDir(const QString &dirName);
9086
void updateLaunchButtonState();
9187
bool discardUnsavedChanges(bool saveOption=true);
9288

0 commit comments

Comments
 (0)