Use Oxygen icon names

svn path=/branches/work/konsole-split-view/; revision=640441

konsole/KonsoleMainWindow.cpp

@@ -87,7 +87,7 @@ void KonsoleMainWindow::setupActions()
     newTabAction->setText( i18n("New &Tab") );
 
     QAction* newWindowAction = collection->addAction("new-window"); 
-    newWindowAction->setIcon( KIcon("window_new") );
+    newWindowAction->setIcon( KIcon("window-new") );
     newWindowAction->setText( i18n("New &Window") );
 
     connect( newTabAction , SIGNAL(triggered()) , this , SLOT(newTab()) );

konsole/SessionController.cpp

@@ -154,20 +154,20 @@ void SessionController::setupActions()
 
     // Close Session
     action = collection->addAction("close-session"); 
-    action->setIcon( KIcon("fileclose") );
+    action->setIcon( KIcon("window-close") ); // FIXME: Not the best icon for this
     action->setText( i18n("&Close Tab") );
     action->setShortcut( QKeySequence(Qt::CTRL+Qt::SHIFT+Qt::Key_W) );
     connect( action , SIGNAL(triggered()) , this , SLOT(closeSession()) );
     
     // Copy and Paste
     action = collection->addAction("copy");
-    action->setIcon( KIcon("editcopy") );
+    action->setIcon( KIcon("edit-copy") );
     action->setText( i18n("&Copy") );
     action->setShortcut( QKeySequence(Qt::CTRL+Qt::SHIFT+Qt::Key_C) );
     connect( action , SIGNAL(triggered()) , this , SLOT(copy()) );
     
     action = collection->addAction("paste");
-    action->setIcon( KIcon("editpaste") );
+    action->setIcon( KIcon("edit-paste") );
     action->setText( i18n("&Paste") );
     action->setShortcut( QKeySequence(Qt::CTRL+Qt::SHIFT+Qt::Key_V) );
     connect( action , SIGNAL(triggered()) , this , SLOT(paste()) );
@@ -179,6 +179,7 @@ void SessionController::setupActions()
     
     action = collection->addAction("clear-and-reset");
     action->setText( i18n("Clear and Reset") );
+    action->setIcon( KIcon("history-clear") );
     connect( action , SIGNAL(triggered()) , this , SLOT(clearAndReset()) );
 
     // Monitor
@@ -196,17 +197,18 @@ void SessionController::setupActions()
     // History
     _searchToggleAction = new KAction(i18n("Search History"),this);
     _searchToggleAction->setShortcut( QKeySequence(Qt::CTRL+Qt::SHIFT+Qt::Key_F) );
+    _searchToggleAction->setIcon( KIcon("edit-find") );
     action = collection->addAction("search-history" , _searchToggleAction);
     connect( action , SIGNAL(triggered()) , this , SLOT(searchHistory()) );
     
     action = collection->addAction("find-next");
-    action->setIcon( KIcon("next") );
+    action->setIcon( KIcon("find-next") );
     action->setText( i18n("Find Next") );
     action->setShortcut( QKeySequence(Qt::Key_F3) );
     connect( action , SIGNAL(triggered()) , this , SLOT(findNextInHistory()) );
     
     action = collection->addAction("find-previous");
-    action->setIcon( KIcon("previous") );
+    action->setIcon( KIcon("find-previous") );
     action->setText( i18n("Find Previous") );
     action->setShortcut( QKeySequence(Qt::SHIFT + Qt::Key_F3) );
     connect( action , SIGNAL(triggered()) , this , SLOT(findPreviousInHistory()) );
@@ -217,6 +219,7 @@ void SessionController::setupActions()
    
     action = collection->addAction("history-options");
     action->setText( i18n("History Options") );
+    action->setIcon( KIcon("configure") );
     connect( action , SIGNAL(triggered()) , this , SLOT(historyOptions()) );
 
     action = collection->addAction("clear-history");
@@ -292,15 +295,16 @@ void SessionController::clear()
 {
     TEmulation* emulation = _session->getEmulation();
 
+#warning "Find a way to reimplement clearing the selection - this is now done in ScreenWindow not TEmulation"
     emulation->clearEntireScreen();
-    emulation->clearSelection();
+    //emulation->clearSelection();
 }
 void SessionController::clearAndReset()
 {
     TEmulation* emulation = _session->getEmulation();
 
     emulation->reset();
-    emulation->clearSelection();
+    //emulation->clearSelection();
 }
 void SessionController::searchClosed()
 {

konsole/ViewContainer.cpp

@@ -113,13 +113,13 @@ TabbedViewContainer::TabbedViewContainer(QObject* parent) :
 
     _newSessionButton = new QToolButton(_tabWidget);
     _newSessionButton->setAutoRaise(true);
-    _newSessionButton->setIcon( KIcon("tab_new") );
+    _newSessionButton->setIcon( KIcon("tab-new") );
     _newSessionButton->setText( i18n("New") );
     _newSessionButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
     _newSessionButton->setPopupMode(QToolButton::MenuButtonPopup);
 
     QToolButton* closeButton = new QToolButton(_tabWidget);
-    closeButton->setIcon( KIcon("tab_remove") );
+    closeButton->setIcon( KIcon("tab-remove") );
     closeButton->setAutoRaise(true);
     connect( closeButton , SIGNAL(clicked()) , this , SLOT(closeTabClicked()) );
 

konsole/ViewManager.cpp

@@ -68,15 +68,15 @@ void ViewManager::setupActions()
 {
     KActionCollection* collection = _mainWindow->actionCollection();
 
-    _splitViewAction = new KToggleAction( KIcon("view_top_bottom"),i18n("&Split View") , this);
-    _splitViewAction->setCheckedState( KGuiItem(i18n("&Remove Split") , KIcon("view_remove") ) );
+    _splitViewAction = new KToggleAction( KIcon("view-top-bottom"),i18n("&Split View") , this);
+    _splitViewAction->setCheckedState( KGuiItem(i18n("&Remove Split") , KIcon("view-remove") ) );
     _splitViewAction->setShortcut( QKeySequence(Qt::CTRL+Qt::SHIFT+Qt::Key_S) );
     collection->addAction("split-view",_splitViewAction);
     connect( _splitViewAction , SIGNAL(toggled(bool)) , this , SLOT(splitView(bool)));
 
 
     QAction* detachViewAction = collection->addAction("detach-view");
-    detachViewAction->setIcon( KIcon("view_remove") );
+    detachViewAction->setIcon( KIcon("tab-breakoff") );
     detachViewAction->setText( i18n("&Detach View") );
     // Ctrl+Shift+D is not used as a shortcut by default because it is too close
     // to Ctrl+D - which will terminate the session in many cases