Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
JuK
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Multimedia
JuK
Commits
b931274a
Commit
b931274a
authored
Feb 13, 2003
by
Scott Wheeler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
API cleanups
svn path=/trunk/kdemultimedia/juk/; revision=206623
parent
5d9e5ff1
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
41 additions
and
41 deletions
+41
-41
juk.cpp
juk.cpp
+23
-23
juk.h
juk.h
+8
-8
jukui.rc
jukui.rc
+10
-10
No files found.
juk.cpp
View file @
b931274a
...
...
@@ -119,11 +119,11 @@ void JuK::setupActions()
// play menu
randomPlayAction
=
new
KToggleAction
(
i18n
(
"Random Play"
),
0
,
actionCollection
(),
"randomPlay"
);
playAction
=
new
KAction
(
i18n
(
"&Play"
),
"player_play"
,
0
,
this
,
SLOT
(
play
File
()),
actionCollection
(),
"playFile
"
);
pauseAction
=
new
KAction
(
i18n
(
"P&ause"
),
"player_pause"
,
0
,
this
,
SLOT
(
pause
File
()),
actionCollection
(),
"pauseFil
e"
);
stopAction
=
new
KAction
(
i18n
(
"&Stop"
),
"player_stop"
,
0
,
this
,
SLOT
(
stop
File
()),
actionCollection
(),
"stopFile
"
);
backAction
=
new
KAction
(
i18n
(
"Skip &Back"
),
"player_start"
,
0
,
this
,
SLOT
(
back
File
()),
actionCollection
(),
"backFile
"
);
forwardAction
=
new
KAction
(
i18n
(
"Skip &Forward"
),
"player_end"
,
0
,
this
,
SLOT
(
forward
File
()),
actionCollection
(),
"forwardFile
"
);
playAction
=
new
KAction
(
i18n
(
"&Play"
),
"player_play"
,
0
,
this
,
SLOT
(
play
()),
actionCollection
(),
"play
"
);
pauseAction
=
new
KAction
(
i18n
(
"P&ause"
),
"player_pause"
,
0
,
this
,
SLOT
(
pause
()),
actionCollection
(),
"paus
e"
);
stopAction
=
new
KAction
(
i18n
(
"&Stop"
),
"player_stop"
,
0
,
this
,
SLOT
(
stop
()),
actionCollection
(),
"stop
"
);
backAction
=
new
KAction
(
i18n
(
"Skip &Back"
),
"player_start"
,
0
,
this
,
SLOT
(
back
()),
actionCollection
(),
"back
"
);
forwardAction
=
new
KAction
(
i18n
(
"Skip &Forward"
),
"player_end"
,
0
,
this
,
SLOT
(
forward
()),
actionCollection
(),
"forward
"
);
// tagger menu
new
KAction
(
i18n
(
"Save"
),
"filesave"
,
"CTRL+t"
,
splitter
,
SLOT
(
saveItem
()),
actionCollection
(),
"saveItem"
);
...
...
@@ -162,11 +162,11 @@ void JuK::setupSystemTray()
systemTray
=
new
SystemTray
(
this
,
"systemTray"
);
systemTray
->
show
();
connect
(
systemTray
,
SIGNAL
(
play
()),
this
,
SLOT
(
play
File
()));
connect
(
systemTray
,
SIGNAL
(
stop
()),
this
,
SLOT
(
stop
File
()));
connect
(
systemTray
,
SIGNAL
(
pause
()),
this
,
SLOT
(
pause
File
()));
connect
(
systemTray
,
SIGNAL
(
back
()),
this
,
SLOT
(
back
File
()));
connect
(
systemTray
,
SIGNAL
(
forward
()),
this
,
SLOT
(
forward
File
()));
connect
(
systemTray
,
SIGNAL
(
play
()),
this
,
SLOT
(
play
()));
connect
(
systemTray
,
SIGNAL
(
stop
()),
this
,
SLOT
(
stop
()));
connect
(
systemTray
,
SIGNAL
(
pause
()),
this
,
SLOT
(
pause
()));
connect
(
systemTray
,
SIGNAL
(
back
()),
this
,
SLOT
(
back
()));
connect
(
systemTray
,
SIGNAL
(
forward
()),
this
,
SLOT
(
forward
()));
if
(
player
&&
player
->
paused
())
systemTray
->
slotPause
();
...
...
@@ -297,7 +297,7 @@ void JuK::saveConfig()
bool
JuK
::
queryClose
()
{
stop
File
();
stop
();
delete
(
player
);
Cache
::
instance
()
->
save
();
saveConfig
();
...
...
@@ -336,7 +336,7 @@ void JuK::updatePlaylistInfo()
// player menu
////////////////////////////////////////////////////////////////////////////////
void
JuK
::
play
File
()
void
JuK
::
play
()
{
if
(
!
player
)
return
;
...
...
@@ -358,10 +358,10 @@ void JuK::playFile()
else
if
(
player
->
playing
())
player
->
seekPosition
(
0
);
else
play
File
(
splitter
->
playNextFile
(
randomPlayAction
->
isChecked
()));
play
(
splitter
->
playNextFile
(
randomPlayAction
->
isChecked
()));
}
void
JuK
::
pause
File
()
void
JuK
::
pause
()
{
if
(
!
player
)
return
;
...
...
@@ -373,7 +373,7 @@ void JuK::pauseFile()
systemTray
->
slotPause
();
}
void
JuK
::
stop
File
()
void
JuK
::
stop
()
{
if
(
!
player
)
return
;
...
...
@@ -397,14 +397,14 @@ void JuK::stopFile()
systemTray
->
slotStop
();
}
void
JuK
::
back
File
()
void
JuK
::
back
()
{
play
File
(
splitter
->
playPreviousFile
(
randomPlayAction
->
isChecked
()));
play
(
splitter
->
playPreviousFile
(
randomPlayAction
->
isChecked
()));
}
void
JuK
::
forward
File
()
void
JuK
::
forward
()
{
play
File
(
splitter
->
playNextFile
(
randomPlayAction
->
isChecked
()));
play
(
splitter
->
playNextFile
(
randomPlayAction
->
isChecked
()));
}
////////////////////////////////////////////////////////////////////////////////
...
...
@@ -429,7 +429,7 @@ void JuK::toggleSystemTray(bool enabled)
void
JuK
::
setOutput
(
int
output
)
{
stop
File
();
stop
();
delete
(
player
);
player
=
Player
::
createPlayer
(
output
);
}
...
...
@@ -477,7 +477,7 @@ void JuK::pollPlay()
playTimer
->
stop
();
if
(
!
player
->
paused
())
play
File
(
splitter
->
playNextFile
(
randomPlayAction
->
isChecked
()));
play
(
splitter
->
playNextFile
(
randomPlayAction
->
isChecked
()));
}
else
if
(
!
trackPositionDragging
)
{
...
...
@@ -507,7 +507,7 @@ void JuK::setVolume(int volume)
}
}
void
JuK
::
play
File
(
const
QString
&
file
)
void
JuK
::
play
(
const
QString
&
file
)
{
if
(
!
player
)
return
;
...
...
@@ -538,7 +538,7 @@ void JuK::playFile(const QString &file)
systemTray
->
slotPlay
();
}
else
stop
File
();
stop
();
}
#include "juk.moc"
juk.h
View file @
b931274a
...
...
@@ -73,11 +73,11 @@ private slots:
void
cut
()
{
splitter
->
copy
();
splitter
->
clear
();
}
// player menu
void
play
File
();
void
pause
File
();
void
stop
File
();
void
back
File
();
void
forward
File
();
void
play
();
void
pause
();
void
stop
();
void
back
();
void
forward
();
// settings menu
void
showGenreListEditor
();
...
...
@@ -105,10 +105,10 @@ private slots:
* This is the main method to play stuff. Everything else is just a wrapper
* around this.
*/
void
play
File
(
const
QString
&
file
);
void
play
(
const
QString
&
file
);
void
playSelectedFile
()
{
play
File
(
splitter
->
playSelectedFile
());
}
void
playFirstFile
()
{
play
File
(
splitter
->
playFirstFile
());
}
void
playSelectedFile
()
{
play
(
splitter
->
playSelectedFile
());
}
void
playFirstFile
()
{
play
(
splitter
->
playFirstFile
());
}
private:
// layout objects
...
...
jukui.rc
View file @
b931274a
...
...
@@ -33,11 +33,11 @@
<Separator/>
<Action
name=
"play
File
"
/>
<Action
name=
"pause
File
"
/>
<Action
name=
"stop
File
"
/>
<Action
name=
"back
File
"
/>
<Action
name=
"forward
File
"
/>
<Action
name=
"play"
/>
<Action
name=
"pause"
/>
<Action
name=
"stop"
/>
<Action
name=
"back"
/>
<Action
name=
"forward"
/>
</Menu>
<Menu
name=
"playlist"
><text>
Tagger
</text>
<Action
name=
"saveItem"
/>
...
...
@@ -68,13 +68,13 @@
</ToolBar>
<ToolBar
name=
"playToolBar"
noMerge=
"1"
><text>
Play Toolbar
</text>
<Action
name=
"play
File
"
/>
<Action
name=
"pause
File
"
/>
<Action
name=
"stop
File
"
/>
<Action
name=
"play"
/>
<Action
name=
"pause"
/>
<Action
name=
"stop"
/>
<Separator
lineSeparator=
"false"
/>
<Action
name=
"back
File
"
/>
<Action
name=
"forward
File
"
/>
<Action
name=
"back"
/>
<Action
name=
"forward"
/>
<Action
name=
"trackPositionAction"
/>
</kpartgui>
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment