From 1c7805145007908550335cd9bf20199ea80bc6f9 Mon Sep 17 00:00:00 2001 From: scorpio810 Date: Mon, 26 Sep 2016 00:46:02 +0000 Subject: [PATCH] Add new action in help menu : link for download latest devel build for MAC OS (only visible on MAC OS platform) git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4725 bfdf4180-ca20-0410-9c96-a3a8aa849046 --- sources/editor/graphicspart/partarc.cpp | 10 +++++----- sources/qetmainwindow.cpp | 17 ++++++++++++++++- sources/qetmainwindow.h | 3 ++- 3 files changed, 23 insertions(+), 7 deletions(-) diff --git a/sources/editor/graphicspart/partarc.cpp b/sources/editor/graphicspart/partarc.cpp index 31b3d38e4..44aefc537 100644 --- a/sources/editor/graphicspart/partarc.cpp +++ b/sources/editor/graphicspart/partarc.cpp @@ -86,7 +86,7 @@ void PartArc::paint(QPainter *painter, const QStyleOptionGraphicsItem *options, drawCross(m_rect.center(), painter); if (scene()->selectedItems().size() == 1) { if (m_resize_mode == 3) - m_handler.drawHandler(painter, m_handler.pointsForArc(m_rect, m_start_angle/16, m_span_angle/16)); + m_handler.drawHandler(painter, m_handler.pointsForArc(m_rect, m_start_angle /16, m_span_angle /16)); else m_handler.drawHandler(painter, m_handler.pointsForRect(m_rect)); } @@ -147,7 +147,7 @@ QPainterPath PartArc::shape() const { QPainterPath shape; shape.arcMoveTo(m_rect, m_start_angle/16); - shape.arcTo(m_rect, m_start_angle/16, m_span_angle/16); + shape.arcTo(m_rect, m_start_angle /16, m_span_angle /16); QPainterPathStroker pps; pps.setWidth(m_hovered? penWeight()+SHADOWS_HEIGHT : penWeight()); @@ -164,7 +164,7 @@ QPainterPath PartArc::shadowShape() const { QPainterPath shape; shape.arcMoveTo(m_rect, m_start_angle/16); - shape.arcTo(m_rect, m_start_angle/16, m_span_angle/16); + shape.arcTo(m_rect, m_start_angle /16, m_span_angle /16); QPainterPathStroker pps; pps.setWidth(penWeight()); @@ -231,9 +231,9 @@ void PartArc::mousePressEvent(QGraphicsSceneMouseEvent *event) } //resize angle if (m_resize_mode == 3) { - m_handler_index = m_handler.pointIsHoverHandler(event->pos(), m_handler.pointsForArc(m_rect, m_start_angle/16, m_span_angle/16)); + m_handler_index = m_handler.pointIsHoverHandler(event->pos(), m_handler.pointsForArc(m_rect, m_start_angle /16, m_span_angle /16)); if (m_handler_index == 0) { - m_span_point = m_handler.pointsForArc(m_rect, m_start_angle/16, m_span_angle/16).at(1); + m_span_point = m_handler.pointsForArc(m_rect, m_start_angle /16, m_span_angle /16).at(1); m_undo_command = new QPropertyUndoCommand(this, "startAngle", QVariant(m_start_angle)); m_undo_command->setText(tr("Modifier un arc")); diff --git a/sources/qetmainwindow.cpp b/sources/qetmainwindow.cpp index c452ccb2b..854acac29 100644 --- a/sources/qetmainwindow.cpp +++ b/sources/qetmainwindow.cpp @@ -94,11 +94,19 @@ void QETMainWindow::initCommonActions() { upgrade_ = new QAction(QET::Icons::QETDownload, tr("Télécharger une nouvelle version (dev)"), this); upgrade_ -> setStatusTip(tr("Lance le navigateur par défaut vers le dépot Nightly en ligne de QElectroTech", "status bar tip")); + upgrade_M = new QAction(QET::Icons::QETDownload, tr("Télécharger une nouvelle version (dev)"), this); + upgrade_M -> setStatusTip(tr("Lance le navigateur par défaut vers le dépot Nightly 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)); }); + connect(upgrade_M, &QAction::triggered, [this](bool) { + QString link = "http://download.tuxfamily.org/qet/builds/MAC_OS_X/"; + QDesktopServices::openUrl(QUrl(link)); + }); + donate_ = new QAction(QET::Icons::QETDonate, tr("Soutenir le projet par un don"), this); donate_ -> setStatusTip(tr("Soutenir le projet QElectroTech par un don", "status bar tip")); @@ -129,6 +137,7 @@ void QETMainWindow::initCommonMenus() { help_menu_ -> addAction(manual_online_); help_menu_ -> addAction(youtube_); help_menu_ -> addAction(upgrade_); + help_menu_ -> addAction(upgrade_M); help_menu_ -> addAction(donate_); help_menu_ -> addAction(about_qt_); @@ -137,7 +146,13 @@ upgrade_ -> setVisible(true); #else upgrade_ -> setVisible(false); #endif - + +#ifdef Q_OS_MAC +upgrade_M -> setVisible(true); +#else +upgrade_M -> setVisible(false); +#endif + insertMenu(0, settings_menu_); insertMenu(0, help_menu_); } diff --git a/sources/qetmainwindow.h b/sources/qetmainwindow.h index dd33f0ae6..a01cd1922 100644 --- a/sources/qetmainwindow.h +++ b/sources/qetmainwindow.h @@ -58,7 +58,8 @@ class QETMainWindow : public QMainWindow { 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 *upgrade_; ///< Launch browser on QElectroTech Windows Nightly builds + QAction *upgrade_M; ///< Launch browser on QElectroTech MAC_OS_X builds QAction *donate_; ///< Launch browser to donate link QAction *about_qt_; ///< launch the "About Qt" dialog QMenu *settings_menu_; ///< Settings menu