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

List:       kde-commits
Subject:    KDE/kdegraphics/kviewshell
From:       Wilfried Huss <Wilfried.Huss () gmx ! at>
Date:       2006-07-03 8:51:05
Message-ID: 1151916665.097050.13152.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 557425 by whuss:

Compile with the latest kdelibs snapshot.

Is it just me, or is this snapshot completely broken?
Nothing works anymore.

 M  +1 -1      plugins/djvu/djvumultipage.cpp  
 M  +1 -1      plugins/dvi/dviRenderer.cpp  
 M  +3 -3      plugins/pdf/pdfMultipage.cpp  
 M  +3 -4      plugins/pdf/pdfRenderer.cpp  
 M  +1 -1      shell/kmultipage.cpp  
 M  +1 -1      shell/kmultipageadaptor.h  
 M  +2 -2      shell/kviewpart.cpp  
 M  +1 -1      shell/main.cpp  
 M  +0 -4      shell/pageSizeWidget_base.ui  


--- trunk/KDE/kdegraphics/kviewshell/plugins/djvu/djvumultipage.cpp #557424:557425
@@ -181,7 +181,7 @@
 
   // Obtain file name for insertion
   QString filter = i18n("*.djvu|DjVu file (*.djvu)");
-  QString fname = KFileDialog::getOpenFileName( "::djvu",  filter, parentWdg, \
i18n("Insert DJVU file...")); +  QString fname = \
KFileDialog::getOpenFileName(KUrl("kfiledialog:///<djvu>?global"), filter, parentWdg, \
i18n("Insert DJVU file..."));  if (fname.isEmpty())
     return;
 
--- trunk/KDE/kdegraphics/kviewshell/plugins/dvi/dviRenderer.cpp #557424:557425
@@ -313,7 +313,7 @@
     dialog.setHelp("inverse-search", "kdvi");
     dialog.enableLinkedHelp(true);
     dialog.setMainWidget(topcontents);
-    dialog.enableButtonSeparator(false);
+    dialog.showButtonSeparator(false);
     dialog.setInitialSize( extraSize );
     dialog.exec();
 
--- trunk/KDE/kdegraphics/kviewshell/plugins/pdf/pdfMultipage.cpp #557424:557425
@@ -23,7 +23,7 @@
 
 #include <kaction.h>
 #include <kconfigdialog.h>
-#include <kdialogbase.h>
+#include <kdialog.h>
 #include <kfiledialog.h>
 #include <kmessagebox.h>
 #include <kparts/genericfactory.h>
@@ -249,7 +249,7 @@
 
   // Obtain file name for insertion
   QString filter = i18n("*.pdf|PDF file (*.pdf)");
-  QString fname = KFileDialog::getOpenFileName( "::pdf",  filter, parentWdg, \
i18n("Insert PDF file...")); +  QString fname = \
KFileDialog::getOpenFileName(KUrl("kfiledialog:///<pdf>?global"), filter, parentWdg, \
i18n("Insert PDF file..."));  if (fname.isEmpty())
     return;
 
@@ -298,7 +298,7 @@
 
   // Obtain file name for insertion
   QString filter = i18n("*.pdf|PDF file (*.pdf)");
-  QString fname = KFileDialog::getOpenFileName( "::pdf",  filter, parentWdg, \
i18n("Select PDF file for background...")); +  QString fname = \
KFileDialog::getOpenFileName(KUrl("kfiledialog:///<pdf>?global"),  filter, parentWdg, \
i18n("Select PDF file for background..."));  if (fname.isEmpty())
     return;
 
--- trunk/KDE/kdegraphics/kviewshell/plugins/pdf/pdfRenderer.cpp #557424:557425
@@ -24,7 +24,6 @@
 #include <kicontheme.h>
 #include <kapplication.h>
 #include <kdialog.h>
-#include <kdialogbase.h>
 #include <kglobal.h>
 #include <kio/job.h>
 #include <klocale.h>
@@ -763,7 +762,7 @@
     dialog->setHelp("inverse-search", "kpdfview");
     dialog->enableLinkedHelp(true);
     dialog->setMainWidget(topcontents);
-    dialog->enableButtonSeparator(false);
+    dialog->showButtonSeparator(false);
     dialog->setInitialSize(extraSize);
     dialog->exec();
     delete dialog;
@@ -904,11 +903,11 @@
 {
   KDialog dialog(parentWidget);
   dialog.setCaption( i18n("Document Properties") );
-  dialog.setButtons( KDialogBase::Ok|KDialogBase::Cancel );
+  dialog.setButtons( KDialog::Ok|KDialog::Cancel );
   dialog.setModal( true );
 
 
-  //  KDialog dialog( parentWidget, "urldialog", true, i18n("Document Properties"), \
KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true ); +  //  KDialog dialog( \
parentWidget, "urldialog", true, i18n("Document Properties"), \
KDialog::Ok|KDialog::Cancel, KDialog::Ok, true );  
   // Setup the main properties widget
   DocumentInfoWidget_base infoWdg( &dialog );
--- trunk/KDE/kdegraphics/kviewshell/shell/kmultipage.cpp #557424:557425
@@ -23,7 +23,7 @@
 //#include <QPaintDeviceMetrics>
 #include <QSplitter>
 #include "kmultipageadaptor.h"
-#include <dbus/qdbus.h>
+#include <QtDBus/QtDBus>
 
 //#define DEBUG_KMULTIPAGE
 
--- trunk/KDE/kdegraphics/kviewshell/shell/kmultipageadaptor.h #557424:557425
@@ -11,7 +11,7 @@
 #define KMULTIPAGEADAPTOR_H_81041149690568
 
 #include <QtCore/QObject>
-#include <dbus/qdbus.h>
+#include <QtDBus/QtDBus>
 class QByteArray;
 template<class T> class QList;
 template<class Key, class Value> class QMap;
--- trunk/KDE/kdegraphics/kviewshell/shell/kviewpart.cpp #557424:557425
@@ -495,7 +495,7 @@
       return;
   }
 
-  KUrl url = KFileDialog::getOpenURL(QString::null, supportedMimeTypes().join(" "));
+  KUrl url = KFileDialog::getOpenURL(KUrl(), supportedMimeTypes().join(" "), \
mainWidget);  
   if (!url.isEmpty())
     openURL(url);
@@ -1711,7 +1711,7 @@
     return;
   }
 
-  QString fileName = KFileDialog::getSaveFileName(QString::null, mimeTypeFilter, 0, \
i18n("Save File As")); +  QString fileName = KFileDialog::getSaveFileName(KUrl(), \
mimeTypeFilter, mainWidget, i18n("Save File As"));  
   if (QFile(fileName).exists()) {
     int r = KMessageBox::warningContinueCancel (0, i18n("<qt>The file %1 exists. Do \
                you want to overwrite that file?</qt>", fileName),
--- trunk/KDE/kdegraphics/kviewshell/shell/main.cpp #557424:557425
@@ -10,7 +10,7 @@
 #include <klocale.h>
 #include <kmimetype.h>
 #include <kurl.h>
-#include <dbus/qdbus.h>
+#include <QtDBus/QtDBus>
 #include <QDir>
 
 #include <cstdlib>
--- trunk/KDE/kdegraphics/kviewshell/shell/pageSizeWidget_base.ui #557424:557425
@@ -290,9 +290,5 @@
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcombobox.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>sizepreview.h</includehint>
 </includehints>
 </UI>


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