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:
1 parent
fb8d573fba
commit
3d8ef28d1b
112 files changed
+779
-212
No files matched your search
@@ -19,9 +19,11 @@
|
||||
|
||||
#define _USE_MATH_DEFINES
|
||||
#include <cmath>
|
||||
#include <QStandardItemModel>
|
||||
|
||||
#include "Editor/helpers/DPIHelper.h"
|
||||
#include "BiQuadFilterGUI.h"
|
||||
#include "ui_BiQuadFilterGUI.h"
|
||||
#include <QStandardItemModel>
|
||||
|
||||
static const double dialFreqSteps = 1000;
|
||||
static const double dialFreqMin = 20;
|
||||
@@ -35,6 +37,10 @@ BiQuadFilterGUI::BiQuadFilterGUI(BiQuadFilter* filter)
|
||||
{
|
||||
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("Low-pass filter"), BiQuad::LOW_PASS);
|
||||
ui->typeComboBox->addItem(tr("High-pass filter"), BiQuad::HIGH_PASS);
|
||||
|
||||
@@ -21,6 +21,7 @@
|
||||
#include <Ks.h>
|
||||
#include <KsMedia.h>
|
||||
|
||||
#include "Editor/helpers/DPIHelper.h"
|
||||
#include "Editor/helpers/GUIChannelHelper.h"
|
||||
#include "ChannelFilterGUIDialog.h"
|
||||
#include "ui_ChannelFilterGUIDialog.h"
|
||||
@@ -35,6 +36,7 @@ ChannelFilterGUIDialog::ChannelFilterGUIDialog(QWidget* parent, QStringList sele
|
||||
ui(new Ui::ChannelFilterGUIDialog)
|
||||
{
|
||||
ui->setupUi(this);
|
||||
resize(DPIHelper::scale(QSize(355, 329)));
|
||||
|
||||
ui->centerCheckBox->setProperty(PROPERTY_POSITION, SPEAKER_FRONT_CENTER);
|
||||
ui->leftCheckBox->setProperty(PROPERTY_POSITION, SPEAKER_FRONT_LEFT);
|
||||
|
||||
@@ -203,7 +203,7 @@
|
||||
</property>
|
||||
<property name="icon">
|
||||
<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>
|
||||
</widget>
|
||||
</item>
|
||||
@@ -214,7 +214,7 @@
|
||||
</property>
|
||||
<property name="icon">
|
||||
<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>
|
||||
</widget>
|
||||
</item>
|
||||
|
||||
@@ -17,6 +17,7 @@
|
||||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*/
|
||||
|
||||
#include "Editor/helpers/DPIHelper.h"
|
||||
#include "ChannelFilterGUIChannelItem.h"
|
||||
#include "ChannelFilterGUIScene.h"
|
||||
|
||||
@@ -47,7 +48,7 @@ void ChannelFilterGUIScene::load(vector<wstring> channelNames, QStringList selec
|
||||
|
||||
channelMap.insert(c, item);
|
||||
if (c != "ALL")
|
||||
channelMap.insert(QString().setNum(i), item);
|
||||
channelMap.insert(QString().setNum(i + 1), item);
|
||||
lastItem = item;
|
||||
}
|
||||
|
||||
@@ -66,7 +67,8 @@ void ChannelFilterGUIScene::load(vector<wstring> channelNames, QStringList selec
|
||||
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);
|
||||
}
|
||||
|
||||
|
||||
@@ -17,6 +17,7 @@
|
||||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*/
|
||||
|
||||
#include "Editor/helpers/DPIHelper.h"
|
||||
#include "CommentFilterGUI.h"
|
||||
#include "ui_CommentFilterGUI.h"
|
||||
|
||||
@@ -35,7 +36,7 @@ CommentFilterGUI::CommentFilterGUI(IFilterGUI* child, bool isComment)
|
||||
ui->horizontalLayout->addWidget(child);
|
||||
|
||||
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->updateMaximumHeight();
|
||||
|
||||
|
||||
@@ -49,8 +49,8 @@
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset resource="../Editor.qrc">
|
||||
<normaloff>:/icons/power_off.png</normaloff>
|
||||
<normalon>:/icons/power_on.png</normalon>:/icons/power_off.png</iconset>
|
||||
<normaloff>:/icons/power_off.ico</normaloff>
|
||||
<normalon>:/icons/power_on.ico</normalon>:/icons/power_off.ico</iconset>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Power on</string>
|
||||
|
||||
@@ -33,7 +33,7 @@
|
||||
</property>
|
||||
<property name="icon">
|
||||
<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>
|
||||
</widget>
|
||||
</item>
|
||||
|
||||
@@ -18,12 +18,13 @@
|
||||
*/
|
||||
|
||||
#include "Editor/widgets/ResizeCorner.h"
|
||||
#include "Editor/helpers/DPIHelper.h"
|
||||
#include "helpers/ChannelHelper.h"
|
||||
#include "CopyFilterGUIForm.h"
|
||||
#include "CopyFilterGUI.h"
|
||||
#include "ui_CopyFilterGUI.h"
|
||||
|
||||
static const int DEFAULT_HEIGHT = 88;
|
||||
static const double DEFAULT_HEIGHT = 88;
|
||||
|
||||
using namespace std;
|
||||
|
||||
@@ -39,7 +40,7 @@ CopyFilterGUI::CopyFilterGUI(CopyFilter* filter, FilterTable* filterTable)
|
||||
ui->form->load(filter->getAssignments());
|
||||
|
||||
ResizeCorner* cornerWidget = new ResizeCorner(filterTable,
|
||||
QSize(0, 50), QSize(0, INT_MAX),
|
||||
QSize(0, DPIHelper::scale(85)), QSize(0, INT_MAX),
|
||||
[this]() {
|
||||
return QSize(0, ui->scrollArea->height());
|
||||
},
|
||||
@@ -167,14 +168,14 @@ void CopyFilterGUI::store(QString& command, QString& parameters)
|
||||
|
||||
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());
|
||||
}
|
||||
|
||||
void CopyFilterGUI::storePreferences(QVariantMap& prefs)
|
||||
{
|
||||
if (ui->scrollArea->height() != DEFAULT_HEIGHT)
|
||||
prefs.insert("height", ui->scrollArea->height());
|
||||
if (DPIHelper::invScale(ui->scrollArea->height()) != DEFAULT_HEIGHT)
|
||||
prefs.insert("height", DPIHelper::invScale(ui->scrollArea->height()));
|
||||
if (ui->tabWidget->currentIndex() != 0)
|
||||
prefs.insert("tabIndex", ui->tabWidget->currentIndex());
|
||||
}
|
||||
@@ -56,7 +56,7 @@
|
||||
<widget class="QWidget" name="tab">
|
||||
<attribute name="icon">
|
||||
<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 name="title">
|
||||
<string/>
|
||||
@@ -101,7 +101,7 @@
|
||||
<widget class="QWidget" name="tab_2">
|
||||
<attribute name="icon">
|
||||
<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 name="title">
|
||||
<string/>
|
||||
@@ -138,8 +138,8 @@
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>348</width>
|
||||
<height>88</height>
|
||||
<width>380</width>
|
||||
<height>90</height>
|
||||
</rect>
|
||||
</property>
|
||||
</widget>
|
||||
|
||||
@@ -23,6 +23,7 @@
|
||||
#include <QPainter>
|
||||
#include <QLineEdit>
|
||||
|
||||
#include "Editor/helpers/DPIHelper.h"
|
||||
#include "Editor/widgets/ResizingLineEdit.h"
|
||||
#include "CopyFilterGUIChannelItem.h"
|
||||
#include "CopyFilterGUIScene.h"
|
||||
@@ -32,7 +33,6 @@ static const int maxArrowSize = 6;
|
||||
|
||||
CopyFilterGUIConnectionItem::CopyFilterGUIConnectionItem()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
CopyFilterGUIConnectionItem::CopyFilterGUIConnectionItem(CopyFilterGUIChannelItem* source, CopyFilterGUIChannelItem* target, double factor, bool isDecibel)
|
||||
@@ -52,7 +52,8 @@ QRectF CopyFilterGUIConnectionItem::boundingRect() const
|
||||
QRectF rect = QGraphicsLineItem::boundingRect();
|
||||
|
||||
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);
|
||||
}
|
||||
@@ -66,7 +67,7 @@ QPainterPath CopyFilterGUIConnectionItem::shape() const
|
||||
double length = line().length();
|
||||
if (length > 0)
|
||||
{
|
||||
double offset = min(length, maxArrowSize);
|
||||
double offset = min(length, DPIHelper::scale(maxArrowSize));
|
||||
QLineF unit = l.unitVector();
|
||||
QLineF normal = l.normalVector().unitVector();
|
||||
QPointF v(unit.dx(), unit.dy());
|
||||
@@ -92,7 +93,7 @@ QPainterPath CopyFilterGUIConnectionItem::shape() const
|
||||
if (factor != 1.0 || isDecibel)
|
||||
{
|
||||
QFont font;
|
||||
font.setPixelSize(10);
|
||||
font.setPixelSize(DPIHelper::scale(10));
|
||||
QPointF center = (l.p1() + l.p2()) / 2;
|
||||
QString text = QString("%1").arg(factor);
|
||||
if (isDecibel)
|
||||
@@ -130,7 +131,7 @@ void CopyFilterGUIConnectionItem::paint(QPainter* painter, const QStyleOptionGra
|
||||
painter->drawLine(line());
|
||||
|
||||
double length = line().length();
|
||||
double offset = min(length, maxArrowSize);
|
||||
double offset = min(length, DPIHelper::scale(maxArrowSize));
|
||||
QLineF unit = l.unitVector();
|
||||
QLineF normal = l.normalVector().unitVector();
|
||||
QPointF v(unit.dx(), unit.dy());
|
||||
@@ -149,7 +150,7 @@ void CopyFilterGUIConnectionItem::paint(QPainter* painter, const QStyleOptionGra
|
||||
if (factor != 1.0 || isDecibel)
|
||||
{
|
||||
QFont font = painter->font();
|
||||
font.setPixelSize(10);
|
||||
font.setPixelSize(DPIHelper::scale(10));
|
||||
painter->setFont(font);
|
||||
QPointF center = (l.p1() + l.p2()) / 2;
|
||||
QString text = QString("%1").arg(factor);
|
||||
|
||||
@@ -91,7 +91,7 @@ void CopyFilterGUIForm::load(vector<Assignment> assignments)
|
||||
|
||||
QPushButton* addSummandButton = new QPushButton(this);
|
||||
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);
|
||||
connect(addSummandButton, SIGNAL(pressed()), this, SLOT(addSummand()));
|
||||
|
||||
@@ -100,7 +100,7 @@ void CopyFilterGUIForm::load(vector<Assignment> assignments)
|
||||
removeButton->setText(tr("Remove assignment"));
|
||||
else
|
||||
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);
|
||||
connect(removeButton, SIGNAL(pressed()), this, SLOT(remove()));
|
||||
|
||||
@@ -113,7 +113,7 @@ void CopyFilterGUIForm::load(vector<Assignment> assignments)
|
||||
|
||||
QPushButton* addAssignmentButton = new QPushButton(this);
|
||||
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);
|
||||
connect(addAssignmentButton, SIGNAL(pressed()), this, SLOT(addAssignment()));
|
||||
}
|
||||
|
||||
@@ -23,6 +23,7 @@
|
||||
#include <QLineEdit>
|
||||
#include <QToolButton>
|
||||
|
||||
#include "Editor/helpers/DPIHelper.h"
|
||||
#include "Editor/widgets/ResizingLineEdit.h"
|
||||
#include "CopyFilterGUIChannelItem.h"
|
||||
#include "CopyFilterGUIScene.h"
|
||||
@@ -102,12 +103,13 @@ void CopyFilterGUIScene::load(const vector<wstring>& channelNames, vector<Assign
|
||||
}
|
||||
|
||||
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()));
|
||||
addProxyItem = addWidget(addButton);
|
||||
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()
|
||||
|
||||
@@ -17,6 +17,7 @@
|
||||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*/
|
||||
|
||||
#include "Editor/helpers/DPIHelper.h"
|
||||
#include "DelayFilterGUI.h"
|
||||
#include "ui_DelayFilterGUI.h"
|
||||
|
||||
@@ -29,6 +30,7 @@ DelayFilterGUI::DelayFilterGUI(double delay, bool isMs)
|
||||
{
|
||||
ui->setupUi(this);
|
||||
|
||||
ui->delayDial->setFixedSize(DPIHelper::scale(QSize(100, 66)));
|
||||
ui->unitComboBox->setCurrentIndex(isMs ? 0 : 1);
|
||||
ui->delaySpinBox->setValue(delay);
|
||||
}
|
||||
|
||||
@@ -17,6 +17,7 @@
|
||||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*/
|
||||
|
||||
#include "Editor/helpers/DPIHelper.h"
|
||||
#include "DeviceFilterGUIDialog.h"
|
||||
#include "ui_DeviceFilterGUIDialog.h"
|
||||
|
||||
@@ -29,6 +30,7 @@ DeviceFilterGUIDialog::DeviceFilterGUIDialog(DeviceFilterGUI* gui, DeviceFilterG
|
||||
ui(new Ui::DeviceFilterGUIDialog)
|
||||
{
|
||||
ui->setupUi(this);
|
||||
resize(DPIHelper::scale(QSize(500, 350)));
|
||||
|
||||
bool all = pattern.trimmed() == "all";
|
||||
ui->allDevicesCheckBox->setChecked(all);
|
||||
|
||||
@@ -23,14 +23,15 @@
|
||||
#include <QTextStream>
|
||||
|
||||
#include "helpers/GainIterator.h"
|
||||
#include "Editor/helpers/DPIHelper.h"
|
||||
#include "Editor/widgets/ResizeCorner.h"
|
||||
#include "Editor/FilterTable.h"
|
||||
#include "GraphicEQFilterGUIView.h"
|
||||
#include "GraphicEQFilterGUI.h"
|
||||
#include "ui_GraphicEQFilterGUI.h"
|
||||
|
||||
static const int DEFAULT_TABLE_WIDTH = 119;
|
||||
static const int DEFAULT_VIEW_HEIGHT = 150;
|
||||
static const double DEFAULT_TABLE_WIDTH = 119;
|
||||
static const double DEFAULT_VIEW_HEIGHT = 150;
|
||||
|
||||
using namespace std;
|
||||
|
||||
@@ -40,6 +41,10 @@ GraphicEQFilterGUI::GraphicEQFilterGUI(GraphicEQFilter* filter, QString configPa
|
||||
: ui(new Ui::GraphicEQFilterGUI), configPath(configPath)
|
||||
{
|
||||
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);
|
||||
ui->graphicsView->setScene(scene);
|
||||
@@ -109,35 +114,39 @@ void GraphicEQFilterGUI::store(QString& command, QString& parameters)
|
||||
|
||||
void GraphicEQFilterGUI::loadPreferences(const QVariantMap& prefs)
|
||||
{
|
||||
ui->tableWidget->setFixedWidth(prefs.value("tableWidth", DEFAULT_TABLE_WIDTH).toInt());
|
||||
ui->graphicsView->setFixedHeight(prefs.value("viewHeight", DEFAULT_VIEW_HEIGHT).toInt());
|
||||
double zoomX = prefs.value("zoomX", 1.0).toDouble();
|
||||
double zoomY = prefs.value("zoomY", 1.0).toDouble();
|
||||
if (zoomX != 1.0 || zoomY != 1.0)
|
||||
scene->setZoom(zoomX, zoomY);
|
||||
int scrollX = prefs.value("scrollX", round(scene->hzToX(20))).toInt();
|
||||
int scrollY = prefs.value("scrollY", round(scene->dbToY(22))).toInt();
|
||||
ui->tableWidget->setFixedWidth(DPIHelper::scale(prefs.value("tableWidth", DEFAULT_TABLE_WIDTH).toDouble()));
|
||||
ui->graphicsView->setFixedHeight(DPIHelper::scale(prefs.value("viewHeight", DEFAULT_VIEW_HEIGHT).toDouble()));
|
||||
double zoomX = DPIHelper::scaleZoom(prefs.value("zoomX", 1.0).toDouble());
|
||||
double zoomY = DPIHelper::scaleZoom(prefs.value("zoomY", 1.0).toDouble());
|
||||
scene->setZoom(zoomX, zoomY);
|
||||
bool ok;
|
||||
int scrollX = DPIHelper::scale(prefs.value("scrollX").toDouble(&ok));
|
||||
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);
|
||||
}
|
||||
|
||||
void GraphicEQFilterGUI::storePreferences(QVariantMap& prefs)
|
||||
{
|
||||
if (ui->tableWidget->width() != DEFAULT_TABLE_WIDTH)
|
||||
prefs.insert("tableWidth", ui->tableWidget->width());
|
||||
if (ui->graphicsView->height() != DEFAULT_VIEW_HEIGHT)
|
||||
prefs.insert("viewHeight", ui->graphicsView->height());
|
||||
if (scene->getZoomX() != 1.0)
|
||||
prefs.insert("zoomX", scene->getZoomX());
|
||||
if (scene->getZoomY() != 1.0)
|
||||
prefs.insert("zoomY", scene->getZoomY());
|
||||
if (DPIHelper::invScale(ui->tableWidget->width()) != DEFAULT_TABLE_WIDTH)
|
||||
prefs.insert("tableWidth", DPIHelper::invScale(ui->tableWidget->width()));
|
||||
if (DPIHelper::invScale(ui->graphicsView->height()) != DEFAULT_VIEW_HEIGHT)
|
||||
prefs.insert("viewHeight", DPIHelper::invScale(ui->graphicsView->height()));
|
||||
if (DPIHelper::invScaleZoom(scene->getZoomX()) != 1.0)
|
||||
prefs.insert("zoomX", DPIHelper::invScaleZoom(scene->getZoomX()));
|
||||
if (DPIHelper::invScaleZoom(scene->getZoomY()) != 1.0)
|
||||
prefs.insert("zoomY", DPIHelper::invScaleZoom(scene->getZoomY()));
|
||||
QScrollBar* hScrollBar = ui->graphicsView->horizontalScrollBar();
|
||||
int value = hScrollBar->value();
|
||||
if (value != round(scene->hzToX(20)))
|
||||
prefs.insert("scrollX", value);
|
||||
prefs.insert("scrollX", DPIHelper::invScale(value));
|
||||
QScrollBar* vScrollBar = ui->graphicsView->verticalScrollBar();
|
||||
value = vScrollBar->value();
|
||||
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)
|
||||
|
||||
@@ -197,14 +197,7 @@
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QToolBar" name="toolBar">
|
||||
<property name="iconSize">
|
||||
<size>
|
||||
<width>16</width>
|
||||
<height>16</height>
|
||||
</size>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QToolBar" name="toolBar"/>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
@@ -212,7 +205,7 @@
|
||||
<action name="actionImport">
|
||||
<property name="icon">
|
||||
<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 name="text">
|
||||
<string>Import</string>
|
||||
@@ -221,7 +214,7 @@
|
||||
<action name="actionExport">
|
||||
<property name="icon">
|
||||
<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 name="text">
|
||||
<string>Export</string>
|
||||
@@ -230,7 +223,7 @@
|
||||
<action name="actionInvertResponse">
|
||||
<property name="icon">
|
||||
<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 name="text">
|
||||
<string>Invert response</string>
|
||||
@@ -239,7 +232,7 @@
|
||||
<action name="actionNormalizeResponse">
|
||||
<property name="icon">
|
||||
<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 name="text">
|
||||
<string>Normalize response</string>
|
||||
@@ -248,7 +241,7 @@
|
||||
<action name="actionResetResponse">
|
||||
<property name="icon">
|
||||
<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 name="text">
|
||||
<string>Reset response</string>
|
||||
|
||||
@@ -19,6 +19,7 @@
|
||||
|
||||
#include <QPainter>
|
||||
|
||||
#include "Editor/helpers/DPIHelper.h"
|
||||
#include "GraphicEQFilterGUIScene.h"
|
||||
#include "GraphicEQFilterGUIItem.h"
|
||||
|
||||
@@ -33,7 +34,8 @@ GraphicEQFilterGUIItem::GraphicEQFilterGUIItem(int index, double hz, double db)
|
||||
|
||||
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
|
||||
@@ -55,7 +57,7 @@ void GraphicEQFilterGUIItem::paint(QPainter* painter, const QStyleOptionGraphics
|
||||
painter->setPen(Qt::white);
|
||||
|
||||
QFont font;
|
||||
font.setPixelSize(9);
|
||||
font.setPixelSize(DPIHelper::scale(9));
|
||||
font.setLetterSpacing(QFont::AbsoluteSpacing, -1);
|
||||
QFontMetrics metrics(font);
|
||||
painter->setFont(font);
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>400</width>
|
||||
<height>22</height>
|
||||
<height>26</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
@@ -43,7 +43,7 @@
|
||||
</property>
|
||||
<property name="icon">
|
||||
<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>
|
||||
</widget>
|
||||
</item>
|
||||
@@ -67,7 +67,7 @@
|
||||
</property>
|
||||
<property name="icon">
|
||||
<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>
|
||||
</widget>
|
||||
</item>
|
||||
|
||||
@@ -19,6 +19,7 @@
|
||||
|
||||
#include <cmath>
|
||||
|
||||
#include "Editor/helpers/DPIHelper.h"
|
||||
#include "PreampFilterGUI.h"
|
||||
#include "ui_PreampFilterGUI.h"
|
||||
|
||||
@@ -29,6 +30,7 @@ PreampFilterGUI::PreampFilterGUI(double dbGain)
|
||||
{
|
||||
ui->setupUi(this);
|
||||
|
||||
ui->dial->setFixedSize(DPIHelper::scale(QSize(100, 66)));
|
||||
ui->doubleSpinBox->setValue(dbGain);
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user