Commit 90c13033 authored by Andreas Cord-Landwehr's avatar Andreas Cord-Landwehr
Browse files

KIcon -> QIcon.

parent fd5a2efb
......@@ -37,7 +37,7 @@
#include <KCmdLineArgs>
#include <KDialog>
#include <KGlobal>
#include <KIcon>
#include <QIcon>
#include <KLocale>
#include <KDeclarative/KDeclarative>
#include <KConfigDialog>
......@@ -69,7 +69,7 @@ MainWindow::MainWindow()
, m_trainingSession(new TrainingSession(this))
, m_profileManager(new LearnerProfile::ProfileManager(this))
{
setWindowIcon(KIcon("artikulate")); // FIXME not present yet
setWindowIcon(QIcon::fromTheme("artikulate")); // FIXME not present yet
setWindowTitle(qAppName());
setAutoSaveSettings();
......@@ -142,24 +142,24 @@ void MainWindow::setupActions()
connect(editorAction, SIGNAL(triggered()), SLOT(switchMode()));
connect(this, SIGNAL(modeChanged(bool)), editorAction, SLOT(setChecked(bool)));
actionCollection()->addAction("editor", editorAction);
editorAction->setIcon(KIcon("artikulate-course-editor"));
editorAction->setIcon(QIcon::fromTheme("artikulate-course-editor"));
editorAction->setCheckable(true);
editorAction->setChecked(false);
KAction *settingsAction = new KAction(i18nc("@item:inmenu", "Configure Artikulate"), this);
connect(settingsAction, SIGNAL(triggered()), SLOT(showSettingsDialog()));
actionCollection()->addAction("settings", settingsAction);
settingsAction->setIcon(KIcon("configure"));
settingsAction->setIcon(QIcon::fromTheme("configure"));
KAction *downloadsAction = new KAction(i18nc("@item:inmenu", "Download New Language Course"), this);
connect(downloadsAction, SIGNAL(triggered(bool)), this, SLOT(downloadNewStuff()));
actionCollection()->addAction("download_new_stuff", downloadsAction);
downloadsAction->setIcon(KIcon("get-hot-new-stuff"));
downloadsAction->setIcon(QIcon::fromTheme("get-hot-new-stuff"));
KAction *configLearnerProfileAction = new KAction(i18nc("@item:inmenu", "Learner Profile"), this);
connect(configLearnerProfileAction, SIGNAL(triggered(bool)), this, SLOT(configLearnerProfile()));
actionCollection()->addAction("config_learner_profile", configLearnerProfileAction);
configLearnerProfileAction->setIcon(KIcon("user-identity"));
configLearnerProfileAction->setIcon(QIcon::fromTheme("user-identity"));
KStandardAction::quit(kapp, SLOT(quit()), actionCollection());
......
......@@ -33,9 +33,9 @@ SoundDeviceDialogPage::SoundDeviceDialogPage()
ui->setupUi(this);
// set buttons
ui->buttonPlayTestSound->setIcon(KIcon("media-playback-start"));
ui->buttonPlayRecordedTestSound->setIcon(KIcon("media-playback-start"));
ui->buttonRecordTestSound->setIcon(KIcon("media-record"));
ui->buttonPlayTestSound->setIcon(QIcon::fromTheme("media-playback-start"));
ui->buttonPlayRecordedTestSound->setIcon(QIcon::fromTheme("media-playback-start"));
ui->buttonRecordTestSound->setIcon(QIcon::fromTheme("media-record"));
ui->buttonPlayRecordedTestSound->setEnabled(false);
// set input volume slider
......@@ -119,12 +119,12 @@ void SoundDeviceDialogPage::recordSound()
if (CaptureDeviceController::self().state() == CaptureDeviceController::RecordingState)
{
CaptureDeviceController::self().stopCapture();
ui->buttonRecordTestSound->setIcon(KIcon("media-record"));
ui->buttonRecordTestSound->setIcon(QIcon::fromTheme("media-record"));
ui->buttonPlayRecordedTestSound->setEnabled(true);
return;
}
ui->buttonRecordTestSound->setIcon(KIcon("artikulate-media-record-active"));
ui->buttonRecordTestSound->setIcon(QIcon::fromTheme("artikulate-media-record-active"));
CaptureDeviceController::self().setDevice(ui->kcfg_AudioInputDevice->currentText());
CaptureDeviceController::self().startCapture(m_recordTestFile.fileName());
}
......@@ -134,24 +134,24 @@ void SoundDeviceDialogPage::updatePlayButtonIcons()
// default sound output test
switch (OutputDeviceController::self().state()) {
case OutputDeviceController::PlayingState:
ui->buttonPlayTestSound->setIcon(KIcon("media-playback-stop"));
ui->buttonPlayTestSound->setIcon(QIcon::fromTheme("media-playback-stop"));
break;
case OutputDeviceController::StoppedState:
ui->buttonPlayTestSound->setIcon(KIcon("media-playback-start"));
ui->buttonPlayTestSound->setIcon(QIcon::fromTheme("media-playback-start"));
break;
default:
ui->buttonPlayTestSound->setIcon(KIcon("media-playback-start"));
ui->buttonPlayTestSound->setIcon(QIcon::fromTheme("media-playback-start"));
}
// recorded sound output test
switch (OutputDeviceController::self().state()) {
case OutputDeviceController::PlayingState:
ui->buttonPlayRecordedTestSound->setIcon(KIcon("media-playback-stop"));
ui->buttonPlayRecordedTestSound->setIcon(QIcon::fromTheme("media-playback-stop"));
break;
case OutputDeviceController::StoppedState:
ui->buttonPlayRecordedTestSound->setIcon(KIcon("media-playback-start"));
ui->buttonPlayRecordedTestSound->setIcon(QIcon::fromTheme("media-playback-start"));
break;
default:
ui->buttonPlayRecordedTestSound->setIcon(KIcon("media-playback-start"));
ui->buttonPlayRecordedTestSound->setIcon(QIcon::fromTheme("media-playback-start"));
}
}
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