diff --git a/docs/roadmap.txt b/docs/roadmap.txt index 714cb2a..a92bd03 100644 --- a/docs/roadmap.txt +++ b/docs/roadmap.txt @@ -34,6 +34,7 @@ v 0.3.0 - Rose noise and sine generator. - Logs, verbosity, timestamp. - New play mode without pitch control, it saves resources. MA_SOUND_FLAG_NO_PITCH +- SettingsDialog. - Load/save conf file. - ¿Exit Point? is it needed? - Hardening: check return errors, try/catch exceptions, i'm too happy.... @@ -45,5 +46,4 @@ v 0.3.0 v 0.2.1 showplayer -- SettingsDialog, configuración gráfica. diff --git a/lms-resources.qrc b/lms-resources.qrc index 52ce73b..a8112f0 100644 --- a/lms-resources.qrc +++ b/lms-resources.qrc @@ -11,6 +11,6 @@ resources/icon.png resources/panic_button.jpg resources/go_button.jpeg - resources/restore_button.jpg + resources/restore_button.jpg diff --git a/src/libremediaserver-audio-ui.cpp b/src/libremediaserver-audio-ui.cpp index 212b071..bfeeeb3 100644 --- a/src/libremediaserver-audio-ui.cpp +++ b/src/libremediaserver-audio-ui.cpp @@ -36,7 +36,6 @@ libreMediaServerAudioUi::libreMediaServerAudioUi(QWidget *parent) addDockWidget(Qt::TopDockWidgetArea, topWidget); connect(ui.actionLaunch_OLA_Setup, SIGNAL(triggered()), this, SLOT(olasetup())); connect(ui.actionLaunchShowPlayer, SIGNAL(triggered()), this, SLOT(launchShowPlayerWindow())); - connect(ui.actionAudioSetup, SIGNAL(triggered()), this, SLOT(audioSetupWindow)); this->setContentsMargins(0, 0, 0, 0); this->setStyleSheet( "margin: 0px;" @@ -99,8 +98,3 @@ void libreMediaServerAudioUi::launchShowPlayerWindow() { m_showPlayer->show(); } - -void libreMediaServerAudioUi::audioSetupWindow() -{ - -} diff --git a/src/libremediaserver-audio-ui.h b/src/libremediaserver-audio-ui.h index 020eec2..61963de 100644 --- a/src/libremediaserver-audio-ui.h +++ b/src/libremediaserver-audio-ui.h @@ -46,7 +46,6 @@ private: private slots: void olasetup(); void launchShowPlayerWindow(); - void audioSetupWindow(); }; #endif // LIBREMEDIASERVERAUDIOUI_H diff --git a/src/libremediaserver-audio-ui.ui b/src/libremediaserver-audio-ui.ui index 50eb228..7de7324 100644 --- a/src/libremediaserver-audio-ui.ui +++ b/src/libremediaserver-audio-ui.ui @@ -15,6 +15,7 @@ Unifont 12 + 75 true @@ -37,11 +38,10 @@ - Setup + File - @@ -55,11 +55,6 @@ Show Player - - - Audio - - diff --git a/src/showplayer.cpp b/src/showplayer.cpp index a728253..328227b 100644 --- a/src/showplayer.cpp +++ b/src/showplayer.cpp @@ -2,7 +2,7 @@ ShowPlayer::ShowPlayer(QWidget *parent) : - QDialog(parent, Qt::Window) + QDialog(parent) , ui(new Ui::ShowPlayer) { ui->setupUi(this); @@ -31,7 +31,6 @@ ShowPlayer::ShowPlayer(QWidget *parent) : ui->splitter_controls->restoreState(Settings::getInstance()->value("controlsSplitter").toByteArray()); ui->splitter_cues->restoreState(Settings::getInstance()->value("cueSplitter").toByteArray()); Settings::getInstance()->endGroup(); - ui->activeCueList->setSelectionMode(QAbstractItemView::NoSelection); } ShowPlayer::~ShowPlayer()