From a0b8eed61286d87e98e9344f11d65c5c3aa7d636 Mon Sep 17 00:00:00 2001
From: Gehad elrobey <gehadelrobey@gmail.com>
Date: Sat, 30 May 2015 13:10:31 +0200
Subject: [PATCH] Printing: Edit the print options widget

Remove obsolete code and add new customizable print code to the options
dialog.

Signed-off-by: Gehad elrobey <gehadelrobey@gmail.com>
Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
---
 display.h              |  4 +-
 qt-ui/printoptions.cpp | 60 ++++++++-------------------
 qt-ui/printoptions.h   |  9 ++--
 qt-ui/printoptions.ui  | 93 +++++++++++++++---------------------------
 4 files changed, 58 insertions(+), 108 deletions(-)

diff --git a/display.h b/display.h
index f0101448d..72b5c99fc 100644
--- a/display.h
+++ b/display.h
@@ -40,7 +40,9 @@ struct print_options {
 		PRETTY,
 		TABLE,
 		TWOPERPAGE,
-		ONEPERPAGE
+		ONEPERPAGE,
+		DIVELIST,
+		STATISTICS
 	} type;
 	bool print_selected;
 	bool color_selected;
diff --git a/qt-ui/printoptions.cpp b/qt-ui/printoptions.cpp
index d3e148c69..03f9d19e2 100644
--- a/qt-ui/printoptions.cpp
+++ b/qt-ui/printoptions.cpp
@@ -17,66 +17,53 @@ void PrintOptions::setup(struct print_options *printOpt)
 	printOptions = printOpt;
 	// print type radio buttons
 	switch (printOptions->type) {
-	case print_options::PRETTY:
-		ui.radioSixDives->setChecked(true);
-		break;
-	case print_options::TWOPERPAGE:
-		ui.radioTwoDives->setChecked(true);
-		break;
-	case print_options::ONEPERPAGE:
-		ui.radioOneDive->setChecked(true);
+	case print_options::DIVELIST:
+		ui.radioDiveListPrint->setChecked(true);
 		break;
 	case print_options::TABLE:
 		ui.radioTablePrint->setChecked(true);
 		break;
+	case print_options::STATISTICS:
+		ui.radioStatisticsPrint->setChecked(true);
+		break;
 	}
+
 	// general print option checkboxes
 	if (printOptions->color_selected)
 		ui.printInColor->setChecked(true);
 	if (printOptions->print_selected)
 		ui.printSelected->setChecked(true);
-	// ordering
-	if (printOptions->notes_up)
-		ui.notesOnTop->setChecked(true);
-	else
-		ui.profileOnTop->setChecked(true);
 
 	// connect slots only once
 	if (hasSetupSlots)
 		return;
 
-	connect(ui.radioSixDives, SIGNAL(clicked(bool)), this, SLOT(radioSixDivesClicked(bool)));
-	connect(ui.radioTwoDives, SIGNAL(clicked(bool)), this, SLOT(radioTwoDivesClicked(bool)));
-	connect(ui.radioOneDive, SIGNAL(clicked(bool)), this, SLOT(radioOneDiveClicked(bool)));
-	connect(ui.radioTablePrint, SIGNAL(clicked(bool)), this, SLOT(radioTablePrintClicked(bool)));
-
 	connect(ui.printInColor, SIGNAL(clicked(bool)), this, SLOT(printInColorClicked(bool)));
 	connect(ui.printSelected, SIGNAL(clicked(bool)), this, SLOT(printSelectedClicked(bool)));
 
-	connect(ui.notesOnTop, SIGNAL(clicked(bool)), this, SLOT(notesOnTopClicked(bool)));
-	connect(ui.profileOnTop, SIGNAL(clicked(bool)), this, SLOT(profileOnTopClicked(bool)));
 	hasSetupSlots = true;
 }
 
 // print type radio buttons
-void PrintOptions::radioSixDivesClicked(bool check)
+void PrintOptions::on_radioDiveListPrint_clicked(bool check)
 {
-	printOptions->type = print_options::PRETTY;
+	if (check) {
+		printOptions->type = print_options::DIVELIST;
+	}
 }
 
-void PrintOptions::radioTwoDivesClicked(bool check)
+void PrintOptions::on_radioTablePrint_clicked(bool check)
 {
-	printOptions->type = print_options::TWOPERPAGE;
+	if (check) {
+		printOptions->type = print_options::TABLE;
+	}
 }
 
-void PrintOptions::radioOneDiveClicked(bool check)
+void PrintOptions::on_radioStatisticsPrint_clicked(bool check)
 {
-	printOptions->type = print_options::ONEPERPAGE;
-}
-
-void PrintOptions::radioTablePrintClicked(bool check)
-{
-	printOptions->type = print_options::TABLE;
+	if (check) {
+		printOptions->type = print_options::STATISTICS;
+	}
 }
 
 // general print option checkboxes
@@ -89,14 +76,3 @@ void PrintOptions::printSelectedClicked(bool check)
 {
 	printOptions->print_selected = check;
 }
-
-// ordering
-void PrintOptions::notesOnTopClicked(bool check)
-{
-	printOptions->notes_up = true;
-}
-
-void PrintOptions::profileOnTopClicked(bool check)
-{
-	printOptions->notes_up = false;
-}
diff --git a/qt-ui/printoptions.h b/qt-ui/printoptions.h
index 658e7ec1d..af845cb19 100644
--- a/qt-ui/printoptions.h
+++ b/qt-ui/printoptions.h
@@ -20,14 +20,11 @@ private:
 
 private
 slots:
-	void radioSixDivesClicked(bool check);
-	void radioTwoDivesClicked(bool check);
-	void radioOneDiveClicked(bool check);
-	void radioTablePrintClicked(bool check);
 	void printInColorClicked(bool check);
 	void printSelectedClicked(bool check);
-	void notesOnTopClicked(bool check);
-	void profileOnTopClicked(bool check);
+	void on_radioStatisticsPrint_clicked(bool check);
+	void on_radioTablePrint_clicked(bool check);
+	void on_radioDiveListPrint_clicked(bool check);
 };
 
 #endif // PRINTOPTIONS_H
diff --git a/qt-ui/printoptions.ui b/qt-ui/printoptions.ui
index 59a48b956..8ec1718af 100644
--- a/qt-ui/printoptions.ui
+++ b/qt-ui/printoptions.ui
@@ -30,7 +30,7 @@
      </property>
      <layout class="QGridLayout" name="gridLayout">
       <item row="0" column="0" colspan="2">
-       <widget class="QRadioButton" name="radioSixDives">
+       <widget class="QRadioButton" name="radioDiveListPrint">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
           <horstretch>0</horstretch>
@@ -38,7 +38,7 @@
          </sizepolicy>
         </property>
         <property name="text">
-         <string>&amp;6 dives per page</string>
+         <string>&amp;Dive list Print</string>
         </property>
         <property name="checked">
          <bool>true</bool>
@@ -46,32 +46,6 @@
        </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>&amp;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>&amp;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">
@@ -80,7 +54,20 @@
          </sizepolicy>
         </property>
         <property name="text">
-         <string>&amp;Table print</string>
+         <string>&amp;Table Print</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0" colspan="2">
+       <widget class="QRadioButton" name="radioStatisticsPrint">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string>&amp;Statistics Print</string>
         </property>
        </widget>
       </item>
@@ -136,40 +123,30 @@
     </widget>
    </item>
    <item>
-    <widget class="QGroupBox" name="ordering">
+    <widget class="QGroupBox" name="template_2">
      <property name="title">
-      <string>Ordering</string>
+      <string>Template</string>
      </property>
-     <layout class="QVBoxLayout" name="verticalLayout_2">
+     <layout class="QHBoxLayout" name="horizontalLayout">
       <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&amp;ile on top</string>
-        </property>
-        <property name="checked">
-         <bool>true</bool>
-        </property>
+       <widget class="QComboBox" name="printTemplate">
+        <item>
+         <property name="text">
+          <string>2 Dives per page</string>
+         </property>
+        </item>
        </widget>
       </item>
       <item>
-       <widget class="QRadioButton" name="notesOnTop">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
+       <widget class="QPushButton" name="editButton">
+        <property name="maximumSize">
+         <size>
+          <width>106</width>
+          <height>26</height>
+         </size>
         </property>
         <property name="text">
-         <string>&amp;Notes on top</string>
-        </property>
-        <property name="checked">
-         <bool>false</bool>
+         <string>Edit</string>
         </property>
        </widget>
       </item>
@@ -179,12 +156,10 @@
   </layout>
  </widget>
  <tabstops>
-  <tabstop>radioSixDives</tabstop>
-  <tabstop>radioTwoDives</tabstop>
+  <tabstop>radioDiveListPrint</tabstop>
+  <tabstop>radioStatisticsPrint</tabstop>
   <tabstop>printSelected</tabstop>
   <tabstop>printInColor</tabstop>
-  <tabstop>profileOnTop</tabstop>
-  <tabstop>notesOnTop</tabstop>
  </tabstops>
  <resources/>
  <connections/>