mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
Clean up some widgets
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
Dirk Hohndel
parent
1fc4fba69f
commit
2f86cbdc36
3 changed files with 552 additions and 598 deletions
|
|
@ -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();
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,45 +1,33 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<ui version="4.0">
|
||||
<class>MainTab</class>
|
||||
<widget class="QTabWidget" name="MainTab">
|
||||
<widget class="QWidget" name="MainTab">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>463</width>
|
||||
<height>815</height>
|
||||
<width>555</width>
|
||||
<height>848</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
<string>Form</string>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_9">
|
||||
<item>
|
||||
<widget class="KMessageWidget" name="diveNotesMessage"/>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QTabWidget" name="tabWidget">
|
||||
<property name="currentIndex">
|
||||
<number>1</number>
|
||||
<number>0</number>
|
||||
</property>
|
||||
<widget class="QWidget" name="notesTab">
|
||||
<attribute name="title">
|
||||
<string>Notes</string>
|
||||
</attribute>
|
||||
<attribute name="toolTip">
|
||||
<string>General notes about the current selection</string>
|
||||
</attribute>
|
||||
<layout class="QGridLayout" name="diveNotesLayout">
|
||||
<property name="leftMargin">
|
||||
<number>5</number>
|
||||
</property>
|
||||
<property name="topMargin">
|
||||
<number>5</number>
|
||||
</property>
|
||||
<property name="rightMargin">
|
||||
<number>5</number>
|
||||
</property>
|
||||
<property name="bottomMargin">
|
||||
<number>5</number>
|
||||
</property>
|
||||
<property name="spacing">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<item row="2" column="1">
|
||||
<widget class="KMessageWidget" name="diveNotesMessage"/>
|
||||
</item>
|
||||
<item row="3" column="1">
|
||||
<layout class="QVBoxLayout" name="verticalLayout_8">
|
||||
<item>
|
||||
<widget class="QScrollArea" name="scrollArea">
|
||||
<property name="frameShape">
|
||||
<enum>QFrame::NoFrame</enum>
|
||||
|
|
@ -55,11 +43,11 @@
|
|||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>445</width>
|
||||
<height>726</height>
|
||||
<width>523</width>
|
||||
<height>739</height>
|
||||
</rect>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_3">
|
||||
<layout class="QVBoxLayout" name="verticalLayout_5">
|
||||
<property name="leftMargin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
|
|
@ -73,7 +61,7 @@
|
|||
<number>0</number>
|
||||
</property>
|
||||
<item>
|
||||
<layout class="QGridLayout" name="gridLayout">
|
||||
<layout class="QGridLayout" name="gridLayout_6">
|
||||
<property name="leftMargin">
|
||||
<number>5</number>
|
||||
</property>
|
||||
|
|
@ -94,7 +82,7 @@
|
|||
</widget>
|
||||
</item>
|
||||
<item row="0" column="0">
|
||||
<widget class="QLabel" name="label_2">
|
||||
<widget class="QLabel" name="label">
|
||||
<property name="text">
|
||||
<string>Date</string>
|
||||
</property>
|
||||
|
|
@ -104,7 +92,7 @@
|
|||
</widget>
|
||||
</item>
|
||||
<item row="0" column="1">
|
||||
<widget class="QLabel" name="label">
|
||||
<widget class="QLabel" name="label_6">
|
||||
<property name="text">
|
||||
<string>Time</string>
|
||||
</property>
|
||||
|
|
@ -186,7 +174,7 @@
|
|||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QVBoxLayout" name="verticalLayout">
|
||||
<layout class="QVBoxLayout" name="verticalLayout_6">
|
||||
<property name="spacing">
|
||||
<number>0</number>
|
||||
</property>
|
||||
|
|
@ -221,7 +209,7 @@
|
|||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_2">
|
||||
<layout class="QHBoxLayout" name="horizontalLayout">
|
||||
<property name="spacing">
|
||||
<number>2</number>
|
||||
</property>
|
||||
|
|
@ -253,7 +241,7 @@
|
|||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QGridLayout" name="gridLayout_4">
|
||||
<layout class="QGridLayout" name="gridLayout_7">
|
||||
<property name="leftMargin">
|
||||
<number>5</number>
|
||||
</property>
|
||||
|
|
@ -303,7 +291,7 @@
|
|||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QGridLayout" name="gridLayout_3" columnstretch="0,0,1">
|
||||
<layout class="QGridLayout" name="gridLayout_8" columnstretch="0,0,1">
|
||||
<property name="leftMargin">
|
||||
<number>5</number>
|
||||
</property>
|
||||
|
|
@ -391,7 +379,7 @@
|
|||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QGridLayout" name="gridLayout_2">
|
||||
<layout class="QGridLayout" name="gridLayout_9">
|
||||
<property name="horizontalSpacing">
|
||||
<number>5</number>
|
||||
</property>
|
||||
|
|
@ -449,7 +437,7 @@
|
|||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_2">
|
||||
<layout class="QVBoxLayout" name="verticalLayout_7">
|
||||
<property name="spacing">
|
||||
<number>0</number>
|
||||
</property>
|
||||
|
|
@ -510,26 +498,8 @@
|
|||
<attribute name="title">
|
||||
<string>Equipment</string>
|
||||
</attribute>
|
||||
<attribute name="toolTip">
|
||||
<string>Used equipment in the current selection</string>
|
||||
</attribute>
|
||||
<layout class="QGridLayout" name="equiptmentTabLayout">
|
||||
<property name="leftMargin">
|
||||
<number>5</number>
|
||||
</property>
|
||||
<property name="topMargin">
|
||||
<number>5</number>
|
||||
</property>
|
||||
<property name="rightMargin">
|
||||
<number>5</number>
|
||||
</property>
|
||||
<property name="bottomMargin">
|
||||
<number>5</number>
|
||||
</property>
|
||||
<item row="0" column="0">
|
||||
<widget class="KMessageWidget" name="diveEquipmentMessage"/>
|
||||
</item>
|
||||
<item row="1" column="0">
|
||||
<layout class="QVBoxLayout" name="verticalLayout_10">
|
||||
<item>
|
||||
<widget class="QScrollArea" name="scrollArea_2">
|
||||
<property name="frameShape">
|
||||
<enum>QFrame::NoFrame</enum>
|
||||
|
|
@ -540,13 +510,13 @@
|
|||
<property name="widgetResizable">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<widget class="QWidget" name="scrollAreaWidgetContents_2">
|
||||
<widget class="QWidget" name="scrollAreaWidgetContents">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>445</width>
|
||||
<height>720</height>
|
||||
<width>523</width>
|
||||
<height>739</height>
|
||||
</rect>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="equipmentTabScrollAreaLayout">
|
||||
|
|
@ -602,6 +572,9 @@
|
|||
</layout>
|
||||
</widget>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<customwidgets>
|
||||
<customwidget>
|
||||
<class>KMessageWidget</class>
|
||||
|
|
@ -638,18 +611,6 @@
|
|||
<header>desktop-widgets/locationinformation.h</header>
|
||||
</customwidget>
|
||||
</customwidgets>
|
||||
<tabstops>
|
||||
<tabstop>dateEdit</tabstop>
|
||||
<tabstop>timeEdit</tabstop>
|
||||
<tabstop>airtemp</tabstop>
|
||||
<tabstop>watertemp</tabstop>
|
||||
<tabstop>divemaster</tabstop>
|
||||
<tabstop>buddy</tabstop>
|
||||
<tabstop>rating</tabstop>
|
||||
<tabstop>visibility</tabstop>
|
||||
<tabstop>suit</tabstop>
|
||||
<tabstop>notes</tabstop>
|
||||
</tabstops>
|
||||
<resources>
|
||||
<include location="../../subsurface.qrc"/>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -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));
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue