--- a/GUI/playlist/GUI_Playlist.cpp
+++ b/GUI/playlist/GUI_Playlist.cpp
@@ -39,11 +39,9 @@
class GUI_InfoDialog;
-// CTOR
GUI_Playlist::GUI_Playlist(QWidget *parent, GUI_InfoDialog* dialog) :
QWidget(parent)
{
-
_parent = parent;
ui = new Ui::Playlist_Window();
@@ -53,12 +51,13 @@
QAction* clear_action = new QAction(this);
clear_action->setShortcut(QKeySequence("Ctrl+."));
clear_action->setShortcutContext(Qt::WidgetWithChildrenShortcut);
- connect(clear_action, SIGNAL(triggered()), this->ui->btn_clear, SLOT(click()));
+ connect(clear_action, SIGNAL(triggered()),
+ this->ui->btn_clear, SLOT(click()));
this->addAction(clear_action);
-
CSettingsStorage* settings = CSettingsStorage::getInstance();
bool small_playlist_items = settings->getShowSmallPlaylist();
+
ui->listView->show_big_items(!small_playlist_items);
_info_dialog = dialog;
@@ -69,33 +68,38 @@
setAcceptDrops(true);
- connect(ui->btn_clear, SIGNAL(clicked()), this, SLOT(clear_playlist_slot()));
-
- connect(ui->btn_repAll, SIGNAL(clicked()), this, SLOT(playlist_mode_changed_slot()));
- connect(ui->btn_shuffle, SIGNAL(clicked()), this, SLOT(playlist_mode_changed_slot()));
- connect(ui->btn_append, SIGNAL(clicked()), this, SLOT(playlist_mode_changed_slot()));
- connect(ui->btn_replace, SIGNAL(clicked()), this, SLOT(playlist_mode_changed_slot()));
- connect(ui->btn_playAdded,SIGNAL(clicked()), this, SLOT(playlist_mode_changed_slot()));
-
- connect(ui->listView, SIGNAL(sig_metadata_dropped(const MetaDataList&, int)),
+ connect(ui->btn_clear, SIGNAL(clicked()),
+ this, SLOT(clear_playlist_slot()));
+ connect(ui->btn_repAll, SIGNAL(clicked()),
+ this, SLOT(playlist_mode_changed_slot()));
+ connect(ui->btn_shuffle, SIGNAL(clicked()),
+ this, SLOT(playlist_mode_changed_slot()));
+ connect(ui->btn_append, SIGNAL(clicked()),
+ this, SLOT(playlist_mode_changed_slot()));
+ connect(ui->btn_replace, SIGNAL(clicked()),
+ this, SLOT(playlist_mode_changed_slot()));
+ connect(ui->btn_playAdded, SIGNAL(clicked()),
+ this, SLOT(playlist_mode_changed_slot()));
+
+ connect(ui->listView,SIGNAL(sig_metadata_dropped(const MetaDataList&, int)),
this, SLOT(metadata_dropped(const MetaDataList&, int)));
- connect(ui->listView, SIGNAL(sig_rows_removed(const QList<int>&, bool)),
+ connect(ui->listView, SIGNAL(sig_rows_removed(const QList<int>&, bool)),
this, SLOT(rows_removed(const QList<int>&, bool)));
- connect(ui->listView, SIGNAL(sig_sort_tno()),
+ connect(ui->listView, SIGNAL(sig_sort_tno()),
this, SIGNAL(sig_sort_tno()));
-
- connect(ui->listView, SIGNAL(sig_selection_changed(MetaDataList&)),
+ connect(ui->listView, SIGNAL(sig_selection_changed(MetaDataList&)),
this, SLOT(selection_changed(MetaDataList&)));
- connect(ui->listView, SIGNAL(sig_selection_min_row(int)),
+ connect(ui->listView, SIGNAL(sig_selection_min_row(int)),
this, SIGNAL(selection_min_row(int)));
- connect(ui->listView, SIGNAL(sig_double_clicked(int)), this, SLOT(double_clicked(int)));
+ connect(ui->listView, SIGNAL(sig_double_clicked(int)),
+ this, SLOT(double_clicked(int)));
connect(ui->listView, SIGNAL(sig_no_focus()), this, SLOT(no_focus()));
- connect(ui->btn_numbers, SIGNAL(toggled(bool)), this, SLOT(btn_numbers_changed(bool)));
-}
-
-
-// DTOR
+ connect(ui->btn_numbers, SIGNAL(toggled(bool)),
+ this, SLOT(btn_numbers_changed(bool)));
+}
+
+
GUI_Playlist::~GUI_Playlist()
{
delete ui;
@@ -110,10 +114,11 @@
ui->btn_shuffle->setChecked(_playlist_mode.shuffle);
ui->btn_append->setChecked(_playlist_mode.append);
ui->btn_replace->setChecked(_playlist_mode.replace);
- if (_playlist_mode.replace)
+ if (_playlist_mode.replace) {
ui->btn_append->setEnabled(false);
- else
+ } else {
ui->btn_append->setEnabled(true);
+ }
ui->btn_playAdded->setChecked(_playlist_mode.playAdded);
}
@@ -182,7 +187,7 @@
// SLOT: fill all tracks in v_metadata into playlist
void GUI_Playlist::fillPlaylist(MetaDataList& v_metadata, int cur_play_idx, int)
{
-
+ ui->listView->setStyleSheet(styleSheet());
ui->listView->fill(v_metadata, cur_play_idx);
_total_msecs = 0;
@@ -239,10 +244,11 @@
_playlist_mode.replace = ui->btn_replace->isChecked();
_playlist_mode.playAdded = ui->btn_playAdded->isChecked();
- if (_playlist_mode.replace)
+ if (_playlist_mode.replace) {
ui->btn_append->setEnabled(false);
- else
+ } else {
ui->btn_append->setEnabled(true);
+ }
emit playlist_mode_changed(_playlist_mode);
}
@@ -262,10 +268,10 @@
{
if (event->pos().y() < this->ui->listView->y()) {
this->ui->listView->scrollUp();
- } else if (event->pos().y() > this->ui->listView->y() + this->ui->listView->height()) {
+ } else if (event->pos().y() >
+ this->ui->listView->y() + this->ui->listView->height()) {
this->ui->listView->scrollDown();
}
-
}
@@ -275,10 +281,8 @@
}
-
void GUI_Playlist::set_total_time_label()
{
-
QString text = "";
ui->lab_totalTime->setContentsMargins(0, 2, 0, 2);
@@ -300,7 +304,6 @@
void GUI_Playlist::psl_show_small_playlist_items(bool small_playlist_items)
{
-
ui->listView->show_big_items(!small_playlist_items);
}