Merge branch 'new_panels' of https://vcs.maemo.org/git/situare into new_panels

diff --cc src/ui/tabbedpanel.cpp
index e753c68,f534a86..89c979c
--- 1/src/ui/tabbedpanel.cpp
--- 2/src/ui/tabbedpanel.cpp
+++ b/src/ui/tabbedpanel.cpp
@@@ -142,12 -147,10 +146,13 @@@ void TabbedPanel::setCurrentIndex(int i
  {
      qDebug() << __PRETTY_FUNCTION__;
  
+ ///< @todo if ((first) && (second)) {
      if (index < m_panelWidgetStack->count() && index >= 0) {
          m_panelWidgetStack->setCurrentIndex(index);
 -        openPanel();
 +
 +        if(!m_isOpen)
 +            emit toggleState();
 +
          emit currentChanged(index);
      }
  }

diff --cc src/ui/tabbedpanel.h
Simple merge