[KBear-cvs] kbear/kbear/lib/interfaces kbearpartmanageriface.cpp,NONE,1.1 kbearpartmanageriface.h,NO
Brought to you by:
kbjorn
Menu
▾
▴
[KBear-cvs] kbear/kbear/lib/interfaces kbearpartmanageriface.cpp,NONE,1.1 kbearpartmanageriface.h,NONE,1.1 connectioninfo.cpp,1.13,1.14 connectioninfo.h,1.12,1.13 connectionmanager.cpp,1.14,1.15 connectionmanager.h,1.13,1.14 kbearapi.h,1.2,1.3 kbearcore.cpp,1.13,1.14 kbearcore.h,1.13,1.14 kbeardirlisteriface.cpp,1.1,1.2 kbeardirlisteriface.h,1.6,1.7 kbearfilesyspartiface.cpp,1.16,1.17 kbearfilesyspartiface.h,1.15,1.16 kbearpart.cpp,1.5,1.6 kbearpart.h,1.9,1.10 Makefile.am,1.13,1.14 misc.cpp,1.1,1.2 misc.h,1.3,1.4 siteinfo.h,1.6,1.7
Update of /cvsroot/kbear/kbear/kbear/lib/interfaces
In directory sc8-pr-cvs1:/tmp/cvs-serv29832/kbear/lib/interfaces
Modified Files:
connectioninfo.cpp connectioninfo.h connectionmanager.cpp
connectionmanager.h kbearapi.h kbearcore.cpp kbearcore.h
kbeardirlisteriface.cpp kbeardirlisteriface.h
kbearfilesyspartiface.cpp kbearfilesyspartiface.h
kbearpart.cpp kbearpart.h Makefile.am misc.cpp misc.h
siteinfo.h
Added Files:
kbearpartmanageriface.cpp kbearpartmanageriface.h
Log Message:
Finally fixed crash at shutdown
--- NEW FILE: kbearpartmanageriface.cpp ---
/*********************************************************************************
* C++ Implementation: kbearpartmanageriface.h
* Description:
*
* Begin : tis apr 29 2003
* Author : Björn Sahlström <kb...@us...> (C) 2003
* Copyright : See COPYING file that comes with this distribution
**********************************************************************************/
//////////////////////////////////////////////////////////////////////
// Qt specific include files
//////////////////////////////////////////////////////////////////////
// KDE specific include files
//////////////////////////////////////////////////////////////////////
// System specific include files
//////////////////////////////////////////////////////////////////////
// Application specific include files
#include "kbearpartmanageriface.h"
using namespace KBear;
//-----------------------------------------------
KBearPartManagerInterface::KBearPartManagerInterface( QWidget* parentWidg, QObject* parent, const char*name )
: KParts::PartManager( parentWidg, parent, name )
{
}
//-----------------------------------------------
KBearPartManagerInterface::~KBearPartManagerInterface() {
}
//-----------------------------------------------
--- NEW FILE: kbearpartmanageriface.h ---
/*********************************************************************************
* C++ Implementation: kbearpartmanageriface.h
* Description:
*
* Begin : tis apr 29 2003
* Author : Björn Sahlström <kb...@us...> (C) 2003
* Copyright : See COPYING file that comes with this distribution
**********************************************************************************/
#ifndef KBEARKBEARPARTMANAGERIFACE_H
#define KBEARKBEARPARTMANAGERIFACE_H
//////////////////////////////////////////////////////////////////////
// Qt specific include files
//////////////////////////////////////////////////////////////////////
// KDE specific include files
#include <kparts/partmanager.h>
//////////////////////////////////////////////////////////////////////
// System specific include files
//////////////////////////////////////////////////////////////////////
// Application specific include files
namespace KBear {
/**
@author Björn Sahlström
*/
class KBearPartManagerInterface : public KParts::PartManager {
Q_OBJECT
public:
/** */
KBearPartManagerInterface( QWidget* parentWidg, QObject* parent, const char*name );
/** */
~KBearPartManagerInterface();
};
};
#endif
Index: connectioninfo.cpp
===================================================================
RCS file: /cvsroot/kbear/kbear/kbear/lib/interfaces/connectioninfo.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** connectioninfo.cpp 21 Apr 2003 22:53:41 -0000 1.13
--- connectioninfo.cpp 29 Apr 2003 20:56:24 -0000 1.14
***************
*** 34,37 ****
--- 34,41 ----
using namespace KBear;
//-----------------------------------------------
+ class ConnectionInfoPrivate {
+ public:
+ };
+ //-----------------------------------------------
ConnectionInfo::ConnectionInfo()
: m_ID( -1 )
Index: connectioninfo.h
===================================================================
RCS file: /cvsroot/kbear/kbear/kbear/lib/interfaces/connectioninfo.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** connectioninfo.h 21 Apr 2003 22:53:41 -0000 1.12
--- connectioninfo.h 29 Apr 2003 20:56:25 -0000 1.13
***************
*** 155,158 ****
--- 155,160 ----
protected:
int m_ID;
+ class ConnectionInfoPrivate;
+ ConnectionInfoPrivate* d;
}; //class ConnectionInfo
}; // namespace KBear
Index: connectionmanager.cpp
===================================================================
RCS file: /cvsroot/kbear/kbear/kbear/lib/interfaces/connectionmanager.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** connectionmanager.cpp 23 Apr 2003 10:20:44 -0000 1.14
--- connectionmanager.cpp 29 Apr 2003 20:56:25 -0000 1.15
***************
*** 38,41 ****
--- 38,49 ----
using namespace KBear;
//-----------------------------------------------
+ class ConnectionPrivate {
+ public:
+ };
+ //-----------------------------------------------
+ class ConnectionManagerPrivate {
+ public:
+ };
+ //-----------------------------------------------
// class Connection
//-----------------------------------------------
***************
*** 312,315 ****
--- 320,324 ----
}
QPtrList<Connection>* ptrList = new QPtrList<Connection>();
+ ptrList->setAutoDelete( true );
m_connectionMap->insert( ID, ptrList );
return info;
Index: connectionmanager.h
===================================================================
RCS file: /cvsroot/kbear/kbear/kbear/lib/interfaces/connectionmanager.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** connectionmanager.h 19 Apr 2003 08:38:03 -0000 1.13
--- connectionmanager.h 29 Apr 2003 20:56:25 -0000 1.14
***************
*** 94,97 ****
--- 94,99 ----
KIO::MetaData m_metaData;
QPtrList< KIO::Job > m_jobList;
+ class ConnectionPrivate;
+ ConnectionPrivate* d;
};
/**
***************
*** 198,201 ****
--- 200,205 ----
static ConnectionManager* s_instance;
QIntDict< QPtrList<Connection> >* m_connectionMap;
+ class ConnectionManagerPrivate;
+ ConnectionManagerPrivate* d;
};
};
Index: kbearapi.h
===================================================================
RCS file: /cvsroot/kbear/kbear/kbear/lib/interfaces/kbearapi.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** kbearapi.h 26 Mar 2003 00:21:43 -0000 1.2
--- kbearapi.h 29 Apr 2003 20:56:26 -0000 1.3
***************
*** 27,30 ****
--- 27,31 ----
class ConnectionManager;
class TransferManager;
+ class KBearPartManagerInterface;
/**
***************
*** 47,50 ****
--- 48,53 ----
/** */
virtual TransferManager* transferManager() = 0;
+ /** */
+ virtual KBearPartManagerInterface* partManager() = 0;
};
Index: kbearcore.cpp
===================================================================
RCS file: /cvsroot/kbear/kbear/kbear/lib/interfaces/kbearcore.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** kbearcore.cpp 14 Apr 2003 23:41:31 -0000 1.13
--- kbearcore.cpp 29 Apr 2003 20:56:27 -0000 1.14
***************
*** 52,59 ****
}
//-----------------------------------------------
- void KBearCore::emitShuttingDown() {
- emit shuttingDown();
- }
- //-----------------------------------------------
void KBearCore::emitRequestShutDown() {
kdDebug()<<"KBearCore::emitRequestShutDown()"<<endl;
--- 52,55 ----
***************
*** 68,94 ****
}
//-----------------------------------------------
- void KBearCore::emitNewToolbarConfig() {
- emit newToolbarConfig();
- }
- //-----------------------------------------------
- void KBearCore::emitInitialized() {
- emit initialized();
- }
- //-----------------------------------------------
- void KBearCore::emitConfigWidget( KDialogBase* dlg ) {
- emit configWidget( dlg );
- }
- //-----------------------------------------------
- void KBearCore::emitConfigWidget( KWizard* wiz ) {
- emit configWidget( wiz );
- }
- //-----------------------------------------------
- void KBearCore::emitMetaDataNeeded( KIO::MetaData& metaData ) {
- emit metaDataNeeded( metaData );
- }
- //-----------------------------------------------
- void KBearCore::emitSystemTrayMenuNeeded( KPopupMenu* menu ) {
- emit systemTrayMenuNeeded( menu );
- }
- //-----------------------------------------------
-
--- 64,65 ----
Index: kbearcore.h
===================================================================
RCS file: /cvsroot/kbear/kbear/kbear/lib/interfaces/kbearcore.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** kbearcore.h 22 Apr 2003 10:08:35 -0000 1.13
--- kbearcore.h 29 Apr 2003 20:56:27 -0000 1.14
***************
*** 41,59 ****
virtual ~KBearCore();
/** */
! void emitInitialized();
/** */
! void emitConfigWidget( KDialogBase* );
/** */
! void emitConfigWidget( KWizard* );
/** */
! void emitNewToolbarConfig();
! /**
* Call this method when you need the @ref KIO::MetaData to be filled
*/
! void emitMetaDataNeeded( KIO::MetaData& metaData );
! /**
* Call this method when you need the @ref KIO::MetaData to be filled
*/
! void emitSystemTrayMenuNeeded( KPopupMenu* menu );
/**
* Call this method if you want to abort application shutdown.
--- 41,71 ----
virtual ~KBearCore();
/** */
! void emitNewToolbarConfig() {
! emit newToolbarConfig();
! }
/** */
! void emitInitialized() {
! emit initialized();
! }
/** */
! void emitConfigWidget( KDialogBase* dlg ) {
! emit configWidget( dlg );
! }
/** */
! void emitConfigWidget( KWizard* wiz ) {
! emit configWidget( wiz );
! }
! /**
* Call this method when you need the @ref KIO::MetaData to be filled
*/
! void emitMetaDataNeeded( KIO::MetaData& metaData ) {
! emit metaDataNeeded( metaData );
! }
! /**
* Call this method when you need the @ref KIO::MetaData to be filled
*/
! void emitSystemTrayMenuNeeded( KPopupMenu* menu ) {
! emit systemTrayMenuNeeded( menu );
! }
/**
* Call this method if you want to abort application shutdown.
***************
*** 73,78 ****
* Do NOT use this. Only meant for the main window
*/
! void emitShuttingDown();
! /**
* Connect to this slot when you want to open a new site.
* The signal @ref #newSite will be emitted containing the site that is opened.
--- 85,92 ----
* Do NOT use this. Only meant for the main window
*/
! void emitShuttingDown() {
! emit shuttingDown();
! }
! /**
* Connect to this slot when you want to open a new site.
* The signal @ref #newSite will be emitted containing the site that is opened.
Index: kbeardirlisteriface.cpp
===================================================================
RCS file: /cvsroot/kbear/kbear/kbear/lib/interfaces/kbeardirlisteriface.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** kbeardirlisteriface.cpp 17 Feb 2003 22:03:10 -0000 1.1
--- kbeardirlisteriface.cpp 29 Apr 2003 20:56:27 -0000 1.2
***************
*** 22,25 ****
--- 22,29 ----
using namespace KBear;
//-----------------------------------------------
+ class KBearDirListerIfacePrivate {
+ public:
+ };
+ //-----------------------------------------------
KBearDirListerIface::KBearDirListerIface()
{
Index: kbeardirlisteriface.h
===================================================================
RCS file: /cvsroot/kbear/kbear/kbear/lib/interfaces/kbeardirlisteriface.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** kbeardirlisteriface.h 5 Apr 2003 23:07:31 -0000 1.6
--- kbeardirlisteriface.h 29 Apr 2003 20:56:28 -0000 1.7
***************
*** 104,107 ****
--- 104,109 ----
KURL m_url;
QString m_lastMimeType;
+ class KBearDirListerIfacePrivate;
+ KBearDirListerIfacePrivate* d;
};
Index: kbearfilesyspartiface.cpp
===================================================================
RCS file: /cvsroot/kbear/kbear/kbear/lib/interfaces/kbearfilesyspartiface.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** kbearfilesyspartiface.cpp 23 Apr 2003 10:20:45 -0000 1.16
--- kbearfilesyspartiface.cpp 29 Apr 2003 20:56:28 -0000 1.17
***************
*** 27,32 ****
#include <kparts/genericfactory.h>
#include <kparts/partmanager.h>
- #include <kparts/componentfactory.h>
#include <kparts/browserextension.h>
#include <kconfig.h>
#include <kconfigbase.h>
--- 27,32 ----
#include <kparts/genericfactory.h>
#include <kparts/partmanager.h>
#include <kparts/browserextension.h>
[...1827 lines suppressed...]
! m_myWidget->toolBarUpper()->hide();
}
//-----------------------------------------------
void KBearFileSysPartInterface::showToolBarLower( bool show ) {
! if( ! m_myWidget->toolBarLower() )
return;
if( show )
! m_myWidget->toolBarLower()->show();
else
! m_myWidget->toolBarLower()->hide();
}
//-----------------------------------------------
void KBearFileSysPartInterface::showStatusBarUpper( bool show ) {
! m_myWidget->toggleStatusBarUpper( show );
}
//-----------------------------------------------
void KBearFileSysPartInterface::showStatusBarLower( bool show ) {
! m_myWidget->toggleStatusBarLower( show );
}
//-----------------------------------------------
Index: kbearfilesyspartiface.h
===================================================================
RCS file: /cvsroot/kbear/kbear/kbear/lib/interfaces/kbearfilesyspartiface.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** kbearfilesyspartiface.h 22 Apr 2003 21:07:38 -0000 1.15
--- kbearfilesyspartiface.h 29 Apr 2003 20:56:28 -0000 1.16
***************
*** 32,49 ****
// Application specific include files
#include "kbearpart.h"
#include "connectioninfo.h"
class QPopupMenu;
class QTimer;
- class QSplitter;
- class KComboBox;
- class KHistoryCombo;
- class QLabel;
- class KListView;
- class KFileView;
- class KToolBar;
- class QHBox;
class KFileItem;
! class KProgress;
namespace KBear {
--- 32,43 ----
// Application specific include files
#include "kbearpart.h"
+ #include "kbearfilesyswidget.h"
#include "connectioninfo.h"
class QPopupMenu;
class QTimer;
class KFileItem;
! class KFileView;
! class KConfig;
namespace KBear {
***************
*** 51,55 ****
class KBearDirListerIface;
/**
! *
* @author Björn Sahlström
**/
--- 45,49 ----
class KBearDirListerIface;
/**
! *
* @author Björn Sahlström
**/
***************
*** 71,78 ****
virtual void init();
/** */
- KFileView* fileView();
- /** */
virtual KURL currentURL() const { return m_url; };
/** */
KURL::List selectedURLs();
/**
--- 65,72 ----
virtual void init();
/** */
virtual KURL currentURL() const { return m_url; };
/** */
+ KURL lastURL() const;
+ /** */
KURL::List selectedURLs();
/**
***************
*** 100,103 ****
--- 94,109 ----
/** */
void saveProperties( KConfig* config, const QString& group );
+ /**
+ * A view factory for creating predefined fileviews.
+ */
+ virtual KBearDirView* createTreeView( QWidget* parent ) = 0;
+ /**
+ * A view factory for creating predefined fileviews.
+ */
+ virtual KFileView* createView( QWidget* parent, KFile::FileView view ) = 0;
+ /** */
+ void updateSortActions();
+ /** */
+ void updateViewActions();
public slots:
/** */
***************
*** 113,116 ****
--- 119,126 ----
/** */
virtual void stop();
+ /** */
+ virtual void slotOpenDir(const KURL& );
+ /** */
+ virtual void slotOpenFile(const KURL& );
signals:
/**
***************
*** 124,146 ****
protected:
/** */
! // virtual void partActivateEvent( KParts::PartActivateEvent* event );
/** */
State state() const;
/** */
void setState( unsigned int );
/** */
virtual void openURL( const KURL& u );
- /**
- * A view factory for creating predefined fileviews.
- */
- virtual KBearDirView* createTreeView( QWidget* parent ) = 0;
- /**
- * A view factory for creating predefined fileviews.
- */
- virtual KFileView* createView( QWidget* parent, KFile::FileView view ) = 0;
- /**
- * A view factory for creating predefined fileviews.
- */
- virtual KParts::ReadOnlyPart* createPartFromServiceType( const QString& serviceType, QWidget* parentWidget, QObject* parent );
/** */
// virtual void setXMLFile( const QString& file, bool merge=false, bool setXMLDoc=true );
--- 134,146 ----
protected:
/** */
! // virtual void partActivateEvent( KParts::PartActivateEvent* event );
/** */
State state() const;
/** */
+ inline KBearDirListerIface* dirLister();
+ /** */
void setState( unsigned int );
/** */
virtual void openURL( const KURL& u );
/** */
// virtual void setXMLFile( const QString& file, bool merge=false, bool setXMLDoc=true );
***************
*** 148,153 ****
void setupConnections();
/** */
- void setDirLister( KBearDirListerIface* m_dirLister );
- /** */
void deleteFiles( const KFileItemList* items, bool shred = false );
/** */
--- 148,151 ----
***************
*** 164,169 ****
/** No descriptions */
virtual void executeService( const QString& exec, const KURL::List& urlList, const QString& name, const QString& icon ) = 0;
- /** */
- bool isModifierKeysPressed( unsigned int mask );
protected slots:
/** No descriptions */
--- 162,165 ----
***************
*** 176,193 ****
void slotSetWindowCaption( const QString& str );
/** */
- void slotDeleteItem( KFileItem *item );
- /** */
virtual void slotDelete();
/** */
virtual void slotSetupPopupMenu();
/** */
- virtual void slotToggleHidden( bool );
- /** */
- virtual void slotOpenDir(const KURL& );
- /** */
- virtual void slotOpenFile(const KURL& );
- /** */
- virtual void slotOpenFile( const KFileItem* item );
- /** */
virtual void slotStartLoading();
/** */
--- 172,179 ----
***************
*** 198,224 ****
virtual void slotViewActionRemoved( KAction * );
/** */
- void slotStatusMessage( const QString& mess);
- /** */
virtual void slotSelectionChanged();
/** */
virtual void slotActivatedMenu( const KFileItem *, const QPoint& pos );
/** */
- virtual void resetCursor();
- /** */
virtual void slotResult( KIO::Job* job );
- /** */
- virtual void slotNewItems(const KFileItemList &newone);
- /** */
- virtual void slotProgress( int percent );
- /** */
- void pathChanged();
private slots:
void slotRefreshItems( const KFileItemList& items );
void slotPreviewJobStarted( KIO::Job* job );
! void slotDirActivated(const KFileItem*);
! void slotFileSelected(const KFileItem*);
! void slotFilterChanged( const QString& nameFilter );
! void slotSpeed( int speed );
! void slotPathActivated( int item );
void slotCopy();
void slotCut();
--- 184,196 ----
virtual void slotViewActionRemoved( KAction * );
/** */
virtual void slotSelectionChanged();
/** */
virtual void slotActivatedMenu( const KFileItem *, const QPoint& pos );
/** */
virtual void slotResult( KIO::Job* job );
private slots:
void slotRefreshItems( const KFileItemList& items );
void slotPreviewJobStarted( KIO::Job* job );
! void slotPathActivated( const QString& path );
void slotCopy();
void slotCut();
***************
*** 228,260 ****
void slotSetupViewMenu();
void slotClipboardDataChanged();
- void slotUpdateDirsAndFiles( int dirs, int files );
void slotClearSelection();
void slotSelectAll();
void slotInvertSelection();
void slotMakeDir();
- void slotToggleTreeView( bool );
- void slotSortByName();
- void slotSortBySize();
- void slotSortByDate();
- void slotToggleDirsFirst();
- void slotToggleIgnoreCase();
- void slotSortReversed();
- void slotDetailedView();
- void slotSimpleView();
void slotUpdateTime();
void slotClearStatusBar();
! void slotViewSortingChanged( QDir::SortSpec sort );
private:
void clearHistory();
void doCutCopy( bool cut );
- void showProgress();
- void setSorting( QDir::SortSpec );
- void updateSortActions();
- void setView(KFile::FileView view );
void connectView(KFileView* );
- void updateViewActions();
void setup();
void setupActions();
- void connectTreeView();
protected:
KURL m_url;
--- 200,216 ----
void slotSetupViewMenu();
void slotClipboardDataChanged();
void slotClearSelection();
void slotSelectAll();
void slotInvertSelection();
void slotMakeDir();
void slotUpdateTime();
void slotClearStatusBar();
! void slotPathChanged();
private:
void clearHistory();
void doCutCopy( bool cut );
void connectView(KFileView* );
void setup();
void setupActions();
protected:
KURL m_url;
***************
*** 262,267 ****
KActionCollection* m_viewActionCollection;
QPopupMenu* m_actionMenu;
! private:
static const unsigned int s_viewActionCount;
class KBearFileSysPartInterfacePrivate;
KBearFileSysPartInterfacePrivate* d;
--- 218,225 ----
KActionCollection* m_viewActionCollection;
QPopupMenu* m_actionMenu;
! KParts::ReadOnlyPart* m_partViewer;
! KBearFileSysWidget* m_myWidget;
static const unsigned int s_viewActionCount;
+ private:
class KBearFileSysPartInterfacePrivate;
KBearFileSysPartInterfacePrivate* d;
Index: kbearpart.cpp
===================================================================
RCS file: /cvsroot/kbear/kbear/kbear/lib/interfaces/kbearpart.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** kbearpart.cpp 26 Mar 2003 00:21:44 -0000 1.5
--- kbearpart.cpp 29 Apr 2003 20:56:28 -0000 1.6
***************
*** 25,35 ****
using namespace KBear;
//-----------------------------------------------
! KBearPart::KBearPart( QWidget* parentWidget, const char* widgetName, QObject* parent, const char* name )
: KParts::Part( parent, name )
{
! assert( parent->inherits( "KBear::KBearAPI" ) );
m_api = static_cast<KBearAPI*>( parent );
- setWidget( new QWidget( parentWidget, widgetName ) );
- widget()->setFocusPolicy(QWidget::WheelFocus);
}
//-----------------------------------------------
--- 25,33 ----
using namespace KBear;
//-----------------------------------------------
! KBearPart::KBearPart( QObject* parent, const char* name )
: KParts::Part( parent, name )
{
! // assert( parent->inherits( "KBear::KBearAPI" ) );
m_api = static_cast<KBearAPI*>( parent );
}
//-----------------------------------------------
Index: kbearpart.h
===================================================================
RCS file: /cvsroot/kbear/kbear/kbear/lib/interfaces/kbearpart.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** kbearpart.h 26 Mar 2003 00:21:44 -0000 1.9
--- kbearpart.h 29 Apr 2003 20:56:28 -0000 1.10
***************
*** 37,41 ****
public:
/** */
! KBearPart( QWidget* parentWidget, const char* widgetName, QObject* parent, const char* name );
/** */
virtual ~KBearPart();
--- 37,41 ----
public:
/** */
! KBearPart( QObject* parent, const char* name );
/** */
virtual ~KBearPart();
Index: Makefile.am
===================================================================
RCS file: /cvsroot/kbear/kbear/kbear/lib/interfaces/Makefile.am,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Makefile.am 21 Apr 2003 22:53:41 -0000 1.13
--- Makefile.am 29 Apr 2003 20:56:30 -0000 1.14
***************
*** 2,11 ****
connectioninfo.cpp connectioninfo.h kbeartags.cpp kbeartags.h
INCLUDES = -I$(top_srcdir)/kbear/lib/widgets $(all_includes)
! #libkbearinterfaces_la_LDFLAGS = -version-info 3:0:0 -no-undefined $(all_libraries)
! #libkbearinterfaces_la_LIBADD = $(LIB_KPARTS) $(LIB_KDECORE) $(LIB_KDEUI)
! libkbearinterfaces_la_SOURCES = kbearcore.h kbearcore.cpp kbearapi.h kbearapi.cpp connectioninfo.cpp siteinfo.cpp kbeartags.cpp connectionmanager.cpp transfermanager.cpp misc.cpp misc.h group.h kbeardomhelper.h kbeardomhelper.cpp kbearchildviewiface.cpp kbearchildviewiface.skel kbearchildviewiface.h kbearconfigwidgetiface.cpp kbearconfigwidgetiface.h kbearmainwiniface.skel kbearmainwiniface.cpp kbearmainwiniface.h kbearpart.cpp kbearpart.h kbearplugin.cpp kbearplugin.h kbearsiteimportfilterpluginiface.cpp kbearsiteimportfilterpluginiface.h kbearfilesyspartiface.h kbearfilesyspartiface.cpp kbeardirlisteriface.h kbeardirlisteriface.cpp group.cpp
libkbearinterfaces_la_METASOURCES = AUTO
noinst_LTLIBRARIES = libkbearinterfaces.la
! libkbearinterfacesinclude_HEADERS = kbearplugin.h kbearcore.h kbearapi.h connectioninfo.h siteinfo.h kbeartags.h connectionmanager.h transfermanager.h misc.h group.h kbeardomhelper.h kbearconfigwidgetiface.h kbearpart.h kbearplugin.h kbearsiteimportfilterpluginiface.h kbearfilesyspartiface.h kbeardirlisteriface.h kbearmainwiniface.h
libkbearinterfacesincludedir = $(kde_includes)/kbear
kde_services_DATA = kbearplugin.desktop kbearsiteimportfilterplugin.desktop kbearpart.desktop kbearfilesyspart.desktop
--- 2,9 ----
connectioninfo.cpp connectioninfo.h kbeartags.cpp kbeartags.h
INCLUDES = -I$(top_srcdir)/kbear/lib/widgets $(all_includes)
! libkbearinterfaces_la_SOURCES = kbearcore.h kbearcore.cpp kbearapi.h kbearapi.cpp connectioninfo.cpp siteinfo.cpp kbeartags.cpp connectionmanager.cpp transfermanager.cpp misc.cpp misc.h group.h kbeardomhelper.h kbeardomhelper.cpp kbearchildviewiface.cpp kbearchildviewiface.skel kbearchildviewiface.h kbearconfigwidgetiface.cpp kbearconfigwidgetiface.h kbearmainwiniface.skel kbearmainwiniface.cpp kbearmainwiniface.h kbearpart.cpp kbearpart.h kbearplugin.cpp kbearplugin.h kbearsiteimportfilterpluginiface.cpp kbearsiteimportfilterpluginiface.h kbearfilesyspartiface.h kbearfilesyspartiface.cpp kbeardirlisteriface.h kbeardirlisteriface.cpp group.cpp kbearpartmanageriface.h kbearpartmanageriface.cpp
libkbearinterfaces_la_METASOURCES = AUTO
noinst_LTLIBRARIES = libkbearinterfaces.la
! libkbearinterfacesinclude_HEADERS = kbearplugin.h kbearcore.h kbearapi.h connectioninfo.h siteinfo.h kbeartags.h connectionmanager.h transfermanager.h misc.h group.h kbeardomhelper.h kbearconfigwidgetiface.h kbearpart.h kbearplugin.h kbearsiteimportfilterpluginiface.h kbearfilesyspartiface.h kbeardirlisteriface.h kbearmainwiniface.h kbearpartmanageriface.h kbearchildviewiface.h kbearmainwiniface.h
libkbearinterfacesincludedir = $(kde_includes)/kbear
kde_services_DATA = kbearplugin.desktop kbearsiteimportfilterplugin.desktop kbearpart.desktop kbearfilesyspart.desktop
***************
*** 13,17 ****
kbearfilesysifacercdir = $(kde_datadir)/kbear
kbearfilesysifacerc_DATA = kbearfilesyspartiface.rc
! noinst_HEADERS = kbearchildviewiface.h kbearmainwiniface.h
#KDE_CXXFLAGS = $(USE_EXCEPTIONS)
AM_CFLAGS =
--- 11,15 ----
kbearfilesysifacercdir = $(kde_datadir)/kbear
kbearfilesysifacerc_DATA = kbearfilesyspartiface.rc
! noinst_HEADERS =
#KDE_CXXFLAGS = $(USE_EXCEPTIONS)
AM_CFLAGS =
***************
*** 19,20 ****
--- 17,19 ----
AM_FFLAGS =
SUBDIRS =
+ libkbearinterfaces_la_LDFLAGS =
Index: misc.cpp
===================================================================
RCS file: /cvsroot/kbear/kbear/kbear/lib/interfaces/misc.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** misc.cpp 26 Jan 2003 00:43:36 -0000 1.1
--- misc.cpp 29 Apr 2003 20:56:30 -0000 1.2
***************
*** 15,18 ****
--- 15,25 ----
//////////////////////////////////////////////////////
// KDE specific includes
+ #include <kparts/componentfactory.h>
+ #include <kparts/part.h>
+ #include <kguiitem.h>
+ #include <kmessagebox.h>
+ ///////////////////////////////////////////////////////
+ // System specific includes
+ #include <X11/Xlib.h>
//////////////////////////////////////////////////////
// Application specific includes
***************
*** 37,40 ****
--- 44,56 ----
QCString result = KCodecs::base64Decode( dataIn );
return result.data();
+ }
+ //-----------------------------------------------
+ bool isModifierKeysPressed( unsigned int mask ){
+ Window root;
+ Window child;
+ int root_x, root_y, win_x, win_y;
+ unsigned int keybstate;
+ XQueryPointer( qt_xdisplay(), qt_xrootwin(), &root, &child, &root_x, &root_y, &win_x, &win_y, &keybstate );
+ return keybstate & mask;
}
//-----------------------------------------------
Index: misc.h
===================================================================
RCS file: /cvsroot/kbear/kbear/kbear/lib/interfaces/misc.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** misc.h 6 Apr 2003 23:02:49 -0000 1.3
--- misc.h 29 Apr 2003 20:56:31 -0000 1.4
***************
*** 13,16 ****
--- 13,17 ----
//////////////////////////////////////////////////////
// Qt specific includes
+ #include <qwidget.h>
#include <qstring.h>
//////////////////////////////////////////////////////
***************
*** 31,39 ****
*/
extern QString encodePassword( const QString& password );
! /**
* @param password should contain the password to decode
* @return the password decoded using base64
*/
extern QString decodePassword( const QString& password );
/**
* This enum represents the different ChildFrame modes
--- 32,45 ----
*/
extern QString encodePassword( const QString& password );
! /**
* @param password should contain the password to decode
* @return the password decoded using base64
*/
extern QString decodePassword( const QString& password );
+ /**
+ * @param mask should contain the mask for the modifier key/keys to check for
+ * @return true if the specified modifier key/keys is pressed
+ */
+ extern bool isModifierKeysPressed( unsigned int mask );
/**
* This enum represents the different ChildFrame modes
Index: siteinfo.h
===================================================================
RCS file: /cvsroot/kbear/kbear/kbear/lib/interfaces/siteinfo.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** siteinfo.h 21 Apr 2003 22:53:41 -0000 1.6
--- siteinfo.h 29 Apr 2003 20:56:31 -0000 1.7
***************
*** 43,47 ****
SiteInfo( const ConnectionInfo& c );
/** */
! virtual ~SiteInfo();
/** @return users login name for the remote host */
QString parent() const;
--- 43,47 ----
SiteInfo( const ConnectionInfo& c );
/** */
! ~SiteInfo();
/** @return users login name for the remote host */
QString parent() const;
|