[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdepim] /: improve default theme
From:       Montel Laurent <montel () kde ! org>
Date:       2014-03-31 20:59:27
Message-ID: E1WUjIl-00042p-D2 () scm ! kde ! org
[Download RAW message or body]

Git commit 53fcc1c68dc67aa4eb544e62f74f9672d5d0fec2 by Montel Laurent.
Committed on 31/03/2014 at 20:58.
Pushed by mlaurent into branch 'master'.

improve default theme

M  +24   -2    kaddressbook/printing/grantlee/themes/default/theme.html
M  +4    -0    kaddressbookgrantlee/formatter/grantleecontactutils.cpp

http://commits.kde.org/kdepim/53fcc1c68dc67aa4eb544e62f74f9672d5d0fec2

diff --git a/kaddressbook/printing/grantlee/themes/default/theme.html \
b/kaddressbook/printing/grantlee/themes/default/theme.html index bfbdf7f..98dcad7 \
                100644
--- a/kaddressbook/printing/grantlee/themes/default/theme.html
+++ b/kaddressbook/printing/grantlee/themes/default/theme.html
@@ -29,7 +29,7 @@
 <div class=whole_page>
 {% if contacts %}
 {% for contact in contacts %}
-<div class=name>{{ contact.familyName }}</div>
+<div class=name>{{ contact.name }}</div>
 <div class=last_extra_name>{{ contact.realName|safe }}</div>
 
 <table cellpadding=0>
@@ -48,10 +48,32 @@
   {% if contact.webPage %}
   <tr>
    <td class=data_header>{{ contacti18n.websitei18n }}</td>
-   <td class=last_data>{{ contact.webPage }}</td>
+   <td class=last_data>{{ contact.webPage|safe }}</td>
   </tr>
   {% endif %}
+  {% if contact.birthday %}
+  <tr>
+   <td class=data_header>{{ contacti18n.birthdayi18n }}</td>
+   <td class=last_data>{{ contact.birthday }}</td>
+  </tr>
+  {% endif %}
+  {% if contact.note %}
+  <tr>
+   <td class=data_header>{{ contacti18n.notei18n }}</td>
+   <td class=last_data>{{ contact.note }}</td>
+  </tr>
+  {% endif %}
+  {% if contact.title %}
+  <tr>
+   <td class=data_header>{{ contacti18n.titlei18n }}</td>
+   <td class=last_data>{{ contact.title }}</td>
+  </tr>
+  {% endif %}
+  {% for address in addresses %}
+
+  {% endfor %}
 </table>
+<br>
 {% endfor %}
 {% endif %}
 
diff --git a/kaddressbookgrantlee/formatter/grantleecontactutils.cpp \
b/kaddressbookgrantlee/formatter/grantleecontactutils.cpp index 83a837c..fd9a6a3 \
                100644
--- a/kaddressbookgrantlee/formatter/grantleecontactutils.cpp
+++ b/kaddressbookgrantlee/formatter/grantleecontactutils.cpp
@@ -56,6 +56,10 @@ QString GrantleeContactUtils::variableI18n(const QString \
&variable)  return i18n( "Longitude" );
     } else if (variable == QLatin1String("organizationi18n")) {
         return i18n( "Organization" );
+    } else if (variable == QLatin1String("namei18n")) {
+        return i18n( "Name" );
+    } else if (variable == QLatin1String("titlei18n")) {
+        return i18n( "Title" );
     } else {
         return variable;
     }


[prev in list] [next in list] [prev in thread] [next in thread]