Added: High DPI support for the Configuration Editor. Icons and proportions should look better now when DPI scaling is used.

Improved: Updated Qt to version 5.7
Fixed: The GUI for the Channel command was showing the wrong channels as selected when channel numbers were used instead of names.
This commit is contained in:
jthedering committed 2016-07-09 11:07:21 +00:00
1 parent fb8d573fba
commit 3d8ef28d1b
112 files changed
+779 -212

No files matched your search

+39
View File
@@ -0,0 +1,39 @@
/*
This file is part of EqualizerAPO, a system-wide equalizer.
Copyright (C) 2016 Jonas Thedering
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 "CustomStyle.h"
#include "Editor/helpers/DPIHelper.h"
CustomStyle::CustomStyle(QStyle* style)
: QProxyStyle(style)
{
}
int CustomStyle::pixelMetric(QStyle::PixelMetric metric, const QStyleOption* option, const QWidget* widget) const
{
switch (metric)
{
case PM_ToolBarIconSize:
case PM_TabBarIconSize:
return DPIHelper::scale(16);
case PM_DockWidgetTitleBarButtonMargin:
return DPIHelper::scale(baseStyle()->pixelMetric(metric, option, widget));
default:
return baseStyle()->pixelMetric(metric, option, widget);
}
}
+32
View File
@@ -0,0 +1,32 @@
/*
This file is part of EqualizerAPO, a system-wide equalizer.
Copyright (C) 2016 Jonas Thedering
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.
*/
#pragma once
#include <QProxyStyle>
class CustomStyle : public QProxyStyle
{
Q_OBJECT
public:
CustomStyle(QStyle* style);
int pixelMetric(PixelMetric metric, const QStyleOption* option, const QWidget* widget) const override;
};
+6 -2
View File
@@ -112,7 +112,9 @@ SOURCES += main.cpp\
../parser/StringOperators.cpp \ ../parser/StringOperators.cpp \
AnalysisThread.cpp \ AnalysisThread.cpp \
widgets/ExponentialSpinBox.cpp \ widgets/ExponentialSpinBox.cpp \
FilterTableMimeData.cpp FilterTableMimeData.cpp \
helpers/DPIHelper.cpp \
CustomStyle.cpp
HEADERS += \ HEADERS += \
../helpers/LogHelper.h \ ../helpers/LogHelper.h \
@@ -213,7 +215,9 @@ HEADERS += \
../parser/StringOperators.h \ ../parser/StringOperators.h \
AnalysisThread.h \ AnalysisThread.h \
widgets/ExponentialSpinBox.h \ widgets/ExponentialSpinBox.h \
FilterTableMimeData.h FilterTableMimeData.h \
helpers/DPIHelper.h \
CustomStyle.h
FORMS += \ FORMS += \
guis/PreampFilterGUI.ui \ guis/PreampFilterGUI.ui \
+21 -21
View File
@@ -1,27 +1,27 @@
<RCC> <RCC>
<qresource prefix="/"> <qresource prefix="/">
<file>icons/arrow_right.png</file>
<file>icons/16x16/document-open.png</file>
<file>icons/16x16/document-new.png</file>
<file>icons/16x16/document-save-as.png</file>
<file>icons/16x16/document-save.png</file>
<file>icons/16x16/edit-copy.png</file>
<file>icons/16x16/edit-cut.png</file>
<file>icons/16x16/edit-delete.png</file>
<file>icons/16x16/edit-paste.png</file>
<file>icons/16x16/accessories-text-editor.png</file>
<file>icons/16x16/list-add-green.png</file>
<file>icons/16x16/list-remove-red.png</file>
<file>icons/invert_response.png</file>
<file>icons/normalize_response.png</file>
<file>icons/power_off.png</file>
<file>icons/power_on.png</file>
<file>icons/16x16/applications-graphics-rotated.png</file>
<file>icons/16x16/format-justify-fill-rotated.png</file>
<file>translations/Editor_de.qm</file> <file>translations/Editor_de.qm</file>
<file>translations/qtbase_de.qm</file> <file>translations/qtbase_de.qm</file>
<file>icons/16x16/go-up.png</file> <file>icons/document-open.ico</file>
<file>icons/reset_response.png</file> <file>icons/document-save.ico</file>
<file>icons/resize_corner.png</file> <file>icons/accessories-text-editor.ico</file>
<file>icons/applications-graphics-rotated.ico</file>
<file>icons/document-new.ico</file>
<file>icons/document-save-as.ico</file>
<file>icons/edit-copy.ico</file>
<file>icons/edit-cut.ico</file>
<file>icons/edit-delete.ico</file>
<file>icons/edit-paste.ico</file>
<file>icons/format-justify-fill-rotated.ico</file>
<file>icons/go-up.ico</file>
<file>icons/list-add-green.ico</file>
<file>icons/list-remove-red.ico</file>
<file>icons/arrow_right.ico</file>
<file>icons/power_off.ico</file>
<file>icons/power_on.ico</file>
<file>icons/invert_response.ico</file>
<file>icons/normalize_response.ico</file>
<file>icons/reset_response.ico</file>
<file>icons/resize_corner.ico</file>
</qresource> </qresource>
</RCC> </RCC>
+10 -6
View File
@@ -48,6 +48,7 @@
#include "guis/IncludeFilterGUIFactory.h" #include "guis/IncludeFilterGUIFactory.h"
#include "guis/GraphicEQFilterGUIFactory.h" #include "guis/GraphicEQFilterGUIFactory.h"
#include "guis/ConvolutionFilterGUIFactory.h" #include "guis/ConvolutionFilterGUIFactory.h"
#include "Editor/helpers/DPIHelper.h"
#include "helpers/StringHelper.h" #include "helpers/StringHelper.h"
#include "helpers/LogHelper.h" #include "helpers/LogHelper.h"
#include "helpers/ChannelHelper.h" #include "helpers/ChannelHelper.h"
@@ -61,9 +62,9 @@ FilterTable::FilterTable(MainWindow* mainWindow, QWidget* parent)
{ {
gridLayout = new QGridLayout(this); gridLayout = new QGridLayout(this);
QPixmap pixmap(QStringLiteral(":/icons/arrow_right.png")); QIcon icon(QStringLiteral(":/icons/arrow_right.ico"));
insertArrow = new QLabel(this); insertArrow = new QLabel(this);
insertArrow->setPixmap(pixmap); insertArrow->setPixmap(icon.pixmap(DPIHelper::scale(QSize(24, 15))));
insertArrow->setVisible(false); insertArrow->setVisible(false);
factories.append(new ExpressionFilterGUIFactory); factories.append(new ExpressionFilterGUIFactory);
@@ -195,13 +196,13 @@ void FilterTable::updateGuis()
propagateChannels(); propagateChannels();
QToolBar* toolBar = new QToolBar; QToolBar* toolBar = new QToolBar;
toolBar->setIconSize(QSize(16, 16)); toolBar->setIconSize(DPIHelper::scale(QSize(16, 16)));
QWidget* spacer = new QWidget; QWidget* spacer = new QWidget;
spacer->setFixedWidth(25); spacer->setFixedWidth(DPIHelper::scale(25));
toolBar->addWidget(spacer); toolBar->addWidget(spacer);
QAction* addAction = new QAction(QIcon(":/icons/16x16/list-add-green.png"), tr("Add filter"), toolBar); QAction* addAction = new QAction(QIcon(":/icons/list-add-green.ico"), tr("Add filter"), toolBar);
addAction->setCheckable(true); addAction->setCheckable(true);
connect(addAction, SIGNAL(triggered()), this, SLOT(addActionTriggered())); connect(addAction, SIGNAL(triggered()), this, SLOT(addActionTriggered()));
toolBar->addAction(addAction); toolBar->addAction(addAction);
@@ -887,6 +888,9 @@ bool FilterTable::eventFilter(QObject* obj, QEvent* event)
{ {
if (type == QEvent::Wheel) if (type == QEvent::Wheel)
{ {
QWheelEvent* wheelEvent = (QWheelEvent*)event;
scrollStartPoint = wheelEvent->globalPos();
QWidget* widget = qobject_cast<QWidget*>(obj); QWidget* widget = qobject_cast<QWidget*>(obj);
if (widget != NULL) if (widget != NULL)
{ {
@@ -901,7 +905,7 @@ bool FilterTable::eventFilter(QObject* obj, QEvent* event)
{ {
QMouseEvent* mouseEvent = (QMouseEvent*)event; QMouseEvent* mouseEvent = (QMouseEvent*)event;
if ((mouseEvent->globalPos() - scrollStartPoint).manhattanLength() > QApplication::startDragDistance()) if ((mouseEvent->globalPos() - scrollStartPoint).manhattanLength() > DPIHelper::scale(30))
scrollingNow = false; scrollingNow = false;
} }
} }
+2
View File
@@ -22,6 +22,7 @@
#include <QPainter> #include <QPainter>
#include <QScrollBar> #include <QScrollBar>
#include "Editor/helpers/DPIHelper.h"
#include "FilterTableRow.h" #include "FilterTableRow.h"
#include "ui_FilterTableRow.h" #include "ui_FilterTableRow.h"
@@ -30,6 +31,7 @@ FilterTableRow::FilterTableRow(FilterTable* table, int number, FilterTable::Item
ui(new Ui::FilterTableRow) ui(new Ui::FilterTableRow)
{ {
ui->setupUi(this); ui->setupUi(this);
ui->labelNumber->setMinimumWidth(DPIHelper::scale(25));
this->table = table; this->table = table;
this->item = item; this->item = item;
+3 -3
View File
@@ -147,7 +147,7 @@
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="Editor.qrc"> <iconset resource="Editor.qrc">
<normaloff>:/icons/16x16/list-add-green.png</normaloff>:/icons/16x16/list-add-green.png</iconset> <normaloff>:/icons/list-add-green.ico</normaloff>:/icons/list-add-green.ico</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>Add</string> <string>Add</string>
@@ -156,7 +156,7 @@
<action name="actionRemove"> <action name="actionRemove">
<property name="icon"> <property name="icon">
<iconset resource="Editor.qrc"> <iconset resource="Editor.qrc">
<normaloff>:/icons/16x16/list-remove-red.png</normaloff>:/icons/16x16/list-remove-red.png</iconset> <normaloff>:/icons/list-remove-red.ico</normaloff>:/icons/list-remove-red.ico</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>Remove</string> <string>Remove</string>
@@ -168,7 +168,7 @@
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="Editor.qrc"> <iconset resource="Editor.qrc">
<normaloff>:/icons/16x16/accessories-text-editor.png</normaloff>:/icons/16x16/accessories-text-editor.png</iconset> <normaloff>:/icons/accessories-text-editor.ico</normaloff>:/icons/accessories-text-editor.ico</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>Edit text</string> <string>Edit text</string>
+17 -10
View File
@@ -40,6 +40,7 @@
#include "helpers/LogHelper.h" #include "helpers/LogHelper.h"
#include "helpers/ChannelHelper.h" #include "helpers/ChannelHelper.h"
#include "Editor/helpers/GUIChannelHelper.h" #include "Editor/helpers/GUIChannelHelper.h"
#include "Editor/helpers/DPIHelper.h"
#include "version.h" #include "version.h"
#include "FilterTable.h" #include "FilterTable.h"
#include "MainWindow.h" #include "MainWindow.h"
@@ -64,6 +65,7 @@ MainWindow::MainWindow(QDir configDir, QWidget* parent)
} }
ui->setupUi(this); ui->setupUi(this);
resize(DPIHelper::scale(QSize(1024, 768)));
LogHelper::set(stderr, true, false, false); LogHelper::set(stderr, true, false, false);
@@ -961,12 +963,17 @@ void MainWindow::loadPreferences()
ui->startFromComboBox->setCurrentIndex(settings.value("analysis/startFrom").toInt()); ui->startFromComboBox->setCurrentIndex(settings.value("analysis/startFrom").toInt());
ui->analysisChannelComboBox->setCurrentText(settings.value("analysis/channel").toString()); ui->analysisChannelComboBox->setCurrentText(settings.value("analysis/channel").toString());
ui->resolutionSpinBox->setValue(settings.value("analysis/resolution", 65536).toInt()); ui->resolutionSpinBox->setValue(settings.value("analysis/resolution", 65536).toInt());
double zoomX = settings.value("analysis/zoomX", 1.0).toDouble(); double zoomX = DPIHelper::scaleZoom(settings.value("analysis/zoomX", 1.0).toDouble());
double zoomY = settings.value("analysis/zoomY", 1.0).toDouble(); double zoomY = DPIHelper::scaleZoom(settings.value("analysis/zoomY", 1.0).toDouble());
if (zoomX != 1.0 || zoomY != 1.0) analysisPlotScene->setZoom(zoomX, zoomY);
analysisPlotScene->setZoom(zoomX, zoomY); bool ok;
int scrollX = settings.value("analysis/scrollX", round(analysisPlotScene->hzToX(20))).toInt(); int scrollX = DPIHelper::scale(settings.value("analysis/scrollX").toDouble(&ok));
int scrollY = settings.value("analysis/scrollY", round(analysisPlotScene->dbToY(22))).toInt(); if (!ok)
scrollX = round(analysisPlotScene->hzToX(20));
int scrollY = DPIHelper::scale(settings.value("analysis/scrollY").toDouble(&ok));
if (!ok)
scrollY = round(analysisPlotScene->dbToY(22));
ui->graphicsView->setScrollOffsets(scrollX, scrollY); ui->graphicsView->setScrollOffsets(scrollX, scrollY);
QVariant openFilesValue = settings.value("openFiles"); QVariant openFilesValue = settings.value("openFiles");
@@ -1013,13 +1020,13 @@ void MainWindow::savePreferences()
settings.setValue("analysis/startFrom", ui->startFromComboBox->currentIndex()); settings.setValue("analysis/startFrom", ui->startFromComboBox->currentIndex());
settings.setValue("analysis/channel", ui->analysisChannelComboBox->currentText()); settings.setValue("analysis/channel", ui->analysisChannelComboBox->currentText());
settings.setValue("analysis/resolution", ui->resolutionSpinBox->value()); settings.setValue("analysis/resolution", ui->resolutionSpinBox->value());
settings.setValue("analysis/zoomX", analysisPlotScene->getZoomX()); settings.setValue("analysis/zoomX", DPIHelper::invScaleZoom(analysisPlotScene->getZoomX()));
settings.setValue("analysis/zoomY", analysisPlotScene->getZoomY()); settings.setValue("analysis/zoomY", DPIHelper::invScaleZoom(analysisPlotScene->getZoomY()));
QScrollBar* hScrollBar = ui->graphicsView->horizontalScrollBar(); QScrollBar* hScrollBar = ui->graphicsView->horizontalScrollBar();
int value = hScrollBar->value(); double value = DPIHelper::invScale(hScrollBar->value());
settings.setValue("analysis/scrollX", value); settings.setValue("analysis/scrollX", value);
QScrollBar* vScrollBar = ui->graphicsView->verticalScrollBar(); QScrollBar* vScrollBar = ui->graphicsView->verticalScrollBar();
value = vScrollBar->value(); value = DPIHelper::invScale(vScrollBar->value());
settings.setValue("analysis/scrollY", value); settings.setValue("analysis/scrollY", value);
QStringList fileList; QStringList fileList;
+9 -9
View File
@@ -48,7 +48,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>1024</width> <width>1024</width>
<height>21</height> <height>26</height>
</rect> </rect>
</property> </property>
<widget class="QMenu" name="menuFile"> <widget class="QMenu" name="menuFile">
@@ -562,7 +562,7 @@
<action name="actionNew"> <action name="actionNew">
<property name="icon"> <property name="icon">
<iconset resource="Editor.qrc"> <iconset resource="Editor.qrc">
<normaloff>:/icons/16x16/document-new.png</normaloff>:/icons/16x16/document-new.png</iconset> <normaloff>:/icons/document-new.ico</normaloff>:/icons/document-new.ico</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>New</string> <string>New</string>
@@ -574,7 +574,7 @@
<action name="actionOpen"> <action name="actionOpen">
<property name="icon"> <property name="icon">
<iconset resource="Editor.qrc"> <iconset resource="Editor.qrc">
<normaloff>:/icons/16x16/document-open.png</normaloff>:/icons/16x16/document-open.png</iconset> <normaloff>:/icons/document-open.ico</normaloff>:/icons/document-open.ico</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>Open</string> <string>Open</string>
@@ -589,7 +589,7 @@
<action name="actionSave"> <action name="actionSave">
<property name="icon"> <property name="icon">
<iconset resource="Editor.qrc"> <iconset resource="Editor.qrc">
<normaloff>:/icons/16x16/document-save.png</normaloff>:/icons/16x16/document-save.png</iconset> <normaloff>:/icons/document-save.ico</normaloff>:/icons/document-save.ico</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>Save</string> <string>Save</string>
@@ -604,7 +604,7 @@
<action name="actionSaveAs"> <action name="actionSaveAs">
<property name="icon"> <property name="icon">
<iconset resource="Editor.qrc"> <iconset resource="Editor.qrc">
<normaloff>:/icons/16x16/document-save-as.png</normaloff>:/icons/16x16/document-save-as.png</iconset> <normaloff>:/icons/document-save-as.ico</normaloff>:/icons/document-save-as.ico</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>Save as...</string> <string>Save as...</string>
@@ -624,7 +624,7 @@
<action name="actionCut"> <action name="actionCut">
<property name="icon"> <property name="icon">
<iconset resource="Editor.qrc"> <iconset resource="Editor.qrc">
<normaloff>:/icons/16x16/edit-cut.png</normaloff>:/icons/16x16/edit-cut.png</iconset> <normaloff>:/icons/edit-cut.ico</normaloff>:/icons/edit-cut.ico</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>Cut</string> <string>Cut</string>
@@ -636,7 +636,7 @@
<action name="actionCopy"> <action name="actionCopy">
<property name="icon"> <property name="icon">
<iconset resource="Editor.qrc"> <iconset resource="Editor.qrc">
<normaloff>:/icons/16x16/edit-copy.png</normaloff>:/icons/16x16/edit-copy.png</iconset> <normaloff>:/icons/edit-copy.ico</normaloff>:/icons/edit-copy.ico</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>Copy</string> <string>Copy</string>
@@ -648,7 +648,7 @@
<action name="actionPaste"> <action name="actionPaste">
<property name="icon"> <property name="icon">
<iconset resource="Editor.qrc"> <iconset resource="Editor.qrc">
<normaloff>:/icons/16x16/edit-paste.png</normaloff>:/icons/16x16/edit-paste.png</iconset> <normaloff>:/icons/edit-paste.ico</normaloff>:/icons/edit-paste.ico</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>Paste</string> <string>Paste</string>
@@ -660,7 +660,7 @@
<action name="actionDelete"> <action name="actionDelete">
<property name="icon"> <property name="icon">
<iconset resource="Editor.qrc"> <iconset resource="Editor.qrc">
<normaloff>:/icons/16x16/edit-delete.png</normaloff>:/icons/16x16/edit-delete.png</iconset> <normaloff>:/icons/edit-delete.ico</normaloff>:/icons/edit-delete.ico</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>Delete</string> <string>Delete</string>
+7 -1
View File
@@ -19,9 +19,11 @@
#define _USE_MATH_DEFINES #define _USE_MATH_DEFINES
#include <cmath> #include <cmath>
#include <QStandardItemModel>
#include "Editor/helpers/DPIHelper.h"
#include "BiQuadFilterGUI.h" #include "BiQuadFilterGUI.h"
#include "ui_BiQuadFilterGUI.h" #include "ui_BiQuadFilterGUI.h"
#include <QStandardItemModel>
static const double dialFreqSteps = 1000; static const double dialFreqSteps = 1000;
static const double dialFreqMin = 20; static const double dialFreqMin = 20;
@@ -35,6 +37,10 @@ BiQuadFilterGUI::BiQuadFilterGUI(BiQuadFilter* filter)
{ {
ui->setupUi(this); ui->setupUi(this);
ui->freqDial->setFixedSize(DPIHelper::scale(QSize(100, 66)));
ui->gainDial->setFixedSize(DPIHelper::scale(QSize(100, 66)));
ui->qDial->setFixedSize(DPIHelper::scale(QSize(100, 66)));
ui->typeComboBox->addItem(tr("Peaking filter"), BiQuad::PEAKING); ui->typeComboBox->addItem(tr("Peaking filter"), BiQuad::PEAKING);
ui->typeComboBox->addItem(tr("Low-pass filter"), BiQuad::LOW_PASS); ui->typeComboBox->addItem(tr("Low-pass filter"), BiQuad::LOW_PASS);
ui->typeComboBox->addItem(tr("High-pass filter"), BiQuad::HIGH_PASS); ui->typeComboBox->addItem(tr("High-pass filter"), BiQuad::HIGH_PASS);
+2
View File
@@ -21,6 +21,7 @@
#include <Ks.h> #include <Ks.h>
#include <KsMedia.h> #include <KsMedia.h>
#include "Editor/helpers/DPIHelper.h"
#include "Editor/helpers/GUIChannelHelper.h" #include "Editor/helpers/GUIChannelHelper.h"
#include "ChannelFilterGUIDialog.h" #include "ChannelFilterGUIDialog.h"
#include "ui_ChannelFilterGUIDialog.h" #include "ui_ChannelFilterGUIDialog.h"
@@ -35,6 +36,7 @@ ChannelFilterGUIDialog::ChannelFilterGUIDialog(QWidget* parent, QStringList sele
ui(new Ui::ChannelFilterGUIDialog) ui(new Ui::ChannelFilterGUIDialog)
{ {
ui->setupUi(this); ui->setupUi(this);
resize(DPIHelper::scale(QSize(355, 329)));
ui->centerCheckBox->setProperty(PROPERTY_POSITION, SPEAKER_FRONT_CENTER); ui->centerCheckBox->setProperty(PROPERTY_POSITION, SPEAKER_FRONT_CENTER);
ui->leftCheckBox->setProperty(PROPERTY_POSITION, SPEAKER_FRONT_LEFT); ui->leftCheckBox->setProperty(PROPERTY_POSITION, SPEAKER_FRONT_LEFT);
+2 -2
View File
@@ -203,7 +203,7 @@
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../Editor.qrc"> <iconset resource="../Editor.qrc">
<normaloff>:/icons/16x16/list-remove-red.png</normaloff>:/icons/16x16/list-remove-red.png</iconset> <normaloff>:/icons/list-remove-red.ico</normaloff>:/icons/list-remove-red.ico</iconset>
</property> </property>
</widget> </widget>
</item> </item>
@@ -214,7 +214,7 @@
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../Editor.qrc"> <iconset resource="../Editor.qrc">
<normaloff>:/icons/16x16/list-add-green.png</normaloff>:/icons/16x16/list-add-green.png</iconset> <normaloff>:/icons/list-add-green.ico</normaloff>:/icons/list-add-green.ico</iconset>
</property> </property>
</widget> </widget>
</item> </item>
+4 -2
View File
@@ -17,6 +17,7 @@
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/ */
#include "Editor/helpers/DPIHelper.h"
#include "ChannelFilterGUIChannelItem.h" #include "ChannelFilterGUIChannelItem.h"
#include "ChannelFilterGUIScene.h" #include "ChannelFilterGUIScene.h"
@@ -47,7 +48,7 @@ void ChannelFilterGUIScene::load(vector<wstring> channelNames, QStringList selec
channelMap.insert(c, item); channelMap.insert(c, item);
if (c != "ALL") if (c != "ALL")
channelMap.insert(QString().setNum(i), item); channelMap.insert(QString().setNum(i + 1), item);
lastItem = item; lastItem = item;
} }
@@ -66,7 +67,8 @@ void ChannelFilterGUIScene::load(vector<wstring> channelNames, QStringList selec
item->setSelected(true); item->setSelected(true);
} }
setSceneRect(itemsBoundingRect().marginsAdded(QMarginsF(2, 2, 2, 2))); int margin = DPIHelper::scale(4);
setSceneRect(itemsBoundingRect().marginsAdded(QMarginsF(margin, margin, margin, margin)));
blockSignals(false); blockSignals(false);
} }
+2 -1
View File
@@ -17,6 +17,7 @@
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/ */
#include "Editor/helpers/DPIHelper.h"
#include "CommentFilterGUI.h" #include "CommentFilterGUI.h"
#include "ui_CommentFilterGUI.h" #include "ui_CommentFilterGUI.h"
@@ -35,7 +36,7 @@ CommentFilterGUI::CommentFilterGUI(IFilterGUI* child, bool isComment)
ui->horizontalLayout->addWidget(child); ui->horizontalLayout->addWidget(child);
ui->actionPowerOn->setChecked(!isComment); ui->actionPowerOn->setChecked(!isComment);
ui->toolBar->setIconSize(QSize(24, 24)); ui->toolBar->setIconSize(DPIHelper::scale(QSize(24, 24)));
ui->toolBar->addAction(ui->actionPowerOn); ui->toolBar->addAction(ui->actionPowerOn);
ui->toolBar->updateMaximumHeight(); ui->toolBar->updateMaximumHeight();
+2 -2
View File
@@ -49,8 +49,8 @@
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../Editor.qrc"> <iconset resource="../Editor.qrc">
<normaloff>:/icons/power_off.png</normaloff> <normaloff>:/icons/power_off.ico</normaloff>
<normalon>:/icons/power_on.png</normalon>:/icons/power_off.png</iconset> <normalon>:/icons/power_on.ico</normalon>:/icons/power_off.ico</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>Power on</string> <string>Power on</string>
+1 -1
View File
@@ -33,7 +33,7 @@
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../Editor.qrc"> <iconset resource="../Editor.qrc">
<normaloff>:/icons/16x16/document-open.png</normaloff>:/icons/16x16/document-open.png</iconset> <normaloff>:/icons/document-open.ico</normaloff>:/icons/document-open.ico</iconset>
</property> </property>
</widget> </widget>
</item> </item>
+6 -5
View File
@@ -18,12 +18,13 @@
*/ */
#include "Editor/widgets/ResizeCorner.h" #include "Editor/widgets/ResizeCorner.h"
#include "Editor/helpers/DPIHelper.h"
#include "helpers/ChannelHelper.h" #include "helpers/ChannelHelper.h"
#include "CopyFilterGUIForm.h" #include "CopyFilterGUIForm.h"
#include "CopyFilterGUI.h" #include "CopyFilterGUI.h"
#include "ui_CopyFilterGUI.h" #include "ui_CopyFilterGUI.h"
static const int DEFAULT_HEIGHT = 88; static const double DEFAULT_HEIGHT = 88;
using namespace std; using namespace std;
@@ -39,7 +40,7 @@ CopyFilterGUI::CopyFilterGUI(CopyFilter* filter, FilterTable* filterTable)
ui->form->load(filter->getAssignments()); ui->form->load(filter->getAssignments());
ResizeCorner* cornerWidget = new ResizeCorner(filterTable, ResizeCorner* cornerWidget = new ResizeCorner(filterTable,
QSize(0, 50), QSize(0, INT_MAX), QSize(0, DPIHelper::scale(85)), QSize(0, INT_MAX),
[this]() { [this]() {
return QSize(0, ui->scrollArea->height()); return QSize(0, ui->scrollArea->height());
}, },
@@ -167,14 +168,14 @@ void CopyFilterGUI::store(QString& command, QString& parameters)
void CopyFilterGUI::loadPreferences(const QVariantMap& prefs) void CopyFilterGUI::loadPreferences(const QVariantMap& prefs)
{ {
ui->scrollArea->setFixedHeight(prefs.value("height", DEFAULT_HEIGHT).toInt()); ui->scrollArea->setFixedHeight(DPIHelper::scale(prefs.value("height", DEFAULT_HEIGHT).toDouble()));
ui->tabWidget->setCurrentIndex(prefs.value("tabIndex", 0).toInt()); ui->tabWidget->setCurrentIndex(prefs.value("tabIndex", 0).toInt());
} }
void CopyFilterGUI::storePreferences(QVariantMap& prefs) void CopyFilterGUI::storePreferences(QVariantMap& prefs)
{ {
if (ui->scrollArea->height() != DEFAULT_HEIGHT) if (DPIHelper::invScale(ui->scrollArea->height()) != DEFAULT_HEIGHT)
prefs.insert("height", ui->scrollArea->height()); prefs.insert("height", DPIHelper::invScale(ui->scrollArea->height()));
if (ui->tabWidget->currentIndex() != 0) if (ui->tabWidget->currentIndex() != 0)
prefs.insert("tabIndex", ui->tabWidget->currentIndex()); prefs.insert("tabIndex", ui->tabWidget->currentIndex());
} }
+4 -4
View File
@@ -56,7 +56,7 @@
<widget class="QWidget" name="tab"> <widget class="QWidget" name="tab">
<attribute name="icon"> <attribute name="icon">
<iconset resource="../Editor.qrc"> <iconset resource="../Editor.qrc">
<normaloff>:/icons/16x16/applications-graphics-rotated.png</normaloff>:/icons/16x16/applications-graphics-rotated.png</iconset> <normaloff>:/icons/applications-graphics-rotated.ico</normaloff>:/icons/applications-graphics-rotated.ico</iconset>
</attribute> </attribute>
<attribute name="title"> <attribute name="title">
<string/> <string/>
@@ -101,7 +101,7 @@
<widget class="QWidget" name="tab_2"> <widget class="QWidget" name="tab_2">
<attribute name="icon"> <attribute name="icon">
<iconset resource="../Editor.qrc"> <iconset resource="../Editor.qrc">
<normaloff>:/icons/16x16/format-justify-fill-rotated.png</normaloff>:/icons/16x16/format-justify-fill-rotated.png</iconset> <normaloff>:/icons/format-justify-fill-rotated.ico</normaloff>:/icons/format-justify-fill-rotated.ico</iconset>
</attribute> </attribute>
<attribute name="title"> <attribute name="title">
<string/> <string/>
@@ -138,8 +138,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>348</width> <width>380</width>
<height>88</height> <height>90</height>
</rect> </rect>
</property> </property>
</widget> </widget>
+7 -6
View File
@@ -23,6 +23,7 @@
#include <QPainter> #include <QPainter>
#include <QLineEdit> #include <QLineEdit>
#include "Editor/helpers/DPIHelper.h"
#include "Editor/widgets/ResizingLineEdit.h" #include "Editor/widgets/ResizingLineEdit.h"
#include "CopyFilterGUIChannelItem.h" #include "CopyFilterGUIChannelItem.h"
#include "CopyFilterGUIScene.h" #include "CopyFilterGUIScene.h"
@@ -32,7 +33,6 @@ static const int maxArrowSize = 6;
CopyFilterGUIConnectionItem::CopyFilterGUIConnectionItem() CopyFilterGUIConnectionItem::CopyFilterGUIConnectionItem()
{ {
} }
CopyFilterGUIConnectionItem::CopyFilterGUIConnectionItem(CopyFilterGUIChannelItem* source, CopyFilterGUIChannelItem* target, double factor, bool isDecibel) CopyFilterGUIConnectionItem::CopyFilterGUIConnectionItem(CopyFilterGUIChannelItem* source, CopyFilterGUIChannelItem* target, double factor, bool isDecibel)
@@ -52,7 +52,8 @@ QRectF CopyFilterGUIConnectionItem::boundingRect() const
QRectF rect = QGraphicsLineItem::boundingRect(); QRectF rect = QGraphicsLineItem::boundingRect();
QPointF p2 = line().p2(); QPointF p2 = line().p2();
QRectF rect2 = QRectF(p2.x() - maxArrowSize, p2.y() - maxArrowSize, 2 * maxArrowSize, 2 * maxArrowSize); int as = DPIHelper::scale(maxArrowSize);
QRectF rect2 = QRectF(p2.x() - as, p2.y() - as, 2 * as, 2 * as);
return rect.united(rect2); return rect.united(rect2);
} }
@@ -66,7 +67,7 @@ QPainterPath CopyFilterGUIConnectionItem::shape() const
double length = line().length(); double length = line().length();
if (length > 0) if (length > 0)
{ {
double offset = min(length, maxArrowSize); double offset = min(length, DPIHelper::scale(maxArrowSize));
QLineF unit = l.unitVector(); QLineF unit = l.unitVector();
QLineF normal = l.normalVector().unitVector(); QLineF normal = l.normalVector().unitVector();
QPointF v(unit.dx(), unit.dy()); QPointF v(unit.dx(), unit.dy());
@@ -92,7 +93,7 @@ QPainterPath CopyFilterGUIConnectionItem::shape() const
if (factor != 1.0 || isDecibel) if (factor != 1.0 || isDecibel)
{ {
QFont font; QFont font;
font.setPixelSize(10); font.setPixelSize(DPIHelper::scale(10));
QPointF center = (l.p1() + l.p2()) / 2; QPointF center = (l.p1() + l.p2()) / 2;
QString text = QString("%1").arg(factor); QString text = QString("%1").arg(factor);
if (isDecibel) if (isDecibel)
@@ -130,7 +131,7 @@ void CopyFilterGUIConnectionItem::paint(QPainter* painter, const QStyleOptionGra
painter->drawLine(line()); painter->drawLine(line());
double length = line().length(); double length = line().length();
double offset = min(length, maxArrowSize); double offset = min(length, DPIHelper::scale(maxArrowSize));
QLineF unit = l.unitVector(); QLineF unit = l.unitVector();
QLineF normal = l.normalVector().unitVector(); QLineF normal = l.normalVector().unitVector();
QPointF v(unit.dx(), unit.dy()); QPointF v(unit.dx(), unit.dy());
@@ -149,7 +150,7 @@ void CopyFilterGUIConnectionItem::paint(QPainter* painter, const QStyleOptionGra
if (factor != 1.0 || isDecibel) if (factor != 1.0 || isDecibel)
{ {
QFont font = painter->font(); QFont font = painter->font();
font.setPixelSize(10); font.setPixelSize(DPIHelper::scale(10));
painter->setFont(font); painter->setFont(font);
QPointF center = (l.p1() + l.p2()) / 2; QPointF center = (l.p1() + l.p2()) / 2;
QString text = QString("%1").arg(factor); QString text = QString("%1").arg(factor);
+3 -3
View File
@@ -91,7 +91,7 @@ void CopyFilterGUIForm::load(vector<Assignment> assignments)
QPushButton* addSummandButton = new QPushButton(this); QPushButton* addSummandButton = new QPushButton(this);
addSummandButton->setText(tr("Add summand")); addSummandButton->setText(tr("Add summand"));
addSummandButton->setIcon(QIcon(":/icons/16x16/list-add-green.png")); addSummandButton->setIcon(QIcon(":/icons/list-add-green.ico"));
gridLayout->addWidget(addSummandButton, row, 4); gridLayout->addWidget(addSummandButton, row, 4);
connect(addSummandButton, SIGNAL(pressed()), this, SLOT(addSummand())); connect(addSummandButton, SIGNAL(pressed()), this, SLOT(addSummand()));
@@ -100,7 +100,7 @@ void CopyFilterGUIForm::load(vector<Assignment> assignments)
removeButton->setText(tr("Remove assignment")); removeButton->setText(tr("Remove assignment"));
else else
removeButton->setText(tr("Remove summand")); removeButton->setText(tr("Remove summand"));
removeButton->setIcon(QIcon(":/icons/16x16/list-remove-red.png")); removeButton->setIcon(QIcon(":/icons/list-remove-red.ico"));
gridLayout->addWidget(removeButton, row, 5); gridLayout->addWidget(removeButton, row, 5);
connect(removeButton, SIGNAL(pressed()), this, SLOT(remove())); connect(removeButton, SIGNAL(pressed()), this, SLOT(remove()));
@@ -113,7 +113,7 @@ void CopyFilterGUIForm::load(vector<Assignment> assignments)
QPushButton* addAssignmentButton = new QPushButton(this); QPushButton* addAssignmentButton = new QPushButton(this);
addAssignmentButton->setText(tr("Add assignment")); addAssignmentButton->setText(tr("Add assignment"));
addAssignmentButton->setIcon(QIcon(":/icons/16x16/list-add-green.png")); addAssignmentButton->setIcon(QIcon(":/icons/list-add-green.ico"));
gridLayout->addWidget(addAssignmentButton, row++, 0, 1, 4); gridLayout->addWidget(addAssignmentButton, row++, 0, 1, 4);
connect(addAssignmentButton, SIGNAL(pressed()), this, SLOT(addAssignment())); connect(addAssignmentButton, SIGNAL(pressed()), this, SLOT(addAssignment()));
} }
+4 -2
View File
@@ -23,6 +23,7 @@
#include <QLineEdit> #include <QLineEdit>
#include <QToolButton> #include <QToolButton>
#include "Editor/helpers/DPIHelper.h"
#include "Editor/widgets/ResizingLineEdit.h" #include "Editor/widgets/ResizingLineEdit.h"
#include "CopyFilterGUIChannelItem.h" #include "CopyFilterGUIChannelItem.h"
#include "CopyFilterGUIScene.h" #include "CopyFilterGUIScene.h"
@@ -102,12 +103,13 @@ void CopyFilterGUIScene::load(const vector<wstring>& channelNames, vector<Assign
} }
QToolButton* addButton = new QToolButton; QToolButton* addButton = new QToolButton;
addButton->setIcon(QIcon(":/icons/16x16/list-add-green.png")); addButton->setIcon(QIcon(":/icons/list-add-green.ico"));
connect(addButton, SIGNAL(clicked()), this, SLOT(addOutputChannel())); connect(addButton, SIGNAL(clicked()), this, SLOT(addOutputChannel()));
addProxyItem = addWidget(addButton); addProxyItem = addWidget(addButton);
addProxyItem->setPos(getNextChannelPoint(lastOutputItem, true)); addProxyItem->setPos(getNextChannelPoint(lastOutputItem, true));
setSceneRect(itemsBoundingRect().marginsAdded(QMarginsF(2, 2, 2, 2))); int margin = DPIHelper::scale(4);
setSceneRect(itemsBoundingRect().marginsAdded(QMarginsF(margin, margin, margin, margin)));
} }
std::vector<Assignment> CopyFilterGUIScene::buildAssignments() std::vector<Assignment> CopyFilterGUIScene::buildAssignments()
+2
View File
@@ -17,6 +17,7 @@
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/ */
#include "Editor/helpers/DPIHelper.h"
#include "DelayFilterGUI.h" #include "DelayFilterGUI.h"
#include "ui_DelayFilterGUI.h" #include "ui_DelayFilterGUI.h"
@@ -29,6 +30,7 @@ DelayFilterGUI::DelayFilterGUI(double delay, bool isMs)
{ {
ui->setupUi(this); ui->setupUi(this);
ui->delayDial->setFixedSize(DPIHelper::scale(QSize(100, 66)));
ui->unitComboBox->setCurrentIndex(isMs ? 0 : 1); ui->unitComboBox->setCurrentIndex(isMs ? 0 : 1);
ui->delaySpinBox->setValue(delay); ui->delaySpinBox->setValue(delay);
} }
+2
View File
@@ -17,6 +17,7 @@
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/ */
#include "Editor/helpers/DPIHelper.h"
#include "DeviceFilterGUIDialog.h" #include "DeviceFilterGUIDialog.h"
#include "ui_DeviceFilterGUIDialog.h" #include "ui_DeviceFilterGUIDialog.h"
@@ -29,6 +30,7 @@ DeviceFilterGUIDialog::DeviceFilterGUIDialog(DeviceFilterGUI* gui, DeviceFilterG
ui(new Ui::DeviceFilterGUIDialog) ui(new Ui::DeviceFilterGUIDialog)
{ {
ui->setupUi(this); ui->setupUi(this);
resize(DPIHelper::scale(QSize(500, 350)));
bool all = pattern.trimmed() == "all"; bool all = pattern.trimmed() == "all";
ui->allDevicesCheckBox->setChecked(all); ui->allDevicesCheckBox->setChecked(all);
+29 -20
View File
@@ -23,14 +23,15 @@
#include <QTextStream> #include <QTextStream>
#include "helpers/GainIterator.h" #include "helpers/GainIterator.h"
#include "Editor/helpers/DPIHelper.h"
#include "Editor/widgets/ResizeCorner.h" #include "Editor/widgets/ResizeCorner.h"
#include "Editor/FilterTable.h" #include "Editor/FilterTable.h"
#include "GraphicEQFilterGUIView.h" #include "GraphicEQFilterGUIView.h"
#include "GraphicEQFilterGUI.h" #include "GraphicEQFilterGUI.h"
#include "ui_GraphicEQFilterGUI.h" #include "ui_GraphicEQFilterGUI.h"
static const int DEFAULT_TABLE_WIDTH = 119; static const double DEFAULT_TABLE_WIDTH = 119;
static const int DEFAULT_VIEW_HEIGHT = 150; static const double DEFAULT_VIEW_HEIGHT = 150;
using namespace std; using namespace std;
@@ -40,6 +41,10 @@ GraphicEQFilterGUI::GraphicEQFilterGUI(GraphicEQFilter* filter, QString configPa
: ui(new Ui::GraphicEQFilterGUI), configPath(configPath) : ui(new Ui::GraphicEQFilterGUI), configPath(configPath)
{ {
ui->setupUi(this); ui->setupUi(this);
ui->tableWidget->horizontalHeader()->setMinimumSectionSize(DPIHelper::scale(10));
ui->tableWidget->horizontalHeader()->setDefaultSectionSize(DPIHelper::scale(10));
ui->tableWidget->verticalHeader()->setMinimumSectionSize(DPIHelper::scale(23));
ui->tableWidget->verticalHeader()->setDefaultSectionSize(DPIHelper::scale(23));
scene = new GraphicEQFilterGUIScene(ui->graphicsView); scene = new GraphicEQFilterGUIScene(ui->graphicsView);
ui->graphicsView->setScene(scene); ui->graphicsView->setScene(scene);
@@ -109,35 +114,39 @@ void GraphicEQFilterGUI::store(QString& command, QString& parameters)
void GraphicEQFilterGUI::loadPreferences(const QVariantMap& prefs) void GraphicEQFilterGUI::loadPreferences(const QVariantMap& prefs)
{ {
ui->tableWidget->setFixedWidth(prefs.value("tableWidth", DEFAULT_TABLE_WIDTH).toInt()); ui->tableWidget->setFixedWidth(DPIHelper::scale(prefs.value("tableWidth", DEFAULT_TABLE_WIDTH).toDouble()));
ui->graphicsView->setFixedHeight(prefs.value("viewHeight", DEFAULT_VIEW_HEIGHT).toInt()); ui->graphicsView->setFixedHeight(DPIHelper::scale(prefs.value("viewHeight", DEFAULT_VIEW_HEIGHT).toDouble()));
double zoomX = prefs.value("zoomX", 1.0).toDouble(); double zoomX = DPIHelper::scaleZoom(prefs.value("zoomX", 1.0).toDouble());
double zoomY = prefs.value("zoomY", 1.0).toDouble(); double zoomY = DPIHelper::scaleZoom(prefs.value("zoomY", 1.0).toDouble());
if (zoomX != 1.0 || zoomY != 1.0) scene->setZoom(zoomX, zoomY);
scene->setZoom(zoomX, zoomY); bool ok;
int scrollX = prefs.value("scrollX", round(scene->hzToX(20))).toInt(); int scrollX = DPIHelper::scale(prefs.value("scrollX").toDouble(&ok));
int scrollY = prefs.value("scrollY", round(scene->dbToY(22))).toInt(); if (!ok)
scrollX = round(scene->hzToX(20));
int scrollY = DPIHelper::scale(prefs.value("scrollY").toDouble(&ok));
if (!ok)
scrollY = round(scene->dbToY(22));
ui->graphicsView->setScrollOffsets(scrollX, scrollY); ui->graphicsView->setScrollOffsets(scrollX, scrollY);
} }
void GraphicEQFilterGUI::storePreferences(QVariantMap& prefs) void GraphicEQFilterGUI::storePreferences(QVariantMap& prefs)
{ {
if (ui->tableWidget->width() != DEFAULT_TABLE_WIDTH) if (DPIHelper::invScale(ui->tableWidget->width()) != DEFAULT_TABLE_WIDTH)
prefs.insert("tableWidth", ui->tableWidget->width()); prefs.insert("tableWidth", DPIHelper::invScale(ui->tableWidget->width()));
if (ui->graphicsView->height() != DEFAULT_VIEW_HEIGHT) if (DPIHelper::invScale(ui->graphicsView->height()) != DEFAULT_VIEW_HEIGHT)
prefs.insert("viewHeight", ui->graphicsView->height()); prefs.insert("viewHeight", DPIHelper::invScale(ui->graphicsView->height()));
if (scene->getZoomX() != 1.0) if (DPIHelper::invScaleZoom(scene->getZoomX()) != 1.0)
prefs.insert("zoomX", scene->getZoomX()); prefs.insert("zoomX", DPIHelper::invScaleZoom(scene->getZoomX()));
if (scene->getZoomY() != 1.0) if (DPIHelper::invScaleZoom(scene->getZoomY()) != 1.0)
prefs.insert("zoomY", scene->getZoomY()); prefs.insert("zoomY", DPIHelper::invScaleZoom(scene->getZoomY()));
QScrollBar* hScrollBar = ui->graphicsView->horizontalScrollBar(); QScrollBar* hScrollBar = ui->graphicsView->horizontalScrollBar();
int value = hScrollBar->value(); int value = hScrollBar->value();
if (value != round(scene->hzToX(20))) if (value != round(scene->hzToX(20)))
prefs.insert("scrollX", value); prefs.insert("scrollX", DPIHelper::invScale(value));
QScrollBar* vScrollBar = ui->graphicsView->verticalScrollBar(); QScrollBar* vScrollBar = ui->graphicsView->verticalScrollBar();
value = vScrollBar->value(); value = vScrollBar->value();
if (value != round(scene->dbToY(22))) if (value != round(scene->dbToY(22)))
prefs.insert("scrollY", value); prefs.insert("scrollY", DPIHelper::invScale(value));
} }
void GraphicEQFilterGUI::insertRow(int index, double hz, double db) void GraphicEQFilterGUI::insertRow(int index, double hz, double db)
+6 -13
View File
@@ -197,14 +197,7 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QToolBar" name="toolBar"> <widget class="QToolBar" name="toolBar"/>
<property name="iconSize">
<size>
<width>16</width>
<height>16</height>
</size>
</property>
</widget>
</item> </item>
</layout> </layout>
</item> </item>
@@ -212,7 +205,7 @@
<action name="actionImport"> <action name="actionImport">
<property name="icon"> <property name="icon">
<iconset resource="../Editor.qrc"> <iconset resource="../Editor.qrc">
<normaloff>:/icons/16x16/document-open.png</normaloff>:/icons/16x16/document-open.png</iconset> <normaloff>:/icons/document-open.ico</normaloff>:/icons/document-open.ico</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>Import</string> <string>Import</string>
@@ -221,7 +214,7 @@
<action name="actionExport"> <action name="actionExport">
<property name="icon"> <property name="icon">
<iconset resource="../Editor.qrc"> <iconset resource="../Editor.qrc">
<normaloff>:/icons/16x16/document-save-as.png</normaloff>:/icons/16x16/document-save-as.png</iconset> <normaloff>:/icons/document-save-as.ico</normaloff>:/icons/document-save-as.ico</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>Export</string> <string>Export</string>
@@ -230,7 +223,7 @@
<action name="actionInvertResponse"> <action name="actionInvertResponse">
<property name="icon"> <property name="icon">
<iconset resource="../Editor.qrc"> <iconset resource="../Editor.qrc">
<normaloff>:/icons/invert_response.png</normaloff>:/icons/invert_response.png</iconset> <normaloff>:/icons/invert_response.ico</normaloff>:/icons/invert_response.ico</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>Invert response</string> <string>Invert response</string>
@@ -239,7 +232,7 @@
<action name="actionNormalizeResponse"> <action name="actionNormalizeResponse">
<property name="icon"> <property name="icon">
<iconset resource="../Editor.qrc"> <iconset resource="../Editor.qrc">
<normaloff>:/icons/normalize_response.png</normaloff>:/icons/normalize_response.png</iconset> <normaloff>:/icons/normalize_response.ico</normaloff>:/icons/normalize_response.ico</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>Normalize response</string> <string>Normalize response</string>
@@ -248,7 +241,7 @@
<action name="actionResetResponse"> <action name="actionResetResponse">
<property name="icon"> <property name="icon">
<iconset resource="../Editor.qrc"> <iconset resource="../Editor.qrc">
<normaloff>:/icons/reset_response.png</normaloff>:/icons/reset_response.png</iconset> <normaloff>:/icons/reset_response.ico</normaloff>:/icons/reset_response.ico</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>Reset response</string> <string>Reset response</string>
+4 -2
View File
@@ -19,6 +19,7 @@
#include <QPainter> #include <QPainter>
#include "Editor/helpers/DPIHelper.h"
#include "GraphicEQFilterGUIScene.h" #include "GraphicEQFilterGUIScene.h"
#include "GraphicEQFilterGUIItem.h" #include "GraphicEQFilterGUIItem.h"
@@ -33,7 +34,8 @@ GraphicEQFilterGUIItem::GraphicEQFilterGUIItem(int index, double hz, double db)
QRectF GraphicEQFilterGUIItem::boundingRect() const QRectF GraphicEQFilterGUIItem::boundingRect() const
{ {
return QRectF(-size / 2, -size / 2, size, size); int s = DPIHelper::scale(size);
return QRectF(-s / 2, -s / 2, s, s);
} }
QPainterPath GraphicEQFilterGUIItem::shape() const QPainterPath GraphicEQFilterGUIItem::shape() const
@@ -55,7 +57,7 @@ void GraphicEQFilterGUIItem::paint(QPainter* painter, const QStyleOptionGraphics
painter->setPen(Qt::white); painter->setPen(Qt::white);
QFont font; QFont font;
font.setPixelSize(9); font.setPixelSize(DPIHelper::scale(9));
font.setLetterSpacing(QFont::AbsoluteSpacing, -1); font.setLetterSpacing(QFont::AbsoluteSpacing, -1);
QFontMetrics metrics(font); QFontMetrics metrics(font);
painter->setFont(font); painter->setFont(font);
+3 -3
View File
@@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>400</width> <width>400</width>
<height>22</height> <height>26</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@@ -43,7 +43,7 @@
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../Editor.qrc"> <iconset resource="../Editor.qrc">
<normaloff>:/icons/16x16/document-open.png</normaloff>:/icons/16x16/document-open.png</iconset> <normaloff>:/icons/document-open.ico</normaloff>:/icons/document-open.ico</iconset>
</property> </property>
</widget> </widget>
</item> </item>
@@ -67,7 +67,7 @@
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../Editor.qrc"> <iconset resource="../Editor.qrc">
<normaloff>:/icons/16x16/go-up.png</normaloff>:/icons/16x16/go-up.png</iconset> <normaloff>:/icons/go-up.ico</normaloff>:/icons/go-up.ico</iconset>
</property> </property>
</widget> </widget>
</item> </item>
+2
View File
@@ -19,6 +19,7 @@
#include <cmath> #include <cmath>
#include "Editor/helpers/DPIHelper.h"
#include "PreampFilterGUI.h" #include "PreampFilterGUI.h"
#include "ui_PreampFilterGUI.h" #include "ui_PreampFilterGUI.h"
@@ -29,6 +30,7 @@ PreampFilterGUI::PreampFilterGUI(double dbGain)
{ {
ui->setupUi(this); ui->setupUi(this);
ui->dial->setFixedSize(DPIHelper::scale(QSize(100, 66)));
ui->doubleSpinBox->setValue(dbGain); ui->doubleSpinBox->setValue(dbGain);
} }
+70
View File
@@ -0,0 +1,70 @@
/*
This file is part of EqualizerAPO, a system-wide equalizer.
Copyright (C) 2016 Jonas Thedering
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 "DPIHelper.h"
#include <QApplication>
#include <QFont>
#include <QFontMetrics>
#include <QScreen>
QSize DPIHelper::scale(QSize size)
{
if (qApp->testAttribute(Qt::AA_Use96Dpi))
return size;
qreal dpi = QGuiApplication::primaryScreen()->logicalDotsPerInchX();
return QSize(qRound(size.width() * dpi / 96), qRound(size.height() * dpi / 96));
}
int DPIHelper::scale(double pixel)
{
if (qApp->testAttribute(Qt::AA_Use96Dpi))
return qRound(pixel);
qreal dpi = QGuiApplication::primaryScreen()->logicalDotsPerInchX();
return qRound(pixel * dpi / 96);
}
double DPIHelper::scaleZoom(double zoom)
{
if (qApp->testAttribute(Qt::AA_Use96Dpi))
return zoom;
qreal dpi = QGuiApplication::primaryScreen()->logicalDotsPerInchX();
return zoom * dpi / 96;
}
double DPIHelper::invScale(int pixel)
{
if (qApp->testAttribute(Qt::AA_Use96Dpi))
return pixel;
qreal dpi = QGuiApplication::primaryScreen()->logicalDotsPerInchX();
return pixel * 96 / dpi;
}
double DPIHelper::invScaleZoom(double zoom)
{
if (qApp->testAttribute(Qt::AA_Use96Dpi))
return zoom;
qreal dpi = QGuiApplication::primaryScreen()->logicalDotsPerInchX();
return zoom * 96 / dpi;
}
+32
View File
@@ -0,0 +1,32 @@
/*
This file is part of EqualizerAPO, a system-wide equalizer.
Copyright (C) 2016 Jonas Thedering
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 <QSize>
#pragma once
class DPIHelper
{
public:
static QSize scale(QSize size);
static int scale(double pixel);
static double scaleZoom(double zoom);
static double invScale(int pixel);
static double invScaleZoom(double zoom);
};
Binary file not shown.

Before

Width:  |  Height:  |  Size: 574 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 624 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 635 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 477 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 672 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 866 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 911 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 498 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 807 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 680 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 561 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 303 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 317 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 652 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 322 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 323 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 246 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 247 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 32 KiB

After

Width:  |  Height:  |  Size: 34 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 281 B

+9 -9
View File
@@ -15,9 +15,9 @@
version="1.1" version="1.1"
inkscape:version="0.91 r13725" inkscape:version="0.91 r13725"
viewBox="0 0 24 15" viewBox="0 0 24 15"
inkscape:export-filename="C:\Eigene Dateien\Entwickl\EqualizerAPO\trunk\Editor\icons\arrow_right.png" inkscape:export-filename="C:\Eigene Dateien\Entwickl\EqualizerAPO\trunk\Editor\icons\arrow_right_48.png"
inkscape:export-xdpi="90" inkscape:export-xdpi="180"
inkscape:export-ydpi="90" inkscape:export-ydpi="180"
sodipodi:docname="arrow_right.svg"> sodipodi:docname="arrow_right.svg">
<defs <defs
id="defs3346" /> id="defs3346" />
@@ -29,16 +29,16 @@
inkscape:pageopacity="0.0" inkscape:pageopacity="0.0"
inkscape:pageshadow="2" inkscape:pageshadow="2"
inkscape:zoom="22.197802" inkscape:zoom="22.197802"
inkscape:cx="8.8534553" inkscape:cx="-3.2423369"
inkscape:cy="1.9902411" inkscape:cy="1.9902411"
inkscape:current-layer="layer1" inkscape:current-layer="layer1"
showgrid="true" showgrid="true"
inkscape:grid-bbox="true" inkscape:grid-bbox="true"
inkscape:document-units="px" inkscape:document-units="px"
inkscape:window-width="1920" inkscape:window-width="2560"
inkscape:window-height="1018" inkscape:window-height="1365"
inkscape:window-x="-8" inkscape:window-x="-9"
inkscape:window-y="-8" inkscape:window-y="-9"
inkscape:window-maximized="1" /> inkscape:window-maximized="1" />
<metadata <metadata
id="metadata3349"> id="metadata3349">
@@ -48,7 +48,7 @@
<dc:format>image/svg+xml</dc:format> <dc:format>image/svg+xml</dc:format>
<dc:type <dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title> <dc:title />
</cc:Work> </cc:Work>
</rdf:RDF> </rdf:RDF>
</metadata> </metadata>

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 408 B

@@ -15,10 +15,10 @@
version="1.1" version="1.1"
inkscape:version="0.91 r13725" inkscape:version="0.91 r13725"
viewBox="0 0 16 16" viewBox="0 0 16 16"
sodipodi:docname="mirror_response.svg" sodipodi:docname="invert_response.svg"
inkscape:export-filename="C:\Eigene Dateien\Entwickl\EqualizerAPO\trunk\Editor\guis\mirror_response.png" inkscape:export-filename="C:\Eigene Dateien\Entwickl\EqualizerAPO\trunk\Editor\icons\invert_response_32.png"
inkscape:export-xdpi="90" inkscape:export-xdpi="180"
inkscape:export-ydpi="90"> inkscape:export-ydpi="180">
<defs <defs
id="defs6175" /> id="defs6175" />
<sodipodi:namedview <sodipodi:namedview
@@ -29,16 +29,16 @@
inkscape:pageopacity="0.0" inkscape:pageopacity="0.0"
inkscape:pageshadow="2" inkscape:pageshadow="2"
inkscape:zoom="22.197802" inkscape:zoom="22.197802"
inkscape:cx="-1.8433169" inkscape:cx="-13.939109"
inkscape:cy="8" inkscape:cy="8"
inkscape:current-layer="layer1" inkscape:current-layer="layer1"
showgrid="true" showgrid="true"
inkscape:grid-bbox="true" inkscape:grid-bbox="true"
inkscape:document-units="px" inkscape:document-units="px"
inkscape:window-width="1920" inkscape:window-width="2560"
inkscape:window-height="1018" inkscape:window-height="1365"
inkscape:window-x="-8" inkscape:window-x="-9"
inkscape:window-y="-8" inkscape:window-y="-9"
inkscape:window-maximized="1" /> inkscape:window-maximized="1" />
<metadata <metadata
id="metadata6178"> id="metadata6178">
@@ -48,7 +48,7 @@
<dc:format>image/svg+xml</dc:format> <dc:format>image/svg+xml</dc:format>
<dc:type <dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title> <dc:title />
</cc:Work> </cc:Work>
</rdf:RDF> </rdf:RDF>
</metadata> </metadata>
Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 719 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 524 B

+9 -9
View File
@@ -16,9 +16,9 @@
inkscape:version="0.91 r13725" inkscape:version="0.91 r13725"
viewBox="0 0 16 16" viewBox="0 0 16 16"
sodipodi:docname="normalize_response.svg" sodipodi:docname="normalize_response.svg"
inkscape:export-filename="C:\Eigene Dateien\Entwickl\EqualizerAPO\trunk\Editor\guis\mirror_response.png" inkscape:export-filename="C:\Eigene Dateien\Entwickl\EqualizerAPO\trunk\Editor\icons\normalize_response_32.png"
inkscape:export-xdpi="90" inkscape:export-xdpi="180"
inkscape:export-ydpi="90"> inkscape:export-ydpi="180">
<defs <defs
id="defs6175"> id="defs6175">
<marker <marker
@@ -128,16 +128,16 @@
inkscape:pageopacity="0.0" inkscape:pageopacity="0.0"
inkscape:pageshadow="2" inkscape:pageshadow="2"
inkscape:zoom="22.197802" inkscape:zoom="22.197802"
inkscape:cx="0.47673261" inkscape:cx="-11.61906"
inkscape:cy="8" inkscape:cy="8"
inkscape:current-layer="layer1" inkscape:current-layer="layer1"
showgrid="true" showgrid="true"
inkscape:grid-bbox="true" inkscape:grid-bbox="true"
inkscape:document-units="px" inkscape:document-units="px"
inkscape:window-width="1920" inkscape:window-width="2560"
inkscape:window-height="1018" inkscape:window-height="1365"
inkscape:window-x="-8" inkscape:window-x="-9"
inkscape:window-y="-8" inkscape:window-y="-9"
inkscape:window-maximized="1" /> inkscape:window-maximized="1" />
<metadata <metadata
id="metadata6178"> id="metadata6178">
@@ -147,7 +147,7 @@
<dc:format>image/svg+xml</dc:format> <dc:format>image/svg+xml</dc:format>
<dc:type <dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title> <dc:title />
</cc:Work> </cc:Work>
</rdf:RDF> </rdf:RDF>
</metadata> </metadata>

Before

Width:  |  Height:  |  Size: 6.5 KiB

After

Width:  |  Height:  |  Size: 6.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 546 B

+11 -11
View File
@@ -16,9 +16,9 @@
inkscape:version="0.91 r13725" inkscape:version="0.91 r13725"
viewBox="0 0 16 16" viewBox="0 0 16 16"
sodipodi:docname="power_off.svg" sodipodi:docname="power_off.svg"
inkscape:export-filename="C:\Eigene Dateien\Entwickl\EqualizerAPO\trunk\Editor\guis\power_on2.png" inkscape:export-filename="C:\Eigene Dateien\Entwickl\EqualizerAPO\trunk\Editor\icons\power_off_48.png"
inkscape:export-xdpi="135" inkscape:export-xdpi="270"
inkscape:export-ydpi="135"> inkscape:export-ydpi="270">
<defs <defs
id="defs4138" /> id="defs4138" />
<sodipodi:namedview <sodipodi:namedview
@@ -29,16 +29,16 @@
inkscape:pageopacity="0.0" inkscape:pageopacity="0.0"
inkscape:pageshadow="2" inkscape:pageshadow="2"
inkscape:zoom="31.392433" inkscape:zoom="31.392433"
inkscape:cx="0.88689741" inkscape:cx="-7.6661192"
inkscape:cy="8.823581" inkscape:cy="8.823581"
inkscape:current-layer="layer1" inkscape:current-layer="layer1"
showgrid="true" showgrid="true"
inkscape:grid-bbox="true" inkscape:grid-bbox="true"
inkscape:document-units="px" inkscape:document-units="px"
inkscape:window-width="1920" inkscape:window-width="2560"
inkscape:window-height="1018" inkscape:window-height="1365"
inkscape:window-x="-8" inkscape:window-x="-9"
inkscape:window-y="-8" inkscape:window-y="-9"
inkscape:window-maximized="1" /> inkscape:window-maximized="1" />
<metadata <metadata
id="metadata4141"> id="metadata4141">
@@ -48,7 +48,7 @@
<dc:format>image/svg+xml</dc:format> <dc:format>image/svg+xml</dc:format>
<dc:type <dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title> <dc:title />
</cc:Work> </cc:Work>
</rdf:RDF> </rdf:RDF>
</metadata> </metadata>
@@ -57,12 +57,12 @@
inkscape:label="Layer 1" inkscape:label="Layer 1"
inkscape:groupmode="layer"> inkscape:groupmode="layer">
<path <path
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.40000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
d="m 3.9589844,3.1152344 a 1.0001,1.0001 0 0 0 -0.6875,0.3027344 c -2.6027028,2.6027026 -2.6027025,6.8523742 0,9.4550782 2.6027027,2.602703 6.8543276,2.602702 9.4570316,0 2.602702,-2.602704 2.602702,-6.8523756 0,-9.4550782 a 1.0001,1.0001 0 1 0 -1.414063,1.4140624 c 1.838405,1.8384052 1.838406,4.7885468 0,6.6269528 -1.838406,1.838406 -4.7905011,1.838406 -6.6289061,0 -1.8384053,-1.8384058 -1.838405,-4.7885478 0,-6.6269528 A 1.0001,1.0001 0 0 0 3.9589844,3.1152344 Z" d="m 3.9589844,3.1152344 a 1.0001,1.0001 0 0 0 -0.6875,0.3027344 c -2.6027028,2.6027026 -2.6027025,6.8523742 0,9.4550782 2.6027027,2.602703 6.8543276,2.602702 9.4570316,0 2.602702,-2.602704 2.602702,-6.8523756 0,-9.4550782 a 1.0001,1.0001 0 1 0 -1.414063,1.4140624 c 1.838405,1.8384052 1.838406,4.7885468 0,6.6269528 -1.838406,1.838406 -4.7905011,1.838406 -6.6289061,0 -1.8384053,-1.8384058 -1.838405,-4.7885478 0,-6.6269528 A 1.0001,1.0001 0 0 0 3.9589844,3.1152344 Z"
id="path4692" id="path4692"
inkscape:connector-curvature="0" /> inkscape:connector-curvature="0" />
<path <path
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.40000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
d="M 7.984375,1.1757812 A 1.0001,1.0001 0 0 0 7,2.1894531 l 0,5.0644531 a 1.0001,1.0001 0 1 0 2,0 L 9,2.1894531 A 1.0001,1.0001 0 0 0 7.984375,1.1757812 Z" d="M 7.984375,1.1757812 A 1.0001,1.0001 0 0 0 7,2.1894531 l 0,5.0644531 a 1.0001,1.0001 0 1 0 2,0 L 9,2.1894531 A 1.0001,1.0001 0 0 0 7.984375,1.1757812 Z"
id="path6137" id="path6137"
inkscape:connector-curvature="0" /> inkscape:connector-curvature="0" />

Before

Width:  |  Height:  |  Size: 4.5 KiB

After

Width:  |  Height:  |  Size: 4.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

+9 -9
View File
@@ -16,9 +16,9 @@
inkscape:version="0.91 r13725" inkscape:version="0.91 r13725"
viewBox="0 0 16 16" viewBox="0 0 16 16"
sodipodi:docname="power_on.svg" sodipodi:docname="power_on.svg"
inkscape:export-filename="C:\Eigene Dateien\Entwickl\EqualizerAPO\trunk\Editor\guis\power_on2.png" inkscape:export-filename="C:\Eigene Dateien\Entwickl\EqualizerAPO\trunk\Editor\icons\power_on_48.png"
inkscape:export-xdpi="135" inkscape:export-xdpi="270"
inkscape:export-ydpi="135"> inkscape:export-ydpi="270">
<defs <defs
id="defs4138" /> id="defs4138" />
<sodipodi:namedview <sodipodi:namedview
@@ -29,16 +29,16 @@
inkscape:pageopacity="0.0" inkscape:pageopacity="0.0"
inkscape:pageshadow="2" inkscape:pageshadow="2"
inkscape:zoom="31.392433" inkscape:zoom="31.392433"
inkscape:cx="0.88689741" inkscape:cx="-7.6661192"
inkscape:cy="8.823581" inkscape:cy="8.823581"
inkscape:current-layer="layer1" inkscape:current-layer="layer1"
showgrid="true" showgrid="true"
inkscape:grid-bbox="true" inkscape:grid-bbox="true"
inkscape:document-units="px" inkscape:document-units="px"
inkscape:window-width="1920" inkscape:window-width="2560"
inkscape:window-height="1018" inkscape:window-height="1365"
inkscape:window-x="-8" inkscape:window-x="-9"
inkscape:window-y="-8" inkscape:window-y="-9"
inkscape:window-maximized="1" /> inkscape:window-maximized="1" />
<metadata <metadata
id="metadata4141"> id="metadata4141">
@@ -48,7 +48,7 @@
<dc:format>image/svg+xml</dc:format> <dc:format>image/svg+xml</dc:format>
<dc:type <dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title> <dc:title />
</cc:Work> </cc:Work>
</rdf:RDF> </rdf:RDF>
</metadata> </metadata>

Before

Width:  |  Height:  |  Size: 4.5 KiB

After

Width:  |  Height:  |  Size: 4.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 424 B

+8 -8
View File
@@ -16,9 +16,9 @@
inkscape:version="0.91 r13725" inkscape:version="0.91 r13725"
viewBox="0 0 16 16" viewBox="0 0 16 16"
sodipodi:docname="reset_response.svg" sodipodi:docname="reset_response.svg"
inkscape:export-filename="C:\Eigene Dateien\Entwickl\EqualizerAPO\trunk\Editor\icons\reset_response.png" inkscape:export-filename="C:\Eigene Dateien\Entwickl\EqualizerAPO\trunk\Editor\icons\reset_response_32.png"
inkscape:export-xdpi="90" inkscape:export-xdpi="180"
inkscape:export-ydpi="90"> inkscape:export-ydpi="180">
<defs <defs
id="defs6175"> id="defs6175">
<marker <marker
@@ -128,16 +128,16 @@
inkscape:pageopacity="0.0" inkscape:pageopacity="0.0"
inkscape:pageshadow="2" inkscape:pageshadow="2"
inkscape:zoom="22.197802" inkscape:zoom="22.197802"
inkscape:cx="2.7742573" inkscape:cx="-9.3215349"
inkscape:cy="8" inkscape:cy="8"
inkscape:current-layer="layer1" inkscape:current-layer="layer1"
showgrid="true" showgrid="true"
inkscape:grid-bbox="true" inkscape:grid-bbox="true"
inkscape:document-units="px" inkscape:document-units="px"
inkscape:window-width="1920" inkscape:window-width="2560"
inkscape:window-height="1018" inkscape:window-height="1365"
inkscape:window-x="-8" inkscape:window-x="-9"
inkscape:window-y="-8" inkscape:window-y="-9"
inkscape:window-maximized="1" /> inkscape:window-maximized="1" />
<metadata <metadata
id="metadata6178"> id="metadata6178">

Before

Width:  |  Height:  |  Size: 6.2 KiB

After

Width:  |  Height:  |  Size: 6.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 527 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 195 B

+9 -9
View File
@@ -17,9 +17,9 @@
inkscape:version="0.91 r13725" inkscape:version="0.91 r13725"
viewBox="0 0 16 16" viewBox="0 0 16 16"
sodipodi:docname="resize_corner.svg" sodipodi:docname="resize_corner.svg"
inkscape:export-filename="C:\Eigene Dateien\Entwickl\EqualizerAPO\trunk\Editor\icons\resize_corner.png" inkscape:export-filename="C:\Eigene Dateien\Entwickl\EqualizerAPO\trunk\Editor\icons\resize_corner_32.png"
inkscape:export-xdpi="90" inkscape:export-xdpi="180"
inkscape:export-ydpi="90"> inkscape:export-ydpi="180">
<defs <defs
id="defs4138"> id="defs4138">
<linearGradient <linearGradient
@@ -164,16 +164,16 @@
inkscape:pageopacity="0.0" inkscape:pageopacity="0.0"
inkscape:pageshadow="2" inkscape:pageshadow="2"
inkscape:zoom="44.395604" inkscape:zoom="44.395604"
inkscape:cx="6.225166" inkscape:cx="-1.8161707"
inkscape:cy="8.4597677" inkscape:cy="8.4597677"
inkscape:current-layer="layer1" inkscape:current-layer="layer1"
showgrid="true" showgrid="true"
inkscape:grid-bbox="true" inkscape:grid-bbox="true"
inkscape:document-units="px" inkscape:document-units="px"
inkscape:window-width="1920" inkscape:window-width="2560"
inkscape:window-height="1018" inkscape:window-height="1365"
inkscape:window-x="-8" inkscape:window-x="-9"
inkscape:window-y="-8" inkscape:window-y="-9"
inkscape:window-maximized="1" /> inkscape:window-maximized="1" />
<metadata <metadata
id="metadata4141"> id="metadata4141">
@@ -183,7 +183,7 @@
<dc:format>image/svg+xml</dc:format> <dc:format>image/svg+xml</dc:format>
<dc:type <dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title> <dc:title />
</cc:Work> </cc:Work>
</rdf:RDF> </rdf:RDF>
</metadata> </metadata>

Before

Width:  |  Height:  |  Size: 7.5 KiB

After

Width:  |  Height:  |  Size: 7.5 KiB

+327
View File
@@ -0,0 +1,327 @@
<?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:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="20"
height="20"
id="svg4136"
version="1.1"
inkscape:version="0.91 r13725"
viewBox="0 0 20 20"
sodipodi:docname="resize_corner_20.svg"
inkscape:export-filename="C:\Eigene Dateien\Entwickl\EqualizerAPO\trunk\Editor\icons\resize_corner.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90">
<defs
id="defs4138">
<linearGradient
id="linearGradient8270"
inkscape:collect="always">
<stop
style="stop-color:#ffffff;stop-opacity:1"
offset="0"
id="stop8272" />
<stop
style="stop-color:#000000;stop-opacity:1;"
offset="1"
id="stop8276" />
</linearGradient>
<marker
inkscape:stockid="TriangleOutM"
orient="auto"
refY="0"
refX="0"
id="TriangleOutM"
style="overflow:visible"
inkscape:isstock="true">
<path
id="path4835"
d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
transform="scale(0.4,0.4)"
inkscape:connector-curvature="0" />
</marker>
<marker
inkscape:stockid="TriangleOutS"
orient="auto"
refY="0"
refX="0"
id="TriangleOutS"
style="overflow:visible"
inkscape:isstock="true">
<path
id="path4838"
d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
transform="scale(0.2,0.2)"
inkscape:connector-curvature="0" />
</marker>
<marker
inkscape:stockid="Arrow2Send"
orient="auto"
refY="0"
refX="0"
id="Arrow2Send"
style="overflow:visible"
inkscape:isstock="true">
<path
id="path4723"
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
transform="matrix(-0.3,0,0,-0.3,0.69,0)"
inkscape:connector-curvature="0" />
</marker>
<marker
inkscape:stockid="TriangleInS"
orient="auto"
refY="0"
refX="0"
id="TriangleInS"
style="overflow:visible"
inkscape:isstock="true">
<path
id="path4829"
d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
transform="scale(-0.2,-0.2)"
inkscape:connector-curvature="0" />
</marker>
<marker
inkscape:stockid="TriangleInM"
orient="auto"
refY="0"
refX="0"
id="TriangleInM"
style="overflow:visible"
inkscape:isstock="true">
<path
id="path4826"
d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
transform="scale(-0.4,-0.4)"
inkscape:connector-curvature="0" />
</marker>
<marker
inkscape:stockid="Arrow1Sstart"
orient="auto"
refY="0"
refX="0"
id="marker5044"
style="overflow:visible"
inkscape:isstock="true">
<path
id="path5046"
d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
transform="matrix(0.2,0,0,0.2,1.2,0)"
inkscape:connector-curvature="0" />
</marker>
<marker
inkscape:stockid="Arrow2Sstart"
orient="auto"
refY="0"
refX="0"
id="Arrow2Sstart"
style="overflow:visible"
inkscape:isstock="true">
<path
id="path4720"
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
transform="matrix(0.3,0,0,0.3,-0.69,0)"
inkscape:connector-curvature="0" />
</marker>
<marker
inkscape:stockid="Arrow1Sstart"
orient="auto"
refY="0"
refX="0"
id="Arrow1Sstart"
style="overflow:visible"
inkscape:isstock="true">
<path
id="path4702"
d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
transform="matrix(0.2,0,0,0.2,1.2,0)"
inkscape:connector-curvature="0" />
</marker>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient8270"
id="linearGradient4305"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.4999999,0,0,1.4999999,-3.4999995,-7.5)"
x1="13.337872"
y1="13.887377"
x2="15.968564"
y2="15.711881" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient8270"
id="linearGradient4305-9"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.4999999,0,0,1.4999999,-3.5000002,-11.5)"
x1="13.337872"
y1="13.887377"
x2="15.968564"
y2="15.711881" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient8270"
id="linearGradient4305-9-8"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.4999999,0,0,1.4999999,-7.5000009,-11.500001)"
x1="13.337872"
y1="13.887377"
x2="15.968564"
y2="15.711881" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient8270"
id="linearGradient4305-96"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.4999999,0,0,1.4999999,-7.5000009,-7.5000005)"
x1="13.337872"
y1="13.887377"
x2="15.968564"
y2="15.711881" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient8270"
id="linearGradient4305-9-0"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.4999999,0,0,1.4999999,-3.5000007,-15.5)"
x1="13.337872"
y1="13.887377"
x2="15.968564"
y2="15.711881" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient8270"
id="linearGradient4305-96-7"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.4999999,0,0,1.4999999,-11.500001,-7.4999995)"
x1="13.337872"
y1="13.887377"
x2="15.968564"
y2="15.711881" />
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="22.197802"
inkscape:cx="-0.29538331"
inkscape:cy="9.3796718"
inkscape:current-layer="layer1"
showgrid="true"
inkscape:grid-bbox="true"
inkscape:document-units="px"
inkscape:window-width="2560"
inkscape:window-height="1365"
inkscape:window-x="-9"
inkscape:window-y="-9"
inkscape:window-maximized="1" />
<metadata
id="metadata4141">
<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"
transform="translate(0,4)">
<circle
style="fill:url(#linearGradient4305);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00600004;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0"
id="path7823-08"
cx="17.5"
cy="13.5"
r="1.5"
inkscape:tile-cx="14"
inkscape:tile-cy="14"
inkscape:tile-w="2"
inkscape:tile-h="2"
inkscape:tile-x0="13"
inkscape:tile-y0="13" />
<circle
style="fill:url(#linearGradient4305-9);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00600004;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0"
id="path7823-08-2"
cx="17.5"
cy="9.5"
r="1.5"
inkscape:tile-cx="14"
inkscape:tile-cy="14"
inkscape:tile-w="2"
inkscape:tile-h="2"
inkscape:tile-x0="13"
inkscape:tile-y0="13" />
<circle
style="fill:url(#linearGradient4305-96);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00600004;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0"
id="path7823-08-5"
cx="13.5"
cy="13.5"
r="1.5"
inkscape:tile-cx="14"
inkscape:tile-cy="14"
inkscape:tile-w="2"
inkscape:tile-h="2"
inkscape:tile-x0="13"
inkscape:tile-y0="13" />
<circle
style="fill:url(#linearGradient4305-9-8);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00600004;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0"
id="path7823-08-2-6"
cx="13.5"
cy="9.5"
r="1.5"
inkscape:tile-cx="14"
inkscape:tile-cy="14"
inkscape:tile-w="2"
inkscape:tile-h="2"
inkscape:tile-x0="13"
inkscape:tile-y0="13" />
<circle
style="fill:url(#linearGradient4305-9-0);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00600004;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0"
id="path7823-08-2-67"
cx="17.5"
cy="5.5"
r="1.5"
inkscape:tile-cx="14"
inkscape:tile-cy="14"
inkscape:tile-w="2"
inkscape:tile-h="2"
inkscape:tile-x0="13"
inkscape:tile-y0="13" />
<circle
style="fill:url(#linearGradient4305-96-7);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00600004;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0"
id="path7823-08-5-1"
cx="9.5"
cy="13.5"
r="1.5"
inkscape:tile-cx="14"
inkscape:tile-cy="14"
inkscape:tile-w="2"
inkscape:tile-h="2"
inkscape:tile-x0="13"
inkscape:tile-y0="13" />
</g>
</svg>

After

Width:  |  Height:  |  Size: 11 KiB

+2
View File
@@ -22,6 +22,7 @@
#include <QDir> #include <QDir>
#include <QCommandLineParser> #include <QCommandLineParser>
#include <QSettings> #include <QSettings>
#include "CustomStyle.h"
#include "MainWindow.h" #include "MainWindow.h"
#include "helpers/RegistryHelper.h" #include "helpers/RegistryHelper.h"
@@ -41,6 +42,7 @@ int main(int argc, char* argv[])
do do
{ {
QApplication application(argc, argv); QApplication application(argc, argv);
application.setStyle(new CustomStyle(application.style()));
QSettings settings(QString::fromWCharArray(EDITOR_REGPATH), QSettings::NativeFormat); QSettings settings(QString::fromWCharArray(EDITOR_REGPATH), QSettings::NativeFormat);
QVariant languageValue = settings.value("language"); QVariant languageValue = settings.value("language");
+4 -3
View File
@@ -20,6 +20,7 @@
#include <QGraphicsScene> #include <QGraphicsScene>
#include <QPainter> #include <QPainter>
#include "Editor/helpers/DPIHelper.h"
#include "ChannelGraphItem.h" #include "ChannelGraphItem.h"
static const float margin = 5; static const float margin = 5;
@@ -43,8 +44,8 @@ QRectF ChannelGraphItem::boundingRect() const
// shift by 0.5 to have sharp lines // shift by 0.5 to have sharp lines
cachedRect.setLeft(0.5); cachedRect.setLeft(0.5);
cachedRect.setTop(0.5); cachedRect.setTop(0.5);
cachedRect.setWidth(width + 2 * margin); cachedRect.setWidth(width + 2 * DPIHelper::scale(margin));
cachedRect.setHeight(height + 2 * margin); cachedRect.setHeight(height + 2 * DPIHelper::scale(margin));
} }
return cachedRect; return cachedRect;
@@ -62,6 +63,6 @@ void ChannelGraphItem::paint(QPainter* painter, QColor color)
gradient.setColorAt(0, QColor(255, 255, 255)); gradient.setColorAt(0, QColor(255, 255, 255));
gradient.setColorAt(1, color); gradient.setColorAt(1, color);
painter->setBrush(gradient); painter->setBrush(gradient);
painter->drawRoundedRect(rect, margin, margin); painter->drawRoundedRect(rect, DPIHelper::scale(margin), DPIHelper::scale(margin));
painter->drawText(rect.translated(1, -1), Qt::AlignCenter, name); painter->drawText(rect.translated(1, -1), Qt::AlignCenter, name);
} }
+3 -2
View File
@@ -19,6 +19,7 @@
#include <QGraphicsItem> #include <QGraphicsItem>
#include "Editor/helpers/DPIHelper.h"
#include "ChannelGraphScene.h" #include "ChannelGraphScene.h"
ChannelGraphScene::ChannelGraphScene(QWidget* parent) ChannelGraphScene::ChannelGraphScene(QWidget* parent)
@@ -32,8 +33,8 @@ QPointF ChannelGraphScene::getNextChannelPoint(QGraphicsItem* lastItem, bool out
if (lastItem != NULL) if (lastItem != NULL)
{ {
QRectF lastRect = lastItem->sceneBoundingRect(); QRectF lastRect = lastItem->sceneBoundingRect();
x = lastRect.left() + lastRect.width() + 1 + 10; x = lastRect.left() + lastRect.width() + 1 + DPIHelper::scale(10);
} }
return QPointF(x, output ? 50 : 0); return QPointF(x, output ? DPIHelper::scale(50) : 0);
} }
+2 -2
View File
@@ -17,14 +17,14 @@
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/ */
#include "Editor/helpers/DPIHelper.h"
#include "CompactToolBar.h" #include "CompactToolBar.h"
CompactToolBar::CompactToolBar(QWidget* parent) CompactToolBar::CompactToolBar(QWidget* parent)
: QToolBar(parent) : QToolBar(parent)
{ {
setMinimumHeight(1); setMinimumHeight(DPIHelper::scale(33));
setOrientation(Qt::Vertical); setOrientation(Qt::Vertical);
setIconSize(QSize(16, 16));
} }
QSize CompactToolBar::sizeHint() const QSize CompactToolBar::sizeHint() const
+14 -7
View File
@@ -17,6 +17,7 @@
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/ */
#include "Editor/helpers/DPIHelper.h"
#include "FrequencyPlotView.h" #include "FrequencyPlotView.h"
#include "FrequencyPlotScene.h" #include "FrequencyPlotScene.h"
@@ -37,6 +38,9 @@ vector<double> FrequencyPlotScene::bandsVar;
FrequencyPlotScene::FrequencyPlotScene(QObject* parent) FrequencyPlotScene::FrequencyPlotScene(QObject* parent)
: QGraphicsScene(parent) : QGraphicsScene(parent)
{ {
zoomX = DPIHelper::scaleZoom(1.0);
zoomY = DPIHelper::scaleZoom(1.0);
updateSceneRect(); updateSceneRect();
} }
@@ -83,14 +87,17 @@ double FrequencyPlotScene::getZoomY() const
void FrequencyPlotScene::setZoom(double zoomX, double zoomY) void FrequencyPlotScene::setZoom(double zoomX, double zoomY)
{ {
this->zoomX = zoomX; if (zoomX != this->zoomX || zoomY != this->zoomY)
this->zoomY = zoomY;
updateSceneRect();
for (QGraphicsItem* item : items())
{ {
FrequencyPlotItem* plotItem = (FrequencyPlotItem*)item; this->zoomX = zoomX;
plotItem->updatePos(); this->zoomY = zoomY;
updateSceneRect();
for (QGraphicsItem* item : items())
{
FrequencyPlotItem* plotItem = (FrequencyPlotItem*)item;
plotItem->updatePos();
}
} }
} }
+2 -2
View File
@@ -55,7 +55,7 @@ protected:
private: private:
void updateSceneRect(); void updateSceneRect();
double zoomX = 1.0; double zoomX;
double zoomY = 1.0; double zoomY;
int bandCount = -1; int bandCount = -1;
}; };
+2 -1
View File
@@ -19,6 +19,7 @@
#include <QWheelEvent> #include <QWheelEvent>
#include "Editor/helpers/DPIHelper.h"
#include "FrequencyPlotView.h" #include "FrequencyPlotView.h"
#include "FrequencyPlotScene.h" #include "FrequencyPlotScene.h"
#include "FrequencyPlotVRuler.h" #include "FrequencyPlotVRuler.h"
@@ -37,7 +38,7 @@ void FrequencyPlotVRuler::paintEvent(QPaintEvent*)
QPointF topLeft = view->mapToScene(0, 0); QPointF topLeft = view->mapToScene(0, 0);
QPointF bottomRight = view->mapToScene(view->viewport()->width(), view->viewport()->height()); QPointF bottomRight = view->mapToScene(view->viewport()->width(), view->viewport()->height());
double dbStep = abs(s->yToDb(0) - s->yToDb(30)); double dbStep = abs(s->yToDb(0) - s->yToDb(DPIHelper::scale(30)));
double dbBase = pow(10, floor(log10(dbStep))); double dbBase = pow(10, floor(log10(dbStep)));
if (dbStep >= 5 * dbBase) if (dbStep >= 5 * dbBase)
+4 -2
View File
@@ -21,6 +21,7 @@
#include <QWheelEvent> #include <QWheelEvent>
#include <QScrollBar> #include <QScrollBar>
#include "Editor/helpers/DPIHelper.h"
#include "FrequencyPlotItem.h" #include "FrequencyPlotItem.h"
#include "FrequencyPlotView.h" #include "FrequencyPlotView.h"
@@ -29,7 +30,7 @@ using namespace std;
FrequencyPlotView::FrequencyPlotView(QWidget* parent) FrequencyPlotView::FrequencyPlotView(QWidget* parent)
: QGraphicsView(parent) : QGraphicsView(parent)
{ {
setViewportMargins(32, 0, 0, 20); setViewportMargins(DPIHelper::scale(32), 0, 0, DPIHelper::scale(20));
hRuler = new FrequencyPlotHRuler(this); hRuler = new FrequencyPlotHRuler(this);
vRuler = new FrequencyPlotVRuler(this); vRuler = new FrequencyPlotVRuler(this);
hRuler->setMouseTracking(true); hRuler->setMouseTracking(true);
@@ -60,7 +61,7 @@ void FrequencyPlotView::drawBackground(QPainter* painter, const QRectF& drawRect
FrequencyPlotScene* s = scene(); FrequencyPlotScene* s = scene();
QPointF topLeft = mapToScene(0, 0); QPointF topLeft = mapToScene(0, 0);
QPointF bottomRight = mapToScene(viewport()->width(), viewport()->height()); QPointF bottomRight = mapToScene(viewport()->width(), viewport()->height());
double dbStep = abs(s->yToDb(0) - s->yToDb(30)); double dbStep = abs(s->yToDb(0) - s->yToDb(DPIHelper::scale(30)));
double dbBase = pow(10, floor(log10(dbStep))); double dbBase = pow(10, floor(log10(dbStep)));
if (dbStep >= 5 * dbBase) if (dbStep >= 5 * dbBase)
@@ -176,6 +177,7 @@ void FrequencyPlotView::setScrollOffsets(int x, int y)
void FrequencyPlotView::wheelEvent(QWheelEvent* event) void FrequencyPlotView::wheelEvent(QWheelEvent* event)
{ {
event->accept();
int delta = event->angleDelta().y(); int delta = event->angleDelta().y();
zoom(delta, delta, event->x(), event->y()); zoom(delta, delta, event->x(), event->y());
} }
+8 -1
View File
@@ -19,13 +19,20 @@
#include <QMouseEvent> #include <QMouseEvent>
#include "Editor/helpers/DPIHelper.h"
#include "ResizeCorner.h" #include "ResizeCorner.h"
ResizeCorner::ResizeCorner(FilterTable* filterTable, QSize minimumSize, QSize maximumSize, std::function<QSize()> getFunc, std::function<void(QSize)> setFunc, QWidget* parent) ResizeCorner::ResizeCorner(FilterTable* filterTable, QSize minimumSize, QSize maximumSize, std::function<QSize()> getFunc, std::function<void(QSize)> setFunc, QWidget* parent)
: QLabel(parent), minimumSize(minimumSize), maximumSize(maximumSize), getFunc(getFunc), setFunc(setFunc), filterTable(filterTable) : QLabel(parent), minimumSize(minimumSize), maximumSize(maximumSize), getFunc(getFunc), setFunc(setFunc), filterTable(filterTable)
{ {
setPixmap(QPixmap(":/icons/resize_corner.png")); QIcon icon(":/icons/resize_corner.ico");
QSize desiredSize = DPIHelper::scale(QSize(16, 16));
QSize actualSize = icon.actualSize(desiredSize);
QPixmap pixmap = icon.pixmap(actualSize);
setPixmap(pixmap);
setCursor(Qt::SizeFDiagCursor); setCursor(Qt::SizeFDiagCursor);
// move icon to lower right if it does not fill the full area
setContentsMargins(desiredSize.width() - actualSize.width(), desiredSize.height() - actualSize.height(), 0, 0);
} }
void ResizeCorner::mousePressEvent(QMouseEvent* event) void ResizeCorner::mousePressEvent(QMouseEvent* event)
+1
View File
@@ -4,4 +4,5 @@
4. Upload EqualizerAPO32-x.exe, EqualizerAPO64-x.exe and EqualizerAPO-src-x.zip to new folder x 4. Upload EqualizerAPO32-x.exe, EqualizerAPO64-x.exe and EqualizerAPO-src-x.zip to new folder x
5. Update readme.txt using subversion log 5. Update readme.txt using subversion log
6. Set EqualizerAPO64-x.exe as new default download 6. Set EqualizerAPO64-x.exe as new default download
7. Update URL for tool "Downloads" to https://sourceforge.net/projects/equalizerapo/files/x/
7. Create tag of trunk in tags/x 7. Create tag of trunk in tags/x
+1 -1
View File
@@ -1,6 +1,6 @@
!define BINPATH "..\Release" !define BINPATH "..\Release"
!define BINPATH_EDITOR "..\build-Editor-Desktop_Qt_5_5_MSVC2013_32bit-Release\release" !define BINPATH_EDITOR "..\build-Editor-Desktop_Qt_5_7_MSVC2013_32bit-Release\release"
!define LIBPATH "lib32" !define LIBPATH "lib32"
!include "Setup.nsi" !include "Setup.nsi"
+1 -1
View File
@@ -1,6 +1,6 @@
!define BINPATH "..\x64\Release" !define BINPATH "..\x64\Release"
!define BINPATH_EDITOR "..\build-Editor-Desktop_Qt_5_5_MSVC2013_64bit-Release\release" !define BINPATH_EDITOR "..\build-Editor-Desktop_Qt_5_7_MSVC2013_64bit-Release\release"
!define LIBPATH "lib64" !define LIBPATH "lib64"
!include "Setup.nsi" !include "Setup.nsi"
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loaded 100 of 112 files, more files were not shown because too many files have changed in this diff. Show more