equal
deleted
inserted
replaced
84 if(currentView->widget() != view->widget()) |
84 if(currentView->widget() != view->widget()) |
85 view->hide(); |
85 view->hide(); |
86 view->deactivate(); |
86 view->deactivate(); |
87 } |
87 } |
88 } |
88 } |
89 emit currentViewChanged(); |
89 emit currentViewChanged(currentView); |
90 } |
90 } |
91 } |
91 } |
92 |
92 |
93 void ViewController::showView(const QString &name) { |
93 void ViewController::showView(const QString &name) { |
94 ViewMap::iterator it = m_viewMap.find(name); |
94 ViewMap::iterator it = m_viewMap.find(name); |
117 foreach(ControllableViewBase *view, m_viewMap) { |
117 foreach(ControllableViewBase *view, m_viewMap) { |
118 qDebug() << " " << view; |
118 qDebug() << " " << view; |
119 } |
119 } |
120 } |
120 } |
121 |
121 |
122 void ViewController::viewChanged() { |
122 |
123 emit currentViewChanged(); |
|
124 } |
|
125 |
|
126 ControllableViewBase* ViewController::currentView() { |
123 ControllableViewBase* ViewController::currentView() { |
127 if (!m_viewMap.isEmpty()) |
124 if (!m_viewMap.isEmpty()) |
128 return m_current.value(); |
125 return m_current.value(); |
129 else |
126 else |
130 return NULL; |
127 return NULL; |
131 } |
128 } |
132 |
129 const QString & ViewController::currentViewName() { |
|
130 if (!m_viewMap.isEmpty()) |
|
131 return m_current.key(); |
|
132 else |
|
133 return QString(); |
|
134 } |
133 } |
135 } |
134 |
136 |