Commit 81e6d8f4 authored by Christoph Feck's avatar Christoph Feck

KIcon -> QIcon

parent 8ca5fccf
......@@ -51,7 +51,7 @@ EquationEdit::EquationEdit( QWidget * parent )
m_equationEditWidget = new EquationEditWidget( this );
m_highlighter = new EquationHighlighter( this );
m_equation = new Equation( Equation::Cartesian, 0 );
m_editButton = new QPushButton( KIcon("document-properties"), 0, this );
m_editButton = new QPushButton( QIcon::fromTheme("document-properties"), 0, this );
setFocusProxy( m_equationEditWidget );
connect( m_equationEditWidget, SIGNAL( textChanged() ), this, SLOT( slotTextChanged() ) );
......
......@@ -36,7 +36,6 @@
#include <kaction.h>
#include <kcolorbutton.h>
#include <KIcon>
#include <klocale.h>
#include <kmessagebox.h>
......@@ -86,8 +85,8 @@ FunctionEditor::FunctionEditor( KMenu * createNewPlotsMenu, QWidget * parent )
m_editor = new FunctionEditorWidget;
m_functionList = m_editor->functionList;
m_editor->createNewPlot->setIcon( KIcon("document-new") );
m_editor->deleteButton->setIcon( KIcon("edit-delete") );
m_editor->createNewPlot->setIcon( QIcon::fromTheme("document-new") );
m_editor->deleteButton->setIcon( QIcon::fromTheme("edit-delete") );
//BEGIN initialize equation edits
m_editor->cartesianEquation->setInputType( EquationEdit::Function );
......
......@@ -29,7 +29,6 @@
#include "xparser.h"
#include <kdebug.h>
#include <KIcon>
#include <kinputdialog.h>
#include <klocale.h>
#include <kmessagebox.h>
......@@ -61,8 +60,8 @@ KConstantEditor::KConstantEditor( QWidget * parent )
setMainWidget( m_widget );
setButtons( Close );
m_widget->cmdNew->setIcon( KIcon("document-new") );
m_widget->cmdDelete->setIcon( KIcon("edit-delete") );
m_widget->cmdNew->setIcon( QIcon::fromTheme("document-new") );
m_widget->cmdDelete->setIcon( QIcon::fromTheme("edit-delete") );
setCaption( i18n("Constants Editor") );
......
......@@ -37,7 +37,7 @@
KmPlotProgress::KmPlotProgress( QWidget* parent ) : QWidget( parent )
{
m_button = new KPushButton(this);
m_button->setIcon( KIcon( "process-stop" ) );
m_button->setIcon( QIcon::fromTheme( "process-stop" ) );
m_button->setGeometry( QRect( 0, 0, 30, 23 ) );
m_button->setMaximumHeight(height()-10);
connect( m_button, SIGNAL(clicked()), this, SIGNAL(cancelDraw()) );
......
......@@ -27,7 +27,6 @@
#include <kdebug.h>
#include <kfiledialog.h>
#include <KIcon>
#include <kinputdialog.h>
#include <kio/netaccess.h>
#include <klocale.h>
......@@ -55,12 +54,12 @@ KParameterEditor::KParameterEditor( QList<Value> *l, QWidget *parent )
m_mainWidget->layout()->setMargin( 0 );
setMainWidget( m_mainWidget );
m_mainWidget->cmdNew->setIcon( KIcon("document-new" ) );
m_mainWidget->cmdDelete->setIcon( KIcon("edit-delete" ) );
m_mainWidget->moveUp->setIcon( KIcon("go-up") );
m_mainWidget->moveDown->setIcon( KIcon("go-down") );
m_mainWidget->cmdImport->setIcon( KIcon("document-open") );
m_mainWidget->cmdExport->setIcon( KIcon("document-save") );
m_mainWidget->cmdNew->setIcon( QIcon::fromTheme("document-new" ) );
m_mainWidget->cmdDelete->setIcon( QIcon::fromTheme("edit-delete" ) );
m_mainWidget->moveUp->setIcon( QIcon::fromTheme("go-up") );
m_mainWidget->moveDown->setIcon( QIcon::fromTheme("go-down") );
m_mainWidget->cmdImport->setIcon( QIcon::fromTheme("document-open") );
m_mainWidget->cmdExport->setIcon( QIcon::fromTheme("document-save") );
m_mainWidget->list->setFocusPolicy( Qt::NoFocus );
......
......@@ -246,7 +246,7 @@ void MainDlg::setupActions()
//BEGIN file menu
QAction * exportAction = actionCollection()->addAction( "export" );
exportAction->setText( i18n( "E&xport..." ) );
exportAction->setIcon( KIcon( "document-export" ) );
exportAction->setIcon( QIcon::fromTheme( "document-export" ) );
connect( exportAction, SIGNAL(triggered(bool)), this, SLOT( slotExport() ) );
//END file menu
......@@ -260,12 +260,12 @@ void MainDlg::setupActions()
QAction * editAxes = actionCollection()->addAction( "editaxes" );
editAxes->setText( i18n( "&Coordinate System..." ) );
editAxes->setIcon( KIcon("coords.png") );
editAxes->setIcon( QIcon::fromTheme("coords.png") );
connect( editAxes, SIGNAL(triggered(bool)), this, SLOT( editAxes() ) );
QAction * editConstants = actionCollection()->addAction( "editconstants" );
editConstants->setText( i18n( "&Constants..." ) );
editConstants->setIcon( KIcon("editconstants.png") );
editConstants->setIcon( QIcon::fromTheme("editconstants.png") );
connect( editConstants, SIGNAL(triggered(bool)), this, SLOT( editConstants() ) );
//END edit menu
......@@ -276,13 +276,13 @@ void MainDlg::setupActions()
KAction * zoomIn = actionCollection()->addAction( "zoom_in" );
zoomIn->setText( i18n("Zoom &In") );
zoomIn->setShortcut( QKeySequence(Qt::ControlModifier | Qt::Key_1) );
zoomIn->setIcon( KIcon("zoom-in") );
zoomIn->setIcon( QIcon::fromTheme("zoom-in") );
connect( zoomIn, SIGNAL(triggered(bool)), View::self(), SLOT(zoomIn()) );
KAction * zoomOut = actionCollection()->addAction( "zoom_out" );
zoomOut->setText(i18n("Zoom &Out"));
zoomOut->setShortcut( QKeySequence(Qt::ControlModifier | Qt::Key_2) );
zoomOut->setIcon( KIcon("zoom-out") );
zoomOut->setIcon( QIcon::fromTheme("zoom-out") );
connect( zoomOut, SIGNAL(triggered(bool)), View::self(), SLOT( zoomOut() ) );
QAction * zoomTrig = actionCollection()->addAction( "zoom_trig" );
......@@ -291,7 +291,7 @@ void MainDlg::setupActions()
QAction * resetView = actionCollection()->addAction( "reset_view" );
resetView->setText( i18n( "Reset View" ) );
resetView->setIcon( KIcon("resetview") );
resetView->setIcon( QIcon::fromTheme("resetview") );
connect( resetView, SIGNAL(triggered(bool)), this, SLOT( slotResetView() ) );
//END view menu
......@@ -299,7 +299,7 @@ void MainDlg::setupActions()
//BEGIN tools menu
QAction *mnuCalculator = actionCollection()->addAction( "calculator" );
mnuCalculator->setText( i18n( "Calculator") );
mnuCalculator->setIcon( KIcon("system-run") );
mnuCalculator->setIcon( QIcon::fromTheme("system-run") );
connect( mnuCalculator, SIGNAL(triggered(bool)), this, SLOT( calculator() ) );
QAction *mnuArea = actionCollection()->addAction( "grapharea" );
......@@ -308,12 +308,12 @@ void MainDlg::setupActions()
QAction *mnuMaxValue = actionCollection()->addAction( "maximumvalue" );
mnuMaxValue->setText( i18n( "Find Ma&ximum..." ) );
mnuMaxValue->setIcon( KIcon("maximum") );
mnuMaxValue->setIcon( QIcon::fromTheme("maximum") );
connect( mnuMaxValue, SIGNAL(triggered(bool)), this, SLOT( findMaximumValue() ) );
QAction *mnuMinValue = actionCollection()->addAction( "minimumvalue" );
mnuMinValue->setText( i18n( "Find Mi&nimum..." ) );
mnuMinValue->setIcon( KIcon("minimum") );
mnuMinValue->setIcon( QIcon::fromTheme("minimum") );
connect( mnuMinValue, SIGNAL(triggered(bool)), this, SLOT( findMinimumValue() ) );
//END tools menu
......@@ -321,7 +321,7 @@ void MainDlg::setupActions()
//BEGIN help menu
QAction * namesAction = actionCollection()->addAction( "names" );
namesAction->setText( i18n( "Predefined &Math Functions" ) );
namesAction->setIcon( KIcon("functionhelp") );
namesAction->setIcon( QIcon::fromTheme("functionhelp") );
connect( namesAction, SIGNAL(triggered(bool)), this, SLOT( slotNames() ) );
//END help menu
......@@ -329,31 +329,31 @@ void MainDlg::setupActions()
//BEGIN new plots menu
QAction * newFunction = actionCollection()->addAction( "newcartesian" );
newFunction->setText( i18n( "Cartesian Plot" ) );
newFunction->setIcon( KIcon("newfunction") );
newFunction->setIcon( QIcon::fromTheme("newfunction") );
connect( newFunction, SIGNAL(triggered(bool)), m_functionEditor, SLOT( createCartesian() ) );
m_newPlotMenu->addAction( newFunction );
QAction * newParametric = actionCollection()->addAction( "newparametric" );
newParametric->setText( i18n( "Parametric Plot" ) );
newParametric->setIcon( KIcon("newparametric") );
newParametric->setIcon( QIcon::fromTheme("newparametric") );
connect( newParametric, SIGNAL(triggered(bool)), m_functionEditor, SLOT( createParametric() ) );
m_newPlotMenu->addAction( newParametric );
QAction * newPolar = actionCollection()->addAction( "newpolar" );
newPolar->setText( i18n( "Polar Plot" ) );
newPolar->setIcon( KIcon("newpolar") );
newPolar->setIcon( QIcon::fromTheme("newpolar") );
connect( newPolar, SIGNAL(triggered(bool)), m_functionEditor, SLOT( createPolar() ) );
m_newPlotMenu->addAction( newPolar );
QAction * newImplicit = actionCollection()->addAction( "newimplicit" );
newImplicit->setText( i18n( "Implicit Plot" ) );
newImplicit->setIcon( KIcon("newimplicit") );
newImplicit->setIcon( QIcon::fromTheme("newimplicit") );
connect( newImplicit, SIGNAL(triggered(bool)), m_functionEditor, SLOT( createImplicit() ) );
m_newPlotMenu->addAction( newImplicit );
QAction * newDifferential = actionCollection()->addAction( "newdifferential" );
newDifferential->setText( i18n( "Differential Plot" ) );
newDifferential->setIcon( KIcon("newdifferential") );
newDifferential->setIcon( QIcon::fromTheme("newdifferential") );
connect( newDifferential, SIGNAL(triggered(bool)), m_functionEditor, SLOT( createDifferential() ) );
m_newPlotMenu->addAction( newDifferential );
//END new plots menu
......@@ -370,7 +370,7 @@ void MainDlg::setupActions()
QAction *mnuEdit = actionCollection()->addAction( "mnuedit" );
mnuEdit->setText(i18n("&Edit"));
m_firstFunctionAction = mnuEdit;
mnuEdit->setIcon( KIcon("editplots") );
mnuEdit->setIcon( QIcon::fromTheme("editplots") );
connect(mnuEdit , SIGNAL(triggered(bool)), View::self(), SLOT( editCurrentPlot() ) );
m_popupmenu->addAction( mnuEdit );
......@@ -381,7 +381,7 @@ void MainDlg::setupActions()
QAction *mnuRemove = actionCollection()->addAction( "mnuremove" );
mnuRemove->setText(i18n("&Remove"));
mnuRemove->setIcon( KIcon("edit-delete") );
mnuRemove->setIcon( QIcon::fromTheme("edit-delete") );
connect( mnuRemove, SIGNAL(triggered(bool)), View::self(), SLOT( removeCurrentPlot() ) );
m_popupmenu->addAction( mnuRemove );
......
......@@ -73,11 +73,11 @@ ParameterAnimator::ParameterAnimator( QWidget * parent, Function * function )
m_timer = new QTimer( this );
connect( m_timer, SIGNAL(timeout()), this, SLOT(step()) );
m_widget->gotoInitial->setIcon( KIcon( "go-first" ) );
m_widget->gotoFinal->setIcon( KIcon( "go-last" ) );
m_widget->stepBackwards->setIcon( KIcon( "go-previous" ) );
m_widget->stepForwards->setIcon( KIcon( "go-next" ) );
m_widget->pause->setIcon( KIcon( "media-playback-pause" ) );
m_widget->gotoInitial->setIcon( QIcon::fromTheme( "go-first" ) );
m_widget->gotoFinal->setIcon( QIcon::fromTheme( "go-last" ) );
m_widget->stepBackwards->setIcon( QIcon::fromTheme( "go-previous" ) );
m_widget->stepForwards->setIcon( QIcon::fromTheme( "go-next" ) );
m_widget->pause->setIcon( QIcon::fromTheme( "media-playback-pause" ) );
connect( m_widget->gotoInitial, SIGNAL(clicked()), this, SLOT(gotoInitial()) );
connect( m_widget->gotoFinal, SIGNAL(clicked()), this, SLOT(gotoFinal()) );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment