From db6b218d5d0f4b6170d694eec0406d7e0635ad49 Mon Sep 17 00:00:00 2001 From: lordmulder Date: Sun, 20 Mar 2011 14:28:27 +0100 Subject: [PATCH] Added entry for "Help & Support" to Help menu. --- etc/Translation/Blank.ts | 28 ++++++++++++++++------------ etc/Translation/LameXP_DE.ts | 10 +++++++--- etc/Translation/LameXP_ES.ts | 4 ++++ etc/Translation/LameXP_FR.ts | 4 ++++ etc/Translation/LameXP_IT.ts | 4 ++++ etc/Translation/LameXP_RU.ts | 4 ++++ etc/Translation/LameXP_UK.ts | 4 ++++ gui/MainWindow.ui | 15 +++++++++++++-- res/Icons.qrc | 1 + res/localization/LameXP_DE.qm | Bin 55055 -> 55439 bytes src/Config.h | 2 +- src/Dialog_MainWindow.cpp | 15 ++++++++++++--- src/Global.cpp | 14 +++++++++++++- src/Global.h | 1 + 14 files changed, 84 insertions(+), 22 deletions(-) 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 079400421eafc4fd7e720ad704333a28965f2e98..035eee6b5d0efd72486d7805a625d81dc2b30482 100644 GIT binary patch delta 3496 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 T%5e41N{qKWRXa83M9}{LY*Yr> delta 3099 zcmXX|cU%d7YtaC zqDU2xSVIwz5UePo5q}np6{Dz0EGXn%AMdaGo89@od(XM&o;&fyiuhv+{g~6irWaZd zBwe=bQ4yG4c6TBmegH5Yu)hhgjzCHY#qWT?M!?G(I2{TER0CUGfG{sWm)aQ8vkUSGp%)5ZGAyf2ki>{kesJMG@GmwLm2O@M$xU(GSA( zpMj9m&;(WhlfH&sv<@g(iD8rcfl*5^X>THs-GIrqWq{!++|Km@$^^Lgr}N{c!+k^& zkZ`**=AGz_Wgpx^k-n6qdo5K)Y|7LSRc1(+Ls0!V+4g+)VvpXOj~Phx4#DXi;094MNL zU7_hf|0e8GEX9n!Ik+D2IZ%C7M zNe%*j*(x(Bvj&EXvTl*hK!veve6}5s)g+t3Du6NGvVa*yfNYp7$kP^d+1%0SQ3b$QPo zy8+cEdCwGL&fiwvcltVDY=eBV^f#anmoE-42WlGSE7%r5K1;qsMfC*tk*7H=1x7T< zb7I?o1MB4ly6(V|Hu=c~R&?&H{BhqUL}=On;!q?HmbbW*c2+!+x38pv{cIJ=M{j`R zwF=3e5}e6XnE%iLl=6x`y(#9tFf__X$b%*tGztrur(vK%r=RzaBF!WRSZS@uY>Efs z_9^nKCsCVUD+;a;1}dRA{pl;x?e~hh`fGsiLB*vsC6UymXz-ys*LNtM#l`{4PcpKQ z)xefahGkw7=t743)*o2Chta-vBl(##MsM~3N9!0D8wVnB7vnN|H1s$Z&dm7XKfq+B zGnOA=mYGij7DO_u!V`es9x&0;N1Cm@%(guQa##ctQ*;3fh5lg|@?>?o$7nq(Up!<06^B_P9@s$S>yKvE4;^WqBd!)>P4 zixO;l$6Q-P6C0Sw+%#+Lqb@a(e=O#OLo9a{c9SWiR{?6 zbAXMUT^RWg@TgsmwcDw}w*E6}@pq-wT`wi9LJ&;1%Fh1>5Yr66p7VZ7CpOZrjav_=W++0i42c z9OzcaNjFk~k`&HLI#0+NI2(orZ}%B)NG^HT#2C)G3l$nQko$HISx?di&P_)Q?hWPi z?)hiP0z$c|%bdBZ`L}7Zv$^Y@gnaNQuHmf=IBd(^eGv-mdB#0= zr-B{q_1vF99V9MKu5F$rux=MGj6F-L4&sdkqO$S;Z=$NC7oYOhb4SyNkKk<%IRMe! zcw3{#WWp=>p?^}s9<9+F4>4Tkbo%5_KD}xX;4+xcG@U?`8_H*?>c|r8`J%{gNFqD= zVl8zj_r@ za$;IJ6+B!y?f5^GV5rhhNs<{iKpFX&Ix?=dGbYw3w^-1$Sux7^_A21#JIbWQVqklz zGUXvd)-*(!7m!3=7on`XNRh2q-g2dmL^~<(xtq~6PAyfo4qE`2)hpX4OeEhZRw?FD zqFxtOCbC>&c$uotlfUSBw#wZ<6ot6MGC68*{bwp< zqD*x&Bo3JEt7;1I1|}q^o?8%wJ3LhF9y;#)SN9hp_a0Jm9=s2(=}qgR_L~`n`UHe7mrFL@4l| zS|PE67W(9sLaK`;P0vf=kbed6ZJ?0Rwgxz{RLBW9Ow;BqU)iA)+TkM(ILiGM2>gHXbPoa-uiDTeSZ4h$bvb z9MPo<(DRPy7W@25Rk@=3?7;-jS@f1jdG_x_Z%3kIK#S--BMwM=)fs=iDbDyJ6uSqa zUxY6u$`M!Jr^I`l{vQ*>jdia8g@qW|pW2XlM%P-L7kJ6NVy@3|-7|pM`N?=xq=32%B!1jUWd8jjdkRPXcS$2iiz-3LVLF@=uNG=lH%l85Y)L@343|aSlz=Mf*rjPSMVF-0>!__^K~nXO zC_=+aH5r!lag`(8I!R9HRWIFEXzAkv75`+CB}gPvXZKx-2Nq(cU8In7p5qwIsgCw 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[]);