Qt code refactor w/ functional style
This commit is contained in:
parent
f8171f12f3
commit
f7de5ef803
7 changed files with 207 additions and 201 deletions
|
|
@ -1,50 +1,10 @@
|
|||
#pragma once
|
||||
|
||||
#include <QMainWindow>
|
||||
#include <QApplication>
|
||||
#include <QCloseEvent>
|
||||
|
||||
#include <QIcon>
|
||||
#include <QSystemTrayIcon>
|
||||
#include <QMenu>
|
||||
//#include <QMessageBox>
|
||||
|
||||
#include <QLabel>
|
||||
#include <QSlider>
|
||||
#include <QGridLayout>
|
||||
#include <QPushButton>
|
||||
#include <QCheckBox>
|
||||
#include <QTimer>
|
||||
#include <QScrollArea>
|
||||
#include <QScrollBar>
|
||||
#include <QSize>
|
||||
#include <QMenuBar>
|
||||
#include <QMenu>
|
||||
#include <QScreen>
|
||||
#include <QToolBar>
|
||||
#include <QWindow>
|
||||
#include <QPainter>
|
||||
#include <QStyle>
|
||||
#include <QStyleOptionComplex>
|
||||
#include <QStyleOptionSlider>
|
||||
#include <QStylePainter>
|
||||
#include <QStyleOptionSlider>
|
||||
#include <QFontMetrics>
|
||||
//#include <QScrollBar>
|
||||
/*
|
||||
* #else
|
||||
* class QSlider;
|
||||
* class QLabel;
|
||||
* class QGridLayout;
|
||||
* class QPushButton;
|
||||
* class QWidget;
|
||||
* class QMainWindow;
|
||||
* #endif
|
||||
*/
|
||||
|
||||
#include "global.h"
|
||||
#include "qtcommon.h"
|
||||
#include "contclasses.h"
|
||||
|
||||
class MeterSlider;
|
||||
|
||||
enum SpawnPos {
|
||||
LEFT = (1 << 1),
|
||||
RIGHT = (0 << 1),
|
||||
|
|
@ -70,26 +30,9 @@ public:
|
|||
};
|
||||
//Q_DECLARE_METATYPE(EndpointWidgetEvent)
|
||||
|
||||
class MeterSlider : public QSlider {
|
||||
Q_OBJECT
|
||||
private:
|
||||
~MeterSlider();
|
||||
float peakValue;
|
||||
|
||||
friend class MixerStyle;
|
||||
protected:
|
||||
bool event(QEvent* ev) override;
|
||||
void paintEvent(QPaintEvent *event) override;
|
||||
|
||||
public:
|
||||
//MeterSlider(Qt::Orientation orientation, QWidget *parent = nullptr);
|
||||
//MeterSlider(QWidget* parent = nullptr) : MeterSlider(Qt::Vertical, parent){};
|
||||
void setPeakValue(float peakValue);
|
||||
using QSlider::QSlider;
|
||||
};
|
||||
|
||||
//todo: TEST. TEST.
|
||||
#include "qtvisuals.h"
|
||||
//#include "qtvisuals.h"
|
||||
|
||||
class ExtendedCheckBox : public QCheckBox {
|
||||
Q_OBJECT
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue