summaryrefslogtreecommitdiffstats
path: root/juk/juk.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 15:13:25 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 15:13:25 -0600
commit940c092f32d40263ad6b24f948eaf4c48b01e99a (patch)
treef5235b5c44e8aaedd3484a00551e29993d548590 /juk/juk.cpp
parentced2058eaf8e5af831ebc02812a18937ff7e1de3 (diff)
downloadtdemultimedia-940c092f32d40263ad6b24f948eaf4c48b01e99a.tar.gz
tdemultimedia-940c092f32d40263ad6b24f948eaf4c48b01e99a.zip
Rename a number of classes to enhance compatibility with KDE4
Diffstat (limited to 'juk/juk.cpp')
-rw-r--r--juk/juk.cpp80
1 files changed, 40 insertions, 40 deletions
diff --git a/juk/juk.cpp b/juk/juk.cpp
index 69b65c0b..e4238416 100644
--- a/juk/juk.cpp
+++ b/juk/juk.cpp
@@ -44,7 +44,7 @@ using namespace ActionCollection;
////////////////////////////////////////////////////////////////////////////////
JuK::JuK(TQWidget *parent, const char *name) :
- KMainWindow(parent, name, WDestructiveClose),
+ TDEMainWindow(parent, name, WDestructiveClose),
m_player(PlayerManager::instance()),
m_shuttingDown(false)
{
@@ -82,7 +82,7 @@ JuK::~JuK()
kdDebug(65432) << k_funcinfo << endl;
}
-KActionCollection *JuK::actionCollection() const
+TDEActionCollection *JuK::actionCollection() const
{
return ActionCollection::actions();
}
@@ -120,64 +120,64 @@ void JuK::setupActions()
KStdAction::clear(TQT_TQOBJECT(kapp), TQT_SLOT(clear()), ActionCollection::actions());
KStdAction::selectAll(TQT_TQOBJECT(kapp), TQT_SLOT(selectAll()), ActionCollection::actions());
- new KAction(i18n("Remove From Playlist"), "edit_remove", 0, TQT_TQOBJECT(kapp), TQT_SLOT(clear()), ActionCollection::actions(), "removeFromPlaylist");
+ new TDEAction(i18n("Remove From Playlist"), "edit_remove", 0, TQT_TQOBJECT(kapp), TQT_SLOT(clear()), ActionCollection::actions(), "removeFromPlaylist");
- KActionMenu *actionMenu = new KActionMenu(i18n("&Random Play"), "roll", ActionCollection::actions(), "actionMenu");
+ TDEActionMenu *actionMenu = new TDEActionMenu(i18n("&Random Play"), "roll", ActionCollection::actions(), "actionMenu");
actionMenu->setDelayed(false);
- KRadioAction *ka = new KRadioAction(i18n("&Disable Random Play"), "player_playlist", 0, ActionCollection::actions(), "disableRandomPlay");
+ TDERadioAction *ka = new TDERadioAction(i18n("&Disable Random Play"), "player_playlist", 0, ActionCollection::actions(), "disableRandomPlay");
ka->setExclusiveGroup("randomPlayGroup");
actionMenu->insert(ka);
- m_randomPlayAction = new KRadioAction(i18n("Use &Random Play"), "roll", 0, ActionCollection::actions(), "randomPlay");
+ m_randomPlayAction = new TDERadioAction(i18n("Use &Random Play"), "roll", 0, ActionCollection::actions(), "randomPlay");
m_randomPlayAction->setExclusiveGroup("randomPlayGroup");
actionMenu->insert(m_randomPlayAction);
- ka = new KRadioAction(i18n("Use &Album Random Play"), "roll", 0, ActionCollection::actions(), "albumRandomPlay");
+ ka = new TDERadioAction(i18n("Use &Album Random Play"), "roll", 0, ActionCollection::actions(), "albumRandomPlay");
ka->setExclusiveGroup("randomPlayGroup");
connect(ka, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotCheckAlbumNextAction(bool)));
actionMenu->insert(ka);
- new KAction(i18n("&Play"), "player_play", 0, TQT_TQOBJECT(m_player), TQT_SLOT(play()), ActionCollection::actions(), "play");
- new KAction(i18n("P&ause"), "player_pause", 0, TQT_TQOBJECT(m_player), TQT_SLOT(pause()), ActionCollection::actions(), "pause");
- new KAction(i18n("&Stop"), "player_stop", 0, TQT_TQOBJECT(m_player), TQT_SLOT(stop()), ActionCollection::actions(), "stop");
+ new TDEAction(i18n("&Play"), "player_play", 0, TQT_TQOBJECT(m_player), TQT_SLOT(play()), ActionCollection::actions(), "play");
+ new TDEAction(i18n("P&ause"), "player_pause", 0, TQT_TQOBJECT(m_player), TQT_SLOT(pause()), ActionCollection::actions(), "pause");
+ new TDEAction(i18n("&Stop"), "player_stop", 0, TQT_TQOBJECT(m_player), TQT_SLOT(stop()), ActionCollection::actions(), "stop");
- new KToolBarPopupAction(i18n("previous track", "Previous"), "player_start", KShortcut(), TQT_TQOBJECT(m_player), TQT_SLOT(back()), ActionCollection::actions(), "back");
- new KAction(i18n("next track", "&Next"), "player_end", KShortcut(), TQT_TQOBJECT(m_player), TQT_SLOT(forward()), ActionCollection::actions(), "forward");
- new KToggleAction(i18n("&Loop Playlist"), 0, KShortcut(), ActionCollection::actions(), "loopPlaylist");
- KToggleAction *resizeColumnAction =
- new KToggleAction(i18n("&Resize Playlist Columns Manually"),
- KShortcut(), ActionCollection::actions(), "resizeColumnsManually");
+ new TDEToolBarPopupAction(i18n("previous track", "Previous"), "player_start", TDEShortcut(), TQT_TQOBJECT(m_player), TQT_SLOT(back()), ActionCollection::actions(), "back");
+ new TDEAction(i18n("next track", "&Next"), "player_end", TDEShortcut(), TQT_TQOBJECT(m_player), TQT_SLOT(forward()), ActionCollection::actions(), "forward");
+ new TDEToggleAction(i18n("&Loop Playlist"), 0, TDEShortcut(), ActionCollection::actions(), "loopPlaylist");
+ TDEToggleAction *resizeColumnAction =
+ new TDEToggleAction(i18n("&Resize Playlist Columns Manually"),
+ TDEShortcut(), ActionCollection::actions(), "resizeColumnsManually");
resizeColumnAction->setCheckedState(i18n("&Resize Column Headers Automatically"));
// the following are not visible by default
- new KAction(i18n("Mute"), "mute", 0, TQT_TQOBJECT(m_player), TQT_SLOT(mute()), ActionCollection::actions(), "mute");
- new KAction(i18n("Volume Up"), "volumeUp", 0, TQT_TQOBJECT(m_player), TQT_SLOT(volumeUp()), ActionCollection::actions(), "volumeUp");
- new KAction(i18n("Volume Down"), "volumeDown", 0, TQT_TQOBJECT(m_player), TQT_SLOT(volumeDown()), ActionCollection::actions(), "volumeDown");
- new KAction(i18n("Play / Pause"), "playPause", 0, TQT_TQOBJECT(m_player), TQT_SLOT(playPause()), ActionCollection::actions(), "playPause");
- new KAction(i18n("Seek Forward"), "seekForward", 0, TQT_TQOBJECT(m_player), TQT_SLOT(seekForward()), ActionCollection::actions(), "seekForward");
- new KAction(i18n("Seek Back"), "seekBack", 0, TQT_TQOBJECT(m_player), TQT_SLOT(seekBack()), ActionCollection::actions(), "seekBack");
+ new TDEAction(i18n("Mute"), "mute", 0, TQT_TQOBJECT(m_player), TQT_SLOT(mute()), ActionCollection::actions(), "mute");
+ new TDEAction(i18n("Volume Up"), "volumeUp", 0, TQT_TQOBJECT(m_player), TQT_SLOT(volumeUp()), ActionCollection::actions(), "volumeUp");
+ new TDEAction(i18n("Volume Down"), "volumeDown", 0, TQT_TQOBJECT(m_player), TQT_SLOT(volumeDown()), ActionCollection::actions(), "volumeDown");
+ new TDEAction(i18n("Play / Pause"), "playPause", 0, TQT_TQOBJECT(m_player), TQT_SLOT(playPause()), ActionCollection::actions(), "playPause");
+ new TDEAction(i18n("Seek Forward"), "seekForward", 0, TQT_TQOBJECT(m_player), TQT_SLOT(seekForward()), ActionCollection::actions(), "seekForward");
+ new TDEAction(i18n("Seek Back"), "seekBack", 0, TQT_TQOBJECT(m_player), TQT_SLOT(seekBack()), ActionCollection::actions(), "seekBack");
//////////////////////////////////////////////////
// settings menu
//////////////////////////////////////////////////
m_toggleSplashAction =
- new KToggleAction(i18n("Show Splash Screen on Startup"),
- KShortcut(), ActionCollection::actions(), "showSplashScreen");
+ new TDEToggleAction(i18n("Show Splash Screen on Startup"),
+ TDEShortcut(), ActionCollection::actions(), "showSplashScreen");
m_toggleSplashAction->setCheckedState(i18n("Hide Splash Screen on Startup"));
m_toggleSystemTrayAction =
- new KToggleAction(i18n("&Dock in System Tray"),
- KShortcut(), ActionCollection::actions(), "toggleSystemTray");
+ new TDEToggleAction(i18n("&Dock in System Tray"),
+ TDEShortcut(), ActionCollection::actions(), "toggleSystemTray");
m_toggleDockOnCloseAction =
- new KToggleAction(i18n("&Stay in System Tray on Close"),
- KShortcut(), ActionCollection::actions(), "dockOnClose");
+ new TDEToggleAction(i18n("&Stay in System Tray on Close"),
+ TDEShortcut(), ActionCollection::actions(), "dockOnClose");
m_togglePopupsAction =
- new KToggleAction(i18n("Popup &Track Announcement"),
- KShortcut(), TQT_TQOBJECT(this), 0, ActionCollection::actions(), "togglePopups");
- new KToggleAction(i18n("Save &Play Queue on Exit"),
- KShortcut(), TQT_TQOBJECT(this), 0, ActionCollection::actions(), "saveUpcomingTracks");
+ new TDEToggleAction(i18n("Popup &Track Announcement"),
+ TDEShortcut(), TQT_TQOBJECT(this), 0, ActionCollection::actions(), "togglePopups");
+ new TDEToggleAction(i18n("Save &Play Queue on Exit"),
+ TDEShortcut(), TQT_TQOBJECT(this), 0, ActionCollection::actions(), "saveUpcomingTracks");
connect(m_toggleSystemTrayAction, TQT_SIGNAL(toggled(bool)),
this, TQT_SLOT(slotToggleSystemTray(bool)));
@@ -188,10 +188,10 @@ void JuK::setupActions()
if(m_outputSelectAction)
m_outputSelectAction->setCurrentItem(0);
- new KAction(i18n("&Tag Guesser..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotConfigureTagGuesser()),
+ new TDEAction(i18n("&Tag Guesser..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotConfigureTagGuesser()),
ActionCollection::actions(), "tagGuesserConfig");
- new KAction(i18n("&File Renamer..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotConfigureFileRenamer()),
+ new TDEAction(i18n("&File Renamer..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotConfigureFileRenamer()),
ActionCollection::actions(), "fileRenamerConfig");
KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(slotEditKeys()), ActionCollection::actions());
@@ -269,7 +269,7 @@ void JuK::keyPressEvent(TQKeyEvent *e)
{
if (e->key() >= TQt::Key_Back && e->key() <= TQt::Key_MediaLast)
e->accept();
- KMainWindow::keyPressEvent(e);
+ TDEMainWindow::keyPressEvent(e);
}
/**
@@ -297,16 +297,16 @@ void JuK::readConfig()
// Default to no random play
- ActionCollection::action<KToggleAction>("disableRandomPlay")->setChecked(true);
+ ActionCollection::action<TDEToggleAction>("disableRandomPlay")->setChecked(true);
TQString randomPlayMode = playerConfig.readEntry("RandomPlay", "Disabled");
if(randomPlayMode == "true" || randomPlayMode == "Normal")
m_randomPlayAction->setChecked(true);
else if(randomPlayMode == "AlbumRandomPlay")
- ActionCollection::action<KToggleAction>("albumRandomPlay")->setChecked(true);
+ ActionCollection::action<TDEToggleAction>("albumRandomPlay")->setChecked(true);
bool loopPlaylist = playerConfig.readBoolEntry("LoopPlaylist", false);
- ActionCollection::action<KToggleAction>("loopPlaylist")->setChecked(loopPlaylist);
+ ActionCollection::action<TDEToggleAction>("loopPlaylist")->setChecked(loopPlaylist);
// general settings
@@ -340,10 +340,10 @@ void JuK::saveConfig()
playerConfig.writeEntry("RandomPlay", m_randomPlayAction->isChecked());
- KToggleAction *a = ActionCollection::action<KToggleAction>("loopPlaylist");
+ TDEToggleAction *a = ActionCollection::action<TDEToggleAction>("loopPlaylist");
playerConfig.writeEntry("LoopPlaylist", a->isChecked());
- a = ActionCollection::action<KToggleAction>("albumRandomPlay");
+ a = ActionCollection::action<TDEToggleAction>("albumRandomPlay");
if(a->isChecked())
playerConfig.writeEntry("RandomPlay", "AlbumRandomPlay");
else if(m_randomPlayAction->isChecked())