Move the Profile out of the mainwindow.ui

And place it in mainwindow.cpp

Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

4 files changed, 17 insertions, 104 deletions

diff --git a/qt-ui/diveplanner.h b/qt-ui/diveplanner.h
index 49fd43ff6..196e17546 100644
--- a/qt-ui/diveplanner.h
+++ b/qt-ui/diveplanner.h
@@ -192,6 +192,9 @@ class PlannerDetails : public QWidget {
 	Q_OBJECT
 public:
 	explicit PlannerDetails(QWidget *parent = 0);
+	QPushButton *printPlan() const { return ui.printPlan; }
+	QTextEdit *divePlanOutput() const { return ui.divePlanOutput; }
+
 private:
 	Ui::plannerDetails ui;
 };
diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp
index 9caa5d3c3..a6a8cdeca 100644
--- a/qt-ui/mainwindow.cpp
+++ b/qt-ui/mainwindow.cpp
@@ -67,6 +67,7 @@ MainWindow::MainWindow() : QMainWindow(),
 	registerApplicationState("EditDive", mainTab, diveListView, profileWidget, globeGps );
 	registerApplicationState("PlanDive", plannerWidget, plannerSettings, profileWidget, plannerDetails );
 	registerApplicationState("EditPlannedDive", plannerWidget, diveListView, profileWidget, globeGps );
+	setApplicationState("Default");
 
 	ui.multiFilter->hide();
 	// what is a sane order for those icons? we should have the ones the user is
@@ -100,7 +101,7 @@ MainWindow::MainWindow() : QMainWindow(),
 	connect(information(), SIGNAL(addDiveFinished()), graphics(), SLOT(setProfileState()));
 	connect(DivePlannerPointsModel::instance(), SIGNAL(planCreated()), this, SLOT(planCreated()));
 	connect(DivePlannerPointsModel::instance(), SIGNAL(planCanceled()), this, SLOT(planCanceled()));
-	connect(ui.printPlan, SIGNAL(pressed()), divePlannerWidget(), SLOT(printDecoPlan()));
+	connect(plannerDetails->printPlan(), SIGNAL(pressed()), divePlannerWidget(), SLOT(printDecoPlan()));
 	connect(ui.menu_Edit, SIGNAL(aboutToShow()), this, SLOT(checkForUndoAndRedo()));
 #ifdef NO_PRINTING
 	ui.printPlan->hide();
@@ -176,7 +177,6 @@ MainWindow::MainWindow() : QMainWindow(),
 
 	updateManager = new UpdateManager(this);
 	undoBuffer = new UndoBuffer(this);
-	setApplicationState("Default");
 }
 
 MainWindow::~MainWindow()
@@ -184,6 +184,10 @@ MainWindow::~MainWindow()
 	m_Instance = NULL;
 }
 
+PlannerDetails *MainWindow::plannerDetails() const {
+	return qobject_cast<PlannerDetails*>(applicationState["PlanDive"].bottomRight);
+}
+
 void MainWindow::setLoadedWithFiles(bool f)
 {
 	filesAsArguments = f;
@@ -212,7 +216,8 @@ void MainWindow::refreshDisplay(bool doRecreateDiveList)
 #ifdef NO_MARBLE
 	ui.globePane->hide();
 #endif
-	ui.globePane->setCurrentIndex(0);
+
+	setApplicationState("Default");
 	dive_list()->setEnabled(true);
 	dive_list()->setFocus();
 	WSInfoModel::instance()->updateInfo();
@@ -483,13 +488,13 @@ void MainWindow::planCreated()
 
 void MainWindow::setPlanNotes(const char *notes)
 {
-	ui.divePlanOutput->setHtml(notes);
+	plannerDetails()->divePlanOutput()->setHtml(notes);
 }
 
 void MainWindow::printPlan()
 {
 #ifndef NO_PRINTING
-	QString diveplan = ui.divePlanOutput->toHtml();
+	QString diveplan = plannerDetails()->divePlanOutput()->toHtml();
 	QString withDisclaimer = QString("<img height=50 src=\":subsurface-icon\"> ") + diveplan + QString(disclaimer);
 
 	QPrinter printer;
@@ -498,9 +503,9 @@ void MainWindow::printPlan()
 	if (dialog->exec() != QDialog::Accepted)
 		return;
 
-	ui.divePlanOutput->setHtml(withDisclaimer);
-	ui.divePlanOutput->print(&printer);
-	ui.divePlanOutput->setHtml(diveplan);
+	plannerDetails()->divePlanOutput()->setHtml(withDisclaimer);
+	plannerDetails()->divePlanOutput()->print(&printer);
+	plannerDetails()->divePlanOutput()->setHtml(diveplan);
 #endif
 }
 
@@ -534,8 +539,6 @@ void MainWindow::on_actionReplanDive_triggered()
 	divePlannerWidget()->setReplanButton(true);
 	DivePlannerPointsModel::instance()->loadFromDive(current_dive);
 	reset_cylinders(&displayed_dive, true);
-	ui.diveListPane->setCurrentIndex(1); // switch to the plan output
-	ui.globePane->setCurrentIndex(1);
 #ifdef NO_MARBLE
 	ui.globePane->show();
 #endif
@@ -559,8 +562,6 @@ void MainWindow::on_actionDivePlanner_triggered()
 	DivePictureModel::instance()->updateDivePictures();
 	divePlannerWidget()->setReplanButton(false);
 
-	ui.diveListPane->setCurrentIndex(1); // switch to the plan output
-	ui.globePane->setCurrentIndex(1);
 #ifdef NO_MARBLE
 	ui.globePane->show();
 #endif
diff --git a/qt-ui/mainwindow.h b/qt-ui/mainwindow.h
index 0bb024079..2af7f9c9b 100644
--- a/qt-ui/mainwindow.h
+++ b/qt-ui/mainwindow.h
@@ -81,6 +81,7 @@ public:
 	void cleanUpEmpty();
 	void setToolButtonsEnabled(bool enabled);
 	ProfileWidget2 *graphics() const;
+	PlannerDetails *plannerDetails() const;
 	void setLoadedWithFiles(bool filesFromCommandLine);
 	bool filesFromCommandLine() const;
 	void setPlanNotes(const char *notes);
diff --git a/qt-ui/mainwindow.ui b/qt-ui/mainwindow.ui
index 4bc74f20c..b4be5b7d9 100644
--- a/qt-ui/mainwindow.ui
+++ b/qt-ui/mainwindow.ui
@@ -41,98 +41,6 @@
         </widget>
         <widget class="PlannerSettingsWidget" name="plannerSettingsWidget"/>
        </widget>
-       <widget class="QStackedWidget" name="globePane">
-        <property name="currentIndex">
-         <number>0</number>
-        </property>
-        <widget class="QWidget" name="stackedWidgetPage1">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <layout class="QVBoxLayout" name="globeLayout"/>
-        </widget>
-        <widget class="QWidget" name="page_5">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <layout class="QVBoxLayout" name="verticalLayout_3">
-          <item>
-           <layout class="QHBoxLayout" name="divePlanLayout">
-            <item>
-             <widget class="QLabel" name="divePlanOutputLabel">
-              <property name="maximumSize">
-               <size>
-                <width>16777215</width>
-                <height>20</height>
-               </size>
-              </property>
-              <property name="text">
-               <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Dive plan details&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-              </property>
-              <property name="textFormat">
-               <enum>Qt::RichText</enum>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QPushButton" name="printPlan">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-              <property name="text">
-               <string>Print</string>
-              </property>
-              <property name="autoDefault">
-               <bool>false</bool>
-              </property>
-              <property name="default">
-               <bool>false</bool>
-              </property>
-              <property name="flat">
-               <bool>false</bool>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </item>
-          <item>
-           <widget class="QTextEdit" name="divePlanOutput">
-            <property name="enabled">
-             <bool>true</bool>
-            </property>
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="styleSheet">
-             <string notr="true">font: 13pt &quot;Courier&quot;;</string>
-            </property>
-            <property name="readOnly">
-             <bool>true</bool>
-            </property>
-            <property name="html">
-             <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Courier'; font-size:13pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'.Curier New';&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </widget>
       </widget>
      </widget>
     </item>