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

List:       kde-commits
Subject:    playground/pim/kmobiletools/kmobiletools
From:       Marco Gulino <marco () kmobiletools ! org>
Date:       2007-04-23 15:08:55
Message-ID: 1177340935.091139.11299.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 657219 by gulino:

Fixing homepagePart html code.
More d-pointer.


 M  +6 -6      about/main.html  
 M  +25 -14    libkmobiletools/homepage.cpp  
 M  +11 -11    libkmobiletools/homepage.h  


--- trunk/playground/pim/kmobiletools/kmobiletools/about/main.html #657218:657219
@@ -10,9 +10,9 @@
   <style type="text/css">
   /*<![CDATA[*/
     @import "%1"; /* kde_infopage.css */
-    %1 /* maybe @import "kde_infopage_rtl.css"; */
+    /* maybe @import "kde_infopage_rtl.css"; */
     @import "kmobiletools.css";
-    body {font-size: %1px;}
+    body {font-size: %2px;}
   /*]]>*/
   </style>
 
@@ -25,11 +25,11 @@
     <div id="headerR"/>
 
     <div id="title">
-    %2 <!-- KMobileTools -->
+    %3 <!-- KMobileTools -->
     </div>
 
     <div id="tagline">
-    %3 <!-- Catchphrase -->
+    %4 <!-- Catchphrase -->
     </div>
   </div>
 
@@ -39,7 +39,7 @@
     <div id="barL">
       <div id="barR">
         <div id="barCenter" class="bar_text">
-      %4<!-- KMobileTools is ... -->
+      %5<!-- KMobileTools is ... -->
         </div>
       </div>
     </div>
@@ -53,7 +53,7 @@
       <div id="boxR">
         <div id="boxCenter">
         <!--Welcome to KMobileTools-->
-	%5
+	%6
         </div>
       </div>
     </div>
--- trunk/playground/pim/kmobiletools/kmobiletools/libkmobiletools/homepage.cpp \
#657218:657219 @@ -51,10 +51,19 @@
 #include <iostream>
 using namespace KMobileTools;
 
+class homepagePartPrivate {
+public:
+    homepagePartPrivate() : i_infopage(-1), p_engine(0)
+    {}
+    QString content;
+    int i_infopage;
+    KMobileTools::Engine * p_engine;
+};
+
 homepagePart::homepagePart(QWidget *parent, const char *name)
  : KHTMLPart(parent, parent)
-        , i_infopage(-1), p_engine(0)
 {
+    d=new homepagePartPrivate;
     setObjectName(QLatin1String(name));
     view()->setSizePolicy(QSizePolicy(QSizePolicy::Expanding,QSizePolicy::Expanding, \
                5, 2) );
     connect( browserExtension(), SIGNAL( openURLRequest(const KUrl &, const \
KParts::URLArgs &) ), @@ -83,22 +92,22 @@
     QString location = KStandardDirs::locate( "data", "kmobiletools/about/main.html" \
);  QFile fcontent(location);
     fcontent.open(QIODevice::ReadOnly);
-    content = QString(fcontent.readAll() );
+    d->content = QString(fcontent.readAll() );
     fcontent.close();
-    content = content.arg( KStandardDirs::locate( "data", \
"kmobiletools/about/kde_infopage.css" ) ); +    debugPage( d->content );
+    d->content = d->content.arg( KStandardDirs::locate( "data", \
"kmobiletools/about/kde_infopage.css" ) );  //     if ( kapp->reverseLayout() )
 //         content = content.arg( "@import \"%1\";" ).arg( KStandardDirs::locate( \
"data", "kmobiletools/about/kde_infopage_rtl.css" ) );  //     else
-         content = content.arg( "" );
+//          d->content = d->content.arg( "" );
     begin( KUrl( location ) );
 
     QString appName( i18n( "KMobileTools" ) );
     QString catchPhrase( i18n( "Get Synced!" ) );
     QString quickDescription( i18n( "a KDE Mobile Phone Syncing and Management tool" \
                ) );
-    content=content.arg( QFont().pointSize() + 2 ).arg( appName )
+    d->content=d->content.arg( QFont().pointSize() + 2 ).arg( appName )
             .arg( catchPhrase ).arg( quickDescription ).arg( data );
-    write( content );
-    debugPage( content );
+    write( d->content );
     end();
 //     cout << content << "\n";
 }
@@ -190,8 +199,8 @@
 
 void homepagePart::printInfoPage(int i, const QString &mobileName, \
KMobileTools::Engine *engine)  {
-    p_engine=engine;
-    i_infopage=i;
+    d->p_engine=engine;
+    d->i_infopage=i;
     QString htmlData;
     htmlData="<h2 style='text-align:center; margin-top: 0px;'><img src=\"%1\" \
                align=\"absmiddle\"> %2</h2>";
     htmlData=htmlData.arg(KMobileTools::DevicesConfig::deviceTypeIconPath(name(),-K3Icon::SizeHuge) \
) @@ -265,24 +274,24 @@
  */
 void homepagePart::slotContextMenu(const QString& urlString, const QPoint& point )
 {
-    kDebug() << "homepagePart::slotContextMenu(\"" << urlString << "\", " << point \
<< ") engine:" << p_engine <<";\n"; +    kDebug() << \
"homepagePart::slotContextMenu(\"" << urlString << "\", " << point << ") engine:" << \
d->p_engine <<";\n";  KUrl url(urlString);
 //     if(urlString==QString::null && p_engine) url=KUrl::fromPathOrUrl( \
QString("mobile:%1").arg(p_engine->name() ));  KMenu *m_popup=0;
-    if(url.protocol() == "mobile" || p_engine)
+    if(url.protocol() == "mobile" || d->p_engine)
     {
         bool eng_loaded;
         QString eng_name;
-        if(!p_engine)
+        if(!d->p_engine)
         {
             eng_loaded=(EnginesList::instance()->namesList(false).contains(url.path() \
)>0);  eng_name=url.path();
         } else
         {
             eng_loaded=true;
-            eng_name=p_engine->name();
+            eng_name=d->p_engine->name();
         }
-        m_popup=new deviceMenu( eng_loaded, p_engine, 0, eng_name.latin1() );
+        m_popup=new deviceMenu( eng_loaded, d->p_engine, 0, eng_name.latin1() );
         connect(m_popup, SIGNAL(switchDevice(const QString &) ), \
                SIGNAL(switchDevice(const QString &) ) );
         connect(m_popup, SIGNAL(loadDevice(const QString &) ), \
                SIGNAL(loadDevice(const QString &) ) );
         connect(m_popup, SIGNAL(unloadDevice(const QString &) ), \
SIGNAL(unloadDevice(const QString &) ) ); @@ -303,3 +312,5 @@
 {
     kapp->sendEvent(this, (new KParts::GUIActivateEvent( event->activated() ) )  );
 }
+
+int homepagePart::currentInfoPage() { return d->i_infopage; }
--- trunk/playground/pim/kmobiletools/kmobiletools/libkmobiletools/homepage.h \
#657218:657219 @@ -27,12 +27,13 @@
 namespace KMobileTools {
 class Engine;
 }
-class DeviceIFace_stub;
 
 /**
 @author Marco Gulino
 */
 class KUrl;
+class homepagePartPrivate;
+
 namespace KMobileTools {
 class KMOBILETOOLS_EXPORT homepagePart : public KHTMLPart
 {
@@ -42,16 +43,14 @@
 
     ~homepagePart();
     static const QString htmlIcon(const QString &iconName, int groupOrSize);
-    int currentInfoPage() { return i_infopage;}
-    private:
-        QString content;
-        DeviceIFace_stub *deviceIFace;
-        int i_infopage;
-        KMobileTools::Engine * p_engine;
-    protected:
-        void guiActivateEvent  ( KParts::GUIActivateEvent *event);
-        void partActivateEvent( KParts::PartActivateEvent *event );
-        void debugPage(const QString &htmldata);
+    int currentInfoPage();
+private:
+    homepagePartPrivate *d;
+
+protected:
+    void guiActivateEvent  ( KParts::GUIActivateEvent *event);
+    void partActivateEvent( KParts::PartActivateEvent *event );
+    void debugPage(const QString &htmldata);
 public slots:
     void refreshData(const QString &data);
     void printInfoPage(int i, KMobileTools::Engine *engine);
@@ -70,6 +69,7 @@
     void configCmd(const QString &);
     void infopage(int);
     void setStatusBarText(const QString &);
+
 };
 }
 #endif


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