Merge branch 'new_panels' into locationlistview
authorJussi Laitinen <jupe@l3l7588.ixonos.local>
Wed, 11 Aug 2010 08:04:02 +0000 (11:04 +0300)
committerJussi Laitinen <jupe@l3l7588.ixonos.local>
Wed, 11 Aug 2010 08:04:02 +0000 (11:04 +0300)
Conflicts:
src/src.pro
src/ui/friendlistpanel.cpp
src/ui/friendlistpanel.h
src/ui/listcommon.h
src/ui/mainwindow.cpp

1  2 
src/src.pro
src/ui/friendlistpanel.cpp
src/ui/friendlistpanel.h
src/ui/listcommon.h
src/ui/mainwindow.h

diff --cc src/src.pro
@@@ -36,9 -45,11 +45,21 @@@ SOURCES += main.cpp 
      ui/updatelocation/texteditautoresizer.cpp \
      ui/updatelocation/updatelocationdialog.cpp \
      ui/avatarimage.cpp \
++    ui/extendedlistitem.cpp \
++    ui/extendedlistitemdelegate.cpp \
++    ui/extendedlistitemstore.cpp \
      ui/friendlistitem.cpp \
++    ui/friendlistitemdelegate.cpp \
      ui/friendlistpanel.cpp \
++    ui/friendlistview.cpp \
+     ui/fullscreenbutton.cpp \
      ui/imagebutton.cpp \
+     ui/indicatorbutton.cpp \
++    ui/listitem.cpp \
++    ui/listitemdelegate.cpp \
++    ui/listview.cpp \
++    ui/locationlistitem.cpp \
++    ui/locationlistview.cpp \
      ui/logindialog.cpp \
      ui/mainwindow.cpp \
      ui/mapscale.cpp \
      ui/userinfopanel.cpp \
      ui/zoombutton.cpp \
      ui/zoombuttonpanel.cpp \
-     user/user.cpp \
-     ui/fullscreenbutton.cpp \
-     engine/mce.cpp \
-     ui/indicatorbutton.cpp \
-     routing/routingservice.cpp \
-     routing/routesegment.cpp \
-     routing/route.cpp \
-     routing/location.cpp \
-     map/maprouteitem.cpp \
-     coordinates/scenecoordinate.cpp \
-     coordinates/geocoordinate.cpp \
--    ui/listview.cpp \
--    ui/listitem.cpp \
--    ui/listitemdelegate.cpp \
--    ui/friendlistitemdelegate.cpp \
      ui/searchdialog.cpp \
-     ui/locationlistitem.cpp \
-     ui/extendedlistitem.cpp \
-     ui/extendedlistitemstore.cpp \
-     ui/extendedlistitemdelegate.cpp \
-     ui/locationlistview.cpp \
-     ui/friendlistview.cpp \
-     routing/geocodingservice.cpp
+     ui/paneltab.cpp \
+     ui/tabbedpanel.cpp \
+     ui/panelbar.cpp \
+     ui/panelcontent.cpp \
+     ui/panelbase.cpp \
+     user/user.cpp
  HEADERS += application.h \
      common.h \
      engine/engine.h \
      ui/friendlistitemdelegate.h \
      ui/listcommon.h \
      ui/searchdialog.h \
 +    ui/locationlistitem.h \
 +    ui/extendedlistitem.h \
 +    ui/extendedlistitemstore.h \
 +    ui/extendedlistitemdelegate.h \
 +    ui/locationlistview.h \
 +    ui/friendlistview.h \
 +    error.h \
-     routing/geocodingservice.h
+     ui/paneltab.h \
+     ui/tabbedpanel.h \
+     ui/panelbar.h \
+     ui/panelcontent.h \
+     ui/panelbase.h
  QT += network \
      webkit
  
@@@ -52,37 -55,25 +55,22 @@@ FriendListPanel::FriendListPanel(QWidge
      m_friendListHeaderWidget->hide();
      m_friendListLabel = new QLabel(this);
      m_clearFilterButton = new QPushButton(tr("Show all"));
      filterLayout->addWidget(m_friendListLabel);
      filterLayout->addWidget(m_clearFilterButton);
-     m_panelVBox->addWidget(m_friendListHeaderWidget);
-     QVBoxLayout *friendListLayout =  new QVBoxLayout;
-     friendListLayout->setContentsMargins(FRIENDPANEL_MARGIN_LEFT, FRIENDPANEL_MARGIN_TOP,
-                                          FRIENDPANEL_MARGIN_RIGHT, FRIENDPANEL_MARGIN_BOTTOM);
  
 -    m_friendListView = new ListView(this);
 -
 -    m_friendListView->setAutoFillBackground(false);
 -    m_friendListView->viewport()->setAutoFillBackground(false);
 -    m_friendListItemDelegate = new FriendListItemDelegate();
 -    m_friendListView->setItemDelegate(m_friendListItemDelegate);
 +    m_friendListView = new FriendListView(this);
 +    m_friendListView->setItemDelegate(new FriendListItemDelegate(this));
-     //REMOVE
-     //m_friendListView->hide();
  
-     m_locationListView = new LocationListView(this);
-     m_locationListView->setItemDelegate(new ExtendedListItemDelegate(this));
-     //REMOVE
-     m_locationListView->hide();
-     friendListLayout->addWidget(m_friendListView);
-     //friendListLayout->addWidget(m_locationListView);
-     m_panelVBox->addLayout(friendListLayout);
+     friendListPanelLayout->addWidget(m_friendListHeaderWidget);
+     friendListPanelLayout->addWidget(m_friendListView);
  
 -    connect(m_friendListView, SIGNAL(listItemClicked(GeoCoordinate)),
 +    connect(m_friendListView, SIGNAL(friendItemClicked(GeoCoordinate)),
-             this, SIGNAL(friendItemClicked(GeoCoordinate)));
+             this, SIGNAL(findFriend(GeoCoordinate)));
  
      connect(m_clearFilterButton, SIGNAL(clicked()),
              this, SLOT(clearFriendListFilter()));
 +
-     connect(m_locationListView, SIGNAL(locationItemClicked(GeoCoordinate&,GeoCoordinate&)),
-             this, SIGNAL(locationItemClicked(GeoCoordinate&,GeoCoordinate&)));
      connect(this, SIGNAL(panelOpened()),
              this, SLOT(clearFriendListFilter()));
  }
@@@ -32,18 -31,19 +31,19 @@@ class QWidget
  
  class FriendListItemDelegate;
  class GeoCoordinate;
 -class ListView;
 +class FriendListView;
  class User;
- class Location;
- class LocationListView;
  
  /**
- * @brief Class for sliding friends list panel
- *
- * @author Kaj Wallin - kaj.wallin (at) ixonos.com
- * @class FriendListPanel friendlistpanel.h "ui/friendlistpanel.h"
- */
- class FriendListPanel : public SidePanel
+  * @brief Class for sliding friends list panel
+  *
+  * @author Kaj Wallin - kaj.wallin (at) ixonos.com
+  * @author Henri Lampela - henri.lampela (at) ixonos.com
+  * @author Pekka Nissinen - pekka.nissinen (at) ixonos.com
+  *
+  * @class FriendListPanel friendlistpanel.h "ui/friendlistpanel.h"
+  */
+ class FriendListPanel : public QWidget
  {
      Q_OBJECT
  
@@@ -117,13 -102,14 +102,13 @@@ signals
   * DATA MEMBERS
   ******************************************************************************/
  private:
+     QWidget *m_friendListHeaderWidget;  ///< Friend list header widget
      QLabel *m_friendListLabel;          ///< Friend list label
      QPushButton *m_clearFilterButton;   ///< Button to clear list filtering
-     QString m_friendListNameRegExp;     ///< Friend list name search regular expression
-     QWidget *m_friendListHeaderWidget;  ///< Friend list header widget
  
-     FriendListView *m_friendListView;         ///< Friend list view
-     LocationListView *m_locationListView;   ///< Location list view
 -    ListView *m_friendListView;                         ///< Friend list view
 -    FriendListItemDelegate *m_friendListItemDelegate;   ///< Friend list item delegate
++    FriendListView *m_friendListView;   ///< Friend list view
  };
  
  #endif // FRIENDLISTPANEL_H
@@@ -38,15 -38,14 +38,15 @@@ const int MARGIN = 5;           ///< Te
  *
  * @brief Name label's maximum width
  */
- const int NAME_TEXT_MAX_WIDTH = ITEM_WIDTH - 3*MARGIN - IMAGE_WIDTH;
 -const int NAME_LABEL_MAX_WIDTH = ITEM_WIDTH - 3 * MARGIN - IMAGE_WIDTH;
++const int NAME_TEXT_MAX_WIDTH = ITEM_WIDTH - 3 * MARGIN - IMAGE_WIDTH;
  
  /**
 -* @var LABEL_MAX_WIDTH
 +* @var SUBITEM_TEXT_MAX_WIDTH
  *
  * @brief All label's maximum width
  */
 -const int LABEL_MAX_WIDTH = ITEM_WIDTH - 3 * MARGIN - IMAGE_WIDTH - MARGIN - ICON_WIDTH - MARGIN * 2;
 +const int SUBITEM_TEXT_MAX_WIDTH = ITEM_WIDTH - 3 * MARGIN - IMAGE_WIDTH - MARGIN - ICON_WIDTH
-                                    - MARGIN*2;
++                                   - MARGIN * 2;
  
  const int NAME_DISPLAY_INDEX = Qt::DisplayRole;
  const int AVATAR_IMAGE_INDEX = Qt::DecorationRole;
@@@ -52,9 -52,7 +52,8 @@@ class SituareService
  class User;
  class UserInfoPanel;
  class ZoomButtonPanel;
 +class Location;
  
  /**
  * @brief Main Window Class
  */