From: Sami Rämö <sami.ramo@ixonos.com>
Date: Wed, 25 Aug 2010 10:46:00 +0000 (+0300)
Subject: Merge branch 'new_panels_with_context_buttons' of https://vcs.maemo.org/git/situare... 
X-Git-Tag: v2.0b-1~41
X-Git-Url: https://vcs.maemo.org/git/?p=situare;a=commitdiff_plain;h=a54dbda414ce507bdcf8f9dd7515dfd4b280975e

Merge branch 'new_panels_with_context_buttons' of https://vcs.maemo.org/git/situare into move_buttons_to_content_area
---

a54dbda414ce507bdcf8f9dd7515dfd4b280975e
diff --cc src/ui/friendlistpanel.cpp
index 19f3136,fe7acfa..92d656f
--- a/src/ui/friendlistpanel.cpp
+++ b/src/ui/friendlistpanel.cpp
@@@ -136,10 -130,6 +136,10 @@@ FriendListPanel::FriendListPanel(QWidge
  
      connect(qApp, SIGNAL(topmostWindowChanged(bool)),
              this, SLOT(topmostWindowChanged(bool)));
 +
 +    // CONTEXT BUTTONS
-     m_contextButtonLayout->addWidget(m_routeButton, 0, 0);
-     m_contextButtonLayout->addWidget(m_clearGroupFilteringButton, 1, 0);
++    m_contextButtonLayout->addWidget(m_routeButton);
++    m_contextButtonLayout->addWidget(m_clearGroupFilteringButton);
  }
  
  void FriendListPanel::anyPanelClosed()
diff --cc src/ui/routingpanel.cpp
index 9662506,b292e09..7b7f132
--- a/src/ui/routingpanel.cpp
+++ b/src/ui/routingpanel.cpp
@@@ -33,11 -33,11 +33,11 @@@ RoutingPanel::RoutingPanel(QWidget *par
                                                          ":/res/images/search_s.png",
                                                          "", this);
  
-     m_contextButtonLayout->addWidget(searchLocationButton, 0, 0);
+     m_contextButtonLayout->addWidget(searchLocationButton);
  
 -    m_routeButton = new QPushButton(tr("Route to location"));
 +    m_routeButton = new ImageButton(":res/images/route_to_location.png",
 +                                    ":res/images/route_to_location_s.png", "", this);
      m_routeButton->setDisabled(true);
 -    m_routeButton->hide();
  
      m_locationListHeaderWidget = new QWidget();
      m_locationListHeaderWidget->setLayout(headerLayout);
@@@ -81,9 -82,6 +81,9 @@@
  
      connect(searchLocationButton, SIGNAL(clicked()),
              this, SIGNAL(requestSearchLocation()));
 +
 +    // CONTEXT BUTTONS
-     m_contextButtonLayout->addWidget(m_routeButton, 1, 0);
++    m_contextButtonLayout->addWidget(m_routeButton);
  }
  
  void RoutingPanel::clearListsSelections()