[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: extragear/multimedia/kmid
From: Pedro Lopez-Cabanillas <pedro.lopez.cabanillas () gmail ! com>
Date: 2010-03-03 17:41:49
Message-ID: 1267638109.575050.8832.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 1098417 by pedrol:
renaming kmid2->kmid
M +1 -1 Messages.sh
M +1 -1 alsa/CMakeLists.txt
M +1 -1 examples/CMakeLists.txt
A kmid.spec kmid2.spec#1098391
D kmid2.spec
M +1 -1 maps/CMakeLists.txt
M +12 -12 src/CMakeLists.txt
A src/kmid.desktop src/kmid2.desktop#1098391
A src/kmid.kcfg src/kmid2.kcfg#1098391
M +5 -5 src/kmid2.cpp
D src/kmid2.desktop
D src/kmid2.kcfg
M +1 -1 src/kmid2ui.rc
M +1 -1 src/main.cpp
--- trunk/extragear/multimedia/kmid/Messages.sh #1098416:1098417
@@ -1,4 +1,4 @@
#!bin/sh
$EXTRACTRC `find . -name \*.rc -o -name \*.ui -o -name \*.kcfg` >> rc.cpp
-$XGETTEXT `find . -name \*.cpp -o -name \*.h` -o $podir/kmid2.pot
+$XGETTEXT `find . -name \*.cpp -o -name \*.h` -o $podir/kmid.pot
rm -f rc.cpp
--- trunk/extragear/multimedia/kmid/alsa/CMakeLists.txt #1098416:1098417
@@ -1,4 +1,4 @@
-message (STATUS "building the ALSA backend for KMid2")
+message (STATUS "building the ALSA backend for KMid")
include_directories(
../src
--- trunk/extragear/multimedia/kmid/examples/CMakeLists.txt #1098416:1098417
@@ -1,3 +1,3 @@
file(GLOB MIDI_FILES *.mid)
install( FILES ${MIDI_FILES}
- DESTINATION ${DATA_INSTALL_DIR}/kmid2 )
+ DESTINATION ${DATA_INSTALL_DIR}/kmid )
--- trunk/extragear/multimedia/kmid/maps/CMakeLists.txt #1098416:1098417
@@ -3,4 +3,4 @@
YamahaPSS790.map
YamahaPSR500.map
YamahaQY10.map
- DESTINATION ${DATA_INSTALL_DIR}/kmid2 )
+ DESTINATION ${DATA_INSTALL_DIR}/kmid )
--- trunk/extragear/multimedia/kmid/src/CMakeLists.txt #1098416:1098417
@@ -4,7 +4,7 @@
configure_file(config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)
-set(kmid2_SRCS
+set(kmid_SRCS
main.cpp
kmid2.cpp
backend.cpp
@@ -26,25 +26,25 @@
../widgets/vumeter.cpp
)
-kde4_add_ui_files( kmid2_SRCS prefs_midi.ui prefs_lyrics.ui prefs_progs.ui)
-kde4_add_kcfg_files( kmid2_SRCS settings.kcfgc )
-qt4_add_resources( kmid2_SRCS ../widgets/pianokeybd.qrc )
-kde4_add_executable( kmid2 ${kmid2_SRCS} )
-target_link_libraries( kmid2
+kde4_add_ui_files( kmid_SRCS prefs_midi.ui prefs_lyrics.ui prefs_progs.ui)
+kde4_add_kcfg_files( kmid_SRCS settings.kcfgc )
+qt4_add_resources( kmid_SRCS ../widgets/pianokeybd.qrc )
+kde4_add_executable( kmid ${kmid_SRCS} )
+target_link_libraries( kmid
${KDE4_KDEUI_LIBS}
${KDE4_KIO_LIBS}
${KDE4_KFILE_LIBS}
)
if (USE_PCH)
- set_target_properties( kmid2 PROPERTIES COMPILE_FLAGS -fPIC)
- add_dependencies(kmid2 precompiled_headers)
+ set_target_properties( kmid PROPERTIES COMPILE_FLAGS -fPIC)
+ add_dependencies(kmid precompiled_headers)
endif (USE_PCH)
########### install files ###############
-install( TARGETS kmid2 ${INSTALL_TARGETS_DEFAULT_ARGS} )
-install( FILES kmid2.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
-install( FILES kmid2ui.rc DESTINATION ${DATA_INSTALL_DIR}/kmid2 )
+install( TARGETS kmid ${INSTALL_TARGETS_DEFAULT_ARGS} )
+install( FILES kmid.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
+install( FILES kmid2ui.rc DESTINATION ${DATA_INSTALL_DIR}/kmid )
install( FILES kmid_backend.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
-install( FILES kmid2.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
+install( FILES kmid.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
--- trunk/extragear/multimedia/kmid/src/kmid2.cpp #1098416:1098417
@@ -95,7 +95,7 @@
if ( m_backend->initialized() ) {
m_midiobj = m_backend->midiObject();
m_midiout = m_backend->midiOutput();
- m_midiout->setName("kmid2");
+ m_midiout->setName("kmid");
m_midiout->setMidiMap(&m_mapper);
connect(m_midiobj, SIGNAL(stateChanged(State,State)),
SLOT(slotUpdateState(State,State)));
@@ -1014,9 +1014,9 @@
" system. You can specify a software synthesizer, such as"
" TiMidity++ or FluidSynth, to be launched automatically"
" when KMid2 starts. This option is located in the dialog"
- " Settings->Configure kmid2, Programs category."
+ " Settings->Configure kmid, Programs category."
" You can find more information in the <link url="
- "'help:/kmid2/general-usage.html#using-midi'>online help"
+ "'help:/kmid/general-usage.html#using-midi'>online help"
" documents</link>."),
i18nc("@title:window", "MIDI Player connection"),
KMessageBox::Notify | KMessageBox::AllowLink);
@@ -1031,9 +1031,9 @@
" software synthesizer like Timidity++ or FluidSynth, or an"
" external MIDI device, or a hardware synthesizer provided by"
" your sound card. This setting can be changed later, using"
- " the Settings->Configure kmid2->MIDI dialog."
+ " the Settings->Configure kmid->MIDI dialog."
" You can find more information in the <link url="
- "'help:/kmid2/general-usage.html#using-midi'>online help"
+ "'help:/kmid/general-usage.html#using-midi'>online help"
" documents</link><nl/>"
"Please select one MIDI port now:"),
items, -1, false, &ok, this);
--- trunk/extragear/multimedia/kmid/src/kmid2ui.rc #1098416:1098417
@@ -1,5 +1,5 @@
<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="kmid2" version="1">
+<kpartgui name="kmid" version="1">
<MenuBar>
<Menu name="file">
<Action name="file_info"/>
--- trunk/extragear/multimedia/kmid/src/main.cpp #1098416:1098417
@@ -32,7 +32,7 @@
int main(int argc, char **argv)
{
- KAboutData about( "kmid2", 0, ki18n("kmid2"), version, ki18n(description),
+ KAboutData about( "kmid", 0, ki18n("kmid"), version, ki18n(description),
KAboutData::License_GPL );
about.addAuthor( ki18n("Pedro Lopez-Cabanillas"), ki18n("Maintainer"),
"plcl@users.sf.net" );
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic