From 634abb8bb2dadbf3657629b8f26bc1e4cc0dd79f Mon Sep 17 00:00:00 2001 From: Tomaz Canabrava Date: Wed, 24 Apr 2013 19:57:10 -0300 Subject: Use the star widget in it's right place Signed-off-by: Tomaz Canabrava --- qt-ui/maintab.ui | 16 ++++++++++++---- qt-ui/mainwindow.cpp | 5 +---- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/qt-ui/maintab.ui b/qt-ui/maintab.ui index 0f46d91a5..5122d681d 100644 --- a/qt-ui/maintab.ui +++ b/qt-ui/maintab.ui @@ -14,7 +14,7 @@ TabWidget - 2 + 1 @@ -356,9 +356,6 @@ - - - @@ -372,6 +369,9 @@ + + + @@ -805,6 +805,14 @@ + + + StarWidget + QWidget +
starwidget.h
+ 1 + + diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp index adfb3c74a..e8fcd3200 100644 --- a/qt-ui/mainwindow.cpp +++ b/qt-ui/mainwindow.cpp @@ -28,10 +28,7 @@ MainWindow::MainWindow() : ui(new Ui::MainWindow()), ui->ListWidget->setModel(model); this->setWindowIcon(QIcon(":subsurface-icon")); // Just to test the star widgets, can be safely removed. - StarWidget *star = new StarWidget(0); - star->setMaximumStars(10); - star->setCurrentStars(3); - star->show(); + } void MainWindow::on_actionNew_triggered() -- cgit v1.2.3-70-g09d2 From 607c08bb25926d964f0b430440d6a1c6b6366c95 Mon Sep 17 00:00:00 2001 From: Tomaz Canabrava Date: Wed, 24 Apr 2013 19:57:50 -0300 Subject: Remove the use of this-> Signed-off-by: Tomaz Canabrava --- qt-ui/mainwindow.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp index e8fcd3200..b0b56a4e7 100644 --- a/qt-ui/mainwindow.cpp +++ b/qt-ui/mainwindow.cpp @@ -26,7 +26,7 @@ MainWindow::MainWindow() : ui(new Ui::MainWindow()), { ui->setupUi(this); ui->ListWidget->setModel(model); - this->setWindowIcon(QIcon(":subsurface-icon")); + setWindowIcon(QIcon(":subsurface-icon")); // Just to test the star widgets, can be safely removed. } -- cgit v1.2.3-70-g09d2 From 639dbe95f85c72a97b00ac17e76d968c692086e3 Mon Sep 17 00:00:00 2001 From: Tomaz Canabrava Date: Wed, 24 Apr 2013 19:59:52 -0300 Subject: Fix the order of the DiveInformation tab bar. Signed-off-by: Tomaz Canabrava --- qt-ui/maintab.ui | 356 +++++++++++++++++++++++++++---------------------------- 1 file changed, 178 insertions(+), 178 deletions(-) diff --git a/qt-ui/maintab.ui b/qt-ui/maintab.ui index 5122d681d..7edbf5837 100644 --- a/qt-ui/maintab.ui +++ b/qt-ui/maintab.ui @@ -14,8 +14,185 @@ TabWidget - 1 + 0 + + + Dive Notes + + + + + + Location + + + + + + + + + + Divemaster + + + + + + + Buddy + + + + + + + + + + + + + Rating + + + + + + + Suit + + + + + + + + + + Notes + + + + + + + + + + + + + + Equipment + + + + + + Qt::Vertical + + + + Cylinders + + + + + + + + + + + Edit + + + + + + + Add + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Delete + + + + + + + + + + Weight + + + + + + + + + + + Edit + + + + + + + Add + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Delete + + + + + + + + + + + Dive Info @@ -307,183 +484,6 @@ - - - Dive Notes - - - - - - Location - - - - - - - - - - Divemaster - - - - - - - Buddy - - - - - - - - - - - - - Rating - - - - - - - Suit - - - - - - - - - - Notes - - - - - - - - - - - - - - Equipment - - - - - - Qt::Vertical - - - - Cylinders - - - - - - - - - - - Edit - - - - - - - Add - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Delete - - - - - - - - - - Weight - - - - - - - - - - - Edit - - - - - - - Add - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Delete - - - - - - - - - - - Stats -- cgit v1.2.3-70-g09d2