we are getting close. :)
From e9b471c68b11df10f0e049b9982ad2898dd20307 Mon Sep 17 00:00:00 2001 From: Tomaz Canabrava <[email protected]> Date: Mon, 4 Aug 2014 12:58:21 -0300 Subject: [PATCH 1/3] Disable the Toolbox when in edit mode.
Some of the toolbox icons will trigger a recalculation of the dive, triggering then a replot, that will copy the dive to the displayed_dive again, but in the case of a edit this would discard the edition ( that would still be shown on the UI ) leaving the dive in an unconsistent state. Signed-off-by: Tomaz Canabrava <[email protected]> --- qt-ui/maintab.cpp | 3 +++ qt-ui/mainwindow.cpp | 10 ++++++++++ qt-ui/mainwindow.h | 1 + 3 files changed, 14 insertions(+) diff --git a/qt-ui/maintab.cpp b/qt-ui/maintab.cpp index 5a6f7b5..652e824 100644 --- a/qt-ui/maintab.cpp +++ b/qt-ui/maintab.cpp @@ -270,6 +270,7 @@ void MainTab::enableEdition(EditMode newEditMode) return; } MainWindow::instance()->dive_list()->setEnabled(false); + MainWindow::instance()->setEnabledToolbar(false); // only setup the globe for editing if we are editing exactly one existing dive if (amount_selected == 1 && newEditMode != ADD) @@ -781,6 +782,7 @@ void MainTab::acceptChanges() MainWindow::instance()->dive_list()->setFocus(); cylindersModel->changed = false; weightModel->changed = false; + MainWindow::instance()->setEnabledToolbar(true); } void MainTab::resetPallete() @@ -845,6 +847,7 @@ void MainTab::rejectChanges() MainWindow::instance()->globe()->reload(); // show the profile and dive info MainWindow::instance()->graphics()->replot(); + MainWindow::instance()->setEnabledToolbar(true); cylindersModel->changed = false; weightModel->changed = false; cylindersModel->updateDive(); diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp index aa9d8c1..1a4594b 100644 --- a/qt-ui/mainwindow.cpp +++ b/qt-ui/mainwindow.cpp @@ -1286,3 +1286,13 @@ void MainWindow::on_actionExport_triggered() DiveLogExportDialog diveLogExport; diveLogExport.exec(); } + +void MainWindow::setEnabledToolbar(bool arg1) +{ + QList<QToolButton*> toolBar; toolBar << ui.profCalcAllTissues << ui.profCalcCeiling + << ui.profDcCeiling << ui.profEad << ui.profHR << ui.profIncrement3m + << ui.profMod << ui.profNdl_tts << ui.profNdl_tts << ui.profPhe << ui.profPn2 + << ui.profPO2 << ui.profRuler << ui.profSAC << ui.profScaled << ui.profTogglePicture; + Q_FOREACH(QToolButton *b, toolBar) + b->setEnabled(arg1); +} diff --git a/qt-ui/mainwindow.h b/qt-ui/mainwindow.h index 6b53bab..5c0ec8e 100644 --- a/qt-ui/mainwindow.h +++ b/qt-ui/mainwindow.h @@ -156,6 +156,7 @@ slots: void editCurrentDive(); void planCanceled(); void planCreated(); + void setEnabledToolbar(bool arg1); private: Ui::MainWindow ui; -- 2.0.4
From 7aa2dae86ec9d1a705c64b028275237105ae7f20 Mon Sep 17 00:00:00 2001 From: Tomaz Canabrava <[email protected]> Date: Mon, 4 Aug 2014 13:18:20 -0300 Subject: [PATCH 2/3] Fix unresizable DiveList The issue with the dive list was actually the Planner Settings widget that was in the same space as the dive list but hidden, but since it had a minimum width we couldn't resize the dive list to be below the planner settings minimum. Fixed by inserting the contents of the Planner Settings into a QScroll Area. Signed-off-by: Tomaz Canabrava <[email protected]> --- qt-ui/plannerSettings.ui | 981 ++++++++++++++++++++++++----------------------- 1 file changed, 503 insertions(+), 478 deletions(-) diff --git a/qt-ui/plannerSettings.ui b/qt-ui/plannerSettings.ui index e94dc88..0ad0f5b 100644 --- a/qt-ui/plannerSettings.ui +++ b/qt-ui/plannerSettings.ui @@ -6,496 +6,521 @@ <rect> <x>0</x> <y>0</y> - <width>1116</width> - <height>292</height> + <width>1102</width> + <height>442</height> </rect> </property> <property name="windowTitle"> <string>Form</string> </property> - <layout class="QHBoxLayout" name="horizontalLayout"> - <property name="spacing"> - <number>2</number> - </property> - <property name="leftMargin"> - <number>2</number> - </property> - <property name="topMargin"> - <number>2</number> - </property> - <property name="rightMargin"> - <number>2</number> - </property> - <property name="bottomMargin"> - <number>2</number> - </property> + <layout class="QHBoxLayout" name="horizontalLayout_2"> <item> - <widget class="QGroupBox" name="groupBox_2"> - <property name="title"> - <string>Rates</string> + <widget class="QScrollArea" name="scrollArea"> + <property name="frameShape"> + <enum>QFrame::NoFrame</enum> </property> - <layout class="QVBoxLayout" name="verticalLayout"> - <property name="spacing"> - <number>2</number> - </property> - <property name="leftMargin"> - <number>2</number> - </property> - <property name="topMargin"> - <number>2</number> - </property> - <property name="rightMargin"> - <number>2</number> - </property> - <property name="bottomMargin"> - <number>2</number> + <property name="frameShadow"> + <enum>QFrame::Plain</enum> + </property> + <property name="widgetResizable"> + <bool>true</bool> + </property> + <widget class="QWidget" name="scrollAreaWidgetContents"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>1089</width> + <height>404</height> + </rect> </property> - <item> - <widget class="QGroupBox" name="groupBox"> - <property name="title"> - <string>Ascent</string> - </property> - <layout class="QGridLayout" name="gridLayout_3"> - <property name="leftMargin"> - <number>2</number> - </property> - <property name="topMargin"> - <number>2</number> - </property> - <property name="rightMargin"> - <number>2</number> - </property> - <property name="bottomMargin"> - <number>2</number> - </property> - <property name="horizontalSpacing"> - <number>2</number> + <layout class="QHBoxLayout" name="horizontalLayout"> + <property name="spacing"> + <number>0</number> + </property> + <property name="leftMargin"> + <number>0</number> + </property> + <property name="topMargin"> + <number>0</number> + </property> + <property name="rightMargin"> + <number>0</number> + </property> + <property name="bottomMargin"> + <number>0</number> + </property> + <item> + <widget class="QGroupBox" name="groupBox_2"> + <property name="title"> + <string>Rates</string> </property> - <item row="0" column="0"> - <widget class="QLabel" name="label"> - <property name="text"> - <string>below 75% avg. depth</string> - </property> - </widget> - </item> - <item row="0" column="1"> - <widget class="QSpinBox" name="ascRate75"> - <property name="suffix"> - <string>m/min</string> - </property> - <property name="minimum"> - <number>1</number> - </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="QLabel" name="label_2"> - <property name="text"> - <string>75% to 50% avg. depth</string> - </property> - </widget> - </item> - <item row="1" column="1"> - <widget class="QSpinBox" name="ascRate50"> - <property name="suffix"> - <string>m/min</string> - </property> - <property name="minimum"> - <number>1</number> - </property> - </widget> - </item> - <item row="2" column="0"> - <widget class="QLabel" name="asc50to6"> - <property name="text"> - <string>50% avg. depth to 6m</string> - </property> - </widget> - </item> - <item row="2" column="1"> - <widget class="QSpinBox" name="ascRateStops"> - <property name="suffix"> - <string>m/min</string> - </property> - <property name="minimum"> - <number>1</number> - </property> - </widget> - </item> - <item row="3" column="0"> - <widget class="QLabel" name="asc6toSurf"> - <property name="text"> - <string>6m to surface</string> - </property> - </widget> - </item> - <item row="3" column="1"> - <widget class="QSpinBox" name="ascRateLast6m"> - <property name="suffix"> - <string>m/min</string> - </property> - <property name="minimum"> - <number>1</number> - </property> - </widget> - </item> - </layout> - </widget> - </item> - <item> - <widget class="QGroupBox" name="groupBox_3"> - <property name="title"> - <string>Descent</string> - </property> - <layout class="QGridLayout" name="gridLayout_4"> - <property name="leftMargin"> - <number>2</number> + <layout class="QVBoxLayout" name="verticalLayout"> + <property name="spacing"> + <number>2</number> + </property> + <property name="leftMargin"> + <number>2</number> + </property> + <property name="topMargin"> + <number>2</number> + </property> + <property name="rightMargin"> + <number>2</number> + </property> + <property name="bottomMargin"> + <number>2</number> + </property> + <item> + <widget class="QGroupBox" name="groupBox"> + <property name="title"> + <string>Ascent</string> + </property> + <layout class="QGridLayout" name="gridLayout_3"> + <property name="leftMargin"> + <number>2</number> + </property> + <property name="topMargin"> + <number>2</number> + </property> + <property name="rightMargin"> + <number>2</number> + </property> + <property name="bottomMargin"> + <number>2</number> + </property> + <property name="horizontalSpacing"> + <number>2</number> + </property> + <item row="0" column="0"> + <widget class="QLabel" name="label"> + <property name="text"> + <string>below 75% avg. depth</string> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QSpinBox" name="ascRate75"> + <property name="suffix"> + <string>m/min</string> + </property> + <property name="minimum"> + <number>1</number> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="label_2"> + <property name="text"> + <string>75% to 50% avg. depth</string> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="QSpinBox" name="ascRate50"> + <property name="suffix"> + <string>m/min</string> + </property> + <property name="minimum"> + <number>1</number> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QLabel" name="asc50to6"> + <property name="text"> + <string>50% avg. depth to 6m</string> + </property> + </widget> + </item> + <item row="2" column="1"> + <widget class="QSpinBox" name="ascRateStops"> + <property name="suffix"> + <string>m/min</string> + </property> + <property name="minimum"> + <number>1</number> + </property> + </widget> + </item> + <item row="3" column="0"> + <widget class="QLabel" name="asc6toSurf"> + <property name="text"> + <string>6m to surface</string> + </property> + </widget> + </item> + <item row="3" column="1"> + <widget class="QSpinBox" name="ascRateLast6m"> + <property name="suffix"> + <string>m/min</string> + </property> + <property name="minimum"> + <number>1</number> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QGroupBox" name="groupBox_3"> + <property name="title"> + <string>Descent</string> + </property> + <layout class="QGridLayout" name="gridLayout_4"> + <property name="leftMargin"> + <number>2</number> + </property> + <property name="topMargin"> + <number>2</number> + </property> + <property name="rightMargin"> + <number>2</number> + </property> + <property name="bottomMargin"> + <number>2</number> + </property> + <property name="spacing"> + <number>2</number> + </property> + <item row="0" column="1"> + <widget class="QSpinBox" name="descRate"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="maximumSize"> + <size> + <width>16777215</width> + <height>16777215</height> + </size> + </property> + <property name="suffix"> + <string>m/min</string> + </property> + <property name="minimum"> + <number>1</number> + </property> + <property name="value"> + <number>18</number> + </property> + </widget> + </item> + <item row="0" column="0"> + <widget class="QLabel" name="label_9"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>surface to the bottom</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <spacer name="verticalSpacer"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>40</height> + </size> + </property> + </spacer> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QGroupBox" name="groupBox_5"> + <property name="title"> + <string>Planning</string> </property> - <property name="topMargin"> - <number>2</number> + <layout class="QGridLayout" name="gridLayout"> + <property name="leftMargin"> + <number>2</number> + </property> + <property name="topMargin"> + <number>2</number> + </property> + <property name="rightMargin"> + <number>2</number> + </property> + <property name="bottomMargin"> + <number>2</number> + </property> + <property name="spacing"> + <number>2</number> + </property> + <item row="0" column="0"> + <widget class="QLabel" name="label_15"> + <property name="text"> + <string>GF low</string> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QSpinBox" name="gflow"> + <property name="minimum"> + <number>1</number> + </property> + <property name="maximum"> + <number>150</number> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="label_16"> + <property name="text"> + <string>GF high</string> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="QSpinBox" name="gfhigh"> + <property name="minimum"> + <number>1</number> + </property> + <property name="maximum"> + <number>150</number> + </property> + </widget> + </item> + <item row="2" column="0" colspan="2"> + <widget class="QCheckBox" name="drop_stone_mode"> + <property name="text"> + <string>Drop to first depth</string> + </property> + </widget> + </item> + <item row="3" column="0" colspan="2"> + <widget class="QCheckBox" name="lastStop"> + <property name="text"> + <string>Last stop at 6m</string> + </property> + </widget> + </item> + <item row="4" column="0" colspan="2"> + <widget class="QCheckBox" name="backgasBreaks"> + <property name="text"> + <string>Plan backgas breaks</string> + </property> + </widget> + </item> + <item row="5" column="0"> + <spacer name="verticalSpacer_2"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>40</height> + </size> + </property> + </spacer> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QGroupBox" name="groupBox_4"> + <property name="title"> + <string>Gas options</string> </property> - <property name="rightMargin"> - <number>2</number> + <layout class="QGridLayout" name="gridLayout_5"> + <property name="leftMargin"> + <number>2</number> + </property> + <property name="topMargin"> + <number>2</number> + </property> + <property name="rightMargin"> + <number>2</number> + </property> + <property name="bottomMargin"> + <number>2</number> + </property> + <property name="spacing"> + <number>2</number> + </property> + <item row="0" column="0"> + <widget class="QLabel" name="label_13"> + <property name="text"> + <string>Bottom SAC</string> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QSpinBox" name="bottomSAC"/> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="label_14"> + <property name="text"> + <string>Deco SAC</string> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="QSpinBox" name="decoStopSAC"/> + </item> + <item row="2" column="0"> + <widget class="QLabel" name="label_6"> + <property name="text"> + <string>Bottom pO₂</string> + </property> + </widget> + </item> + <item row="2" column="1"> + <widget class="QDoubleSpinBox" name="bottompo2"> + <property name="suffix"> + <string>bar</string> + </property> + <property name="maximum"> + <double>2.000000000000000</double> + </property> + <property name="singleStep"> + <double>0.100000000000000</double> + </property> + <property name="value"> + <double>1.400000000000000</double> + </property> + </widget> + </item> + <item row="3" column="0"> + <widget class="QLabel" name="label_7"> + <property name="text"> + <string>Deco pO₂</string> + </property> + </widget> + </item> + <item row="3" column="1"> + <widget class="QDoubleSpinBox" name="decopo2"> + <property name="suffix"> + <string>bar</string> + </property> + <property name="maximum"> + <double>2.000000000000000</double> + </property> + <property name="singleStep"> + <double>0.100000000000000</double> + </property> + <property name="value"> + <double>1.600000000000000</double> + </property> + </widget> + </item> + <item row="4" column="0"> + <spacer name="verticalSpacer_3"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>40</height> + </size> + </property> + </spacer> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QGroupBox" name="groupBox_6"> + <property name="title"> + <string>Dive notes</string> </property> - <property name="bottomMargin"> - <number>2</number> - </property> - <property name="spacing"> - <number>2</number> - </property> - <item row="0" column="1"> - <widget class="QSpinBox" name="descRate"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="maximumSize"> - <size> - <width>16777215</width> - <height>16777215</height> - </size> - </property> - <property name="suffix"> - <string>m/min</string> - </property> - <property name="minimum"> - <number>1</number> - </property> - <property name="value"> - <number>18</number> - </property> - </widget> - </item> - <item row="0" column="0"> - <widget class="QLabel" name="label_9"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>surface to the bottom</string> - </property> - </widget> - </item> - </layout> - </widget> - </item> - <item> - <spacer name="verticalSpacer"> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>40</height> - </size> - </property> - </spacer> - </item> - </layout> - </widget> - </item> - <item> - <widget class="QGroupBox" name="groupBox_5"> - <property name="title"> - <string>Planning</string> - </property> - <layout class="QGridLayout" name="gridLayout"> - <property name="leftMargin"> - <number>2</number> - </property> - <property name="topMargin"> - <number>2</number> - </property> - <property name="rightMargin"> - <number>2</number> - </property> - <property name="bottomMargin"> - <number>2</number> - </property> - <property name="spacing"> - <number>2</number> - </property> - <item row="0" column="0"> - <widget class="QLabel" name="label_15"> - <property name="text"> - <string>GF low</string> - </property> - </widget> - </item> - <item row="0" column="1"> - <widget class="QSpinBox" name="gflow"> - <property name="minimum"> - <number>1</number> - </property> - <property name="maximum"> - <number>150</number> - </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="QLabel" name="label_16"> - <property name="text"> - <string>GF high</string> - </property> - </widget> - </item> - <item row="1" column="1"> - <widget class="QSpinBox" name="gfhigh"> - <property name="minimum"> - <number>1</number> - </property> - <property name="maximum"> - <number>150</number> - </property> - </widget> - </item> - <item row="2" column="0" colspan="2"> - <widget class="QCheckBox" name="drop_stone_mode"> - <property name="text"> - <string>Drop to first depth</string> - </property> - </widget> - </item> - <item row="3" column="0" colspan="2"> - <widget class="QCheckBox" name="lastStop"> - <property name="text"> - <string>Last stop at 6m</string> - </property> - </widget> - </item> - <item row="4" column="0" colspan="2"> - <widget class="QCheckBox" name="backgasBreaks"> - <property name="text"> - <string>Plan backgas breaks</string> - </property> - </widget> - </item> - <item row="5" column="0"> - <spacer name="verticalSpacer_2"> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>40</height> - </size> - </property> - </spacer> - </item> - </layout> - </widget> - </item> - <item> - <widget class="QGroupBox" name="groupBox_4"> - <property name="title"> - <string>Gas options</string> - </property> - <layout class="QGridLayout" name="gridLayout_5"> - <property name="leftMargin"> - <number>2</number> - </property> - <property name="topMargin"> - <number>2</number> - </property> - <property name="rightMargin"> - <number>2</number> - </property> - <property name="bottomMargin"> - <number>2</number> - </property> - <property name="spacing"> - <number>2</number> - </property> - <item row="0" column="0"> - <widget class="QLabel" name="label_13"> - <property name="text"> - <string>Bottom SAC</string> - </property> - </widget> - </item> - <item row="0" column="1"> - <widget class="QSpinBox" name="bottomSAC"/> - </item> - <item row="1" column="0"> - <widget class="QLabel" name="label_14"> - <property name="text"> - <string>Deco SAC</string> - </property> - </widget> - </item> - <item row="1" column="1"> - <widget class="QSpinBox" name="decoStopSAC"/> - </item> - <item row="2" column="0"> - <widget class="QLabel" name="label_6"> - <property name="text"> - <string>Bottom pO₂</string> - </property> - </widget> - </item> - <item row="2" column="1"> - <widget class="QDoubleSpinBox" name="bottompo2"> - <property name="suffix"> - <string>bar</string> - </property> - <property name="maximum"> - <double>2.000000000000000</double> - </property> - <property name="singleStep"> - <double>0.100000000000000</double> - </property> - <property name="value"> - <double>1.400000000000000</double> - </property> - </widget> - </item> - <item row="3" column="0"> - <widget class="QLabel" name="label_7"> - <property name="text"> - <string>Deco pO₂</string> - </property> - </widget> - </item> - <item row="3" column="1"> - <widget class="QDoubleSpinBox" name="decopo2"> - <property name="suffix"> - <string>bar</string> - </property> - <property name="maximum"> - <double>2.000000000000000</double> - </property> - <property name="singleStep"> - <double>0.100000000000000</double> - </property> - <property name="value"> - <double>1.600000000000000</double> - </property> - </widget> - </item> - <item row="4" column="0"> - <spacer name="verticalSpacer_3"> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>40</height> - </size> - </property> - </spacer> - </item> - </layout> - </widget> - </item> - <item> - <widget class="QGroupBox" name="groupBox_6"> - <property name="title"> - <string>Dive notes</string> - </property> - <layout class="QGridLayout" name="gridLayout_6"> - <property name="leftMargin"> - <number>2</number> - </property> - <property name="topMargin"> - <number>2</number> - </property> - <property name="rightMargin"> - <number>2</number> - </property> - <property name="bottomMargin"> - <number>2</number> - </property> - <property name="spacing"> - <number>2</number> - </property> - <item row="0" column="0"> - <widget class="QCheckBox" name="display_runtime"> - <property name="toolTip"> - <string>In dive plan, show runtime (absolute time) of stops</string> - </property> - <property name="text"> - <string>Display runtime</string> - </property> - <property name="checked"> - <bool>true</bool> - </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="QCheckBox" name="display_duration"> - <property name="enabled"> - <bool>true</bool> - </property> - <property name="toolTip"> - <string>In dive plan, show duration (relative time) of stops</string> - </property> - <property name="text"> - <string>Display segment duration</string> - </property> - <property name="checked"> - <bool>false</bool> - </property> - </widget> - </item> - <item row="2" column="0"> - <widget class="QCheckBox" name="display_transitions"> - <property name="toolTip"> - <string>In diveplan, list transitions or treat them as implicit</string> - </property> - <property name="text"> - <string>Display transitions in deco</string> - </property> - </widget> - </item> - <item row="3" column="0"> - <widget class="QCheckBox" name="verbatim_plan"> - <property name="text"> - <string>Verbatim diveplan</string> - </property> - </widget> - </item> - <item row="4" column="0"> - <spacer name="verticalSpacer_4"> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>40</height> - </size> - </property> - </spacer> - </item> - </layout> + <layout class="QGridLayout" name="gridLayout_6"> + <property name="leftMargin"> + <number>2</number> + </property> + <property name="topMargin"> + <number>2</number> + </property> + <property name="rightMargin"> + <number>2</number> + </property> + <property name="bottomMargin"> + <number>2</number> + </property> + <property name="spacing"> + <number>2</number> + </property> + <item row="0" column="0"> + <widget class="QCheckBox" name="display_runtime"> + <property name="toolTip"> + <string>In dive plan, show runtime (absolute time) of stops</string> + </property> + <property name="text"> + <string>Display runtime</string> + </property> + <property name="checked"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QCheckBox" name="display_duration"> + <property name="enabled"> + <bool>true</bool> + </property> + <property name="toolTip"> + <string>In dive plan, show duration (relative time) of stops</string> + </property> + <property name="text"> + <string>Display segment duration</string> + </property> + <property name="checked"> + <bool>false</bool> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QCheckBox" name="display_transitions"> + <property name="toolTip"> + <string>In diveplan, list transitions or treat them as implicit</string> + </property> + <property name="text"> + <string>Display transitions in deco</string> + </property> + </widget> + </item> + <item row="3" column="0"> + <widget class="QCheckBox" name="verbatim_plan"> + <property name="text"> + <string>Verbatim diveplan</string> + </property> + </widget> + </item> + <item row="4" column="0"> + <spacer name="verticalSpacer_4"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>40</height> + </size> + </property> + </spacer> + </item> + </layout> + </widget> + </item> + </layout> + </widget> </widget> </item> </layout> -- 2.0.4
From a8ffc8beaf615dba71b4ac5678c6ad19cc6e509a Mon Sep 17 00:00:00 2001 From: Tomaz Canabrava <[email protected]> Date: Mon, 4 Aug 2014 13:27:29 -0300 Subject: [PATCH 3/3] Fix the layout on the Print Dialog The layout was a hardcoded position without layouts, that would only work on english language since other languages can have bigger strings than the current ones. also, removed the 'setFixedSize' stuff and let the widget find it's best size for itself. Signed-off-by: Tomaz Canabrava <[email protected]> --- qt-ui/printdialog.cpp | 1 - qt-ui/printoptions.ui | 375 ++++++++++++++++++++++---------------------------- 2 files changed, 166 insertions(+), 210 deletions(-) diff --git a/qt-ui/printdialog.cpp b/qt-ui/printdialog.cpp index d1553ae..0ad2b28 100644 --- a/qt-ui/printdialog.cpp +++ b/qt-ui/printdialog.cpp @@ -55,7 +55,6 @@ PrintDialog::PrintDialog(QWidget *parent, Qt::WindowFlags f) : QDialog(parent, f hLayout->addWidget(buttonBox); - setFixedSize(550, 400); setWindowTitle(tr("Print")); setWindowIcon(QIcon(":subsurface-icon")); diff --git a/qt-ui/printoptions.ui b/qt-ui/printoptions.ui index e7bdbf6..59a48b9 100644 --- a/qt-ui/printoptions.ui +++ b/qt-ui/printoptions.ui @@ -6,224 +6,181 @@ <rect> <x>0</x> <y>0</y> - <width>511</width> - <height>308</height> + <width>367</width> + <height>433</height> </rect> </property> - <widget class="QGroupBox" name="printOptions"> - <property name="geometry"> - <rect> - <x>10</x> - <y>70</y> - <width>489</width> - <height>81</height> - </rect> - </property> - <property name="title"> - <string>Print options</string> - </property> - <widget class="QCheckBox" name="printSelected"> - <property name="geometry"> - <rect> - <x>10</x> - <y>30</y> - <width>461</width> - <height>18</height> - </rect> - </property> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>Print only selected dives</string> - </property> - </widget> - <widget class="QCheckBox" name="printInColor"> - <property name="geometry"> - <rect> - <x>10</x> - <y>50</y> - <width>461</width> - <height>18</height> - </rect> - </property> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>Print in color</string> - </property> - </widget> - </widget> - <widget class="QGroupBox" name="printType"> - <property name="geometry"> - <rect> - <x>10</x> - <y>10</y> - <width>489</width> - <height>51</height> - </rect> - </property> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="baseSize"> - <size> - <width>0</width> - <height>0</height> - </size> - </property> - <property name="title"> - <string>Print type</string> - </property> - <widget class="QWidget" name="horizontalLayoutWidget_2"> - <property name="geometry"> - <rect> - <x>0</x> - <y>20</y> - <width>491</width> - <height>31</height> - </rect> - </property> - <layout class="QHBoxLayout" name="layoutPrintType"> - <property name="sizeConstraint"> - <enum>QLayout::SetDefaultConstraint</enum> + <layout class="QVBoxLayout" name="verticalLayout_3"> + <item> + <widget class="QGroupBox" name="printType"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> </property> - <property name="leftMargin"> - <number>15</number> + <property name="baseSize"> + <size> + <width>0</width> + <height>0</height> + </size> </property> - <property name="rightMargin"> - <number>15</number> + <property name="title"> + <string>Print type</string> </property> - <item> - <widget class="QRadioButton" name="radioSixDives"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>6 dives per page</string> - </property> - <property name="checked"> - <bool>true</bool> - </property> - </widget> - </item> - <item> - <widget class="QRadioButton" name="radioTwoDives"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>2 dives per page</string> - </property> - </widget> - </item> - <item> - <widget class="QRadioButton" name="radioOneDive"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>1 dive per page</string> - </property> - </widget> - </item> - <item> - <widget class="QRadioButton" name="radioTablePrint"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>Table print</string> - </property> - </widget> - </item> - </layout> - </widget> - </widget> - <widget class="QGroupBox" name="ordering"> - <property name="geometry"> - <rect> - <x>10</x> - <y>160</y> - <width>489</width> - <height>81</height> - </rect> - </property> - <property name="title"> - <string>Ordering</string> - </property> - <widget class="QRadioButton" name="profileOnTop"> - <property name="geometry"> - <rect> - <x>10</x> - <y>30</y> - <width>461</width> - <height>18</height> - </rect> - </property> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>Profile on top</string> - </property> - <property name="checked"> - <bool>true</bool> - </property> - </widget> - <widget class="QRadioButton" name="notesOnTop"> - <property name="geometry"> - <rect> - <x>10</x> - <y>50</y> - <width>461</width> - <height>18</height> - </rect> - </property> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>Notes on top</string> - </property> - <property name="checked"> - <bool>false</bool> - </property> - </widget> - </widget> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0" colspan="2"> + <widget class="QRadioButton" name="radioSixDives"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>&6 dives per page</string> + </property> + <property name="checked"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QRadioButton" name="radioOneDive"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>&1 dive per page</string> + </property> + </widget> + </item> + <item row="3" column="0" colspan="2"> + <widget class="QRadioButton" name="radioTwoDives"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>&2 dives per page</string> + </property> + </widget> + </item> + <item row="0" column="2"> + <widget class="QRadioButton" name="radioTablePrint"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>&Table print</string> + </property> + </widget> + </item> + <item row="2" column="2" rowspan="2"> + <spacer name="verticalSpacer"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>40</height> + </size> + </property> + </spacer> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QGroupBox" name="printOptions"> + <property name="title"> + <string>Print options</string> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="QCheckBox" name="printSelected"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>Print only selected dives</string> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="printInColor"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>Print in color</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QGroupBox" name="ordering"> + <property name="title"> + <string>Ordering</string> + </property> + <layout class="QVBoxLayout" name="verticalLayout_2"> + <item> + <widget class="QRadioButton" name="profileOnTop"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>Prof&ile on top</string> + </property> + <property name="checked"> + <bool>true</bool> + </property> + </widget> + </item> + <item> + <widget class="QRadioButton" name="notesOnTop"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>&Notes on top</string> + </property> + <property name="checked"> + <bool>false</bool> + </property> + </widget> + </item> + </layout> + </widget> + </item> + </layout> </widget> <tabstops> <tabstop>radioSixDives</tabstop> <tabstop>radioTwoDives</tabstop> - <tabstop>radioTablePrint</tabstop> <tabstop>printSelected</tabstop> <tabstop>printInColor</tabstop> <tabstop>profileOnTop</tabstop> -- 2.0.4
_______________________________________________ subsurface mailing list [email protected] http://lists.hohndel.org/cgi-bin/mailman/listinfo/subsurface
