From 784bae45ce857e6c3cd059cf09c1ccd9413f3327 Mon Sep 17 00:00:00 2001 From: lupoDharkael Date: Tue, 16 May 2017 23:26:39 +0200 Subject: [PATCH] comment all the mouse visibility related stuff --- capture/button.cpp | 40 ++++++++++++++++++++------------------- capture/button.h | 6 +++--- capture/capturewidget.cpp | 2 +- capture/screenshot.cpp | 6 +++--- controller.cpp | 2 +- 5 files changed, 29 insertions(+), 27 deletions(-) diff --git a/capture/button.cpp b/capture/button.cpp index a50b6a6f..d7651729 100644 --- a/capture/button.cpp +++ b/capture/button.cpp @@ -60,16 +60,16 @@ QIcon Button::getIcon(const Type t, bool isWhite) { } QString path = ":/img/buttonIcons" + iconColor + "/"; - if (t == Type::mouseVisibility) { - QSettings settings; - bool mouseVisible = settings.value("mouseVisible").toBool(); - if (mouseVisible){ - path += "mouse.svg"; - } else { - path += "mouse-off.svg"; - } - return QIcon(path); - } +// if (t == Type::mouseVisibility) { +// QSettings settings; +// bool mouseVisible = settings.value("mouseVisible").toBool(); +// if (mouseVisible){ +// path += "mouse.svg"; +// } else { +// path += "mouse-off.svg"; +// } +// return QIcon(path); +// } switch (t) { case Type::arrow: @@ -150,17 +150,19 @@ void Button::leaveEvent(QEvent *e) { Q_EMIT mouseExited(); QWidget::leaveEvent(e); } +#include +void Button::mouseReleaseEvent(QMouseEvent *e) { + if (e->button() == Qt::LeftButton){ +// if (m_buttonType == Type::mouseVisibility) { +// QSettings settings; +// bool mouseVisible = settings.value("mouseVisible").toBool(); +// settings.setValue("mouseVisible", !mouseVisible); +// setIcon(getIcon(Type::mouseVisibility)); +// } else if (m_buttonType == Type::colorPicker) { -void Button::mouseReleaseEvent(QMouseEvent *) { - if (m_buttonType == Type::mouseVisibility) { - QSettings settings; - bool mouseVisible = settings.value("mouseVisible").toBool(); - settings.setValue("mouseVisible", !mouseVisible); - setIcon(getIcon(Type::mouseVisibility)); - } else if (m_buttonType == Type::colorPicker) { - +// } + Q_EMIT typeEmited(m_buttonType); } - Q_EMIT typeEmited(m_buttonType); } void Button::animatedShow() { diff --git a/capture/button.h b/capture/button.h index 8aaacae1..86ad4830 100644 --- a/capture/button.h +++ b/capture/button.h @@ -31,7 +31,6 @@ class Button : public QPushButton { public: enum class Type { selectionIndicator, - mouseVisibility, exit, copy, save, @@ -42,11 +41,12 @@ public: circle, marker, text, - colorPicker, undo, imageUploader, move, - last + last, // used for iteration over the enum + mouseVisibility, + colorPicker }; explicit Button(Type, QWidget *parent = 0); diff --git a/capture/capturewidget.cpp b/capture/capturewidget.cpp index 1cf04282..8d1e0da5 100644 --- a/capture/capturewidget.cpp +++ b/capture/capturewidget.cpp @@ -402,7 +402,7 @@ void CaptureWidget::downResize() { void CaptureWidget::setState(Button::Type t) { if(t == Button::Type::selectionIndicator || - t == Button::Type::mouseVisibility || + //t == Button::Type::mouseVisibility || t == Button::Type::colorPicker) { return; } diff --git a/capture/screenshot.cpp b/capture/screenshot.cpp index 1c7cda51..122451e4 100644 --- a/capture/screenshot.cpp +++ b/capture/screenshot.cpp @@ -103,9 +103,9 @@ QString Screenshot::graphicalSave(const QRect &selection) const { pixToSave = m_screenshot.copy(selection); } - if (settings.value("mouseVisible").toBool()) { - // TO DO - } +// if (settings.value("mouseVisible").toBool()) { +// // TO DO +// } if (!pixToSave.save(fileName)) { QMessageBox::warning(nullptr, QObject::tr("Save Error"), diff --git a/controller.cpp b/controller.cpp index 34af752a..73ea2b26 100644 --- a/controller.cpp +++ b/controller.cpp @@ -85,7 +85,7 @@ void Controller::initDefaults() { if (!settings.value("initiated").toBool()) { settings.setValue("initiated", true); settings.setValue("drawColor", QColor(Qt::red)); - settings.setValue("mouseVisible", false); + //settings.setValue("mouseVisible", false); settings.setValue("whiteIconColor", true); settings.setValue("uiColor", QColor(136, 0, 170));