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

List:       kde-commits
Subject:    kdenonbeta/kmobiletools/kmobiletools
From:       Marco Gulino <marco () kmobiletools ! org>
Date:       2005-03-28 20:11:29
Message-ID: 20050328201129.B9600631 () office ! kde ! org
[Download RAW message or body]

CVS commit by gulino: 

Nice addressee detail widget with context menu for numbers 


  A            libkmobiletoolsprivate/popupnumber.cpp   1.1 [UNKNOWN]
  A            libkmobiletoolsprivate/popupnumber.h   1.1 [UNKNOWN]
  M +41 -0     deviceparts/addressdetails.cpp   1.2
  M +4 -0      deviceparts/addressdetails.h   1.2
  M +1 -5      deviceparts/kmobiletools_devicepart.cpp   1.7
  M +2 -2      libkmobiletoolsprivate/Makefile.am   1.6


--- kdenonbeta/kmobiletools/kmobiletools/deviceparts/addressdetails.cpp  #1.1:1.2
@@ -12,7 +12,15 @@
 #include "addressdetails.h"
 
+#include <kabc/addressee.h>
+#include <kiconloader.h>
+#include <klocale.h>
+#include <qstylesheet.h>
+
+#include "popupnumber.h"
+
 addressDetails::addressDetails(QWidget *parentWidget, const char *widgetname,QObject \
*parent, const char *name)  : KHTMLPart(parentWidget, widgetname, parent, name)
 {
+    connect(this, SIGNAL(popupMenu(const QString &,const QPoint &)), SLOT(popupMenu \
( const QString &, const QPoint &) ) );  }
 
@@ -24,2 +32,35 @@ addressDetails::~addressDetails()
 
 #include "addressdetails.moc"
+
+
+/*!
+    \fn addressDetails::showAddressee(KABC::Addressee &addressee)
+ */
+void addressDetails::showAddressee(KABC::Addressee *addressee)
+{
+    QString htmlData="<p><font size=\"+1\"><b><img align=\"absmiddle\" src=\"%1\"> \
%2</b></font></p>\n\n\ +    <p><b>%3:</b> <a href=\"number:";
+    htmlData=htmlData.arg( KGlobal::iconLoader()->iconPath("personal", \
KIcon::Desktop, false) ) +        .arg( addressee->assembledName() )
+        .arg( i18n("Phone number:") );
+    htmlData+=KURL::encode_string_no_slash( \
addressee->phoneNumber(KABC::PhoneNumber::Cell).number() ) +        + "\">" \
+QStyleSheet::escape(addressee->phoneNumber(KABC::PhoneNumber::Cell).number() ) + \
"</a></p>\n"; +    begin();
+    write( htmlData );
+    kdDebug() << htmlData << endl;
+    end();
+}
+
+
+/*!
+    \fn addressDetails::popupMenu ( const QString &url, const QPoint &point)
+ */
+void addressDetails::popupMenu ( const QString &url, const QPoint &point)
+{
+    KURL kurl(url);
+    KPopupMenu *popup=0;
+    if(kurl.protocol()=="number")
+        popup=new popupNumber(kurl.path() );
+    if(!popup) return;
+    popup->exec(point);
+}

--- kdenonbeta/kmobiletools/kmobiletools/deviceparts/addressdetails.h  #1.1:1.2
@@ -18,4 +18,5 @@
 @author Marco Gulino
 */
+namespace KABC {class Addressee; }
 class addressDetails : public KHTMLPart
 {
@@ -24,5 +25,8 @@ public:
     addressDetails(QWidget *parentWidget = 0, const char *widgetname = 0, QObject \
*parent = 0, const char *name = 0);  ~addressDetails();
+    void showAddressee(KABC::Addressee *addressee);
 
+public slots:
+    void popupMenu ( const QString &url, const QPoint &point);
 };
 

--- kdenonbeta/kmobiletools/kmobiletools/deviceparts/kmobiletools_devicepart.cpp  \
#1.6:1.7 @@ -276,8 +276,4 @@ void kmobiletoolsDevicePart::pb_clicked 
 {
     if(!item)return;
-    QString s_text="<font size=\"+1\"><b>%1</b></font><br><br><b>%2:</b> <a \
                href=\"phone:%3\">%4</a><br>";
-    s_text=s_text.arg(item->text(0)).arg(i18n("Phone number"))
-        .arg( p_phoneBook->at(item->text(1).toInt() \
                )->phoneNumber(KABC::PhoneNumber::Cell).number() )
-        .arg( p_phoneBook->at(item->text(1).toInt() \
                )->phoneNumber(KABC::PhoneNumber::Cell).number() );
-//     m_widget->phonebookEntryLabel->setText(s_text);
+    p_addressDetails->showAddressee( p_phoneBook->at(item->text(1).toInt() ) );
 }

--- kdenonbeta/kmobiletools/kmobiletools/libkmobiletoolsprivate/Makefile.am  #1.5:1.6
@@ -7,7 +7,7 @@
 libkmobiletoolsprivate_la_SOURCES = aboutdata.cpp kmobiletools_cfg.kcfgc \
                 kmobiletools_devices.kcfgc homepage.cpp sms.cpp smslist.cpp \
                weaver.cpp weaverextensions.cpp \
-        devicemenu.cpp
+        devicemenu.cpp popupnumber.cpp
 noinst_HEADERS = aboutdata.h kmobiletoolsengine.h homepage.h sms.h smslist.h \
-        weaverextensions.h weaver.h devicemenu.h
+        weaverextensions.h weaver.h devicemenu.h popupnumber.h
 
 libkmobiletoolsprivate_la_LIBADD = $(LIB_KHTML) $(LIB_KABC)


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