new profile window

gajim/common/modules/vcard_temp.py

@@ -101,22 +101,25 @@ def send_vcard(self, vcard, sha):
         if not app.account_is_connected(self._account):
             return
 
-        iq = nbxmpp.Iq(typ='set')
-        iq2 = iq.setTag(nbxmpp.NS_VCARD + ' vCard')
-        for i in vcard:
-            if i == 'jid':
-                continue
-            if isinstance(vcard[i], dict):
-                iq3 = iq2.addChild(i)
-                for j in vcard[i]:
-                    iq3.addChild(j).setData(vcard[i][j])
-            elif isinstance(vcard[i], list):
-                for j in vcard[i]:
+        if isinstance(vcard, nbxmpp.Iq):
+            iq = vcard
+        else:
+            iq = nbxmpp.Iq(typ='set')
+            iq2 = iq.setTag(nbxmpp.NS_VCARD + ' vCard')
+            for i in vcard:
+                if i == 'jid':
+                    continue
+                if isinstance(vcard[i], dict):
                     iq3 = iq2.addChild(i)
-                    for k in j:
-                        iq3.addChild(k).setData(j[k])
-            else:
-                iq2.addChild(i).setData(vcard[i])
+                    for j in vcard[i]:
+                        iq3.addChild(j).setData(vcard[i][j])
+                elif isinstance(vcard[i], list):
+                    for j in vcard[i]:
+                        iq3 = iq2.addChild(i)
+                        for k in j:
+                            iq3.addChild(k).setData(j[k])
+                else:
+                    iq2.addChild(i).setData(vcard[i])
 
         self._log.info('Upload avatar: %s %s', self._account, sha)
 

gajim/data/style/gajim.css

@@ -248,6 +248,7 @@ .field-fixed { font-size: 16px; font-weight: bold; padding-top:5px;}
 .data-form-title { font-size: 16px; font-weight: bold; }
 .data-form-widget grid { margin: 0px 18px 18px 18px; }
 .data-form-widget treeview { padding: 5px; }
+
 .data-form-widget scrolledwindow { border: 1px solid; border-color:@unfocused_borders; }
 .data-form-widget textview { padding: 5px; }
 
@@ -262,3 +263,16 @@ .adhoc-scrolled { border: 1px solid; border-color:@unfocused_borders; }
 /* Search Dialog */
 .search-treeview { padding: 5px; }
 .search-scrolled { border: 1px solid; border-color:@unfocused_borders; }
+
+
+#ProfileWindow grid { padding:18px; }
+.profile-address-entry { border-radius: 0 0 0 0; border-width: 1px 1px 0 1px; }
+.profile-address-entry:nth-child(first) { border-radius: 4px 4px 0 0; }
+.profile-address-entry:nth-child(last) { border-radius: 0 0 4px 4px; border-width: 1px; }
+
+.profile-textview-edit { padding: 8px; border: 1px solid; border-color: @borders; border-radius: 4px; background-color: @theme_base_color }
+.profile-textview-edit border { border: none; }
+.profile-textview text { background-color: @theme_unfocused_bg_color }
+
+.profile-label-fix {padding-top:9px;}
+

gajim/gui_interface.py

@@ -87,6 +87,8 @@
 from gajim.common.const import SSLError
 
 from gajim import roster_window
+from gajim import profile_window_new
+
 from gajim.common import ged
 from gajim.common.caps_cache import muc_caps_cache
 from gajim.common import configpaths
@@ -227,9 +229,9 @@ def handle_event_status(self, obj): # OUR status
             self.show_vcard_when_connect.remove(account)
 
     def edit_own_details(self, account):
-        window = app.get_app_window(ProfileWindow)
+        window = app.get_app_window(profile_window_new.ProfileWindow)
         if window is None:
-            ProfileWindow(account)
+            profile_window_new.ProfileWindow(account)
         else:
             window.present()