dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Save geometry, tabbar and playlist on exit only, fix loading tabs in

Browse Source 
correct order
This commit is contained in:
Jonas Kvinge
2019-04-27 22:32:39 +02:00
parent d0135a5ff7
commit 170adfd00c
6 changed files with 135 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/playlist/playlistview.cpp
View File

@@ -143,7 +143,6 @@ PlaylistView::PlaylistView(QWidget *parent)
background_initialized_(false),
setting_initial_header_layout_(false),
read_only_settings_(true),
header_loaded_(false),
previous_background_image_opacity_(0.0),
fade_animation_(new QTimeLine(1000, this)),
force_background_redraw_(false),
@@ -171,11 +170,6 @@ PlaylistView::PlaylistView(QWidget *parent)
setStyle(style_);
setMouseTracking(true);
connect(header_, SIGNAL(sectionResized(int,int,int)), SLOT(SaveGeometry()));
connect(header_, SIGNAL(sectionMoved(int,int,int)), SLOT(SaveGeometry()));
connect(header_, SIGNAL(sortIndicatorChanged(int,Qt::SortOrder)), SLOT(SaveGeometry()));
connect(header_, SIGNAL(SectionVisibilityChanged(int,bool)), SLOT(SaveGeometry()));
connect(header_, SIGNAL(sectionResized(int,int,int)), SLOT(InvalidateCachedCurrentPixmap()));
connect(header_, SIGNAL(sectionMoved(int,int,int)), SLOT(InvalidateCachedCurrentPixmap()));
connect(header_, SIGNAL(SectionVisibilityChanged(int,bool)), SLOT(InvalidateCachedCurrentPixmap()));
@@ -205,7 +199,6 @@ PlaylistView::PlaylistView(QWidget *parent)
}
PlaylistView::~PlaylistView() {
SaveGeometry();
delete style_;
}
@@ -294,10 +287,11 @@ void PlaylistView::setModel(QAbstractItemModel *m) {
void PlaylistView::LoadGeometry() {
QSettings settings;
settings.beginGroup(Playlist::kSettingsGroup);
QSettings s;
s.beginGroup(Playlist::kSettingsGroup);
QByteArray state(s.value("state").toByteArray());
s.endGroup();
QByteArray state(settings.value("state").toByteArray());
if (!header_->RestoreState(state)) {
// Maybe we're upgrading from a version that persisted the state with QHeaderView.
if (!header_->restoreState(state)) {
@@ -340,8 +334,6 @@ void PlaylistView::LoadGeometry() {
header_->ShowSection(Playlist::Column_Title);
}
header_loaded_ = true;
}
void PlaylistView::SaveGeometry() {
@@ -1117,7 +1109,6 @@ void PlaylistView::StretchChanged(bool stretch) {
if (!initialized_) return;
setHorizontalScrollBarPolicy(stretch ? Qt::ScrollBarAlwaysOff : Qt::ScrollBarAsNeeded);
SaveGeometry();
}
@@ -1298,15 +1289,14 @@ void PlaylistView::ResetColumns() {
read_only_settings_ = true;
setting_initial_header_layout_ = true;
QSettings settings;
settings.beginGroup(Playlist::kSettingsGroup);
settings.remove("state");
settings.endGroup();
QSettings s;
s.beginGroup(Playlist::kSettingsGroup);
s.remove("state");
s.endGroup();
ReloadSettings();
LoadGeometry();
ReloadSettings();
read_only_settings_ = false;
SaveGeometry();
SetPlaylist(playlist_);
}