core/adapterFuctions.cpp

@@ -39,22 +39,25 @@ void Core::initializeVCard(Shared::VCard& vCard, const QXmppVCardIq& card)
     QList<QXmppVCardEmail> emails = card.emails();
     std::deque<Shared::VCard::Email>& myEmails = vCard.getEmails();
     for (const QXmppVCardEmail& em : emails) {
-        QXmppVCardEmail::Type et = em.type();
+        QString addr = em.address();
-        bool prefered = false;
+        if (addr.size() != 0) {
-        bool accounted = false;
+            QXmppVCardEmail::Type et = em.type();
-        if (et & QXmppVCardEmail::Preferred) {
+            bool prefered = false;
-            prefered = true;
+            bool accounted = false;
-        }
+            if (et & QXmppVCardEmail::Preferred) {
-        if (et & QXmppVCardEmail::Home) {
+                prefered = true;
-            myEmails.emplace_back(em.address(), Shared::VCard::Email::home, prefered);
+            }
-            accounted = true;
+            if (et & QXmppVCardEmail::Home) {
-        } 
+                myEmails.emplace_back(addr, Shared::VCard::Email::home, prefered);
-        if (et & QXmppVCardEmail::Work) {
+                accounted = true;
-            myEmails.emplace_back(em.address(), Shared::VCard::Email::work, prefered);
+            } 
-            accounted = true;
+            if (et & QXmppVCardEmail::Work) {
-        }
+                myEmails.emplace_back(addr, Shared::VCard::Email::work, prefered);
-        if (!accounted) {
+                accounted = true;
-            myEmails.emplace_back(em.address(), Shared::VCard::Email::none, prefered);
+            }
+            if (!accounted) {
+                myEmails.emplace_back(addr, Shared::VCard::Email::none, prefered);
+            }
         }
         
     }
@@ -62,113 +65,115 @@ void Core::initializeVCard(Shared::VCard& vCard, const QXmppVCardIq& card)
     QList<QXmppVCardPhone> phones = card.phones();
     std::deque<Shared::VCard::Phone>& myPhones = vCard.getPhones();
     for (const QXmppVCardPhone& ph : phones) {
-        Shared::VCard::Phone mPh(ph.number());
+        QString num = ph.number();
-        QXmppVCardPhone::Type pt = ph.type();
+        if (num.size() != 0) {
-        bool prefered = false;
+            QXmppVCardPhone::Type pt = ph.type();
-        bool accounted = false;
+            bool prefered = false;
-        if (pt & QXmppVCardPhone::Preferred) {
+            bool accounted = false;
-            prefered = true;
+            if (pt & QXmppVCardPhone::Preferred) {
-        }
+                prefered = true;
-        
-        bool home = false;
-        bool work = false;
-        
-        if (pt & QXmppVCardPhone::Home) {
-            home = true;
-        }
-        if (pt & QXmppVCardPhone::Work) {
-            work = true;
-        }
-        
-        
-        if (pt & QXmppVCardPhone::Fax) {
-            if (home || work) {
-                if (home) {
-                    myPhones.emplace_back(ph.number(), Shared::VCard::Phone::fax, Shared::VCard::Phone::home, prefered);
-                }
-                if (work) {
-                    myPhones.emplace_back(ph.number(), Shared::VCard::Phone::fax, Shared::VCard::Phone::work, prefered);
-                }
-            } else {
-                myPhones.emplace_back(ph.number(), Shared::VCard::Phone::fax, Shared::VCard::Phone::none, prefered);
             }
-            accounted = true;
+            
-        } 
+            bool home = false;
-        if (pt & QXmppVCardPhone::Voice) {
+            bool work = false;
-            if (home || work) {
+            
-                if (home) {
+            if (pt & QXmppVCardPhone::Home) {
-                    myPhones.emplace_back(ph.number(), Shared::VCard::Phone::voice, Shared::VCard::Phone::home, prefered);
+                home = true;
-                }
-                if (work) {
-                    myPhones.emplace_back(ph.number(), Shared::VCard::Phone::voice, Shared::VCard::Phone::work, prefered);
-                }
-            } else {
-                myPhones.emplace_back(ph.number(), Shared::VCard::Phone::voice, Shared::VCard::Phone::none, prefered);
             }
-            accounted = true;
+            if (pt & QXmppVCardPhone::Work) {
-        } 
+                work = true;
-        if (pt & QXmppVCardPhone::Pager) {
-            if (home || work) {
-                if (home) {
-                    myPhones.emplace_back(ph.number(), Shared::VCard::Phone::pager, Shared::VCard::Phone::home, prefered);
-                }
-                if (work) {
-                    myPhones.emplace_back(ph.number(), Shared::VCard::Phone::pager, Shared::VCard::Phone::work, prefered);
-                }
-            } else {
-                myPhones.emplace_back(ph.number(), Shared::VCard::Phone::pager, Shared::VCard::Phone::none, prefered);
             }
-            accounted = true;
+            
-        } 
+            
-        if (pt & QXmppVCardPhone::Cell) {
+            if (pt & QXmppVCardPhone::Fax) {
-            if (home || work) {
+                if (home || work) {
-                if (home) {
+                    if (home) {
-                    myPhones.emplace_back(ph.number(), Shared::VCard::Phone::cell, Shared::VCard::Phone::home, prefered);
+                        myPhones.emplace_back(num, Shared::VCard::Phone::fax, Shared::VCard::Phone::home, prefered);
+                    }
+                    if (work) {
+                        myPhones.emplace_back(num, Shared::VCard::Phone::fax, Shared::VCard::Phone::work, prefered);
+                    }
+                } else {
+                    myPhones.emplace_back(num, Shared::VCard::Phone::fax, Shared::VCard::Phone::none, prefered);
                 }
-                if (work) {
+                accounted = true;
-                    myPhones.emplace_back(ph.number(), Shared::VCard::Phone::cell, Shared::VCard::Phone::work, prefered);
+            } 
+            if (pt & QXmppVCardPhone::Voice) {
+                if (home || work) {
+                    if (home) {
+                        myPhones.emplace_back(num, Shared::VCard::Phone::voice, Shared::VCard::Phone::home, prefered);
+                    }
+                    if (work) {
+                        myPhones.emplace_back(num, Shared::VCard::Phone::voice, Shared::VCard::Phone::work, prefered);
+                    }
+                } else {
+                    myPhones.emplace_back(num, Shared::VCard::Phone::voice, Shared::VCard::Phone::none, prefered);
                 }
-            } else {
+                accounted = true;
-                myPhones.emplace_back(ph.number(), Shared::VCard::Phone::cell, Shared::VCard::Phone::none, prefered);
+            } 
-            }
+            if (pt & QXmppVCardPhone::Pager) {
-            accounted = true;
+                if (home || work) {
-        } 
+                    if (home) {
-        if (pt & QXmppVCardPhone::Video) {
+                        myPhones.emplace_back(num, Shared::VCard::Phone::pager, Shared::VCard::Phone::home, prefered);
-            if (home || work) {
+                    }
-                if (home) {
+                    if (work) {
-                    myPhones.emplace_back(ph.number(), Shared::VCard::Phone::video, Shared::VCard::Phone::home, prefered);
+                        myPhones.emplace_back(num, Shared::VCard::Phone::pager, Shared::VCard::Phone::work, prefered);
+                    }
+                } else {
+                    myPhones.emplace_back(num, Shared::VCard::Phone::pager, Shared::VCard::Phone::none, prefered);
                 }
-                if (work) {
+                accounted = true;
-                    myPhones.emplace_back(ph.number(), Shared::VCard::Phone::video, Shared::VCard::Phone::work, prefered);
+            } 
+            if (pt & QXmppVCardPhone::Cell) {
+                if (home || work) {
+                    if (home) {
+                        myPhones.emplace_back(num, Shared::VCard::Phone::cell, Shared::VCard::Phone::home, prefered);
+                    }
+                    if (work) {
+                        myPhones.emplace_back(num, Shared::VCard::Phone::cell, Shared::VCard::Phone::work, prefered);
+                    }
+                } else {
+                    myPhones.emplace_back(num, Shared::VCard::Phone::cell, Shared::VCard::Phone::none, prefered);
                 }
-            } else {
+                accounted = true;
-                myPhones.emplace_back(ph.number(), Shared::VCard::Phone::video, Shared::VCard::Phone::none, prefered);
+            } 
-            }
+            if (pt & QXmppVCardPhone::Video) {
-            accounted = true;
+                if (home || work) {
-        } 
+                    if (home) {
-        if (pt & QXmppVCardPhone::Modem) {
+                        myPhones.emplace_back(num, Shared::VCard::Phone::video, Shared::VCard::Phone::home, prefered);
-            if (home || work) {
+                    }
-                if (home) {
+                    if (work) {
-                    myPhones.emplace_back(ph.number(), Shared::VCard::Phone::modem, Shared::VCard::Phone::home, prefered);
+                        myPhones.emplace_back(num, Shared::VCard::Phone::video, Shared::VCard::Phone::work, prefered);
+                    }
+                } else {
+                    myPhones.emplace_back(num, Shared::VCard::Phone::video, Shared::VCard::Phone::none, prefered);
                 }
-                if (work) {
+                accounted = true;
-                    myPhones.emplace_back(ph.number(), Shared::VCard::Phone::modem, Shared::VCard::Phone::work, prefered);
+            } 
+            if (pt & QXmppVCardPhone::Modem) {
+                if (home || work) {
+                    if (home) {
+                        myPhones.emplace_back(num, Shared::VCard::Phone::modem, Shared::VCard::Phone::home, prefered);
+                    }
+                    if (work) {
+                        myPhones.emplace_back(num, Shared::VCard::Phone::modem, Shared::VCard::Phone::work, prefered);
+                    }
+                } else {
+                    myPhones.emplace_back(num, Shared::VCard::Phone::modem, Shared::VCard::Phone::none, prefered);
                 }
-            } else {
+                accounted = true;
-                myPhones.emplace_back(ph.number(), Shared::VCard::Phone::modem, Shared::VCard::Phone::none, prefered);
+            } 
-            }
+            if (!accounted) {
-            accounted = true;
+                if (home || work) {
-        } 
+                    if (home) {
-        if (!accounted) {
+                        myPhones.emplace_back(num, Shared::VCard::Phone::other, Shared::VCard::Phone::home, prefered);
-            if (home || work) {
+                    }
-                if (home) {
+                    if (work) {
-                    myPhones.emplace_back(ph.number(), Shared::VCard::Phone::other, Shared::VCard::Phone::home, prefered);
+                        myPhones.emplace_back(num, Shared::VCard::Phone::other, Shared::VCard::Phone::work, prefered);
+                    }
+                } else {
+                    myPhones.emplace_back(num, Shared::VCard::Phone::other, Shared::VCard::Phone::none, prefered);
                 }
-                if (work) {
-                    myPhones.emplace_back(ph.number(), Shared::VCard::Phone::other, Shared::VCard::Phone::work, prefered);
-                }
-            } else {
-                myPhones.emplace_back(ph.number(), Shared::VCard::Phone::other, Shared::VCard::Phone::none, prefered);
             }
         }
     }

global.h

@@ -457,7 +457,9 @@ static const std::map<QString, std::pair<QString, QString>> icons = {
     {"state-ok", {"state-ok", "state-ok"}}, 
     {"state-error", {"state-error", "state-error"}},
     
+    {"edit-copy", {"edit-copy", "copy"}},
     {"edit-delete", {"edit-delete", "edit-delete"}},
+    {"edit-rename", {"edit-rename", "edit-rename"}},
     {"mail-message", {"mail-message", "mail-message"}},
     {"mail-attachment", {"mail-attachment", "mail-attachment"}},
     {"network-connect", {"network-connect", "network-connect"}},
@@ -469,9 +471,11 @@ static const std::map<QString, std::pair<QString, QString>> icons = {
     {"clean", {"edit-clear-all", "clean"}},
     {"user", {"user", "user"}},
     {"user-properties", {"user-properties", "user-properties"}},
-    {"edit-rename", {"edit-rename", "edit-rename"}},
     {"group", {"group", "group"}},
     {"group-new", {"resurce-group-new", "group-new"}},
+    {"favorite", {"favorite", "favorite"}},
+    {"unfavorite", {"draw-star", "unfavorite"}},
+    {"list-add", {"list-add", "add"}},
 };
 
 };

resources/images/fallback/dark/big/add.svg

@@ -0,0 +1,14 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#232629;
+      }
+      </style>
+  </defs>
+ <path 
+    style="fill:currentColor;fill-opacity:1;stroke:none" 
+    d="M 10 4 L 10 11 L 3 11 L 3 12 L 10 12 L 10 19 L 11 19 L 11 12 L 18 12 L 18 11 L 11 11 L 11 4 L 10 4 z "
+    class="ColorScheme-Text"
+    />  
+</svg>

resources/images/fallback/dark/big/copy.svg

@@ -0,0 +1,14 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#232629;
+      }
+      </style>
+  </defs>
+ <path 
+    style="fill:currentColor;fill-opacity:1;stroke:none" 
+	d="m4 3v1 13h1 2 1v1 1h6l4-4v-1-7-1h-2v-3h-1-10-1m1 1h10v2h-7v1 9h-1-2v-12m4 3h8v7h-3-1v1 3h-4v-11"
+    class="ColorScheme-Text"
+    />  
+</svg>

resources/images/fallback/dark/big/favorite.svg

@@ -0,0 +1,14 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#232629;
+      }
+      </style>
+  </defs>
+ <path 
+    style="fill:currentColor;fill-opacity:1;stroke:none" 
+    d="M 11,3 8.523,8.266 3,9.11 7,13.21 6.055,19 11,16.266 15.945,19 15,13.21 19,9.11 13.477,8.266 11,3 Z"
+    class="ColorScheme-Text"
+    />  
+</svg>

resources/images/fallback/dark/big/unfavorite.svg

@@ -0,0 +1,14 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#232629;
+      }
+      </style>
+  </defs>
+ <path 
+    style="fill:currentColor;fill-opacity:1;stroke:none" 
+	d="M 12,4 9.5273438,9.2675781 4,10.111328 8,14.210938 7.0566406,20 12,17.267578 16.943359,20 16,14.210938 20,10.111328 14.472656,9.2675781 12,4 Z M 12,6 13.853516,9.9492188 18,10.583984 15,13.658203 15.708984,18 12,15.949219 8.2910156,18 9,13.658203 6,10.583984 10.146484,9.9492188 12,6 Z" transform="translate(-.99999-.99999)"
+    class="ColorScheme-Text"
+    />  
+</svg>

resources/images/fallback/dark/small/add.svg

@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#232629;
+      }
+      </style>
+  </defs>
+ <path style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 7 3.0058594 L 7 8 L 2 8 L 2 8.9980469 L 7 8.9980469 L 7 14.007812 L 8 14.007812 L 8 8.9980469 L 13 8.9980469 L 13 8 L 8 8 L 8 3.0058594 L 7 3.0058594 z "
+     class="ColorScheme-Text"
+     />
+</svg>

resources/images/fallback/dark/small/copy.svg

@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#232629;
+      }
+      </style>
+  </defs>
+ <path style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 3 2 L 3 13 L 6 13 L 6 14 L 11 14 L 14 11 L 14 4 L 13 4 L 13 2 L 3.7851562 2 L 3 2 z M 4 3 L 12 3 L 12 4 L 6 4 L 6 12 L 4 12 L 4 3 z M 7 5 L 13 5 L 13 10 L 10 10 L 10 13 L 7 13 L 7 5 z "
+     class="ColorScheme-Text"
+     />
+</svg>

resources/images/fallback/dark/small/favorite.svg

@@ -0,0 +1,14 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#232629;
+      }
+      </style>
+  </defs>
+ <path 
+    style="fill:currentColor;fill-opacity:1;stroke:none" 
+    d="M 11,3 8.523,8.266 3,9.11 7,13.21 6.055,19 11,16.266 15.945,19 15,13.21 19,9.11 13.477,8.266 11,3 Z"
+    class="ColorScheme-Text"
+    />  
+</svg>

resources/images/fallback/dark/small/unfavorite.svg

@@ -0,0 +1,14 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#232629;
+      }
+      </style>
+  </defs>
+ <path 
+    style="fill:currentColor;fill-opacity:1;stroke:none" 
+	d="M 12,4 9.5273438,9.2675781 4,10.111328 8,14.210938 7.0566406,20 12,17.267578 16.943359,20 16,14.210938 20,10.111328 14.472656,9.2675781 12,4 Z M 12,6 13.853516,9.9492188 18,10.583984 15,13.658203 15.708984,18 12,15.949219 8.2910156,18 9,13.658203 6,10.583984 10.146484,9.9492188 12,6 Z" transform="translate(-.99999-.99999)"
+    class="ColorScheme-Text"
+    />  
+</svg>

resources/images/fallback/light/big/add.svg

@@ -0,0 +1,14 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#eff0f1;
+      }
+      </style>
+  </defs>
+ <path 
+    style="fill:currentColor;fill-opacity:1;stroke:none" 
+    d="M 10 4 L 10 11 L 3 11 L 3 12 L 10 12 L 10 19 L 11 19 L 11 12 L 18 12 L 18 11 L 11 11 L 11 4 L 10 4 z "
+    class="ColorScheme-Text"
+    />  
+</svg>

resources/images/fallback/light/big/copy.svg

@@ -0,0 +1,14 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#eff0f1;
+      }
+      </style>
+  </defs>
+ <path 
+    style="fill:currentColor;fill-opacity:1;stroke:none" 
+	d="m4 3v1 13h1 2 1v1 1h6l4-4v-1-7-1h-2v-3h-1-10-1m1 1h10v2h-7v1 9h-1-2v-12m4 3h8v7h-3-1v1 3h-4v-11"
+    class="ColorScheme-Text"
+    />  
+</svg>

resources/images/fallback/light/big/favorite.svg

@@ -0,0 +1,14 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#eff0f1;
+      }
+      </style>
+  </defs>
+ <path 
+    style="fill:currentColor;fill-opacity:1;stroke:none" 
+    d="M 11,3 8.523,8.266 3,9.11 7,13.21 6.055,19 11,16.266 15.945,19 15,13.21 19,9.11 13.477,8.266 11,3 Z"
+    class="ColorScheme-Text"
+    />  
+</svg>

resources/images/fallback/light/big/unfavorite.svg

@@ -0,0 +1,14 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#eff0f1;
+      }
+      </style>
+  </defs>
+ <path 
+    style="fill:currentColor;fill-opacity:1;stroke:none" 
+	d="M 12,4 9.5273438,9.2675781 4,10.111328 8,14.210938 7.0566406,20 12,17.267578 16.943359,20 16,14.210938 20,10.111328 14.472656,9.2675781 12,4 Z M 12,6 13.853516,9.9492188 18,10.583984 15,13.658203 15.708984,18 12,15.949219 8.2910156,18 9,13.658203 6,10.583984 10.146484,9.9492188 12,6 Z" transform="translate(-.99999-.99999)"
+    class="ColorScheme-Text"
+    />  
+</svg>

resources/images/fallback/light/small/add.svg

@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#eff0f1;
+      }
+      </style>
+  </defs>
+ <path style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 7 3.0058594 L 7 8 L 2 8 L 2 8.9980469 L 7 8.9980469 L 7 14.007812 L 8 14.007812 L 8 8.9980469 L 13 8.9980469 L 13 8 L 8 8 L 8 3.0058594 L 7 3.0058594 z "
+     class="ColorScheme-Text"
+     />
+</svg>

resources/images/fallback/light/small/copy.svg

@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#eff0f1;
+      }
+      </style>
+  </defs>
+ <path style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 3 2 L 3 13 L 6 13 L 6 14 L 11 14 L 14 11 L 14 4 L 13 4 L 13 2 L 3.7851562 2 L 3 2 z M 4 3 L 12 3 L 12 4 L 6 4 L 6 12 L 4 12 L 4 3 z M 7 5 L 13 5 L 13 10 L 10 10 L 10 13 L 7 13 L 7 5 z "
+     class="ColorScheme-Text"
+     />
+</svg>

resources/images/fallback/light/small/favorite.svg

@@ -0,0 +1,14 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#eff0f1;
+      }
+      </style>
+  </defs>
+ <path 
+    style="fill:currentColor;fill-opacity:1;stroke:none" 
+    d="M 11,3 8.523,8.266 3,9.11 7,13.21 6.055,19 11,16.266 15.945,19 15,13.21 19,9.11 13.477,8.266 11,3 Z"
+    class="ColorScheme-Text"
+    />  
+</svg>

resources/images/fallback/light/small/unfavorite.svg

@@ -0,0 +1,14 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#eff0f1;
+      }
+      </style>
+  </defs>
+ <path 
+    style="fill:currentColor;fill-opacity:1;stroke:none" 
+	d="M 12,4 9.5273438,9.2675781 4,10.111328 8,14.210938 7.0566406,20 12,17.267578 16.943359,20 16,14.210938 20,10.111328 14.472656,9.2675781 12,4 Z M 12,6 13.853516,9.9492188 18,10.583984 15,13.658203 15.708984,18 12,15.949219 8.2910156,18 9,13.658203 6,10.583984 10.146484,9.9492188 12,6 Z" transform="translate(-.99999-.99999)"
+    class="ColorScheme-Text"
+    />  
+</svg>

resources/resources.qrc

@@ -36,6 +36,10 @@
     <file>images/fallback/dark/big/group-new.svg</file>
     <file>images/fallback/dark/big/edit-rename.svg</file>
     <file>images/fallback/dark/big/user-properties.svg</file>
+    <file>images/fallback/dark/big/copy.svg</file>
+    <file>images/fallback/dark/big/favorite.svg</file>
+    <file>images/fallback/dark/big/unfavorite.svg</file>
+    <file>images/fallback/dark/big/add.svg</file>
     
     
     <file>images/fallback/dark/small/absent.svg</file>
@@ -72,6 +76,10 @@
     <file>images/fallback/dark/small/group-new.svg</file>
     <file>images/fallback/dark/small/edit-rename.svg</file>
     <file>images/fallback/dark/small/user-properties.svg</file>
+    <file>images/fallback/dark/small/copy.svg</file>
+    <file>images/fallback/dark/small/favorite.svg</file>
+    <file>images/fallback/dark/small/unfavorite.svg</file>
+    <file>images/fallback/dark/small/add.svg</file>
     
     
     <file>images/fallback/light/big/absent.svg</file>
@@ -108,6 +116,10 @@
     <file>images/fallback/light/big/group-new.svg</file>
     <file>images/fallback/light/big/edit-rename.svg</file>
     <file>images/fallback/light/big/user-properties.svg</file>
+    <file>images/fallback/light/big/copy.svg</file>
+    <file>images/fallback/light/big/favorite.svg</file>
+    <file>images/fallback/light/big/unfavorite.svg</file>
+    <file>images/fallback/light/big/add.svg</file>
     
     
     <file>images/fallback/light/small/absent.svg</file>
@@ -144,5 +156,9 @@
     <file>images/fallback/light/small/group-new.svg</file>
     <file>images/fallback/light/small/edit-rename.svg</file>
     <file>images/fallback/light/small/user-properties.svg</file>
+    <file>images/fallback/light/small/copy.svg</file>
+    <file>images/fallback/light/small/favorite.svg</file>
+    <file>images/fallback/light/small/unfavorite.svg</file>
+    <file>images/fallback/light/small/add.svg</file>
 </qresource>
 </RCC>

translations/squawk.ru.ts

@@ -5,92 +5,77 @@
     <name>Account</name>
     <message>
         <location filename="../ui/widgets/account.ui" line="14"/>
-        <location filename="../build/ui/squawkUI_autogen/include/ui_account.h" line="127"/>
         <source>Account</source>
         <translatorcomment>Заголовок окна</translatorcomment>
         <translation>Учетная запись</translation>
     </message>
     <message>
         <location filename="../ui/widgets/account.ui" line="40"/>
-        <location filename="../build/ui/squawkUI_autogen/include/ui_account.h" line="129"/>
         <source>Your account login</source>
         <translation>Имя пользователя Вашей учетной записи</translation>
     </message>
     <message>
         <location filename="../ui/widgets/account.ui" line="43"/>
-        <location filename="../build/ui/squawkUI_autogen/include/ui_account.h" line="131"/>
         <source>john_smith1987</source>
         <translation>ivan_ivanov1987</translation>
     </message>
     <message>
         <location filename="../ui/widgets/account.ui" line="50"/>
-        <location filename="../build/ui/squawkUI_autogen/include/ui_account.h" line="132"/>
         <source>Server</source>
         <translation>Сервер</translation>
     </message>
     <message>
         <location filename="../ui/widgets/account.ui" line="57"/>
-        <location filename="../build/ui/squawkUI_autogen/include/ui_account.h" line="134"/>
         <source>A server address of your account. Like 404.city or macaw.me</source>
         <translation>Адресс сервера вашей учетной записи (выглядит как 404.city или macaw.me)</translation>
     </message>
     <message>
         <location filename="../ui/widgets/account.ui" line="60"/>
-        <location filename="../build/ui/squawkUI_autogen/include/ui_account.h" line="136"/>
         <source>macaw.me</source>
         <translation>macaw.me</translation>
     </message>
     <message>
         <location filename="../ui/widgets/account.ui" line="67"/>
-        <location filename="../build/ui/squawkUI_autogen/include/ui_account.h" line="137"/>
         <source>Login</source>
         <translation>Имя учетной записи</translation>
     </message>
     <message>
         <location filename="../ui/widgets/account.ui" line="74"/>
-        <location filename="../build/ui/squawkUI_autogen/include/ui_account.h" line="138"/>
         <source>Password</source>
         <translation>Пароль</translation>
     </message>
     <message>
         <location filename="../ui/widgets/account.ui" line="81"/>
-        <location filename="../build/ui/squawkUI_autogen/include/ui_account.h" line="140"/>
         <source>Password of your account</source>
         <translation>Пароль вашей учетной записи</translation>
     </message>
     <message>
         <location filename="../ui/widgets/account.ui" line="103"/>
-        <location filename="../build/ui/squawkUI_autogen/include/ui_account.h" line="145"/>
         <source>Name</source>
         <translation>Имя</translation>
     </message>
     <message>
         <location filename="../ui/widgets/account.ui" line="110"/>
-        <location filename="../build/ui/squawkUI_autogen/include/ui_account.h" line="147"/>
         <source>Just a name how would you call this account, doesn&apos;t affect anything</source>
         <translation>Просто имя, то как Вы называете свою учетную запись, может быть любым</translation>
     </message>
     <message>
         <location filename="../ui/widgets/account.ui" line="113"/>
-        <location filename="../build/ui/squawkUI_autogen/include/ui_account.h" line="149"/>
         <source>John</source>
         <translation>Иван</translation>
     </message>
     <message>
         <location filename="../ui/widgets/account.ui" line="120"/>
-        <location filename="../build/ui/squawkUI_autogen/include/ui_account.h" line="150"/>
         <source>Resource</source>
         <translation>Ресурс</translation>
     </message>
     <message>
         <location filename="../ui/widgets/account.ui" line="127"/>
-        <location filename="../build/ui/squawkUI_autogen/include/ui_account.h" line="152"/>
         <source>A resource name like &quot;Home&quot; or &quot;Work&quot;</source>
         <translation>Имя этой программы для ваших контактов, может быть &quot;Home&quot; или &quot;Phone&quot;</translation>
     </message>
     <message>
         <location filename="../ui/widgets/account.ui" line="130"/>
-        <location filename="../build/ui/squawkUI_autogen/include/ui_account.h" line="154"/>
         <source>QXmpp</source>
         <translatorcomment>Ресурс по умолчанию</translatorcomment>
         <translation>QXmpp</translation>
@@ -100,44 +85,38 @@
     <name>Accounts</name>
     <message>
         <location filename="../ui/widgets/accounts.ui" line="14"/>
-        <location filename="../build/ui/squawkUI_autogen/include/ui_accounts.h" line="108"/>
         <source>Accounts</source>
         <translation>Учетные записи</translation>
     </message>
     <message>
         <location filename="../ui/widgets/accounts.ui" line="45"/>
-        <location filename="../build/ui/squawkUI_autogen/include/ui_accounts.h" line="109"/>
         <source>Delete</source>
         <translation>Удалить</translation>
     </message>
     <message>
         <location filename="../ui/widgets/accounts.ui" line="86"/>
-        <location filename="../build/ui/squawkUI_autogen/include/ui_accounts.h" line="110"/>
         <source>Add</source>
         <translation>Добавить</translation>
     </message>
     <message>
         <location filename="../ui/widgets/accounts.ui" line="96"/>
-        <location filename="../build/ui/squawkUI_autogen/include/ui_accounts.h" line="111"/>
         <source>Edit</source>
         <translation>Редактировать</translation>
     </message>
     <message>
         <location filename="../ui/widgets/accounts.ui" line="106"/>
-        <location filename="../build/ui/squawkUI_autogen/include/ui_accounts.h" line="112"/>
         <source>Change password</source>
         <translation>Изменить пароль</translation>
     </message>
     <message>
         <location filename="../ui/widgets/accounts.ui" line="129"/>
-        <location filename="../build/ui/squawkUI_autogen/include/ui_accounts.h" line="113"/>
+        <location filename="../ui/widgets/accounts.cpp" line="125"/>
-        <location filename="../ui/widgets/accounts.cpp" line="126"/>
+        <location filename="../ui/widgets/accounts.cpp" line="128"/>
-        <location filename="../ui/widgets/accounts.cpp" line="129"/>
         <source>Connect</source>
         <translation>Подключить</translation>
     </message>
     <message>
-        <location filename="../ui/widgets/accounts.cpp" line="123"/>
+        <location filename="../ui/widgets/accounts.cpp" line="122"/>
         <source>Disconnect</source>
         <translation>Отключить</translation>
     </message>
@@ -146,10 +125,14 @@
     <name>Conversation</name>
     <message>
         <location filename="../ui/widgets/conversation.ui" line="449"/>
-        <location filename="../build/ui/squawkUI_autogen/include/ui_conversation.h" line="324"/>
         <source>Type your message here...</source>
         <translation>Введите сообщение...</translation>
     </message>
+    <message>
+        <location filename="../ui/widgets/conversation.cpp" line="260"/>
+        <source>Chose a file to send</source>
+        <translation>Выберите файл для отправки</translation>
+    </message>
 </context>
 <context>
     <name>Global</name>
@@ -253,67 +236,97 @@
         <source>Moderator</source>
         <translation>Модератор</translation>
     </message>
+    <message>
+        <source>Not specified</source>
+        <translation>Не указан</translation>
+    </message>
+    <message>
+        <source>Personal</source>
+        <translation>Личный</translation>
+    </message>
+    <message>
+        <source>Business</source>
+        <translation>Рабочий</translation>
+    </message>
+    <message>
+        <source>Fax</source>
+        <translation>Факс</translation>
+    </message>
+    <message>
+        <source>Pager</source>
+        <translation>Пэйджер</translation>
+    </message>
+    <message>
+        <source>Voice</source>
+        <translation>Стационарный</translation>
+    </message>
+    <message>
+        <source>Cell</source>
+        <translation>Мобильный</translation>
+    </message>
+    <message>
+        <source>Video</source>
+        <translation>Видеофон</translation>
+    </message>
+    <message>
+        <source>Modem</source>
+        <translation>Модем</translation>
+    </message>
+    <message>
+        <source>Other</source>
+        <translation>Другой</translation>
+    </message>
 </context>
 <context>
     <name>JoinConference</name>
     <message>
         <location filename="../ui/widgets/joinconference.ui" line="14"/>
-        <location filename="../build/ui/squawkUI_autogen/include/ui_joinconference.h" line="116"/>
         <source>Join new conference</source>
         <translatorcomment>Заголовок окна</translatorcomment>
         <translation>Присоединиться к новой беседе</translation>
     </message>
     <message>
         <location filename="../ui/widgets/joinconference.ui" line="22"/>
-        <location filename="../build/ui/squawkUI_autogen/include/ui_joinconference.h" line="117"/>
         <source>JID</source>
         <translation>JID</translation>
     </message>
     <message>
         <location filename="../ui/widgets/joinconference.ui" line="29"/>
-        <location filename="../build/ui/squawkUI_autogen/include/ui_joinconference.h" line="119"/>
         <source>Room JID</source>
         <translation>Jabber-идентификатор беседы</translation>
     </message>
     <message>
         <location filename="../ui/widgets/joinconference.ui" line="32"/>
-        <location filename="../build/ui/squawkUI_autogen/include/ui_joinconference.h" line="121"/>
         <source>identifier@conference.server.org</source>
         <translation>identifier@conference.server.org</translation>
     </message>
     <message>
         <location filename="../ui/widgets/joinconference.ui" line="39"/>
-        <location filename="../build/ui/squawkUI_autogen/include/ui_joinconference.h" line="122"/>
         <source>Account</source>
         <translation>Учетная запись</translation>
     </message>
     <message>
         <location filename="../ui/widgets/joinconference.ui" line="49"/>
-        <location filename="../build/ui/squawkUI_autogen/include/ui_joinconference.h" line="123"/>
         <source>Join on login</source>
         <translation>Автовход</translation>
     </message>
     <message>
         <location filename="../ui/widgets/joinconference.ui" line="56"/>
-        <location filename="../build/ui/squawkUI_autogen/include/ui_joinconference.h" line="125"/>
         <source>If checked Squawk will try to join this conference on login</source>
         <translation>Если стоит галочка Squawk автоматически присоединится к этой беседе при подключении</translation>
     </message>
     <message>
         <location filename="../ui/widgets/joinconference.ui" line="66"/>
-        <location filename="../build/ui/squawkUI_autogen/include/ui_joinconference.h" line="128"/>
         <source>Nick name</source>
         <translation>Псевдоним</translation>
     </message>
     <message>
         <location filename="../ui/widgets/joinconference.ui" line="73"/>
-        <location filename="../build/ui/squawkUI_autogen/include/ui_joinconference.h" line="130"/>
         <source>Your nick name for that conference. If you leave this field empty your account name will be used as a nick name</source>
         <translation>Ваш псевдоним в этой беседе, если оставите это поле пустым - будет использовано имя Вашей учетной записи</translation>
     </message>
     <message>
         <location filename="../ui/widgets/joinconference.ui" line="76"/>
-        <location filename="../build/ui/squawkUI_autogen/include/ui_joinconference.h" line="132"/>
         <source>John</source>
         <translation>Ivan</translation>
     </message>
@@ -321,24 +334,24 @@
 <context>
     <name>Message</name>
     <message>
-        <location filename="../ui/utils/message.cpp" line="120"/>
+        <location filename="../ui/utils/message.cpp" line="119"/>
         <source>Download</source>
         <translation>Скачать</translation>
     </message>
     <message>
-        <location filename="../ui/utils/message.cpp" line="124"/>
+        <location filename="../ui/utils/message.cpp" line="123"/>
         <source>Error downloading file: %1
 You can try again</source>
         <translation>Ошибка загрузки файла: %1
 Вы можете попробовать снова</translation>
     </message>
     <message>
-        <location filename="../ui/utils/message.cpp" line="126"/>
+        <location filename="../ui/utils/message.cpp" line="125"/>
         <source>%1 is offering you to download a file</source>
         <translation>%1 предлагает Вам скачать файл</translation>
     </message>
     <message>
-        <location filename="../ui/utils/message.cpp" line="191"/>
+        <location filename="../ui/utils/message.cpp" line="190"/>
         <source>Open</source>
         <translation>Открыть</translation>
     </message>
@@ -388,67 +401,67 @@ You can try again</source>
 <context>
     <name>Models::Roster</name>
     <message>
-        <location filename="../ui/models/roster.cpp" line="79"/>
+        <location filename="../ui/models/roster.cpp" line="80"/>
         <source>New messages</source>
         <translation>Есть непрочитанные сообщения</translation>
     </message>
     <message>
-        <location filename="../ui/models/roster.cpp" line="152"/>
         <location filename="../ui/models/roster.cpp" line="178"/>
-        <location filename="../ui/models/roster.cpp" line="215"/>
+        <location filename="../ui/models/roster.cpp" line="204"/>
-        <location filename="../ui/models/roster.cpp" line="227"/>
+        <location filename="../ui/models/roster.cpp" line="241"/>
+        <location filename="../ui/models/roster.cpp" line="253"/>
         <source>New messages: </source>
         <translation>Новых сообщений: </translation>
     </message>
     <message>
-        <location filename="../ui/models/roster.cpp" line="154"/>
+        <location filename="../ui/models/roster.cpp" line="180"/>
         <source>Jabber ID: </source>
         <translation>Идентификатор: </translation>
     </message>
     <message>
-        <location filename="../ui/models/roster.cpp" line="158"/>
+        <location filename="../ui/models/roster.cpp" line="184"/>
-        <location filename="../ui/models/roster.cpp" line="181"/>
+        <location filename="../ui/models/roster.cpp" line="207"/>
-        <location filename="../ui/models/roster.cpp" line="194"/>
+        <location filename="../ui/models/roster.cpp" line="220"/>
         <source>Availability: </source>
         <translation>Доступность: </translation>
     </message>
     <message>
-        <location filename="../ui/models/roster.cpp" line="162"/>
+        <location filename="../ui/models/roster.cpp" line="188"/>
-        <location filename="../ui/models/roster.cpp" line="184"/>
+        <location filename="../ui/models/roster.cpp" line="210"/>
-        <location filename="../ui/models/roster.cpp" line="197"/>
+        <location filename="../ui/models/roster.cpp" line="223"/>
         <source>Status: </source>
         <translation>Статус: </translation>
     </message>
     <message>
-        <location filename="../ui/models/roster.cpp" line="165"/>
+        <location filename="../ui/models/roster.cpp" line="191"/>
-        <location filename="../ui/models/roster.cpp" line="167"/>
+        <location filename="../ui/models/roster.cpp" line="193"/>
-        <location filename="../ui/models/roster.cpp" line="229"/>
+        <location filename="../ui/models/roster.cpp" line="255"/>
         <source>Subscription: </source>
         <translation>Подписка: </translation>
     </message>
     <message>
-        <location filename="../ui/models/roster.cpp" line="200"/>
+        <location filename="../ui/models/roster.cpp" line="226"/>
         <source>Affiliation: </source>
         <translatorcomment>Я правда не знаю, как это объяснить, не то что перевести</translatorcomment>
         <translation>Причастность: </translation>
     </message>
     <message>
-        <location filename="../ui/models/roster.cpp" line="203"/>
+        <location filename="../ui/models/roster.cpp" line="229"/>
         <source>Role: </source>
         <translation>Роль: </translation>
     </message>
     <message>
-        <location filename="../ui/models/roster.cpp" line="217"/>
+        <location filename="../ui/models/roster.cpp" line="243"/>
         <source>Online contacts: </source>
         <translation>Контакстов в сети: </translation>
     </message>
     <message>
-        <location filename="../ui/models/roster.cpp" line="218"/>
+        <location filename="../ui/models/roster.cpp" line="244"/>
         <source>Total contacts: </source>
         <translation>Всего контактов: </translation>
     </message>
     <message>
-        <location filename="../ui/models/roster.cpp" line="231"/>
+        <location filename="../ui/models/roster.cpp" line="257"/>
         <source>Members: </source>
         <translation>Участников: </translation>
     </message>
@@ -457,57 +470,48 @@ You can try again</source>
     <name>NewContact</name>
     <message>
         <location filename="../ui/widgets/newcontact.ui" line="14"/>
-        <location filename="../build/ui/squawkUI_autogen/include/ui_newcontact.h" line="103"/>
         <source>Add new contact</source>
         <translatorcomment>Заголовок окна</translatorcomment>
         <translation>Добавление нового контакта</translation>
     </message>
     <message>
         <location filename="../ui/widgets/newcontact.ui" line="22"/>
-        <location filename="../build/ui/squawkUI_autogen/include/ui_newcontact.h" line="104"/>
         <source>Account</source>
         <translation>Учетная запись</translation>
     </message>
     <message>
         <location filename="../ui/widgets/newcontact.ui" line="29"/>
-        <location filename="../build/ui/squawkUI_autogen/include/ui_newcontact.h" line="106"/>
         <source>An account that is going to have new contact</source>
         <translation>Учетная запись для которой будет добавлен контакт</translation>
     </message>
     <message>
         <location filename="../ui/widgets/newcontact.ui" line="36"/>
-        <location filename="../build/ui/squawkUI_autogen/include/ui_newcontact.h" line="108"/>
         <source>JID</source>
         <translation>JID</translation>
     </message>
     <message>
         <location filename="../ui/widgets/newcontact.ui" line="43"/>
-        <location filename="../build/ui/squawkUI_autogen/include/ui_newcontact.h" line="110"/>
         <source>Jabber id of your new contact</source>
         <translation>Jabber-идентификатор нового контакта</translation>
     </message>
     <message>
         <location filename="../ui/widgets/newcontact.ui" line="46"/>
-        <location filename="../build/ui/squawkUI_autogen/include/ui_newcontact.h" line="112"/>
         <source>name@server.dmn</source>
         <translatorcomment>Placeholder поля ввода JID</translatorcomment>
         <translation>name@server.dmn</translation>
     </message>
     <message>
         <location filename="../ui/widgets/newcontact.ui" line="53"/>
-        <location filename="../build/ui/squawkUI_autogen/include/ui_newcontact.h" line="113"/>
         <source>Name</source>
         <translation>Имя</translation>
     </message>
     <message>
         <location filename="../ui/widgets/newcontact.ui" line="60"/>
-        <location filename="../build/ui/squawkUI_autogen/include/ui_newcontact.h" line="115"/>
         <source>The way this new contact will be labeled in your roster (optional)</source>
         <translation>То, как будет подписан контакт в вашем списке контактов (не обязательно)</translation>
     </message>
     <message>
         <location filename="../ui/widgets/newcontact.ui" line="63"/>
-        <location filename="../build/ui/squawkUI_autogen/include/ui_newcontact.h" line="117"/>
         <source>John Smith</source>
         <translation>Иван Иванов</translation>
     </message>
@@ -516,87 +520,91 @@ You can try again</source>
     <name>Squawk</name>
     <message>
         <location filename="../ui/squawk.ui" line="14"/>
-        <location filename="../build/ui/squawkUI_autogen/include/ui_squawk.h" line="130"/>
         <source>squawk</source>
         <translation>Squawk</translation>
     </message>
     <message>
-        <location filename="../ui/squawk.ui" line="75"/>
+        <location filename="../ui/squawk.ui" line="78"/>
-        <location filename="../build/ui/squawkUI_autogen/include/ui_squawk.h" line="136"/>
         <source>Settings</source>
         <translation>Настройки</translation>
     </message>
     <message>
-        <location filename="../ui/squawk.ui" line="81"/>
+        <location filename="../ui/squawk.ui" line="84"/>
-        <location filename="../build/ui/squawkUI_autogen/include/ui_squawk.h" line="137"/>
         <source>Squawk</source>
         <translation>Squawk</translation>
     </message>
     <message>
-        <location filename="../ui/squawk.ui" line="96"/>
+        <location filename="../ui/squawk.ui" line="99"/>
-        <location filename="../build/ui/squawkUI_autogen/include/ui_squawk.h" line="131"/>
         <source>Accounts</source>
         <translation>Учетные записи</translation>
     </message>
     <message>
-        <location filename="../ui/squawk.ui" line="105"/>
+        <location filename="../ui/squawk.ui" line="108"/>
-        <location filename="../build/ui/squawkUI_autogen/include/ui_squawk.h" line="132"/>
         <source>Quit</source>
         <translation>Выйти</translation>
     </message>
     <message>
-        <location filename="../ui/squawk.ui" line="117"/>
+        <location filename="../ui/squawk.ui" line="120"/>
-        <location filename="../build/ui/squawkUI_autogen/include/ui_squawk.h" line="133"/>
         <source>Add contact</source>
         <translation>Добавить контакт</translation>
     </message>
     <message>
-        <location filename="../ui/squawk.ui" line="128"/>
+        <location filename="../ui/squawk.ui" line="132"/>
-        <location filename="../build/ui/squawkUI_autogen/include/ui_squawk.h" line="134"/>
         <source>Add conference</source>
         <translation>Присоединиться к беседе</translation>
     </message>
     <message>
-        <location filename="../ui/squawk.cpp" line="529"/>
+        <location filename="../ui/squawk.cpp" line="60"/>
+        <source>Contact list</source>
+        <translation>Список контактов</translation>
+    </message>
+    <message>
+        <location filename="../ui/squawk.cpp" line="549"/>
         <source>Disconnect</source>
         <translation>Отключить</translation>
     </message>
     <message>
-        <location filename="../ui/squawk.cpp" line="535"/>
+        <location filename="../ui/squawk.cpp" line="555"/>
         <source>Connect</source>
         <translation>Подключить</translation>
     </message>
     <message>
-        <location filename="../ui/squawk.cpp" line="541"/>
+        <location filename="../ui/squawk.cpp" line="561"/>
-        <location filename="../ui/squawk.cpp" line="635"/>
+        <location filename="../ui/squawk.cpp" line="659"/>
-        <location filename="../ui/squawk.cpp" line="675"/>
+        <source>VCard</source>
+        <translation>Карточка</translation>
+    </message>
+    <message>
+        <location filename="../ui/squawk.cpp" line="565"/>
+        <location filename="../ui/squawk.cpp" line="663"/>
+        <location filename="../ui/squawk.cpp" line="703"/>
         <source>Remove</source>
         <translation>Удалить</translation>
     </message>
     <message>
-        <location filename="../ui/squawk.cpp" line="553"/>
+        <location filename="../ui/squawk.cpp" line="577"/>
         <source>Open dialog</source>
         <translation>Открыть диалог</translation>
     </message>
     <message>
-        <location filename="../ui/squawk.cpp" line="563"/>
+        <location filename="../ui/squawk.cpp" line="587"/>
-        <location filename="../ui/squawk.cpp" line="656"/>
+        <location filename="../ui/squawk.cpp" line="684"/>
         <source>Unsubscribe</source>
         <translation>Отписаться</translation>
     </message>
     <message>
-        <location filename="../ui/squawk.cpp" line="573"/>
+        <location filename="../ui/squawk.cpp" line="597"/>
-        <location filename="../ui/squawk.cpp" line="665"/>
+        <location filename="../ui/squawk.cpp" line="693"/>
         <source>Subscribe</source>
         <translation>Подписаться</translation>
     </message>
     <message>
-        <location filename="../ui/squawk.cpp" line="584"/>
+        <location filename="../ui/squawk.cpp" line="608"/>
         <source>Rename</source>
         <translation>Переименовать</translation>
     </message>
     <message>
-        <location filename="../ui/squawk.cpp" line="597"/>
+        <location filename="../ui/squawk.cpp" line="621"/>
         <source>Input new name for %1
 or leave it empty for the contact 
 to be displayed as %1</source>
@@ -606,34 +614,245 @@ to be displayed as %1</source>
 %1</translation>
     </message>
     <message>
-        <location filename="../ui/squawk.cpp" line="598"/>
+        <location filename="../ui/squawk.cpp" line="622"/>
         <source>Renaming %1</source>
         <translation>Назначение имени контакту %1</translation>
     </message>
     <message>
-        <location filename="../ui/squawk.cpp" line="604"/>
+        <location filename="../ui/squawk.cpp" line="628"/>
         <source>Groups</source>
         <translation>Группы</translation>
     </message>
     <message>
-        <location filename="../ui/squawk.cpp" line="619"/>
+        <location filename="../ui/squawk.cpp" line="643"/>
         <source>New group</source>
         <translation>Создать новую группу</translation>
     </message>
     <message>
-        <location filename="../ui/squawk.cpp" line="629"/>
+        <location filename="../ui/squawk.cpp" line="653"/>
         <source>New group name</source>
         <translation>Имя группы</translation>
     </message>
     <message>
-        <location filename="../ui/squawk.cpp" line="630"/>
+        <location filename="../ui/squawk.cpp" line="654"/>
         <source>Add %1 to a new group</source>
         <translation>Добавление %1 в новую группу</translation>
     </message>
     <message>
-        <location filename="../ui/squawk.cpp" line="647"/>
+        <location filename="../ui/squawk.cpp" line="675"/>
         <source>Open conversation</source>
         <translation>Открыть окно беседы</translation>
     </message>
+    <message>
+        <location filename="../ui/squawk.cpp" line="780"/>
+        <source>%1 account card</source>
+        <translation>Карточка учетной записи %1</translation>
+    </message>
+    <message>
+        <location filename="../ui/squawk.cpp" line="782"/>
+        <source>%1 contact card</source>
+        <translation>Карточка контакта %1</translation>
+    </message>
+    <message>
+        <location filename="../ui/squawk.cpp" line="794"/>
+        <source>Downloading vCard</source>
+        <translation>Получение карточки</translation>
+    </message>
+</context>
+<context>
+    <name>VCard</name>
+    <message>
+        <location filename="../ui/widgets/vcard/vcard.ui" line="65"/>
+        <source>Received 12.07.2007 at 17.35</source>
+        <translation>Не обновлялось</translation>
+    </message>
+    <message>
+        <location filename="../ui/widgets/vcard/vcard.ui" line="100"/>
+        <location filename="../ui/widgets/vcard/vcard.ui" line="425"/>
+        <source>General</source>
+        <translation>Общее</translation>
+    </message>
+    <message>
+        <location filename="../ui/widgets/vcard/vcard.ui" line="130"/>
+        <source>Organization</source>
+        <translation>Место работы</translation>
+    </message>
+    <message>
+        <location filename="../ui/widgets/vcard/vcard.ui" line="180"/>
+        <source>Middle name</source>
+        <translation>Среднее имя</translation>
+    </message>
+    <message>
+        <location filename="../ui/widgets/vcard/vcard.ui" line="190"/>
+        <source>First name</source>
+        <translation>Имя</translation>
+    </message>
+    <message>
+        <location filename="../ui/widgets/vcard/vcard.ui" line="200"/>
+        <source>Last name</source>
+        <translation>Фамилия</translation>
+    </message>
+    <message>
+        <location filename="../ui/widgets/vcard/vcard.ui" line="226"/>
+        <source>Nick name</source>
+        <translation>Псевдоним</translation>
+    </message>
+    <message>
+        <location filename="../ui/widgets/vcard/vcard.ui" line="252"/>
+        <source>Birthday</source>
+        <translation>Дата рождения</translation>
+    </message>
+    <message>
+        <location filename="../ui/widgets/vcard/vcard.ui" line="272"/>
+        <source>Organization name</source>
+        <translation>Название организации</translation>
+    </message>
+    <message>
+        <location filename="../ui/widgets/vcard/vcard.ui" line="298"/>
+        <source>Unit / Department</source>
+        <translation>Отдел</translation>
+    </message>
+    <message>
+        <location filename="../ui/widgets/vcard/vcard.ui" line="324"/>
+        <source>Role / Profession</source>
+        <translation>Профессия</translation>
+    </message>
+    <message>
+        <location filename="../ui/widgets/vcard/vcard.ui" line="350"/>
+        <source>Job title</source>
+        <translation>Наименование должности</translation>
+    </message>
+    <message>
+        <location filename="../ui/widgets/vcard/vcard.ui" line="390"/>
+        <source>Full name</source>
+        <translation>Полное имя</translation>
+    </message>
+    <message>
+        <location filename="../ui/widgets/vcard/vcard.ui" line="460"/>
+        <source>Personal information</source>
+        <translation>Личная информация</translation>
+    </message>
+    <message>
+        <location filename="../ui/widgets/vcard/vcard.ui" line="653"/>
+        <source>Addresses</source>
+        <translation>Адреса</translation>
+    </message>
+    <message>
+        <location filename="../ui/widgets/vcard/vcard.ui" line="682"/>
+        <source>E-Mail addresses</source>
+        <translation>Адреса электронной почты</translation>
+    </message>
+    <message>
+        <location filename="../ui/widgets/vcard/vcard.ui" line="767"/>
+        <source>Phone numbers</source>
+        <translation>Номера телефонов</translation>
+    </message>
+    <message>
+        <location filename="../ui/widgets/vcard/vcard.ui" line="522"/>
+        <location filename="../ui/widgets/vcard/vcard.ui" line="546"/>
+        <source>Contact</source>
+        <translation>Контактная информация</translation>
+    </message>
+    <message>
+        <location filename="../ui/widgets/vcard/vcard.ui" line="713"/>
+        <source>Jabber ID</source>
+        <translation>Jabber ID</translation>
+    </message>
+    <message>
+        <location filename="../ui/widgets/vcard/vcard.ui" line="739"/>
+        <source>Web site</source>
+        <translation>Веб сайт</translation>
+    </message>
+    <message>
+        <location filename="../ui/widgets/vcard/vcard.ui" line="798"/>
+        <location filename="../ui/widgets/vcard/vcard.ui" line="822"/>
+        <source>Description</source>
+        <translation>Описание</translation>
+    </message>
+    <message>
+        <location filename="../ui/widgets/vcard/vcard.ui" line="859"/>
+        <source>Set avatar</source>
+        <translation>Установить иконку</translation>
+    </message>
+    <message>
+        <location filename="../ui/widgets/vcard/vcard.ui" line="868"/>
+        <source>Clear avatar</source>
+        <translation>Убрать иконку</translation>
+    </message>
+    <message>
+        <location filename="../ui/widgets/vcard/vcard.cpp" line="93"/>
+        <source>Account %1 card</source>
+        <translation>Карточка учетной записи %1</translation>
+    </message>
+    <message>
+        <location filename="../ui/widgets/vcard/vcard.cpp" line="108"/>
+        <source>Contact %1 card</source>
+        <translation>Карточка контакта %1</translation>
+    </message>
+    <message>
+        <location filename="../ui/widgets/vcard/vcard.cpp" line="170"/>
+        <source>Received %1 at %2</source>
+        <translation>Получено %1 в %2</translation>
+    </message>
+    <message>
+        <location filename="../ui/widgets/vcard/vcard.cpp" line="221"/>
+        <source>Chose your new avatar</source>
+        <translation>Выберите новую иконку</translation>
+    </message>
+    <message>
+        <location filename="../ui/widgets/vcard/vcard.cpp" line="223"/>
+        <source>Images (*.png *.jpg *.jpeg)</source>
+        <translation>Изображения (*.png *.jpg *.jpeg)</translation>
+    </message>
+    <message>
+        <location filename="../ui/widgets/vcard/vcard.cpp" line="310"/>
+        <source>Add email address</source>
+        <translation>Добавить адрес электронной почты</translation>
+    </message>
+    <message>
+        <location filename="../ui/widgets/vcard/vcard.cpp" line="320"/>
+        <source>Unset this email as preferred</source>
+        <translation>Убрать отметку &quot;предпочтительный&quot; с этого адреса</translation>
+    </message>
+    <message>
+        <location filename="../ui/widgets/vcard/vcard.cpp" line="323"/>
+        <source>Set this email as preferred</source>
+        <translation>Отметить этот адрес как &quot;предпочтительный&quot;</translation>
+    </message>
+    <message>
+        <location filename="../ui/widgets/vcard/vcard.cpp" line="328"/>
+        <source>Remove selected email addresses</source>
+        <translation>Удалить выбранные адреса</translation>
+    </message>
+    <message>
+        <location filename="../ui/widgets/vcard/vcard.cpp" line="333"/>
+        <source>Copy selected emails to clipboard</source>
+        <translation>Скопировать выбранные адреса в буфер обмена</translation>
+    </message>
+    <message>
+        <location filename="../ui/widgets/vcard/vcard.cpp" line="338"/>
+        <source>Add phone number</source>
+        <translation>Добавить номер телефона</translation>
+    </message>
+    <message>
+        <location filename="../ui/widgets/vcard/vcard.cpp" line="348"/>
+        <source>Unset this phone as preferred</source>
+        <translation>Убрать отметку &quot;предпочтительный&quot; с этого номера</translation>
+    </message>
+    <message>
+        <location filename="../ui/widgets/vcard/vcard.cpp" line="351"/>
+        <source>Set this phone as preferred</source>
+        <translation>Отметить этот номер как &quot;предпочтительный&quot;</translation>
+    </message>
+    <message>
+        <location filename="../ui/widgets/vcard/vcard.cpp" line="356"/>
+        <source>Remove selected phone numbers</source>
+        <translation>Удалить выбранные телефонные номера</translation>
+    </message>
+    <message>
+        <location filename="../ui/widgets/vcard/vcard.cpp" line="361"/>
+        <source>Copy selected phones to clipboard</source>
+        <translation>Скопировать выбранные телефонные номера в буфер обмена</translation>
+    </message>
 </context>
 </TS>

ui/widgets/vcard/emailsmodel.cpp

@@ -52,7 +52,7 @@ QVariant UI::VCard::EMailsModel::data(const QModelIndex& index, int role) const
             case 1:
                 switch (role) {
                     case Qt::DisplayRole:
-                        return tr(Shared::VCard::Email::roleNames[deque[index.row()].role].toStdString().c_str());
+                        return QCoreApplication::translate("Global", Shared::VCard::Email::roleNames[deque[index.row()].role].toStdString().c_str());
                     case Qt::EditRole: 
                         return deque[index.row()].role;
                     default:

ui/widgets/vcard/phonesmodel.cpp

@@ -52,7 +52,7 @@ QVariant UI::VCard::PhonesModel::data(const QModelIndex& index, int role) const
             case 1:
                 switch (role) {
                     case Qt::DisplayRole:
-                        return tr(Shared::VCard::Phone::roleNames[deque[index.row()].role].toStdString().c_str());
+                        return QCoreApplication::translate("Global", Shared::VCard::Phone::roleNames[deque[index.row()].role].toStdString().c_str());
                     case Qt::EditRole: 
                         return deque[index.row()].role;
                     default:
@@ -62,7 +62,7 @@ QVariant UI::VCard::PhonesModel::data(const QModelIndex& index, int role) const
             case 2:
                 switch (role) {
                     case Qt::DisplayRole:
-                        return tr(Shared::VCard::Phone::typeNames[deque[index.row()].type].toStdString().c_str());
+                        return QCoreApplication::translate("Global", Shared::VCard::Phone::typeNames[deque[index.row()].type].toStdString().c_str());
                     case Qt::EditRole: 
                         return deque[index.row()].type;
                     default:

ui/widgets/vcard/vcard.cpp

@@ -55,17 +55,17 @@ VCard::VCard(const QString& jid, bool edit, QWidget* parent):
     setAvatar->setEnabled(true);
     clearAvatar->setEnabled(false);
     
-    roleDelegate->addEntry(tr(Shared::VCard::Email::roleNames[0].toStdString().c_str()));
+    roleDelegate->addEntry(QCoreApplication::translate("Global", Shared::VCard::Email::roleNames[0].toStdString().c_str()));
-    roleDelegate->addEntry(tr(Shared::VCard::Email::roleNames[1].toStdString().c_str()));
+    roleDelegate->addEntry(QCoreApplication::translate("Global", Shared::VCard::Email::roleNames[1].toStdString().c_str()));
-    roleDelegate->addEntry(tr(Shared::VCard::Email::roleNames[2].toStdString().c_str()));
+    roleDelegate->addEntry(QCoreApplication::translate("Global", Shared::VCard::Email::roleNames[2].toStdString().c_str()));
     
-    phoneTypeDelegate->addEntry(tr(Shared::VCard::Phone::typeNames[0].toStdString().c_str()));
+    phoneTypeDelegate->addEntry(QCoreApplication::translate("Global", Shared::VCard::Phone::typeNames[0].toStdString().c_str()));
-    phoneTypeDelegate->addEntry(tr(Shared::VCard::Phone::typeNames[1].toStdString().c_str()));
+    phoneTypeDelegate->addEntry(QCoreApplication::translate("Global", Shared::VCard::Phone::typeNames[1].toStdString().c_str()));
-    phoneTypeDelegate->addEntry(tr(Shared::VCard::Phone::typeNames[2].toStdString().c_str()));
+    phoneTypeDelegate->addEntry(QCoreApplication::translate("Global", Shared::VCard::Phone::typeNames[2].toStdString().c_str()));
-    phoneTypeDelegate->addEntry(tr(Shared::VCard::Phone::typeNames[3].toStdString().c_str()));
+    phoneTypeDelegate->addEntry(QCoreApplication::translate("Global", Shared::VCard::Phone::typeNames[3].toStdString().c_str()));
-    phoneTypeDelegate->addEntry(tr(Shared::VCard::Phone::typeNames[4].toStdString().c_str()));
+    phoneTypeDelegate->addEntry(QCoreApplication::translate("Global", Shared::VCard::Phone::typeNames[4].toStdString().c_str()));
-    phoneTypeDelegate->addEntry(tr(Shared::VCard::Phone::typeNames[5].toStdString().c_str()));
+    phoneTypeDelegate->addEntry(QCoreApplication::translate("Global", Shared::VCard::Phone::typeNames[5].toStdString().c_str()));
-    phoneTypeDelegate->addEntry(tr(Shared::VCard::Phone::typeNames[6].toStdString().c_str()));
+    phoneTypeDelegate->addEntry(QCoreApplication::translate("Global", Shared::VCard::Phone::typeNames[6].toStdString().c_str()));
     
     m_ui->emailsView->setContextMenuPolicy(Qt::CustomContextMenu);
     m_ui->emailsView->setModel(&emails);
@@ -317,7 +317,7 @@ void VCard::onContextMenu(const QPoint& point)
                 if (selectionSize == 1) {
                     int row = sm->selectedRows().at(0).row();
                     if (emails.isPreferred(row)) {
-                        QAction* rev = contextMenu->addAction(Shared::icon("view-media-favorite"), tr("Unset this email as preferred"));
+                        QAction* rev = contextMenu->addAction(Shared::icon("unfavorite"), tr("Unset this email as preferred"));
                         connect(rev, &QAction::triggered, std::bind(&UI::VCard::EMailsModel::revertPreferred, &emails, row));
                     } else {
                         QAction* rev = contextMenu->addAction(Shared::icon("favorite"), tr("Set this email as preferred"));
@@ -325,12 +325,12 @@ void VCard::onContextMenu(const QPoint& point)
                     }
                 }
                 
-                QAction* del = contextMenu->addAction(Shared::icon("remove"), tr("Remove selected email addresses"));
+                QAction* del = contextMenu->addAction(Shared::icon("edit-delete"), tr("Remove selected email addresses"));
                 connect(del, &QAction::triggered, this, &VCard::onRemoveEmail);
             }
         }
         
-        QAction* cp = contextMenu->addAction(Shared::icon("copy"), tr("Copy selected emails to clipboard"));
+        QAction* cp = contextMenu->addAction(Shared::icon("edit-copy"), tr("Copy selected emails to clipboard"));
         connect(cp, &QAction::triggered, this, &VCard::onCopyEmail);
     } else if (snd == m_ui->phonesView) {
         hasMenu = true;
@@ -353,12 +353,12 @@ void VCard::onContextMenu(const QPoint& point)
                     }
                 }
                 
-                QAction* del = contextMenu->addAction(Shared::icon("remove"), tr("Remove selected phone numbers"));
+                QAction* del = contextMenu->addAction(Shared::icon("edit-delete"), tr("Remove selected phone numbers"));
                 connect(del, &QAction::triggered, this, &VCard::onRemovePhone);
             }
         }
         
-        QAction* cp = contextMenu->addAction(Shared::icon("copy"), tr("Copy selected phones to clipboard"));
+        QAction* cp = contextMenu->addAction(Shared::icon("edit-copy"), tr("Copy selected phones to clipboard"));
         connect(cp, &QAction::triggered, this, &VCard::onCopyPhone);
     }
     
@@ -431,32 +431,30 @@ void VCard::onRemovePhone()
 
 void VCard::onCopyEmail()
 {
-    QItemSelection selection(m_ui->emailsView->selectionModel()->selection());
+    QList<QModelIndex> selection(m_ui->emailsView->selectionModel()->selectedRows());
     
     QList<QString> addrs;
-    for (const QModelIndex& index : selection.indexes()) {
+    for (const QModelIndex& index : selection) {
         addrs.push_back(emails.getEmail(index.row()));
     }
     
     QString list = addrs.join("\n");
     
-    qDebug() << list;
     QClipboard* cb = QApplication::clipboard();
     cb->setText(list);
 }
 
 void VCard::onCopyPhone()
 {
-    QItemSelection selection(m_ui->phonesView->selectionModel()->selection());
+    QList<QModelIndex> selection(m_ui->phonesView->selectionModel()->selectedRows());
     
     QList<QString> phs;
-    for (const QModelIndex& index : selection.indexes()) {
+    for (const QModelIndex& index : selection) {
         phs.push_back(phones.getPhone(index.row()));
     }
     
     QString list = phs.join("\n");
     
-    qDebug() << list;
     QClipboard* cb = QApplication::clipboard();
     cb->setText(list);
 }

ui/widgets/vcard/vcard.ui

@@ -124,10 +124,10 @@
             </sizepolicy>
            </property>
            <property name="styleSheet">
-            <string notr="true"/>
+            <string notr="true">font: 600 16pt;</string>
            </property>
            <property name="text">
-            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:16pt; font-weight:600;&quot;&gt;Organization&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+            <string>Organization</string>
            </property>
            <property name="alignment">
             <set>Qt::AlignCenter</set>
@@ -418,8 +418,11 @@
          </item>
          <item row="0" column="0" colspan="4">
           <widget class="QLabel" name="generalHeading">
+           <property name="styleSheet">
+            <string notr="true">font: 600 24pt ;</string>
+           </property>
            <property name="text">
-            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:24pt; font-weight:600;&quot;&gt;General&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+            <string>General</string>
            </property>
           </widget>
          </item>
@@ -445,7 +448,7 @@
             </sizepolicy>
            </property>
            <property name="styleSheet">
-            <string notr="true"/>
+            <string notr="true">font: 600 16pt;</string>
            </property>
            <property name="frameShape">
             <enum>QFrame::NoFrame</enum>
@@ -454,7 +457,7 @@
             <enum>QFrame::Plain</enum>
            </property>
            <property name="text">
-            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:16pt; font-weight:600;&quot;&gt;Personal information&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+            <string>Personal information</string>
            </property>
            <property name="alignment">
             <set>Qt::AlignCenter</set>
@@ -536,8 +539,11 @@
          </property>
          <item>
           <widget class="QLabel" name="contactHeading">
+           <property name="styleSheet">
+            <string notr="true">font: 600 24pt ;</string>
+           </property>
            <property name="text">
-            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:24pt; font-weight:600;&quot;&gt;Contact&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+            <string>Contact</string>
            </property>
           </widget>
          </item>
@@ -561,7 +567,7 @@
               <x>0</x>
               <y>0</y>
               <width>566</width>
-              <height>497</height>
+              <height>498</height>
              </rect>
             </property>
             <layout class="QGridLayout" name="gridLayout_3" columnstretch="1,3,1">
@@ -640,8 +646,11 @@
              </item>
              <item row="8" column="1">
               <widget class="QLabel" name="addressesHeading">
+               <property name="styleSheet">
+                <string notr="true">font: 600 16pt;</string>
+               </property>
                <property name="text">
-                <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:16pt; font-weight:600;&quot;&gt;Addresses&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                <string>Addresses</string>
                </property>
                <property name="alignment">
                 <set>Qt::AlignCenter</set>
@@ -666,8 +675,11 @@
              </item>
              <item row="2" column="1">
               <widget class="QLabel" name="emailsHeading">
+               <property name="styleSheet">
+                <string notr="true">font: 600 16pt;</string>
+               </property>
                <property name="text">
-                <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:16pt; font-weight:600;&quot;&gt;E-Mail addresses&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                <string>E-Mail addresses</string>
                </property>
                <property name="alignment">
                 <set>Qt::AlignCenter</set>
@@ -748,8 +760,11 @@
              </item>
              <item row="5" column="1">
               <widget class="QLabel" name="phenesHeading">
+               <property name="styleSheet">
+                <string notr="true">font: 600 16pt;</string>
+               </property>
                <property name="text">
-                <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:16pt; font-weight:600;&quot;&gt;Phone numbers&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                <string>Phone numbers</string>
                </property>
                <property name="alignment">
                 <set>Qt::AlignCenter</set>
@@ -800,8 +815,11 @@
          </property>
          <item row="0" column="0">
           <widget class="QLabel" name="descriptionHeading">
+           <property name="styleSheet">
+            <string notr="true">font: 600 24pt ;</string>
+           </property>
            <property name="text">
-            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:24pt; font-weight:600;&quot;&gt;Description&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+            <string>Description</string>
            </property>
           </widget>
          </item>