Merge branch 'master' into contact_dialog

[situare] / images.qrc

diff --git a/images.qrc b/images.qrc
index 01708f4..b033893 100644 (file)
--- a/images.qrc
+++ b/images.qrc
@@ -15,6 +15,9 @@
         <file>res/images/clock.png</file>
         <file>res/images/compass.png</file>
         <file>res/images/envelope.png</file>
+        <file>res/images/filtered.png</file>
+        <file>res/images/filtered_d.png</file>
+        <file>res/images/filtered_s.png</file>
         <file>res/images/friend_group.png</file>
         <file>res/images/friend_list.png</file>
         <file>res/images/gps_position.png</file>
@@ -31,16 +34,23 @@
         <file>res/images/menu_bar_drop_shadow.png</file>
         <file>res/images/own_location.png</file>
         <file>res/images/panel_bar_tile.png</file>
+        <file>res/images/panel_context_button_bar_tile.png</file>
+        <file>res/images/panel_context_button_bar_top.png</file>
         <file>res/images/profile_pic_border.png</file>
         <file>res/images/refresh.png</file>
         <file>res/images/refresh_s.png</file>
         <file>res/images/rocket_icon_gray.png</file>
         <file>res/images/routing.png</file>
+        <file>res/images/route_to_friend.png</file>
+        <file>res/images/route_to_friend_d.png</file>
+        <file>res/images/route_to_friend_s.png</file>
+        <file>res/images/route_to_location.png</file>
+        <file>res/images/route_to_location_s.png</file>
         <file>res/images/ruler.png</file>
+        <file>res/images/search.png</file>
+        <file>res/images/search_s.png</file>
         <file>res/images/send_position.png</file>
         <file>res/images/send_position_s.png</file>
-        <file>res/images/show_position.png</file>
-        <file>res/images/show_position_s.png</file>
         <file>res/images/sight.png</file>
         <file>res/images/tab_active.png</file>
         <file>res/images/tab_inactive.png</file>
@@ -49,5 +59,13 @@
         <file>res/images/walk_icon_gray.png</file>
         <file>res/images/zoom_in.png</file>
         <file>res/images/zoom_out.png</file>
+        <file>res/images/location_search.png</file>
+        <file>res/images/search_history.png</file>
+        <file>res/images/clear_btn_d.png</file>
+        <file>res/images/clear_btn_s.png</file>
+        <file>res/images/clear_btn.png</file>
+        <file>res/images/contact_btn.png</file>
+        <file>res/images/contact_btn_d.png</file>
+        <file>res/images/contact_btn_s.png</file>
     </qresource>
 </RCC>