mirror of
				https://github.com/subsurface/subsurface.git
				synced 2025-02-19 22:16:15 +00:00 
			
		
		
		
	Added back the menu entry 'Dive Planner'
Added back the menu entry Dive Planner, and removed the calee code from the Print action. Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
This commit is contained in:
		
							parent
							
								
									fdd8a4811b
								
							
						
					
					
						commit
						062515ba6f
					
				
					 3 changed files with 19 additions and 3 deletions
				
			
		|  | @ -179,11 +179,19 @@ void MainWindow::on_actionExportUDDF_triggered() | ||||||
| 
 | 
 | ||||||
| void MainWindow::on_actionPrint_triggered() | void MainWindow::on_actionPrint_triggered() | ||||||
| { | { | ||||||
| 	// hijacking the print action for a while.
 |  | ||||||
| 	DivePlanner::instance()->show(); |  | ||||||
| 	qDebug("actionPrint"); | 	qDebug("actionPrint"); | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
|  | void MainWindow::on_actionDivePlanner_triggered() | ||||||
|  | { | ||||||
|  | 	DivePlanner *planner = DivePlanner::instance(); | ||||||
|  | 	if (planner->exec() == QDialog::Accepted){ | ||||||
|  | 		struct dive *d = planner->getDive(); | ||||||
|  | 		qDebug() << "Finish me."; | ||||||
|  | 	} | ||||||
|  | } | ||||||
|  | 
 | ||||||
|  | 
 | ||||||
| void MainWindow::on_actionPreferences_triggered() | void MainWindow::on_actionPreferences_triggered() | ||||||
| { | { | ||||||
| 	PreferencesDialog::instance()->show(); | 	PreferencesDialog::instance()->show(); | ||||||
|  |  | ||||||
|  | @ -83,6 +83,7 @@ private slots: | ||||||
| 	void on_actionInputPlan_triggered(); | 	void on_actionInputPlan_triggered(); | ||||||
| 	void on_actionAboutSubsurface_triggered(); | 	void on_actionAboutSubsurface_triggered(); | ||||||
| 	void on_actionUserManual_triggered(); | 	void on_actionUserManual_triggered(); | ||||||
|  | 	void on_actionDivePlanner_triggered(); | ||||||
| 
 | 
 | ||||||
| 	void current_dive_changed(int divenr); | 	void current_dive_changed(int divenr); | ||||||
| 	void initialUiSetup(); | 	void initialUiSetup(); | ||||||
|  |  | ||||||
|  | @ -103,7 +103,7 @@ | ||||||
|      <x>0</x> |      <x>0</x> | ||||||
|      <y>0</y> |      <y>0</y> | ||||||
|      <width>763</width> |      <width>763</width> | ||||||
|      <height>34</height> |      <height>20</height> | ||||||
|     </rect> |     </rect> | ||||||
|    </property> |    </property> | ||||||
|    <widget class="QMenu" name="menuFile"> |    <widget class="QMenu" name="menuFile"> | ||||||
|  | @ -152,6 +152,8 @@ | ||||||
|     <addaction name="separator"/> |     <addaction name="separator"/> | ||||||
|     <addaction name="actionPreviousDC"/> |     <addaction name="actionPreviousDC"/> | ||||||
|     <addaction name="actionNextDC"/> |     <addaction name="actionNextDC"/> | ||||||
|  |     <addaction name="separator"/> | ||||||
|  |     <addaction name="actionDivePlanner"/> | ||||||
|    </widget> |    </widget> | ||||||
|    <widget class="QMenu" name="menuFilter"> |    <widget class="QMenu" name="menuFilter"> | ||||||
|     <property name="title"> |     <property name="title"> | ||||||
|  | @ -368,6 +370,11 @@ | ||||||
|     <string>Ctrl+4</string> |     <string>Ctrl+4</string> | ||||||
|    </property> |    </property> | ||||||
|   </action> |   </action> | ||||||
|  |   <action name="actionDivePlanner"> | ||||||
|  |    <property name="text"> | ||||||
|  |     <string>Dive Planner</string> | ||||||
|  |    </property> | ||||||
|  |   </action> | ||||||
|  </widget> |  </widget> | ||||||
|  <customwidgets> |  <customwidgets> | ||||||
|   <customwidget> |   <customwidget> | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue