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

List:       kde-commits
Subject:    koffice/lib/kofficecore
From:       Laurent Montel <montel () kde ! org>
Date:       2006-03-27 9:40:20
Message-ID: 1143452420.501388.9513.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 523054 by mlaurent:

fix some error

 M  +7 -5      KoDocument.cpp  
 M  +1 -1      koOpenPaneBase.ui  


--- trunk/koffice/lib/kofficecore/KoDocument.cpp #523053:523054
@@ -36,6 +36,7 @@
 #include <KoXmlWriter.h>
 
 #include <kapplication.h>
+#include <kdialogbase.h>
 #include <kdebug.h>
 #include <kdeversion.h>
 #include <kfileitem.h>
@@ -48,6 +49,7 @@
 #include <kparts/partmanager.h>
 #include <kprinter.h>
 #include <ksavefile.h>
+#include <kxmlguifactory.h>
 
 #include <qbuffer.h>
 #include <qcursor.h>
@@ -1446,7 +1448,7 @@
         kError(30003) << "No mimetype found for " << m_file << endl;
         QApplication::restoreOverrideCursor();
         if ( d->m_autoErrorHandlingEnabled )
-            KMessageBox::error( 0L, i18n( "Could not open\n%1" ).arg( \
url().prettyURL( 0, KUrl::StripFileProtocol ) ) ); +            KMessageBox::error( \
0L, i18n( "Could not open\n%1" ).arg( url().pathOrURL() ) );  d->m_bLoading = false;
         return false;
     }
@@ -1513,7 +1515,7 @@
             if( d->m_autoErrorHandlingEnabled && !msg.isEmpty())
             {
                 QString errorMsg( i18n( "Could not open\n%2.\nReason: %1" ) );
-                QString docUrl = url().prettyURL( 0, KUrl::StripFileProtocol );
+                QString docUrl = url().pathOrURL();
                 KMessageBox::error( 0L, errorMsg.arg(msg).arg(docUrl) );
             }
 
@@ -2061,7 +2063,7 @@
                 caption = static_cast<KoDocumentInfoAbout *>(page)->title();
         }
         if ( caption.isEmpty() )
-            caption = url().prettyURL( 0, KUrl::StripFileProtocol );             // \
Fall back to document URL +            caption = url().pathOrURL();             // \
Fall back to document URL  
         //kDebug(30003)<<k_funcinfo<<" url: "<<url().url()<<" caption: \
"<<caption<<endl;  if ( doc )
@@ -2342,11 +2344,11 @@
 {
     if ( d->lastErrorMessage.isEmpty() )
     {
-        KMessageBox::error( 0L, i18n( "Could not open\n%1" ).arg( url().prettyURL( \
0, KUrl::StripFileProtocol ) ) ); +        KMessageBox::error( 0L, i18n( "Could not \
open\n%1" ).arg( url().pathOrURL() ) );  }
     else if ( d->lastErrorMessage != "USER_CANCELED" )
     {
-        KMessageBox::error( 0L, i18n( "Could not open %1\nReason: %2" ).arg( \
url().prettyURL( 0, KUrl::StripFileProtocol ), d->lastErrorMessage ) ); +        \
KMessageBox::error( 0L, i18n( "Could not open %1\nReason: %2" ).arg( \
url().pathOrURL(), d->lastErrorMessage ) );  }
 }
 
--- trunk/koffice/lib/kofficecore/koOpenPaneBase.ui #523053:523054
@@ -141,7 +141,7 @@
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>k3listview.h</includehint>
     <includehint>kpushbutton.h</includehint>
 </includehints>
 </UI>


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