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

List:       kde-commits
Subject:    KDE/kdelibs/kross/ui
From:       Sebastian Sauer <mail () dipe ! org>
Date:       2007-06-04 19:08:34
Message-ID: 1180984114.198197.25487.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 671421 by sebsauer:

removed yet unused scriptmanager-functionality (bic but not sic).



 M  +0 -20     guiclient.cpp  
 M  +5 -28     guiclient.h  
 M  +0 -20     view.cpp  
 M  +0 -5      view.h  


--- trunk/KDE/kdelibs/kross/ui/guiclient.cpp #671420:671421
@@ -48,8 +48,6 @@
         public:
             /// The \a KXMLGUIClient that is parent of the \a GUIClient instance.
             KXMLGUIClient* guiclient;
-            /// The collection of installed script-packages.
-            //KActionCollection* actions;
             /// The menu used to display the scripts.
             KActionMenu* scriptsmenu;
     };
@@ -64,7 +62,6 @@
     setComponentData( GUIClient::componentData() );
 
     d->guiclient = guiclient;
-    //d->actions = Manager::self().actionCollection();
 
     d->scriptsmenu = new KActionMenu(i18n("Scripts"), this);
     actionCollection()->addAction("scripts", d->scriptsmenu);
@@ -91,7 +88,6 @@
 
 GUIClient::~GUIClient()
 {
-    //krossdebug("GUIClient::~GUIClient()");
     delete d;
 }
 
@@ -219,12 +215,6 @@
     showExecuteScriptFile();
 }
 
-void GUIClient::slotShowScriptManager()
-{
-    krossdebug( QString("GUIClient::slotShowScriptManager") );
-    showScriptManager();
-}
-
 void GUIClient::started(Kross::Action* action)
 {
     Q_UNUSED(action);
@@ -263,14 +253,4 @@
     return filedialog->exec() ? Manager::self().executeScriptFile( \
filedialog->selectedUrl().path() ) : false;  }
 
-bool GUIClient::showScriptManager()
-{
-    QObject* obj = Manager::self().module("scriptmanager");
-    if( obj )
-        if( QMetaObject::invokeMethod(obj, "showManagerDialog") )
-            return true; // successfully called the method.
-    KMessageBox::sorry(0, i18n("Failed to load the Script Manager."));
-    return false;
-}
-
 #include "guiclient.moc"
--- trunk/KDE/kdelibs/kross/ui/guiclient.h #671420:671421
@@ -70,57 +70,34 @@
              */
             virtual void setDOMDocument(const QDomDocument &document, bool merge = \
false);  
-#if 0
             /**
-             * \return the KActionCollection which holds the list of \a Action \
                instances.
-             */
-            KActionCollection* scriptsActionCollection() const;
-
-            /**
-             * This method tries to determinate all available packages and fills
-             * the configuration with actions defined there.
-             */
-            bool writeConfigFromPackages();
-#endif
-
-            /**
             * Show a KFileDialog to select a script file that should be executed.
             */
             static bool showExecuteScriptFile();
 
-            /**
-            * Show the "Script Manager" dialog defined in the \a ScriptManagerModule
-            * to let the user manage the script files.
-            */
-            static bool showScriptManager();
-
         public Q_SLOTS:
 
             /**
             * Show a modal KFileDialog to select a script file that should be \
                executed.
             */
-            void slotShowExecuteScriptFile();
+            virtual void slotShowExecuteScriptFile();
 
-            /**
-            * Show the modal "Script Manager" dialog.
-            */
-            void slotShowScriptManager();
+        protected Q_SLOTS:
 
-        private Q_SLOTS:
             /**
              * Called before the "Scripts" menu is shown to update the list of \
                displayed scripts.
              */
-            void slotMenuAboutToShow();
+            virtual void slotMenuAboutToShow();
 
             /**
              * Called if execution started.
              */
-            void started(Kross::Action*);
+            virtual void started(Kross::Action*);
 
             /**
              * Called if execution finished.
              */
-            void finished(Kross::Action*);
+            virtual void finished(Kross::Action*);
 
         private:
             /// \internal d-pointer class.
--- trunk/KDE/kdelibs/kross/ui/view.cpp #671420:671421
@@ -334,21 +334,6 @@
     d->collection->addAction("remove", removeaction);
     connect(removeaction, SIGNAL(triggered()), this, SLOT(slotRemove()) );
 
-    /*
-    d->newstuffbtn = new KAction(KIcon("get-hot-new-stuff"), i18n("Get New \
                Scripts"), this);
-    d->newstuffbtn->setToolTip( i18n("Get new scripts from the internet.") );
-    d->collection->addAction("newstuff", d->newstuffbtn);
-    //TODO connect(d->newstuffbtn, SIGNAL(clicked()), this, SLOT(slotNewScripts()) \
                );
-    */
-
-    //i18n("About"), i18n("Configure")
-
-    KAction* manageraction = new KAction(KIcon("configure"), i18n("Script Manager"), \
                this);
-    manageraction->setObjectName("manager");
-    manageraction->setToolTip( i18n("Script Manager to configure scripts.") );
-    d->collection->addAction("manager", manageraction);
-    connect(manageraction, SIGNAL(triggered()), this, SLOT(slotShowScriptManager()) \
                );
-
     connect(this, SIGNAL(enabledChanged(const QString&)), this, \
SLOT(slotEnabledChanged(const QString&)));  //expandAll();
 }
@@ -463,11 +448,6 @@
     d->modified = true;
 }
 
-void ActionCollectionView::slotShowScriptManager()
-{
-    GUIClient::showScriptManager();
-}
-
 void ActionCollectionView::slotRun()
 {
     if( ! selectionModel() ) return;
--- trunk/KDE/kdelibs/kross/ui/view.h #671420:671421
@@ -281,11 +281,6 @@
             */
             virtual void slotSelectionChanged();
 
-            /**
-            * This slot got called if the "Script Manager" should be displayed.
-            */
-            virtual void slotShowScriptManager();
-
         protected:
 
             /**


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