Remove 'Clear Display' and 'Clear Scrollback' menu items. Without the

'& Reset' option, these options produce unexpected screen displays.


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

src/SessionController.cpp

@@ -420,12 +420,7 @@ void SessionController::setupActions()
     action->setText(i18n("Copy Input To..."));
     connect( action , SIGNAL(triggered()) , this , SLOT(copyInputTo()) );
 
-    // Clear and Clear+Reset
-    action = collection->addAction("clear");
-    action->setText( i18n("C&lear Display") );
-    action->setIcon( KIcon("edit-clear") );
-    connect( action , SIGNAL(triggered()) , this , SLOT(clear()) );
-
+    // Clear+Reset
     action = collection->addAction("clear-and-reset");
     action->setText( i18n("Clear && Reset") );
     action->setIcon( KIcon("edit-clear-history") );
@@ -493,10 +488,6 @@ void SessionController::setupActions()
     action->setIcon( KIcon("configure") );
     connect( action , SIGNAL(triggered()) , this , SLOT(showHistoryOptions()) );
 
-    action = collection->addAction("clear-history");
-    action->setText( i18n("Clear Scrollback") );
-    connect( action , SIGNAL(triggered()) , this , SLOT(clearHistory()) );
-
     action = collection->addAction("clear-history-and-reset");
     action->setText( i18n("Clear Scrollback && Reset") );
     action->setShortcut( QKeySequence(Qt::CTRL+Qt::SHIFT+Qt::Key_X) );