moved PanelManager to a more traditional singleton form

app/window/mainwindow/mainmenu.cpp

@@ -198,7 +198,7 @@ MainMenu::MainMenu(QMainWindow *parent) :
   connect(window_menu_, SIGNAL(aboutToHide()), this, SLOT(WindowMenuAboutToHide()));
   window_menu_separator_ = window_menu_->addSeparator();
   window_maximize_panel_item_ = window_menu_->AddItem("maximizepanel", parent, SLOT(ToggleMaximizedPanel()), "`");
-  window_lock_layout_item_ = window_menu_->AddItem("lockpanels", olive::panel_manager, SLOT(SetPanelsLocked(bool)));
+  window_lock_layout_item_ = window_menu_->AddItem("lockpanels", PanelManager::instance(), SLOT(SetPanelsLocked(bool)));
   window_lock_layout_item_->setCheckable(true);
   window_menu_->addSeparator();
   window_reset_layout_item_ = window_menu_->AddItem("resetdefaultlayout", nullptr, nullptr);
@@ -368,7 +368,7 @@ void MainMenu::WindowMenuAboutToShow()
 
   window_menu_->insertActions(window_menu_separator_, panel_menu_actions);
 
-  window_lock_layout_item_->setChecked(olive::panel_manager->ArePanelsLocked());
+  window_lock_layout_item_->setChecked(PanelManager::instance()->ArePanelsLocked());
 }
 
 void MainMenu::WindowMenuAboutToHide()
@@ -380,67 +380,67 @@ void MainMenu::WindowMenuAboutToHide()
 
 void MainMenu::ZoomInTriggered()
 {
-  olive::panel_manager->CurrentlyFocused()->ZoomIn();
+  PanelManager::instance()->CurrentlyFocused()->ZoomIn();
 }
 
 void MainMenu::ZoomOutTriggered()
 {
-  olive::panel_manager->CurrentlyFocused()->ZoomOut();
+  PanelManager::instance()->CurrentlyFocused()->ZoomOut();
 }
 
 void MainMenu::GoToStartTriggered()
 {
-  olive::panel_manager->CurrentlyFocused()->GoToStart();
+  PanelManager::instance()->CurrentlyFocused()->GoToStart();
 }
 
 void MainMenu::PrevFrameTriggered()
 {
-  olive::panel_manager->CurrentlyFocused()->PrevFrame();
+  PanelManager::instance()->CurrentlyFocused()->PrevFrame();
 }
 
 void MainMenu::PlayPauseTriggered()
 {
-  olive::panel_manager->CurrentlyFocused()->PlayPause();
+  PanelManager::instance()->CurrentlyFocused()->PlayPause();
 }
 
 void MainMenu::NextFrameTriggered()
 {
-  olive::panel_manager->CurrentlyFocused()->NextFrame();
+  PanelManager::instance()->CurrentlyFocused()->NextFrame();
 }
 
 void MainMenu::GoToEndTriggered()
 {
-  olive::panel_manager->CurrentlyFocused()->GoToEnd();
+  PanelManager::instance()->CurrentlyFocused()->GoToEnd();
 }
 
 void MainMenu::SelectAllTriggered()
 {
-  olive::panel_manager->CurrentlyFocused()->SelectAll();
+  PanelManager::instance()->CurrentlyFocused()->SelectAll();
 }
 
 void MainMenu::DeselectAllTriggered()
 {
-  olive::panel_manager->CurrentlyFocused()->DeselectAll();
+  PanelManager::instance()->CurrentlyFocused()->DeselectAll();
 }
 
 void MainMenu::RippleToInTriggered()
 {
-  olive::panel_manager->CurrentlyFocused()->RippleToIn();
+  PanelManager::instance()->CurrentlyFocused()->RippleToIn();
 }
 
 void MainMenu::RippleToOutTriggered()
 {
-  olive::panel_manager->CurrentlyFocused()->RippleToOut();
+  PanelManager::instance()->CurrentlyFocused()->RippleToOut();
 }
 
 void MainMenu::EditToInTriggered()
 {
-  olive::panel_manager->CurrentlyFocused()->EditToIn();
+  PanelManager::instance()->CurrentlyFocused()->EditToIn();
 }
 
 void MainMenu::EditToOutTriggered()
 {
-  olive::panel_manager->CurrentlyFocused()->EditToOut();
+  PanelManager::instance()->CurrentlyFocused()->EditToOut();
 }
 
 void MainMenu::ActionSearchTriggered()
@@ -452,27 +452,27 @@ void MainMenu::ActionSearchTriggered()
 
 void MainMenu::ShuttleLeftTriggered()
 {
-  olive::panel_manager->CurrentlyFocused()->ShuttleLeft();
+  PanelManager::instance()->CurrentlyFocused()->ShuttleLeft();
 }
 
 void MainMenu::ShuttleStopTriggered()
 {
-  olive::panel_manager->CurrentlyFocused()->ShuttleStop();
+  PanelManager::instance()->CurrentlyFocused()->ShuttleStop();
 }
 
 void MainMenu::ShuttleRightTriggered()
 {
-  olive::panel_manager->CurrentlyFocused()->ShuttleRight();
+  PanelManager::instance()->CurrentlyFocused()->ShuttleRight();
 }
 
 void MainMenu::GoToPrevCutTriggered()
 {
-  olive::panel_manager->CurrentlyFocused()->GoToPrevCut();
+  PanelManager::instance()->CurrentlyFocused()->GoToPrevCut();
 }
 
 void MainMenu::GoToNextCutTriggered()
 {
-  olive::panel_manager->CurrentlyFocused()->GoToNextCut();
+  PanelManager::instance()->CurrentlyFocused()->GoToNextCut();
 }
 
 void MainMenu::Retranslate()

app/window/mainwindow/mainwindow.cpp

@@ -79,7 +79,7 @@ void olive::MainWindow::ToggleMaximizedPanel()
     // Assume nothing is maximized at the moment
 
     // Find the currently focused panel
-    PanelWidget* currently_hovered = olive::panel_manager->CurrentlyHovered();
+    PanelWidget* currently_hovered = PanelManager::instance()->CurrentlyHovered();
 
     // If no panel is hovered, do nothing
     if (currently_hovered == nullptr) {
@@ -95,7 +95,7 @@ void olive::MainWindow::ToggleMaximizedPanel()
     premaximized_state_ = saveState();
 
     // For every other panel that is on the main window, hide it
-    foreach (PanelWidget* panel, olive::panel_manager->panels()) {
+    foreach (PanelWidget* panel, PanelManager::instance()->panels()) {
       if (!panel->isFloating() && panel != currently_hovered) {
         panel->setVisible(false);
       }
@@ -110,29 +110,29 @@ void olive::MainWindow::ToggleMaximizedPanel()
 void olive::MainWindow::ProjectOpen(Project* p)
 {
   // FIXME Use settings data to create panels and restore state if they exist
-  NodePanel* node_panel = olive::panel_manager->CreatePanel<NodePanel>(this);
+  NodePanel* node_panel = PanelManager::instance()->CreatePanel<NodePanel>(this);
   addDockWidget(Qt::TopDockWidgetArea, node_panel);
 
-  ParamPanel* param_panel = olive::panel_manager->CreatePanel<ParamPanel>(this);
+  ParamPanel* param_panel = PanelManager::instance()->CreatePanel<ParamPanel>(this);
   addDockWidget(Qt::TopDockWidgetArea, param_panel);
 
-  ViewerPanel* viewer_panel2 = olive::panel_manager->CreatePanel<ViewerPanel>(this);
+  ViewerPanel* viewer_panel2 = PanelManager::instance()->CreatePanel<ViewerPanel>(this);
   addDockWidget(Qt::TopDockWidgetArea, viewer_panel2);
 
-  ProjectPanel* project_panel = olive::panel_manager->CreatePanel<ProjectPanel>(this);
+  ProjectPanel* project_panel = PanelManager::instance()->CreatePanel<ProjectPanel>(this);
   project_panel->set_project(p);
   addDockWidget(Qt::BottomDockWidgetArea, project_panel);
 
-  ToolPanel* tool_panel = olive::panel_manager->CreatePanel<ToolPanel>(this);
+  ToolPanel* tool_panel = PanelManager::instance()->CreatePanel<ToolPanel>(this);
   addDockWidget(Qt::BottomDockWidgetArea, tool_panel);
 
-  TimelinePanel* timeline_panel = olive::panel_manager->CreatePanel<TimelinePanel>(this);
+  TimelinePanel* timeline_panel = PanelManager::instance()->CreatePanel<TimelinePanel>(this);
   addDockWidget(Qt::BottomDockWidgetArea, timeline_panel);
 
-  AudioMonitorPanel* audio_monitor_panel = olive::panel_manager->CreatePanel<AudioMonitorPanel>(this);
+  AudioMonitorPanel* audio_monitor_panel = PanelManager::instance()->CreatePanel<AudioMonitorPanel>(this);
   addDockWidget(Qt::BottomDockWidgetArea, audio_monitor_panel);
 
-  TaskManagerPanel* task_man_panel = olive::panel_manager->CreatePanel<TaskManagerPanel>(this);
+  TaskManagerPanel* task_man_panel = PanelManager::instance()->CreatePanel<TaskManagerPanel>(this);
   addDockWidget(Qt::BottomDockWidgetArea, task_man_panel);
   task_man_panel->setFloating(true);
   task_man_panel->setVisible(false);
@@ -147,7 +147,7 @@ void olive::MainWindow::ProjectOpen(Project* p)
 
 void olive::MainWindow::closeEvent(QCloseEvent *e)
 {
-  olive::panel_manager->DeleteAllPanels();
+  PanelManager::instance()->DeleteAllPanels();
 
   // FIXME: Test code - We have no cache management and the cache is very much testing only, so we delete it on close
   //                    as to not clog up HDD space