Print: remove the height sliders from the PrintOptions class

These were hidden and we don't really support them because
our print layouting is not that flexible in Qt!

Note: printoptions.ui is now converted to UNIX line breaks.

Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

3 files changed, 217 insertions, 455 deletions

diff --git a/qt-ui/printoptions.cpp b/qt-ui/printoptions.cpp
index 5db665ab4..ac5f6550c 100644
--- a/qt-ui/printoptions.cpp
+++ b/qt-ui/printoptions.cpp
@@ -14,18 +14,7 @@ PrintOptions::PrintOptions(QWidget *parent, struct options *printOpt)
 
 void PrintOptions::setup(struct options *printOpt)
 {
-	/* these options are not supported ATM and we hide them.
-	 * basically the entire PrintDialog class needs re-implementation, so that
-	 * the paper size, DPI and all other options are displayed in one dialog.
-	 * this way we can print directly or do an optional preview first.
-	 */
-	ui.sizingHeights->setVisible(false);
-
 	printOptions = printOpt;
-	// layout height sliders
-	initSliderWithLabel(ui.sliderPHeight, ui.valuePHeight, printOptions->profile_height);
-	initSliderWithLabel(ui.sliderOHeight, ui.valueOHeight, printOptions->notes_height);
-	initSliderWithLabel(ui.sliderNHeight, ui.valueNHeight, printOptions->tanks_height);
 	// print type radio buttons
 	switch (printOptions->type) {
 	case options::PRETTY:
@@ -52,9 +41,6 @@ void PrintOptions::setup(struct options *printOpt)
 	// connect slots only once
 	if (hasSetupSlots)
 		return;
-	connect(ui.sliderPHeight, SIGNAL(sliderMoved(int)), this, SLOT(sliderPHeightMoved(int)));
-	connect(ui.sliderOHeight, SIGNAL(sliderMoved(int)), this, SLOT(sliderOHeightMoved(int)));
-	connect(ui.sliderNHeight, SIGNAL(sliderMoved(int)), this, SLOT(sliderNHeightMoved(int)));
 
 	connect(ui.radioSixDives, SIGNAL(clicked(bool)), this, SLOT(radioSixDivesClicked(bool)));
 	connect(ui.radioTwoDives, SIGNAL(clicked(bool)), this, SLOT(radioTwoDivesClicked(bool)));
@@ -68,37 +54,6 @@ void PrintOptions::setup(struct options *printOpt)
 	hasSetupSlots = true;
 }
 
-// layout height sliders
-void PrintOptions::initSliderWithLabel(QSlider *slider, QLabel *label, int value)
-{
-	slider->setValue(value);
-	label->setText(formatSliderValueText(value));
-}
-
-QString PrintOptions::formatSliderValueText(int value)
-{
-	QString str = QString("%1%").arg(QString::number(value));
-	return str;
-}
-
-void PrintOptions::sliderPHeightMoved(int value)
-{
-	ui.valuePHeight->setText(formatSliderValueText(value));
-	printOptions->profile_height = value;
-}
-
-void PrintOptions::sliderOHeightMoved(int value)
-{
-	ui.valueOHeight->setText(formatSliderValueText(value));
-	printOptions->notes_height = value;
-}
-
-void PrintOptions::sliderNHeightMoved(int value)
-{
-	ui.valueNHeight->setText(formatSliderValueText(value));
-	printOptions->tanks_height = value;
-}
-
 // print type radio buttons
 void PrintOptions::radioSixDivesClicked(bool check)
 {
diff --git a/qt-ui/printoptions.h b/qt-ui/printoptions.h
index 9fc55ed52..66d3d7424 100644
--- a/qt-ui/printoptions.h
+++ b/qt-ui/printoptions.h
@@ -15,17 +15,11 @@ public:
 
 private:
 	Ui::PrintOptions ui;
-	void setLabelFromSlider(QSlider *slider, QLabel *label);
-	void initSliderWithLabel(QSlider *slider, QLabel *label, int value);
-	QString formatSliderValueText(int value);
 	struct options *printOptions;
 	bool hasSetupSlots;
 
 private
 slots:
-	void sliderPHeightMoved(int value);
-	void sliderOHeightMoved(int value);
-	void sliderNHeightMoved(int value);
 	void radioSixDivesClicked(bool check);
 	void radioTwoDivesClicked(bool check);
 	void radioTablePrintClicked(bool check);
diff --git a/qt-ui/printoptions.ui b/qt-ui/printoptions.ui
index 43f8e6cfd..c108315d0 100644
--- a/qt-ui/printoptions.ui
+++ b/qt-ui/printoptions.ui
@@ -1,408 +1,221 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<ui version="4.0">

- <class>PrintOptions</class>

- <widget class="QWidget" name="PrintOptions">

-  <property name="geometry">

-   <rect>

-    <x>0</x>

-    <y>0</y>

-    <width>511</width>

-    <height>448</height>
-   </rect>

-  </property>

-  <widget class="QGroupBox" name="printOptions">

-   <property name="geometry">

-    <rect>

-     <x>10</x>

+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>PrintOptions</class>
+ <widget class="QWidget" name="PrintOptions">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>511</width>
+    <height>308</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>

+     <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>

-     </property>

-     <property name="leftMargin">

-      <number>15</number>

-     </property>

-     <property name="rightMargin">

-      <number>15</number>

-     </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="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>

+    </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>
+     </property>
+     <property name="leftMargin">
+      <number>15</number>
+     </property>
+     <property name="rightMargin">
+      <number>15</number>
+     </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="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>

+     <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>

-  <widget class="QGroupBox" name="sizingHeights">

-   <property name="geometry">

-    <rect>

-     <x>10</x>

-     <y>250</y>
-     <width>489</width>

-     <height>141</height>
-    </rect>

-   </property>

-   <property name="title">

-    <string>Sizing heights (% of layout)</string>

-   </property>

-   <widget class="QSlider" name="sliderPHeight">

-    <property name="geometry">

-     <rect>

-      <x>260</x>

-      <y>30</y>

-      <width>211</width>

-      <height>20</height>

-     </rect>

-    </property>

-    <property name="minimum">

-     <number>43</number>

-    </property>

-    <property name="maximum">

-     <number>85</number>

-    </property>

-    <property name="orientation">

-     <enum>Qt::Horizontal</enum>

-    </property>

-   </widget>

-   <widget class="QLabel" name="labelPHeight">

-    <property name="geometry">

-     <rect>

-      <x>10</x>

-      <y>30</y>

-      <width>201</width>

-      <height>20</height>

-     </rect>

-    </property>

-    <property name="sizePolicy">

-     <sizepolicy hsizetype="Expanding" vsizetype="Preferred">

-      <horstretch>0</horstretch>

-      <verstretch>0</verstretch>

-     </sizepolicy>

-    </property>

-    <property name="text">

-     <string>Profile height (43% - 85%)</string>

-    </property>

-    <property name="alignment">

-     <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>

-    </property>

-   </widget>

-   <widget class="QLabel" name="labelOHeight">

-    <property name="geometry">

-     <rect>

-      <x>10</x>

-      <y>70</y>

-      <width>201</width>

-      <height>20</height>

-     </rect>

-    </property>

-    <property name="sizePolicy">

-     <sizepolicy hsizetype="Expanding" vsizetype="Preferred">

-      <horstretch>0</horstretch>

-      <verstretch>0</verstretch>

-     </sizepolicy>

-    </property>

-    <property name="text">

-     <string>Other data height (8% - 17%)</string>

-    </property>

-    <property name="alignment">

-     <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>

-    </property>

-   </widget>

-   <widget class="QSlider" name="sliderOHeight">

-    <property name="geometry">

-     <rect>

-      <x>260</x>

-      <y>70</y>

-      <width>211</width>

-      <height>20</height>

-     </rect>

-    </property>

-    <property name="minimum">

-     <number>8</number>

-    </property>

-    <property name="maximum">

-     <number>17</number>

-    </property>

-    <property name="orientation">

-     <enum>Qt::Horizontal</enum>

-    </property>

-   </widget>

-   <widget class="QSlider" name="sliderNHeight">

-    <property name="geometry">

-     <rect>

-      <x>260</x>

-      <y>110</y>

-      <width>211</width>

-      <height>20</height>

-     </rect>

-    </property>

-    <property name="maximum">

-     <number>52</number>

-    </property>

-    <property name="orientation">

-     <enum>Qt::Horizontal</enum>

-    </property>

-   </widget>

-   <widget class="QLabel" name="labelNHeight">

-    <property name="geometry">

-     <rect>

-      <x>10</x>

-      <y>110</y>

-      <width>201</width>

-      <height>20</height>

-     </rect>

-    </property>

-    <property name="sizePolicy">

-     <sizepolicy hsizetype="Expanding" vsizetype="Preferred">

-      <horstretch>0</horstretch>

-      <verstretch>0</verstretch>

-     </sizepolicy>

-    </property>

-    <property name="layoutDirection">

-     <enum>Qt::LeftToRight</enum>

-    </property>

-    <property name="text">

-     <string>Notes height (0% - 52%)</string>

-    </property>

-    <property name="alignment">

-     <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>

-    </property>

-   </widget>

-   <widget class="QLabel" name="valuePHeight">

-    <property name="geometry">

-     <rect>

-      <x>220</x>

-      <y>30</y>

-      <width>31</width>

-      <height>20</height>

-     </rect>

-    </property>

-    <property name="text">

-     <string>0</string>

-    </property>

-    <property name="alignment">

-     <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>

-    </property>

-   </widget>

-   <widget class="QLabel" name="valueOHeight">

-    <property name="geometry">

-     <rect>

-      <x>220</x>

-      <y>70</y>

-      <width>31</width>

-      <height>20</height>

-     </rect>

-    </property>

-    <property name="text">

-     <string>0</string>

-    </property>

-    <property name="alignment">

-     <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>

-    </property>

-   </widget>

-   <widget class="QLabel" name="valueNHeight">

-    <property name="geometry">

-     <rect>

-      <x>220</x>

-      <y>110</y>

-      <width>31</width>

-      <height>20</height>

-     </rect>

-    </property>

-    <property name="text">

-     <string>0</string>

-    </property>

-    <property name="alignment">

-     <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>

-    </property>

-   </widget>

-  </widget>

- </widget>

- <tabstops>

-  <tabstop>radioSixDives</tabstop>

-  <tabstop>radioTwoDives</tabstop>

-  <tabstop>radioTablePrint</tabstop>

-  <tabstop>printSelected</tabstop>

-  <tabstop>printInColor</tabstop>

-  <tabstop>profileOnTop</tabstop>

-  <tabstop>notesOnTop</tabstop>

-  <tabstop>sliderPHeight</tabstop>

-  <tabstop>sliderOHeight</tabstop>

-  <tabstop>sliderNHeight</tabstop>

- </tabstops>

- <resources/>

- <connections/>

-</ui>

+    </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>
+ </widget>
+ <tabstops>
+  <tabstop>radioSixDives</tabstop>
+  <tabstop>radioTwoDives</tabstop>
+  <tabstop>radioTablePrint</tabstop>
+  <tabstop>printSelected</tabstop>
+  <tabstop>printInColor</tabstop>
+  <tabstop>profileOnTop</tabstop>
+  <tabstop>notesOnTop</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>