From 272338875d315e24b019917e35fbfadf36c05f09 Mon Sep 17 00:00:00 2001 From: Tomaz Canabrava Date: Mon, 17 Jun 2013 13:41:00 -0300 Subject: [PATCH] Addes a simple 'Renumber Dialog', very similar to the GTK one. This code adds a Renumber Dialog, that's most a copy & paste of the GTK visual, I didn't tried to do anything fance with it, but I still dont like how it looks like. a better management form is needed. :) ( Well, actually my dislike is mostly because it's on a menu and it's on a popup, I think a 'toolbox' should exist to hold all of those widgets that don't belong to the menu - will try that later ) Signed-off-by: Tomaz Canabrava --- qt-ui/mainwindow.cpp | 3 ++- qt-ui/simplewidgets.cpp | 30 +++++++++++++++++++++++++++++- qt-ui/simplewidgets.h | 20 +++++++++++++++++++- 3 files changed, 50 insertions(+), 3 deletions(-) diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp index 8b216bd8c..789d410da 100644 --- a/qt-ui/mainwindow.cpp +++ b/qt-ui/mainwindow.cpp @@ -29,6 +29,7 @@ #include "downloadfromdivecomputer.h" #include "preferences.h" #include "subsurfacewebservices.h" +#include "simplewidgets.h" static MainWindow* instance = 0; @@ -222,7 +223,7 @@ void MainWindow::on_actionAddDive_triggered() void MainWindow::on_actionRenumber_triggered() { - qDebug("actionRenumber"); + RenumberDialog::instance()->show(); } void MainWindow::on_actionAutoGroup_triggered() diff --git a/qt-ui/simplewidgets.cpp b/qt-ui/simplewidgets.cpp index c389a34c3..a6e01a724 100644 --- a/qt-ui/simplewidgets.cpp +++ b/qt-ui/simplewidgets.cpp @@ -4,6 +4,14 @@ #include #include #include +#include +#include +#include +#include + +#include "../dive.h" + +#include "ui_renumber.h" class MinMaxAvgWidgetPrivate{ public: @@ -24,7 +32,7 @@ public: avgValue = new QLabel(owner); minValue = new QLabel(owner); maxValue = new QLabel(owner); - + QGridLayout *formLayout = new QGridLayout(); formLayout->addWidget(maxIco, 0, 0); formLayout->addWidget(maxValue, 0, 1); @@ -90,3 +98,23 @@ void MinMaxAvgWidget::setMinimum(const QString& minimum) { d->minValue->setText(minimum); } + +RenumberDialog* RenumberDialog::instance() +{ + static RenumberDialog* self = new RenumberDialog(); + return self; +} + +void RenumberDialog::buttonClicked(QAbstractButton* button) +{ + if (ui->buttonBox->buttonRole(button) == QDialogButtonBox::AcceptRole){ + qDebug() << "Renumbering."; + renumber_dives(ui->spinBox->value()); + } +} + +RenumberDialog::RenumberDialog(): QDialog(), ui( new Ui::RenumberDialog()) +{ + ui->setupUi(this); + connect(ui->buttonBox, SIGNAL(clicked(QAbstractButton*)), this, SLOT(buttonClicked(QAbstractButton*))); +} diff --git a/qt-ui/simplewidgets.h b/qt-ui/simplewidgets.h index b05dd8f0e..ffd415767 100644 --- a/qt-ui/simplewidgets.h +++ b/qt-ui/simplewidgets.h @@ -2,7 +2,10 @@ #define SIMPLEWIDGETS_H class MinMaxAvgWidgetPrivate; +class QAbstractButton; + #include +#include class MinMaxAvgWidget : public QWidget{ Q_OBJECT @@ -25,4 +28,19 @@ private: MinMaxAvgWidgetPrivate *d; }; -#endif \ No newline at end of file +namespace Ui{ + class RenumberDialog; +}; + +class RenumberDialog : public QDialog { + Q_OBJECT +public: + static RenumberDialog *instance(); +private slots: + void buttonClicked(QAbstractButton *button); +private: + explicit RenumberDialog(); + Ui::RenumberDialog *ui; +}; + +#endif