Made small cosmetic changes to contact and back button images, removed btn suffix...

and made changes to all related classes.

diff --git a/images.qrc b/images.qrc
index d05fe3a..e671c06 100644 (file)
--- a/images.qrc
+++ b/images.qrc
@@ -11,14 +11,15 @@
         <file>res/images/arrow_turn_slight_right.png</file>
         <file>res/images/arrow_turn_start.png</file>
         <file>res/images/arrow_turn_u_turn.png</file>
-        <file>res/images/back_btn_d.png</file>
-        <file>res/images/back_btn_s.png</file>
-        <file>res/images/back_btn.png</file>
+        <file>res/images/back.png</file>
+        <file>res/images/back_d.png</file>
+        <file>res/images/back_s.png</file>
+        <file>res/images/calendar.png</file>
         <file>res/images/car_icon_gray.png</file>
         <file>res/images/clock.png</file>
         <file>res/images/compass.png</file>
-        <file>res/images/contact_btn.png</file>
-        <file>res/images/contact_btn_s.png</file>
+        <file>res/images/contact.png</file>
+        <file>res/images/contact_s.png</file>
         <file>res/images/envelope.png</file>
         <file>res/images/filtered.png</file>
         <file>res/images/filtered_d.png</file>
@@ -68,6 +69,5 @@
         <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/calendar.png</file>
     </qresource>
 </RCC>

diff --git a/res/images/back.png b/res/images/back.png
new file mode 100755 (executable)
index 0000000..7c766b4
Binary files /dev/null and b/res/images/back.png differ

diff --git a/res/images/back_btn.png b/res/images/back_btn.png
deleted file mode 100644 (file)
index ddef5ca..0000000
Binary files a/res/images/back_btn.png and /dev/null differ

diff --git a/res/images/back_btn_d.png b/res/images/back_btn_d.png
deleted file mode 100644 (file)
index 70591a9..0000000
Binary files a/res/images/back_btn_d.png and /dev/null differ

diff --git a/res/images/back_btn_s.png b/res/images/back_btn_s.png
deleted file mode 100644 (file)
index 26471e3..0000000
Binary files a/res/images/back_btn_s.png and /dev/null differ

diff --git a/res/images/back_d.png b/res/images/back_d.png
new file mode 100755 (executable)
index 0000000..fcb6b0b
Binary files /dev/null and b/res/images/back_d.png differ

diff --git a/res/images/back_s.png b/res/images/back_s.png
new file mode 100755 (executable)
index 0000000..edabb80
Binary files /dev/null and b/res/images/back_s.png differ

diff --git a/res/images/contact.png b/res/images/contact.png
new file mode 100755 (executable)
index 0000000..efe5110
Binary files /dev/null and b/res/images/contact.png differ

diff --git a/res/images/contact_btn.png b/res/images/contact_btn.png
deleted file mode 100644 (file)
index 026212c..0000000
Binary files a/res/images/contact_btn.png and /dev/null differ

diff --git a/res/images/contact_btn_s.png b/res/images/contact_btn_s.png
deleted file mode 100644 (file)
index 5738d33..0000000
Binary files a/res/images/contact_btn_s.png and /dev/null differ

diff --git a/res/images/contact_s.png b/res/images/contact_s.png
new file mode 100755 (executable)
index 0000000..d024eff
Binary files /dev/null and b/res/images/contact_s.png differ

diff --git a/src/ui/friendlistpanel.cpp b/src/ui/friendlistpanel.cpp
index ed887ef..32a6442 100644 (file)
--- a/src/ui/friendlistpanel.cpp
+++ b/src/ui/friendlistpanel.cpp
@@ -134,9 +134,9 @@ FriendListPanel::FriendListPanel(QWidget *parent)
     connect(m_routeButton, SIGNAL(clicked()),
             this, SLOT(routeToSelectedFriend()));
 
-    m_showContactButton = new ImageButton(":res/images/contact_btn.png",
-                                          ":res/images/contact_btn_s.png",
-                                          ":res/images/contact_btn_d.png", this);
+    m_showContactButton = new ImageButton(":res/images/contact.png",
+                                          ":res/images/contact_s.png",
+                                          ":res/images/contact_d.png", this);
     connect(m_showContactButton, SIGNAL(clicked()),
             this, SLOT(requestSelectedFriendContactDialog()));
 

diff --git a/src/ui/locationsearchpanel.cpp b/src/ui/locationsearchpanel.cpp
index 87bcf82..8b7b4d0 100644 (file)
--- a/src/ui/locationsearchpanel.cpp
+++ b/src/ui/locationsearchpanel.cpp
@@ -116,9 +116,9 @@ LocationSearchPanel::LocationSearchPanel(QWidget *parent)
     connect(searchLocationButton, SIGNAL(clicked()),
             this, SIGNAL(requestSearchLocation()));
 
-    m_clearLocationListButton = new ImageButton(":/res/images/back_btn.png",
-                                                ":/res/images/back_btn_s.png",
-                                                ":/res/images/back_btn_d.png", this);
+    m_clearLocationListButton = new ImageButton(":/res/images/back.png",
+                                                ":/res/images/back_s.png",
+                                                ":/res/images/back_d.png", this);
     m_clearLocationListButton->setDisabled(true);
 
     connect(m_clearLocationListButton, SIGNAL(clicked()),