[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: koffice/filters
From: Fredrik Edemar <f_edemar () linux ! se>
Date: 2006-06-14 19:55:03
Message-ID: 1150314903.279509.18518.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 551510 by fedemar:
compile
M +3 -1 kspread/html/exportdialog.cc
M +1 -3 kspread/latex/export/CMakeLists.txt
M +4 -7 kspread/latex/export/kspreadlatexexportdiaImpl.cc
M +0 -3 kspread/latex/export/kspreadlatexexportdiaImpl.h
A kspread/latex/export/latexexportAdaptor.cc [License: LGPL (v2+)]
A kspread/latex/export/latexexportAdaptor.h [License: LGPL (v2+)]
M +3 -1 kword/ascii/ExportDialog.cc
M +3 -1 kword/ascii/ImportDialog.cc
M +3 -1 kword/html/export/ExportDialog.cc
M +1 -2 kword/latex/export/CMakeLists.txt
M +3 -7 kword/latex/export/kwordlatexexportdia.cc
A kword/latex/export/latexexportAdaptor.cc [License: LGPL (v2+)]
A kword/latex/export/latexexportAdaptor.h [License: LGPL (v2+)]
M +3 -1 kword/mswrite/ImportDialog.cc
M +15 -10 kword/pdf/dialog.cpp
M +2 -2 kword/pdf/dialog.h
--- trunk/koffice/filters/kspread/html/exportdialog.cc #551509:551510
@@ -33,8 +33,10 @@
#include <exportwidget.h>
ExportDialog::ExportDialog( QWidget *parent )
- : KDialog( parent, i18n("Export Sheet to HTML"), KDialog::Ok|KDialog::Cancel ), \
m_mainwidget( new ExportWidget( this ) ) + : KDialog( parent ), m_mainwidget( new \
ExportWidget( this ) ) {
+ setCaption( i18n("Export Sheet to HTML") );
+ setButtons( Ok|Cancel );
setDefaultButton(KDialog::No);
kapp->restoreOverrideCursor();
--- trunk/koffice/filters/kspread/latex/export/CMakeLists.txt #551509:551510
@@ -14,7 +14,7 @@
format.cc
kspreadlatexexportdiaImpl.cc
latexexport.cc
- latexexportIface.cc
+ latexexportAdaptor.cc
map.cc
pen.cc
row.cc
@@ -26,8 +26,6 @@
kde4_add_ui3_files(kspreadlatexexport_PART_SRCS latexexportdia.ui )
-kde4_add_dcop_skels(kspreadlatexexport_PART_SRCS latexexportIface.h )
-
kde4_add_plugin(kspreadlatexexport WITH_PREFIX ${kspreadlatexexport_PART_SRCS})
kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} kspreadlatexexport )
--- trunk/koffice/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cc \
#551509:551510 @@ -40,7 +40,7 @@
#include <kcombobox.h>
#include <knuminput.h>
-#include <dcopclient.h>
+#include "latexexportAdaptor.h"
#include "document.h"
@@ -81,12 +81,9 @@
i = i + 1;
}
- _iface = new LatexExportIface(this);
- if(!kapp->dcopClient()->isRegistered() )
- {
- kapp->dcopClient()->registerAs("FilterConfigDia");
- kapp->dcopClient()->setDefaultObject(_iface->objId());
- }
+ new LatexExportAdaptor(this);
+ QDBus::sessionBus().registerObject("/filter/latex", this);
+
/* All these items inserted must not be translated so they are inserted here
* without i18n() method. */
--- trunk/koffice/filters/kspread/latex/export/kspreadlatexexportdiaImpl.h \
#551509:551510 @@ -24,8 +24,6 @@
#include <QStringList>
#include <kurl.h>
-#include "latexexportIface.h"
-
class KoStore;
class KConfig;
@@ -37,7 +35,6 @@
QString _fileOut;
KoStore* _in;
KConfig* _config;
- LatexExportIface* _iface;
public:
KSpreadLatexExportDiaImpl( KoStore*, QWidget* parent = 0,
--- trunk/koffice/filters/kword/ascii/ExportDialog.cc #551509:551510
@@ -34,9 +34,11 @@
#include <ExportDialog.h>
AsciiExportDialog :: AsciiExportDialog(QWidget* parent)
- : KDialog(parent, i18n("KWord's Plain Text Export Filter"), \
KDialog::Ok|KDialog::Cancel), + : KDialog(parent),
m_dialog(new ExportDialogUI(this))
{
+ setButtons( Ok|Cancel );
+ setCaption( i18n("KWord's Plain Text Export Filter") );
setDefaultButton(KDialog::No);
kapp->restoreOverrideCursor();
--- trunk/koffice/filters/kword/ascii/ImportDialog.cc #551509:551510
@@ -34,9 +34,11 @@
#include <ImportDialog.h>
AsciiImportDialog :: AsciiImportDialog(QWidget* parent)
- : KDialog(parent,i18n("KWord's Plain Text Import Filter"), \
KDialog::Ok|KDialog::Cancel), + : KDialog(parent),
m_dialog(new ImportDialogUI(this))
{
+ setButtons( Ok|Cancel);
+ setCaption( i18n("KWord's Plain Text Import Filter") );
setDefaultButton(KDialog::No);
kapp->restoreOverrideCursor();
--- trunk/koffice/filters/kword/html/export/ExportDialog.cc #551509:551510
@@ -37,9 +37,11 @@
#include <ExportDialog.h>
HtmlExportDialog :: HtmlExportDialog(QWidget* parent)
- : KDialog(parent, i18n("KWord's HTML Export Filter"), \
KDialog::Ok|KDialog::Cancel), + : KDialog(parent),
m_dialog(new ExportDialogUI(this))
{
+ setButtons( Ok|Cancel );
+ setCaption( i18n("KWord's HTML Export Filter") );
setDefaultButton(KDialog::No);
kapp->restoreOverrideCursor();
--- trunk/koffice/filters/kword/latex/export/CMakeLists.txt #551509:551510
@@ -17,7 +17,7 @@
key.cc
kwordlatexexportdia.cc
latexexport.cc
- latexexportIface.cc
+ latexexportAdaptor.cc
layout.cc
listtable.cc
para.cc
@@ -35,7 +35,6 @@
kde4_add_ui3_files(kwordlatexexport_PART_SRCS latexexportdia.ui )
-kde4_add_dcop_skels(kwordlatexexport_PART_SRCS latexexportIface.h )
kde4_add_plugin(kwordlatexexport WITH_PREFIX ${kwordlatexexport_PART_SRCS})
--- trunk/koffice/filters/kword/latex/export/kwordlatexexportdia.cc #551509:551510
@@ -41,7 +41,7 @@
#include <knuminput.h>
#include <dcopclient.h>
-#include <latexexportIface.h>
+#include <latexexportAdaptor.h>
#include "xml2latexparser.h"
@@ -83,12 +83,8 @@
i = i + 1;
}
- _iface = new LatexExportIface(this);
- if(!kapp->dcopClient()->isRegistered() )
- {
- kapp->dcopClient()->registerAs("FilterConfigDia");
- kapp->dcopClient()->setDefaultObject(_iface->objId());
- }
+ new LatexExportAdaptor(this);
+ QDBus::sessionBus().registerObject("/filter/latex", this);
/* All these items inserted must not be translated so they are inserted here
* without i18n() method. */
--- trunk/koffice/filters/kword/mswrite/ImportDialog.cc #551509:551510
@@ -36,9 +36,11 @@
#include <QCheckBox>
MSWriteImportDialog :: MSWriteImportDialog(QWidget* parent)
- : KDialog(parent, i18n("KWord's MS Write Import Filter"), \
KDialog::Ok|KDialog::Cancel), + : KDialog(parent),
m_dialog(new ImportDialogUI(this))
{
+ setCaption( i18n("KWord's MS Write Import Filter") );
+ setButtons( Ok|Cancel );
setDefaultButton(KDialog::No);
kapp->restoreOverrideCursor();
--- trunk/koffice/filters/kword/pdf/dialog.cpp #551509:551510
@@ -118,17 +118,22 @@
{
Dialog::Dialog(uint nbPages, bool isEncrypted, QWidget *widget)
- : KDialogBase(Plain, i18n("KWord's PDF Import Filter"), Ok|Cancel, Ok,
- widget, "pdf_import_dialog"), _nbPages(nbPages)
+ : KDialog(widget), _nbPages(nbPages)
{
+ setCaption( i18n("KWord's PDF Import Filter") );
+ setButtons( Ok|Cancel );
+ setDefaultButton(Ok);
+ setObjectName( "pdf_import_dialog" );
+
QApplication::restoreOverrideCursor();
- Q3VBoxLayout *top = new Q3VBoxLayout(plainPage(), KDialogBase::marginHint(),
- KDialogBase::spacingHint());
+ QWidget *page = new QWidget();
+ Q3VBoxLayout *top = new Q3VBoxLayout(page, KDialog::marginHint(),
+ KDialog::spacingHint());
// page selection
- Q3GroupBox *gbox = new Q3GroupBox(1, Qt::Horizontal,i18n("Page Selection"), \
plainPage());
- gbox->setInsideSpacing(KDialogBase::spacingHint());
+ Q3GroupBox *gbox = new Q3GroupBox(1, Qt::Horizontal,i18n("Page Selection"), \
page); + gbox->setInsideSpacing(KDialog::spacingHint());
top->addWidget(gbox);
_group = new Q3ButtonGroup;
_allButton = new QRadioButton(i18n("All (%1 pages)", nbPages), gbox);
@@ -143,10 +148,10 @@
SLOT(rangeChanged(const QString &)));
// options
- _images = new QCheckBox(i18n("Import images"), plainPage());
+ _images = new QCheckBox(i18n("Import images"), page);
_images->setChecked(true);
top->addWidget(_images);
- _smart = new QCheckBox(i18n("\"Smart\" mode"), plainPage());
+ _smart = new QCheckBox(i18n("\"Smart\" mode"), page);
_smart->setChecked(true);
_smart->setWhatsThis(
i18n("Removes returns and hyphens at end of line. "
@@ -156,10 +161,10 @@
top->addWidget(_smart);
// passwords
- gbox = new Q3GroupBox(1, Qt::Horizontal,i18n("Passwords"), plainPage());
+ gbox = new Q3GroupBox(1, Qt::Horizontal,i18n("Passwords"), page);
top->addWidget(gbox);
Q3Grid *grid = new Q3Grid(2, gbox);
- grid->setSpacing(KDialogBase::spacingHint());
+ grid->setSpacing(KDialog::spacingHint());
(void)new QLabel(i18n("Owner:"), grid);
_owner = new KLineEdit(grid);
_owner->setEchoMode(QLineEdit::Password);
--- trunk/koffice/filters/kword/pdf/dialog.h #551509:551510
@@ -23,7 +23,7 @@
#include <q3valuevector.h>
#include <QPair>
-#include <kdialogbase.h>
+#include <kdialog.h>
class Q3ButtonGroup;
class QRadioButton;
@@ -77,7 +77,7 @@
bool importImages, smart;
};
-class Dialog : public KDialogBase
+class Dialog : public KDialog
{
Q_OBJECT
public:
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic