Cannot select custom folder for report files in AppImage #942

Quick-Event · Aug 25, 2023 · 077c4c7 · 077c4c7
1 parent 97517c3
commit 077c4c7
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/quickevent/app/quickevent/plugins/Core/src/widgets/reportssettingspage.cpp b/quickevent/app/quickevent/plugins/Core/src/widgets/reportssettingspage.cpp
@@ -21,6 +21,8 @@ ReportsSettingsPage::ReportsSettingsPage(QWidget *parent) :
 	//m_settingsDir = plugin->settingsDir() + "/reports";
 	m_caption = tr("Reports");
 	ui->setupUi(this);
+
+	ui->lblHelp->setText(ui->lblHelp->text().arg(defaultReportsDirectory()));
 }
 
 ReportsSettingsPage::~ReportsSettingsPage()
@@ -66,12 +68,17 @@ void ReportsSettingsPage::save()
 	qf::qmlwidgets::framework::Plugin::setReportsDir(dir);
 }
 
+QString ReportsSettingsPage::defaultReportsDirectory() const
+{
+	return QCoreApplication::applicationDirPath() + "/reports";
+}
+
 QString ReportsSettingsPage::reportsDirectory() const
 {
 	ReportsSettings settings;
 	auto dir = settings.reportsDirectory();
 	if(dir.isEmpty())
-		dir = QCoreApplication::applicationDirPath() + "/reports";
+		dir = defaultReportsDirectory();
 	return dir;
 }
 

diff --git a/quickevent/app/quickevent/plugins/Core/src/widgets/reportssettingspage.h b/quickevent/app/quickevent/plugins/Core/src/widgets/reportssettingspage.h
@@ -25,6 +25,8 @@ private slots:
 	void load() override;
 	void save() override;
 
+	QString defaultReportsDirectory() const;
+
 	void setReportsDirectory(const QString dir);
 private:
 	Ui::ReportsSettingsPage *ui;

diff --git a/quickevent/app/quickevent/plugins/Core/src/widgets/reportssettingspage.ui b/quickevent/app/quickevent/plugins/Core/src/widgets/reportssettingspage.ui
@@ -43,9 +43,9 @@
     </layout>
    </item>
    <item>
-    <widget class="QLabel" name="label_2">
+    <widget class="QLabel" name="lblHelp">
      <property name="text">
-      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Reports directory is an directory, where QuickEvent is looking for reports definition QML files. It is populated during installation. Default reports directory is 'bin/reports' in QuickEvent install directory. If you want to have own reports, then you can make reports dir copy, modify QML files and redirect reports dir.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Reports directory is an directory, where QuickEvent is looking for reports definition QML files. It is populated during installation. Default reports directory is '%1' in QuickEvent install directory. If you want to have own reports, then you can make '%1' dir copy, modify QML files and redirect reports dir.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
      </property>
      <property name="wordWrap">
       <bool>true</bool>