[KBear-cvs] kbear/kbear/plugins/sitemanager kbearsitemanager.cpp,1.57,1.58 kbearsitemanagertreeview.cpp,1.11,1.12 kbearsitemanagertreeview.h,1.8,1.9

[<fri...@us...>]

Update of /cvsroot/kbear/kbear/kbear/plugins/sitemanager
In directory sc8-pr-cvs1:/tmp/cvs-serv25279/kbear/plugins/sitemanager

Modified Files:
	kbearsitemanager.cpp kbearsitemanagertreeview.cpp 
	kbearsitemanagertreeview.h 
Log Message:
Fixed some bugs in sitemanager:
* When collapsing a group tree, the site label was deactivated
* The save button 'forgot' the need to save when you clicked another item
* Group names weren't shown in the site label

Index: kbearsitemanager.cpp
===================================================================
RCS file: /cvsroot/kbear/kbear/kbear/plugins/sitemanager/kbearsitemanager.cpp,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -d -r1.57 -r1.58
*** kbearsitemanager.cpp	8 Jul 2003 17:04:21 -0000	1.57
--- kbearsitemanager.cpp	16 Nov 2003 20:16:29 -0000	1.58
***************
*** 662,666 ****
  void KBearSiteManager::slotPressed(QListViewItem* item) {
  	if( ! item )
! 		slotSelectedSite( 0L );
  		return;
  	if( item->isExpandable() ) {
--- 662,666 ----
  void KBearSiteManager::slotPressed(QListViewItem* item) {
  	if( ! item )
! // 		slotSelectedSite( 0L );
  		return;
  	if( item->isExpandable() ) {
***************
*** 673,676 ****
--- 673,679 ----
  void KBearSiteManager::slotSelectedSite( QListViewItem* item ) {
  kdDebug()<<"KBearSiteManager::slotSelectedSite item="<<(item?item->text(0):QString::null)<<endl;
+ 	// We need this temporary variable because changing the text of the widgets below will set m_isModified to true
+ 	// even if nothing was modified in reality.
+ 	bool modified = m_isModified;
  
  	if( item && item->isSelected() ) {
***************
*** 681,685 ****
  		
  		bool b = item->isExpandable();
! 		// Enable/Disable the groupBox items depending on the item (group or not)	
  		m_siteEdit->setEnabled( true );
  		m_hostnameEdit->setEnabled( !b );
--- 684,688 ----
  		
  		bool b = item->isExpandable();
! 		// Enable/Disable the groupBox items depending on the item (group or not)
  		m_siteEdit->setEnabled( true );
  		m_hostnameEdit->setEnabled( !b );
***************
*** 694,702 ****
  		
  		if( item->isExpandable() ) {// a group was selected
! 			clear();
  			m_selectedItem.setParent( parent );
  			m_selectedItem.setLabel( label );
! 			emit selectionCleared();
  			m_groupSelected = true;
  			return;
  		}
--- 697,708 ----
  		
  		if( item->isExpandable() ) {// a group was selected
!  			clear();
  			m_selectedItem.setParent( parent );
  			m_selectedItem.setLabel( label );
! 			m_siteEdit->setText( label );
!   			emit selectionCleared();
  			m_groupSelected = true;
+ 			m_isModified = modified;
+ 			enableButton( User1, modified );
  			return;
  		}
***************
*** 716,723 ****
--- 722,737 ----
  	}
  	m_groupBox->setEnabled( true );
+ 	m_isModified = modified;
+ 	enableButton( User1, modified );
  	emit siteSelected( m_selectedItem );
  }
  //-----------------------------------------------
  void KBearSiteManager::setSite( const SiteInfo& site ) {
+ 	kdDebug()<<"setSite: "<<site.label()<<endl;
+ 
+ 	// We need this temporary variable because changing the text of the widgets below will set m_isModified to true
+ 	// even if nothing was modified in reality.
+ 	bool modified = m_isModified;
+ 
  	m_siteEdit->setText( site.label() );
  	m_hostnameEdit->setText( site.host() );
***************
*** 769,776 ****
  	slotUpdateAdv();
  
- 	m_isModified = false;
  	m_selectedItem = site;
  	m_connectButton->setEnabled( true );
! 	enableButton( User1, false );
  //	m_saveButton->setEnabled( false );
  	QListViewItem* parentItem = siteTreeView->findParentByFullName( site.parent() );
--- 783,790 ----
  	slotUpdateAdv();
  
  	m_selectedItem = site;
  	m_connectButton->setEnabled( true );
! 	m_isModified = modified;
! 	enableButton( User1, modified );
  //	m_saveButton->setEnabled( false );
  	QListViewItem* parentItem = siteTreeView->findParentByFullName( site.parent() );
***************
*** 833,837 ****
  void KBearSiteManager::clear(){
  	SiteInfo site;  // We use a site here in order to get the correct default values
! 	setSite( site );	
  	m_connectButton->setEnabled( false );
  }
--- 847,851 ----
  void KBearSiteManager::clear(){
  	SiteInfo site;  // We use a site here in order to get the correct default values
! 	setSite( site );
  	m_connectButton->setEnabled( false );
  }

Index: kbearsitemanagertreeview.cpp
===================================================================
RCS file: /cvsroot/kbear/kbear/kbear/plugins/sitemanager/kbearsitemanagertreeview.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** kbearsitemanagertreeview.cpp	1 Jul 2003 23:24:19 -0000	1.11
--- kbearsitemanagertreeview.cpp	16 Nov 2003 20:16:30 -0000	1.12
***************
*** 107,110 ****
--- 107,111 ----
  	connect( &m_autoOpenTimer, SIGNAL( timeout() ), this, SLOT( slotOpenFolder() ) );
  	connect( this, SIGNAL( executed( QListViewItem* ) ), this, SLOT( slotExecuted( QListViewItem*) ) );
+ 	connect( this, SIGNAL( expanded( QListViewItem* ) ), this, SLOT( slotExpanded( QListViewItem* ) ) );
  }
  //-----------------------------------------------
***************
*** 118,123 ****
  		return;
  
- //	KBearSiteManager* manager = static_cast<KBearSiteManager*>( parentWidget() );
- // 	manager->checkModified();
  	QPoint hotspot;
  	QPixmap pixmap = * selectedItem()->pixmap(0);
--- 119,122 ----
***************
*** 267,270 ****
--- 266,275 ----
  	setSelected( item, true );
  	item->setOpen( ! item->isOpen() );
+ }
+ //-----------------------------------------------
+ void KBearSiteManagerTreeView::slotExpanded( QListViewItem* item )
+ {
+ 	setCurrentItem( item );
+ 	setSelected( item, true );
  }
  //-----------------------------------------------

Index: kbearsitemanagertreeview.h
===================================================================
RCS file: /cvsroot/kbear/kbear/kbear/plugins/sitemanager/kbearsitemanagertreeview.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** kbearsitemanagertreeview.h	1 Jul 2003 23:24:19 -0000	1.8
--- kbearsitemanagertreeview.h	16 Nov 2003 20:16:30 -0000	1.9
***************
*** 123,126 ****
--- 123,127 ----
  private slots:
  	virtual void slotExecuted( QListViewItem* );
+ 	virtual void slotExpanded( QListViewItem* );
  	/** Called whenever the autoOpenTimer expires */
  	void slotOpenFolder();