LibreMediaServer/lms-audio
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

shortcuts acts in entire app, although the focus is set on the main window

Browse source 
cueTrackWidget and cueTrackListWidget cosmetics
This commit is contained in:
snt 2024-07-26 21:28:23 +02:00
parent f4bf71dbcf
commit f665ccfd7d
5 changed files with 384 additions and 289 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/cuetracklistwidget.cpp
View file

@ -14,6 +14,7 @@
#include <QXmlStreamReader> #include <QXmlStreamReader>
#include <QMessageBox> #include <QMessageBox>
#include "cuetracklistwidget.h" #include "cuetracklistwidget.h"
#include "editcuetrackwidget.h"
CueTrackListWidget::CueTrackListWidget(QWidget *parent) CueTrackListWidget::CueTrackListWidget(QWidget *parent)
{ {
@ -22,6 +23,7 @@ CueTrackListWidget::CueTrackListWidget(QWidget *parent)
tableWidget->setSortingEnabled(false); tableWidget->setSortingEnabled(false);
layout->addWidget(tableWidget); layout->addWidget(tableWidget);
setLayout(layout); setLayout(layout);
tableWidget->installEventFilter(parent);
QShortcut *shortcut_up = new QShortcut(QKeySequence("Up"), parent); QShortcut *shortcut_up = new QShortcut(QKeySequence("Up"), parent);
QObject::connect(shortcut_up, SIGNAL(activated()), this , SLOT(key_up())); QObject::connect(shortcut_up, SIGNAL(activated()), this , SLOT(key_up()));
QShortcut *shortcut_down = new QShortcut(QKeySequence("Down"), parent); QShortcut *shortcut_down = new QShortcut(QKeySequence("Down"), parent);
@ -32,7 +34,6 @@ CueTrackListWidget::CueTrackListWidget(QWidget *parent)
QObject::connect(shortcut_cut, SIGNAL(activated()), this, SLOT(cutCueTrack())); QObject::connect(shortcut_cut, SIGNAL(activated()), this, SLOT(cutCueTrack()));
QShortcut *shortcut_paste = new QShortcut(QKeySequence("Ctrl+V"), parent); QShortcut *shortcut_paste = new QShortcut(QKeySequence("Ctrl+V"), parent);
QObject::connect(shortcut_paste, SIGNAL(activated()), this, SLOT(pasteCueTrack())); QObject::connect(shortcut_paste, SIGNAL(activated()), this, SLOT(pasteCueTrack()));
tableWidget->installEventFilter(this);
QShortcut *shortcut_delete = new QShortcut(QKeySequence("Delete"), parent); QShortcut *shortcut_delete = new QShortcut(QKeySequence("Delete"), parent);
QObject::connect(shortcut_delete, SIGNAL(activated()), this, SLOT(deleteCueTrack())); QObject::connect(shortcut_delete, SIGNAL(activated()), this, SLOT(deleteCueTrack()));
QShortcut *shortcut_insert = new QShortcut(QKeySequence("Insert"), parent); QShortcut *shortcut_insert = new QShortcut(QKeySequence("Insert"), parent);
@ -92,7 +93,7 @@ void CueTrackListWidget::key_down() {
void CueTrackListWidget::displayCueTrackInTable(CueTrack *cueTrack, int index) { void CueTrackListWidget::displayCueTrackInTable(CueTrack *cueTrack, int index) {
if (tableWidget->columnCount() == 0) { if (tableWidget->columnCount() == 0) {
tableWidget->setColumnCount(7); tableWidget->setColumnCount(7);
QStringList headers = {"Active", "Number","Audio Channel", "Name", "Volume", "Status", "File"}; QStringList headers = {"Active", "Cue","Chan", "Name", "Vol", "State", "File"};
tableWidget->setHorizontalHeaderLabels(headers); tableWidget->setHorizontalHeaderLabels(headers);
} }
if (index == -1) if (index == -1)
@ -247,7 +248,7 @@ void CueTrackListWidget::redrawCueTrackList()
int selected = cueTracks.at(selectedIndex)->userNumber; int selected = cueTracks.at(selectedIndex)->userNumber;
clearTableWidget(); clearTableWidget();
tableWidget->setColumnCount(7); tableWidget->setColumnCount(7);
QStringList headers = {"Active", "Number","Channel", "Name", "Volume", "Status", "File"}; QStringList headers = {"Active", "Cue","Chan", "Name", "Vol", "State", "File"};
tableWidget->setHorizontalHeaderLabels(headers); tableWidget->setHorizontalHeaderLabels(headers);
sortCueTrackList(); sortCueTrackList();
selectedIndex = 0; selectedIndex = 0;
@ -510,7 +511,7 @@ CueTrack loadCueTrackFromXml(const QString& filename) {
const QString elementName = xmlReader.name().toString(); const QString elementName = xmlReader.name().toString();
if (elementName == "filePath") { if (elementName == "filePath") {
cueTrack.filePath = xmlReader.readElementText().toStdString(); cueTrack.filePath = xmlReader.readElementText().toStdString();
} else if (elementName == "volume") { } else if (elementName == "vol") {
cueTrack.volume = xmlReader.readElementText().toInt(); cueTrack.volume = xmlReader.readElementText().toInt();
} else if (elementName == "pan") { } else if (elementName == "pan") {
cueTrack.pan = xmlReader.readElementText().toInt(); cueTrack.pan = xmlReader.readElementText().toInt();
@ -520,7 +521,7 @@ CueTrack loadCueTrackFromXml(const QString& filename) {
cueTrack.bus1 = xmlReader.readElementText().toInt(); cueTrack.bus1 = xmlReader.readElementText().toInt();
} else if (elementName == "bus2") { } else if (elementName == "bus2") {
cueTrack.bus2 = xmlReader.readElementText().toInt(); cueTrack.bus2 = xmlReader.readElementText().toInt();
} else if (elementName == "status") { } else if (elementName == "state") {
QString tmp = xmlReader.readElementText(); QString tmp = xmlReader.readElementText();
cueTrack.status = stringToStatus(&tmp); cueTrack.status = stringToStatus(&tmp);
} else if (elementName == "fadeOut") { } else if (elementName == "fadeOut") {

1
src/cuetracklistwidget.h
View file

@ -10,7 +10,6 @@
#include <QTableWidget> #include <QTableWidget>
#include <QTableWidgetItem> #include <QTableWidgetItem>
#include "defines.h" #include "defines.h"
#include "editcuetrackwidget.h"
class CueTrackListWidget : public QWidget { class CueTrackListWidget : public QWidget {
Q_OBJECT Q_OBJECT

608
src/cuetrackwidget.ui
View file

@ -33,6 +33,21 @@
<normaloff>:/buttons/resources/icon.png</normaloff>:/buttons/resources/icon.png</iconset> <normaloff>:/buttons/resources/icon.png</normaloff>:/buttons/resources/icon.png</iconset>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<property name="spacing">
<number>0</number>
</property>
<property name="leftMargin">
<number>1</number>
</property>
<property name="topMargin">
<number>1</number>
</property>
<property name="rightMargin">
<number>1</number>
</property>
<property name="bottomMargin">
<number>1</number>
</property>
<item> <item>
<widget class="QSplitter" name="splitter_2"> <widget class="QSplitter" name="splitter_2">
<property name="orientation"> <property name="orientation">
@ -405,6 +420,9 @@
<property name="frameShape"> <property name="frameShape">
<enum>QFrame::NoFrame</enum> <enum>QFrame::NoFrame</enum>
</property> </property>
<property name="lineWidth">
<number>0</number>
</property>
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
@ -443,35 +461,8 @@
<property name="spacing"> <property name="spacing">
<number>0</number> <number>0</number>
</property> </property>
<item row="0" column="4"> <item row="0" column="5">
<widget class="QLabel" name="waitInLable"> <widget class="QLCDNumber" name="waitIn">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font">
<font>
<pointsize>10</pointsize>
</font>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="text">
<string>Wait In</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLCDNumber" name="fade">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>10</horstretch> <horstretch>10</horstretch>
@ -481,6 +472,9 @@
<property name="frameShape"> <property name="frameShape">
<enum>QFrame::StyledPanel</enum> <enum>QFrame::StyledPanel</enum>
</property> </property>
<property name="frameShadow">
<enum>QFrame::Plain</enum>
</property>
<property name="smallDecimalPoint"> <property name="smallDecimalPoint">
<bool>false</bool> <bool>false</bool>
</property> </property>
@ -489,82 +483,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="1">
<widget class="QLCDNumber" name="vol">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>10</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Volume&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="smallDecimalPoint">
<bool>false</bool>
</property>
<property name="digitCount">
<number>3</number>
</property>
<property name="segmentStyle">
<enum>QLCDNumber::Flat</enum>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="fadeInLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font">
<font>
<pointsize>10</pointsize>
</font>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="text">
<string>Fade In</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item row="4" column="2">
<widget class="QLabel" name="bus1Label">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font">
<font>
<pointsize>10</pointsize>
</font>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="text">
<string>Bus 1</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="0" column="3"> <item row="0" column="3">
<widget class="QLCDNumber" name="fadeOut"> <widget class="QLCDNumber" name="fadeOut">
<property name="sizePolicy"> <property name="sizePolicy">
@ -576,6 +494,9 @@
<property name="frameShape"> <property name="frameShape">
<enum>QFrame::StyledPanel</enum> <enum>QFrame::StyledPanel</enum>
</property> </property>
<property name="frameShadow">
<enum>QFrame::Plain</enum>
</property>
<property name="smallDecimalPoint"> <property name="smallDecimalPoint">
<bool>false</bool> <bool>false</bool>
</property> </property>
@ -584,6 +505,97 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="7">
<widget class="QLCDNumber" name="waitOut">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>10</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Plain</enum>
</property>
<property name="smallDecimalPoint">
<bool>false</bool>
</property>
<property name="segmentStyle">
<enum>QLCDNumber::Flat</enum>
</property>
</widget>
</item>
<item row="6" column="7">
<widget class="QLCDNumber" name="lcdNumber">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>10</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Plain</enum>
</property>
<property name="smallDecimalPoint">
<bool>false</bool>
</property>
<property name="segmentStyle">
<enum>QLCDNumber::Flat</enum>
</property>
</widget>
</item>
<item row="6" column="5">
<widget class="QLCDNumber" name="entryPoint">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>10</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Plain</enum>
</property>
<property name="smallDecimalPoint">
<bool>false</bool>
</property>
<property name="segmentStyle">
<enum>QLCDNumber::Flat</enum>
</property>
</widget>
</item>
<item row="4" column="4">
<widget class="QLabel" name="bus2Label">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font">
<font>
<pointsize>10</pointsize>
</font>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="text">
<string>Bus
2</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="4" column="0"> <item row="4" column="0">
<widget class="QLabel" name="volLabel"> <widget class="QLabel" name="volLabel">
<property name="sizePolicy"> <property name="sizePolicy">
@ -601,15 +613,15 @@
<enum>QFrame::StyledPanel</enum> <enum>QFrame::StyledPanel</enum>
</property> </property>
<property name="text"> <property name="text">
<string>Volume</string> <string>Vol</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
</property> </property>
</widget> </widget>
</item> </item>
<item row="6" column="4"> <item row="6" column="6">
<widget class="QLabel" name="entryPointLabel"> <widget class="QLabel" name="exitPointLabel">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch> <horstretch>0</horstretch>
@ -625,7 +637,107 @@
<enum>QFrame::StyledPanel</enum> <enum>QFrame::StyledPanel</enum>
</property> </property>
<property name="text"> <property name="text">
<string>Entry Point</string> <string>Exit
Point</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLCDNumber" name="fade">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>10</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Plain</enum>
</property>
<property name="smallDecimalPoint">
<bool>false</bool>
</property>
<property name="segmentStyle">
<enum>QLCDNumber::Flat</enum>
</property>
</widget>
</item>
<item row="4" column="2">
<widget class="QLabel" name="bus1Label">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font">
<font>
<pointsize>10</pointsize>
</font>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="text">
<string>Bus
1</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="6" column="0">
<widget class="QLabel" name="panLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font">
<font>
<pointsize>10</pointsize>
</font>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="text">
<string>Pan</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="fadeInLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font">
<font>
<pointsize>10</pointsize>
</font>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="text">
<string>Fade
In</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
@ -659,30 +771,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="6" column="0">
<widget class="QLabel" name="panLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font">
<font>
<pointsize>10</pointsize>
</font>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="text">
<string>Pan</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="0" column="6"> <item row="0" column="6">
<widget class="QLabel" name="waitOutLabel"> <widget class="QLabel" name="waitOutLabel">
<property name="sizePolicy"> <property name="sizePolicy">
@ -700,7 +788,8 @@
<enum>QFrame::StyledPanel</enum> <enum>QFrame::StyledPanel</enum>
</property> </property>
<property name="text"> <property name="text">
<string>Wait Out</string> <string>Wait
Out</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
@ -710,52 +799,34 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="6" column="5"> <item row="4" column="3">
<widget class="QLCDNumber" name="entryPoint"> <widget class="QLCDNumber" name="bus1">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>10</horstretch> <horstretch>10</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Bus 1 Volume&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="frameShape"> <property name="frameShape">
<enum>QFrame::StyledPanel</enum> <enum>QFrame::StyledPanel</enum>
</property> </property>
<property name="frameShadow">
<enum>QFrame::Plain</enum>
</property>
<property name="smallDecimalPoint"> <property name="smallDecimalPoint">
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="digitCount">
<number>3</number>
</property>
<property name="segmentStyle"> <property name="segmentStyle">
<enum>QLCDNumber::Flat</enum> <enum>QLCDNumber::Flat</enum>
</property> </property>
</widget> </widget>
</item> </item>
<item row="6" column="6">
<widget class="QLabel" name="exitPointLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font">
<font>
<pointsize>10</pointsize>
</font>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="text">
<string>Exit Point</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item row="0" column="2"> <item row="0" column="2">
<widget class="QLabel" name="fadeOutLabel"> <widget class="QLabel" name="fadeOutLabel">
<property name="sizePolicy"> <property name="sizePolicy">
@ -773,7 +844,8 @@
<enum>QFrame::StyledPanel</enum> <enum>QFrame::StyledPanel</enum>
</property> </property>
<property name="text"> <property name="text">
<string>Fade Out</string> <string>Fade
Out</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
@ -783,93 +855,8 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="6" column="7"> <item row="0" column="4">
<widget class="QLCDNumber" name="lcdNumber"> <widget class="QLabel" name="waitInLable">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>10</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="smallDecimalPoint">
<bool>false</bool>
</property>
<property name="segmentStyle">
<enum>QLCDNumber::Flat</enum>
</property>
</widget>
</item>
<item row="0" column="7">
<widget class="QLCDNumber" name="waitOut">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>10</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="smallDecimalPoint">
<bool>false</bool>
</property>
<property name="segmentStyle">
<enum>QLCDNumber::Flat</enum>
</property>
</widget>
</item>
<item row="4" column="3">
<widget class="QLCDNumber" name="bus1">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>10</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Bus 1 Volume&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="smallDecimalPoint">
<bool>false</bool>
</property>
<property name="digitCount">
<number>3</number>
</property>
<property name="segmentStyle">
<enum>QLCDNumber::Flat</enum>
</property>
</widget>
</item>
<item row="6" column="1">
<widget class="QLCDNumber" name="pan">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>10</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="smallDecimalPoint">
<bool>false</bool>
</property>
<property name="digitCount">
<number>3</number>
</property>
<property name="segmentStyle">
<enum>QLCDNumber::Flat</enum>
</property>
</widget>
</item>
<item row="4" column="4">
<widget class="QLabel" name="bus2Label">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch> <horstretch>0</horstretch>
@ -885,15 +872,19 @@
<enum>QFrame::StyledPanel</enum> <enum>QFrame::StyledPanel</enum>
</property> </property>
<property name="text"> <property name="text">
<string>Bus 2</string> <string>Wait
In</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
</property> </property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget> </widget>
</item> </item>
<item row="6" column="3"> <item row="6" column="1">
<widget class="QLCDNumber" name="pitch"> <widget class="QLCDNumber" name="pan">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>10</horstretch> <horstretch>10</horstretch>
@ -903,6 +894,9 @@
<property name="frameShape"> <property name="frameShape">
<enum>QFrame::StyledPanel</enum> <enum>QFrame::StyledPanel</enum>
</property> </property>
<property name="frameShadow">
<enum>QFrame::Plain</enum>
</property>
<property name="smallDecimalPoint"> <property name="smallDecimalPoint">
<bool>false</bool> <bool>false</bool>
</property> </property>
@ -928,6 +922,9 @@
<property name="frameShape"> <property name="frameShape">
<enum>QFrame::StyledPanel</enum> <enum>QFrame::StyledPanel</enum>
</property> </property>
<property name="frameShadow">
<enum>QFrame::Plain</enum>
</property>
<property name="smallDecimalPoint"> <property name="smallDecimalPoint">
<bool>false</bool> <bool>false</bool>
</property> </property>
@ -939,8 +936,36 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="5"> <item row="4" column="1">
<widget class="QLCDNumber" name="waitIn"> <widget class="QLCDNumber" name="vol">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>10</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Volume&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Plain</enum>
</property>
<property name="smallDecimalPoint">
<bool>false</bool>
</property>
<property name="digitCount">
<number>3</number>
</property>
<property name="segmentStyle">
<enum>QLCDNumber::Flat</enum>
</property>
</widget>
</item>
<item row="6" column="3">
<widget class="QLCDNumber" name="pitch">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>10</horstretch> <horstretch>10</horstretch>
@ -950,14 +975,54 @@
<property name="frameShape"> <property name="frameShape">
<enum>QFrame::StyledPanel</enum> <enum>QFrame::StyledPanel</enum>
</property> </property>
<property name="frameShadow">
<enum>QFrame::Plain</enum>
</property>
<property name="smallDecimalPoint"> <property name="smallDecimalPoint">
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="digitCount">
<number>3</number>
</property>
<property name="segmentStyle"> <property name="segmentStyle">
<enum>QLCDNumber::Flat</enum> <enum>QLCDNumber::Flat</enum>
</property> </property>
</widget> </widget>
</item> </item>
<item row="6" column="4">
<widget class="QLabel" name="entryPointLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font">
<font>
<pointsize>10</pointsize>
</font>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="text">
<string>Entry
Point</string>
</property>
<property name="textFormat">
<enum>Qt::AutoText</enum>
</property>
<property name="scaledContents">
<bool>false</bool>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="gridLayoutWidget"> <widget class="QWidget" name="gridLayoutWidget">
@ -967,9 +1032,9 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<layout class="QGridLayout" name="audioControlLayout" rowminimumheight="0,0" columnminimumwidth="0,0,0"> <layout class="QGridLayout" name="audioControlLayout" rowstretch="0,0" rowminimumheight="0,0" columnminimumwidth="0,0,0">
<property name="sizeConstraint"> <property name="sizeConstraint">
<enum>QLayout::SetDefaultConstraint</enum> <enum>QLayout::SetMaximumSize</enum>
</property> </property>
<property name="spacing"> <property name="spacing">
<number>0</number> <number>0</number>
@ -977,7 +1042,7 @@
<item row="0" column="0"> <item row="0" column="0">
<widget class="QPushButton" name="playButton"> <widget class="QPushButton" name="playButton">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Minimum"> <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@ -990,7 +1055,7 @@
<item row="0" column="1"> <item row="0" column="1">
<widget class="QPushButton" name="pauseButton"> <widget class="QPushButton" name="pauseButton">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Minimum"> <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@ -998,12 +1063,18 @@
<property name="text"> <property name="text">
<string>Pause</string> <string>Pause</string>
</property> </property>
<property name="checkable">
<bool>false</bool>
</property>
<property name="flat">
<bool>false</bool>
</property>
</widget> </widget>
</item> </item>
<item row="0" column="2"> <item row="0" column="2">
<widget class="QPushButton" name="stopButton"> <widget class="QPushButton" name="stopButton">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Minimum"> <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@ -1016,20 +1087,21 @@
<item row="1" column="0"> <item row="1" column="0">
<widget class="QPushButton" name="fadeInButton"> <widget class="QPushButton" name="fadeInButton">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Minimum"> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="text"> <property name="text">
<string>Fade In</string> <string>Fade
In</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item row="1" column="1">
<widget class="QPushButton" name="muteButton"> <widget class="QPushButton" name="muteButton">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Minimum"> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@ -1037,18 +1109,22 @@
<property name="text"> <property name="text">
<string>Mute</string> <string>Mute</string>
</property> </property>
<property name="checkable">
<bool>true</bool>
</property>
</widget> </widget>
</item> </item>
<item row="1" column="2"> <item row="1" column="2">
<widget class="QPushButton" name="fadeOutButton"> <widget class="QPushButton" name="fadeOutButton">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Minimum"> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="text"> <property name="text">
<string>Fade Out</string> <string>Fade
Out</string>
</property> </property>
</widget> </widget>
</item> </item>

19
src/libremediaserver-audio-ui.cpp
View file

@ -45,6 +45,25 @@ libreMediaServerAudioUi::libreMediaServerAudioUi(QWidget *parent)
"selection-background-color: green" "selection-background-color: green"
); );
m_showPlayer = new ShowPlayer(); m_showPlayer = new ShowPlayer();
m_showPlayer->setFocus();
QShortcut *shortcut_space = new QShortcut(QKeySequence(" "), this);
QObject::connect(shortcut_space, SIGNAL(activated()), m_showPlayer, SLOT(go()));
QShortcut *shortcut_up = new QShortcut(QKeySequence("Up"), this);
QObject::connect(shortcut_up, SIGNAL(activated()), m_showPlayer->ui->cueListWidget, SLOT(key_up()));
QShortcut *shortcut_down = new QShortcut(QKeySequence("Down"), this);
QObject::connect(shortcut_down, SIGNAL(activated()), m_showPlayer->ui->cueListWidget, SLOT(key_down()));
QShortcut *shortcut_copy = new QShortcut(QKeySequence("Ctrl+C"), this);
QObject::connect(shortcut_copy, SIGNAL(activated()), m_showPlayer->ui->cueListWidget, SLOT(copyCueTrack()));
QShortcut *shortcut_cut = new QShortcut(QKeySequence("Ctrl+X"), this);
QObject::connect(shortcut_cut, SIGNAL(activated()), m_showPlayer->ui->cueListWidget, SLOT(cutCueTrack()));
QShortcut *shortcut_paste = new QShortcut(QKeySequence("Ctrl+V"), this);
QObject::connect(shortcut_paste, SIGNAL(activated()), m_showPlayer->ui->cueListWidget, SLOT(pasteCueTrack()));
QShortcut *shortcut_delete = new QShortcut(QKeySequence("Delete"), this);
QObject::connect(shortcut_delete, SIGNAL(activated()), m_showPlayer->ui->cueListWidget, SLOT(deleteCueTrack()));
QShortcut *shortcut_insert = new QShortcut(QKeySequence("Insert"), this);
QObject::connect(shortcut_insert, SIGNAL(activated()), m_showPlayer->ui->cueListWidget, SLOT(createNewCueTrack()));
QShortcut *shortcut_edit = new QShortcut(QKeySequence("e"), this);
QObject::connect(shortcut_edit, SIGNAL(activated()), m_showPlayer->ui->cueListWidget, SLOT(editCueTrack()));
Settings::getInstance()->beginGroup("mainwindow"); Settings::getInstance()->beginGroup("mainwindow");
auto geometry = Settings::getInstance()->value("geometry", QByteArray()).toByteArray(); auto geometry = Settings::getInstance()->value("geometry", QByteArray()).toByteArray();
if (!geometry.isEmpty()) if (!geometry.isEmpty())

2
src/showplayer.h
View file

@ -26,6 +26,7 @@ class ShowPlayer : public QDialog
public: public:
explicit ShowPlayer(QWidget *parent = nullptr); explicit ShowPlayer(QWidget *parent = nullptr);
~ShowPlayer(); ~ShowPlayer();
Ui::ShowPlayer *ui;
public slots: public slots:
void cueTrackAtEnd(int layer); void cueTrackAtEnd(int layer);
@ -33,7 +34,6 @@ public slots:
void saveCueTrackList(QString path); void saveCueTrackList(QString path);
private: private:
Ui::ShowPlayer *ui;
Status currentStatus = Status::Iddle; Status currentStatus = Status::Iddle;
int layersUsed[MAX_LAYERS]; int layersUsed[MAX_LAYERS];
CueTrack *current[MAX_LAYERS]; CueTrack *current[MAX_LAYERS];