mirror of
				https://github.com/subsurface/subsurface.git
				synced 2025-02-19 22:16:15 +00:00 
			
		
		
		
	mapwidget: add an empty reload() method
Call same method in MainWindow if the NO_MARBLE macro is defined. Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
This commit is contained in:
		
							parent
							
								
									86f4a26a83
								
							
						
					
					
						commit
						39af5bb05b
					
				
					 3 changed files with 22 additions and 0 deletions
				
			
		|  | @ -216,7 +216,11 @@ MainWindow::MainWindow() : QMainWindow(), | |||
| 	diveListView->reload(DiveTripModel::TREE); | ||||
| 	diveListView->reloadHeaderActions(); | ||||
| 	diveListView->setFocus(); | ||||
| #ifndef NO_MARBLE | ||||
| 	GlobeGPS::instance()->reload(); | ||||
| #else | ||||
| 	MapWidget::instance()->reload(); | ||||
| #endif | ||||
| 	diveListView->expand(dive_list()->model()->index(0, 0)); | ||||
| 	diveListView->scrollTo(dive_list()->model()->index(0, 0), QAbstractItemView::PositionAtCenter); | ||||
| 	divePlannerWidget()->settingsChanged(); | ||||
|  | @ -425,7 +429,11 @@ void MainWindow::refreshDisplay(bool doRecreateDiveList) | |||
| 	getNotificationWidget()->showNotification(get_error_string(), KMessageWidget::Error); | ||||
| 	information()->reload(); | ||||
| 	TankInfoModel::instance()->update(); | ||||
| #ifndef NO_MARBLE | ||||
| 	GlobeGPS::instance()->reload(); | ||||
| #else | ||||
| 	MapWidget::instance()->reload(); | ||||
| #endif | ||||
| 	if (doRecreateDiveList) | ||||
| 		recreateDiveList(); | ||||
| 
 | ||||
|  | @ -496,7 +504,11 @@ void MainWindow::current_dive_changed(int divenr) | |||
| 	graphics()->plotDive(); | ||||
| 	information()->updateDiveInfo(); | ||||
| 	configureToolbar(); | ||||
| #ifndef NO_MARBLE | ||||
| 	GlobeGPS::instance()->reload(); | ||||
| #else | ||||
| 	MapWidget::instance()->reload(); | ||||
| #endif | ||||
| } | ||||
| 
 | ||||
| void MainWindow::on_actionNew_triggered() | ||||
|  | @ -652,7 +664,11 @@ void MainWindow::cleanUpEmpty() | |||
| 	information()->updateDiveInfo(true); | ||||
| 	graphics()->setEmptyState(); | ||||
| 	dive_list()->reload(DiveTripModel::TREE); | ||||
| #ifndef NO_MARBLE | ||||
| 	GlobeGPS::instance()->reload(); | ||||
| #else | ||||
| 	MapWidget::instance()->reload(); | ||||
| #endif | ||||
| 	if (!existing_filename) | ||||
| 		setTitle(MWTF_DEFAULT); | ||||
| 	disableShortcuts(); | ||||
|  |  | |||
|  | @ -27,6 +27,11 @@ void MapWidget::centerOnDiveSite(struct dive_site *ds) | |||
| 	qDebug() << longitude << latitude; | ||||
| } | ||||
| 
 | ||||
| void MapWidget::reload() | ||||
| { | ||||
| 	// TODO;
 | ||||
| } | ||||
| 
 | ||||
| MapWidget::~MapWidget() | ||||
| { | ||||
| 	m_instance = NULL; | ||||
|  |  | |||
|  | @ -18,6 +18,7 @@ public: | |||
| 	~MapWidget(); | ||||
| 
 | ||||
| 	static MapWidget *instance(); | ||||
| 	void reload(); | ||||
| 
 | ||||
| public slots: | ||||
| 	void centerOnDiveSite(struct dive_site *); | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue