mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Clean up some widgets

Browse source 
Simplify logic of handling the Message that this
dive is being modified.

Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Tomaz Canabrava 2017-04-04 19:50:46 +02:00 • committed by Dirk Hohndel
parent 1fc4fba69f
commit 2f86cbdc36
3 changed files with 552 additions and 598 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
desktop-widgets/tab-widgets/maintab.cpp
View file

@ -46,13 +46,13 @@ MainTab::MainTab(QWidget *parent) : QTabWidget(parent),
ui.setupUi(this);
extraWidgets << new TabDiveExtraInfo(this);
addTab(extraWidgets.last(), "Extra Info");
ui.tabWidget->addTab(extraWidgets.last(), "Extra Info");
extraWidgets << new TabDiveInformation(this);
addTab(extraWidgets.last(), "Information");
ui.tabWidget->addTab(extraWidgets.last(), "Information");
extraWidgets << new TabDiveStatistics(this);
addTab(extraWidgets.last(), "Statistics");
ui.tabWidget->addTab(extraWidgets.last(), "Statistics");
extraWidgets << new TabDivePhotos(this);
addTab(extraWidgets.last(), "Photos");
ui.tabWidget->addTab(extraWidgets.last(), "Photos");
ui.dateEdit->setDisplayFormat(prefs.date_format);
@ -121,7 +121,6 @@ MainTab::MainTab(QWidget *parent) : QTabWidget(parent),
ui.suit->setCompleter(completers.suit);
ui.tagWidget->setCompleter(completers.tags);
ui.diveNotesMessage->hide();
ui.diveEquipmentMessage->hide();
ui.depth->hide();
ui.depthLabel->hide();
ui.duration->hide();
@ -261,14 +260,12 @@ void MainTab::addDiveStarted()
void MainTab::addMessageAction(QAction *action)
{
ui.diveEquipmentMessage->addAction(action);
ui.diveNotesMessage->addAction(action);
}
void MainTab::hideMessage()
{
ui.diveNotesMessage->animatedHide();
ui.diveEquipmentMessage->animatedHide();
updateTextLabels(false);
}
@ -276,17 +273,13 @@ void MainTab::closeMessage()
{
hideMessage();
ui.diveNotesMessage->setCloseButtonVisible(false);
ui.diveEquipmentMessage->setCloseButtonVisible(false);
}
}
void MainTab::displayMessage(QString str)
{
ui.diveNotesMessage->setCloseButtonVisible(false);
ui.diveEquipmentMessage->setCloseButtonVisible(false);
ui.diveNotesMessage->setText(str);
ui.diveNotesMessage->animatedShow();
ui.diveEquipmentMessage->setText(str);
ui.diveEquipmentMessage->animatedShow();
updateTextLabels();
}

1131
desktop-widgets/tab-widgets/maintab.ui
View file

File diff suppressed because it is too large Load diff

2
desktop-widgets/tableview.cpp
View file

@ -73,7 +73,7 @@ TableView::~TableView()
}
if (oldDefault) {
s.remove("");
} else {
} else if (ui.tableView->model()) {
for (int i = 0; i < ui.tableView->model()->columnCount(); i++) {
if (ui.tableView->columnWidth(i) == defaultColumnWidth(i))
s.remove(QString("colwidth%1").arg(i));