From 2b5a2352eadfe992319910495cc11a0a83c4a6cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20M=C4=9B=C5=99insk=C3=BD?= Date: Mon, 13 Mar 2017 11:34:42 +0100 Subject: [PATCH] Remove unused DateWidget with its icon. --- desktop-widgets/simplewidgets.cpp | 122 ------------------------------ desktop-widgets/simplewidgets.h | 25 ------ icons/calendarbg.png | Bin 1294 -> 0 bytes subsurface.qrc | 1 - 4 files changed, 148 deletions(-) delete mode 100644 icons/calendarbg.png diff --git a/desktop-widgets/simplewidgets.cpp b/desktop-widgets/simplewidgets.cpp index de00cc19f..049ce6549 100644 --- a/desktop-widgets/simplewidgets.cpp +++ b/desktop-widgets/simplewidgets.cpp @@ -431,128 +431,6 @@ bool isGnome3Session() #endif } -DateWidget::DateWidget(QWidget *parent) : QWidget(parent), - calendarWidget(new QCalendarWidget()) -{ - setDate(QDate::currentDate()); - setMinimumSize(QSize(80, 64)); - setFocusPolicy(Qt::StrongFocus); - calendarWidget->setWindowFlags(Qt::FramelessWindowHint); - calendarWidget->setFirstDayOfWeek(getLocale().firstDayOfWeek()); - calendarWidget->setVerticalHeaderFormat(QCalendarWidget::NoVerticalHeader); - - connect(calendarWidget, SIGNAL(activated(QDate)), calendarWidget, SLOT(hide())); - connect(calendarWidget, SIGNAL(clicked(QDate)), calendarWidget, SLOT(hide())); - connect(calendarWidget, SIGNAL(activated(QDate)), this, SLOT(setDate(QDate))); - connect(calendarWidget, SIGNAL(clicked(QDate)), this, SLOT(setDate(QDate))); - calendarWidget->installEventFilter(this); -} - -bool DateWidget::eventFilter(QObject *object, QEvent *event) -{ - if (event->type() == QEvent::FocusOut) { - calendarWidget->hide(); - return true; - } - if (event->type() == QEvent::KeyPress) { - QKeyEvent *ev = static_cast(event); - if (ev->key() == Qt::Key_Escape) { - calendarWidget->hide(); - } - } - return QObject::eventFilter(object, event); -} - - -void DateWidget::setDate(const QDate &date) -{ - mDate = date; - update(); - emit dateChanged(mDate); -} - -QDate DateWidget::date() const -{ - return mDate; -} - -void DateWidget::changeEvent(QEvent *event) -{ - if (event->type() == QEvent::EnabledChange) { - update(); - } -} - -#define DATEWIDGETWIDTH 80 -void DateWidget::paintEvent(QPaintEvent *event) -{ - Q_UNUSED(event) - static QPixmap pix = QPixmap(":/calendar").scaled(DATEWIDGETWIDTH, 64); - - QPainter painter(this); - - painter.drawPixmap(QPoint(0, 0), isEnabled() ? pix : QPixmap::fromImage(grayImage(pix.toImage()))); - - QString month = mDate.toString("MMM"); - QString year = mDate.toString("yyyy"); - QString day = mDate.toString("dd"); - - QFont font = QFont("monospace", 10); - QFontMetrics metrics = QFontMetrics(font); - painter.setFont(font); - painter.setPen(QPen(QBrush(Qt::white), 0)); - painter.setBrush(QBrush(Qt::white)); - painter.drawText(QPoint(6, metrics.height() + 1), month); - painter.drawText(QPoint(DATEWIDGETWIDTH - metrics.width(year) - 6, metrics.height() + 1), year); - - font.setPointSize(14); - metrics = QFontMetrics(font); - painter.setPen(QPen(QBrush(Qt::black), 0)); - painter.setBrush(Qt::black); - painter.setFont(font); - painter.drawText(QPoint(DATEWIDGETWIDTH / 2 - metrics.width(day) / 2, 45), day); - - if (hasFocus()) { - QStyleOptionFocusRect option; - option.initFrom(this); - option.backgroundColor = palette().color(QPalette::Background); - style()->drawPrimitive(QStyle::PE_FrameFocusRect, &option, &painter, this); - } -} - -void DateWidget::mousePressEvent(QMouseEvent *event) -{ - calendarWidget->setSelectedDate(mDate); - calendarWidget->move(event->globalPos()); - calendarWidget->show(); - calendarWidget->raise(); - calendarWidget->setFocus(); -} - -void DateWidget::focusInEvent(QFocusEvent *event) -{ - setFocus(); - QWidget::focusInEvent(event); -} - -void DateWidget::focusOutEvent(QFocusEvent *event) -{ - QWidget::focusOutEvent(event); -} - -void DateWidget::keyPressEvent(QKeyEvent *event) -{ - if (event->key() == Qt::Key_Return || - event->key() == Qt::Key_Enter || - event->key() == Qt::Key_Space) { - calendarWidget->move(mapToGlobal(QPoint(0, 64))); - calendarWidget->show(); - event->setAccepted(true); - } else { - QWidget::keyPressEvent(event); - } -} - #define COMPONENT_FROM_UI(_component) what->_component = ui._component->isChecked() #define UI_FROM_COMPONENT(_component) ui._component->setChecked(what->_component) diff --git a/desktop-widgets/simplewidgets.h b/desktop-widgets/simplewidgets.h index 2fc858cd3..ac98414a0 100644 --- a/desktop-widgets/simplewidgets.h +++ b/desktop-widgets/simplewidgets.h @@ -131,31 +131,6 @@ private: class QCalendarWidget; -class DateWidget : public QWidget { - Q_OBJECT -public: - DateWidget(QWidget *parent = 0); - QDate date() const; -public -slots: - void setDate(const QDate &date); - -protected: - void paintEvent(QPaintEvent *event); - void mousePressEvent(QMouseEvent *event); - void focusInEvent(QFocusEvent *); - void focusOutEvent(QFocusEvent *); - void keyPressEvent(QKeyEvent *); - void changeEvent(QEvent *); - bool eventFilter(QObject *, QEvent *); -signals: - void dateChanged(const QDate &date); - -private: - QDate mDate; - QCalendarWidget *calendarWidget; -}; - class DiveComponentSelection : public QDialog { Q_OBJECT public: diff --git a/icons/calendarbg.png b/icons/calendarbg.png deleted file mode 100644 index 4e968f7dea63bce3fdca332583b4c47e7510c1a9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1294 zcmeAS@N?(olHy`uVBq!ia0vp^CxG}G2Q!dd9A)bcq*&4&eH|GXHuiJ>Nn{1`6_P!I zd>I(3)EF2VS{N990fib~Fff!FFfhDIU|_JC!N4G1FlSew4FdzCdw@@fD^S7U1a+2{ zjaF7IHa6|Hw%zvjeGU#2933Y+J5P0SneOU3)75pho7)_B_j&H_^F2HkczQ1M^jzfS zwZzM7nYZ_HAD({Rz zKYo1w{{7pxZ(qKA`TY6wr%#_ge*F0U{rh+C-o1VM_Vw%6uU@@+@#4j^XV0EKefsFp zqX!Qj+`W7E)~#FDuV24>`SOJe7tWqNd+OAwLm8K50Zlh93GxeOU}9n8;O6BQ6c!bi zR8Z0~RWr7i)3Nq)4zcu!&(w2^Eh%c9v3lRd)Ux)KJ0sJlEUN3SF1)4%)XtdX?d}rr zIL~Jfki%Kv5n0T@z%2~Ij105pNH8!kJ@s^P45_&F_Waeb#|aXw0U4J~I5RJ)Yz>(Z zG=nKv;uz3zci;Y9|2$3a-_c)k4`i<0%-`_*nTw0dll?!vuCD(1RiQ^L!zD4`dv@Gb zqxUXa^WB z?x~BCPK!5rD64PUuw%=fqG=aSeY*7M(7h9uPH9hU6pf1-CrIw}IMEZMl;Wl*Y@{5{ zF>~VTmNO?zoqk&v%>~Lip6I!wlH!&pXr#QIbLK>Apj<3as~k}4{0T}KB94nWq+Bm( zG`R_ybS(&E=>-XG-mlCLG^f1cD{{c$Z z0j2i?rR`h3xh>kF;a<<#drGMn5)mI?rR4r)=>59&S#s6eK Y^;On9icons/ead.png icons/icon-HR.png icons/heatmap.png - icons/calendarbg.png icons/pictures.png icons/subsurface/index.theme icons/subsurface/32x32/actions/go-down.png