From 6a91cf198ee54b3370c6cb09dcf41df4e00f0402 Mon Sep 17 00:00:00 2001 From: craig Date: Fri, 9 Dec 2011 18:40:20 +0000 Subject: [PATCH] Fix playlist headers!!!! --- gui/folderpage.cpp | 2 +- gui/librarypage.cpp | 2 +- gui/playlistspage.cpp | 1 + gui/streamspage.cpp | 2 +- widgets/treeview.cpp | 16 ++++++++++------ widgets/treeview.h | 1 + 6 files changed, 15 insertions(+), 9 deletions(-) diff --git a/gui/folderpage.cpp b/gui/folderpage.cpp index 84e3e0d66..363dea821 100644 --- a/gui/folderpage.cpp +++ b/gui/folderpage.cpp @@ -54,7 +54,7 @@ FolderPage::FolderPage(MainWindow *p) #else search->setPlaceholderText(tr("Search files...")); #endif - view->setHeaderHidden(true); + view->setPageDefaults(); view->addAction(p->addToPlaylistAction); view->addAction(p->replacePlaylistAction); diff --git a/gui/librarypage.cpp b/gui/librarypage.cpp index c135f17ad..174df6919 100644 --- a/gui/librarypage.cpp +++ b/gui/librarypage.cpp @@ -56,7 +56,7 @@ LibraryPage::LibraryPage(MainWindow *p) #else search->setPlaceholderText(tr("Search library...")); #endif - view->setHeaderHidden(true); + view->setPageDefaults(); view->addAction(p->addToPlaylistAction); view->addAction(p->replacePlaylistAction); proxy.setSourceModel(&model); diff --git a/gui/playlistspage.cpp b/gui/playlistspage.cpp index 7385d0c60..4181aff0b 100644 --- a/gui/playlistspage.cpp +++ b/gui/playlistspage.cpp @@ -72,6 +72,7 @@ PlaylistsPage::PlaylistsPage(MainWindow *p) delPlaylist->setEnabled(false); renPlaylist->setEnabled(false); + view->setPageDefaults(); view->setDragDropMode(QAbstractItemView::NoDragDrop); view->addAction(p->addToPlaylistAction); view->addAction(p->replacePlaylistAction); diff --git a/gui/streamspage.cpp b/gui/streamspage.cpp index 13e34aefe..bca718b4d 100644 --- a/gui/streamspage.cpp +++ b/gui/streamspage.cpp @@ -98,7 +98,7 @@ StreamsPage::StreamsPage(MainWindow *p) addToPlaylist->setEnabled(false); replacePlaylist->setEnabled(false); - view->setHeaderHidden(true); + view->setPageDefaults(); view->addAction(p->addToPlaylistAction); view->addAction(p->replacePlaylistAction); view->addAction(removeAction); diff --git a/widgets/treeview.cpp b/widgets/treeview.cpp index 5ccfc96ce..74453eb48 100644 --- a/widgets/treeview.cpp +++ b/widgets/treeview.cpp @@ -26,10 +26,18 @@ TreeView::TreeView(QWidget *parent) : QTreeView(parent) { - setHeaderHidden(true); - sortByColumn(0, Qt::AscendingOrder); setDragEnabled(true); setContextMenuPolicy(Qt::NoContextMenu); +} + +TreeView::~TreeView() +{ +} + +void TreeView::setPageDefaults() +{ + sortByColumn(0, Qt::AscendingOrder); + setHeaderHidden(true); setDragDropMode(QAbstractItemView::DragOnly); setSelectionMode(QAbstractItemView::ExtendedSelection); setAllColumnsShowFocus(true); @@ -38,10 +46,6 @@ TreeView::TreeView(QWidget *parent) setSortingEnabled(true); } -TreeView::~TreeView() -{ -} - void TreeView::selectionChanged(const QItemSelection &selected, const QItemSelection &deselected) { QTreeView::selectionChanged(selected, deselected); diff --git a/widgets/treeview.h b/widgets/treeview.h index 86adbbba8..ae291fd74 100644 --- a/widgets/treeview.h +++ b/widgets/treeview.h @@ -35,6 +35,7 @@ public: virtual ~TreeView(); + void setPageDefaults(); void selectionChanged(const QItemSelection &selected, const QItemSelection &deselected); bool haveSelectedItems() const; bool haveUnSelectedItems() const;