[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: koffice/libs/kokross
From: Sebastian Sauer <mail () dipe ! org>
Date: 2007-05-31 22:49:14
Message-ID: 1180651754.204867.7247.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 670287 by sebsauer:
reactivate scriptmanager
M +3 -60 KoScriptManager.cpp
M +1 -33 KoScriptManager.h
M +27 -0 KoScriptingGuiClient.cpp
M +3 -0 KoScriptingGuiClient.h
--- trunk/koffice/libs/kokross/KoScriptManager.cpp #670286:670287
@@ -78,14 +78,13 @@
class KoScriptManagerCollection::Private
{
public:
- KoScriptManagerModule* module;
bool modified;
Kross::ActionCollectionView* view;
- Private(KoScriptManagerModule* m) : module(m), modified(false) {}
+ Private() : modified(false) {}
};
-KoScriptManagerCollection::KoScriptManagerCollection(KoScriptManagerModule* module, QWidget* parent)
- : QWidget(parent), d(new Private(module))
+KoScriptManagerCollection::KoScriptManagerCollection(QWidget* parent)
+ : QWidget(parent), d(new Private())
{
QHBoxLayout* mainlayout = new QHBoxLayout();
mainlayout->setMargin(0);
@@ -131,11 +130,6 @@
delete d;
}
-KoScriptManagerModule* KoScriptManagerCollection::module() const
-{
- return d->module;
-}
-
/*
bool KoScriptManagerCollection::isModified() const
{
@@ -184,26 +178,6 @@
}
#endif
-/******************************************************************************
- * KoScriptManagerModule
- */
-
-/// \internal d-pointer class.
-class KoScriptManagerModule::Private
-{
- public:
-};
-
-KoScriptManagerModule::KoScriptManagerModule()
- : QObject(), d(new Private())
-{
-}
-
-KoScriptManagerModule::~KoScriptManagerModule()
-{
- delete d;
-}
-
#if 0
bool KoScriptManagerModule::installPackage(const QString& scriptpackagefile)
{
@@ -288,35 +262,4 @@
}
#endif
-QWidget* KoScriptManagerModule::createManagerWidget(QWidget* parent)
-{
- return new KoScriptManagerCollection(this, parent);
-}
-
-void KoScriptManagerModule::showManagerDialog()
-{
- KDialog* dialog = new KDialog();
- dialog->setCaption( i18n("Script Manager") );
- dialog->setButtons( KDialog::Ok | KDialog::Cancel );
- dialog->setMainWidget( createManagerWidget( dialog->mainWidget() ) );
- dialog->resize( QSize(520, 380).expandedTo( dialog->minimumSizeHint() ) );
- int result = dialog->exec();
-#if 0
- if ( view->isModified() ) {
- if( result == QDialog::Accepted /*&& dialog->result() == KDialog::Ok*/ ) {
- // save new config
- Manager::self().writeConfig();
- }
- else {
- // restore old config
- Manager::self().readConfig();
- }
- QMetaObject::invokeMethod(&Manager::self(), "configChanged");
- }
-#else
- Q_UNUSED(result);
-#endif
- dialog->delayedDestruct();
-}
-
#include "KoScriptManager.moc"
--- trunk/koffice/libs/kokross/KoScriptManager.h #670286:670287
@@ -47,11 +47,9 @@
/**
* Constructor.
- * \param module The \a KoScriptManagerModule that was used
- * to create this \a KoScriptManagerCollection instance.
* \param parent The parent widget this widget is child of.
*/
- explicit KoScriptManagerCollection(KoScriptManagerModule* module, QWidget* parent = 0);
+ explicit KoScriptManagerCollection(QWidget* parent);
/**
* Destructor.
@@ -111,34 +109,4 @@
Private* const d;
};
-/**
-* The KoScriptManagerModule provides access to the Script Manager
-* functionality like the "Script Manager" KDialog.
-*/
-class KoScriptManagerModule : public QObject
-{
- Q_OBJECT
- public:
- explicit KoScriptManagerModule();
- virtual ~KoScriptManagerModule();
-
- public Q_SLOTS:
-
- /**
- * Create and return the "Script Manager" widget.
- */
- QWidget* createManagerWidget(QWidget* parent = 0);
-
- /**
- * Display the modal "Script Manager" dialog.
- */
- void showManagerDialog();
-
- private:
- /// \internal d-pointer class.
- class Private;
- /// \internal d-pointer instance.
- Private* const d;
-};
-
#endif
--- trunk/koffice/libs/kokross/KoScriptingGuiClient.cpp #670286:670287
@@ -18,6 +18,7 @@
***************************************************************************/
#include "KoScriptingGuiClient.h"
+#include "KoScriptManager.h"
// qt
//#include <QApplication>
@@ -63,4 +64,30 @@
delete d;
}
+void KoScriptingGuiClient::slotShowScriptManager()
+{
+ KDialog* dialog = new KDialog();
+ dialog->setCaption( i18n("Script Manager") );
+ dialog->setButtons( KDialog::Ok | KDialog::Cancel );
+ dialog->setMainWidget( new KoScriptManagerCollection(dialog->mainWidget()) );
+ dialog->resize( QSize(520, 380).expandedTo( dialog->minimumSizeHint() ) );
+ int result = dialog->exec();
+#if 0
+ if ( view->isModified() ) {
+ if( result == QDialog::Accepted /*&& dialog->result() == KDialog::Ok*/ ) {
+ // save new config
+ Manager::self().writeConfig();
+ }
+ else {
+ // restore old config
+ Manager::self().readConfig();
+ }
+ QMetaObject::invokeMethod(&Manager::self(), "configChanged");
+ }
+#else
+ Q_UNUSED(result);
+#endif
+ dialog->delayedDestruct();
+}
+
#include "KoScriptingGuiClient.moc"
--- trunk/koffice/libs/kokross/KoScriptingGuiClient.h #670286:670287
@@ -40,6 +40,9 @@
explicit KoScriptingGuiClient(KXMLGUIClient* guiclient, QObject* parent = 0);
virtual ~KoScriptingGuiClient();
+ public Q_SLOTS:
+ void slotShowScriptManager();
+
private:
/// \internal d-pointer class.
class Private;
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic