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

List:       kde-commits
Subject:    branches/kblogger/kblogger-0.7
From:       Christian Weilbach <christian () whiletaker ! homeip ! net>
Date:       2007-08-26 2:57:13
Message-ID: 1188097033.302524.18156.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 704724 by weilbach:

Removed the stylesheet stuff as it takes much too long with me and is buggy. 
Removed the layout, too, since it does not behave as expected (a real button), the \
other code is commented out.


 M  +3 -1      kblogger.kdevelop  
 M  +18 -14    src/kblogger.cpp  
 M  +4 -2      src/kblogger.h  
 M  +18 -16    src/kbloggereditor.cpp  


--- branches/kblogger/kblogger-0.7/kblogger.kdevelop #704723:704724
@@ -105,7 +105,7 @@
       <root>/usr/share/qt3</root>
       <designerintegration>EmbeddedKDevDesigner</designerintegration>
       <qmake>/usr/bin/qmake-qt3</qmake>
-      <designer>/usr/bin/designer-qt3</designer>
+      <designer></designer>
       <designerpluginpaths/>
     </qt>
     <codecompletion>
@@ -130,6 +130,8 @@
       <usePermanentCaching>true</usePermanentCaching>
       <alwaysIncludeNamespaces>false</alwaysIncludeNamespaces>
       <includePaths>.;</includePaths>
+      <parseMissingHeadersExperimental>false</parseMissingHeadersExperimental>
+      <resolveIncludePathsUsingMakeExperimental>false</resolveIncludePathsUsingMakeExperimental>
  </codecompletion>
     <creategettersetter>
       <prefixGet/>
--- branches/kblogger/kblogger-0.7/src/kblogger.cpp #704723:704724
@@ -82,15 +82,15 @@
 	kdDebug() << "KBlogger::KBlogger - Creating Applet-widget" << endl;
 
 	// create the panel button.
-	panelIcon= new QPixmap( m_iconLoader->loadIcon("kblogger",KIcon::Panel ) );
-	m_label= new QLabel(this);
-	m_label->setPixmap(*panelIcon);
-	m_label->setCursor(QCursor(Qt::PointingHandCursor));
-	QToolTip::add( m_label, "<b>KBlogger</b><br><i>LMB</i> to write a new \
                post.<br><i>RMB</i> for other options<br>" );
-// 	QVBoxLayout *appletlay = new QVBoxLayout ( this );
-// 	m_button = new QPushButton ( i18n ( "Blog" ),this );
-// 	appletlay->addWidget ( m_label );
-// 	connect ( m_button, SIGNAL ( clicked() ), this, SLOT ( slotClicked() ) );
+// 	panelIcon= new QPixmap( m_iconLoader->loadIcon("kblogger",KIcon::Panel ) );
+	m_appletlay = new QVBoxLayout ( this );
+// 	m_label= new QLabel( this );
+// 	m_label->setPixmap(*panelIcon);
+	m_button = new QPushButton ( i18n ( "Blog" ),this );
+	m_appletlay->addWidget ( m_button );
+//	m_label->setCursor(QCursor(Qt::PointingHandCursor));
+//	QToolTip::add( m_label, "<b>KBlogger</b><br><i>LMB</i> to write a new \
post.<br><i>RMB</i> for other options<br>" ); + 	connect ( m_button, SIGNAL ( \
clicked() ), this, SLOT ( slotClicked() ) );  
 	if ( !parent )
 		setBackgroundMode ( X11ParentRelative );
@@ -99,7 +99,7 @@
 
 	// initialize about data
 	m_aboutData = new KAboutData ( "kblogger", I18N_NOOP ( "KBlogger - Your voice on \
                the Net" ),
-	                               "0.7beta1", I18N_NOOP ( "A kicker applet for \
blogging" ), KAboutData::License_GPL, +	                               "0.7beta2", \
                I18N_NOOP ( "A kicker applet for blogging" ), \
                KAboutData::License_GPL,
 	                               0, 0, "http://kblogger.pwsp.net", \
"christian_weilbach@web.de" );  m_aboutData->addAuthor ( "Christian Weilbach", \
                I18N_NOOP ( "Main developer" ),
 	                         I18N_NOOP ( "christian_weilbach@web.de" ), I18N_NOOP ( \
"http://whiletaker.homeip.net" ) ); @@ -137,8 +137,10 @@
 	delete m_aboutData;
 	delete m_configwd;
 	delete m_configDialog;
-	delete m_label;
-	delete panelIcon;
+	delete m_button;
+	delete m_appletlay;
+// 	delete m_label;
+// 	delete panelIcon;
 }
 
 void KBlogger::handleSuccess ( const QString& string )
@@ -275,12 +277,14 @@
 
 int KBlogger::widthForHeight( int height ) const
 {
-	return panelIcon->width();
+// 	return panelIcon->width();
+	return 65;
 }
 
 int KBlogger::heightForWidth( int width ) const
 {
-	return panelIcon->height();
+// 	return panelIcon->height();
+	return 40;
 }
 
 void KBlogger::mousePressEvent ( QMouseEvent *e )
--- branches/kblogger/kblogger-0.7/src/kblogger.h #704723:704724
@@ -94,8 +94,10 @@
 	KBloggerEditor* m_editor;
 	KBloggerUpload* m_upload;
 	KTempDir *m_tempDir;
-	QLabel *m_label;
-	QPixmap* panelIcon;
+// 	QLabel *m_label;
+	QPushButton* m_button;
+// 	QPixmap* panelIcon;
+	QVBoxLayout *m_appletlay;
 
 
 private slots:
--- branches/kblogger/kblogger-0.7/src/kbloggereditor.cpp #704723:704724
@@ -165,23 +165,25 @@
 	PreviewBrowser->setMetaRefreshEnabled(false);
 	PreviewBrowser->setPluginsEnabled(false);
 	PreviewBrowser->setProgressInfoEnabled(false);
-	
+
+// TODO either fetch asynchronous or remove it
+// TODO make it compatible with @import and other css import possibilities
 	//Get Css
-	KURL url = KBloggerConfig::url();
-	url.setFileName(QString::null); // now url="www.yourblog.org:80/path/to/"
-	if (url.isValid()){
-		
-		PreviewBrowser->openURL(url);
-		QRegExp cssRegExp("(<link\\s*rel=\"stylesheet\"\\s*href=\")(http://[\\S]*.css)(\".*/>)");
                
-		if ( cssRegExp.search( PreviewBrowser->documentSource() ) >1)
-			cssUrl=new KURL(cssRegExp.cap(2));
-		kdDebug() << "KBloggerEditor::KBloggerEditor url.isValid()==TRUE cssURL=" << \
                cssUrl->url() << endl;
-	}
-	
-	if ( !cssUrl->isValid() ){
-		QPixmap icon( m_parent->m_iconLoader->loadIcon("kblogger/warning",KIcon::Panel ));
-		KPassivePopup::message ( "KBlogger Warning","Stylesheet not \
                found!",icon,this,"Passive Error Message" );
-	}
+// 	KURL url = KBloggerConfig::url();
+// 	url.setFileName(QString::null); // now url="www.yourblog.org:80/path/to/"
+// 	if (url.isValid()){
+// 		
+// 		PreviewBrowser->openURL(url);
+// 		QRegExp cssRegExp("href=.(http://\\w+\\.css)");
+// 		if ( cssRegExp.search( PreviewBrowser->documentSource() ) != -1)
+// 			cssUrl=new KURL(cssRegExp.cap());
+// 		kdDebug() << "KBloggerEditor::KBloggerEditor url.isValid()==TRUE cssURL=" << \
cssUrl->url() << endl; +// 	}
+// 	
+// 	if ( !cssUrl->isValid() ){
+// 		QPixmap icon( m_parent->m_iconLoader->loadIcon("kblogger/warning",KIcon::Panel \
)); +// 		KPassivePopup::message ( "KBlogger Warning","Stylesheet not \
found!",icon,this,"Passive Error Message" ); +// 	}
 
 	
 	layoutSend->addWidget(m_statusBar,0,0);


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