Re-added 'Clear Scrollback and Reset'.

svn path=/trunk/KDE/kdebase/apps/konsole/; revision=1125540

desktop/partui.rc

@@ -1,6 +1,6 @@
 <!DOCTYPE kpartgui>
 
-<kpartgui name="konsolepart" version="3">
+<kpartgui name="konsolepart" version="4">
     <Menu name="session-popup-menu">
         <Action name="edit_copy"/>
         <Action name="edit_paste"/>
@@ -10,6 +10,7 @@
             <Action name="configure-history" group="session-history-operations"/>
             <Separator group="session-history-operations"/>
             <Action name="clear-history" group="session-history-operations"/>
+            <Action name="clear-history-and-reset" group="session-history-operations"/>
         </Menu>
         <Action name="open-browser"/>
         <Separator/>

desktop/sessionui.rc

@@ -1,6 +1,6 @@
 <!DOCTYPE kpartgui>
 
-<kpartgui name="session" version="11">
+<kpartgui name="session" version="12">
     <MenuBar>
         <Menu name="file">
             <Action name="close-session" group="session-tab-operations"/>
@@ -33,6 +33,7 @@
             <Action name="set-encoding" group="session-view-operations"/>
             <Separator group="session-view-operations"/>
             <Action name="clear-history" group="session-view-operations"/>
+            <Action name="clear-history-and-reset" group="session-view-operations"/>
         </Menu>
         <!--<Menu name="debug"><text>Debug</text>
             <Action name="debug-process"/>

src/SessionController.cpp

@@ -495,6 +495,10 @@ void SessionController::setupActions()
     action = collection->addAction("clear-history", this, SLOT(clearHistory()));
     action->setText(i18n("Clear Scrollback"));
     action->setIcon(KIcon("edit-clear-history"));
+
+    action = collection->addAction("clear-history-and-reset", this, SLOT(clearHistoryAndReset()));
+    action->setText(i18n("Clear Scrollback and Reset"));
+    action->setIcon(KIcon("edit-clear-history"));
     action->setShortcut(QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_X));
 
     // Profile Options
@@ -978,6 +982,14 @@ void SessionController::clearHistory()
     _view->updateImage();   // To reset view scrollbar
 }
 
+void SessionController::clearHistoryAndReset()
+{
+    Emulation* emulation = _session->emulation();
+    emulation->reset();
+    //_session->refresh();
+    clearHistory();
+}
+
 void SessionController::increaseTextSize()
 {
     QFont font = _view->getVTFont();

src/SessionController.h

@@ -176,6 +176,7 @@ private slots:
     void saveHistory();
     void showHistoryOptions();
     void clearHistory();
+    void clearHistoryAndReset();
     void closeSession();
     void monitorActivity(bool monitor);
     void monitorSilence(bool monitor);