Menu
▾
▴
[Krusader-commits] krusader_kde3/krusader Makefile.am,1.33,1.34 krslots.cpp,1.86,1.87 krslots.h,1.40,1.41 krusader.cpp,1.125,1.126 krusader.h,1.37,1.38
|
From: Jonas B. <jb...@us...> - 2005-01-22 20:40:03
|
Update of /cvsroot/krusader/krusader_kde3/krusader In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5074/krusader Modified Files: Makefile.am krslots.cpp krslots.h krusader.cpp krusader.h Log Message: ADDED: Primitive scripting support; Warning: very alpha!! see CVSNEWS and my mail to krusader-devel for more details Index: krusader.h =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/krusader.h,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** krusader.h 12 Jan 2005 23:12:05 -0000 1.37 --- krusader.h 22 Jan 2005 20:39:49 -0000 1.38 *************** *** 48,51 **** --- 48,55 ---- #include <qtextstream.h> + #ifdef __KJSEMBED__ + #include <kjsembed/kjsembedpart.h> + #endif + class KrusaderStatus; class KRPleaseWaitHandler; *************** *** 139,142 **** --- 143,151 ---- static KrBookmarkHandler *bookman; + #ifdef __KJSEMBED__ + static KJSEmbed::KJSEmbedPart *js; + static KAction *actShowJSConsole; + #endif + signals: void changeMessage( QString ); *************** *** 221,223 **** --- 230,237 ---- #define krF10 Krusader::App->actF10 + #ifdef __KJSEMBED__ + #define krJS Krusader::App->js + #define krJSConsole Krusader::App->actShowJSConsole + #endif + #endif Index: krslots.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/krslots.cpp,v retrieving revision 1.86 retrieving revision 1.87 diff -C2 -d -r1.86 -r1.87 *** krslots.cpp 22 Jan 2005 15:42:02 -0000 1.86 --- krslots.cpp 22 Jan 2005 20:39:49 -0000 1.87 *************** *** 47,50 **** --- 47,55 ---- #include <kcmdlineargs.h> #include <KViewer/krviewer.h> + + #ifdef __KJSEMBED__ + #include <kjsembed/jsconsolewidget.h> + #endif + // Krusader includes #include "krslots.h" *************** *** 827,830 **** --- 832,841 ---- } + #ifdef __KJSEMBED__ + //shows the JavaScript-Console + void KRslots::jsConsole() { + krJS->view()->show(); + } + #endif #include "krslots.moc" Index: Makefile.am =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/Makefile.am,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** Makefile.am 21 Jan 2005 23:25:29 -0000 1.33 --- Makefile.am 22 Jan 2005 20:39:49 -0000 1.34 *************** *** 8,13 **** endif krusader_SOURCES = paneltabbar.cpp panelmanager.cpp krservices.cpp main.cpp krusaderview.cpp krusader.cpp krslots.cpp kicons.cpp ! krusader_LDADD = ./BookMan/libBookMan.a ./Dialogs/libDialogs.a ./DiskUsage/libDiskUsage.a ./DiskUsage/radialMap/libradialmap.a ./DiskUsage/filelightParts/libfilelightparts.a ./GUI/libGUI.a ./Konfigurator/libKonfigurator.a ./KViewer/libKViewer.a ./MountMan/libMountMan.a ./Panel/libPanel.a ./RemoteMan/libRemoteMan.a ./VFS/libVFS.a ./Search/libSearch.a ./Splitter/libSplitter.a ./Synchronizer/libSynchronizer.a ./UserMenu/libUserMenu.a ./Locate/libLocate.a UserAction/libUserAction.a VFS/libVFS.a KViewer/libKViewer.a Dialogs/libDialogs.a GUI/libGUI.a $(LIB_KONQ) $(LIB_KPARTS) $(LIB_KFILE) $(LIB_KHTML) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) $(LIBSOCKET) SUBDIRS = BookMan Dialogs DiskUsage GUI Konfigurator KViewer MountMan Panel RemoteMan VFS \ --- 8,19 ---- endif + if include_libkjsembed + AM_CPPFLAGS = -D__KJSEMBED__ + LIB_KJSEMBED = -lkjsembed + endif + + krusader_SOURCES = paneltabbar.cpp panelmanager.cpp krservices.cpp main.cpp krusaderview.cpp krusader.cpp krslots.cpp kicons.cpp ! krusader_LDADD = ./BookMan/libBookMan.a ./Dialogs/libDialogs.a ./DiskUsage/libDiskUsage.a ./DiskUsage/radialMap/libradialmap.a ./DiskUsage/filelightParts/libfilelightparts.a ./GUI/libGUI.a ./Konfigurator/libKonfigurator.a ./KViewer/libKViewer.a ./MountMan/libMountMan.a ./Panel/libPanel.a ./RemoteMan/libRemoteMan.a ./VFS/libVFS.a ./Search/libSearch.a ./Splitter/libSplitter.a ./Synchronizer/libSynchronizer.a ./UserMenu/libUserMenu.a ./Locate/libLocate.a UserAction/libUserAction.a VFS/libVFS.a KViewer/libKViewer.a Dialogs/libDialogs.a GUI/libGUI.a $(LIB_KJSEMBED) $(LIB_KONQ) $(LIB_KPARTS) $(LIB_KFILE) $(LIB_KHTML) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) $(LIBSOCKET) SUBDIRS = BookMan Dialogs DiskUsage GUI Konfigurator KViewer MountMan Panel RemoteMan VFS \ Index: krusader.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/krusader.cpp,v retrieving revision 1.125 retrieving revision 1.126 diff -C2 -d -r1.125 -r1.126 *** krusader.cpp 22 Jan 2005 15:42:02 -0000 1.125 --- krusader.cpp 22 Jan 2005 20:39:49 -0000 1.126 *************** *** 162,165 **** --- 162,170 ---- //QTextOStream *Krusader::_krOut = QTextOStream(::stdout); + #ifdef krJS + KJSEmbed::KJSEmbedPart *Krusader::js = 0; + KAction *Krusader::actShowJSConsole = 0; + #endif + // construct the views, statusbar and menu bars and prepare Krusader to start Krusader::Krusader() : KParts::MainWindow(), sysTray( 0 ), isStarting( true ) { *************** *** 599,602 **** --- 604,614 ---- expander = new Expander(); userAction = new UserAction(); + + #ifdef __KJSEMBED__ + js = new KJSEmbed::KJSEmbedPart(); + // make this object, the class Krusader, available for scripting as "Krusader": + js->addObject( this, "Krusader" ); + actBack = new KAction( i18n( "JavaScript console" ), ALT + CTRL + Key_J, SLOTS, SLOT( jsConsole() ), actionCollection(), "JS_Console" ); + #endif } Index: krslots.h =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/krslots.h,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** krslots.h 22 Jan 2005 15:42:02 -0000 1.40 --- krslots.h 22 Jan 2005 20:39:49 -0000 1.41 *************** *** 162,165 **** --- 162,169 ---- void slotCurrentChanged( QString p ) { MAIN_VIEW->slotCurrentChanged( p ); } void slotSetActivePanel( ListPanel *p ) { MAIN_VIEW->slotSetActivePanel( p ); } + + #ifdef __KJSEMBED__ + void jsConsole(); + #endif }; |