diff -r 6aeb7a756187 -r 3c88a81ff781 ginebra2/ViewController.cpp --- a/ginebra2/ViewController.cpp Thu Sep 23 15:32:11 2010 -0400 +++ b/ginebra2/ViewController.cpp Fri Oct 15 17:30:59 2010 -0400 @@ -86,7 +86,7 @@ view->deactivate(); } } - emit currentViewChanged(); + emit currentViewChanged(currentView); } } @@ -119,16 +119,18 @@ } } - void ViewController::viewChanged() { - emit currentViewChanged(); - } - + ControllableViewBase* ViewController::currentView() { if (!m_viewMap.isEmpty()) return m_current.value(); else return NULL; } - + const QString & ViewController::currentViewName() { + if (!m_viewMap.isEmpty()) + return m_current.key(); + else + return QString(); + } }