new fallback icons, new fields in vCard, fix about recreation new avatar on each request

core/account.cpp

@@ -1353,18 +1353,28 @@ void Core::Account::onVCardReceived(const QXmppVCardIq& card)
     if (ava.size() > 0) {
         item->setAvatar(ava);
     } else {
+        if (!item->hasAvatar() || !item->isAvatarAutoGenerated()) {
             item->setAutoGeneratedAvatar();
         }
+    }
     
     Shared::VCard vCard;
+    vCard.setFullName(card.fullName());
     vCard.setFirstName(card.firstName());
     vCard.setMiddleName(card.middleName());
     vCard.setLastName(card.lastName());
     vCard.setBirthday(card.birthday());
     vCard.setNickName(card.nickName());
     vCard.setDescription(card.description());
+    vCard.setUrl(card.url());
+    QXmppVCardOrganization org = card.organization();
+    vCard.setOrgName(org.organization());
+    vCard.setOrgRole(org.role());
+    vCard.setOrgUnit(org.unit());
+    vCard.setOrgTitle(org.title());
+    
     if (item->hasAvatar()) {
-        if (item->isAvatarAutoGenerated()) {
+        if (!item->isAvatarAutoGenerated()) {
             vCard.setAvatarType(Shared::Avatar::valid);
         } else {
             vCard.setAvatarType(Shared::Avatar::autocreated);
@@ -1465,12 +1475,19 @@ void Core::Account::onOwnVCardReceived(const QXmppVCardIq& card)
     ownVCardRequestInProgress = false;
     
     Shared::VCard vCard;
+    vCard.setFullName(card.fullName());
     vCard.setFirstName(card.firstName());
     vCard.setMiddleName(card.middleName());
     vCard.setLastName(card.lastName());
     vCard.setBirthday(card.birthday());
     vCard.setNickName(card.nickName());
     vCard.setDescription(card.description());
+    vCard.setUrl(card.url());
+    QXmppVCardOrganization org = card.organization();
+    vCard.setOrgName(org.organization());
+    vCard.setOrgRole(org.role());
+    vCard.setOrgUnit(org.unit());
+    vCard.setOrgTitle(org.title());
     if (avatarType.size() > 0) {
         vCard.setAvatarType(Shared::Avatar::valid);
         vCard.setAvatarPath(path + "avatar." + avatarType);
@@ -1515,12 +1532,20 @@ void Core::Account::requestVCard(const QString& jid)
 void Core::Account::uploadVCard(const Shared::VCard& card)
 {
     QXmppVCardIq iq;
+    iq.setFullName(card.getFullName());
     iq.setFirstName(card.getFirstName());
     iq.setMiddleName(card.getMiddleName());
     iq.setLastName(card.getLastName());
     iq.setNickName(card.getNickName());
     iq.setBirthday(card.getBirthday());
     iq.setDescription(card.getDescription());
+    iq.setUrl(card.getUrl());
+    QXmppVCardOrganization org;
+    org.setOrganization(card.getOrgName());
+    org.setUnit(card.getOrgUnit());
+    org.setRole(card.getOrgRole());
+    org.setTitle(card.getOrgTitle());
+    iq.setOrganization(org);
     
     bool avatarChanged = false;
     if (card.getAvatarType() == Shared::Avatar::empty) {

global.cpp

@@ -323,11 +323,17 @@ Shared::VCard::Address::Address(const QString& zCode, const QString& cntry, cons
 {}
 
 Shared::VCard::VCard():
+    fullName(),
     firstName(),
     middleName(),
     lastName(),
     nickName(),
     description(),
+    url(),
+    organizationName(),
+    organizationUnit(),
+    organizationRole(),
+    jobTitle(),
     birthday(),
     photoType(Avatar::empty),
     photoPath(),
@@ -338,11 +344,17 @@ Shared::VCard::VCard():
 {}
 
 Shared::VCard::VCard(const QDateTime& creationTime):
+    fullName(),
     firstName(),
     middleName(),
     lastName(),
     nickName(),
     description(),
+    url(),
+    organizationName(),
+    organizationUnit(),
+    organizationRole(),
+    jobTitle(),
     birthday(),
     photoType(Avatar::empty),
     photoPath(),
@@ -449,6 +461,78 @@ void Shared::VCard::setNickName(const QString& nick)
     }
 }
 
+QString Shared::VCard::getFullName() const
+{
+    return fullName;
+}
+
+QString Shared::VCard::getUrl() const
+{
+    return url;
+}
+
+void Shared::VCard::setFullName(const QString& name)
+{
+    if (fullName != name) {
+        fullName = name;
+    }
+}
+
+void Shared::VCard::setUrl(const QString& u)
+{
+    if (url != u) {
+        url = u;
+    }
+}
+
+QString Shared::VCard::getOrgName() const
+{
+    return organizationName;
+}
+
+QString Shared::VCard::getOrgRole() const
+{
+    return organizationRole;
+}
+
+QString Shared::VCard::getOrgTitle() const
+{
+    return jobTitle;
+}
+
+QString Shared::VCard::getOrgUnit() const
+{
+    return organizationUnit;
+}
+
+void Shared::VCard::setOrgName(const QString& name)
+{
+    if (organizationName != name) {
+        organizationName = name;
+    }
+}
+
+void Shared::VCard::setOrgRole(const QString& role)
+{
+    if (organizationRole != role) {
+        organizationRole = role;
+    }
+}
+
+void Shared::VCard::setOrgTitle(const QString& title)
+{
+    if (jobTitle != title) {
+        jobTitle = title;
+    }
+}
+
+void Shared::VCard::setOrgUnit(const QString& unit)
+{
+    if (organizationUnit != unit) {
+        organizationUnit = unit;
+    }
+}
+
 QIcon Shared::availabilityIcon(Shared::Availability av, bool big)
 {
     const std::deque<QString>& fallback = QApplication::palette().window().color().lightnessF() > 0.5 ? 

global.h

@@ -272,6 +272,8 @@ public:
     VCard();
     VCard(const QDateTime& creationTime);
     
+    QString getFullName() const;
+    void setFullName(const QString& name);
     QString getFirstName() const;
     void setFirstName(const QString& first);
     QString getMiddleName() const;
@@ -282,19 +284,35 @@ public:
     void setNickName(const QString& nick);
     QString getDescription() const;
     void setDescription(const QString& descr);
+    QString getUrl() const;
+    void setUrl(const QString& u);
     QDate getBirthday() const;
     void setBirthday(const QDate& date);
     Avatar getAvatarType() const;
     void setAvatarType(Avatar type);
     QString getAvatarPath() const;
     void setAvatarPath(const QString& path);
+    QString getOrgName() const;
+    void setOrgName(const QString& name);
+    QString getOrgUnit() const;
+    void setOrgUnit(const QString& unit);
+    QString getOrgRole() const;
+    void setOrgRole(const QString& role);
+    QString getOrgTitle() const;
+    void setOrgTitle(const QString& title);
     
 private:
+    QString fullName;
     QString firstName;
     QString middleName;
     QString lastName;
     QString nickName;
     QString description;
+    QString url;
+    QString organizationName;
+    QString organizationUnit;
+    QString organizationRole;
+    QString jobTitle;
     QDate birthday;
     Avatar photoType;
     QString photoPath;
@@ -438,6 +456,10 @@ static const std::map<QString, std::pair<QString, QString>> icons = {
     {"send", {"document-send", "send"}},
     {"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"}},
 };
 
 };

resources/images/fallback/dark/big/edit-rename.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="m14.996094 3l-11.992188 11.992188h-.003906v4.00781h1 2 1.00781v-.003906l11.992188-11.992188-.001953-.001953.001953-.001953-4-4-.001953.001953-.001953-.001953m-1.998047 3.412109l2.589844 2.589844-7.587891 7.587891v-1.589844h-1-1v-1-.589844l6.998047-6.998047m-7.998047 7.998047v1.589844h1 1v1 .589844l-.410156.410156h-1.589844l-1-1v-1.589844l1-1" 
+    class="ColorScheme-Text"
+    />
+</svg>

resources/images/fallback/dark/big/group-new.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 14 3 C 12.338 3 11 4.338 11 6 C 11 7.662 12.338 9 14 9 C 15.662 9 17 7.662 17 6 C 17 4.338 15.662 3 14 3 z M 8 6 C 6.3380003 6 5 7.3380003 5 9 C 5 10.662 6.3380003 12 8 12 C 9.6619997 12 11 10.662 11 9 C 11 7.3380003 9.6619997 6 8 6 z M 14 10 C 13.353654 10 12.744006 10.134157 12.181641 10.361328 L 12.636719 11.275391 C 13.064535 11.114885 13.514485 11 14 11 C 15.482985 11 16.758385 11.807292 17.449219 13 L 18.580078 13 C 17.810617 11.232833 16.056835 10 14 10 z M 8 13 C 5.2299834 13 3 15.229983 3 18 L 3 19 L 13 19 L 13 18 C 13 15.229983 10.770017 13 8 13 z M 8 14 C 10.216017 14 12 15.783983 12 18 L 4 18 C 4 15.783983 5.7839834 14 8 14 z M 16 14 L 16 16 L 14 16 L 14 17 L 16 17 L 16 19 L 17 19 L 17 17 L 19 17 L 19 16 L 17 16 L 17 14 L 16 14 z "
+    class="ColorScheme-Text"
+    />  
+</svg>

resources/images/fallback/dark/big/group.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 14 3 C 12.338 3 11 4.338 11 6 C 11 7.662 12.338 9 14 9 C 15.662 9 17 7.662 17 6 C 17 4.338 15.662 3 14 3 z M 8 6 C 6.338 6 5 7.338 5 9 C 5 10.662 6.338 12 8 12 C 9.662 12 11 10.662 11 9 C 11 7.338 9.662 6 8 6 z M 14 10 C 13.353654 10 12.744006 10.134157 12.181641 10.361328 L 12.636719 11.275391 C 13.064535 11.114885 13.514485 11 14 11 C 16.21602 11 18 12.78398 18 15 L 14.5 15 L 15 16 L 19 16 L 19 15 C 19 12.22998 16.77002 10 14 10 z M 8 13 C 5.229983 13 3 15.229983 3 18 L 3 19 L 13 19 L 13 18 C 13 15.229983 10.770017 13 8 13 z M 8 14 C 10.216017 14 12 15.783983 12 18 L 4 18 C 4 15.783983 5.783983 14 8 14 z "
+	class="ColorScheme-Text"
+    />  
+</svg>

resources/images/fallback/dark/big/user-properties.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 3 L 10 4 L 19 4 L 19 3 L 10 3 z M 8 6 C 6.338 6 5 7.338 5 9 C 5 10.662 6.338 12 8 12 C 9.662 12 11 10.662 11 9 C 11 7.338 9.662 6 8 6 z M 12 8 L 12 9 L 19 9 L 19 8 L 12 8 z M 8 13 C 5.229983 13 3 15.229983 3 18 L 3 19 L 13 19 L 13 18 C 13 15.229983 10.770017 13 8 13 z M 13 13 L 13 14 L 19 14 L 19 13 L 13 13 z M 8 14 C 10.216017 14 12 15.783983 12 18 L 4 18 C 4 15.783983 5.783983 14 8 14 z "
+	class="ColorScheme-Text"
+    />  
+</svg>

resources/images/fallback/dark/small/edit-rename.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 10.398438 2 L 5.2871094 7.1113281 L 2 10.398438 L 2 14 L 5.6015625 14 L 14 5.6015625 L 10.398438 2 z M 8.3496094 5.4902344 L 10.509766 7.6503906 L 7.3359375 10.826172 L 7.3359375 10.150391 L 6.3222656 10.171875 L 5.2871094 10.171875 L 5.2871094 9.1367188 L 5.2871094 8.5507812 L 6.7285156 7.1113281 L 8.3496094 5.4902344 z M 4.2734375 9.5644531 L 4.2734375 11.185547 L 5.3085938 11.185547 L 6.3007812 11.185547 L 6.3222656 11.837891 L 5.2421875 12.919922 L 3.8007812 12.919922 L 3.0800781 12.199219 L 3.0800781 10.757812 L 4.2734375 9.5644531 z "
+     class="ColorScheme-Text"
+     />
+</svg>

resources/images/fallback/dark/small/group-new.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 11.5 2 A 2.5 2.5 0 0 0 9 4.5 A 2.5 2.5 0 0 0 11.5 7 A 2.5 2.5 0 0 0 14 4.5 A 2.5 2.5 0 0 0 11.5 2 z M 5.5 4 A 2.5 2.5 0 0 0 3 6.5 A 2.5 2.5 0 0 0 5.5 9 A 2.5 2.5 0 0 0 8 6.5 A 2.5 2.5 0 0 0 5.5 4 z M 11 8.0722656 A 3.4999979 4 0 0 0 8.4921875 10.273438 A 4.5 5 0 0 1 9.0917969 11 L 9.2929688 11 A 2.5 3 0 0 1 11 9.1074219 L 11 8.0722656 z M 12 9 L 12 11 L 10 11 L 10 12 L 12 12 L 12 14 L 13 14 L 13 12 L 15 12 L 15 11 L 13 11 L 13 9 L 12 9 z M 5.5 10 A 3.4999979 4 0 0 0 2 14 L 3 14 L 8 14 L 9 14 A 3.4999979 4 0 0 0 5.5 10 z M 5.5 11 A 2.5 3 0 0 1 7.8535156 13 L 3.1464844 13 A 2.5 3 0 0 1 5.5 11 z "
+     class="ColorScheme-Text"
+     />
+</svg>

resources/images/fallback/dark/small/group.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 11.5 2 A 2.5 2.5 0 0 0 9 4.5 A 2.5 2.5 0 0 0 11.5 7 A 2.5 2.5 0 0 0 14 4.5 A 2.5 2.5 0 0 0 11.5 2 z M 5.5 4 A 2.5 2.5 0 0 0 3 6.5 A 2.5 2.5 0 0 0 5.5 9 A 2.5 2.5 0 0 0 8 6.5 A 2.5 2.5 0 0 0 5.5 4 z M 11.646484 8 A 3.4999979 4 0 0 0 8.4921875 10.273438 A 4.5 5 0 0 1 9.6171875 12 L 14.146484 12 L 15.146484 12 A 3.4999979 4 0 0 0 11.646484 8 z M 11.646484 9 A 2.5 3 0 0 1 14 11 L 9.2929688 11 A 2.5 3 0 0 1 11.646484 9 z M 5.5 10 A 3.4999979 4 0 0 0 2 14 L 3 14 L 8 14 L 9 14 A 3.4999979 4 0 0 0 5.5 10 z M 5.5 11 A 2.5 3 0 0 1 7.8535156 13 L 3.1464844 13 A 2.5 3 0 0 1 5.5 11 z "
+     class="ColorScheme-Text"
+     />
+</svg>

resources/images/fallback/dark/small/user-properties.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 9 2 L 9 3 L 14 3 L 14 2 L 9 2 z M 5.5 4 A 2.5 2.5 0 0 0 3 6.5 A 2.5 2.5 0 0 0 5.5 9 A 2.5 2.5 0 0 0 8 6.5 A 2.5 2.5 0 0 0 5.5 4 z M 9 5 L 9 6 L 14 6 L 14 5 L 9 5 z M 9 8 L 9 9 L 14 9 L 14 8 L 9 8 z M 5.5 10 A 3.499998 4 0 0 0 2 14 L 9 14 A 3.499998 4 0 0 0 5.5 10 z M 5.5 11 A 2.5 3 0 0 1 7.8535156 13 L 3.1464844 13 A 2.5 3 0 0 1 5.5 11 z "
+     class="ColorScheme-Text"/>
+</svg>

resources/images/fallback/light/big/edit-rename.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="m14.996094 3l-11.992188 11.992188h-.003906v4.00781h1 2 1.00781v-.003906l11.992188-11.992188-.001953-.001953.001953-.001953-4-4-.001953.001953-.001953-.001953m-1.998047 3.412109l2.589844 2.589844-7.587891 7.587891v-1.589844h-1-1v-1-.589844l6.998047-6.998047m-7.998047 7.998047v1.589844h1 1v1 .589844l-.410156.410156h-1.589844l-1-1v-1.589844l1-1" 
+    class="ColorScheme-Text"
+    />
+</svg>

resources/images/fallback/light/big/group-new.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 14 3 C 12.338 3 11 4.338 11 6 C 11 7.662 12.338 9 14 9 C 15.662 9 17 7.662 17 6 C 17 4.338 15.662 3 14 3 z M 8 6 C 6.3380003 6 5 7.3380003 5 9 C 5 10.662 6.3380003 12 8 12 C 9.6619997 12 11 10.662 11 9 C 11 7.3380003 9.6619997 6 8 6 z M 14 10 C 13.353654 10 12.744006 10.134157 12.181641 10.361328 L 12.636719 11.275391 C 13.064535 11.114885 13.514485 11 14 11 C 15.482985 11 16.758385 11.807292 17.449219 13 L 18.580078 13 C 17.810617 11.232833 16.056835 10 14 10 z M 8 13 C 5.2299834 13 3 15.229983 3 18 L 3 19 L 13 19 L 13 18 C 13 15.229983 10.770017 13 8 13 z M 8 14 C 10.216017 14 12 15.783983 12 18 L 4 18 C 4 15.783983 5.7839834 14 8 14 z M 16 14 L 16 16 L 14 16 L 14 17 L 16 17 L 16 19 L 17 19 L 17 17 L 19 17 L 19 16 L 17 16 L 17 14 L 16 14 z "
+    class="ColorScheme-Text"
+    />  
+</svg>

resources/images/fallback/light/big/group.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 14 3 C 12.338 3 11 4.338 11 6 C 11 7.662 12.338 9 14 9 C 15.662 9 17 7.662 17 6 C 17 4.338 15.662 3 14 3 z M 8 6 C 6.338 6 5 7.338 5 9 C 5 10.662 6.338 12 8 12 C 9.662 12 11 10.662 11 9 C 11 7.338 9.662 6 8 6 z M 14 10 C 13.353654 10 12.744006 10.134157 12.181641 10.361328 L 12.636719 11.275391 C 13.064535 11.114885 13.514485 11 14 11 C 16.21602 11 18 12.78398 18 15 L 14.5 15 L 15 16 L 19 16 L 19 15 C 19 12.22998 16.77002 10 14 10 z M 8 13 C 5.229983 13 3 15.229983 3 18 L 3 19 L 13 19 L 13 18 C 13 15.229983 10.770017 13 8 13 z M 8 14 C 10.216017 14 12 15.783983 12 18 L 4 18 C 4 15.783983 5.783983 14 8 14 z "
+	class="ColorScheme-Text"
+    />  
+</svg>

resources/images/fallback/light/big/user-properties.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 3 L 10 4 L 19 4 L 19 3 L 10 3 z M 8 6 C 6.338 6 5 7.338 5 9 C 5 10.662 6.338 12 8 12 C 9.662 12 11 10.662 11 9 C 11 7.338 9.662 6 8 6 z M 12 8 L 12 9 L 19 9 L 19 8 L 12 8 z M 8 13 C 5.229983 13 3 15.229983 3 18 L 3 19 L 13 19 L 13 18 C 13 15.229983 10.770017 13 8 13 z M 13 13 L 13 14 L 19 14 L 19 13 L 13 13 z M 8 14 C 10.216017 14 12 15.783983 12 18 L 4 18 C 4 15.783983 5.783983 14 8 14 z "
+	class="ColorScheme-Text"
+    />  
+</svg>

resources/images/fallback/light/small/edit-rename.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 10.398438 2 L 5.2871094 7.1113281 L 2 10.398438 L 2 14 L 5.6015625 14 L 14 5.6015625 L 10.398438 2 z M 8.3496094 5.4902344 L 10.509766 7.6503906 L 7.3359375 10.826172 L 7.3359375 10.150391 L 6.3222656 10.171875 L 5.2871094 10.171875 L 5.2871094 9.1367188 L 5.2871094 8.5507812 L 6.7285156 7.1113281 L 8.3496094 5.4902344 z M 4.2734375 9.5644531 L 4.2734375 11.185547 L 5.3085938 11.185547 L 6.3007812 11.185547 L 6.3222656 11.837891 L 5.2421875 12.919922 L 3.8007812 12.919922 L 3.0800781 12.199219 L 3.0800781 10.757812 L 4.2734375 9.5644531 z "
+     class="ColorScheme-Text"
+     />
+</svg>

resources/images/fallback/light/small/group-new.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 11.5 2 A 2.5 2.5 0 0 0 9 4.5 A 2.5 2.5 0 0 0 11.5 7 A 2.5 2.5 0 0 0 14 4.5 A 2.5 2.5 0 0 0 11.5 2 z M 5.5 4 A 2.5 2.5 0 0 0 3 6.5 A 2.5 2.5 0 0 0 5.5 9 A 2.5 2.5 0 0 0 8 6.5 A 2.5 2.5 0 0 0 5.5 4 z M 11 8.0722656 A 3.4999979 4 0 0 0 8.4921875 10.273438 A 4.5 5 0 0 1 9.0917969 11 L 9.2929688 11 A 2.5 3 0 0 1 11 9.1074219 L 11 8.0722656 z M 12 9 L 12 11 L 10 11 L 10 12 L 12 12 L 12 14 L 13 14 L 13 12 L 15 12 L 15 11 L 13 11 L 13 9 L 12 9 z M 5.5 10 A 3.4999979 4 0 0 0 2 14 L 3 14 L 8 14 L 9 14 A 3.4999979 4 0 0 0 5.5 10 z M 5.5 11 A 2.5 3 0 0 1 7.8535156 13 L 3.1464844 13 A 2.5 3 0 0 1 5.5 11 z "
+     class="ColorScheme-Text"
+     />
+</svg>

resources/images/fallback/light/small/group.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 11.5 2 A 2.5 2.5 0 0 0 9 4.5 A 2.5 2.5 0 0 0 11.5 7 A 2.5 2.5 0 0 0 14 4.5 A 2.5 2.5 0 0 0 11.5 2 z M 5.5 4 A 2.5 2.5 0 0 0 3 6.5 A 2.5 2.5 0 0 0 5.5 9 A 2.5 2.5 0 0 0 8 6.5 A 2.5 2.5 0 0 0 5.5 4 z M 11.646484 8 A 3.4999979 4 0 0 0 8.4921875 10.273438 A 4.5 5 0 0 1 9.6171875 12 L 14.146484 12 L 15.146484 12 A 3.4999979 4 0 0 0 11.646484 8 z M 11.646484 9 A 2.5 3 0 0 1 14 11 L 9.2929688 11 A 2.5 3 0 0 1 11.646484 9 z M 5.5 10 A 3.4999979 4 0 0 0 2 14 L 3 14 L 8 14 L 9 14 A 3.4999979 4 0 0 0 5.5 10 z M 5.5 11 A 2.5 3 0 0 1 7.8535156 13 L 3.1464844 13 A 2.5 3 0 0 1 5.5 11 z "
+     class="ColorScheme-Text"
+     />
+</svg>

resources/images/fallback/light/small/user-properties.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 9 2 L 9 3 L 14 3 L 14 2 L 9 2 z M 5.5 4 A 2.5 2.5 0 0 0 3 6.5 A 2.5 2.5 0 0 0 5.5 9 A 2.5 2.5 0 0 0 8 6.5 A 2.5 2.5 0 0 0 5.5 4 z M 9 5 L 9 6 L 14 6 L 14 5 L 9 5 z M 9 8 L 9 9 L 14 9 L 14 8 L 9 8 z M 5.5 10 A 3.499998 4 0 0 0 2 14 L 9 14 A 3.499998 4 0 0 0 5.5 10 z M 5.5 11 A 2.5 3 0 0 1 7.8535156 13 L 3.1464844 13 A 2.5 3 0 0 1 5.5 11 z "
+     class="ColorScheme-Text"/>
+</svg>

resources/resources.qrc

@@ -32,6 +32,10 @@
     <file>images/fallback/dark/big/clean.svg</file>
     <file>images/fallback/dark/big/send.svg</file>
     <file>images/fallback/dark/big/mail-attachment.svg</file>
+    <file>images/fallback/dark/big/group.svg</file>
+    <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/small/absent.svg</file>
@@ -64,6 +68,10 @@
     <file>images/fallback/dark/small/clean.svg</file>
     <file>images/fallback/dark/small/send.svg</file>
     <file>images/fallback/dark/small/mail-attachment.svg</file>
+    <file>images/fallback/dark/small/group.svg</file>
+    <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/light/big/absent.svg</file>
@@ -96,6 +104,10 @@
     <file>images/fallback/light/big/clean.svg</file>
     <file>images/fallback/light/big/send.svg</file>
     <file>images/fallback/light/big/mail-attachment.svg</file>
+    <file>images/fallback/light/big/group.svg</file>
+    <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/small/absent.svg</file>
@@ -128,5 +140,9 @@
     <file>images/fallback/light/small/clean.svg</file>
     <file>images/fallback/light/small/send.svg</file>
     <file>images/fallback/light/small/mail-attachment.svg</file>
+    <file>images/fallback/light/small/group.svg</file>
+    <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>
 </qresource>
 </RCC>

ui/models/roster.cpp

@@ -934,3 +934,23 @@ bool Models::Roster::groupHasContact(const QString& account, const QString& grou
         return gr->hasContact(contact);
     }
 }
+
+QString Models::Roster::getContactIconPath(const QString& account, const QString& jid)
+{
+    ElId id(account, jid);
+    std::multimap<ElId, Contact*>::const_iterator cItr = contacts.find(id);
+    QString path = "";
+    if (cItr == contacts.end()) {
+        std::map<ElId, Room*>::const_iterator rItr = rooms.find(id);
+        if (rItr == rooms.end()) {
+            qDebug() << "An attempt to get an icon path of non existing contact" << account << ":" << jid << ", returning empty value";
+        } else {
+            //path = rItr->second->getRoomName();
+        }
+    } else {
+        if (cItr->second->getAvatarState() != Shared::Avatar::empty) {
+            path = cItr->second->getAvatarPath();
+        }
+    }
+    return path;
+}

ui/models/roster.h

@@ -73,6 +73,7 @@ public:
     
     std::deque<QString> groupList(const QString& account) const;
     bool groupHasContact(const QString& account, const QString& group, const QString& contactJID) const;
+    QString getContactIconPath(const QString& account, const QString& jid);
     
     Accounts* accountsModel;
     

ui/squawk.cpp

@@ -464,11 +464,16 @@ void Squawk::accountMessage(const QString& account, const Shared::Message& data)
 
 void Squawk::notify(const QString& account, const Shared::Message& msg)
 {
-    QString name = QString(rosterModel.getContactName(account, msg.getPenPalJid()));;
+    QString name = QString(rosterModel.getContactName(account, msg.getPenPalJid()));
+    QString path = QString(rosterModel.getContactIconPath(account, msg.getPenPalJid()));
     QVariantList args;
     args << QString(QCoreApplication::applicationName());
     args << QVariant(QVariant::UInt);   //TODO some normal id
-    args << QString("mail-message");    //TODO icon
+    if (path.size() > 0) {
+        args << path;
+    } else {
+        args << QString("mail-message");
+    }
     if (msg.getType() == Shared::Message::groupChat) {
         args << msg.getFromResource() + " from " + name;
     } else {
@@ -635,7 +640,7 @@ void Squawk::onRosterContextMenu(const QPoint& point)
                         }
                     });
                 }
-                QAction* newGroup = groupsMenu->addAction(Shared::icon("resource-group-new"), tr("New group"));
+                QAction* newGroup = groupsMenu->addAction(Shared::icon("group-new"), tr("New group"));
                 newGroup->setEnabled(active);
                 connect(newGroup, &QAction::triggered, [this, accName, cntJID]() {
                     QInputDialog* dialog = new QInputDialog(this);

ui/widgets/vcard.cpp

@@ -52,6 +52,7 @@ VCard::VCard(const QString& jid, bool edit, QWidget* parent):
         avatarMenu->addAction(clearAvatar);
     } else {
         m_ui->buttonBox->hide();
+        m_ui->fullName->setReadOnly(true);
         m_ui->firstName->setReadOnly(true);
         m_ui->middleName->setReadOnly(true);
         m_ui->lastName->setReadOnly(true);
@@ -89,16 +90,18 @@ void VCard::setVCard(const QString& jid, const Shared::VCard& card)
 
 void VCard::setVCard(const Shared::VCard& card)
 {
+    m_ui->fullName->setText(card.getFullName());
     m_ui->firstName->setText(card.getFirstName());
     m_ui->middleName->setText(card.getMiddleName());
     m_ui->lastName->setText(card.getLastName());
     m_ui->nickName->setText(card.getNickName());
     m_ui->birthday->setDate(card.getBirthday());
-    //m_ui->organizationName->setText(card.get());
+    m_ui->organizationName->setText(card.getOrgName());
-    //m_ui->organizationDepartment->setText(card.get());
+    m_ui->organizationDepartment->setText(card.getOrgUnit());
-    //m_ui->organizationTitle->setText(card.get());
+    m_ui->organizationTitle->setText(card.getOrgTitle());
-    //m_ui->organizationRole->setText(card.get());
+    m_ui->organizationRole->setText(card.getOrgRole());
     m_ui->description->setText(card.getDescription());
+    m_ui->url->setText(card.getUrl());
     currentAvatarType = card.getAvatarType();
     currentAvatarPath = card.getAvatarPath();
     
@@ -113,12 +116,18 @@ QString VCard::getJid() const
 void VCard::onButtonBoxAccepted()
 {
     Shared::VCard card;
+    card.setFullName(m_ui->fullName->text());
     card.setFirstName(m_ui->firstName->text());
     card.setMiddleName(m_ui->middleName->text());
     card.setLastName(m_ui->lastName->text());
     card.setNickName(m_ui->nickName->text());
     card.setBirthday(m_ui->birthday->date());
     card.setDescription(m_ui->description->toPlainText());
+    card.setUrl(m_ui->url->text());
+    card.setOrgName(m_ui->organizationName->text());
+    card.setOrgUnit(m_ui->organizationDepartment->text());
+    card.setOrgRole(m_ui->organizationRole->text());
+    card.setOrgTitle(m_ui->organizationTitle->text());
     card.setAvatarPath(currentAvatarPath);
     card.setAvatarType(currentAvatarType);
     

ui/widgets/vcard.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>537</width>
+    <width>594</width>
-    <height>539</height>
+    <height>595</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_2">
@@ -94,14 +94,177 @@
          </property>
         </widget>
        </item>
-       <item row="3" column="1" colspan="2">
+       <item row="4" column="1" colspan="2">
         <widget class="Line" name="personalLine">
          <property name="orientation">
           <enum>Qt::Horizontal</enum>
          </property>
         </widget>
        </item>
+       <item row="3" column="0" rowspan="7">
+        <spacer name="generalLeftHSpacer">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>40</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item row="0" column="0" colspan="4">
+        <widget class="QLabel" name="generalHeading">
+         <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>
+         </property>
+        </widget>
+       </item>
+       <item row="3" column="3" rowspan="7">
+        <spacer name="generalRightHSpacer">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>40</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item row="6" column="1" colspan="2">
+        <widget class="QLabel" name="organizationHeading">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="styleSheet">
+          <string notr="true"/>
+         </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>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignCenter</set>
+         </property>
+        </widget>
+       </item>
+       <item row="7" column="1" colspan="2">
+        <layout class="QFormLayout" name="organizationForm">
+         <property name="formAlignment">
+          <set>Qt::AlignHCenter|Qt::AlignTop</set>
+         </property>
+         <item row="0" column="0">
+          <widget class="QLabel" name="organizationNameLabel">
+           <property name="text">
+            <string>Organization name</string>
+           </property>
+           <property name="buddy">
+            <cstring>organizationName</cstring>
+           </property>
+          </widget>
+         </item>
+         <item row="0" column="1">
+          <widget class="QLineEdit" name="organizationName">
+           <property name="minimumSize">
+            <size>
+             <width>200</width>
+             <height>0</height>
+            </size>
+           </property>
+           <property name="maximumSize">
+            <size>
+             <width>350</width>
+             <height>16777215</height>
+            </size>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="0">
+          <widget class="QLabel" name="organizationDepartmentLabel">
+           <property name="text">
+            <string>Unit / Department</string>
+           </property>
+           <property name="buddy">
+            <cstring>organizationDepartment</cstring>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="1">
+          <widget class="QLineEdit" name="organizationDepartment">
+           <property name="minimumSize">
+            <size>
+             <width>200</width>
+             <height>0</height>
+            </size>
+           </property>
+           <property name="maximumSize">
+            <size>
+             <width>350</width>
+             <height>16777215</height>
+            </size>
+           </property>
+          </widget>
+         </item>
+         <item row="2" column="0">
+          <widget class="QLabel" name="roleLabel">
+           <property name="text">
+            <string>Role / Profession</string>
+           </property>
+           <property name="buddy">
+            <cstring>organizationRole</cstring>
+           </property>
+          </widget>
+         </item>
          <item row="2" column="1">
+          <widget class="QLineEdit" name="organizationRole">
+           <property name="minimumSize">
+            <size>
+             <width>200</width>
+             <height>0</height>
+            </size>
+           </property>
+           <property name="maximumSize">
+            <size>
+             <width>350</width>
+             <height>16777215</height>
+            </size>
+           </property>
+          </widget>
+         </item>
+         <item row="3" column="0">
+          <widget class="QLabel" name="organizationTitleLabel">
+           <property name="text">
+            <string>Job title</string>
+           </property>
+           <property name="buddy">
+            <cstring>organizationTitle</cstring>
+           </property>
+          </widget>
+         </item>
+         <item row="3" column="1">
+          <widget class="QLineEdit" name="organizationTitle">
+           <property name="minimumSize">
+            <size>
+             <width>200</width>
+             <height>0</height>
+            </size>
+           </property>
+           <property name="maximumSize">
+            <size>
+             <width>350</width>
+             <height>16777215</height>
+            </size>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item row="3" column="1">
         <layout class="QFormLayout" name="personalForm">
          <property name="sizeConstraint">
           <enum>QLayout::SetDefaultConstraint</enum>
@@ -228,190 +391,7 @@
          </item>
         </layout>
        </item>
-       <item row="2" column="3" rowspan="7">
+       <item row="3" column="2">
-        <spacer name="generalRightHSpacer">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>40</width>
-           <height>20</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item row="8" column="1" colspan="2">
-        <spacer name="verticalSpacer">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>40</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item row="2" column="0" rowspan="7">
-        <spacer name="generalLeftHSpacer">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>40</width>
-           <height>20</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item row="5" column="1" colspan="2">
-        <widget class="QLabel" name="organizationHeading">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="styleSheet">
-          <string notr="true"/>
-         </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>
-         </property>
-         <property name="alignment">
-          <set>Qt::AlignCenter</set>
-         </property>
-        </widget>
-       </item>
-       <item row="6" column="1" colspan="2">
-        <layout class="QFormLayout" name="organizationForm">
-         <property name="formAlignment">
-          <set>Qt::AlignHCenter|Qt::AlignTop</set>
-         </property>
-         <item row="0" column="0">
-          <widget class="QLabel" name="organizationNameLabel">
-           <property name="text">
-            <string>Organization name</string>
-           </property>
-           <property name="buddy">
-            <cstring>organizationName</cstring>
-           </property>
-          </widget>
-         </item>
-         <item row="0" column="1">
-          <widget class="QLineEdit" name="organizationName">
-           <property name="minimumSize">
-            <size>
-             <width>200</width>
-             <height>0</height>
-            </size>
-           </property>
-           <property name="maximumSize">
-            <size>
-             <width>350</width>
-             <height>16777215</height>
-            </size>
-           </property>
-          </widget>
-         </item>
-         <item row="1" column="0">
-          <widget class="QLabel" name="organizationDepartmentLabel">
-           <property name="text">
-            <string>Unit / Department</string>
-           </property>
-           <property name="buddy">
-            <cstring>organizationDepartment</cstring>
-           </property>
-          </widget>
-         </item>
-         <item row="1" column="1">
-          <widget class="QLineEdit" name="organizationDepartment">
-           <property name="minimumSize">
-            <size>
-             <width>200</width>
-             <height>0</height>
-            </size>
-           </property>
-           <property name="maximumSize">
-            <size>
-             <width>350</width>
-             <height>16777215</height>
-            </size>
-           </property>
-          </widget>
-         </item>
-         <item row="2" column="0">
-          <widget class="QLabel" name="roleLabel">
-           <property name="text">
-            <string>Role / Profession</string>
-           </property>
-           <property name="buddy">
-            <cstring>organizationRole</cstring>
-           </property>
-          </widget>
-         </item>
-         <item row="2" column="1">
-          <widget class="QLineEdit" name="organizationRole">
-           <property name="minimumSize">
-            <size>
-             <width>200</width>
-             <height>0</height>
-            </size>
-           </property>
-           <property name="maximumSize">
-            <size>
-             <width>350</width>
-             <height>16777215</height>
-            </size>
-           </property>
-          </widget>
-         </item>
-         <item row="3" column="0">
-          <widget class="QLabel" name="organizationTitleLabel">
-           <property name="text">
-            <string>Job title</string>
-           </property>
-           <property name="buddy">
-            <cstring>organizationTitle</cstring>
-           </property>
-          </widget>
-         </item>
-         <item row="3" column="1">
-          <widget class="QLineEdit" name="organizationTitle">
-           <property name="minimumSize">
-            <size>
-             <width>200</width>
-             <height>0</height>
-            </size>
-           </property>
-           <property name="maximumSize">
-            <size>
-             <width>350</width>
-             <height>16777215</height>
-            </size>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
-       <item row="7" column="1" colspan="2">
-        <widget class="Line" name="organizationLine">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-        </widget>
-       </item>
-       <item row="0" column="0" colspan="4">
-        <widget class="QLabel" name="generalHeading">
-         <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>
-         </property>
-        </widget>
-       </item>
-       <item row="2" column="2">
         <widget class="QToolButton" name="avatarButton">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
@@ -429,7 +409,8 @@
           <string/>
          </property>
          <property name="icon">
-          <iconset theme="user"/>
+          <iconset theme="user">
+           <normaloff>.</normaloff>.</iconset>
          </property>
          <property name="iconSize">
           <size>
@@ -448,6 +429,43 @@
          </property>
         </widget>
        </item>
+       <item row="8" column="1" colspan="2">
+        <widget class="Line" name="organizationLine">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="1" colspan="2">
+        <layout class="QFormLayout" name="commonForm">
+         <item row="0" column="1">
+          <widget class="QLineEdit" name="fullName"/>
+         </item>
+         <item row="0" column="0">
+          <widget class="QLabel" name="fullNameLabel">
+           <property name="text">
+            <string>Full name</string>
+           </property>
+           <property name="buddy">
+            <cstring>fullName</cstring>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item row="9" column="1" colspan="2">
+        <spacer name="verticalSpacer">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="Contact">
@@ -496,8 +514,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>525</width>
+            <width>582</width>
-            <height>415</height>
+            <height>471</height>
            </rect>
           </property>
           <layout class="QGridLayout" name="gridLayout_3" columnstretch="1,4,1">
@@ -584,6 +602,9 @@
                <property name="text">
                 <string>Web site</string>
                </property>
+               <property name="buddy">
+                <cstring>url</cstring>
+               </property>
               </widget>
              </item>
             </layout>
@@ -756,7 +777,8 @@
   </layout>
   <action name="actionSetAvatar">
    <property name="icon">
-    <iconset theme="photo"/>
+    <iconset theme="photo">
+     <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
     <string>Set avatar</string>
@@ -764,7 +786,8 @@
   </action>
   <action name="actionClearAvatar">
    <property name="icon">
-    <iconset theme="edit-clear-all"/>
+    <iconset theme="edit-clear-all">
+     <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
     <string>Clear avatar</string>
@@ -772,19 +795,22 @@
   </action>
  </widget>
  <tabstops>
+  <tabstop>fullName</tabstop>
   <tabstop>firstName</tabstop>
   <tabstop>middleName</tabstop>
   <tabstop>lastName</tabstop>
   <tabstop>nickName</tabstop>
   <tabstop>birthday</tabstop>
+  <tabstop>avatarButton</tabstop>
   <tabstop>organizationName</tabstop>
   <tabstop>organizationDepartment</tabstop>
   <tabstop>organizationRole</tabstop>
   <tabstop>organizationTitle</tabstop>
-  <tabstop>scrollArea</tabstop>
-  <tabstop>jabberID</tabstop>
-  <tabstop>description</tabstop>
   <tabstop>tabWidget</tabstop>
+  <tabstop>jabberID</tabstop>
+  <tabstop>url</tabstop>
+  <tabstop>description</tabstop>
+  <tabstop>scrollArea</tabstop>
  </tabstops>
  <resources>
   <include location="../../resources/resources.qrc"/>