[rkward-cvs] rkward/rkward rkconsole.cpp, 1.25, 1.26 rkconsole.h, 1.17, 1.18 rkwatch.cpp, 1.45, 1.46 rkwatch.h, 1.21, 1.22

[Thomas Friedrichsmeier]

Update of /cvsroot/rkward/rkward/rkward
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv7009

Modified Files:
	rkconsole.cpp rkconsole.h rkwatch.cpp rkwatch.h 
Log Message:
Correct line continuation in console and command log (remove spurious line breaks after each flushOutput ())

Index: rkwatch.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/rkwatch.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** rkwatch.cpp	1 Sep 2006 15:38:17 -0000	1.45
--- rkwatch.cpp	10 Sep 2006 23:45:40 -0000	1.46
***************
*** 83,90 ****
  	}
  
- 	watch->append ("\n");
  	watch->setItalic (true);
  
! 	watch->append (command->command ());
  
  	if (RKSettingsModuleWatch::shouldRaiseWindow (command)) {
--- 83,89 ----
  	}
  
  	watch->setItalic (true);
  
! 	watch->append (command->command () + "\n");
  
  	if (RKSettingsModuleWatch::shouldRaiseWindow (command)) {
***************
*** 113,117 ****
      watch->setBold (true);
  
! 	watch->append (output);
  
  	if (RKSettingsModuleWatch::shouldRaiseWindow (command)) {
--- 112,116 ----
      watch->setBold (true);
  
! 	watch->insert (output);
  
  	if (RKSettingsModuleWatch::shouldRaiseWindow (command)) {
***************
*** 136,140 ****
  }
  
! void RKwatch::commandDone (RCommand *command) {
  	RK_TRACE (APP);
  
--- 135,139 ----
  }
  
! void RKwatch::rCommandDone (RCommand *command) {
  	RK_TRACE (APP);
  
***************
*** 159,162 ****
--- 158,163 ----
  		}
  	}
+ 
+ 	if (RKSettingsModuleWatch::shouldShowOutput (command)) watch->append ("\n");
  }
  

Index: rkwatch.h
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/rkwatch.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** rkwatch.h	1 Sep 2006 15:38:17 -0000	1.21
--- rkwatch.h	10 Sep 2006 23:45:40 -0000	1.22
***************
*** 45,53 ****
  /** Adds output to the watch-window (i.e. replies received) */
  	void newOutput (RCommand *command, ROutput *output_fragment);
- /** Command has finished. If the command has failed, it may be neccessary to print some more information */
- 	void commandDone (RCommand *command);
  signals:
  /** the watch emits this, when it should be raised (apparently this can only be done from the main frame) */
  	void raiseWatch ();
  public slots:
  /** configures the watch-window */
--- 45,54 ----
  /** Adds output to the watch-window (i.e. replies received) */
  	void newOutput (RCommand *command, ROutput *output_fragment);
  signals:
  /** the watch emits this, when it should be raised (apparently this can only be done from the main frame) */
  	void raiseWatch ();
+ protected:
+ /** Command has finished. If the command has failed, it may be neccessary to print some more information */
+ 	void rCommandDone (RCommand *command);
  public slots:
  /** configures the watch-window */
***************
*** 55,59 ****
  /** clears the watch-window */
  	void clearWatch ();
- 
  private:
  	void addInputNoCheck (RCommand *command);
--- 56,59 ----

Index: rkconsole.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/rkconsole.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** rkconsole.cpp	5 May 2006 13:05:31 -0000	1.25
--- rkconsole.cpp	10 Sep 2006 23:45:40 -0000	1.26
***************
*** 128,131 ****
--- 128,132 ----
  	prefix = nprefix;
  	command_incomplete = false;
+ 	output_continuation = false;
  	//TODO:
  	//view->setUndoRedoEnabled (false);
***************
*** 301,305 ****
  void RKConsole::cursorAtTheEnd () {
  	RK_TRACE (APP);
! 	view->setCursorPosition (doc->numLines() -1, editInterface(doc)->textLine (doc->numLines() -1).length());
  	view->scrollDown ();
  }
--- 302,306 ----
  void RKConsole::cursorAtTheEnd () {
  	RK_TRACE (APP);
! 	view->setCursorPosition (doc->numLines() -1, editInterface(doc)->lineLength (doc->numLines() -1));
  	view->scrollDown ();
  }
***************
*** 378,381 ****
--- 379,383 ----
  	}
  
+ 	output_continuation = false;
  	tryNextInBatch ();
  }
***************
*** 386,391 ****
  // TODO: handle different types of output, once we can differentiate between them
  //	insertAt (output->output, doc->numLines()-1, paragraphLength (doc->numLines() - 1));
! 	view->setCursorPosition (doc->numLines() -1, 1);
! 	editInterface(doc)->insertText (doc->numLines() , 0, output->output);
  
  	if (RKSettingsModuleConsole::maxConsoleLines ()) {
--- 388,396 ----
  // TODO: handle different types of output, once we can differentiate between them
  //	insertAt (output->output, doc->numLines()-1, paragraphLength (doc->numLines() - 1));
! 	if (output_continuation) {
! 		editInterface (doc)->insertText (doc->numLines () -1,  editInterface (doc)->lineLength (doc->numLines () -1), output->output);
! 	} else {
! 		editInterface (doc)->insertText (doc->numLines (), 0, output->output);
! 	}
  
  	if (RKSettingsModuleConsole::maxConsoleLines ()) {
***************
*** 401,404 ****
--- 406,410 ----
  	}
  	cursorAtTheEnd ();
+ 	output_continuation = true;
  }
  

Index: rkconsole.h
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/rkconsole.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** rkconsole.h	12 Apr 2006 12:36:03 -0000	1.17
--- rkconsole.h	10 Sep 2006 23:45:40 -0000	1.18
***************
*** 121,124 ****
--- 121,126 ----
  	void unplugAction(QString action, KActionCollection* ac);
  
+ 	bool output_continuation;
+ 
  	RCommand *current_command;
  	Kate::Document *doc;