diff --git a/src/qprojectM/src/QProjectM_MainWindow.cpp b/src/qprojectM/src/QProjectM_MainWindow.cpp
index 2816947bf..37ded9c46 100644
--- a/src/qprojectM/src/QProjectM_MainWindow.cpp
+++ b/src/qprojectM/src/QProjectM_MainWindow.cpp
@@ -94,6 +94,8 @@ QProjectM_MainWindow::QProjectM_MainWindow ( const std::string & config_file )
connect ( m_QProjectMWidget, SIGNAL ( projectM_Initialized() ), this, SLOT ( postProjectM_Initialize() ) );
+ //connect (ui->presetPlaylistDockWidget, SIGNAL(
+
m_QProjectMWidget->makeCurrent();
m_QProjectMWidget->setFocus();
@@ -111,11 +113,11 @@ QProjectM_MainWindow::QProjectM_MainWindow ( const std::string & config_file )
// ((QVBoxLayout*)ui->verticalLayout)->setAlignment(Qt::AlignCenter);
- //((QLayout*)ui->verticalLayout)->setSizeConstraint(QLayout::SetNoConstraint);
-// ((QLayout*)ui->verticalLayout)->itemAt(0)->setAlignment(Qt::AlignCenter);
-// ((QLayout*)ui->verticalLayout)->itemAt(1)->setAlignment(Qt::AlignCenter);
-// ((QLayout*)ui->verticalLayout)->itemAt(2)->setAlignment(Qt::AlignCenter);
+//ui->verticalLayout->setSizePolicy(QSizePolicy::Expanding,QSizePolicy::Expanding);
+//ui->verticalLayout->sizePolicy().setVerticalStretch(2);
+//ui->presetPlayListDockWidget->widget()->layout()->setAlignment(Qt::AlignCenter);
+
// ((QLayout*)((QLayout*)ui->verticalLayout)->itemAt(1))->setSizeConstraint(QLayout::SetNoConstraint);
// ((QLayout*)((QLayout*)ui->verticalLayout)->itemAt(2))->setSizeConstraint(QLayout::SetNoConstraint);
@@ -145,6 +147,8 @@ QProjectM_MainWindow::~QProjectM_MainWindow()
}
delete ( ui );
+ delete( configUi);
+
}
@@ -492,7 +496,6 @@ void QProjectM_MainWindow::about()
void QProjectM_MainWindow::openSettingsDialog() {
- qDebug() << "HERE!!!";
if (configDialog->exec()) {
}
diff --git a/src/qprojectM/src/QProjectM_MainWindow.ui b/src/qprojectM/src/QProjectM_MainWindow.ui
index 359b46afb..460c4781f 100644
--- a/src/qprojectM/src/QProjectM_MainWindow.ui
+++ b/src/qprojectM/src/QProjectM_MainWindow.ui
@@ -96,266 +96,236 @@ p, li { white-space: pre-wrap; }
1
-
-
-
- 10
- 0
- 301
- 481
-
-
-
-
- -1
-
-
- 9
-
- -
-
-
- 6
-
-
-
-
-
-
- 0
- 0
-
-
-
- <html><head><meta name="qrichtext" content="1" /><style type="text/css">
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ <html><head><meta name="qrichtext" content="1" /><style type="text/css">
p, li { white-space: pre-wrap; }
</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;">
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Click here to add presets to the current playlist.</p></body></html>
-
-
-
-
-
- :/images/icons/hi16-action-projectm_add_playlist.png
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- <html><head><meta name="qrichtext" content="1" /><style type="text/css">
+
+
+
+
+
+ :/images/icons/hi16-action-projectm_add_playlist.png
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ <html><head><meta name="qrichtext" content="1" /><style type="text/css">
p, li { white-space: pre-wrap; }
</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;">
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Saves the currently loaded play list</p></body></html>
-
-
-
-
-
-
-
-
- :/images/icons/hi16-action-projectm_save.png
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- <html><head><meta name="qrichtext" content="1" /><style type="text/css">
+
+
+
+
+
+
+
+
+ :/images/icons/hi16-action-projectm_save.png
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ <html><head><meta name="qrichtext" content="1" /><style type="text/css">
p, li { white-space: pre-wrap; }
</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;">
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Clears<span style=" font-style:italic;"> all </span>presets<span style=" font-style:italic;"> </span>in the playlist.</p></body></html>
-
-
-
-
-
- :/images/icons/hi16-action-projectm_playlist_clear.png
-
-
-
- -
-
-
-
- 1
- 0
-
-
-
- Start typing in a filter to crop the play list.
-
-
- <html><head><meta name="qrichtext" content="1" /><style type="text/css">
+
+
+
+
+
+ :/images/icons/hi16-action-projectm_playlist_clear.png
+
+
+
+ -
+
+
+
+ 20
+ 0
+
+
+
+ Start typing in a filter to crop the play list.
+
+
+ <html><head><meta name="qrichtext" content="1" /><style type="text/css">
p, li { white-space: pre-wrap; }
</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;">
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Use this search bar to crop your preset play list. Only the presets that match your search criteria will be queued.</p></body></html>
-
-
-
-
-
- -
-
-
-
- 2
- 4
-
-
-
-
- 5
- 5
-
-
-
-
- 200
- 0
-
-
-
- true
-
-
- Double click on a preset to render it, or drag presets to change the preset order.
-
-
- false
-
-
- true
-
-
- false
-
-
- QAbstractItemView::SingleSelection
-
-
- QAbstractItemView::SelectRows
-
-
- false
-
-
- Qt::DashDotDotLine
-
-
-
- -
-
-
- 6
-
-
-
-
-
- true
-
-
-
- 0
- 0
-
-
-
- PointingHandCursor
-
-
- <html><head><meta name="qrichtext" content="1" /><style type="text/css">
+
+
+
+ -
+
+
+
+ 2
+ 4
+
+
+
+
+ 5
+ 5
+
+
+
+
+ 200
+ 0
+
+
+
+ true
+
+
+ Double click on a preset to render it, or drag presets to change the preset order.
+
+
+ false
+
+
+ true
+
+
+ false
+
+
+ QAbstractItemView::SingleSelection
+
+
+ QAbstractItemView::SelectRows
+
+
+ false
+
+
+ Qt::DashDotDotLine
+
+
+
+ -
+
+
+ true
+
+
+
+ 0
+ 0
+
+
+
+ PointingHandCursor
+
+
+ <html><head><meta name="qrichtext" content="1" /><style type="text/css">
p, li { white-space: pre-wrap; }
</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;">
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">When the dice is activated, projectM will randomly select presets weighted by your rating preferences.</p></body></html>
-
-
- Enable / Disable Shuffle Mode
-
-
-
-
-
- QCheckBox::indicator:checked {
+
+
+ Enable / Disable Shuffle Mode
+
+
+
+
+
+ QCheckBox::indicator:checked {
image: url(:/images/icons/hi16-action-projectm_random.png);
}
QCheckBox::indicator:unchecked{
image: url(:/images/icons/hi16-action-projectm_random_no.png);
}
-
-
-
-
-
- true
-
-
- true
-
-
-
- -
-
-
- true
-
-
-
- 1
- 0
-
-
-
- PointingHandCursor
-
-
- <html><head><meta name="qrichtext" content="1" /><style type="text/css">
+
+
+
+
+
+ true
+
+
+ true
+
+
+
+ -
+
+
+ true
+
+
+
+ 1
+ 0
+
+
+
+ PointingHandCursor
+
+
+ <html><head><meta name="qrichtext" content="1" /><style type="text/css">
p, li { white-space: pre-wrap; }
</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;">
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">When the locked icon is shown, projectM will not automatically switch to another preset.</p></body></html>
-
-
- Lock / Unlock the selected preset
-
-
-
-
-
- QCheckBox::indicator:checked {image: url(:/images/icons/hi16-action-projectm_lock.png);
+
+
+ Lock / Unlock the selected preset
+
+
+
+
+
+ QCheckBox::indicator:checked {image: url(:/images/icons/hi16-action-projectm_lock.png);
}
QCheckBox::indicator:unchecked{
image: url(:/images/icons/hi16-action-projectm_unlock.png);
}
-
-
-
-
-
- false
-
-
- true
-
-
-
-
-
-
-
+
+
+
+
+
+ false
+
+
+ true
+
+
+
+