diff --git a/etc/Translation/Blank.ts b/etc/Translation/Blank.ts
index 59fc670f..5839efc2 100644
--- a/etc/Translation/Blank.ts
+++ b/etc/Translation/Blank.ts
@@ -757,6 +757,22 @@
Disable Shell Integration
+
+ Frequently Asked Questions
+
+
+
+ Changelog
+
+
+
+ Translator's Guide
+
+
+
+ Help && Support
+
+
Adding file(s), please wait...
@@ -1209,18 +1225,6 @@
The LameXP shell integration has been re-enabled.
-
- Frequently Asked Questions
-
-
-
- Changelog
-
-
-
- Translator's Guide
-
-
MetaInfo
diff --git a/etc/Translation/LameXP_DE.ts b/etc/Translation/LameXP_DE.ts
index 9af04677..61e25d7a 100644
--- a/etc/Translation/LameXP_DE.ts
+++ b/etc/Translation/LameXP_DE.ts
@@ -1212,15 +1212,19 @@
Frequently Asked Questions
-
+ Häufig gestellte Fragen
Changelog
-
+ Versionshistorie
Translator's Guide
-
+ Leitfaden für Übersetzer
+
+
+ Help && Support
+ Hilfe und Support
diff --git a/etc/Translation/LameXP_ES.ts b/etc/Translation/LameXP_ES.ts
index 69355d9b..3be11785 100644
--- a/etc/Translation/LameXP_ES.ts
+++ b/etc/Translation/LameXP_ES.ts
@@ -1221,6 +1221,10 @@
Translator's Guide
+
+ Help && Support
+
+
MetaInfo
diff --git a/etc/Translation/LameXP_FR.ts b/etc/Translation/LameXP_FR.ts
index 521e55fc..d649ace8 100644
--- a/etc/Translation/LameXP_FR.ts
+++ b/etc/Translation/LameXP_FR.ts
@@ -1230,6 +1230,10 @@ Sélection automatique (par défaut)
Translator's Guide
+
+ Help && Support
+
+
MetaInfo
diff --git a/etc/Translation/LameXP_IT.ts b/etc/Translation/LameXP_IT.ts
index 0b86608e..6bf5a4ba 100644
--- a/etc/Translation/LameXP_IT.ts
+++ b/etc/Translation/LameXP_IT.ts
@@ -1222,6 +1222,10 @@
Translator's Guide
+
+ Help && Support
+
+
MetaInfo
diff --git a/etc/Translation/LameXP_RU.ts b/etc/Translation/LameXP_RU.ts
index d6acc114..e15fcec9 100644
--- a/etc/Translation/LameXP_RU.ts
+++ b/etc/Translation/LameXP_RU.ts
@@ -1224,6 +1224,10 @@
Translator's Guide
+
+ Help && Support
+
+
MetaInfo
diff --git a/etc/Translation/LameXP_UK.ts b/etc/Translation/LameXP_UK.ts
index 3e03e004..a9ff6d4a 100644
--- a/etc/Translation/LameXP_UK.ts
+++ b/etc/Translation/LameXP_UK.ts
@@ -1221,6 +1221,10 @@
Translator's Guide
+
+ Help && Support
+
+
MetaInfo
diff --git a/gui/MainWindow.ui b/gui/MainWindow.ui
index 17a8d322..7f8b1f1f 100644
--- a/gui/MainWindow.ui
+++ b/gui/MainWindow.ui
@@ -1057,8 +1057,8 @@
0
0
- 604
- 1091
+ 602
+ 1088
@@ -2726,6 +2726,7 @@
?
+
@@ -3062,6 +3063,15 @@
Translator's Guide
+
+
+
+ :/icons/group.png:/icons/group.png
+
+
+ Help && Support
+
+
@@ -3127,6 +3137,7 @@
+
diff --git a/res/Icons.qrc b/res/Icons.qrc
index de4098ec..7d80f8b7 100644
--- a/res/Icons.qrc
+++ b/res/Icons.qrc
@@ -47,6 +47,7 @@
icons/folder_explore.png
icons/folder_page.png
icons/font.png
+ icons/group.png
icons/house.png
icons/hourglass.png
icons/information.png
diff --git a/res/localization/LameXP_DE.qm b/res/localization/LameXP_DE.qm
index 07940042..035eee6b 100644
Binary files a/res/localization/LameXP_DE.qm and b/res/localization/LameXP_DE.qm differ
diff --git a/src/Config.h b/src/Config.h
index 07d74b14..3a44a5e0 100644
--- a/src/Config.h
+++ b/src/Config.h
@@ -25,7 +25,7 @@
#define VER_LAMEXP_MAJOR 4
#define VER_LAMEXP_MINOR_HI 0
#define VER_LAMEXP_MINOR_LO 1
-#define VER_LAMEXP_BUILD 380
+#define VER_LAMEXP_BUILD 382
#define VER_LAMEXP_SUFFIX Beta-10
/*
diff --git a/src/Dialog_MainWindow.cpp b/src/Dialog_MainWindow.cpp
index 458025e0..d718d486 100644
--- a/src/Dialog_MainWindow.cpp
+++ b/src/Dialog_MainWindow.cpp
@@ -325,11 +325,14 @@ MainWindow::MainWindow(FileListModel *fileListModel, AudioFileModel *metaInfo, S
connect(actionShowDropBoxWidget, SIGNAL(triggered(bool)), this, SLOT(showDropBoxWidgetActionTriggered(bool)));
//Activate help menu actions
+ actionVisitHomepage->setData(QString::fromLatin1(lamexp_website_url()));
+ actionVisitSupport->setData(QString::fromLatin1(lamexp_support_url()));
actionDocumentFAQ->setData(QString("%1/FAQ.html").arg(QApplication::applicationDirPath()));
actionDocumentChangelog->setData(QString("%1/Changelog.html").arg(QApplication::applicationDirPath()));
actionDocumentTranslate->setData(QString("%1/Translate.html").arg(QApplication::applicationDirPath()));
connect(actionCheckUpdates, SIGNAL(triggered()), this, SLOT(checkUpdatesActionActivated()));
connect(actionVisitHomepage, SIGNAL(triggered()), this, SLOT(visitHomepageActionActivated()));
+ connect(actionVisitSupport, SIGNAL(triggered()), this, SLOT(visitHomepageActionActivated()));
connect(actionDocumentFAQ, SIGNAL(triggered()), this, SLOT(documentActionActivated()));
connect(actionDocumentChangelog, SIGNAL(triggered()), this, SLOT(documentActionActivated()));
connect(actionDocumentTranslate, SIGNAL(triggered()), this, SLOT(documentActionActivated()));
@@ -1515,7 +1518,13 @@ void MainWindow::clearMetaButtonClicked(void)
*/
void MainWindow::visitHomepageActionActivated(void)
{
- QDesktopServices::openUrl(QUrl(lamexp_website_url()));
+ if(QAction *action = dynamic_cast(QObject::sender()))
+ {
+ if(action->data().isValid() && (action->data().type() == QVariant::String))
+ {
+ QDesktopServices::openUrl(QUrl(action->data().toString()));
+ }
+ }
}
/*
@@ -1531,7 +1540,7 @@ void MainWindow::documentActionActivated(void)
QFileInfo resource(QString(":/doc/%1.html").arg(document.baseName()));
if(document.exists() && document.isFile() && (document.size() == resource.size()))
{
- QDesktopServices::openUrl(QUrl(QString("file:///%1").arg(document.canonicalFilePath())));
+ QDesktopServices::openUrl(QUrl::fromLocalFile(document.canonicalFilePath()));
}
else
{
@@ -1543,7 +1552,7 @@ void MainWindow::documentActionActivated(void)
action->setData(output.fileName());
source.close();
output.close();
- QDesktopServices::openUrl(QUrl(QString("file:///%1").arg(output.fileName())));
+ QDesktopServices::openUrl(QUrl::fromLocalFile(output.fileName()));
}
}
}
diff --git a/src/Global.cpp b/src/Global.cpp
index 98119d8c..efc0da93 100644
--- a/src/Global.cpp
+++ b/src/Global.cpp
@@ -132,6 +132,7 @@ static bool g_lamexp_console_attached = false;
//Official web-site URL
static const char *g_lamexp_website_url = "http://mulder.dummwiedeutsch.de/";
+static const char *g_lamexp_support_url = "http://forum.doom9.org/showthread.php?t=157726";
//Tool versions (expected)
static const unsigned int g_lamexp_toolver_neroaac = VER_LAMEXP_TOOL_NEROAAC;
@@ -198,13 +199,24 @@ unsigned int lamexp_version_build(void) { return g_lamexp_version.ver_build; }
const char *lamexp_version_release(void) { return g_lamexp_version.ver_release_name; }
const char *lamexp_version_compiler(void) {return g_lamexp_version_compiler; }
unsigned int lamexp_toolver_neroaac(void) { return g_lamexp_toolver_neroaac; }
-const char *lamexp_website_url(void) { return g_lamexp_website_url; }
+/*
+ * URL getters
+ */
+const char *lamexp_website_url(void) { return g_lamexp_website_url; }
+const char *lamexp_support_url(void) { return g_lamexp_support_url; }
+
+/*
+ * Check for Demo (pre-release) version
+ */
bool lamexp_version_demo(void)
{
return LAMEXP_DEBUG || !(strstr(g_lamexp_version.ver_release_name, "Final") || strstr(g_lamexp_version.ver_release_name, "Hotfix"));
}
+/*
+ * Calculate expiration date
+ */
QDate lamexp_version_expires(void)
{
return lamexp_version_date().addDays(LAMEXP_DEBUG ? 2 : 30);
diff --git a/src/Global.h b/src/Global.h
index cb3784e1..883cc164 100644
--- a/src/Global.h
+++ b/src/Global.h
@@ -77,6 +77,7 @@ const char *lamexp_version_compiler(void);
QDate lamexp_version_expires(void);
unsigned int lamexp_toolver_neroaac(void);
const char *lamexp_website_url(void);
+const char *lamexp_support_url(void);
//Public functions
void lamexp_init_console(int argc, char* argv[]);