From: <er...@us...> - 2007-09-14 22:36:53
|
Revision: 2548 http://krusader.svn.sourceforge.net/krusader/?rev=2548&view=rev Author: erlich Date: 2007-09-14 15:36:57 -0700 (Fri, 14 Sep 2007) Log Message: ----------- all compiles... now linker errors... Modified Paths: -------------- trunk/krusader_kde4/Krusader.kdevelop trunk/krusader_kde4/krusader/CMakeLists.txt trunk/krusader_kde4/krusader/UserAction/CMakeLists.txt trunk/krusader_kde4/krusader/UserAction/useraction.cpp trunk/krusader_kde4/krusader/krusaderapp.h Added Paths: ----------- trunk/krusader_kde4/krusader/krusaderapp.cpp Modified: trunk/krusader_kde4/Krusader.kdevelop =================================================================== --- trunk/krusader_kde4/Krusader.kdevelop 2007-09-14 22:08:15 UTC (rev 2547) +++ trunk/krusader_kde4/Krusader.kdevelop 2007-09-14 22:36:57 UTC (rev 2548) @@ -2,7 +2,7 @@ <kdevelop> <general> <author>Shie Erlich & Rafi Yanai</author> - <email></email> + <email/> <version>$VERSION$</version> <projectmanagement>KDevCustomProject</projectmanagement> <primarylanguage>C++</primarylanguage> @@ -10,15 +10,15 @@ <projectname>Krusader</projectname> <projectdirectory>.</projectdirectory> <absoluteprojectpath>false</absoluteprojectpath> - <description></description> - <defaultencoding></defaultencoding> + <description/> + <defaultencoding/> </general> <kdevcustomproject> <run> <mainprogram>/home/shie/src/krusader_kde4/$APPNAMELC$</mainprogram> <directoryradio>executable</directoryradio> - <programargs></programargs> - <globaldebugarguments></globaldebugarguments> + <programargs/> + <globaldebugarguments/> <globalcwd>/home/shie/src/krusader_kde4</globalcwd> <useglobalprogram>false</useglobalprogram> <terminal>false</terminal> @@ -29,16 +29,16 @@ </run> <build> <buildtool>make</buildtool> - <builddir></builddir> + <builddir/> </build> <make> <abortonerror>true</abortonerror> <numberofjobs>1</numberofjobs> <prio>0</prio> <dontact>false</dontact> - <makebin></makebin> - <defaulttarget></defaulttarget> - <makeoptions></makeoptions> + <makebin/> + <defaulttarget/> + <makeoptions/> <selectedenvironment>default</selectedenvironment> <environments> <default/> @@ -47,11 +47,11 @@ </kdevcustomproject> <kdevdebugger> <general> - <dbgshell></dbgshell> - <gdbpath></gdbpath> - <configGdbScript></configGdbScript> - <runShellScript></runShellScript> - <runGdbScript></runGdbScript> + <dbgshell/> + <gdbpath/> + <configGdbScript/> + <runShellScript/> + <runGdbScript/> <breakonloadinglibs>true</breakonloadinglibs> <separatetty>false</separatetty> <floatingtoolbar>false</floatingtoolbar> @@ -124,7 +124,7 @@ <root></root> <designerintegration>EmbeddedKDevDesigner</designerintegration> <qmake>/usr/bin/qmake</qmake> - <designer></designer> + <designer>/usr/bin/designer</designer> <designerpluginpaths/> </qt> <codecompletion> @@ -151,7 +151,7 @@ <includePaths>.;</includePaths> </codecompletion> <creategettersetter> - <prefixGet></prefixGet> + <prefixGet/> <prefixSet>set</prefixSet> <prefixVariable>m_,_</prefixVariable> <parameterName>theValue</parameterName> @@ -182,7 +182,7 @@ </tree> </kdevfileview> <ctagspart> - <customArguments></customArguments> + <customArguments/> <customTagfilePath>/home/shie/src/krusader_kde4/tags</customTagfilePath> <activeTagsFiles/> </ctagspart> Modified: trunk/krusader_kde4/krusader/CMakeLists.txt =================================================================== --- trunk/krusader_kde4/krusader/CMakeLists.txt 2007-09-14 22:08:15 UTC (rev 2547) +++ trunk/krusader_kde4/krusader/CMakeLists.txt 2007-09-14 22:36:57 UTC (rev 2548) @@ -33,7 +33,8 @@ krusaderview.cpp krusader.cpp krslots.cpp - kicons.cpp ) + kicons.cpp + krusaderapp.cpp ) kde4_add_executable(krusader ${krusader_SRCS}) Modified: trunk/krusader_kde4/krusader/UserAction/CMakeLists.txt =================================================================== --- trunk/krusader_kde4/krusader/UserAction/CMakeLists.txt 2007-09-14 22:08:15 UTC (rev 2547) +++ trunk/krusader_kde4/krusader/UserAction/CMakeLists.txt 2007-09-14 22:36:57 UTC (rev 2548) @@ -8,7 +8,8 @@ kraction.cpp expander.cpp useractionpopupmenu.cpp - kractionbase.cpp ) + kractionbase.cpp + useraction.cpp ) kde4_add_library(UserAction ${UserAction_SRCS} ) Modified: trunk/krusader_kde4/krusader/UserAction/useraction.cpp =================================================================== --- trunk/krusader_kde4/krusader/UserAction/useraction.cpp 2007-09-14 22:08:15 UTC (rev 2547) +++ trunk/krusader_kde4/krusader/UserAction/useraction.cpp 2007-09-14 22:36:57 UTC (rev 2548) @@ -12,6 +12,7 @@ #include <kdebug.h> #include <kurl.h> +#include <kactioncollection.h> #include <kmenu.h> #include <kstandarddirs.h> #include <kmessagebox.h> @@ -52,8 +53,8 @@ void UserAction::populateMenu( KMenu* menu ) { for ( KrAction* action = _actions.first(); action; action = _actions.next() ) - if ( ! action->isPlugged( menu ) ) - action->plug( menu ); + if ( !menu->actions().contains(action) ) + menu->addAction(action); } QStringList UserAction::allCategories() { @@ -76,13 +77,13 @@ } void UserAction::readAllFiles() { - QString filename = locate( "data", ACTION_XML ); // locate returns the local file if it exists, else the global one is retrieved. + QString filename = KStandardDirs::locate( "data", ACTION_XML ); // locate returns the local file if it exists, else the global one is retrieved. if ( ! filename.isEmpty() ) - readFromFile( locate( "data", ACTION_XML ), renameDoublicated ); + readFromFile( KStandardDirs::locate( "data", ACTION_XML ), renameDoublicated ); - filename = locate( "data", ACTION_XML_EXAMPLES ); + filename = KStandardDirs::locate( "data", ACTION_XML_EXAMPLES ); if ( ! filename.isEmpty() ) - readFromFile( locate( "data", ACTION_XML_EXAMPLES ), ignoreDoublicated ); // ignore samples which are already in the normal file + readFromFile( KStandardDirs::locate( "data", ACTION_XML_EXAMPLES ), ignoreDoublicated ); // ignore samples which are already in the normal file } void UserAction::readFromFile( const QString& filename, ReadMode mode, KrActionList* list ) { @@ -143,13 +144,13 @@ continue; } - if ( mode == ignoreDoublicated && krApp->actionCollection()->action( name.toLatin1() ) ) + if ( mode == ignoreDoublicated && krApp->actionCollection()->action( name ) ) continue; QString basename = name + "_%1"; int i = 0; // appent a counter till the name is unique... (this checks every action, not only useractions) - while ( krApp->actionCollection()->action( name.toLatin1() ) ) + while ( krApp->actionCollection()->action( name ) ) name = basename.arg( ++i ); KrAction* act = new KrAction( krApp->actionCollection(), name.toLatin1() ); Added: trunk/krusader_kde4/krusader/krusaderapp.cpp =================================================================== --- trunk/krusader_kde4/krusader/krusaderapp.cpp (rev 0) +++ trunk/krusader_kde4/krusader/krusaderapp.cpp 2007-09-14 22:36:57 UTC (rev 2548) @@ -0,0 +1,17 @@ +#include "krusaderapp.h" + +KrusaderApp::KrusaderApp(): KApplication() {} + +bool KrusaderApp::x11EventFilter ( XEvent *e ) { + switch (e->type) { + case FocusIn: + emit windowActive(); + break; + case FocusOut: + emit windowInactive(); + break; + + } + //return false; // event should be processed normally + return KApplication::x11EventFilter(e); + } Modified: trunk/krusader_kde4/krusader/krusaderapp.h =================================================================== --- trunk/krusader_kde4/krusader/krusaderapp.h 2007-09-14 22:08:15 UTC (rev 2547) +++ trunk/krusader_kde4/krusader/krusaderapp.h 2007-09-14 22:36:57 UTC (rev 2548) @@ -8,20 +8,9 @@ class KrusaderApp: public KApplication { Q_OBJECT public: - KrusaderApp(): KApplication() {} - bool x11EventFilter ( XEvent *e ) { - switch (e->type) { - case FocusIn: - emit windowActive(); - break; - case FocusOut: - emit windowInactive(); - break; - - } - //return false; // event should be processed normally - return KApplication::x11EventFilter(e); - } + KrusaderApp(); + bool x11EventFilter ( XEvent *e ); + signals: void windowActive(); void windowInactive(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |