aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile6
-rw-r--r--qt-ui/mainwindow.cpp6
-rw-r--r--qt-ui/starwidget.cpp102
-rw-r--r--qt-ui/starwidget.h42
-rw-r--r--resources.qrc5
-rw-r--r--star.svg74
6 files changed, 232 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 7b7ec0476..076b5f123 100644
--- a/Makefile
+++ b/Makefile
@@ -104,10 +104,10 @@ LIBUSB = $(shell $(PKGCONFIG) --libs libusb-1.0 2> /dev/null)
# Use qmake to find out which Qt version we are building for.
QT_VERSION_MAJOR = $(shell $(QMAKE) -query QT_VERSION | cut -d. -f1)
ifeq ($(QT_VERSION_MAJOR), 5)
- QT_MODULES = Qt5Widgets
+ QT_MODULES = Qt5Widgets Qt5Svg
QT_CORE = Qt5Core
else
- QT_MODULES = QtGui
+ QT_MODULES = QtGui QtSvg
QT_CORE = QtCore
endif
@@ -187,7 +187,7 @@ MSGOBJS=$(addprefix share/locale/,$(MSGLANGS:.po=.UTF-8/LC_MESSAGES/subsurface.m
QTOBJS = qt-ui/maintab.o qt-ui/mainwindow.o qt-ui/plotareascene.o qt-ui/divelistview.o \
- qt-ui/addcylinderdialog.o qt-ui/models.o
+ qt-ui/addcylinderdialog.o qt-ui/models.o qt-ui/starwidget.o
GTKOBJS = info-gtk.o divelist-gtk.o planner-gtk.o statistics-gtk.o
diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp
index 46ce076d4..bb4bda1af 100644
--- a/qt-ui/mainwindow.cpp
+++ b/qt-ui/mainwindow.cpp
@@ -13,6 +13,7 @@
#include <QDateTime>
#include "divelistview.h"
+#include "starwidget.h"
#include "glib.h"
#include "../dive.h"
@@ -25,6 +26,11 @@ MainWindow::MainWindow() : ui(new Ui::MainWindow()),
{
ui->setupUi(this);
ui->ListWidget->setModel(model);
+ // Just to test the star widgets, can be safely removed.
+ StarWidget *star = new StarWidget(0);
+ star->setMaximumStars(10);
+ star->setCurrentStars(3);
+ star->show();
}
void MainWindow::on_actionNew_triggered()
diff --git a/qt-ui/starwidget.cpp b/qt-ui/starwidget.cpp
new file mode 100644
index 000000000..457946feb
--- /dev/null
+++ b/qt-ui/starwidget.cpp
@@ -0,0 +1,102 @@
+#include "starwidget.h"
+#include <QSvgRenderer>
+#include <QPainter>
+#include <QPaintEvent>
+#include <QDebug>
+#include <QMouseEvent>
+
+int StarWidget::currentStars() const
+{
+ return current;
+}
+
+void StarWidget::enableHalfStars(bool enabled)
+{
+ halfStar = enabled;
+ update();
+}
+
+bool StarWidget::halfStarsEnabled() const
+{
+ return halfStar;
+}
+
+int StarWidget::maxStars() const
+{
+ return stars;
+}
+
+void StarWidget::mouseReleaseEvent(QMouseEvent* event)
+{
+ int starClicked = event->pos().x() / IMG_SIZE + 1;
+ if (starClicked > stars)
+ starClicked = stars;
+
+ if (current == starClicked)
+ current -= 1;
+ else
+ current = starClicked;
+
+ update();
+}
+
+void StarWidget::paintEvent(QPaintEvent* event)
+{
+ QPainter p(this);
+
+ for(int i = 0; i < current; i++)
+ p.drawPixmap(i * IMG_SIZE + SPACING, 0, activeStar);
+
+ for(int i = current; i < stars; i++)
+ p.drawPixmap(i * IMG_SIZE + SPACING, 0, inactiveStar);
+}
+
+void StarWidget::setCurrentStars(int value)
+{
+ current = value;
+ update();
+ Q_EMIT valueChanged(current);
+}
+
+void StarWidget::setMaximumStars(int maximum)
+{
+ stars = maximum;
+ update();
+}
+
+StarWidget::StarWidget(QWidget* parent, Qt::WindowFlags f):
+ QWidget(parent, f),
+ stars(5),
+ current(0),
+ halfStar(false)
+{
+ QSvgRenderer render(QString("star.svg"));
+ QPixmap renderedStar(IMG_SIZE, IMG_SIZE);
+
+ renderedStar.fill(Qt::transparent);
+ QPainter painter(&renderedStar);
+
+ render.render(&painter, QRectF(0, 0, IMG_SIZE, IMG_SIZE));
+ activeStar = renderedStar;
+ inactiveStar = grayImage(&renderedStar);
+}
+
+QPixmap StarWidget::grayImage(QPixmap* coloredImg)
+{
+ QImage img = coloredImg->toImage();
+ for (int i = 0; i < img.width(); ++i) {
+ for (int j = 0; j < img.height(); ++j) {
+ QRgb col = img.pixel(i, j);
+ if (!col)
+ continue;
+ int gray = QColor(Qt::darkGray).rgb();
+ img.setPixel(i, j, qRgb(gray, gray, gray));
+ }
+ }
+ return QPixmap::fromImage(img);
+}
+
+QSize StarWidget::sizeHint() const
+{
+ return QSize(IMG_SIZE * stars + SPACING * (stars-1), IMG_SIZE);
+}
diff --git a/qt-ui/starwidget.h b/qt-ui/starwidget.h
new file mode 100644
index 000000000..cdbb3ab5c
--- /dev/null
+++ b/qt-ui/starwidget.h
@@ -0,0 +1,42 @@
+#ifndef STARWIDGET_H
+#define STARWIDGET_H
+
+#include <QWidget>
+
+
+class StarWidget : public QWidget
+{
+ Q_OBJECT
+public:
+ explicit StarWidget(QWidget* parent = 0, Qt::WindowFlags f = 0);
+
+ int maxStars() const;
+ int currentStars() const;
+ bool halfStarsEnabled() const;
+
+ /*reimp*/ QSize sizeHint() const;
+
+ enum {SPACING = 2, IMG_SIZE = 16};
+
+Q_SIGNALS:
+ void valueChanged(int stars);
+
+public Q_SLOTS:
+ void setCurrentStars(int value);
+ void setMaximumStars(int maximum);
+ void enableHalfStars(bool enabled);
+
+protected:
+ /*reimp*/ void mouseReleaseEvent(QMouseEvent* );
+ /*reimp*/ void paintEvent(QPaintEvent* );
+
+private:
+ int stars;
+ int current;
+ bool halfStar;
+ QPixmap activeStar;
+ QPixmap inactiveStar;
+ QPixmap grayImage(QPixmap *coloredImg);
+};
+
+#endif // STARWIDGET_H
diff --git a/resources.qrc b/resources.qrc
new file mode 100644
index 000000000..e257bf8f5
--- /dev/null
+++ b/resources.qrc
@@ -0,0 +1,5 @@
+ <!DOCTYPE RCC><RCC version="1.0">
+ <qresource>
+ <file alias="star">star.svg</file>
+ </qresource>
+ </RCC>
diff --git a/star.svg b/star.svg
new file mode 100644
index 000000000..e4345eb48
--- /dev/null
+++ b/star.svg
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="32px"
+ height="32px"
+ id="svg15725"
+ version="1.1"
+ inkscape:version="0.48.4 r9939"
+ sodipodi:docname="New document 4">
+ <defs
+ id="defs15727" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="11.197802"
+ inkscape:cx="16"
+ inkscape:cy="16.044652"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:grid-bbox="true"
+ inkscape:document-units="px"
+ inkscape:window-width="1884"
+ inkscape:window-height="1058"
+ inkscape:window-x="-5"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1" />
+ <metadata
+ id="metadata15730">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ id="layer1"
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer">
+ <path
+ sodipodi:type="star"
+ style="fill:#ffff00;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ id="path15735"
+ sodipodi:sides="5"
+ sodipodi:cx="15.628067"
+ sodipodi:cy="15.74681"
+ sodipodi:r1="16.150806"
+ sodipodi:r2="7.9237795"
+ sodipodi:arg1="2.5689263"
+ sodipodi:arg2="3.1972448"
+ inkscape:flatsided="false"
+ inkscape:rounded="0"
+ inkscape:randomized="0"
+ d="M 2.0539742,24.498527 7.716555,15.306062 3.110064,5.5415099 13.602452,8.0863163 21.465608,0.68787049 22.28768,11.453112 l 9.466189,5.192062 -9.984319,4.108479 -2.012731,10.607316 -6.99272,-8.226063 z"
+ inkscape:transform-center-x="0.46164082"
+ inkscape:transform-center-y="-1.2197792"
+ transform="matrix(0.86268816,-0.34553411,0.34553411,0.86268816,-2.9571926,8.9732054)" />
+ </g>
+</svg>
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2024-12-26 03:11:12 +0000