Merge branch 'master' into new_panels

Conflicts:
	src/src.pro
	src/ui/indicatorbutton.cpp
	src/ui/mainwindow.cpp
	src/ui/panelcommon.h

diff --cc src/src.pro
index 7f98fd5,16b9a21..c880fed
--- 1/src/src.pro
--- 2/src/src.pro
+++ b/src/src.pro
@@@ -47,9 -38,7 +47,10 @@@ SOURCES += main.cpp 
      ui/avatarimage.cpp \
      ui/friendlistitem.cpp \
      ui/friendlistpanel.cpp \
 +    ui/fullscreenbutton.cpp \
      ui/imagebutton.cpp \
 +    ui/indicatorbutton.cpp \
++    ui/indicatorbuttonpanel.cpp \
      ui/logindialog.cpp \
      ui/mainwindow.cpp \
      ui/mapscale.cpp \
@@@ -118,7 -121,6 +119,8 @@@ HEADERS += application.h 
      ui/fullscreenbutton.h \
      engine/mce.h \
      ui/indicatorbutton.h \
++    ui/indicatorbuttonpanel.h \
 +    routing/geocodingservice.h \
      routing/routingservice.h \
      routing/routingcommon.h \
      routing/routesegment.h \

diff --cc src/ui/indicatorbutton.cpp
index 2082dd4,e392bef..efd28e8
--- 1/src/ui/indicatorbutton.cpp
--- 2/src/ui/indicatorbutton.cpp
+++ b/src/ui/indicatorbutton.cpp
@@@ -1,23 -1,24 +1,24 @@@
  /*
 -   Situare - A location system for Facebook
 -   Copyright (C) 2010  Ixonos Plc. Authors:
 -
 -       Katri Kaikkonen - katri.kaikkonen@ixonos.com
 -       Kaj Wallin - kaj.wallin@ixonos.com
 -       Sami Rämö - sami.ramo@ixonos.com
 -
 -   Situare is free software; you can redistribute it and/or
 -   modify it under the terms of the GNU General Public License
 -   version 2 as published by the Free Software Foundation.
 -
 -   Situare is distributed in the hope that it will be useful,
 -   but WITHOUT ANY WARRANTY; without even the implied warranty of
 -   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 -   GNU General Public License for more details.
 -
 -   You should have received a copy of the GNU General Public License
 -   along with Situare; if not, write to the Free Software
 -   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
 -   USA.
 +    Situare - A location system for Facebook
 +    Copyright (C) 2010  Ixonos Plc. Authors:
 +
 +        Kaj Wallin - kaj.wallin@ixonos.com
 +        Katri Kaikkonen - katri.kaikkonen@ixonos.com
++        Sami Rämö - sami.ramo@ixonos.com
 +
 +    Situare is free software; you can redistribute it and/or
 +    modify it under the terms of the GNU General Public License
 +    version 2 as published by the Free Software Foundation.
 +
 +    Situare is distributed in the hope that it will be useful,
 +    but WITHOUT ANY WARRANTY; without even the implied warranty of
 +    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 +    GNU General Public License for more details.
 +
 +    You should have received a copy of the GNU General Public License
 +    along with Situare; if not, write to the Free Software
 +    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
 +    USA.
  */
  
  #include <QDebug>

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

diff --cc src/ui/mainwindow.cpp
index a32659e,dce7243..446e952
--- 1/src/ui/mainwindow.cpp
--- 2/src/ui/mainwindow.cpp
+++ b/src/ui/mainwindow.cpp
@@@ -4,9 -4,10 +4,10 @@@
  
        Henri Lampela - henri.lampela@ixonos.com
        Kaj Wallin - kaj.wallin@ixonos.com
 -      Jussi Laitinen jussi.laitinen@ixonos.com
 +      Jussi Laitinen - jussi.laitinen@ixonos.com
        Sami Rämö - sami.ramo@ixonos.com
        Ville Tiensuu - ville.tiensuu@ixonos.com
+       Katri Kaikkonen - katri.kaikkonen@ixonos.com
  
     Situare is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License
@@@ -34,11 -35,8 +35,10 @@@
  #include "error.h"
  #include "friendlistpanel.h"
  #include "fullscreenbutton.h"
- #include "indicatorbutton.h"
  #include "logindialog.h"
  #include "mapscale.h"
 +#include "panelcommon.h"
 +#include "tabbedpanel.h"
  #include "searchdialog.h"
  #include "settingsdialog.h"
  #include "userinfopanel.h"

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

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