[KBear-cvs] kbear/kbear kbearmainwindow.cpp,1.42,1.43 kbearmainwindow.h,1.33,1.34 kbearmainwindowsha

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Update of /cvsroot/kbear/kbear/kbear
In directory sc8-pr-cvs1:/tmp/cvs-serv18984/kbear

Modified Files:
	kbearmainwindow.cpp kbearmainwindow.h kbearmainwindowshared.h 
	kbearoutputframe.cpp kbearoutputframe.h kbearoutputtoolbar.cpp 
	kbearoutputtoolbar.h resource.h 
Log Message:
Bugfixes


Index: kbearmainwindow.cpp
===================================================================
RCS file: /cvsroot/kbear/kbear/kbear/kbearmainwindow.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** kbearmainwindow.cpp	28 Jun 2003 16:38:55 -0000	1.42
--- kbearmainwindow.cpp	29 Jun 2003 12:39:48 -0000	1.43
***************
*** 578,582 ****
--- 578,586 ----
  //-----------------------------------------------
  void KBearMainWindow::switchToToplevelMode() {
+ 	if( mdiMode() == KMdi::TabPageMode ) {
+ 		slot_toggleTaskBar();
+ 	}
  	m_toggleTaskBar->setEnabled( true );
+ 
  	bool hidden = m_shared->outputToolBar()->outputFrame()->isHidden();
  	makeDockVisible( m_shared->outputToolBar()->outputFrame() );
***************
*** 602,620 ****
  	else
  		resize( width(), h + KMainWindow::statusBar()->height() );
- 
  	static_cast<KRadioAction*>(action("mdimode_toplevel"))->setChecked( true );
  }
  //-----------------------------------------------
  void KBearMainWindow::switchToTabPageMode() {
  	m_toggleTaskBar->setEnabled( false );
  	bool hidden = m_shared->outputToolBar()->outputFrame()->isHidden();
  	makeDockVisible( m_shared->outputToolBar()->outputFrame() );
! 	QApplication::sendPostedEvents();
! //	m_shared->outputToolBar()->outputFrame()->undock();
  
  	KMdiMainFrm::switchToTabPageMode();
  
- 	m_shared->outputToolBar()->outputFrame()->manualDock( getMainDockWidget(), KDockWidget::DockBottom, 70 );
- 
  	if( hidden )
  		makeDockInvisible( m_shared->outputToolBar()->outputFrame() );
--- 606,624 ----
  	else
  		resize( width(), h + KMainWindow::statusBar()->height() );
  	static_cast<KRadioAction*>(action("mdimode_toplevel"))->setChecked( true );
  }
  //-----------------------------------------------
  void KBearMainWindow::switchToTabPageMode() {
+ 	if( isViewTaskBarOn() ) {
+ 		slot_toggleTaskBar();
+ 	}
  	m_toggleTaskBar->setEnabled( false );
+ 
  	bool hidden = m_shared->outputToolBar()->outputFrame()->isHidden();
  	makeDockVisible( m_shared->outputToolBar()->outputFrame() );
! 	kapp->processEvents();
  
  	KMdiMainFrm::switchToTabPageMode();
  
  	if( hidden )
  		makeDockInvisible( m_shared->outputToolBar()->outputFrame() );
***************
*** 626,632 ****
  //-----------------------------------------------
  void KBearMainWindow::switchToChildframeMode() {
  	m_toggleTaskBar->setEnabled( true );
- 	KMdiMainFrm::switchToChildframeMode();
  	bool hidden = m_shared->outputToolBar()->outputFrame()->isHidden();
  	int oldDockSite = m_pDockbaseAreaOfDocumentViews->dockSite();
  	m_pDockbaseAreaOfDocumentViews->setDockSite( KDockWidget::DockCorner );
--- 630,641 ----
  //-----------------------------------------------
  void KBearMainWindow::switchToChildframeMode() {
+ 	if( mdiMode() == KMdi::TabPageMode ) {
+ 		slot_toggleTaskBar();
+ 	}
  	m_toggleTaskBar->setEnabled( true );
  	bool hidden = m_shared->outputToolBar()->outputFrame()->isHidden();
+ 
+ 	KMdiMainFrm::switchToChildframeMode();
+ 
  	int oldDockSite = m_pDockbaseAreaOfDocumentViews->dockSite();
  	m_pDockbaseAreaOfDocumentViews->setDockSite( KDockWidget::DockCorner );
***************
*** 636,639 ****
--- 645,649 ----
  	else
  		makeDockVisible( m_shared->outputToolBar()->outputFrame() );
+ 
  	if( m_autoChildFrameMode ) {
  		setChildFrameMode( m_childFrameMode );
***************
*** 643,646 ****
--- 653,698 ----
  
  	static_cast<KRadioAction*>(action("mdimode_childframe"))->setChecked( true );
+ }
+ //-----------------------------------------------
+ void KBearMainWindow::addWindow( KMdiChildView* pWnd, int flags) {
+ 	if( mdiMode() == KMdi::TabPageMode ) {
+ 		bool hidden = m_shared->outputToolBar()->outputFrame()->isHidden();
+ 		makeDockVisible( m_shared->outputToolBar()->outputFrame() );
+ 		kapp->processEvents();
+ 
+ 		KMdiMainFrm::addWindow( pWnd, flags );
+ /*
+ 	m_pDockbaseOfTabPage->setDockSite( KDockWidget::DockCorner );
+ 	m_shared->outputToolBar()->outputFrame()->manualDock( m_pDockbaseOfTabPage, KDockWidget::DockBottom, 70 );
+ */
+ 	if( hidden )
+ 		makeDockInvisible( m_shared->outputToolBar()->outputFrame() );
+ 	else
+ 		makeDockVisible( m_shared->outputToolBar()->outputFrame() );
+ 	}
+ 	else {
+ 		KMdiMainFrm::addWindow( pWnd, flags );
+ 	}
+ }
+ //-----------------------------------------------
+ void KBearMainWindow::closeWindow(KMdiChildView *pWnd, bool layoutTaskBar) {
+ 	if( mdiMode() == KMdi::TabPageMode ) {
+ 		bool hidden = m_shared->outputToolBar()->outputFrame()->isHidden();
+ 		makeDockVisible( m_shared->outputToolBar()->outputFrame() );
+ 		kapp->processEvents();
+ 
+ 		KMdiMainFrm::closeWindow( pWnd, layoutTaskBar );
+ 
+ 		m_pDockbaseOfTabPage->setDockSite( KDockWidget::DockCorner );
+ 		m_shared->outputToolBar()->outputFrame()->manualDock( m_pDockbaseOfTabPage, KDockWidget::DockBottom, 70 );
+ 
+ 		if( hidden )
+ 			makeDockInvisible( m_shared->outputToolBar()->outputFrame() );
+ 		else
+ 			makeDockVisible( m_shared->outputToolBar()->outputFrame() );
+ 		}
+ 		else {
+ 			KMdiMainFrm::closeWindow( pWnd, layoutTaskBar );
+ 	}
  }
  //-----------------------------------------------

Index: kbearmainwindow.h
===================================================================
RCS file: /cvsroot/kbear/kbear/kbear/kbearmainwindow.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** kbearmainwindow.h	28 Jun 2003 16:38:55 -0000	1.33
--- kbearmainwindow.h	29 Jun 2003 12:39:48 -0000	1.34
***************
*** 136,139 ****
--- 136,143 ----
  	virtual QPtrList<KBearChildViewIface> childViews();
  public slots:
+ 	/** */
+ 	virtual void addWindow( KMdiChildView* pView, int flags = KMdi::StandardAdd);
+ 	/** */
+ 	virtual void closeWindow( KMdiChildView *pWnd, bool layoutTaskBar = true);
  	/**  Update of the window menu contents. */
  	virtual void fillWindowMenu();

Index: kbearmainwindowshared.h
===================================================================
RCS file: /cvsroot/kbear/kbear/kbear/kbearmainwindowshared.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** kbearmainwindowshared.h	3 Jun 2003 23:35:13 -0000	1.8
--- kbearmainwindowshared.h	29 Jun 2003 12:39:48 -0000	1.9
***************
*** 42,45 ****
--- 42,47 ----
  	void createOutputToolbar( KDockWidget* dock );
  	/** */
+ 	KBearOutputToolBar* outputToolBar();
+ 	/** */
  	void embedOutputPluginView( QWidget* view, const QString& title, const QString& toolTip );
  	/** */
***************
*** 47,52 ****
  	/** */
  	void init();
- 	/** */
- 	KBearOutputToolBar* outputToolBar();
  	/**
  	* This method is called when it is time for the app to save its
--- 49,52 ----

Index: kbearoutputframe.cpp
===================================================================
RCS file: /cvsroot/kbear/kbear/kbear/kbearoutputframe.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** kbearoutputframe.cpp	28 Jun 2003 16:38:55 -0000	1.15
--- kbearoutputframe.cpp	29 Jun 2003 12:39:48 -0000	1.16
***************
*** 81,86 ****
  /////////////////////////////////////////////////////////////
  //-----------------------------------------------
! KBearOutputFrame::KBearOutputFrame( KParts::DockMainWindow* mainWin, KDockWidget* dockTarget  )
!   : KDockWidget( mainWin->manager(), "KBearOutputFrame", QPixmap(), 0L )
  {
  	m_stack = new QWidgetStack( this );
--- 81,86 ----
  /////////////////////////////////////////////////////////////
  //-----------------------------------------------
! KBearOutputFrame::KBearOutputFrame( KParts::DockMainWindow* mainWin, KDockWidget* dockTarget )
! 	:	KDockWidget( mainWin->manager(), "KBearOutputFrame", QPixmap(), 0L )
  {
  	m_stack = new QWidgetStack( this );
***************
*** 89,93 ****
  	
  	setHeader( m_title );
! 	setWidget( m_stack );	
  	manualDock( dockTarget, KDockWidget::DockBottom, 70 );
  	m_stack->setMinimumHeight( 100 );
--- 89,93 ----
  	
  	setHeader( m_title );
! 	setWidget( m_stack );
  	manualDock( dockTarget, KDockWidget::DockBottom, 70 );
  	m_stack->setMinimumHeight( 100 );
***************
*** 120,125 ****
  		}
  	}
! 	if( m_widgets.count() == 0 )
  		API::getInstance()->mainWindow()->mainWindow()->makeDockInvisible( this );
  	return index;
  }
--- 120,126 ----
  		}
  	}
! 	if( m_widgets.count() == 0 ) {
  		API::getInstance()->mainWindow()->mainWindow()->makeDockInvisible( this );
+ 	}
  	return index;
  }

Index: kbearoutputframe.h
===================================================================
RCS file: /cvsroot/kbear/kbear/kbear/kbearoutputframe.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** kbearoutputframe.h	29 Apr 2003 20:55:55 -0000	1.6
--- kbearoutputframe.h	29 Jun 2003 12:39:48 -0000	1.7
***************
*** 40,44 ****
  public:
  	/** */
! 	KBearOutputFrame( KParts::DockMainWindow* mainWin,  KDockWidget* dockTarget  );
  	/** */
  	~KBearOutputFrame();
--- 40,44 ----
  public:
  	/** */
! 	KBearOutputFrame( KParts::DockMainWindow* mainWin, KDockWidget* dockTarget );
  	/** */
  	~KBearOutputFrame();

Index: kbearoutputtoolbar.cpp
===================================================================
RCS file: /cvsroot/kbear/kbear/kbear/kbearoutputtoolbar.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** kbearoutputtoolbar.cpp	28 Jun 2003 16:38:55 -0000	1.18
--- kbearoutputtoolbar.cpp	29 Jun 2003 12:39:48 -0000	1.19
***************
*** 188,191 ****
--- 188,193 ----
  	
  	m_popup->setActiveIndex( index );
+ 
+ 
  	API::getInstance()->mainWindow()->mainWindow()->makeDockVisible( m_popup );
  	m_popup->show();

Index: kbearoutputtoolbar.h
===================================================================
RCS file: /cvsroot/kbear/kbear/kbear/kbearoutputtoolbar.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** kbearoutputtoolbar.h	15 May 2003 22:53:21 -0000	1.7
--- kbearoutputtoolbar.h	29 Jun 2003 12:39:48 -0000	1.8
***************
*** 54,58 ****
  public:
  	/** */
! 	KBearOutputToolBar( KParts::DockMainWindow* mainWin, KDockWidget* );
  	/** */
  	~KBearOutputToolBar();
--- 54,58 ----
  public:
  	/** */
! 	KBearOutputToolBar( KParts::DockMainWindow* mainWin, KDockWidget* dockTarget );
  	/** */
  	~KBearOutputToolBar();

Index: resource.h
===================================================================
RCS file: /cvsroot/kbear/kbear/kbear/resource.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** resource.h	22 Apr 2003 21:07:27 -0000	1.18
--- resource.h	29 Jun 2003 12:39:48 -0000	1.19
***************
*** 28,34 ****
  	static const QString IDS_APPNAME = "KBear";
  	/*  */
! 	static const QString IDS_COPYRIGHT = "(C) 2003, The KBear team";
  	/*  */
  	static const QString IDS_HOMEPAGE = "http://kbear.sourceforge.net/";
! 	static const double IDS_VERSION = 2.91; // this is used for version control of config file
  #endif // RESOURCE_H
--- 28,34 ----
  	static const QString IDS_APPNAME = "KBear";
  	/*  */
! 	static const QString IDS_COPYRIGHT = I18N_NOOP("(C) 2003, The KBear team");
  	/*  */
  	static const QString IDS_HOMEPAGE = "http://kbear.sourceforge.net/";
! 	static const double IDS_VERSION = 2.92; // this is used for version control of config file
  #endif // RESOURCE_H

[KBear-cvs] kbear/kbear kbearmainwindow.cpp,1.42,1.43 kbearmainwindow.h,1.33,1.34 kbearmainwindowsha

[KBear-cvs] kbear/kbear kbearmainwindow.cpp,1.42,1.43 kbearmainwindow.h,1.33,1.34 kbearmainwindowshared.h,1.8,1.9 kbearoutputframe.cpp,1.15,1.16 kbearoutputframe.h,1.6,1.7 kbearoutputtoolbar.cpp,1.18,1.19 kbearoutputtoolbar.h,1.7,1.8 resource.h,1.18,1.19