diff --git a/ico/16x16/edit-download.svg b/ico/16x16/edit-download.svg new file mode 100644 index 000000000..293505e8d --- /dev/null +++ b/ico/16x16/edit-download.svg @@ -0,0 +1,13 @@ + + + + + + diff --git a/qelectrotech.qrc b/qelectrotech.qrc index 82fd768b1..b6fdac6e2 100644 --- a/qelectrotech.qrc +++ b/qelectrotech.qrc @@ -251,5 +251,6 @@ ico/22x22/terminalstrip.png ico/16x16/help-contents.svg ico/16x16/help-donate.svg + ico/16x16/edit-download.svg diff --git a/sources/qeticons.cpp b/sources/qeticons.cpp index 45f85cc99..75d7e4e43 100644 --- a/sources/qeticons.cpp +++ b/sources/qeticons.cpp @@ -188,6 +188,7 @@ namespace QET { QIcon TerminalStrip; QIcon QETManual; QIcon QETDonate; + QIcon QETDownload; } } @@ -381,6 +382,7 @@ void QET::Icons::initIcons() { ProjectFile .addFile(":/ico/oxygen-icons/22x22/mimetypes/application-x-qet-project.png"); ProjectFile .addFile(":/ico/oxygen-icons/32x32/mimetypes/application-x-qet-project.png"); QETDonate .addFile(":/ico/16x16/help-donate.svg"); + QETDownload .addFile(":/ico/16x16/edit-download.svg"); QETIcon .addFile(":/ico/256x256/qelectrotech.png"); ProjectFileGP .addFile(":/ico/16x16/project-WH.png"); QETLogo .addFile(":/ico/16x16/qet.png"); diff --git a/sources/qeticons.h b/sources/qeticons.h index 65514214b..58ec8238d 100644 --- a/sources/qeticons.h +++ b/sources/qeticons.h @@ -197,6 +197,7 @@ namespace QET { extern QIcon TerminalStrip; extern QIcon QETManual; extern QIcon QETDonate; + extern QIcon QETDownload; } } #endif diff --git a/sources/qetmainwindow.cpp b/sources/qetmainwindow.cpp index d5b719a38..c3dc06fa0 100644 --- a/sources/qetmainwindow.cpp +++ b/sources/qetmainwindow.cpp @@ -81,6 +81,24 @@ void QETMainWindow::initCommonActions() { QDesktopServices::openUrl(QUrl(link)); }); + manual_online_ -> setShortcut(Qt::Key_F1); + + youtube_ = new QAction(QET::Icons::QETManual, tr("Chaine Youtube"), this); + youtube_ -> setStatusTip(tr("Lance le navigateur par defaut vers la chaine Youtube de QElectroTech", "status bar tip")); + + connect(youtube_, &QAction::triggered, [this](bool) { + QString link = "https://www.youtube.com/user/scorpio8101/videos"; + QDesktopServices::openUrl(QUrl(link)); + }); + + upgrade_ = new QAction(QET::Icons::QETDownload, tr("Télécharger une nouvelle version (dev)"), this); + upgrade_ -> setStatusTip(tr("Lance le navigateur par defaut vers le dépot Nighlty en ligne de QElectroTech", "status bar tip")); + + connect(upgrade_, &QAction::triggered, [this](bool) { + QString link = "http://download.tuxfamily.org/qet/builds/nightly/"; + QDesktopServices::openUrl(QUrl(link)); + }); + donate_ = new QAction(QET::Icons::QETDonate, tr("Faire un don"), this); donate_ -> setStatusTip(tr("Soutenir le projet QElectroTech par un don", "status bar tip")); @@ -109,9 +127,17 @@ void QETMainWindow::initCommonMenus() { help_menu_ -> addSeparator(); help_menu_ -> addAction(about_qet_); help_menu_ -> addAction(manual_online_); + help_menu_ -> addAction(youtube_); + help_menu_ -> addAction(upgrade_); help_menu_ -> addAction(donate_); help_menu_ -> addAction(about_qt_); +#ifdef Q_OS_WIN32 +upgrade_ -> setVisible(true); +#else +upgrade_ -> setVisible(false); +#endif + insertMenu(0, settings_menu_); insertMenu(0, help_menu_); } diff --git a/sources/qetmainwindow.h b/sources/qetmainwindow.h index 231a03f7a..dd33f0ae6 100644 --- a/sources/qetmainwindow.h +++ b/sources/qetmainwindow.h @@ -57,6 +57,8 @@ class QETMainWindow : public QMainWindow { QAction *whatsthis_action_; ///< Toggle "What's this" mode QAction *about_qet_; ///< Launch the "About QElectroTech" dialog QAction *manual_online_; ///< Launch browser on QElectroTech online manual + QAction *youtube_; ///< Launch browser on QElectroTech Youtube channel + QAction *upgrade_; ///< Launch browser on QElectroTech Windows Nightly builds QAction *donate_; ///< Launch browser to donate link QAction *about_qt_; ///< launch the "About Qt" dialog QMenu *settings_menu_; ///< Settings menu