[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: branches/work/kdelirc
From: Frank Scheffold <fscheffold () googlemail ! com>
Date: 2010-02-28 20:26:55
Message-ID: 1267388815.557297.29104.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 1097251 by frasche:
tooltips for profiles
M +7 -0 kcmremotecontrol/model.cpp
M +27 -6 profiles/amarok.profile.xml
M +5 -3 profiles/dragonplayer.profile.xml
M +6 -0 profiles/klauncher.profile.xml
M +0 -1 profiles/okular.profile.xml
M +6 -6 profiles/powermanagement.profile.xml
M +3 -8 profiles/vlc.profile.xml
--- branches/work/kdelirc/kcmremotecontrol/model.cpp #1097250:1097251
@@ -487,6 +487,13 @@
setHorizontalHeaderLabels(QStringList() << i18n("Profile Name"));
foreach(Profile *profile, ProfileServer::allProfiles()){
QStandardItem *item = new QStandardItem(profile->name());
+ QString tooltip;
+ if(!profile->description().isEmpty()){
+ tooltip.append(profile->description()).append("\n");
+ }
+ tooltip.append(i18nc("Profile author", "Author")).append(": ");
+ tooltip.append(profile->author()).append(" (").append(i18nc( "Profile \
Version", "Version")).append(": ").append(profile->version()).append(")"); \
+ item->setToolTip(tooltip);
item->setData(qVariantFromValue(profile), Qt::UserRole);
appendRow(item);
}
--- branches/work/kdelirc/profiles/amarok.profile.xml #1097250:1097251
@@ -19,7 +19,7 @@
</action>
<action id="stop" button="Stop">
- <name>Start playing</name>
+ <name>Stop playing</name>
<prototype>
<serviceName>org.mpris.amarok</serviceName>
<node>Player</node>
@@ -27,12 +27,22 @@
</prototype>
</action>
+
<action id="pause" button="Pause" repeat="true">
- <name>Pause playing</name>
+ <name>Pause playing</name>
+ <prototype>
+ <serviceName>org.mpris.amarok</serviceName>
+ <node>Player</node>
+ <function>Pause</function>
+ </prototype>
+ </action>
+
+ <action id="playpause" button="PlayPause" repeat="true">
+ <name>Play Pause</name>
<prototype>
<serviceName>org.mpris.amarok</serviceName>
- <node>Pause</node>
- <function>Pause</function>
+ <node>Player</node>
+ <function>PlayPause</function>
</prototype>
</action>
@@ -70,11 +80,11 @@
</action>
<action id="rewind" button="Rewind" repeat="true">
- <name>Rewind</name>
+ <name>Backward</name>
<prototype>
<serviceName>org.mpris.amarok</serviceName>
<node>Player</node>
- <function>Rewind</function>
+ <function>Backward</function>
<arguments>
<argument type="int">
<comment>Amount to rewind in ms</comment>
@@ -83,4 +93,15 @@
</arguments>
</prototype>
</action>
+
+ <action id="fullscreen">
+ <name></name>
+ <prototype>
+ <serviceName>org.mpris.amarok</serviceName>
+ <node>amarok/MainWindow</node>
+ <function>slotFullScreen</function>
+ </prototype>
+ <ifmulti>sendtotop</ifmulti>
+ </action>
+
</profile>
\ No newline at end of file
--- branches/work/kdelirc/profiles/dragonplayer.profile.xml #1097250:1097251
@@ -28,7 +28,7 @@
<ifmulti>sendtotop</ifmulti>
</action>
- <action id="pause" button="Pause">
+ <action id="pause" button="PlayPause">
<name>Pause playing</name>
<prototype>
<serviceName>org.mpris.dragonplayer</serviceName>
@@ -38,7 +38,8 @@
<ifmulti>sendtotop</ifmulti>
</action>
-
+ <!-- The actions currently have no effekt in dragon player 2.0
+
<action id="skipForward" button="SkipForward" repeat="true">
<name>Advance to next track</name>
<prototype>
@@ -57,5 +58,6 @@
<function>Prev</function>
</prototype>
<ifmulti>sendtotop</ifmulti>
- </action>
+ </action>
+ -->
</profile>
--- branches/work/kdelirc/profiles/klauncher.profile.xml #1097250:1097251
@@ -45,6 +45,12 @@
<argument type="QStringList">
<comment>Parameters for the program or script</comment>
</argument>
+ <argument type="QStringList">
+ <comment>Environment variables</comment>
+ </argument>
+ <argument type="QString">
+ <comment>Startup ID</comment>
+ </argument>
</arguments>
</prototype>
</action>
--- branches/work/kdelirc/profiles/okular.profile.xml #1097250:1097251
@@ -3,7 +3,6 @@
<profile xmlns="urn:org-kde-kremotecontrol" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" \
xsi:schemaLocation="urn:org-kde-kremotecontrol file:profile.xsd">
-<!--<profile id="okular" servicename="org.kde.okular">-->
<name>Okular</name>
<version>0.1</version>
<author>Pino Toscano</author>
--- branches/work/kdelirc/profiles/powermanagement.profile.xml #1097250:1097251
@@ -11,7 +11,7 @@
<prototype>
<serviceName>org.kde.klauncher</serviceName>
<node>KLauncher</node>
- <function>void kdeinit_exec(QString, QStringList, QStringList, \
QString)</function> + <function>kdeinit_exec</function>
<arguments>
<argument type="QString">
<comment>System command to use for suspend</comment>
@@ -19,7 +19,7 @@
</argument>
<argument type="QStringList">
<comment>Parameters for the suspend commands</comment>
- <default>suspend,to_ram</default>
+ <default>suspend, to_ram</default>
</argument>
<argument type="QStringList">
<comment>Environment variables</comment>
@@ -37,7 +37,7 @@
<prototype>
<serviceName>org.kde.klauncher</serviceName>
<node>KLauncher</node>
- <function>void kdeinit_exec_wait(QString, QStringList, QStringList, \
QString)</function> + <function>kdeinit_exec</function>
<arguments>
<argument type="QString">
<comment>System command to use for suspend</comment>
@@ -45,7 +45,7 @@
</argument>
<argument type="QStringList">
<comment>Parameters for the suspend commands</comment>
- <default>suspend,to_disk</default>
+ <default>suspend, to_disk</default>
</argument>
<argument type="QStringList">
<comment>Environment variables</comment>
@@ -58,12 +58,12 @@
</action>
<action id="logout">
- <name>logout</name>
+ <name>Logout</name>
<description>Logout and shutdown or reboot your computer</description>
<prototype>
<serviceName>org.kde.ksmserver</serviceName>
<node>KSMServer</node>
- <function>void logout(int, int, int)</function>
+ <function>logout</function>
<arguments>
<argument type="int">
<comment>Ask for confirmation? 1 = No, 2 = Yes</comment>
--- branches/work/kdelirc/profiles/vlc.profile.xml #1097250:1097251
@@ -6,7 +6,7 @@
<name>VLC videolan player</name>
<version>0.1</version>
<author>Gioacchino Mazzurco [gmazzurco89@gmail.com]</author>
-
+ <description>This profile works only if vlc is configured for single instance \
running</description> <!-- Playback actions -->
<action id="play" button="Play">
<name>Start playing</name>
@@ -14,8 +14,7 @@
<serviceName>org.mpris.vlc</serviceName>
<node>Player</node>
<function>Play</function>
- </prototype>
- <ifmulti>sendtotop</ifmulti>
+ </prototype>
</action>
<action id="stop" button="Stop">
@@ -24,8 +23,7 @@
<serviceName>org.mpris.vlc</serviceName>
<node>Player</node>
<function>Stop</function>
- </prototype>
- <ifmulti>sendtotop</ifmulti>
+ </prototype>
</action>
<action id="pause" button="Pause">
@@ -35,7 +33,6 @@
<node>Player</node>
<function>Pause</function>
</prototype>
- <ifmulti>sendtotop</ifmulti>
</action>
<action id="skipForward" button="SkipForward" repeat="true">
@@ -45,7 +42,6 @@
<node>Player</node>
<function>Next</function>
</prototype>
- <ifmulti>sendtotop</ifmulti>
</action>
<action id="skipBackward" button="SkipBackward" repeat="true">
@@ -55,6 +51,5 @@
<node>Player</node>
<function>Prev</function>
</prototype>
- <ifmulti>sendtotop</ifmulti>
</action>
</profile>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic