[rkward-cvs] rkward/rkward/agents rkloadagent.cpp,1.6,1.7

[Thomas Friedrichsmeier]

Update of /cvsroot/rkward/rkward/rkward/agents
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv943/rkward/agents

Modified Files:
	rkloadagent.cpp 
Log Message:
Some code cleanups, and keep window captions up to date

Index: rkloadagent.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/agents/rkloadagent.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** rkloadagent.cpp	2 Oct 2005 17:19:02 -0000	1.6
--- rkloadagent.cpp	10 Nov 2005 15:59:05 -0000	1.7
***************
*** 36,40 ****
  RKLoadAgent::RKLoadAgent (const KURL &url, bool merge) {
  	RK_TRACE (APP);
! 	RKGlobals::rkApp ()->setCaption (i18n ("Loading Workspace ..."), false);
  
  #if !KDE_IS_VERSION (3, 2, 0)
--- 36,40 ----
  RKLoadAgent::RKLoadAgent (const KURL &url, bool merge) {
  	RK_TRACE (APP);
! 	RKGlobals::rkApp ()->slotStatusMsg (i18n ("Loading Workspace ..."));
  
  #if !KDE_IS_VERSION (3, 2, 0)
***************
*** 50,56 ****
  		RKGlobals::rkApp ()->slotCloseAllEditors ();
  		update_was_delete = true;
- 		RKGlobals::rObjectList ()->updateFromR ();
  		command = new RCommand ("remove (list=ls (all.names=TRUE))", RCommand::App);
  		RKGlobals::rInterface ()->issueCommand (command);
  	}
  
--- 50,56 ----
  		RKGlobals::rkApp ()->slotCloseAllEditors ();
  		update_was_delete = true;
  		command = new RCommand ("remove (list=ls (all.names=TRUE))", RCommand::App);
  		RKGlobals::rInterface ()->issueCommand (command);
+ 		RKGlobals::rObjectList ()->updateFromR ();
  	}
  
***************
*** 74,81 ****
  		if (command->failed ()) {
  			KMessageBox::error (0, i18n ("There has been an error opening file '%1':\n%2").arg (RKGlobals::rObjectList ()->getWorkspaceURL ().path ()).arg (command->error ()), i18n ("Error loading workspace"));
! 			RKGlobals::rkApp ()->setCaption (i18n ("Untitled"), false);
! 		} else {
! 			RKGlobals::rkApp ()->setCaption (RKGlobals::rObjectList ()->getWorkspaceURL ().filename (), false);
  		}
  	}
  }
--- 74,81 ----
  		if (command->failed ()) {
  			KMessageBox::error (0, i18n ("There has been an error opening file '%1':\n%2").arg (RKGlobals::rObjectList ()->getWorkspaceURL ().path ()).arg (command->error ()), i18n ("Error loading workspace"));
! 			RKGlobals::rObjectList ()->setWorkspaceURL (QString::null);
  		}
+ 		RKGlobals::rkApp ()->slotStatusReady ();
+ 		RKGlobals::rkApp ()->setCaption (QString::null);	// trigger update of caption
  	}
  }