aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog5
-rw-r--r--debian/changelog7
-rwxr-xr-xdebian/rules2
-rw-r--r--qdialskulpturestyle.cpp433
-rw-r--r--qdialskulpturestyle.hpp39
-rw-r--r--qmidiplayer.pro6
-rw-r--r--qmpchanneleditor.cpp5
-rw-r--r--qmpchanneleditor.hpp2
-rw-r--r--qmpchanneleditor.ui36
-rw-r--r--qmpefxwindow.cpp5
-rw-r--r--qmpefxwindow.hpp3
-rw-r--r--qmpefxwindow.ui24
-rw-r--r--qmphelpwindow.ui6
-rw-r--r--qmpmidiplay.cpp7
14 files changed, 576 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 605aebb..9cedbc6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
2016-01-16 0.6.2 beta
+Maintaince release.
+Use skulpture style dials.
+Use QThread::usleep() in Windows to improve sleep precision.
+
+2016-01-16 0.6.2 beta
Stupid RC bug fixes...
Use correct home directory in Windows.
diff --git a/debian/changelog b/debian/changelog
index 9edcf8d..290b02b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+qmidiplayer (0.6.2-3) UNRELEASED; urgency=low
+
+ * Maintaince release.
+
+ -- chrisoft <chirs241097@gmail.com> Tue, 26 Jan 2016 11:48:31 +0800
+
+
qmidiplayer (0.6.2-2) UNRELEASED; urgency=low
* Minor crash fixes.
diff --git a/debian/rules b/debian/rules
index 414e9c8..589a09a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,5 @@
#!/usr/bin/make -f
%:
- dh $@
+ dh $@ --parallel
override_dh_auto_install:
$(MAKE) INSTALL_ROOT=$$(pwd)/debian/qmidiplayer prefix=/usr install \ No newline at end of file
diff --git a/qdialskulpturestyle.cpp b/qdialskulpturestyle.cpp
new file mode 100644
index 0000000..e7be93b
--- /dev/null
+++ b/qdialskulpturestyle.cpp
@@ -0,0 +1,433 @@
+/******************************************************************************
+
+ Skulpture - Classical Three-Dimensional Artwork for Qt 4
+
+ Copyright (c) 2007-2009 Christoph Feck <christoph@maxiom.de>
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+*****************************************************************************/
+#include <cmath>
+#include <QStyleOptionSlider>
+#include <QPixmapCache>
+#include <QPainter>
+
+#include "qdialskulpturestyle.hpp"
+
+static const bool UsePixmapCache = true;
+
+static void
+paintIndicatorCached(QPainter *painter, const QStyleOption *option, void (*paintIndicator)(QPainter *painter, const QStyleOption *option), bool useCache, const QString &pixmapName)
+{
+ QPixmap pixmap;
+
+ if (!useCache || !QPixmapCache::find(pixmapName, pixmap)) {
+ pixmap = QPixmap(option->rect.size());
+#if 1
+ pixmap.fill(Qt::transparent);
+ // pixmap.fill(Qt::red);
+#else
+ pixmap.fill(option->palette.color(QPalette::Window));
+#endif
+ QPainter p(&pixmap);
+ QStyleOption opt = *option;
+ opt.rect = QRect(QPoint(0, 0), option->rect.size());
+ // p.setCompositionMode(QPainter::CompositionMode_Clear);
+ // p.setCompositionMode(QPainter::CompositionMode_Source);
+ // p.fillRect(opt.rect, Qt::transparent);
+ // p.setCompositionMode(QPainter::CompositionMode_SourceOver);
+ p.setFont(painter->font());
+ p.setRenderHint(QPainter::Antialiasing, true);
+ paintIndicator(&p, &opt);
+ p.end();
+ if (useCache) {
+ QPixmapCache::insert(pixmapName, pixmap);
+ // qDebug() << "inserted into cache:" << pixmapName;
+ }
+ }
+ painter->drawPixmap(option->rect, pixmap);
+}
+
+void
+paintDialBase(QPainter *painter, const QStyleOption *option)
+{
+// painter->fillRect(option->rect, Qt::red);
+// painter->save();
+// painter->setRenderHint(QPainter::Antialiasing, true);
+ int d = qMin(option->rect.width(), option->rect.height());
+/* if (d > 20 && option->notchTarget > 0) {
+ d += -1;
+ }
+*/ QRectF r((option->rect.width() - d) / 2.0, (option->rect.height() - d) / 2.0, d, d);
+ const qreal angle = option->direction == Qt::LeftToRight ? 135.0 : 45.0;
+// const qreal angle = 90;
+
+ painter->setPen(Qt::NoPen);
+ QColor border_color = option->palette.color(QPalette::Window);
+#if 0
+ {
+ QRadialGradient depth_gradient(r.center(), d / 2);
+// depth_gradient.setColorAt(0.0, QColor(0, 0, 0, 255));
+ depth_gradient.setColorAt(0.5, QColor(0, 0, 0, 255));
+ depth_gradient.setColorAt(1.0, QColor(0, 0, 0, 0));
+ painter->setBrush(depth_gradient);
+ painter->drawEllipse(r);
+ }
+#endif
+#if 1
+ if (option->state & QStyle::State_HasFocus && option->state & QStyle::State_KeyboardFocusChange) {
+ painter->setBrush(option->palette.color(QPalette::Highlight).darker(180));
+ r.adjust(1, 1, -1, -1);
+ painter->drawEllipse(r);
+ painter->setBrush(border_color);
+ r.adjust(1, 1, -1, -1);
+ painter->drawEllipse(r);
+ r.adjust(1, 1, -1, -1);
+ } else {
+ painter->setBrush(border_color);
+ r.adjust(1, 1, -1, -1);
+ painter->drawEllipse(r);
+ r.adjust(1, 1, -1, -1);
+ QConicalGradient border_gradient(r.center(), angle);
+ if (!(option->state & QStyle::State_Enabled)) {
+ border_color = border_color.lighter(120);
+ }
+ border_gradient.setColorAt(0.0, border_color.darker(180));
+ border_gradient.setColorAt(0.3, border_color.darker(130));
+ border_gradient.setColorAt(0.5, border_color.darker(170));
+ border_gradient.setColorAt(0.7, border_color.darker(130));
+ border_gradient.setColorAt(1.0, border_color.darker(180));
+ painter->setBrush(border_gradient);
+// painter->setBrush(Qt::blue);
+ painter->drawEllipse(r);
+ r.adjust(1, 1, -1, -1);
+ }
+ d -= 6;
+
+ QColor dial_color;
+ if (option->state & QStyle::State_Enabled) {
+ dial_color = option->palette.color(QPalette::Button).lighter(101);
+ if (option->state & QStyle::State_MouseOver) {
+ dial_color = dial_color.lighter(103);
+ }
+ } else {
+ dial_color = option->palette.color(QPalette::Window);
+ }
+ qreal t = option->state & QStyle::State_Enabled ? 2.0 : 1.5;
+ if (1) {
+ // ###: work around Qt 4.3.0 bug? (this works for 4.3.1)
+ QConicalGradient border_gradient(r.center(), angle);
+ border_gradient.setColorAt(0.0, dial_color.lighter(120));
+ border_gradient.setColorAt(0.2, dial_color);
+ border_gradient.setColorAt(0.5, dial_color.darker(130));
+ border_gradient.setColorAt(0.8, dial_color);
+ border_gradient.setColorAt(1.0, dial_color.lighter(120));
+ painter->setPen(QPen(border_gradient, t));
+ } else {
+ painter->setPen(QPen(Qt::red, t));
+ }
+#if 0
+ QLinearGradient dial_gradient(r.topLeft(), r.bottomLeft());
+ dial_gradient.setColorAt(0.0, dial_color.darker(105));
+ dial_gradient.setColorAt(0.5, dial_color.lighter(102));
+ dial_gradient.setColorAt(1.0, dial_color.lighter(105));
+#elif 1
+ QLinearGradient dial_gradient(option->direction == Qt::LeftToRight ? r.topLeft() : r.topRight(), option->direction == Qt::LeftToRight ? r.bottomRight() : r.bottomLeft());
+// QLinearGradient dial_gradient(r.topLeft(), r.bottomLeft());
+ if (true || option->state & QStyle::State_Enabled) {
+#if 1
+ dial_gradient.setColorAt(0.0, dial_color.darker(106));
+ dial_gradient.setColorAt(1.0, dial_color.lighter(104));
+#else
+ dial_gradient.setColorAt(0.0, dial_color.lighter(101));
+ dial_gradient.setColorAt(0.5, dial_color.darker(103));
+ dial_gradient.setColorAt(1.0, dial_color.lighter(104));
+#endif
+ } else {
+ dial_gradient.setColorAt(0.0, dial_color);
+ dial_gradient.setColorAt(1.0, dial_color);
+ }
+#elif 0
+ QConicalGradient dial_gradient(r.center(), angle);
+ dial_gradient.setColorAt(0.0, dial_color.lighter(102));
+ dial_gradient.setColorAt(0.5, dial_color.darker(103));
+ dial_gradient.setColorAt(1.0, dial_color.lighter(102));
+#else
+ QBrush dial_gradient(dial_color);
+#endif
+ painter->setBrush(dial_gradient);
+ t = t / 2;
+ painter->drawEllipse(r.adjusted(t, t, -t, -t));
+
+// painter->setPen(Qt::NoPen);
+// painter->setBrush(dial_color);
+// painter->drawEllipse(r.adjusted(d / 4, d / 4, - d / 4, - d / 4));
+
+#if 0
+ QLinearGradient border2_gradient(r.topLeft(), r.bottomRight());
+ border2_gradient.setColorAt(1.0, dial_color.darker(425));
+ border2_gradient.setColorAt(0.9, dial_color);
+ border2_gradient.setColorAt(0.0, dial_color.darker(400));
+ painter->setPen(QPen(border2_gradient, 1.3));
+ painter->setBrush(Qt::NoBrush);
+ painter->drawEllipse(r.adjusted(0.3, 0.3, -0.3, -0.3));
+#endif
+// painter->restore();
+#endif
+}
+
+void
+paintCachedDialBase(QPainter *painter, const QStyleOptionSlider *option)
+{
+ bool useCache = UsePixmapCache;
+ QString pixmapName;
+ QRect r = option->rect;
+ int d = qMin(r.width(), r.height());
+
+ if (/* option->state & (QStyle::State_HasFocus | QStyle::State_MouseOver) ||*/ d > 128) {
+ useCache = false;
+ }
+ if (useCache) {
+ uint state = uint(option->state) & (QStyle::State_Enabled | QStyle::State_On | QStyle::State_MouseOver | QStyle::State_KeyboardFocusChange | QStyle::State_HasFocus);
+ if (!(state & QStyle::State_Enabled)) {
+ state &= ~(QStyle::State_MouseOver | QStyle::State_HasFocus | QStyle::State_KeyboardFocusChange);
+ }
+ // state &= ~(QStyle::State_HasFocus);
+ pixmapName.sprintf("scp-qdb-%x-%x-%llx-%x", state, option->direction, option->palette.cacheKey(), d);
+ }
+ paintIndicatorCached(painter, option, paintDialBase, useCache, pixmapName);
+}
+
+void
+paintIndicatorDial(QPainter *painter, const QStyleOptionSlider *option)
+{
+ int d = qMin(option->rect.width(), option->rect.height());
+ QRect rect(option->rect.center() - QPoint((d - 1) / 2, (d - 1) / 2), QSize(d, d));
+ QStyleOptionSlider opt;
+ opt.QStyleOption::operator=(*option);
+ opt.rect = rect;
+ paintCachedDialBase(painter, &opt);
+}
+
+QColor
+shaded_color(const QColor &color, int shade)
+{
+#if 1
+ const qreal contrast = 1.0;
+ int r, g, b;
+ color.getRgb(&r, &g, &b);
+ int gray = qGray(r, g, b);
+ gray = qMax(r, qMax(g, b));
+ gray = (r + b + g + 3 * gray) / 6;
+ if (shade < 0) {
+ qreal k = 220.0 / 255.0 * shade;
+ k *= contrast;
+ int a = 255;
+ if (gray > 0) {
+ a = int(k * 255 / (0 - gray));
+ if (a < 0) a = 0;
+ if (a > 255) a = 255;
+ }
+ return QColor(0, 0, 0, a);
+ } else {
+ qreal k = (255 - 220.0) / (255.0) * shade;
+ k *= contrast;
+ int a = 255;
+ if (gray < 255) {
+ a = int(k * 255 / (255 - gray));
+ if (a < 0) a = 0;
+ if (a > 255) a = 255;
+ }
+ return QColor(255, 255, 255, a);
+ }
+#else
+ if (shade < 0) {
+ return QColor(0, 0, 0, -shade);
+ } else {
+ return QColor(255, 255, 255, shade);
+ }
+#endif
+}
+
+static void
+paintGrip(QPainter *painter, const QStyleOption *option)
+{
+// painter->fillRect(option->rect, Qt::red);
+ int d = qMin(option->rect.width(), option->rect.height());
+ // good values are 3 (very small), 4 (small), 5 (good), 7 (large), 9 (huge)
+ // int d = 5;
+ QRectF rect(QRectF(option->rect).center() - QPointF(d / 2.0, d / 2.0), QSizeF(d, d));
+ const qreal angle = option->direction == Qt::LeftToRight ? 135.0 : 45.0;
+// const qreal angle = 90;
+ QColor color;
+ qreal opacity = 0.9;
+
+ painter->save();
+ painter->setPen(Qt::NoPen);
+ if (option->state & QStyle::State_Enabled) {
+ if (option->state & QStyle::State_Sunken) {
+ color = option->palette.color(QPalette::Highlight).darker(110);
+ } else {
+ color = option->palette.color(QPalette::Button);
+ }
+ } else {
+ color = option->palette.color(QPalette::Button);
+ opacity = 0.5;
+ }
+
+ QConicalGradient gradient1(rect.center(), angle);
+ gradient1.setColorAt(0.0, shaded_color(color, -110));
+ gradient1.setColorAt(0.25, shaded_color(color, -30));
+ gradient1.setColorAt(0.5, shaded_color(color, 180));
+ gradient1.setColorAt(0.75, shaded_color(color, -30));
+ gradient1.setColorAt(1.0, shaded_color(color, -110));
+ painter->setBrush(color);
+ painter->drawEllipse(rect);
+ painter->setBrush(gradient1);
+#if (QT_VERSION >= QT_VERSION_CHECK(4, 2, 0))
+ // ### merge opacity into color
+ painter->setOpacity(opacity);
+#endif
+ painter->drawEllipse(rect);
+#if (QT_VERSION >= QT_VERSION_CHECK(4, 2, 0))
+ painter->setOpacity(1.0);
+ if (d > 2) {
+ QConicalGradient gradient2(rect.center(), angle);
+ gradient2.setColorAt(0.0, shaded_color(color, -40));
+ gradient2.setColorAt(0.25, shaded_color(color, 0));
+ gradient2.setColorAt(0.5, shaded_color(color, 210));
+ gradient2.setColorAt(0.75, shaded_color(color, 0));
+ gradient2.setColorAt(1.0, shaded_color(color, -40));
+ rect.adjust(1, 1, -1, -1);
+ painter->setBrush(color);
+ painter->drawEllipse(rect);
+ painter->setBrush(gradient2);
+ painter->setOpacity(opacity);
+ painter->drawEllipse(rect);
+ painter->setOpacity(1.0);
+ if (d > 8) {
+ QConicalGradient gradient3(rect.center(), angle);
+ gradient3.setColorAt(0.0, shaded_color(color, -10));
+ gradient3.setColorAt(0.25, shaded_color(color, 0));
+ gradient3.setColorAt(0.5, shaded_color(color, 180));
+ gradient3.setColorAt(0.75, shaded_color(color, 0));
+ gradient3.setColorAt(1.0, shaded_color(color, -10));
+ rect.adjust(2, 2, -2, -2);
+ painter->setBrush(color);
+ painter->drawEllipse(rect);
+ painter->setBrush(gradient3);
+ painter->setOpacity(opacity);
+ painter->drawEllipse(rect);
+ painter->setOpacity(1.0);
+ }
+ }
+#endif
+ painter->restore();
+}
+
+void
+paintCachedGrip(QPainter *painter, const QStyleOption *option, QPalette::ColorRole /*bgrole*/)
+{
+ bool useCache = UsePixmapCache;
+ QString pixmapName;
+
+ if (/* option->state & (QStyle::State_HasFocus | QStyle::State_MouseOver) ||*/ option->rect.width() * option->rect.height() > 4096) {
+ useCache = false;
+ }
+ if (useCache) {
+ uint state = uint(option->state) & (QStyle::State_Enabled | QStyle::State_On | QStyle::State_MouseOver | QStyle::State_Sunken | QStyle::State_HasFocus);
+ if (!(state & QStyle::State_Enabled)) {
+ state &= ~(QStyle::State_MouseOver | QStyle::State_HasFocus);
+ }
+ state &= ~(QStyle::State_HasFocus);
+ QByteArray colorName = option->palette.color(QPalette::Button).name().toLatin1();
+ pixmapName.sprintf("scp-isg-%x-%x-%s-%x-%x", state, option->direction, colorName.constData(), option->rect.width(), option->rect.height());
+ }
+ paintIndicatorCached(painter, option, paintGrip, useCache, pixmapName);
+}
+
+void
+QDialSkulptureStyle::drawComplexControl( ComplexControl cc,
+ const QStyleOptionComplex *optc,
+ QPainter *painter,
+ const QWidget *widget) const
+{
+
+ if (cc != QStyle::CC_Dial) {
+ QCommonStyle::drawComplexControl(cc, optc, painter, widget);
+ return;
+ }
+
+ const QStyleOptionSlider *option = qstyleoption_cast<const QStyleOptionSlider *>(optc);
+ if (option == NULL)
+ return;
+
+ int d = qMin(option->rect.width() & ~1, option->rect.height() & ~1);
+ QStyleOptionSlider opt = *option;
+ const QAbstractSlider *slider = NULL;
+ // always highlight knob if pressed (even if mouse is not over knob)
+ if ((option->state & QStyle::State_HasFocus) && (slider = qobject_cast<const QAbstractSlider *>(widget))) {
+ if (slider->isSliderDown()) {
+ opt.state |= QStyle::State_MouseOver;
+ }
+ }
+
+ // tickmarks
+ opt.palette.setColor(QPalette::Inactive, QPalette::WindowText, QColor(80, 80, 80, 255));
+ opt.palette.setColor(QPalette::Active, QPalette::WindowText, QColor(80, 80, 80, 255));
+ opt.state &= ~QStyle::State_HasFocus;
+ opt.rect.setWidth(opt.rect.width() & ~1);
+ opt.rect.setHeight(opt.rect.height() & ~1);
+ //((QCommonStyle *) this)->
+ QCommonStyle::drawComplexControl(QStyle::CC_Dial, &opt, painter, widget);
+
+ // focus rectangle
+ if (option->state & QStyle::State_HasFocus) {
+ QStyleOptionFocusRect focus;
+ opt.state |= QStyle::State_HasFocus;
+ focus.QStyleOption::operator=(opt);
+ focus.rect.adjust(-1, -1, 1, 1);
+ //drawPrimitive(QStyle::PE_FrameFocusRect, &focus, painter, widget);
+ }
+ opt.palette = option->palette;
+
+ // dial base
+ if (d <= 256) {
+ paintIndicatorDial(painter, &opt);
+ } else {
+ // large dials are slow to render, do not render them
+ }
+
+ // dial knob
+ d -= 6;
+ int gripSize = (option->fontMetrics.height() / 4) * 2 - 1;
+ opt.rect.setSize(QSize(gripSize, gripSize));
+ opt.rect.moveCenter(option->rect.center());
+ // angle calculation from qcommonstyle.cpp (c) Trolltech 1992-2007, ASA.
+ qreal angle;
+ int sliderPosition = option->upsideDown ? option->sliderPosition : (option->maximum - option->sliderPosition);
+ int range = option->maximum - option->minimum;
+ if (!range) {
+ angle = M_PI / 2;
+ } else if (option->dialWrapping) {
+ angle = M_PI * 1.5 - (sliderPosition - option->minimum) * 2 * M_PI / range;
+ } else {
+ angle = (M_PI * 8 - (sliderPosition - option->minimum) * 10 * M_PI / range) / 6;
+ }
+
+ qreal rr = d / 2.0 - gripSize - 2;
+ opt.rect.translate(int(0.5 + rr * cos(angle)), int(0.5 - rr * sin(angle)));
+ paintCachedGrip(painter, &opt, option->state & QStyle::State_Enabled ? QPalette::Button : QPalette::Window);
+}
diff --git a/qdialskulpturestyle.hpp b/qdialskulpturestyle.hpp
new file mode 100644
index 0000000..2f3ba04
--- /dev/null
+++ b/qdialskulpturestyle.hpp
@@ -0,0 +1,39 @@
+/******************************************************************************
+
+ Skulpture - Classical Three-Dimensional Artwork for Qt 4
+
+ Copyright (c) 2007-2009 Christoph Feck <christoph@maxiom.de>
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+*****************************************************************************/
+
+#ifndef QDIALSKULPTURESTYLE_H
+#define QDIALSKULPTURESTYLE_H
+
+#include <QCommonStyle>
+
+class QDialSkulptureStyle:public QCommonStyle
+{
+public:
+ QDialSkulptureStyle(){}
+ virtual ~QDialSkulptureStyle(){}
+
+ virtual void drawComplexControl(ComplexControl cc, const QStyleOptionComplex *opt, QPainter *p,
+ const QWidget *widget=0) const;
+
+};
+
+#endif // QDIALSKULPTURESTYLE_H
diff --git a/qmidiplayer.pro b/qmidiplayer.pro
index 8ac9dff..1128e97 100644
--- a/qmidiplayer.pro
+++ b/qmidiplayer.pro
@@ -23,7 +23,8 @@ SOURCES += main.cpp\
qmpefxwindow.cpp \
qmpinfowindow.cpp \
qmpsettingswindow.cpp \
- qmphelpwindow.cpp
+ qmphelpwindow.cpp \
+ qdialskulpturestyle.cpp
HEADERS += qmpmainwindow.hpp \
qmpmidiplay.hpp \
@@ -34,7 +35,8 @@ HEADERS += qmpmainwindow.hpp \
qmpefxwindow.hpp \
qmpinfowindow.hpp \
qmpsettingswindow.hpp \
- qmphelpwindow.hpp
+ qmphelpwindow.hpp \
+ qdialskulpturestyle.hpp
FORMS += qmpmainwindow.ui \
qmpplistwindow.ui \
diff --git a/qmpchanneleditor.cpp b/qmpchanneleditor.cpp
index ac1d8fe..f1d4e5e 100644
--- a/qmpchanneleditor.cpp
+++ b/qmpchanneleditor.cpp
@@ -8,10 +8,15 @@ qmpChannelEditor::qmpChannelEditor(QWidget *parent) :
ui(new Ui::qmpChannelEditor)
{
ui->setupUi(this);
+ styl=new QDialSkulptureStyle();
+ QList<QDial*> dials=findChildren<QDial*>();
+ for(int i=0;i<dials.count();++i)
+ dials.at(i)->setStyle(styl);
}
qmpChannelEditor::~qmpChannelEditor()
{
+ delete styl;
delete ui;
}
diff --git a/qmpchanneleditor.hpp b/qmpchanneleditor.hpp
index c98bfd5..0653af5 100644
--- a/qmpchanneleditor.hpp
+++ b/qmpchanneleditor.hpp
@@ -4,6 +4,7 @@
#include <QDialog>
#include <QShowEvent>
#include <QCloseEvent>
+#include "qdialskulpturestyle.hpp"
namespace Ui {
class qmpChannelEditor;
@@ -35,6 +36,7 @@ class qmpChannelEditor:public QDialog
void sendCC();
void connectSlots();
void disconnectSlots();
+ QCommonStyle* styl;
};
#endif // QMPCHANNELEDITOR_H
diff --git a/qmpchanneleditor.ui b/qmpchanneleditor.ui
index 7e10c41..49e8c8e 100644
--- a/qmpchanneleditor.ui
+++ b/qmpchanneleditor.ui
@@ -154,6 +154,9 @@
<property name="value">
<number>64</number>
</property>
+ <property name="notchesVisible">
+ <bool>true</bool>
+ </property>
</widget>
<widget class="QDial" name="dCut">
<property name="geometry">
@@ -170,6 +173,9 @@
<property name="value">
<number>64</number>
</property>
+ <property name="notchesVisible">
+ <bool>true</bool>
+ </property>
</widget>
<widget class="QLabel" name="lbCut">
<property name="geometry">
@@ -231,6 +237,9 @@
<property name="value">
<number>64</number>
</property>
+ <property name="notchesVisible">
+ <bool>true</bool>
+ </property>
</widget>
<widget class="QDial" name="dReverb">
<property name="geometry">
@@ -247,6 +256,9 @@
<property name="value">
<number>64</number>
</property>
+ <property name="notchesVisible">
+ <bool>true</bool>
+ </property>
</widget>
<widget class="QLabel" name="lbReverb">
<property name="geometry">
@@ -308,6 +320,9 @@
<property name="value">
<number>64</number>
</property>
+ <property name="notchesVisible">
+ <bool>true</bool>
+ </property>
</widget>
<widget class="QDial" name="dAttack">
<property name="geometry">
@@ -324,6 +339,9 @@
<property name="value">
<number>64</number>
</property>
+ <property name="notchesVisible">
+ <bool>true</bool>
+ </property>
</widget>
<widget class="QLabel" name="lbAttack">
<property name="geometry">
@@ -356,6 +374,9 @@
<property name="value">
<number>64</number>
</property>
+ <property name="notchesVisible">
+ <bool>true</bool>
+ </property>
</widget>
<widget class="QLabel" name="lbRelease">
<property name="geometry">
@@ -417,6 +438,9 @@
<property name="value">
<number>64</number>
</property>
+ <property name="notchesVisible">
+ <bool>true</bool>
+ </property>
</widget>
<widget class="QDial" name="dRate">
<property name="geometry">
@@ -433,6 +457,9 @@
<property name="value">
<number>64</number>
</property>
+ <property name="notchesVisible">
+ <bool>true</bool>
+ </property>
</widget>
<widget class="QLabel" name="lbRate">
<property name="geometry">
@@ -465,6 +492,9 @@
<property name="value">
<number>64</number>
</property>
+ <property name="notchesVisible">
+ <bool>true</bool>
+ </property>
</widget>
<widget class="QLabel" name="lbDelay">
<property name="geometry">
@@ -526,6 +556,9 @@
<property name="value">
<number>64</number>
</property>
+ <property name="notchesVisible">
+ <bool>true</bool>
+ </property>
</widget>
<widget class="QLabel" name="lbVol">
<property name="geometry">
@@ -558,6 +591,9 @@
<property name="value">
<number>127</number>
</property>
+ <property name="notchesVisible">
+ <bool>true</bool>
+ </property>
</widget>
</widget>
</widget>
diff --git a/qmpefxwindow.cpp b/qmpefxwindow.cpp
index 8e60d93..7d9c08e 100644
--- a/qmpefxwindow.cpp
+++ b/qmpefxwindow.cpp
@@ -8,6 +8,10 @@ qmpEfxWindow::qmpEfxWindow(QWidget *parent) :
ui(new Ui::qmpEfxWindow)
{
ui->setupUi(this);initialized=false;
+ styl=new QDialSkulptureStyle();
+ QList<QDial*> dials=findChildren<QDial*>();
+ for(int i=0;i<dials.count();++i)
+ dials.at(i)->setStyle(styl);
connect(this,SIGNAL(dialogClosing()),parent,SLOT(dialogClosed()));
//stub. read these from settings after the setting module is implemented
QSettings *settings=qmpSettingsWindow::getSettingsIntf();
@@ -27,6 +31,7 @@ qmpEfxWindow::qmpEfxWindow(QWidget *parent) :
qmpEfxWindow::~qmpEfxWindow()
{
+ delete styl;
delete ui;
}
diff --git a/qmpefxwindow.hpp b/qmpefxwindow.hpp
index 4d4ede2..2a080f0 100644
--- a/qmpefxwindow.hpp
+++ b/qmpefxwindow.hpp
@@ -6,6 +6,8 @@
#include <QShowEvent>
#include <QMoveEvent>
+#include "qdialskulpturestyle.hpp"
+
namespace Ui {
class qmpEfxWindow;
}
@@ -54,6 +56,7 @@ class qmpEfxWindow : public QDialog
double rr,rd,rw,rl;
int cfb,ct,initialized;
double cl,cr,cd;
+ QCommonStyle* styl;
};
#endif // QMPEFXWINDOW_HPP
diff --git a/qmpefxwindow.ui b/qmpefxwindow.ui
index 39c4d6a..4a1e0c6 100644
--- a/qmpefxwindow.ui
+++ b/qmpefxwindow.ui
@@ -56,6 +56,9 @@
<property name="maximum">
<number>120</number>
</property>
+ <property name="notchesVisible">
+ <bool>true</bool>
+ </property>
</widget>
<widget class="QDial" name="dDamp">
<property name="geometry">
@@ -69,6 +72,9 @@
<property name="maximum">
<number>100</number>
</property>
+ <property name="notchesVisible">
+ <bool>true</bool>
+ </property>
</widget>
<widget class="QDial" name="dWidth">
<property name="geometry">
@@ -82,6 +88,9 @@
<property name="maximum">
<number>100</number>
</property>
+ <property name="notchesVisible">
+ <bool>true</bool>
+ </property>
</widget>
<widget class="QDial" name="dLevelR">
<property name="geometry">
@@ -95,6 +104,9 @@
<property name="maximum">
<number>100</number>
</property>
+ <property name="notchesVisible">
+ <bool>true</bool>
+ </property>
</widget>
<widget class="QLabel" name="lbRoom">
<property name="geometry">
@@ -238,6 +250,9 @@
<property name="maximum">
<number>99</number>
</property>
+ <property name="notchesVisible">
+ <bool>true</bool>
+ </property>
</widget>
<widget class="QDial" name="dRate">
<property name="geometry">
@@ -257,6 +272,9 @@
<property name="value">
<number>29</number>
</property>
+ <property name="notchesVisible">
+ <bool>true</bool>
+ </property>
</widget>
<widget class="QDial" name="dDepth">
<property name="geometry">
@@ -270,6 +288,9 @@
<property name="maximum">
<number>210</number>
</property>
+ <property name="notchesVisible">
+ <bool>true</bool>
+ </property>
</widget>
<widget class="QDial" name="dLevelC">
<property name="geometry">
@@ -283,6 +304,9 @@
<property name="maximum">
<number>100</number>
</property>
+ <property name="notchesVisible">
+ <bool>true</bool>
+ </property>
</widget>
<widget class="QLabel" name="lbFeedBack">
<property name="geometry">
diff --git a/qmphelpwindow.ui b/qmphelpwindow.ui
index 95e579c..fd21b5f 100644
--- a/qmphelpwindow.ui
+++ b/qmphelpwindow.ui
@@ -21,7 +21,11 @@
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
- <widget class="QTextBrowser" name="textBrowser"/>
+ <widget class="QTextBrowser" name="textBrowser">
+ <property name="openExternalLinks">
+ <bool>true</bool>
+ </property>
+ </widget>
</item>
</layout>
</widget>
diff --git a/qmpmidiplay.cpp b/qmpmidiplay.cpp
index d099384..2dbc753 100644
--- a/qmpmidiplay.cpp
+++ b/qmpmidiplay.cpp
@@ -2,6 +2,9 @@
#include <chrono>
#include <thread>
#include <fluidsynth.h>
+#ifdef _WIN32
+#include <QThread>
+#endif
#include "qmpmidiplay.hpp"
void CMidiPlayer::fluidInitialize()
{
@@ -125,7 +128,11 @@ void CMidiPlayer::playEvents()
if(tcstop||!midiFile||tceptr>=midiFile->getEventCount())break;
if(resumed)resumed=false;
else
+#ifdef _WIN32
+ QThread::usleep((midiFile->getEvent(tceptr)->time-ct)*(dpt/1000));
+#else
std::this_thread::sleep_for(std::chrono::nanoseconds(midiFile->getEvent(tceptr)->time-ct)*dpt);
+#endif
if(tcstop||!midiFile)break;
ct=midiFile->getEvent(tceptr)->time;
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-26 18:27:59 +0000