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

146
src/widgets/fancytabwidget.cpp
View File

@@ -25,6 +25,7 @@
#include <QDebug>
#include <QObject>
#include <QTabBar>
#include <QWidget>
#include <QMap>
@@ -283,18 +284,62 @@ class FancyTabBar: public QTabBar {
};
class TabData : public QObject {
public:
TabData(QWidget *widget_view, const QString name, const QIcon icon, const QString label, const bool enabled, QWidget *parent) :
QObject(parent),
widget_view_(widget_view),
name_(name), icon_(icon),
label_(label),
page_(new QWidget()),
enabled_(enabled) {
// In order to achieve the same effect as the "Bottom Widget" of the old Nokia based FancyTabWidget a VBoxLayout is used on each page
QVBoxLayout *layout = new QVBoxLayout(page_);
layout->setSpacing(0);
layout->setContentsMargins(0, 0, 0, 0);
layout->addWidget(widget_view_);
page_->setLayout(layout);
}
~TabData() {
//delete page_;
}
QWidget *widget_view() { return widget_view_; }
QString name() { return name_; }
QIcon icon() { return icon_; }
QString label() { return label_; }
QWidget *page() { return page_; }
bool enabled() { return enabled_; }
void set_enabled(bool enabled) { enabled_ = enabled; }
private:
QWidget *widget_view_;
QString name_;
QIcon icon_;
QString label_;
QWidget *page_;
bool enabled_;
};
FancyTabWidget::~FancyTabWidget() {}
// Spacers are just disabled pages
void FancyTabWidget::addSpacer() {
QWidget *spacer = new QWidget(this);
const int index = addTab(spacer, QIcon(), QString());
const int index = insertTab(count(), spacer, QIcon(), QString());
setTabEnabled(index, false);
}
void FancyTabWidget::setBackgroundPixmap(const QPixmap& pixmap) {
background_pixmap_ = pixmap;
update();
}
void FancyTabWidget::setCurrentIndex(int index) {
@@ -332,80 +377,85 @@ FancyTabWidget::FancyTabWidget(QWidget* parent) : QTabWidget(parent),
}
void FancyTabWidget::loadSettings(const char *kSettingsGroup) {
void FancyTabWidget::Load(const QString &kSettingsGroup) {
QSettings settings;
settings.beginGroup(kSettingsGroup);
for (int i = 0 ; i < count() ; i++) {
QString k = "tab_" + tabBar()->tabData(i).toString().toLower();
int index = settings.value(k, i).toInt();
if (index >= 0) {
tabBar()->moveTab(i, index);
}
QSettings s;
s.beginGroup(kSettingsGroup);
QMap <int, TabData*> tabs;
for (TabData *tab : tabs_) {
const int idx = s.value("tab_" + tab->name(), tabs_.count()).toInt();
tabs.insert(idx, tab);
}
s.endGroup();
settings.endGroup();
QMap <int, TabData*> ::iterator i;
for (i = tabs.begin() ; i != tabs.end() ; ++i) {
TabData *tab = i.value();
const int actualIndex = insertTab(i.key(), tab->page(), tab->icon(), tab->label());
tabBar()->setTabData(actualIndex, QVariant(tab->name()));
tab->set_enabled(true);
}
}
void FancyTabWidget::saveSettings(const char *kSettingsGroup) {
int FancyTabWidget::insertTab(int index, QWidget *page, const QIcon &icon, const QString &label) {
return QTabWidget::insertTab(index, page, icon, label);
}
QSettings settings;
settings.beginGroup(kSettingsGroup);
void FancyTabWidget::SaveSettings(const QString &kSettingsGroup) {
QSettings s;
s.beginGroup(kSettingsGroup);
s.setValue("tab_mode", mode_);
s.setValue("current_tab", currentIndex());
for (int i = 0 ; i < count() ; i++) {
QString k = "tab_" + tabBar()->tabData(i).toString().toLower();
settings.setValue(k, i);
s.setValue(k, i);
}
settings.endGroup();
s.endGroup();
}
void FancyTabWidget::addBottomWidget(QWidget* widget_view) {
void FancyTabWidget::addBottomWidget(QWidget *widget_view) {
bottom_widget_ = widget_view;
}
int FancyTabWidget::addTab(QWidget *widget_view, const QIcon &icon, const QString &label) {
return insertTab(count(), widget_view, icon, label);
}
void FancyTabWidget::AddTab(QWidget *widget_view, const QString &name, const QIcon &icon, const QString &label) {
int FancyTabWidget::insertTab(int index, QWidget *widget_view, const QIcon &icon, const QString &label) {
QWidget *page(nullptr);
if (tabs_.contains(label)) page = tabs_.value(label);
else {
page = new QWidget(this);
// In order to achieve the same effect as the "Bottom Widget" of the old Nokia based FancyTabWidget a VBoxLayout is used on each page
QVBoxLayout *layout = new QVBoxLayout(this);
layout->setSpacing(0);
layout->setContentsMargins(0, 0, 0, 0);
layout->addWidget(widget_view);
page->setLayout(layout);
tabs_.insert(label, page);
}
for (int i = 0 ; i < count() ; i++) {
QString l = tabBar()->tabData(i).toString();
if (l == label) return i;
}
const int actualIndex = QTabWidget::insertTab(index, page, icon, label);
tabBar()->setTabData(actualIndex, QVariant(label));
return actualIndex;
TabData *tab = new TabData(widget_view, name, icon, label, false, this);
tabs_.insert(widget_view, tab);
}
void FancyTabWidget::delTab(const QString &label) {
bool FancyTabWidget::EnableTab(QWidget *widget_view) {
if (!tabs_.contains(widget_view)) return false;
TabData *tab = tabs_.value(widget_view);
if (tab->enabled()) return true;
const int actualIndex = QTabWidget::insertTab(count(), tab->page(), tab->icon(), tab->label());
tabBar()->setTabData(actualIndex, QVariant(tab->name()));
tab->set_enabled(true);
return true;
}
bool FancyTabWidget::DisableTab(QWidget *widget_view) {
if (!tabs_.contains(widget_view)) return false;
TabData *tab = tabs_.value(widget_view);
for (int i = 0 ; i < count() ; i++) {
QString l = tabBar()->tabData(i).toString();
if (l == label) {
if (tabBar()->tabData(i).toString() == tab->name()) {
removeTab(i);
break;
tab->set_enabled(false);
return true;
}
}
return false;
}