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

List:       kde-commits
Subject:    KDE/kdelibs/kdeprint/management
From:       David Faure <faure () kde ! org>
Date:       2006-08-31 21:02:09
Message-ID: 1157058129.379235.32025.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 579339 by dfaure:

Fix string-url confusions; use KMimeType api instead of KMimeMagic.


 M  +1 -1      kmconfigfonts.cpp  
 M  +6 -4      kmconfiggeneral.cpp  
 M  +1 -1      kmconfiggeneral.h  


--- trunk/KDE/kdelibs/kdeprint/management/kmconfigfonts.cpp #579338:579339
@@ -151,7 +151,7 @@
 	Q3ListViewItem	*lastItem(m_fontpath->firstChild());
 	while (lastItem && lastItem->nextSibling())
 		lastItem = lastItem->nextSibling();
-	Q3ListViewItem	*item = new Q3ListViewItem(m_fontpath, lastItem, \
m_addpath->url().toString()); +	Q3ListViewItem	*item = new Q3ListViewItem(m_fontpath, \
lastItem, m_addpath->url().path());  m_fontpath->setSelected(item, true);
 }
 
--- trunk/KDE/kdelibs/kdeprint/management/kmconfiggeneral.cpp #579338:579339
@@ -29,7 +29,6 @@
 #include <klocale.h>
 #include <kurlrequester.h>
 #include <krun.h>
-#include <kmimemagic.h>
 #include <kconfig.h>
 #include <knuminput.h>
 #include <kmessagebox.h>
@@ -37,6 +36,7 @@
 #include <klineedit.h>
 #include <kguiitem.h>
 #include <kdialog.h>
+#include <kmimetype.h>
 
 KMConfigGeneral::KMConfigGeneral(QWidget *parent)
     : KMConfigPage(parent)
@@ -61,6 +61,7 @@
 	m_defaulttestpage = new QCheckBox(i18n("&Specify personal test page"), \
m_testpagebox);  m_defaulttestpage->setObjectName(QLatin1String("TestPageCheck"));
 	m_testpage = new KUrlRequester(m_testpagebox);
+	m_testpage->setMode(KFile::File|KFile::ExistingOnly|KFile::LocalOnly);
 	m_preview = new KPushButton(KGuiItem(i18n("Preview..."), "filefind"), \
m_testpagebox);  connect(m_defaulttestpage,SIGNAL(toggled(bool)),m_testpage,SLOT(setEnabled(bool)));
  connect(m_defaulttestpage,SIGNAL(toggled(bool)),this,SLOT(setEnabledPreviewButton(bool)));
 @@ -135,7 +136,8 @@
 	conf->setGroup("General");
 	conf->writeEntry("TimerDelay",m_timer->value());
 	conf->writePathEntry("TestPage",(m_defaulttestpage->isChecked() ? \
                m_testpage->url().url() : QString()));
-	if (m_defaulttestpage->isChecked() && \
KMimeMagic::self()->findFileType(m_testpage->url().toString())->mimeType() != \
"application/postscript") +	if (m_defaulttestpage->isChecked() &&
+		KMimeType::findByFileContent(m_testpage->url().path())->name() != \
"application/postscript")  KMessageBox::sorry(this, i18n("The selected test page is \
                not a PostScript file. You may not "
 		                              "be able to test your printer anymore."));
 	conf->writeEntry("ShowStatusMsg", m_statusmsg->isChecked());
@@ -144,11 +146,11 @@
 
 void KMConfigGeneral::slotTestPagePreview()
 {
-	QString	tpage = m_testpage->url().toString();
+	KUrl tpage = m_testpage->url();
 	if (tpage.isEmpty())
 		KMessageBox::error(this, i18n("Empty file name."));
 	else
-		KRun::runUrl(KUrl( tpage ), KMimeMagic::self()->findFileType(tpage)->mimeType(), \
this); +		(void)new KRun( tpage, this );
 }
 
 #include "kmconfiggeneral.moc"
--- trunk/KDE/kdelibs/kdeprint/management/kmconfiggeneral.h #579338:579339
@@ -37,7 +37,7 @@
 
 protected Q_SLOTS:
 	void slotTestPagePreview();
-        void testPageChanged(const QString & );
+	void testPageChanged(const QString & );
 	void setEnabledPreviewButton(bool b);
 private:
 	KIntNumInput	*m_timer;


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