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

List:       kde-commits
Subject:    KDE/kdelibs/kdeprint/cups
From:       Benjamin Meyer <ben () meyerhome ! net>
Date:       2006-07-05 21:43:34
Message-ID: 1152135814.583667.2018.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 558711 by bmeyer:

KActiveLabel -> QLabel

 M  +6 -5      cupsaddsmb2.cpp  
 M  +1 -2      cupsaddsmb2.h  


--- trunk/KDE/kdelibs/kdeprint/cups/cupsaddsmb2.cpp #558710:558711
@@ -33,7 +33,7 @@
 #include <kio/passdlg.h>
 #include <kdebug.h>
 #include <kseparator.h>
-#include <kactivelabel.h>
+#include <qlabel.h>
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
 
@@ -57,7 +57,8 @@
 	connect(m_cancel, SIGNAL(clicked()), SLOT(reject()));
 	connect(m_doit, SIGNAL(clicked()), SLOT(slotActionClicked()));
 	m_bar = new QProgressBar(this);
-	m_text = new KActiveLabel(this);
+	m_text = new QLabel(this);
+        m_text->setOpenExternalLinks(true);
 	QLabel	*m_title = new QLabel(i18n("Export Printer Driver to Windows Clients"), \
this);  setCaption(m_title->text());
 	QFont	f(m_title->font());
@@ -338,7 +339,7 @@
 			m_logined->setEnabled( true );
 			m_servered->setEnabled( true );
 			m_passwded->setEnabled( true );
-			m_text->setPlainText(i18n("Driver successfully exported."));
+			m_text->setText(i18n("Driver successfully exported."));
 			m_bar->reset();
 			m_textinfo->setText( QString() );
 			return;
@@ -363,7 +364,7 @@
 
 void CupsAddSmb::showError(const QString& msg)
 {
-	m_text->setHtml(i18n("<h3>Operation failed.</h3><p>%1</p>", msg));
+	m_text->setText(i18n("<h3>Operation failed.</h3><p>%1</p>", msg));
 	m_cancel->setEnabled(true);
 	m_logined->setEnabled( true );
 	m_servered->setEnabled( true );
@@ -377,7 +378,7 @@
 	CupsAddSmb	dlg;
 	dlg.m_dest = dest;
 	dlg.m_datadir = datadir;
-	dlg.m_text->setHtml(
+	dlg.m_text->setText(
 			i18n( "You are about to prepare the <b>%1</b> driver to be "
 			      "shared out to Windows clients through Samba. This operation "
 				  "requires the <a \
href=\"http://www.adobe.com/products/printerdrivers/main.html\">Adobe PostScript \
                Driver</a>, a recent version of "
--- trunk/KDE/kdelibs/kdeprint/cups/cupsaddsmb2.h #558710:558711
@@ -29,7 +29,6 @@
 class SidePixmap;
 class QPushButton;
 class QLabel;
-class KActiveLabel;
 class QLineEdit;
 
 class CupsAddSmb : public KDialog
@@ -68,7 +67,7 @@
 	QString		m_dest;
 	SidePixmap	*m_side;
 	QPushButton	*m_doit, *m_cancel;
-	KActiveLabel	*m_text;
+	QLabel	*m_text;
 	QLabel *m_textinfo;
 	QLineEdit *m_logined, *m_passwded, *m_servered;
 	QString	m_datadir;


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