[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdemultimedia/noatun
From:       Laurent Montel <montel () kde ! org>
Date:       2007-01-06 18:09:40
Message-ID: 1168106980.732506.30363.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 620597 by mlaurent:

Start to fix compile noatun with cmake
I will fix other pb today


 M  +8 -8      app/CMakeLists.txt  
 M  +33 -2     library/CMakeLists.txt  
 M  +5 -0      library/equalizerwidget.ui  
 AM            library/noatun/CMakeLists.txt  
 M  +2 -2      library/noatuntags/tags.cpp  
 M  +11 -4     library/stdaction.cpp  
 M  +16 -6     library/stereobuttonaction.cpp  


--- trunk/KDE/kdemultimedia/noatun/app/CMakeLists.txt #620596:620597
@@ -1,24 +1,24 @@
 
 ########### next target ###############
 
-set(noatun_KDEINIT_SRCS 
+set(noatun_bin_KDEINIT_SRCS 
    main.cpp 
    app.cpp 
    generalprefs.cpp 
    pluginmodule.cpp )
 
-kde4_automoc(${noatun_KDEINIT_SRCS})
+kde4_automoc(${noatun_bin_KDEINIT_SRCS})
 
-kde4_add_ui3_files(noatun_KDEINIT_SRCS generalprefswidget.ui pluginmodulewidget.ui )
+kde4_add_ui3_files(noatun_bin_KDEINIT_SRCS generalprefswidget.ui \
pluginmodulewidget.ui )  
-kde4_add_kdeinit_executable( noatun ${noatun_KDEINIT_SRCS})
+kde4_add_kdeinit_executable( noatun_bin ${noatun_bin_KDEINIT_SRCS})
 
-target_link_libraries(kdeinit_noatun  ${KDE4_KDECORE_LIBS} noatun )
+target_link_libraries(kdeinit_noatun_bin  ${KDE4_KDECORE_LIBS} noatun )
 
-install(TARGETS kdeinit_noatun DESTINATION ${LIB_INSTALL_DIR} )
+install(TARGETS kdeinit_noatun_bin DESTINATION ${LIB_INSTALL_DIR} )
 
-target_link_libraries( noatun kdeinit_noatun )
-install(TARGETS noatun DESTINATION ${BIN_INSTALL_DIR})
+target_link_libraries( noatun_bin kdeinit_noatun_bin )
+install(TARGETS noatun_bin DESTINATION ${BIN_INSTALL_DIR})
 
 ########### install files ###############
 
--- trunk/KDE/kdemultimedia/noatun/library/CMakeLists.txt #620596:620597
@@ -26,14 +26,45 @@
         preferencesdialog.cpp 
         scrollinglabel.cpp 
         stdaction.cpp 
-        stereobuttonaction.cpp 
+	stereobuttonaction.cpp 
         config.cpp)
 
+set(header_file_to_automoc
+	noatun/cmodule.h
+	noatun/config.h
+	noatun/controls.h
+	noatun/downloader.h
+	noatun/effects.h
+	noatun/engine.h
+	noatun/equalizer.h
+	noatun/frontend.h
+	noatun/global.h
+	noatun/nmainwindow.h
+	noatun/player.h
+	noatun/playlist.h
+	noatun/playlistitem.h
+	noatun/playlistsaver.h
+	noatun/plugin.h
+	noatun/plugininterfaces.h
+	noatun/pluginloader.h
+	noatun/scrollinglabel.h
+	noatun/stdaction.h
+	noatun/stereobuttonaction.h
+	noatun/video.h
+	noatun/visualization.h
+	)
 
-kde4_automoc(${noatun_LIB_SRCS})
+foreach(_headerfile ${header_file_to_automoc})
+        GET_FILENAME_COMPONENT(outfile ${_headerfile} NAME_WE)
+	qt4_generate_moc(${_headerfile} ${CMAKE_CURRENT_BINARY_DIR}/${outfile}.moc)
+	set_source_files_properties(${CMAKE_SOURCE_DIR}/noatun/library/${outfile}.cpp \
PROPERTIES SKIP_AUTOMOC TRUE) \
+	macro_add_file_dependencies(${CMAKE_SOURCE_DIR}/noatun/library/${outfile}.cpp \
${CMAKE_CURRENT_BINARY_DIR}/${outfile}.moc) +endforeach(_headerfile ${headerfile})
 
 kde4_add_ui3_files(noatun_LIB_SRCS equalizerwidget.ui )
 
+kde4_automoc(${noatun_LIB_SRCS})
+
 kde4_add_library(noatun SHARED ${noatun_LIB_SRCS})
 
 target_link_libraries(noatun  ${KDE4_KIO_LIBS} )
--- trunk/KDE/kdemultimedia/noatun/library/equalizerwidget.ui #620596:620597
@@ -321,6 +321,11 @@
     </grid>
 </widget>
 <customwidgets>
+    <customwidget>
+        <class>KIntSpinBox</class>
+        <header location="global">knuminput.h</header>
+        <container>0</container>
+    </customwidget>
 </customwidgets>
 <tabstops>
     <tabstop>enabledCheckBox</tabstop>
** trunk/KDE/kdemultimedia/noatun/library/noatun/CMakeLists.txt #property \
svn:eol-style  + native
--- trunk/KDE/kdemultimedia/noatun/library/noatuntags/tags.cpp #620596:620597
@@ -30,13 +30,13 @@
 int TagsGetter::interval() const
 {
 	KGlobal::config()->setGroup("Tags");
-	return KGlobal::config()->readNumEntry("interval", 250);
+	return KGlobal::config()->readEntry("interval", 250);
 }
 
 bool TagsGetter::loadAuto() const
 {
 	KGlobal::config()->setGroup("Tags");
-	return KGlobal::config()->readBoolEntry("LoadAuto", true);
+	return KGlobal::config()->readEntry("LoadAuto", true);
 }
 
 void TagsGetter::added(PlaylistItem &i)
--- trunk/KDE/kdemultimedia/noatun/library/stdaction.cpp #620596:620597
@@ -13,7 +13,7 @@
 #include <qcursor.h>
 #include <qmap.h>
 #include <kdebug.h>
-#include <kstdguiitem.h>
+#include <kstandardguiitem.h>
 #include <kxmlguiclient.h>
 #include <kxmlguifactory.h>
 
@@ -235,14 +235,18 @@
 
 KAction *equalizer(Global */*glob*/, QObject *parent, const char *name)
 {
-	KAction *a = new KAction(i18n("E&qualizer..."), "noatun_equalizer", PPparent, \
name); +	KAction *a = new KAction(i18n("E&qualizer..."), PPparent, name);
+	a->setIcon( KIcon( "noatun_equalizer" ) );
 	a->setEnabled(false);
 	return a;
 }
 
 KAction *back(Global *glob, QObject *parent, const char *name)
 {
-	return new KAction(i18n("&Back"), "player_start", 0, glob->player(), \
SLOT(previous()), PPparent, name); +	KAction *a = new KAction(i18n("&Back"), \
PPparent, name); +	a->setIcon( KIcon( "player_start" ) );
+	QObject::connect( a, SIGNAL( triggered() ), glob->player(), SLOT( previous() ) );
+	return a;
 }
 
 KAction *stop(Global *glob, QObject *parent, const char *name)
@@ -261,7 +265,10 @@
 
 KAction *forward(Global *glob, QObject *parent, const char *name)
 {
-	return new KAction(i18n("&Forward"), "player_end", 0, glob->player(), SLOT(next()), \
PPparent, name); +        KAction *a = new KAction(i18n("&Forward"), PPparent, name);
+        a->setIcon( KIcon( "player_end" ) );
+        QObject::connect( a, SIGNAL( triggered() ), glob->player(), SLOT( next() ) \
); +	return a;	
 }
 
 KAction *playpause(Global *glob, KActionCollection *parent, const char *name)
--- trunk/KDE/kdemultimedia/noatun/library/stereobuttonaction.cpp #620596:620597
@@ -13,8 +13,11 @@
 {}
 
 StereoButtonAction::StereoButtonAction(const QString& text, int accel, const \
                QObject* receiver, const char* slot, QObject* parent, const char* \
                name )
-	: KAction(text, KShortcut(accel), receiver, slot, PPparent, name)
-{}
+	:KAction(text, PPparent, name)
+{
+	setShortcut( KShortcut(accel) );
+	connect( this, SIGNAL( triggered() ), receiver, SLOT( slot ) );
+}
 #if 0
 StereoButtonAction::StereoButtonAction(const QString& text, const QIconSet& pix, int \
accel, QObject* parent, const char* name )  : KAction(text, /*pix, \
*/KShortcut(accel), PPparent, name) @@ -26,12 +29,19 @@
 #endif
 
 StereoButtonAction::StereoButtonAction(const QString& text, const QIconSet& pix, int \
                accel, const QObject* receiver, const char* slot, QObject* parent, \
                const char* name )
-	: KAction(text, /*pix, */accel, receiver, slot, PPparent, name)
-{}
+	:KAction(text, PPparent, name)
+{
+        setShortcut( KShortcut(accel) );
+	connect( this, SIGNAL( triggered() ), receiver, SLOT( slot ) );
+}
 
 StereoButtonAction::StereoButtonAction(const QString& text, const QString& pix, int \
                accel, const QObject* receiver, const char* slot, QObject* parent, \
                const char* name )
-	: KAction(text, pix, accel, receiver, slot, PPparent, name)
-{}
+        :KAction(text, PPparent, name)
+{
+	setIcon(KIcon(pix));
+        setShortcut( KShortcut(accel) );
+	connect( this, SIGNAL( triggered() ), receiver, SLOT( slot ) );
+}
 
 void StereoButtonAction::disable()
 {


[prev in list] [next in list] [prev in thread] [next in thread]