You can subscribe to this list here.
2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(11) |
Dec
(10) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2008 |
Jan
(49) |
Feb
(39) |
Mar
(100) |
Apr
(147) |
May
(191) |
Jun
(72) |
Jul
(113) |
Aug
(69) |
Sep
(80) |
Oct
(60) |
Nov
(115) |
Dec
(100) |
2009 |
Jan
(29) |
Feb
(10) |
Mar
(9) |
Apr
(31) |
May
(83) |
Jun
(35) |
Jul
(13) |
Aug
(24) |
Sep
(25) |
Oct
(25) |
Nov
(48) |
Dec
(39) |
2010 |
Jan
(46) |
Feb
(7) |
Mar
(18) |
Apr
(6) |
May
(3) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: <ks...@us...> - 2010-05-29 02:54:31
|
Revision: 2091 http://nghost.svn.sourceforge.net/nghost/?rev=2091&view=rev Author: kshots Date: 2010-05-29 02:54:24 +0000 (Sat, 29 May 2010) Log Message: ----------- * Modified nscan to have a proper application name, organization name, and organization domain (for proper QSettings uniqueness) Modified Paths: -------------- nghost2/branches/nghost2-qt/src/nscan/main.cpp Modified: nghost2/branches/nghost2-qt/src/nscan/main.cpp =================================================================== --- nghost2/branches/nghost2-qt/src/nscan/main.cpp 2010-05-12 15:18:17 UTC (rev 2090) +++ nghost2/branches/nghost2-qt/src/nscan/main.cpp 2010-05-29 02:54:24 UTC (rev 2091) @@ -30,6 +30,11 @@ int main(int argc, char ** argv) { + // The following three lines set things up for QSettings to work + // properly for this application + QCoreApplication::setOrganizationName("openice"); + QCoreApplication::setOrganizationDomain("openice.org"); + QCoreApplication::setApplicationName("nscan"); bool daemon = true; struct passwd * pw = NULL; struct group * gr = NULL; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ks...@us...> - 2010-05-12 15:18:24
|
Revision: 2090 http://nghost.svn.sourceforge.net/nghost/?rev=2090&view=rev Author: kshots Date: 2010-05-12 15:18:17 +0000 (Wed, 12 May 2010) Log Message: ----------- * Moved nghost dbus system configuration file up to the shared dbus dir, as it's no longer nscan-specific * Added the missing 'datadir' string to CMakeLists.txt so things might actually install where they're supposed to Modified Paths: -------------- nghost2/branches/nghost2-qt/CMakeLists.txt nghost2/branches/nghost2-qt/src/CMakeLists.txt nghost2/branches/nghost2-qt/src/nscan/CMakeLists.txt Added Paths: ----------- nghost2/branches/nghost2-qt/src/dbus/CMakeLists.txt nghost2/branches/nghost2-qt/src/dbus/nghost.dbus.conf Removed Paths: ------------- nghost2/branches/nghost2-qt/src/nscan/nghost.dbus.conf Modified: nghost2/branches/nghost2-qt/CMakeLists.txt =================================================================== --- nghost2/branches/nghost2-qt/CMakeLists.txt 2010-05-07 18:33:17 UTC (rev 2089) +++ nghost2/branches/nghost2-qt/CMakeLists.txt 2010-05-12 15:18:17 UTC (rev 2090) @@ -10,13 +10,14 @@ option(enable_maintainer "Enables the maintainer CFLAGS (-Wall -Werror)" OFF) -set(sysconfdir /etc CACHE STRING "Sets the installation dir for system +set(sysconfdir /etc CACHE PATH "Sets the installation dir for system configuration files") -set(xprefix ${CMAKE_INSTALL_PREFIX} CACHE STRING "Sets the X installation dir") +set(xprefix ${CMAKE_INSTALL_PREFIX} CACHE PATH "Sets the X installation dir") set(pidfile /var/run/nscan CACHE STRING "Sets the compiled-in default pid file for nscan") -set(dbusconfdir /etc/dbus-1/system.d CACHE STRING "Sets the location that +set(dbusconfdir /etc/dbus-1/system.d CACHE PATH "Sets the location that system dbus configuration files should be installed in") +set(datadir share/nghost CACHE PATH "Sets the data dir for nghost") set(VERSION 2.5.3) execute_process( COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=plugindir nghostplugin Modified: nghost2/branches/nghost2-qt/src/CMakeLists.txt =================================================================== --- nghost2/branches/nghost2-qt/src/CMakeLists.txt 2010-05-07 18:33:17 UTC (rev 2089) +++ nghost2/branches/nghost2-qt/src/CMakeLists.txt 2010-05-12 15:18:17 UTC (rev 2090) @@ -3,3 +3,4 @@ add_subdirectory(icons) add_subdirectory(desktop) add_subdirectory(skins) +add_subdirectory(dbus) Added: nghost2/branches/nghost2-qt/src/dbus/CMakeLists.txt =================================================================== --- nghost2/branches/nghost2-qt/src/dbus/CMakeLists.txt (rev 0) +++ nghost2/branches/nghost2-qt/src/dbus/CMakeLists.txt 2010-05-12 15:18:17 UTC (rev 2090) @@ -0,0 +1 @@ +install(FILES nghost.dbus.conf DESTINATION ${dbusconfdir}) Copied: nghost2/branches/nghost2-qt/src/dbus/nghost.dbus.conf (from rev 2089, nghost2/branches/nghost2-qt/src/nscan/nghost.dbus.conf) =================================================================== --- nghost2/branches/nghost2-qt/src/dbus/nghost.dbus.conf (rev 0) +++ nghost2/branches/nghost2-qt/src/dbus/nghost.dbus.conf 2010-05-12 15:18:17 UTC (rev 2090) @@ -0,0 +1,14 @@ +<!DOCTYPE busconfig PUBLIC + "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN" + "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> +<busconfig> + <policy context="default"> + <allow own="org.openice.nghost" /> + <allow send_destination="org.openice.nghost" /> + <allow send_destination="org.openice.nghost" + send_interface="org.openice.nghost.nscan.scan" /> + <allow send_path="/nscan" /> + </policy> + + <limit name="max_replies_per_connection">512</limit> +</busconfig> Modified: nghost2/branches/nghost2-qt/src/nscan/CMakeLists.txt =================================================================== --- nghost2/branches/nghost2-qt/src/nscan/CMakeLists.txt 2010-05-07 18:33:17 UTC (rev 2089) +++ nghost2/branches/nghost2-qt/src/nscan/CMakeLists.txt 2010-05-12 15:18:17 UTC (rev 2090) @@ -27,8 +27,6 @@ include(${QT_USE_FILE}) install(FILES nscan.conf DESTINATION ${sysconfdir}/nghost) - install(FILES nghost.dbus.conf - DESTINATION ${dbusconfdir}) add_definitions(-DPLUGIN_DIR="${plugindir}" -DVERSION="${VERSION}" -DPIDFILE="${pidfile}") include_directories(${taglib_INCLUDE_DIRS} ${SDL_INCLUDE_DIR} Deleted: nghost2/branches/nghost2-qt/src/nscan/nghost.dbus.conf =================================================================== --- nghost2/branches/nghost2-qt/src/nscan/nghost.dbus.conf 2010-05-07 18:33:17 UTC (rev 2089) +++ nghost2/branches/nghost2-qt/src/nscan/nghost.dbus.conf 2010-05-12 15:18:17 UTC (rev 2090) @@ -1,14 +0,0 @@ -<!DOCTYPE busconfig PUBLIC - "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN" - "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> -<busconfig> - <policy context="default"> - <allow own="org.openice.nghost" /> - <allow send_destination="org.openice.nghost" /> - <allow send_destination="org.openice.nghost" - send_interface="org.openice.nghost.nscan.scan" /> - <allow send_path="/nscan" /> - </policy> - - <limit name="max_replies_per_connection">512</limit> -</busconfig> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ks...@us...> - 2010-05-07 18:33:23
|
Revision: 2089 http://nghost.svn.sourceforge.net/nghost/?rev=2089&view=rev Author: kshots Date: 2010-05-07 18:33:17 +0000 (Fri, 07 May 2010) Log Message: ----------- * Moved the dbus xml stuff to a shared area for easy access for other sub-projects Modified Paths: -------------- nghost2/branches/nghost2-qt/src/nscan/CMakeLists.txt Added Paths: ----------- nghost2/branches/nghost2-qt/src/dbus/ nghost2/branches/nghost2-qt/src/dbus/nscan.dbus.xml nghost2/branches/nghost2-qt/src/dbus/nscan.scan.dbus.xml Removed Paths: ------------- nghost2/branches/nghost2-qt/src/nscan/nscan.dbus.xml nghost2/branches/nghost2-qt/src/nscan/nscan.scan.dbus.xml Copied: nghost2/branches/nghost2-qt/src/dbus/nscan.dbus.xml (from rev 2088, nghost2/branches/nghost2-qt/src/nscan/nscan.dbus.xml) =================================================================== --- nghost2/branches/nghost2-qt/src/dbus/nscan.dbus.xml (rev 0) +++ nghost2/branches/nghost2-qt/src/dbus/nscan.dbus.xml 2010-05-07 18:33:17 UTC (rev 2089) @@ -0,0 +1,47 @@ +<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" + "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd"> +<node> + <interface name="org.openice.nghost.nscan" > + <method name="CreateScan" > + <arg direction="out" type="o" name="scanobject" /> + <arg direction="in" type="s" name="tableName" /> + <arg direction="in" type="as" name="paths" /> + <arg direction="in" type="as" name="fileextensions" /> + <arg direction="in" type="s" name="daoclass" /> + </method> + + <method name="CreateWatch" > + <arg direction="out" type="o" name="scanobject" /> + <arg direction="in" type="s" name="tableName" /> + <arg direction="in" type="as" name="paths" /> + <arg direction="in" type="as" name="fileextensions" /> + <arg direction="in" type="s" name="daoclass" /> + </method> + + <method name="GetWatches"> + <arg direction="out" type="ao" /> + <arg direction="in" type="s" name="daoclass" /> + </method> + + <signal name="SimultaniousScansChanged" > + <arg direction="out" type="i" name="numscans" /> + <arg direction="out" type="ao" name="runningscans" /> + </signal> + + <signal name="watchTriggered" > + <arg direction="out" type="i" name="mask" /> + <arg direction="out" type="i" name="cookie" /> + <arg direction="out" type="s" name="name" /> + <arg direction="out" type="s" name="path" /> + </signal> + + <signal name="SourceAdded" > + <arg direction="out" type="s" name="device" /> + <arg direction="out" type="s" name="path" /> + </signal> + <signal name="SourceRemoved" > + <arg direction="out" type="s" name="device" /> + <arg direction="out" type="s" name="path" /> + </signal> + </interface> +</node> Copied: nghost2/branches/nghost2-qt/src/dbus/nscan.scan.dbus.xml (from rev 2088, nghost2/branches/nghost2-qt/src/nscan/nscan.scan.dbus.xml) =================================================================== --- nghost2/branches/nghost2-qt/src/dbus/nscan.scan.dbus.xml (rev 0) +++ nghost2/branches/nghost2-qt/src/dbus/nscan.scan.dbus.xml 2010-05-07 18:33:17 UTC (rev 2089) @@ -0,0 +1,23 @@ +<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" + "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd"> +<node> + <interface name="org.openice.nghost.nscan.scan" > + <signal name="ItemFound" > + <arg direction="out" type="s" name="filename" /> + <arg direction="out" type="s" name="path" /> + </signal> + + <signal name="ScanStarted" /> + + <signal name="ScanFinished" > + <arg direction="out" type="i" name="numitemsscanned" /> + <arg direction="out" type="i" name="timetoscan" /> + </signal> + + <signal name="Progress" > + <arg direction="out" type="i" name="progress" /> + </signal> + + <signal name="Updated" /> + </interface> +</node> Modified: nghost2/branches/nghost2-qt/src/nscan/CMakeLists.txt =================================================================== --- nghost2/branches/nghost2-qt/src/nscan/CMakeLists.txt 2010-04-30 20:05:40 UTC (rev 2088) +++ nghost2/branches/nghost2-qt/src/nscan/CMakeLists.txt 2010-05-07 18:33:17 UTC (rev 2089) @@ -5,8 +5,10 @@ find_package(Qt4 REQUIRED) include(${QT_USE_FILE}) set(nscantest_sources nscantest.cpp) - qt4_add_dbus_interface(nscantest_sources nscan.dbus.xml nscaninterface) - qt4_add_dbus_interface(nscantest_sources nscan.scan.dbus.xml + qt4_add_dbus_interface(nscantest_sources + ${CMAKE_SOURCE_DIR}/src/dbus/nscan.dbus.xml nscaninterface) + qt4_add_dbus_interface(nscantest_sources + ${CMAKE_SOURCE_DIR}/src/dbus/nscan.scan.dbus.xml nscanscaninterface) add_executable(nscantest ${nscantest_sources}) target_link_libraries(nscantest ${QT_LIBRARIES}) @@ -42,10 +44,12 @@ set(nscan_sources nscan.cpp main.cpp activescanner.cpp) set(nscan_moc_headers nscan.h activescanner.h) qt4_wrap_cpp(nscan_sources ${nscan_moc_headers}) - qt4_add_dbus_adaptor(nscan_sources nscan.dbus.xml nscan.h nscan + qt4_add_dbus_adaptor(nscan_sources + ${CMAKE_SOURCE_DIR}/src/dbus/nscan.dbus.xml nscan.h nscan nscandbus) - qt4_add_dbus_adaptor(nscan_sources nscan.scan.dbus.xml activescanner.h - activescanner nscanwatchdbus) + qt4_add_dbus_adaptor(nscan_sources + ${CMAKE_SOURCE_DIR}/src/dbus/nscan.scan.dbus.xml + activescanner.h activescanner nscanwatchdbus) add_executable(nscan ${nscan_sources}) set_target_properties(nscan PROPERTIES COMPILE_FLAGS ${taglib_CFLAGS_OTHER} Deleted: nghost2/branches/nghost2-qt/src/nscan/nscan.dbus.xml =================================================================== --- nghost2/branches/nghost2-qt/src/nscan/nscan.dbus.xml 2010-04-30 20:05:40 UTC (rev 2088) +++ nghost2/branches/nghost2-qt/src/nscan/nscan.dbus.xml 2010-05-07 18:33:17 UTC (rev 2089) @@ -1,47 +0,0 @@ -<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" - "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd"> -<node> - <interface name="org.openice.nghost.nscan" > - <method name="CreateScan" > - <arg direction="out" type="o" name="scanobject" /> - <arg direction="in" type="s" name="tableName" /> - <arg direction="in" type="as" name="paths" /> - <arg direction="in" type="as" name="fileextensions" /> - <arg direction="in" type="s" name="daoclass" /> - </method> - - <method name="CreateWatch" > - <arg direction="out" type="o" name="scanobject" /> - <arg direction="in" type="s" name="tableName" /> - <arg direction="in" type="as" name="paths" /> - <arg direction="in" type="as" name="fileextensions" /> - <arg direction="in" type="s" name="daoclass" /> - </method> - - <method name="GetWatches"> - <arg direction="out" type="ao" /> - <arg direction="in" type="s" name="daoclass" /> - </method> - - <signal name="SimultaniousScansChanged" > - <arg direction="out" type="i" name="numscans" /> - <arg direction="out" type="ao" name="runningscans" /> - </signal> - - <signal name="watchTriggered" > - <arg direction="out" type="i" name="mask" /> - <arg direction="out" type="i" name="cookie" /> - <arg direction="out" type="s" name="name" /> - <arg direction="out" type="s" name="path" /> - </signal> - - <signal name="SourceAdded" > - <arg direction="out" type="s" name="device" /> - <arg direction="out" type="s" name="path" /> - </signal> - <signal name="SourceRemoved" > - <arg direction="out" type="s" name="device" /> - <arg direction="out" type="s" name="path" /> - </signal> - </interface> -</node> Deleted: nghost2/branches/nghost2-qt/src/nscan/nscan.scan.dbus.xml =================================================================== --- nghost2/branches/nghost2-qt/src/nscan/nscan.scan.dbus.xml 2010-04-30 20:05:40 UTC (rev 2088) +++ nghost2/branches/nghost2-qt/src/nscan/nscan.scan.dbus.xml 2010-05-07 18:33:17 UTC (rev 2089) @@ -1,23 +0,0 @@ -<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" - "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd"> -<node> - <interface name="org.openice.nghost.nscan.scan" > - <signal name="ItemFound" > - <arg direction="out" type="s" name="filename" /> - <arg direction="out" type="s" name="path" /> - </signal> - - <signal name="ScanStarted" /> - - <signal name="ScanFinished" > - <arg direction="out" type="i" name="numitemsscanned" /> - <arg direction="out" type="i" name="timetoscan" /> - </signal> - - <signal name="Progress" > - <arg direction="out" type="i" name="progress" /> - </signal> - - <signal name="Updated" /> - </interface> -</node> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ks...@us...> - 2010-04-30 20:05:46
|
Revision: 2088 http://nghost.svn.sourceforge.net/nghost/?rev=2088&view=rev Author: kshots Date: 2010-04-30 20:05:40 +0000 (Fri, 30 Apr 2010) Log Message: ----------- * Updated nscan to update the nghost database Modified Paths: -------------- nghost2/branches/nghost2-qt/src/nscan/CMakeLists.txt nghost2/branches/nghost2-qt/src/nscan/activescanner.cpp nghost2/branches/nghost2-qt/src/nscan/activescanner.h nghost2/branches/nghost2-qt/src/nscan/nscan.cpp nghost2/branches/nghost2-qt/src/nscan/nscan.h nghost2/branches/nghost2-qt/src/nscan/nscantest.cpp Modified: nghost2/branches/nghost2-qt/src/nscan/CMakeLists.txt =================================================================== --- nghost2/branches/nghost2-qt/src/nscan/CMakeLists.txt 2010-04-25 18:55:41 UTC (rev 2087) +++ nghost2/branches/nghost2-qt/src/nscan/CMakeLists.txt 2010-04-30 20:05:40 UTC (rev 2088) @@ -5,7 +5,9 @@ find_package(Qt4 REQUIRED) include(${QT_USE_FILE}) set(nscantest_sources nscantest.cpp) - qt4_add_dbus_interfaces(nscantest_sources nscan.dbus.xml) + qt4_add_dbus_interface(nscantest_sources nscan.dbus.xml nscaninterface) + qt4_add_dbus_interface(nscantest_sources nscan.scan.dbus.xml + nscanscaninterface) add_executable(nscantest ${nscantest_sources}) target_link_libraries(nscantest ${QT_LIBRARIES}) endif(enable_nscantest) Modified: nghost2/branches/nghost2-qt/src/nscan/activescanner.cpp =================================================================== --- nghost2/branches/nghost2-qt/src/nscan/activescanner.cpp 2010-04-25 18:55:41 UTC (rev 2087) +++ nghost2/branches/nghost2-qt/src/nscan/activescanner.cpp 2010-04-30 20:05:40 UTC (rev 2088) @@ -1,6 +1,7 @@ #include "activescanner.h" #include "nscanwatchdbus.h" #include <ndebug.h> +#include <DaoHelper.h> using namespace nghost; @@ -26,32 +27,44 @@ void activescanner::run() { + std::vector<std::string> list; QTime time = QTime::currentTime(); time.start(); + IBaseObjectDao * dao = GetDao(m_daoclass.toStdString(), m_table.toStdString()); + if(!dao) + { + ndebug::out(ndebug::LOG_WARNING, "%s:%s(%d) - Failed to load '%s' dao. Assuming 'MediaDao'...", __FILE__, __FUNCTION__, __LINE__, m_daoclass.toAscii().constData()); + dao = new MediaDao(m_table.toStdString()); + } + unsigned int nitems(0); foreach(QString p, m_paths) { - scanDir(p, nitems, m_extensions); + scanDir(p, nitems, m_extensions, list); } + dao->reloadTable(); + dao->create(list); + dao->renameTable(m_table.toStdString()); + delete dao; emit scanFinished(time.elapsed() / 1000, nitems); } void -activescanner::scanDir(QString dir, unsigned int & nitems, QStringList & filters) +activescanner::scanDir(QString dir, unsigned int & nitems, QStringList & filters, std::vector<std::string> & lst) { QDir d(dir); - QList<QFileInfo> list = d.entryInfoList(QDir::AllDirs | QDir::NoDotAndDotDot); + QList<QFileInfo> list = d.entryInfoList(QDir::AllDirs | QDir::NoDotAndDotDot); unsigned int index; foreach(QFileInfo i, list) { - scanDir(i.absoluteFilePath(), ++nitems, filters); + scanDir(i.absoluteFilePath(), ++nitems, filters, lst); } - list = d.entryInfoList(filters); for(index = 0, list = d.entryInfoList(filters); index < list.size(); index++, nitems++) { emit itemFound(list.at(index).fileName(), list.at(index).filePath(), m_table, m_daoclass); + lst.push_back((list.at(index).filePath() + "/" + list.at(index).fileName()).toStdString()); } } Modified: nghost2/branches/nghost2-qt/src/nscan/activescanner.h =================================================================== --- nghost2/branches/nghost2-qt/src/nscan/activescanner.h 2010-04-25 18:55:41 UTC (rev 2087) +++ nghost2/branches/nghost2-qt/src/nscan/activescanner.h 2010-04-30 20:05:40 UTC (rev 2088) @@ -3,6 +3,7 @@ # include <QThread> # include <QtDBus> +# include <vector> class activescanner : public QThread { @@ -21,7 +22,7 @@ protected: virtual void run(); private: - void scanDir(QString dir, unsigned int & nitems, QStringList & filters); + void scanDir(QString dir, unsigned int & nitems, QStringList & filters, std::vector<std::string> & list); QDBusObjectPath m_path; Modified: nghost2/branches/nghost2-qt/src/nscan/nscan.cpp =================================================================== --- nghost2/branches/nghost2-qt/src/nscan/nscan.cpp 2010-04-25 18:55:41 UTC (rev 2087) +++ nghost2/branches/nghost2-qt/src/nscan/nscan.cpp 2010-04-30 20:05:40 UTC (rev 2088) @@ -5,6 +5,7 @@ #include <QDBusConnection> #include <QSignalMapper> #include <ndebug.h> +#include <DaoHelper.h> #include <sys/inotify.h> #include <sys/ioctl.h> #include <errno.h> @@ -13,6 +14,8 @@ nscan::nscan() : QObject(NULL), m_watch(new QSocketNotifier(inotify_init(), QSocketNotifier::Read, this)), m_sm(new QSignalMapper(this)), m_path(QDBusObjectPath("/org/openice/nscan")) { + QSettings settings; + int index, size, wd; QDBusConnection::connectToBus(QDBusConnection::SystemBus, "nscanSession"); QDBusAbstractAdaptor * dbus = new NscanAdaptor(this); if(!QDBusConnection::systemBus().registerObject("/nscan", this)) @@ -25,20 +28,47 @@ { QDBusError e = QDBusConnection::systemBus().lastError(); ndebug::out(ndebug::LOG_ERR, "%s:%s(%d) - Failed to register dbus service 'org.openice.nscan' - %s: %s", __FILE__, __FUNCTION__, __LINE__, e.name().toAscii().constData(), e.message().toAscii().constData()); + exit(1); } connect(m_sm, SIGNAL(mapped(QObject *)), SLOT(scanFinished(QObject *))); connect(m_watch, SIGNAL(activated(int)), SLOT(inotifyTrigger(int))); + for(index = 0, size = settings.beginReadArray("watches"); index < size; index++) + { + settings.setArrayIndex(index); + wd = inotify_add_watch(m_watch->socket(), settings.value("path").toString().toAscii().constData(), IN_CLOSE_WRITE | IN_CREATE | IN_DELETE | IN_MOVE); + if(wd < 0) + { + ndebug::out(ndebug::LOG_WARNING, "%s:%s(%d) - Failed to add inotify_add_watch at '%s'", __FILE__, __FUNCTION__, __LINE__, settings.value("path").toString().toAscii().constData()); + continue; + } + else + { + m_watchmap.insert(wd, watch(settings.value("path").toString(), settings.value("extensions").toStringList(), settings.value("table").toString(), settings.value("daoclass").toString())); + } + } + settings.endArray(); } nscan::~nscan() { - for(QMap<int, struct watch>::const_iterator it = m_watchmap.constBegin(); it != m_watchmap.constEnd(); it++) + QSettings settings; + int index; + QMap<int, struct watch>::const_iterator it; + settings.remove("watches"); // clear out the old data first... + settings.beginWriteArray("watches"); + for(it = m_watchmap.constBegin(), index = 0; it != m_watchmap.constEnd(); it++, index++) { inotify_rm_watch(m_watch->socket(), it.key()); + settings.setArrayIndex(index); + settings.setValue("path", it.value().m_path); + settings.setValue("extensions", it.value().m_extensions); + settings.setValue("table", it.value().m_table); + settings.setValue("daoclass", it.value().m_table); } ::close(m_watch->socket()); + settings.endArray(); if(!QDBusConnection::systemBus().unregisterService("org.openice.nghost")) { ndebug::out(ndebug::LOG_WARNING, "%s:%s(%d) - Failed to unregister serice 'org.openice.nghost' on the system bus", __FILE__, __FUNCTION__, __LINE__); @@ -131,6 +161,56 @@ { QString name(e->name); // must do this to make compatible with dbus emit watchTriggered(e->mask, e->cookie, name, m_watchmap[e->wd].m_path); + IBaseObjectDao * dao = GetDao(m_watchmap[e->wd].m_daoclass.toStdString(), m_watchmap[e->wd].m_table.toStdString()); + if(e->mask & IN_CLOSE_WRITE) + { + BaseFile * file = dao->get((m_watchmap[e->wd].m_path + "/" + name).toStdString()); + dao->edit(file); + } + if(e->mask & IN_MOVED_TO) + { + if(!m_cookies[e->cookie].isNull()) + { + BaseFile * file = dao->get(m_cookies[e->cookie].toStdString()); + file->path = (m_watchmap[e->wd].m_path + "/" + name).toStdString(); + dao->edit(file); + m_cookies.erase(m_cookies.find(e->cookie)); + } + else + { + m_cookies.insert(e->cookie, m_watchmap[e->wd].m_path + "/" + name); + } + } + if(e->mask & IN_MOVED_FROM) + { + if(!m_cookies[e->cookie].isNull()) + { + BaseFile * file = dao->get((m_watchmap[e->wd].m_path + "/" + name).toStdString()); + file->path = m_cookies[e->cookie].toStdString(); + dao->edit(file); + m_cookies.erase(m_cookies.find(e->cookie)); + } + else + { + m_cookies.insert(e->cookie, m_watchmap[e->wd].m_path + "/" + name); + } + } + if(e->mask & IN_DELETE) + { + dao->remove((m_watchmap[e->wd].m_path + "/" + name).toStdString()); + } + if(e->mask & IN_CREATE) + { + dao->create((m_watchmap[e->wd].m_path + "/" + name).toStdString()); + } + if(e->mask & (IN_MOVE_SELF | IN_DELETE_SELF | IN_UNMOUNT)) + { // stop watching this... + if(inotify_rm_watch(m_watch->socket(), e->wd) == -1) + { + ndebug::out(ndebug::LOG_WARNING, "%s:%s(%d) - Failed to remove watch '%s'", __FILE__, __FUNCTION__, __LINE__, (m_watchmap[e->wd].m_path + "/" + name).toAscii().constData()); + } + m_watchmap.erase(m_watchmap.find(e->wd)); + } } } } Modified: nghost2/branches/nghost2-qt/src/nscan/nscan.h =================================================================== --- nghost2/branches/nghost2-qt/src/nscan/nscan.h 2010-04-25 18:55:41 UTC (rev 2087) +++ nghost2/branches/nghost2-qt/src/nscan/nscan.h 2010-04-30 20:05:40 UTC (rev 2088) @@ -40,6 +40,7 @@ private: QSocketNotifier * m_watch; QMap <int, struct watch> m_watchmap; + QMap <int, QString> m_cookies; QSignalMapper * m_sm; QDBusObjectPath m_path; Modified: nghost2/branches/nghost2-qt/src/nscan/nscantest.cpp =================================================================== --- nghost2/branches/nghost2-qt/src/nscan/nscantest.cpp 2010-04-25 18:55:41 UTC (rev 2087) +++ nghost2/branches/nghost2-qt/src/nscan/nscantest.cpp 2010-04-30 20:05:40 UTC (rev 2088) @@ -2,7 +2,7 @@ #include <QDBusConnection> #include <getopt.h> #include <iostream> -#include "dbusinterface.h" +#include "nscaninterface.h" using std::cout; using std::endl; @@ -12,7 +12,9 @@ void usage(const char * pn) { cout << "Usage:" << endl - << pn << " -p path1,path2... -e ext1,ext2... [-t tablename] [-d daoclass]" << endl + << pn << " -s -p path1,path2... -e ext1,ext2... [-t tablename] [-d daoclass]" << endl + << pn << " -w -p path1,path2... -e ext1,ext2... [-t tablename] [-d daoclass]" << endl + << pn << " -g [-d daoclass]" << endl << pn << " -h" << endl << endl << endl @@ -20,7 +22,12 @@ << "--extensions\t-e\tList of extensions to scan for, separated by commas" << endl << "--table\t\t-t\tTable name to use (defaults to \"music\")" << endl << "--dao\t\t-d\tDAO class to use (defaults to \"music\")" << endl - << "--help\t\t-h\tThis screen" << endl; + << endl + << "Required Arugments" << endl << endl + << "--help\t\t-h\tThis screen" << endl + << "--scan\t\t-s\tTells nscan to scan the given paths for the given extensions" << endl + << "--watch\t\t-w\tTells nscan to watch the given paths for the given extensions" << endl + << "--getwatch\t-g\tAsks nscan what the current watches are" << endl; } int main(int argc, char ** argv) @@ -31,6 +38,8 @@ QStringList extensions; QString table = "music"; QString dao = "music"; + enum actiontype{noaction, scan, watch, getwatch}; + actiontype action = noaction; static struct option lo [] = { {"paths", required_argument, 0, 'p'}, @@ -38,51 +47,92 @@ {"help", no_argument, 0, 'h'}, {"table", required_argument, 0, 't'}, {"dao", required_argument, 0, 'd'}, + {"scan", no_argument, 0, 's'}, + {"watch", no_argument, 0, 'w'}, + {"getwatch", no_argument, 0, 'g'}, {NULL, 0, 0, 0} }; - while((option = getopt_long(argc, argv, "hp:e:t:d:", lo, NULL)) != -1) + org::openice::nghost::nscan interface("org.openice.nghost", "/nscan", QDBusConnection::systemBus()); + if(!interface.isValid()) { - switch(option) - { - case 'h': // help - usage(argv[0]); - return 0; - break; - case 'p': // paths - paths << QString(optarg).split(',', QString::SkipEmptyParts); - break; - case 'e': // extensions - extensions << QString(optarg).split(',', QString::SkipEmptyParts); - break; - case 't': // table - table = optarg; - break; - case 'd': // DAO class - dao = optarg; - break; - default: - usage(argv[0]); - return 1; - } + QDBusError error = interface.lastError(); + qFatal("Failed to setup the nscan interface connection: %s: %s", error.name().toAscii().constData(), error.message().toAscii().constData()); + return 1; } - if(paths.isEmpty()) + while((option = getopt_long(argc, argv, "hp:e:t:d:swg", lo, NULL)) != -1) { + switch(option) + { + case 'h': // help + usage(argv[0]); + return 0; + break; + case 'p': // paths + paths << QString(optarg).split(',', QString::SkipEmptyParts); + break; + case 'e': // extensions + extensions << QString(optarg).split(',', QString::SkipEmptyParts); + break; + case 't': // table + table = optarg; + break; + case 'd': // DAO class + dao = optarg; + break; + case 's': // scan + action = scan; + break; + case 'w': // watch + action = watch; + break; + case 'g': // getwatch + action = getwatch; + break; + default: + usage(argv[0]); + return 1; + } + } + if(action == noaction) + { + qFatal("Must set an action to handle"); + return 1; + } + if(paths.isEmpty() && action != getwatch) + { qFatal("Require at least one path"); return 1; } - if(extensions.isEmpty()) + if(extensions.isEmpty() && action != getwatch) { qFatal("Require at least one extension"); } - org::openice::nghost::nscan interface("org.openice.nghost", "/nscan", QDBusConnection::systemBus()); - if(!interface.isValid()) + switch(action) { - QDBusError error = interface.lastError(); - qFatal("Failed to setup the nscan interface connection: %s: %s", error.name().toAscii().constData(), error.message().toAscii().constData()); + case scan: + { + QDBusObjectPath path = interface.CreateScan(table, paths, extensions, dao); + cout << "Obtained object path '" << path.path().toAscii().constData() << '\'' << endl; + } + break; + case watch: + { + QDBusObjectPath path = interface.CreateWatch(table, paths, extensions, dao); + } + break; + case getwatch: + { + QList<QDBusObjectPath> list = interface.GetWatches(dao); + int index(0); + foreach(QDBusObjectPath path, list) + { + cout << '(' << index++ << ')' << path.path().toAscii().constData() << endl; + } + } + break; + case noaction: + qFatal("Must set an action to handle"); return 1; } - qDebug("Sending dbus message..."); - interface.CreateScan(table, paths, extensions, dao); - qDebug("dbus message sent"); return 0; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ks...@us...> - 2010-04-25 18:55:47
|
Revision: 2087 http://nghost.svn.sourceforge.net/nghost/?rev=2087&view=rev Author: kshots Date: 2010-04-25 18:55:41 +0000 (Sun, 25 Apr 2010) Log Message: ----------- * Fixed some destructor cleanup stuff in both dbus adapters Modified Paths: -------------- nghost2/branches/nghost2-qt/src/nscan/activescanner.cpp nghost2/branches/nghost2-qt/src/nscan/nscan.cpp Modified: nghost2/branches/nghost2-qt/src/nscan/activescanner.cpp =================================================================== --- nghost2/branches/nghost2-qt/src/nscan/activescanner.cpp 2010-04-25 18:48:11 UTC (rev 2086) +++ nghost2/branches/nghost2-qt/src/nscan/activescanner.cpp 2010-04-25 18:55:41 UTC (rev 2087) @@ -12,19 +12,15 @@ { ndebug::out(ndebug::LOG_WARNING, "%s:%s(%d) - Failed to register dbus object", __FILE__, __FUNCTION__, __LINE__); } - if(!QDBusConnection::systemBus().registerService("org.openice.nghost")) + /*if(!QDBusConnection::systemBus().registerService("org.openice.nghost")) { ndebug::out(ndebug::LOG_WARNING, "%s:%s(%d) - Failed to register service: 'org.openice.nscan' on the system bus", __FILE__, __FUNCTION__, __LINE__); - } + }*/ } activescanner::~activescanner() { - if(!QDBusConnection::sessionBus().unregisterService("org.openice.nscan")) - { - ndebug::out(ndebug::LOG_WARNING, "%s:%s(%d) - Failed to unregister serice 'org.openice.nscan' on the system bus", __FILE__, __FUNCTION__, __LINE__); - } - QDBusConnection::sessionBus().unregisterObject("/nscan/scan/" + m_table, QDBusConnection::UnregisterTree); + QDBusConnection::systemBus().unregisterObject("/nscan/scan/" + m_table, QDBusConnection::UnregisterTree); } void @@ -47,7 +43,7 @@ activescanner::scanDir(QString dir, unsigned int & nitems, QStringList & filters) { QDir d(dir); - QList<QFileInfo> list = d.entryInfoList(QDir::AllDirs | QDir::NoDotAndDotDot); + QList<QFileInfo> list = d.entryInfoList(QDir::AllDirs | QDir::NoDotAndDotDot); unsigned int index; foreach(QFileInfo i, list) { Modified: nghost2/branches/nghost2-qt/src/nscan/nscan.cpp =================================================================== --- nghost2/branches/nghost2-qt/src/nscan/nscan.cpp 2010-04-25 18:48:11 UTC (rev 2086) +++ nghost2/branches/nghost2-qt/src/nscan/nscan.cpp 2010-04-25 18:55:41 UTC (rev 2087) @@ -39,6 +39,11 @@ inotify_rm_watch(m_watch->socket(), it.key()); } ::close(m_watch->socket()); + if(!QDBusConnection::systemBus().unregisterService("org.openice.nghost")) + { + ndebug::out(ndebug::LOG_WARNING, "%s:%s(%d) - Failed to unregister serice 'org.openice.nghost' on the system bus", __FILE__, __FUNCTION__, __LINE__); + } + QDBusConnection::systemBus().unregisterObject("/nscan", QDBusConnection::UnregisterTree); QDBusConnection::disconnectFromBus("nscanSession"); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ks...@us...> - 2010-04-25 18:48:17
|
Revision: 2086 http://nghost.svn.sourceforge.net/nghost/?rev=2086&view=rev Author: kshots Date: 2010-04-25 18:48:11 +0000 (Sun, 25 Apr 2010) Log Message: ----------- * Stopped using the Qt event system (so test app exits when it's done) * Used Qt logging messages (much more flexible on the user's end) Modified Paths: -------------- nghost2/branches/nghost2-qt/src/nscan/nscantest.cpp Modified: nghost2/branches/nghost2-qt/src/nscan/nscantest.cpp =================================================================== --- nghost2/branches/nghost2-qt/src/nscan/nscantest.cpp 2010-04-25 18:37:22 UTC (rev 2085) +++ nghost2/branches/nghost2-qt/src/nscan/nscantest.cpp 2010-04-25 18:48:11 UTC (rev 2086) @@ -5,7 +5,6 @@ #include "dbusinterface.h" using std::cout; -using std::cerr; using std::endl; void usage(const char * pn); @@ -68,16 +67,22 @@ } if(paths.isEmpty()) { - cerr << "Require at least one path" << endl; + qFatal("Require at least one path"); return 1; } if(extensions.isEmpty()) { - cerr << "Require at least one extension" << endl; + qFatal("Require at least one extension"); } org::openice::nghost::nscan interface("org.openice.nghost", "/nscan", QDBusConnection::systemBus()); + if(!interface.isValid()) + { + QDBusError error = interface.lastError(); + qFatal("Failed to setup the nscan interface connection: %s: %s", error.name().toAscii().constData(), error.message().toAscii().constData()); + return 1; + } qDebug("Sending dbus message..."); interface.CreateScan(table, paths, extensions, dao); - qDebug("dbus message sent (I think)"); - return a.exec(); + qDebug("dbus message sent"); + return 0; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ks...@us...> - 2010-04-25 18:37:29
|
Revision: 2085 http://nghost.svn.sourceforge.net/nghost/?rev=2085&view=rev Author: kshots Date: 2010-04-25 18:37:22 +0000 (Sun, 25 Apr 2010) Log Message: ----------- * Moved dbus system conf to something more generic... should probably not even be in this part of the project (more on that later) * Added a dbus test application that takes command-line arguments... very simple, probably shouldn't be using the qt event loop (will fix later) * Fixed a bug in the activescanner (found after activation) where it would recursively scan the '.' and '..' directories (in other words, infinite recursion) * Modified the nscan project to accomodate the test application (disabled by default) Modified Paths: -------------- nghost2/branches/nghost2-qt/src/nscan/CMakeLists.txt nghost2/branches/nghost2-qt/src/nscan/activescanner.cpp Added Paths: ----------- nghost2/branches/nghost2-qt/src/nscan/nghost.dbus.conf nghost2/branches/nghost2-qt/src/nscan/nscantest.cpp Removed Paths: ------------- nghost2/branches/nghost2-qt/src/nscan/nscan.dbus.conf Modified: nghost2/branches/nghost2-qt/src/nscan/CMakeLists.txt =================================================================== --- nghost2/branches/nghost2-qt/src/nscan/CMakeLists.txt 2010-04-13 19:15:58 UTC (rev 2084) +++ nghost2/branches/nghost2-qt/src/nscan/CMakeLists.txt 2010-04-25 18:37:22 UTC (rev 2085) @@ -1,4 +1,14 @@ option(enable_nscan "Enables the nscan daemon" ON) +option(enable_nscantest "Enables the testing application for nscan" OFF) +if(enable_nscantest) + set(QT_USE_QTDBUS TRUE) + find_package(Qt4 REQUIRED) + include(${QT_USE_FILE}) + set(nscantest_sources nscantest.cpp) + qt4_add_dbus_interfaces(nscantest_sources nscan.dbus.xml) + add_executable(nscantest ${nscantest_sources}) + target_link_libraries(nscantest ${QT_LIBRARIES}) +endif(enable_nscantest) if(enable_nscan) pkg_check_modules(taglib REQUIRED taglib>=1.4) find_package(SDL REQUIRED) Modified: nghost2/branches/nghost2-qt/src/nscan/activescanner.cpp =================================================================== --- nghost2/branches/nghost2-qt/src/nscan/activescanner.cpp 2010-04-13 19:15:58 UTC (rev 2084) +++ nghost2/branches/nghost2-qt/src/nscan/activescanner.cpp 2010-04-25 18:37:22 UTC (rev 2085) @@ -12,14 +12,10 @@ { ndebug::out(ndebug::LOG_WARNING, "%s:%s(%d) - Failed to register dbus object", __FILE__, __FUNCTION__, __LINE__); } - if(!QDBusConnection::systemBus().registerService("org.openice.nscan")) + if(!QDBusConnection::systemBus().registerService("org.openice.nghost")) { ndebug::out(ndebug::LOG_WARNING, "%s:%s(%d) - Failed to register service: 'org.openice.nscan' on the system bus", __FILE__, __FUNCTION__, __LINE__); } - connect(this, SIGNAL(itemFound(const QString &, const QString &, const QString &, const QString &)), dbus, SIGNAL(ItemFound(const QString &, const QString &))); - connect(this, SIGNAL(progress(int)), dbus, SIGNAL(Progress(int))); - connect(this, SIGNAL(scanFinished(int, int)), dbus, SIGNAL(ScanFinished(int, int))); - connect(this, SIGNAL(updated()), dbus, SIGNAL(Updated())); } activescanner::~activescanner() @@ -51,13 +47,15 @@ activescanner::scanDir(QString dir, unsigned int & nitems, QStringList & filters) { QDir d(dir); - foreach(QFileInfo i, d.entryInfoList(QDir::AllDirs)) + QList<QFileInfo> list = d.entryInfoList(QDir::AllDirs | QDir::NoDotAndDotDot); + unsigned int index; + foreach(QFileInfo i, list) { scanDir(i.absoluteFilePath(), ++nitems, filters); } - QList<QFileInfo> list = d.entryInfoList(filters); - for(unsigned int i(0); i < list.size(); i++, nitems++) + list = d.entryInfoList(filters); + for(index = 0, list = d.entryInfoList(filters); index < list.size(); index++, nitems++) { - emit itemFound(list.at(i).fileName(), list.at(i).filePath(), m_table, m_daoclass); + emit itemFound(list.at(index).fileName(), list.at(index).filePath(), m_table, m_daoclass); } } Copied: nghost2/branches/nghost2-qt/src/nscan/nghost.dbus.conf (from rev 2084, nghost2/branches/nghost2-qt/src/nscan/nscan.dbus.conf) =================================================================== --- nghost2/branches/nghost2-qt/src/nscan/nghost.dbus.conf (rev 0) +++ nghost2/branches/nghost2-qt/src/nscan/nghost.dbus.conf 2010-04-25 18:37:22 UTC (rev 2085) @@ -0,0 +1,14 @@ +<!DOCTYPE busconfig PUBLIC + "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN" + "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> +<busconfig> + <policy context="default"> + <allow own="org.openice.nghost" /> + <allow send_destination="org.openice.nghost" /> + <allow send_destination="org.openice.nghost" + send_interface="org.openice.nghost.nscan.scan" /> + <allow send_path="/nscan" /> + </policy> + + <limit name="max_replies_per_connection">512</limit> +</busconfig> Deleted: nghost2/branches/nghost2-qt/src/nscan/nscan.dbus.conf =================================================================== --- nghost2/branches/nghost2-qt/src/nscan/nscan.dbus.conf 2010-04-13 19:15:58 UTC (rev 2084) +++ nghost2/branches/nghost2-qt/src/nscan/nscan.dbus.conf 2010-04-25 18:37:22 UTC (rev 2085) @@ -1,14 +0,0 @@ -<!DOCTYPE busconfig PUBLIC - "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN" - "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> -<busconfig> - <policy context="default"> - <allow own="org.openice.nscan" /> - <allow send_destination="org.openice.nscan" /> - <allow send_destination="org.openice.nscan" - send_interface="org.openice.nscan.scan" /> - <allow send_path="/org/openice/nscan" /> - </policy> - - <limit name="max_replies_per_connection">512</limit> -</busconfig> Added: nghost2/branches/nghost2-qt/src/nscan/nscantest.cpp =================================================================== --- nghost2/branches/nghost2-qt/src/nscan/nscantest.cpp (rev 0) +++ nghost2/branches/nghost2-qt/src/nscan/nscantest.cpp 2010-04-25 18:37:22 UTC (rev 2085) @@ -0,0 +1,83 @@ +#include <QCoreApplication> +#include <QDBusConnection> +#include <getopt.h> +#include <iostream> +#include "dbusinterface.h" + +using std::cout; +using std::cerr; +using std::endl; + +void usage(const char * pn); + +void usage(const char * pn) +{ + cout << "Usage:" << endl + << pn << " -p path1,path2... -e ext1,ext2... [-t tablename] [-d daoclass]" << endl + << pn << " -h" << endl + << endl + << endl + << "--paths\t\t-p\tList of paths to scan, separated by commas" << endl + << "--extensions\t-e\tList of extensions to scan for, separated by commas" << endl + << "--table\t\t-t\tTable name to use (defaults to \"music\")" << endl + << "--dao\t\t-d\tDAO class to use (defaults to \"music\")" << endl + << "--help\t\t-h\tThis screen" << endl; +} + +int main(int argc, char ** argv) +{ + int option; + QCoreApplication a(argc, argv); + QStringList paths; + QStringList extensions; + QString table = "music"; + QString dao = "music"; + static struct option lo [] = + { + {"paths", required_argument, 0, 'p'}, + {"extensions", required_argument, 0, 'e'}, + {"help", no_argument, 0, 'h'}, + {"table", required_argument, 0, 't'}, + {"dao", required_argument, 0, 'd'}, + {NULL, 0, 0, 0} + }; + while((option = getopt_long(argc, argv, "hp:e:t:d:", lo, NULL)) != -1) + { + switch(option) + { + case 'h': // help + usage(argv[0]); + return 0; + break; + case 'p': // paths + paths << QString(optarg).split(',', QString::SkipEmptyParts); + break; + case 'e': // extensions + extensions << QString(optarg).split(',', QString::SkipEmptyParts); + break; + case 't': // table + table = optarg; + break; + case 'd': // DAO class + dao = optarg; + break; + default: + usage(argv[0]); + return 1; + } + } + if(paths.isEmpty()) + { + cerr << "Require at least one path" << endl; + return 1; + } + if(extensions.isEmpty()) + { + cerr << "Require at least one extension" << endl; + } + org::openice::nghost::nscan interface("org.openice.nghost", "/nscan", QDBusConnection::systemBus()); + qDebug("Sending dbus message..."); + interface.CreateScan(table, paths, extensions, dao); + qDebug("dbus message sent (I think)"); + return a.exec(); +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ks...@us...> - 2010-04-13 19:16:04
|
Revision: 2084 http://nghost.svn.sourceforge.net/nghost/?rev=2084&view=rev Author: kshots Date: 2010-04-13 19:15:58 +0000 (Tue, 13 Apr 2010) Log Message: ----------- * Lots of stuff was failing to install headers. Fixed, but not sure why the other syntax did not work (it should have) * Added "fslistbox" class to the project, as things will not compile without it. Luckily, enough work has been done that it _does_ compile :/ * Removed yet another reference to 'basedb.hpp', replacing it with 'basedb.h' Modified Paths: -------------- libnghost/src/core/CMakeLists.txt libnghost/src/dao/CMakeLists.txt libnghost/src/gui2/CMakeLists.txt libnghost/src/gui2/fslistbox.h libnghost/src/net/CMakeLists.txt libnghost/src/plugins/interface/CMakeLists.txt nghost2/branches/nghost2-qt/src/nghost/CMakeLists.txt nghost2/branches/nghost2-qt/src/nghost/player.h Modified: libnghost/src/core/CMakeLists.txt =================================================================== --- libnghost/src/core/CMakeLists.txt 2010-04-07 16:59:19 UTC (rev 2083) +++ libnghost/src/core/CMakeLists.txt 2010-04-13 19:15:58 UTC (rev 2084) @@ -28,7 +28,8 @@ set_target_properties(nghostcore-static PROPERTIES OUTPUT_NAME nghostcore CLEAN_DIRECT_OUTPUT 1) set_target_properties(nghostcore PROPERTIES CLEAN_DIRECT_OUTPUT 1 - PUBLIC_HEADER ${core_headers} SOVERSION 0.0.0) + SOVERSION 0.0.0) + set_property(TARGET nghostcore PROPERTY PUBLIC_HEADER ${core_headers}) target_link_libraries(nghostcore-static nghostlog nghostplugin ${SDL_LIBRARY} ${libtool_LIBRARY} ${X11_LIBRARIES}) target_link_libraries(nghostcore ${SDL_LIBRARY} ${libtool_LIBRARY} Modified: libnghost/src/dao/CMakeLists.txt =================================================================== --- libnghost/src/dao/CMakeLists.txt 2010-04-07 16:59:19 UTC (rev 2083) +++ libnghost/src/dao/CMakeLists.txt 2010-04-13 19:15:58 UTC (rev 2084) @@ -24,8 +24,9 @@ add_dependencies(nghostdao-static nghostcore nghostlog nghostplugin) set_target_properties(nghostdao-static PROPERTIES OUTPUT_NAME nghostdao CLEAN_DIRECT_OUTPUT 1) - set_target_properties(nghostdao PROPERTIES PUBLIC_HEADER - ${dao_headers} SOVERSION 0.0.0 CLEAN_DIRECT_OUTPUT 1) + set_target_properties(nghostdao PROPERTIES SOVERSION 0.0.0 + CLEAN_DIRECT_OUTPUT 1) + set_property(TARGET nghostdao PROPERTY PUBLIC_HEADER ${dao_headers}) target_link_libraries(nghostdao-static nghostcore nghostlog nghostplugin ${SDLIMAGE_LIBRARY} ${taglib_LIBRARIES} ${QT_LIBRARIES}) target_link_libraries(nghostdao ${SDLIMAGE_LIBRARY} Modified: libnghost/src/gui2/CMakeLists.txt =================================================================== --- libnghost/src/gui2/CMakeLists.txt 2010-04-07 16:59:19 UTC (rev 2083) +++ libnghost/src/gui2/CMakeLists.txt 2010-04-13 19:15:58 UTC (rev 2084) @@ -22,12 +22,13 @@ widget_base.h xmlparser.h xmlscreenparser.h artist.h nwm.h background.h button.h hitarea.h item.h nscreen.h progress.h screen.h screenset.h skin_info.h slider.h text.h - input.h image.h osd.h) + input.h image.h osd.h desktop.h fslistbox.h) set(gui2_sources artist.cpp background.cpp button.cpp effects.cpp gfxengine.cpp hitarea.cpp item.cpp listbox.cpp nscreen.cpp osd.cpp progress.cpp screen.cpp screenset.cpp skin_info.cpp slider.cpp text.cpp widget_base.cpp - xmlparser.cpp xmlscreenparser.cpp input.cpp nwm.cpp) + xmlparser.cpp xmlscreenparser.cpp input.cpp nwm.cpp + fslistbox.cpp) add_library(nghostgui2 SHARED ${gui2_sources}) add_library(nghostgui2-static STATIC ${gui2_sources}) add_dependencies(nghostgui2-static nghostlog nghostcore nghostdao @@ -35,7 +36,8 @@ set_target_properties(nghostgui2-static PROPERTIES OUTPUT_NAME nghostgui2 CLEAN_DIRECT_OUTPUT 1) set_target_properties(nghostgui2 PROPERTIES CLEAN_DIRECT_OUTPUT 1 - PUBLIC_HEADER ${gui2_headers} SOVERSION 0.0.0) + SOVERSION 0.0.0) + set_property(TARGET nghostgui2 PROPERTY PUBLIC_HEADER ${gui2_headers}) target_link_libraries(nghostgui2-static nghostlog nghostcore nghostdao nghostnet nghostplugin ${glibmm_LIBRARIES} ${xmlpp_LIBRARIES} ${X11_LIBRARIES} ${SDL_gfx_LIBRARY} ${SDLTTF_LIBRARY} Modified: libnghost/src/gui2/fslistbox.h =================================================================== --- libnghost/src/gui2/fslistbox.h 2010-04-07 16:59:19 UTC (rev 2083) +++ libnghost/src/gui2/fslistbox.h 2010-04-13 19:15:58 UTC (rev 2084) @@ -21,6 +21,7 @@ #define _FSLISTBOX_H_ #include "listbox.h" +#include <cstring> namespace nghost { @@ -30,12 +31,12 @@ void init(gfxengine_sdl *g, listattributes l, IListboxDao * daoObj); virtual int loadImage(std::string f, std::string n,int x, int y); virtual void update(); - virtual void loadDir(string path); + virtual void loadDir(std::string path); virtual void flushHistory(); - virtual void pushHistory(string path); + virtual void pushHistory(std::string path); std::string popHistory(); private: - std::vector<string> listselections; + std::vector<std::string> listselections; int listposition; int alphapos; void saveSettings(); Modified: libnghost/src/net/CMakeLists.txt =================================================================== --- libnghost/src/net/CMakeLists.txt 2010-04-07 16:59:19 UTC (rev 2083) +++ libnghost/src/net/CMakeLists.txt 2010-04-13 19:15:58 UTC (rev 2084) @@ -14,7 +14,8 @@ set_target_properties(nghostnet-static PROPERTIES OUTPUT_NAME nghostnet CLEAN_DIRECT_OUTPUT 1) set_target_properties(nghostnet PROPERTIES CLEAN_DIRECT_OUTPUT 1 - PUBLIC_HEADER ${net_headers} SOVERSION 0.0.0) + SOVERSION 0.0.0) + set_property(TARGET nghostnet PROPERTY PUBLIC_HEADER ${net_headers}) target_link_libraries(nghostnet-static nghostlog nghostcore ${SDL_LIBRARY}) target_link_libraries(nghostnet ${SDL_LIBRARY}) Modified: libnghost/src/plugins/interface/CMakeLists.txt =================================================================== --- libnghost/src/plugins/interface/CMakeLists.txt 2010-04-07 16:59:19 UTC (rev 2083) +++ libnghost/src/plugins/interface/CMakeLists.txt 2010-04-13 19:15:58 UTC (rev 2084) @@ -22,7 +22,9 @@ set_target_properties(nghostplugin-static PROPERTIES OUTPUT_NAME nghostplugin CLEAN_DIRECT_OUTPUT 1) set_target_properties(nghostplugin PROPERTIES CLEAN_DIRECT_OUTPUT 1 - PUBLIC_HEADER ${plugin_headers} SOVERSION 0.0.0) + SOVERSION 0.0.0) + set_property(TARGET nghostplugin PROPERTY PUBLIC_HEADER + ${plugin_headers}) target_link_libraries(nghostplugin-static nghostlog nghostcore nghostgui2 ${libtool_LIBRARY}) target_link_libraries(nghostplugin ${libtool_LIBRARY}) Modified: nghost2/branches/nghost2-qt/src/nghost/CMakeLists.txt =================================================================== --- nghost2/branches/nghost2-qt/src/nghost/CMakeLists.txt 2010-04-07 16:59:19 UTC (rev 2083) +++ nghost2/branches/nghost2-qt/src/nghost/CMakeLists.txt 2010-04-13 19:15:58 UTC (rev 2084) @@ -60,5 +60,5 @@ ${SDLIMAGE_LIBRARY} ${SDLTTF_LIBRARY} ${SDL_gfx_LIBRARY} ${libtool_LIBRARY} ${QT_LIBRARIES}) install(TARGETS nghost - RUNTIME DESTINATION ${exec_prefix}) + RUNTIME DESTINATION bin) endif(enable_nghost) Modified: nghost2/branches/nghost2-qt/src/nghost/player.h =================================================================== --- nghost2/branches/nghost2-qt/src/nghost/player.h 2010-04-07 16:59:19 UTC (rev 2083) +++ nghost2/branches/nghost2-qt/src/nghost/player.h 2010-04-13 19:15:58 UTC (rev 2084) @@ -24,7 +24,7 @@ #include "populate.h" #include "playerdao.h" #include "syncqueue.hpp" -#include "basedb.hpp" +#include "basedb.h" #include "mediadao.h" #include <actionclass.h> #include <extendedmediadao.h> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <nan...@us...> - 2010-04-07 16:59:28
|
Revision: 2083 http://nghost.svn.sourceforge.net/nghost/?rev=2083&view=rev Author: nanonymous Date: 2010-04-07 16:59:19 +0000 (Wed, 07 Apr 2010) Log Message: ----------- added fslistbox files Added Paths: ----------- libnghost/src/gui2/fslistbox.cpp libnghost/src/gui2/fslistbox.h Added: libnghost/src/gui2/fslistbox.cpp =================================================================== --- libnghost/src/gui2/fslistbox.cpp (rev 0) +++ libnghost/src/gui2/fslistbox.cpp 2010-04-07 16:59:19 UTC (rev 2083) @@ -0,0 +1,153 @@ +/*************************************************************************** + * Copyright (C) 2010 by IonIdea Ukraine * + * email: ic...@io... * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the * + * Free Software Foundation, Inc., * + * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + ***************************************************************************/ +#include "fslistbox.h" +#include "listboxdao.h" +#include "ndebug.h" +#include "settings.h" +#include "populate.h" + +#include <plugin_query.h> + +#include <string> +#include <sstream> +#include <iostream> + +using namespace std; +void +nghost::fsListBox::init(gfxengine_sdl *g, listattributes l, IListboxDao * daoObj) +{ + widget_base::init(g,this); + alpha->init(g); + listatt=l; + Dao = daoObj; + update(); +} + +void +nghost::fsListBox::update() +{ + moveAlpha(0); + gotoPosition(0); + Events::ListboxEvents::fireOnUpdateEvent(name); +} + +void +nghost::fsListBox::loadDir(string path) +{ + DictionaryList<string> list; + vector<string> flist; + SearchDir dir; + dir.loadExtensions(listatt.filetype); + dir.listDir(path,flist); + for(size_t i=0;i<flist.size();i++) + { + NameValuePair<string> nv(basename(flist[i].c_str()),flist[i]); + list.push_back(nv); + } + + items = list; +} + +int nghost::fsListBox::loadImage( string f, string n,int x, int y) +{ + ///loadImage is called as part of the listbox creation. We can do some initialization here also if required + widget_base::loadImage(f,n,x,y); + getSettings(); + Events::ListboxEvents::createEvents(name); + listatt.name = name; + loadDir(listatt.dirtosearch); + pushHistory(listatt.dirtosearch); +} + +std::string +nghost::fsListBox::popHistory() +{ + if(history.size()>1) + { + history.pop_back(); + return history.back(); + } + return history.back(); +} + +void +nghost::fsListBox::pushHistory(string path) +{ + history.push_back(path); +} + +void +nghost::fsListBox::flushHistory() +{ + history.clear(); +} + +void +nghost::fsListBox::saveSettings() +{ + ListboxSettingsDao *lbd = new ListboxSettingsDao(); + bool create=false; + ListboxSettings* settings = lbd->getByName(name); + int i; + std::string filter_values; + if(!settings) + { + settings = new ListboxSettings(); + create=true; + } + settings->name = name; + settings->alphapos = alphapos; + settings->listposition = listposition; + settings->current_filter_index = listatt.getFilterIndex(); + + if(create) + lbd->create(settings); + else + lbd->edit(settings); + + if(lbd) delete(lbd); + if(settings) delete(settings); +} + +void +nghost::fsListBox::getSettings() +{ + int i; + + cout << "getsettings called" << endl; + ListboxSettingsDao *lbd = new ListboxSettingsDao(); + + ListboxSettings* setting = lbd->getByName(name); + + if(!setting) + { + ndebug::out(ndebug::LOG_ERR,"Failed to get fslistbox settings for: %s",name.c_str()); + return; ///FAIL!!! + } + + alphapos = setting->alphapos; + listposition = setting->listposition; + + ///now delete record cuz we don't need it anymore + lbd->remove(setting->id); + + if(lbd) delete(lbd); + if(setting) delete(setting); +} Added: libnghost/src/gui2/fslistbox.h =================================================================== --- libnghost/src/gui2/fslistbox.h (rev 0) +++ libnghost/src/gui2/fslistbox.h 2010-04-07 16:59:19 UTC (rev 2083) @@ -0,0 +1,54 @@ +/*************************************************************************** + * Copyright (C) 2010 by IonIdea Ukraine * + * email: ic...@io... * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the * + * Free Software Foundation, Inc., * + * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + ***************************************************************************/ +#ifndef _FSLISTBOX_H_ +#define _FSLISTBOX_H_ + +#include "listbox.h" + +namespace nghost +{ + class fsListBox: public ListBox + { + public: + void init(gfxengine_sdl *g, listattributes l, IListboxDao * daoObj); + virtual int loadImage(std::string f, std::string n,int x, int y); + virtual void update(); + virtual void loadDir(string path); + virtual void flushHistory(); + virtual void pushHistory(string path); + std::string popHistory(); + private: + std::vector<string> listselections; + int listposition; + int alphapos; + void saveSettings(); + void getSettings(); + std::vector<TextClass*> texts; + nRect listbox_area; + std::string action_type; + std::string action; + IListboxDao * Dao; + protected: + std::vector<std::string> history; + }; // class fsListBox +} // namespace nghost + +#endif + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ks...@us...> - 2010-03-26 17:54:05
|
Revision: 2082 http://nghost.svn.sourceforge.net/nghost/?rev=2082&view=rev Author: kshots Date: 2010-03-26 17:53:55 +0000 (Fri, 26 Mar 2010) Log Message: ----------- * Cleaned up some of the dbus stuff - switched to a centralized nghost system bus rather than an nscan-specific system bus Modified Paths: -------------- nghost2/branches/nghost2-qt/src/nscan/CMakeLists.txt nghost2/branches/nghost2-qt/src/nscan/nscan.cpp nghost2/branches/nghost2-qt/src/nscan/nscan.h Modified: nghost2/branches/nghost2-qt/src/nscan/CMakeLists.txt =================================================================== --- nghost2/branches/nghost2-qt/src/nscan/CMakeLists.txt 2010-03-26 16:13:20 UTC (rev 2081) +++ nghost2/branches/nghost2-qt/src/nscan/CMakeLists.txt 2010-03-26 17:53:55 UTC (rev 2082) @@ -13,7 +13,7 @@ include(${QT_USE_FILE}) install(FILES nscan.conf DESTINATION ${sysconfdir}/nghost) - install(FILES nscan.dbus.conf + install(FILES nghost.dbus.conf DESTINATION ${dbusconfdir}) add_definitions(-DPLUGIN_DIR="${plugindir}" -DVERSION="${VERSION}" -DPIDFILE="${pidfile}") Modified: nghost2/branches/nghost2-qt/src/nscan/nscan.cpp =================================================================== --- nghost2/branches/nghost2-qt/src/nscan/nscan.cpp 2010-03-26 16:13:20 UTC (rev 2081) +++ nghost2/branches/nghost2-qt/src/nscan/nscan.cpp 2010-03-26 17:53:55 UTC (rev 2082) @@ -15,17 +15,13 @@ { QDBusConnection::connectToBus(QDBusConnection::SystemBus, "nscanSession"); QDBusAbstractAdaptor * dbus = new NscanAdaptor(this); - connect(this, SIGNAL(SimultaneousScansChanged(int, const QList<QDBusObjectPath> &)), dbus, SIGNAL(SimultaniousScansChanged(int, const QList<QDBusObjectPath> &))); - connect(this, SIGNAL(SourceAdded(const QString &, const QString &)), dbus, SIGNAL(SourceAdded(const QString &, const QString &))); - connect(this, SIGNAL(SourceRemoved(const QString &, const QString &)), dbus, SIGNAL(SourceRemoved(const QString &, const QString &))); - connect(this, SIGNAL(watchTriggered(int, int, QString, QString)), dbus, SIGNAL(watchTriggered(int, int, QString, QString))); - if(!QDBusConnection::systemBus().registerObject("/org/openice/nscan", this)) + if(!QDBusConnection::systemBus().registerObject("/nscan", this)) { QDBusError e = QDBusConnection::systemBus().lastError(); - ndebug::out(ndebug::LOG_ERR, "%s:%s(%d) - Failed to register dbus object '/org/openice/nscan' - %s: %s", __FILE__, __FUNCTION__, __LINE__, e.name().toAscii().constData(), e.message().toAscii().constData()); + ndebug::out(ndebug::LOG_ERR, "%s:%s(%d) - Failed to register dbus object '/nscan' - %s: %s", __FILE__, __FUNCTION__, __LINE__, e.name().toAscii().constData(), e.message().toAscii().constData()); exit(1); } - if(!QDBusConnection::systemBus().registerService("org.openice.nscan")) + if(!QDBusConnection::systemBus().registerService("org.openice.nghost")) { QDBusError e = QDBusConnection::systemBus().lastError(); ndebug::out(ndebug::LOG_ERR, "%s:%s(%d) - Failed to register dbus service 'org.openice.nscan' - %s: %s", __FILE__, __FUNCTION__, __LINE__, e.name().toAscii().constData(), e.message().toAscii().constData()); @@ -128,7 +124,8 @@ { if(QString(e->name).endsWith(extension, Qt::CaseInsensitive)) { - emit watchTriggered(e->mask, e->cookie, e->name, m_watchmap[e->wd].m_path); + QString name(e->name); // must do this to make compatible with dbus + emit watchTriggered(e->mask, e->cookie, name, m_watchmap[e->wd].m_path); } } } Modified: nghost2/branches/nghost2-qt/src/nscan/nscan.h =================================================================== --- nghost2/branches/nghost2-qt/src/nscan/nscan.h 2010-03-26 16:13:20 UTC (rev 2081) +++ nghost2/branches/nghost2-qt/src/nscan/nscan.h 2010-03-26 17:53:55 UTC (rev 2082) @@ -32,10 +32,10 @@ QDBusObjectPath CreateWatch(const QString & tableName, const QStringList & paths, const QStringList & fileExtensions, const QString & daoclass); QList<QDBusObjectPath> GetWatches(const QString & daoclass); signals: - void SimultaneousScansChanged(int numscans, const QList<QDBusObjectPath> & runningscans); + void SimultaniousScansChanged(int numscans, const QList<QDBusObjectPath> & runningscans); void SourceAdded(const QString & device, const QString & path); void SourceRemoved(const QString & device, const QString & path); - void watchTriggered(int mask, int cookie, QString name, QString path); + void watchTriggered(int mask, int cookie, QString & name, QString & path); private: QSocketNotifier * m_watch; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ks...@us...> - 2010-03-26 16:13:29
|
Revision: 2081 http://nghost.svn.sourceforge.net/nghost/?rev=2081&view=rev Author: kshots Date: 2010-03-26 16:13:20 +0000 (Fri, 26 Mar 2010) Log Message: ----------- * Found a few session bus entries in nscan - moved to system bus Modified Paths: -------------- nghost2/branches/nghost2-qt/src/nscan/nscan.cpp Modified: nghost2/branches/nghost2-qt/src/nscan/nscan.cpp =================================================================== --- nghost2/branches/nghost2-qt/src/nscan/nscan.cpp 2010-03-24 02:29:01 UTC (rev 2080) +++ nghost2/branches/nghost2-qt/src/nscan/nscan.cpp 2010-03-26 16:13:20 UTC (rev 2081) @@ -13,7 +13,7 @@ nscan::nscan() : QObject(NULL), m_watch(new QSocketNotifier(inotify_init(), QSocketNotifier::Read, this)), m_sm(new QSignalMapper(this)), m_path(QDBusObjectPath("/org/openice/nscan")) { - QDBusConnection::connectToBus(QDBusConnection::SessionBus, "nscanSession"); + QDBusConnection::connectToBus(QDBusConnection::SystemBus, "nscanSession"); QDBusAbstractAdaptor * dbus = new NscanAdaptor(this); connect(this, SIGNAL(SimultaneousScansChanged(int, const QList<QDBusObjectPath> &)), dbus, SIGNAL(SimultaniousScansChanged(int, const QList<QDBusObjectPath> &))); connect(this, SIGNAL(SourceAdded(const QString &, const QString &)), dbus, SIGNAL(SourceAdded(const QString &, const QString &))); @@ -21,13 +21,13 @@ connect(this, SIGNAL(watchTriggered(int, int, QString, QString)), dbus, SIGNAL(watchTriggered(int, int, QString, QString))); if(!QDBusConnection::systemBus().registerObject("/org/openice/nscan", this)) { - QDBusError e = QDBusConnection::sessionBus().lastError(); + QDBusError e = QDBusConnection::systemBus().lastError(); ndebug::out(ndebug::LOG_ERR, "%s:%s(%d) - Failed to register dbus object '/org/openice/nscan' - %s: %s", __FILE__, __FUNCTION__, __LINE__, e.name().toAscii().constData(), e.message().toAscii().constData()); exit(1); } if(!QDBusConnection::systemBus().registerService("org.openice.nscan")) { - QDBusError e = QDBusConnection::sessionBus().lastError(); + QDBusError e = QDBusConnection::systemBus().lastError(); ndebug::out(ndebug::LOG_ERR, "%s:%s(%d) - Failed to register dbus service 'org.openice.nscan' - %s: %s", __FILE__, __FUNCTION__, __LINE__, e.name().toAscii().constData(), e.message().toAscii().constData()); } @@ -49,6 +49,7 @@ QDBusObjectPath nscan::CreateScan(const QString & tableName, const QStringList & paths, const QStringList & fileextensions, const QString & daoclass) { + ndebug::out(ndebug::LOG_DEBUG, "Got a 'CreateScan' request on table '%s' and daoclass '%s'", tableName.toAscii().constData(), daoclass.toAscii().constData()); foreach(QString s, paths) { const int wd = inotify_add_watch(m_watch->socket(), s.toAscii().constData(), IN_CLOSE_WRITE | IN_CREATE | IN_DELETE | IN_MOVE); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <nan...@us...> - 2010-03-24 02:29:07
|
Revision: 2080 http://nghost.svn.sourceforge.net/nghost/?rev=2080&view=rev Author: nanonymous Date: 2010-03-24 02:29:01 +0000 (Wed, 24 Mar 2010) Log Message: ----------- applied IonIdea-dev's patch for filesystem based listbox Modified Paths: -------------- libnghost/README libnghost/src/dao/populate.cpp libnghost/src/dao/populate.h libnghost/src/gui2/screen.cpp libnghost/src/gui2/screen.h Modified: libnghost/README =================================================================== --- libnghost/README 2010-03-24 02:24:59 UTC (rev 2079) +++ libnghost/README 2010-03-24 02:29:01 UTC (rev 2080) @@ -0,0 +1,56 @@ +Copyright (C)2010 IonIdea Ukraine +Email ic...@io... +http://ionidea.ua/nghost + +Table of contents: +1. Features +2. Applying the patch +3. Usage + +1. Features. +This patch implements new listbox with ability to display filesystem contents without using nScan-populated database, history stack and support for "back" and "home" actions. + +2. Applying the patch. +Instruction assumes the patch is being applied to the following SVN revisions of sources: + -libnghost: revision 2049 + -nghost: revision 2049 +Check out libnghost and nghost sources, ending up with two directories: 'libnghost' and 'trunk' +Place the .diff files extracted from the patch archive to the source root directory +Run the apply_patch script like 'sh < apply_patch.sh' +In case of successfull patching, continue build process as usual, following nghost build instructions (running autogen.sh scripts, configure, make all install etc ) + +3. Usage +New filesystem listboxes can be added to the skin XML screens as in following example: + + <item> + <name>list_box_name</name> + <type>fslistbox</type> + <xcords>100</xcords> + <ycords>200</ycords> + <area_x>3</area_x> + <area_y>3</area_y> + <area_width>-3</area_width> + <area_height>-3</area_height> + <dir>$music</dir> + <file_type>$audioextensions</file_type> + <path>images/media_list_background.png</path> + <action type="media">null playList "%this%" "%pos%"</action> + </item> + +FS listbox supports following options: + <dir> - root directory to search for files, regular filesystem path of config variables can be used ( i.e. /home/foo/music or $music ) + <file_type> - extensions of files to search for, standart syntax or config variable should be used ( i.e. mp3|flac|ogg or $audioextensions ) + +New actions: + +populateWithDir - populates the listbox with contents of given directory +lastDir - populates the listbox with previous path in history stack, removes current path from history stack +resetDir - populates the listbox with path from the <dir> option, flushes the history stack + +examples: + +<action type="listbox">media_list_box populateWithDir "/tmp"</action> + +<action type="listbox">media_list_box resetDir</action> + +<action type="listbox">media_list_box lastDir</action> Modified: libnghost/src/dao/populate.cpp =================================================================== --- libnghost/src/dao/populate.cpp 2010-03-24 02:24:59 UTC (rev 2079) +++ libnghost/src/dao/populate.cpp 2010-03-24 02:29:01 UTC (rev 2080) @@ -166,6 +166,85 @@ return icount; } +int +nghost::SearchDir::listDir(std::string dir, std::vector<std::string> &list) +{ + if(dir2old.size()==0) + { + dir2=dir; + currentdir=get_current_dir_name(); + } + ndebug::out(ndebug::LOG_INFO, "SearchDir: searching '%s'", dir.c_str()); + DIR *dp; + if((dp=opendir(dir.c_str()))==NULL) + { + ndebug::out(ndebug::LOG_WARNING, "SearchDir: couldn't open: %s (%d) - %s", dir.c_str(), errno, strerror(errno)); + return -1; + } + struct dirent *entry; + struct stat statbuf; + std::vector<std::string> dirlist; + string tempdir="",temptitle,next=""; + + chdir(dir.c_str()); + while((entry=readdir(dp)) != NULL) + { + if(stat(entry->d_name,&statbuf)<0) + { + ndebug::out(ndebug::LOG_ERR,"SearchDir: failed to get stats on '%s': (%d) - %s",entry->d_name, errno, strerror(errno)); + continue; + } + + tempdir=""; + next=""; + + if(S_ISDIR(statbuf.st_mode)) + { + //skip unneeded curdir and parent + if(strcmp(".",entry->d_name)==0 || strcmp("..",entry->d_name)==0) + continue; + ndebug::out(ndebug::LOG_DEBUG, "SearchDir: entering %s", entry->d_name); + dir2+="/"; + dir2+=entry->d_name; + dirlist.push_back(dir2); + dir2=dir; + } + else + { + next=entry->d_name; + size_t n=0; + for(size_t i=0;i<typelist.size();i++) + { + string tempext=next, temptype=typelist[i]; + ndebug::out(ndebug::LOG_DEBUG,"SearchDir: checking %s against %s",tempext.c_str(),temptype.c_str()); + if(tempext.length() >= temptype.length() && + (n=tempext.find(temptype)) != string::npos && + tempext.substr(n) == temptype) + { + temptitle=entry->d_name; + tempdir=dir; + tempdir+="/"+temptitle; + icount++; + list.push_back(tempdir); + ndebug::out(ndebug::LOG_DEBUG,"SearchDir: found match %s",tempdir.c_str()); + } + } + } + } + closedir(dp); + if(dir2old.size()==0) chdir(currentdir.c_str()); + list.insert(list.begin(),dirlist.begin(),dirlist.end()); + return icount; +} + +bool +nghost::SearchDir::isDir(string path) +{ + struct stat statbuf; + return ( stat( path.c_str(), &statbuf ) != -1 ) && ( S_ISDIR(statbuf.st_mode )); +} + + void nghost::SearchDir::loadExtensions(std::string f) { Modified: libnghost/src/dao/populate.h =================================================================== --- libnghost/src/dao/populate.h 2010-03-24 02:24:59 UTC (rev 2079) +++ libnghost/src/dao/populate.h 2010-03-24 02:29:01 UTC (rev 2080) @@ -46,6 +46,8 @@ SearchDir(); virtual ~SearchDir(); int searchDirFor(std::string dir,std::vector<std::string> &list, bool=true, std::vector<std::string> * = NULL); + int listDir(std::string dir,std::vector<std::string> &list); + bool isDir(std::string path); void loadExtensions(std::string strtoparse); MediaObj getMetaData(std::string filename); static bool getMetaData(std::string filename, MediaObj *obj); Modified: libnghost/src/gui2/screen.cpp =================================================================== --- libnghost/src/gui2/screen.cpp 2010-03-24 02:24:59 UTC (rev 2079) +++ libnghost/src/gui2/screen.cpp 2010-03-24 02:29:01 UTC (rev 2080) @@ -1,7 +1,8 @@ /*************************************************************************** * Copyright (C) 2007 by Kevron "tripzero" Rees,,, * * tri...@ne... * - * * + * Copyright (C) 2010 IonIdea Ukraine * + * ic...@io... * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * @@ -285,6 +286,20 @@ DictionaryList<string> listboxOptions = createOptionsList(optionsList); addListbox(path, i_name, action_type, i_action, i_socket, listatt, listboxOptions, i_area, x, y); } + else if(i_type=="fslistbox") + { + ndebug::out(ndebug::LOG_DEBUG, "FS listbox found"); + //cout<<"first x="<<i_area.x<<" y="<<i_area.y<<" w= "<<i_area.w<<" h="<<i_area.h<<endl; + listattributes listatt; + listatt.filetype=isVariable(myscreen->get_screen(screen_num).get_item(i).get_file_type()); + listatt.dirtosearch=isVariable(myscreen->get_screen(screen_num).get_item(i).get_dir()); + listatt.numvisible = myscreen->get_screen(screen_num).get_item(i).get_size(); + string options = myscreen->get_screen(screen_num).get_item(i).get_options(); + vector<string> optionsList; + parseItems(options,optionsList); + DictionaryList<string> listboxOptions = createOptionsList(optionsList); + addFsListbox(path, i_name, action_type, i_action, i_socket, listatt, listboxOptions, i_area, x, y); + } else if(i_type=="alpha_selector") { addListboxAlpha(path,i_name,i_action,i_socket); @@ -638,6 +653,26 @@ } int +nghost::ScreenClass::addFsListbox(string path, string i_name, string action_type, string i_action,string s, nghost::listattributes listatt, nghost::DictionaryList<string> options, nghost::nRect a, int x, int y) +{ + Events::ListboxEvents::init(outqueue); + ListBox *l = new fsListBox(); + //Populate *p = new Populate(); + IListboxDao * dao = GetListboxDao(getOption("DataAccessObject",options),listatt.table); + l->init(gfx,listatt, dao); + l->setActionClass((action_type != "" ? action_type+":" : "") +i_action); + l->loadImage(path,i_name,x,y); + l->setArea(a); + l->setAction(action_type,i_action); + l->setInActive(); + if(s.length()>0) l->setSocket(s); + //l->loadExtentions(listatt.filetype); + l->update(); + listboxes.push_back(l); + return 1; +} + +int nghost::ScreenClass::addListboxAlpha(std::string path, std::string i_name, std::string i_action, std::string i_socket) { string ac=i_action; Modified: libnghost/src/gui2/screen.h =================================================================== --- libnghost/src/gui2/screen.h 2010-03-24 02:24:59 UTC (rev 2079) +++ libnghost/src/gui2/screen.h 2010-03-24 02:29:01 UTC (rev 2080) @@ -38,6 +38,7 @@ #include "progress.h" #include "slider.h" #include "listbox.h" +#include "fslistbox.h" #include "desktop.h" //#define OPENGL @@ -104,6 +105,7 @@ bool isInUpdateRect(SDL_Rect pos); public: int addListbox(std::string path, std::string i_name, std::string action_type, std::string i_action, std::string s,listattributes, DictionaryList<std::string> options, nRect a, int x, int y); + int addFsListbox(std::string path, std::string i_name, std::string action_type, std::string i_action, std::string s,listattributes, DictionaryList<std::string> options, nRect a, int x, int y); int addListboxAlpha(std::string path, std::string i_name, std::string i_action, std::string i_socket); int addButton(std::string path, std::string i_name, std::string action_type, std::string i_action, bool, std::string s, int x, int y, int p, DictionaryList<std::string> options, nRect a); int addImage(std::string path, std::string i_name, std::string s, int x, int y); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <nan...@us...> - 2010-03-24 02:25:05
|
Revision: 2079 http://nghost.svn.sourceforge.net/nghost/?rev=2079&view=rev Author: nanonymous Date: 2010-03-24 02:24:59 +0000 (Wed, 24 Mar 2010) Log Message: ----------- applied IonIdea-dev's patch to add support for filesystem based listboxes Modified Paths: -------------- nghost2/trunk/src/event.cpp Modified: nghost2/trunk/src/event.cpp =================================================================== --- nghost2/trunk/src/event.cpp 2010-03-19 17:03:38 UTC (rev 2078) +++ nghost2/trunk/src/event.cpp 2010-03-24 02:24:59 UTC (rev 2079) @@ -365,13 +365,33 @@ { screen->listboxes[n]->moveAlpha(i); - if(screen->listboxes[n]->listatt.nextFilter()=="") + if(screen->listboxes[n]->listatt.nextFilter()=="" && screen->listboxes[n]->items.size()) { + //additional handling for directories in fslistbox + string path; + nghost::SearchDir sd; + int selectedpos = screen->listboxes[n]->getSelection(); + if(selectedpos < (int)screen->listboxes[n]->items.size()) + { + path = screen->listboxes[n]->items[selectedpos].value; + } + else return 0; + if (sd.isDir(path)) + { a.action_class="listbox"; + a.params.push_back(path); a.name=screen->listboxes[n]->getName(); + a.method="populateWithDir"; + inqueue->add(a); + } + else + { + a.action_class="listbox"; + a.name=screen->listboxes[n]->getName(); a.method="doCurrent"; //actions.push_back(a); inqueue->add(a); + } } else { @@ -990,6 +1010,49 @@ screen->listboxes[i]->update(); screen->redraw(screen->listboxes[i]->getPos()); } + else if(action=="populateWithDir") + ///ACTION_TEMPLATE: listbox:name populateWithDir "value" + ///ACTION_DESCRIPTION: populates the fslistbox with contents of given directory + { + string value; + value = a.getParam(0); + screen->listboxes[i]->pushselection(); + nghost::fsListBox * fsl = dynamic_cast<nghost::fsListBox*>(screen->listboxes[i]); + if(fsl){ + fsl->loadDir(value); + fsl->pushHistory(value); + } + screen->listboxes[i]->update(); + screen->redraw(screen->listboxes[i]->getPos()); + } + else if(action=="lastDir") + ///ACTION_TEMPLATE: listbox:name lastDir + ///ACTION_DESCRIPTION: populates the fslistbox with last path in history stack + { + string value; + value = a.getParam(0); + nghost::fsListBox * fsl = dynamic_cast<nghost::fsListBox*>(screen->listboxes[i]); + if(fsl){ + string path=fsl->popHistory(); + fsl->loadDir(path); + } + screen->listboxes[i]->update(); + screen->redraw(screen->listboxes[i]->getPos()); + } + else if(action=="resetDir") + ///ACTION_TEMPLATE: listbox:name resetDir + ///ACTION_DESCRIPTION: populates the listbox with dir option and flushes history stack + { + nghost::fsListBox * fsl = dynamic_cast<nghost::fsListBox*>(screen->listboxes[i]); + if(fsl){ + string path=screen->listboxes[i]->listatt.dirtosearch; + fsl->flushHistory(); + fsl->loadDir(path); + fsl->pushHistory(path); + } + screen->listboxes[i]->update(); + screen->redraw(screen->listboxes[i]->getPos()); + } else if(action=="addFilter") ///ACTION_TEMPLATE: listbox:name addFilter "value" ///ACTION_DESCRIPTION: adds the filter to the listbox @@ -1411,7 +1474,6 @@ vector<nghost::widget_base*> list = screen->getAllWidgets(); struct answertype answer; answer.method = nghost::nactivateAll; - for(size_t n=0;n<list.size();n++) { if(list[n]->getSocket()!="") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ks...@us...> - 2010-03-19 17:03:44
|
Revision: 2078 http://nghost.svn.sourceforge.net/nghost/?rev=2078&view=rev Author: kshots Date: 2010-03-19 17:03:38 +0000 (Fri, 19 Mar 2010) Log Message: ----------- * Updated activescanner to use systembus rather than session bus Modified Paths: -------------- nghost2/branches/nghost2-qt/src/nscan/activescanner.cpp Modified: nghost2/branches/nghost2-qt/src/nscan/activescanner.cpp =================================================================== --- nghost2/branches/nghost2-qt/src/nscan/activescanner.cpp 2010-03-19 17:00:39 UTC (rev 2077) +++ nghost2/branches/nghost2-qt/src/nscan/activescanner.cpp 2010-03-19 17:03:38 UTC (rev 2078) @@ -8,11 +8,11 @@ { QDBusAbstractAdaptor * dbus = new ScanAdaptor(this); - if(!QDBusConnection::sessionBus().registerObject("/nscan/scan/" + m_table, this)) + if(!QDBusConnection::systemBus().registerObject("/nscan/scan/" + m_table, this)) { ndebug::out(ndebug::LOG_WARNING, "%s:%s(%d) - Failed to register dbus object", __FILE__, __FUNCTION__, __LINE__); } - if(!QDBusConnection::sessionBus().registerService("org.openice.nscan")) + if(!QDBusConnection::systemBus().registerService("org.openice.nscan")) { ndebug::out(ndebug::LOG_WARNING, "%s:%s(%d) - Failed to register service: 'org.openice.nscan' on the system bus", __FILE__, __FUNCTION__, __LINE__); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ks...@us...> - 2010-03-19 17:00:46
|
Revision: 2077 http://nghost.svn.sourceforge.net/nghost/?rev=2077&view=rev Author: kshots Date: 2010-03-19 17:00:39 +0000 (Fri, 19 Mar 2010) Log Message: ----------- * Cleaned up qt branch to match current lib style in cmake Modified Paths: -------------- nghost2/branches/nghost2-qt/CMakeLists.txt nghost2/branches/nghost2-qt/src/nghost/CMakeLists.txt nghost2/branches/nghost2-qt/src/nscan/CMakeLists.txt Modified: nghost2/branches/nghost2-qt/CMakeLists.txt =================================================================== --- nghost2/branches/nghost2-qt/CMakeLists.txt 2010-03-16 19:06:17 UTC (rev 2076) +++ nghost2/branches/nghost2-qt/CMakeLists.txt 2010-03-19 17:00:39 UTC (rev 2077) @@ -7,26 +7,12 @@ include(FindSDL_ttf) include(FindSDL) include(FindQt4) -option(enable_nscan - "Enables the nscan daemon" - ON) -option(enable_nghost - "Enables the nghost application" - ON) option(enable_maintainer "Enables the maintainer CFLAGS (-Wall -Werror)" OFF) -set(prefix ${CMAKE_INSTALL_PREFIX}) -set(exec_prefix ${CMAKE_INSTALL_PREFIX}/bin CACHE STRING "Sets the installation dir for the executables") -set(libdir ${prefix}/lib CACHE STRING "Sets the installation dir for the -libraries") -set(includedir ${prefix}/include CACHE STRING "Sets the installation dir for -includes") -set(datadir ${prefix}/share/nghost CACHE STRING "Sets the installation dir for -data objects") set(sysconfdir /etc CACHE STRING "Sets the installation dir for system configuration files") -set(xprefix ${prefix} CACHE STRING "Sets the X installation dir") +set(xprefix ${CMAKE_INSTALL_PREFIX} CACHE STRING "Sets the X installation dir") set(pidfile /var/run/nscan CACHE STRING "Sets the compiled-in default pid file for nscan") set(dbusconfdir /etc/dbus-1/system.d CACHE STRING "Sets the location that @@ -45,76 +31,4 @@ if(enable_maintainer) add_definitions("-Wall -Werror") endif(enable_maintainer) -if(enable_nscan) - set(need_taglib ON) - set(need_sdl ON) - set(need_nghostplugin ON) - set(need_nghostlog ON) - set(need_nghostcore ON) - set(need_nghostdao ON) - set(need_nghostnet ON) - set(need_qt ON) - set(QT_USE_QTDBUS TRUE) - set(QT_USE_QTSQL TRUE) -endif(enable_nscan) -if(enable_nghost) - set(need_sdl ON) - set(need_qt ON) - set(need_glibmm ON) - set(need_xmlpp ON) - set(need_taglib ON) - set(need_nghostcore ON) - set(need_nghostdao ON) - set(need_nghostgui2 ON) - set(need_nghostlog ON) - set(need_nghostnet ON) - set(need_nghostplugin ON) - set(need_libtool ON) - set(QT_USE_QTDBUS TRUE) - set(QT_USE_QTSQL TRUE) -endif(enable_nghost) -if(need_libtool) - find_library(libtool_LIBRARY - ltdl - DOC "Libtool libraries") - find_path(libtool_INCLUDE_DIR - ltdl.h - DOC "Libtool headers") -endif(need_libtool) -if(need_qt) - find_package(Qt4 REQUIRED) - include(${QT_USE_FILE}) -endif(need_qt) -if(need_sdl) - find_package(SDL REQUIRED) - find_package(SDL_image REQUIRED) - find_package(SDL_ttf REQUIRED) -endif(need_sdl) -if(need_glibmm) - pkg_check_modules(glibmm REQUIRED glibmm-2.4) -endif(need_glibmm) -if(need_xmlpp) - pkg_check_modules(xmlpp REQUIRED libxml++-2.6) -endif(need_xmlpp) -if(need_taglib) - pkg_check_modules(taglib REQUIRED taglib>=1.4) -endif(need_taglib) -if(need_nghostcore) - pkg_check_modules(nghostcore REQUIRED nghostcore) -endif(need_nghostcore) -if(need_nghostdao) - pkg_check_modules(nghostdao REQUIRED nghostdao) -endif(need_nghostdao) -if(need_nghostgui2) - pkg_check_modules(nghostgui2 REQUIRED nghostgui2) -endif(need_nghostgui2) -if(need_nghostlog) - pkg_check_modules(nghostlog REQUIRED nghostlog) -endif(need_nghostlog) -if(need_nghostnet) - pkg_check_modules(nghostnet REQUIRED nghostnet) -endif(need_nghostnet) -if(need_nghostplugin) - pkg_check_modules(nghostplugin REQUIRED nghostplugin) -endif(need_nghostplugin) add_subdirectory(src) Modified: nghost2/branches/nghost2-qt/src/nghost/CMakeLists.txt =================================================================== --- nghost2/branches/nghost2-qt/src/nghost/CMakeLists.txt 2010-03-16 19:06:17 UTC (rev 2076) +++ nghost2/branches/nghost2-qt/src/nghost/CMakeLists.txt 2010-03-19 17:00:39 UTC (rev 2077) @@ -1,4 +1,21 @@ +option(enable_nghost "Enables the nghost application" ON) if(enable_nghost) + find_package(SDL REQUIRED) + pkg_check_modules(glibmm REQUIRED glibmm-2.4) + pkg_check_modules(xmlpp REQUIRED libxml++-2.6) + pkg_check_modules(taglib REQUIRED taglib>=1.4) + pkg_check_modules(nghostcore REQUIRED nghostcore) + pkg_check_modules(nghostdao REQUIRED nghostdao) + pkg_check_modules(nghostgui2 REQUIRED nghostgui2) + pkg_check_modules(nghostlog REQUIRED nghostlog) + pkg_check_modules(nghostnet REQUIRED nghostnet) + pkg_check_modules(nghostplugin REQUIRED nghostplugin) + find_library(libtool_LIBRARY ltdl DOC "Libtool libraries") + find_path(libtool_INCLUDE_DIR ltdl.h DOC "Libtool headers") + set(QT_USE_QTDBUS TRUE) + set(QT_USE_QTSQL TRUE) + find_package(Qt4 REQUIRED) + include(${QT_USE_FILE}) install(FILES nghost.conf connections.conf plugins.conf DESTINATION ${sysconfdir}/nghost) add_definitions(-DPLUGINDIR="${plugindir}") Modified: nghost2/branches/nghost2-qt/src/nscan/CMakeLists.txt =================================================================== --- nghost2/branches/nghost2-qt/src/nscan/CMakeLists.txt 2010-03-16 19:06:17 UTC (rev 2076) +++ nghost2/branches/nghost2-qt/src/nscan/CMakeLists.txt 2010-03-19 17:00:39 UTC (rev 2077) @@ -1,4 +1,16 @@ +option(enable_nscan "Enables the nscan daemon" ON) if(enable_nscan) + pkg_check_modules(taglib REQUIRED taglib>=1.4) + find_package(SDL REQUIRED) + pkg_check_modules(nghostplugin REQUIRED nghostplugin) + pkg_check_modules(nghostlog REQUIRED nghostlog) + pkg_check_modules(nghostcore REQUIRED nghostcore) + pkg_check_modules(nghostdao REQUIRED nghostdao) + pkg_check_modules(nghostnet REQUIRED nghostnet) + set(QT_USE_QTDBUS TRUE) + set(QT_USE_QTSQL TRUE) + find_package(Qt4 REQUIRED) + include(${QT_USE_FILE}) install(FILES nscan.conf DESTINATION ${sysconfdir}/nghost) install(FILES nscan.dbus.conf @@ -38,5 +50,5 @@ ${nghostnet_LIBRARIES} ${SDLIMAGE_LIBRARY} ${SDLTTF_LIBRARY} ${SDL_gfx_LIBRARY} ${libtool_LIBRARY} ${QT_LIBRARIES}) install(TARGETS nscan - RUNTIME DESTINATION ${exec_prefix}) + RUNTIME DESTINATION sbin) endif(enable_nscan) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ks...@us...> - 2010-03-16 19:06:23
|
Revision: 2076 http://nghost.svn.sourceforge.net/nghost/?rev=2076&view=rev Author: kshots Date: 2010-03-16 19:06:17 +0000 (Tue, 16 Mar 2010) Log Message: ----------- * Forgot to update the install path for a couple of client plugin utilities Modified Paths: -------------- libnghost/src/plugins/client-plugins/CMakeLists.txt Modified: libnghost/src/plugins/client-plugins/CMakeLists.txt =================================================================== --- libnghost/src/plugins/client-plugins/CMakeLists.txt 2010-03-16 18:08:41 UTC (rev 2075) +++ libnghost/src/plugins/client-plugins/CMakeLists.txt 2010-03-16 19:06:17 UTC (rev 2076) @@ -1,3 +1,3 @@ add_subdirectory(Nweather) install(PROGRAMS nghost-cmd nscan-cmd - DESTINATION ${datadir}/bin) + DESTINATION bin) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ks...@us...> - 2010-03-16 18:08:48
|
Revision: 2075 http://nghost.svn.sourceforge.net/nghost/?rev=2075&view=rev Author: kshots Date: 2010-03-16 18:08:41 +0000 (Tue, 16 Mar 2010) Log Message: ----------- * Made an effort to make configuration changes work more smoothly - each section of libnghost now has its own library checks and lookups Modified Paths: -------------- libnghost/CMakeLists.txt libnghost/src/core/CMakeLists.txt libnghost/src/core/nghostcore.pc.in libnghost/src/dao/CMakeLists.txt libnghost/src/dao/nghostdao.pc.in libnghost/src/gui2/CMakeLists.txt libnghost/src/gui2/gfxengine.cpp libnghost/src/gui2/nghostgui2.pc.in libnghost/src/gui3/CMakeLists.txt libnghost/src/gui3/nghostgui3.pc.in libnghost/src/log/CMakeLists.txt libnghost/src/log/nghostlog.pc.in libnghost/src/net/CMakeLists.txt libnghost/src/plugins/actionevents/hdradio/CMakeLists.txt libnghost/src/plugins/actionevents/ncarinfo/CMakeLists.txt libnghost/src/plugins/actionevents/ng2dbus/CMakeLists.txt libnghost/src/plugins/actionevents/ngpsd/CMakeLists.txt libnghost/src/plugins/actionevents/test/CMakeLists.txt libnghost/src/plugins/actionevents/time/CMakeLists.txt libnghost/src/plugins/actionevents/voicesynth/CMakeLists.txt libnghost/src/plugins/client-plugins/Nweather/CMakeLists.txt libnghost/src/plugins/db/mysql/CMakeLists.txt libnghost/src/plugins/db/sqlite/CMakeLists.txt libnghost/src/plugins/download/curl/CMakeLists.txt libnghost/src/plugins/interface/CMakeLists.txt libnghost/src/plugins/interface/nghostplugin.pc.in libnghost/src/plugins/media/artgrabber/n2ograbber/CMakeLists.txt libnghost/src/plugins/media/audio/gstreamer/CMakeLists.txt libnghost/src/plugins/media/video/gstreamer/CMakeLists.txt libnghost/src/plugins/media/video/ipc/CMakeLists.txt libnghost/src/plugins/media/video/phonon/CMakeLists.txt libnghost/src/plugins/media/video/phonon/phononplayer.h libnghost/src/plugins/media/video/xine/CMakeLists.txt libnghost/src/plugins/sample/CMakeLists.txt Modified: libnghost/CMakeLists.txt =================================================================== --- libnghost/CMakeLists.txt 2010-03-15 20:15:52 UTC (rev 2074) +++ libnghost/CMakeLists.txt 2010-03-16 18:08:41 UTC (rev 2075) @@ -11,242 +11,16 @@ include(FindOpenGL) include(FindGLU) include(FindCURL) -option(enable_core - "Enables the core library" - ON) -option(enable_dao - "Enables the dao library" - ON) -option(enable_gui2 - "Enables the gui2 library" - ON) -option(enable_gui3 - "Enables the gui3 library" - OFF) -option(enable_log - "Enables the log library" - ON) -option(enable_net - "Enables the net library" - ON) -option(enable_hdradio - "Enables the hdradio actionevents plugin" - OFF) -option(enable_ncarinfo - "Enables the ncarinfo actionevents plugin" - OFF) -option(enable_ng2dbus - "Enables the ng2dbus actionevents plugin" - OFF) -option(enable_ngpsd - "Enables the ngpsd actionevents plugin" - OFF) -option(enable_test - "Enables the test actionevents plugin" - OFF) -option(enable_time - "Enables the time actionevents plugin" - OFF) -option(enable_voicesynth - "Enables the voicesynth actionevents plugin" - OFF) -option(enable_nweather - "Enables the nweather client plugin" - OFF) -option(enable_mysql - "Enables the mysql database plugin" - OFF) -option(enable_sqlite3 - "Enables the sqlite3 database plugin" - ON) -option(enable_curl - "Enables the curl download plugin" - OFF) -option(enable_plugin - "Enables the nghost plugin interface library" - ON) -option(enable_artgrabbern2o2k - "Enables the n2o2k artgrabber plugin" - OFF) -option(enable_audiogstreamer - "Enables the gstreamer audio plugin" - ON) -option(enable_videogstreamer - "Enables the video gstreamer plugin" - ON) -option(enable_videoipc - "Enables the IPC video plugin" - ON) -option(enable_videophonon - "Enables the phonon (qt4) video plugin" - OFF) -option(enable_videoxine - "Enables the xine video plugin" - OFF) -option(enable_sample - "Enables the sample plugin" - OFF) option(enable_maintainer "Enables the maintainer CFLAGS (-Wall -Werror)" OFF) -set(prefix ${CMAKE_INSTALL_PREFIX}) -set(exec_prefix ${prefix}/bin CACHE STRING "Sets the installation dir for the -executables") -set(libdir ${prefix}/lib CACHE STRING "Sets the installation dir for the -libraries") -set(includedir ${prefix}/include CACHE STRING "Sets the installation dir for -the include files") -set(plugindir ${libdir}/nghost CACHE STRING "Sets the installation dir for the -plugins") -set(datadir ${prefix}/share/nghost CACHE STRING "Sets the installation dir for -data objects") -set(sysconfdir /etc CACHE STRING "Sets the installation dir for system -configuration files") +set(plugindir ${CMAKE_INSTALL_PREFIX}/lib/nghost CACHE STRING + "Sets the installation dir for the plugins") +set(sysconfdir /etc CACHE STRING + "Sets the installation dir for system configuration files") set(VERSION 2.5.3) add_definitions(-std=c++0x) if(enable_maintainer) add_definitions("-Wall -Werror") endif(enable_maintainer) -if(enable_core) - set(need_libtool ON) - set(need_sdl ON) - set(need_boost ON) - set(need_x11 ON) -endif(enable_core) -if(enable_dao) - set(need_sdl_image ON) - set(need_taglib ON) - set(need_qt ON) - set(QT_USE_QTSQL TRUE) -endif(enable_dao) -if(enable_gui2) - set(need_x11 ON) - set(need_glibmm ON) - set(need_xmlpp ON) - set(need_sdl ON) - set(need_sdl_ttf ON) - set(need_sdl_image ON) - set(need_GL ON) - set(need_GLU ON) -endif(enable_gui2) -if(enable_gui3) - set(need_clutter ON) -endif(enable_gui3) -if(enable_net) - set(need_sdl ON) -endif(enable_net) -if(enable_hdradio) - set(need_sdl ON) - set(need_sdl_image ON) - set(need_sdl_gfx ON) - set(need_x11 ON) -endif(enable_hdradio) -if(enable_ncarinfo) - set(need_qt ON) - set(QT_USE_QTDBUS TRUE) -endif(enable_ncarinfo) -if(enable_ng2dbus) - set(need_qt ON) - set(QT_USE_QTDBUS TRUE) -endif(enable_ng2dbus) -if(enable_ngpsd) - set(need_dbus ON) -endif(enable_ngpsd) -if(enable_test) - set(need_qt ON) -endif(enable_test) -if(enable_time) - set(need_sdl ON) -endif(enable_time) -if(enable_mysql) - set(need_mysql ON) -endif(enable_mysql) -if(enable_sqlite3) - set(need_sqlite3 ON) -endif(enable_sqlite3) -if(enable_curl) - set(need_curl ON) -endif(enable_curl) -if(enable_plugin) - set(need_libtool ON) -endif(enable_plugin) -if(enable_artgrabbern2o2k) - set(need_xmlpp ON) -endif(enable_artgrabbern2o2k) -if(enable_audiogstreamer) - set(need_gstreamer ON) -endif(enable_audiogstreamer) -if(enable_videogstreamer) - set(need_gstreamer ON) -endif(enable_videogstreamer) -if(enable_videophonon) - set(need_qt ON) - set(QT_USE_PHONON TRUE) -endif(enable_videophonon) -if(enable_videoxine) - set(need_xine ON) -endif(enable_videoxine) -if(need_qt) - find_package(Qt4 REQUIRED) - include(${QT_USE_FILE}) -endif(need_qt) -if(need_libtool) - find_library(libtool_LIBRARY - ltdl - DOC "Libtool libraries") - find_path(libtool_INCLUDE_DIR - ltdl.h - DOC "Libtool headers") -endif(need_libtool) -if(need_curl) - find_package(CURL REQUIRED) -endif(need_curl) -if(need_mysql) - find_package(MYSQL REQUIRED) -endif(need_mysql) -if(need_sdl) - find_package(SDL REQUIRED) -endif(need_sdl) -if(need_sdl_image) - find_package(SDL_image REQUIRED) -endif(need_sdl_image) -if(need_sdl_ttf) - find_package(SDL_ttf REQUIRED) -endif(need_sdl_ttf) -if(need_boost) - find_package(Boost REQUIRED) -endif(need_boost) -if(need_x11) - find_package(X11 REQUIRED) -endif(need_x11) -if(need_GL) - find_package(OpenGL REQUIRED) -endif(need_GL) -if(need_GLU) - find_package(GLU REQUIRED) -endif(need_GLU) -if(need_xine) - pkg_check_modules(xine REQUIRED libxine) -endif(need_xine) -if(need_sqlite3) - pkg_check_modules(sqlite3 REQUIRED sqlite3) -endif(need_sqlite3) -if(need_dbus) - pkg_check_modules(dbus REQUIRED dbus-1) -endif(need_dbus) -if(need_glibmm) - pkg_check_modules(glibmm REQUIRED glibmm-2.4) -endif(need_glibmm) -if(need_xmlpp) - pkg_check_modules(xmlpp REQUIRED libxml++-2.6) -endif(need_xmlpp) -if(need_taglib) - pkg_check_modules(taglib REQUIRED taglib>=1.4) -endif(need_taglib) -if(need_gstreamer) - pkg_check_modules(gstreamer REQUIRED gstreamer-0.10>=0.10.12) -endif(need_gstreamer) -if(need_clutter) - pkg_check_modules(clutter REQUIRED clutter-1.0>=1.0) -endif(need_clutter) add_subdirectory(src) Modified: libnghost/src/core/CMakeLists.txt =================================================================== --- libnghost/src/core/CMakeLists.txt 2010-03-15 20:15:52 UTC (rev 2074) +++ libnghost/src/core/CMakeLists.txt 2010-03-16 18:08:41 UTC (rev 2075) @@ -1,6 +1,14 @@ +option(enable_core "Enables the core library" ON) if(enable_core) - add_definitions(-DSYSCONFDIR="${sysconfdir}" -DBINDIR="${exec_prefix}" - -DDATAROOTDIR="${datadir}" -DPLUGIN_DIR="${plugindir}" + find_library(libtool_LIBRARY ltdl DOC "Libtool libraries") + find_path(libtool_INCLUDE_DIR ltdl.h DOC "Libtool headers") + find_package(SDL REQUIRED) + find_package(Boost REQUIRED) + find_package(X11 REQUIRED) + add_definitions(-DSYSCONFDIR="${sysconfdir}" + -DBINDIR="${CMAKE_INSTALL_PREFIX}/bin" + -DDATAROOTDIR="${CMAKE_INSTALL_PREFIX}/share/nghost" + -DPLUGIN_DIR="${plugindir}" -DPACKAGE_NAME="${CMAKE_PROJECT_NAME}") configure_file(${CMAKE_CURRENT_SOURCE_DIR}/nghostcore.pc.in ${CMAKE_BINARY_DIR}/nghostcore.pc @ONLY) @@ -17,20 +25,18 @@ add_library(nghostcore SHARED ${core_sources}) add_library(nghostcore-static STATIC ${core_sources}) add_dependencies(nghostcore-static nghostlog nghostplugin) - set_property(TARGET nghostcore APPEND PROPERTY PUBLIC_HEADER - ${core_headers}) - set_property(TARGET nghostcore PROPERTY SOVERSION 0.0.0) set_target_properties(nghostcore-static PROPERTIES OUTPUT_NAME - nghostcore) - set_target_properties(nghostcore PROPERTIES CLEAN_DIRECT_OUTPUT 1) - set_target_properties(nghostcore-static PROPERTIES CLEAN_DIRECT_OUTPUT - 1) - target_link_libraries(nghostcore-static nghsotlog nghostplugin + nghostcore CLEAN_DIRECT_OUTPUT 1) + set_target_properties(nghostcore PROPERTIES CLEAN_DIRECT_OUTPUT 1 + PUBLIC_HEADER ${core_headers} SOVERSION 0.0.0) + target_link_libraries(nghostcore-static nghostlog nghostplugin ${SDL_LIBRARY} ${libtool_LIBRARY} ${X11_LIBRARIES}) + target_link_libraries(nghostcore ${SDL_LIBRARY} ${libtool_LIBRARY} + ${X11_LIBRARIES}) install(TARGETS nghostcore nghostcore-static - LIBRARY DESTINATION ${libdir} - ARCHIVE DESTINATION ${libdir} - PUBLIC_HEADER DESTINATION ${includedir}/nghost) + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib + PUBLIC_HEADER DESTINATION include/nghost) install(FILES ${CMAKE_BINARY_DIR}/nghostcore.pc - DESTINATION ${libdir}/pkgconfig) + DESTINATION lib/pkgconfig) endif(enable_core) Modified: libnghost/src/core/nghostcore.pc.in =================================================================== --- libnghost/src/core/nghostcore.pc.in 2010-03-15 20:15:52 UTC (rev 2074) +++ libnghost/src/core/nghostcore.pc.in 2010-03-16 18:08:41 UTC (rev 2075) @@ -1,7 +1,7 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@/nghost +prefix=@CMAKE_INSTALL_PREFIX@ +exec_prefix=${prefix}/bin +libdir=${prefix}/lib +includedir=${prefix}/include/nghost Name: nghostcore Description: nGhost vehicle multimedia frontend - core module Modified: libnghost/src/dao/CMakeLists.txt =================================================================== --- libnghost/src/dao/CMakeLists.txt 2010-03-15 20:15:52 UTC (rev 2074) +++ libnghost/src/dao/CMakeLists.txt 2010-03-16 18:08:41 UTC (rev 2075) @@ -1,4 +1,10 @@ +option(enable_dao "Enables the dao nghost library" ON) if(enable_dao) + set(QT_USE_QTSQL TRUE) + find_package(Qt4 REQUIRED) + find_package(SDL_image REQUIRED) + pkg_check_modules(taglib REQUIRED taglib>=1.4) + include(${QT_USE_FILE}) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/nghostdao.pc.in ${CMAKE_BINARY_DIR}/nghostdao.pc @ONLY) include_directories(${CMAKE_SOURCE_DIR}/src/log @@ -16,20 +22,18 @@ add_library(nghostdao SHARED ${dao_sources}) add_library(nghostdao-static STATIC ${dao_sources}) add_dependencies(nghostdao-static nghostcore nghostlog nghostplugin) - set_property(TARGET nghostdao APPEND PROPERTY PUBLIC_HEADER - ${dao_headers}) - set_property(TARGET nghostdao PROPERTY SOVERSION 0.0.0) set_target_properties(nghostdao-static PROPERTIES OUTPUT_NAME - nghostdao) - set_target_properties(nghostdao PROPERTIES CLEAN_DIRECT_OUTPUT 1) - set_target_properties(nghostdao-static PROPERTIES CLEAN_DIRECT_OUTPUT - 1) + nghostdao CLEAN_DIRECT_OUTPUT 1) + set_target_properties(nghostdao PROPERTIES PUBLIC_HEADER + ${dao_headers} SOVERSION 0.0.0 CLEAN_DIRECT_OUTPUT 1) target_link_libraries(nghostdao-static nghostcore nghostlog nghostplugin ${SDLIMAGE_LIBRARY} ${taglib_LIBRARIES} ${QT_LIBRARIES}) + target_link_libraries(nghostdao ${SDLIMAGE_LIBRARY} + ${taglib_LIBRARIES} ${QT_LIBRARIES}) install(TARGETS nghostdao nghostdao-static - LIBRARY DESTINATION ${libdir} - ARCHIVE DESTINATION ${libdir} - PUBLIC_HEADER DESTINATION ${includedir}/nghost) + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib + PUBLIC_HEADER DESTINATION include/nghost) install(FILES ${CMAKE_BINARY_DIR}/nghostdao.pc - DESTINATION ${libdir}/pkgconfig) + DESTINATION lib/pkgconfig) endif(enable_dao) Modified: libnghost/src/dao/nghostdao.pc.in =================================================================== --- libnghost/src/dao/nghostdao.pc.in 2010-03-15 20:15:52 UTC (rev 2074) +++ libnghost/src/dao/nghostdao.pc.in 2010-03-16 18:08:41 UTC (rev 2075) @@ -1,7 +1,7 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@/nghost +prefix=@CMAKE_INSTALL_PREFIX@ +exec_prefix=${prefix}/bin +libdir=${prefix}/lib +includedir=${prefix}/include/nghost Name: nghostdao Description: DAO library for use with nghost projects Modified: libnghost/src/gui2/CMakeLists.txt =================================================================== --- libnghost/src/gui2/CMakeLists.txt 2010-03-15 20:15:52 UTC (rev 2074) +++ libnghost/src/gui2/CMakeLists.txt 2010-03-16 18:08:41 UTC (rev 2075) @@ -1,4 +1,13 @@ +option(enable_gui2 "nghost2 gui library" ON) if(enable_gui2) + find_package(X11 REQUIRED) + find_package(SDL REQUIRED) + find_package(SDL_image REQUIRED) + find_package(SDL_ttf REQUIRED) + find_package(OpenGL REQUIRED) + find_package(GLU REQUIRED) + pkg_check_modules(glibmm REQUIRED glibmm-2.4) + pkg_check_modules(xmlpp REQUIRED libxml++-2.6) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/nghostgui2.pc.in ${CMAKE_BINARY_DIR}/nghostgui2.pc @ONLY) include_directories(${CMAKE_SOURCE_DIR}/src/log @@ -23,23 +32,23 @@ add_library(nghostgui2-static STATIC ${gui2_sources}) add_dependencies(nghostgui2-static nghostlog nghostcore nghostdao nghostnet nghostplugin) - set_property(TARGET nghostgui2 APPEND PROPERTY PUBLIC_HEADER - ${gui2_headers}) - set_property(TARGET nghostgui2 PROPERTY SOVERSION 0.0.0) set_target_properties(nghostgui2-static PROPERTIES OUTPUT_NAME - nghostgui2) - set_target_properties(nghostgui2 PROPERTIES CLEAN_DIRECT_OUTPUT 1) - set_target_properties(nghostgui2-static PROPERTIES CLEAN_DIRECT_OUTPUT - 1) + nghostgui2 CLEAN_DIRECT_OUTPUT 1) + set_target_properties(nghostgui2 PROPERTIES CLEAN_DIRECT_OUTPUT 1 + PUBLIC_HEADER ${gui2_headers} SOVERSION 0.0.0) target_link_libraries(nghostgui2-static nghostlog nghostcore nghostdao nghostnet nghostplugin ${glibmm_LIBRARIES} ${xmlpp_LIBRARIES} ${X11_LIBRARIES} ${SDL_gfx_LIBRARY} ${SDLTTF_LIBRARY} ${SDLIMAGE_LIBRARY} ${SDL_LIBRARY} ${GLU_LIBRARY} ${OPENGL_LIBRARIES}) + target_link_libraries(nghostgui2 ${glibmm_LIBRARIES} + ${xmlpp_LIBRARIES} ${X11_LIBRARIES} ${SDL_gfx_LIBRARY} + ${SDLTTF_LIBRARY} ${SDLIMAGE_LIBRARY} ${SDL_LIBRARY} + ${GLU_LIBRARY} ${OPENGL_LIBRARIES}) install(TARGETS nghostgui2 nghostgui2-static - LIBRARY DESTINATION ${libdir} - ARCHIVE DESTINATION ${libdir} - PUBLIC_HEADER DESTINATION ${includedir}/nghost) + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib + PUBLIC_HEADER DESTINATION include/nghost) install(FILES ${CMAKE_BINARY_DIR}/nghostgui2.pc - DESTINATION ${libdir}/pkgconfig) + DESTINATION lib/pkgconfig) endif(enable_gui2) Modified: libnghost/src/gui2/gfxengine.cpp =================================================================== --- libnghost/src/gui2/gfxengine.cpp 2010-03-15 20:15:52 UTC (rev 2074) +++ libnghost/src/gui2/gfxengine.cpp 2010-03-16 18:08:41 UTC (rev 2075) @@ -17,7 +17,6 @@ * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. du * ***************************************************************************/ -#include <QWidget> #include <sstream> #include <string.h> #include <X11/X.h> Modified: libnghost/src/gui2/nghostgui2.pc.in =================================================================== --- libnghost/src/gui2/nghostgui2.pc.in 2010-03-15 20:15:52 UTC (rev 2074) +++ libnghost/src/gui2/nghostgui2.pc.in 2010-03-16 18:08:41 UTC (rev 2075) @@ -1,7 +1,7 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@/nghost +prefix=@CMAKE_INSTALL_PREFIX@ +exec_prefix=${prefix}/bin +libdir=${prefix}/lib +includedir=${prefix}/include/nghost Name: nghostgui Description: gui library for use in nghost projects Modified: libnghost/src/gui3/CMakeLists.txt =================================================================== --- libnghost/src/gui3/CMakeLists.txt 2010-03-15 20:15:52 UTC (rev 2074) +++ libnghost/src/gui3/CMakeLists.txt 2010-03-16 18:08:41 UTC (rev 2075) @@ -1,4 +1,6 @@ +option(enable_gui3 "nghost2 gui3 library" OFF) if(enable_gui3) + pkg_check_modules(clutter REQUIRED clutter-1.0>=1.0) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/nghostgui3.pc.in ${CMAKE_BINARY_DIR}/nghostgui3.pc @ONLY) include_directories(${CMAKE_SOURCE_DIR}/src/core @@ -9,19 +11,16 @@ add_library(nghostgui3-static STATIC ${gui3_sources}) add_dependencies(nghostgui3-static nghostcore) set_target_properties(nghostgui3-static PROPERTIES OUTPUT_NAME - nghostgui3) - set_target_properties(nghostgui3 PROPERTIES CLEAN_DIRECT_OUTPUT 1) - set_target_properties(nghostgui3-static PROPERTIES CLEAN_DIRECT_OUTPUT - 1) - set_property(TARGET nghostgui3 APPEND PROPERTY PUBLIC_HEADER - ${gui3_headers}) - set_property(TARGET nghostgui3 PROPERTY SOVERSION 0.0.0) + nghostgui3 CLEAN_DIRECT_OUTPUT 1) + set_target_properties(nghostgui3 PROPERTIES CLEAN_DIRECT_OUTPUT 1 + PUBLIC_HEADER ${gui3_headers} SOVERSION 0.0.0) target_link_libraries(nghostgui3-static nghostcore ${clutter_LIBRARIES}) + target_link_libraries(nghostgui3 ${clutter_LIBRARIES}) install(TARGETS nghostgui3 nghostgui3-static - LIBRARY DESTINATION ${libdir} - ARCHIVE DESTINATION ${libdir} - PUBLIC_HEADER DESTINATION ${includedir}/nghost) + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib + PUBLIC_HEADER DESTINATION include/nghost) install(FILES ${CMAKE_BINARY_DIR}/nghostgui3.pc - DESTINATION ${libdir}/pkgconfig) + DESTINATION lib/pkgconfig) endif(enable_gui3) Modified: libnghost/src/gui3/nghostgui3.pc.in =================================================================== --- libnghost/src/gui3/nghostgui3.pc.in 2010-03-15 20:15:52 UTC (rev 2074) +++ libnghost/src/gui3/nghostgui3.pc.in 2010-03-16 18:08:41 UTC (rev 2075) @@ -1,7 +1,7 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ +prefix=@CMAKE_INSTALL_PREFIX@ +exec_prefix=${prefix}/bin +libdir=${prefix}/lib +includedir=${prefix}/include/nghost Name: nghostgui3 Description: gui library for use in nghost3 projects Modified: libnghost/src/log/CMakeLists.txt =================================================================== --- libnghost/src/log/CMakeLists.txt 2010-03-15 20:15:52 UTC (rev 2074) +++ libnghost/src/log/CMakeLists.txt 2010-03-16 18:08:41 UTC (rev 2075) @@ -1,3 +1,4 @@ +option(enable_log "nghost2 log library" ON) if(enable_log) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/nghostlog.pc.in ${CMAKE_BINARY_DIR}/nghostlog.pc @ONLY) @@ -7,18 +8,15 @@ set(log_sources debugtransportsyslog.cpp ndebug.cpp nerror.cpp) add_library(nghostlog SHARED ${log_sources}) add_library(nghostlog-static STATIC ${log_sources}) - set_property(TARGET nghostlog APPEND PROPERTY PUBLIC_HEADER - ${log_headers}) - set_property(TARGET nghostlog PROPERTY SOVERSION 0.0.0) + set_target_properties(nghostlog PROPERTIES CLEAN_DIRECT_OUTPUT 1 + SOVERSION 0.0.0) set_target_properties(nghostlog-static PROPERTIES OUTPUT_NAME - nghostlog) - set_target_properties(nghostlog PROPERTIES CLEAN_DIRECT_OUTPUT 1) - set_target_properties(nghostlog-static PROPERTIES CLEAN_DIRECT_OUTPUT - 1) + nghostlog CLEAN_DIRECT_OUTPUT 1) + set_property(TARGET nghostlog PROPERTY PUBLIC_HEADER ${log_headers}) install(TARGETS nghostlog nghostlog-static - LIBRARY DESTINATION ${libdir} - ARCHIVE DESTINATION ${libdir} - PUBLIC_HEADER DESTINATION ${includedir}/nghost) + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib + PUBLIC_HEADER DESTINATION include/nghost) install(FILES ${CMAKE_BINARY_DIR}/nghostlog.pc - DESTINATION ${libdir}/pkgconfig) + DESTINATION lib/pkgconfig) endif(enable_log) Modified: libnghost/src/log/nghostlog.pc.in =================================================================== --- libnghost/src/log/nghostlog.pc.in 2010-03-15 20:15:52 UTC (rev 2074) +++ libnghost/src/log/nghostlog.pc.in 2010-03-16 18:08:41 UTC (rev 2075) @@ -1,7 +1,7 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@/nghost +prefix=@CMAKE_INSTALL_PREFIX@ +exec_prefix=${prefix}/bin +libdir=${prefix}/lib +includedir=${prefix}/include/nghost Name: nghostlog Description: log library for use in nghost projects Modified: libnghost/src/net/CMakeLists.txt =================================================================== --- libnghost/src/net/CMakeLists.txt 2010-03-15 20:15:52 UTC (rev 2074) +++ libnghost/src/net/CMakeLists.txt 2010-03-16 18:08:41 UTC (rev 2075) @@ -1,4 +1,6 @@ +option(enable_net "nghost2 net library" ON) if(enable_net) + find_package(SDL REQUIRED) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/nghostnet.pc.in ${CMAKE_BINARY_DIR}/nghostnet.pc @ONLY) include_directories(${CMAKE_SOURCE_DIR}/src/log @@ -10,19 +12,16 @@ add_library(nghostnet-static STATIC ${net_sources}) add_dependencies(nghostnet-static nghostlog nghostcore) set_target_properties(nghostnet-static PROPERTIES OUTPUT_NAME - nghostnet) - set_target_properties(nghostnet PROPERTIES CLEAN_DIRECT_OUTPUT 1) - set_target_properties(nghostnet-static PROPERTIES CLEAN_DIRECT_OUTPUT - 1) - set_property(TARGET nghostnet APPEND PROPERTY PUBLIC_HEADER - ${net_headers}) - set_property(TARGET nghostnet PROPERTY SOVERSION 0.0.0) + nghostnet CLEAN_DIRECT_OUTPUT 1) + set_target_properties(nghostnet PROPERTIES CLEAN_DIRECT_OUTPUT 1 + PUBLIC_HEADER ${net_headers} SOVERSION 0.0.0) target_link_libraries(nghostnet-static nghostlog nghostcore ${SDL_LIBRARY}) + target_link_libraries(nghostnet ${SDL_LIBRARY}) install(TARGETS nghostnet nghostnet-static - LIBRARY DESTINATION ${libdir} - ARCHIVE DESTINATION ${libdir} - PUBLIC_HEADER DESTINATION ${includedir}/nghost) + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib + PUBLIC_HEADER DESTINATION include/nghost) install(FILES ${CMAKE_BINARY_DIR}/nghostnet.pc - DESTINATION ${libdir}/pkgconfig) + DESTINATION lib/pkgconfig) endif(enable_net) Modified: libnghost/src/plugins/actionevents/hdradio/CMakeLists.txt =================================================================== --- libnghost/src/plugins/actionevents/hdradio/CMakeLists.txt 2010-03-15 20:15:52 UTC (rev 2074) +++ libnghost/src/plugins/actionevents/hdradio/CMakeLists.txt 2010-03-16 18:08:41 UTC (rev 2075) @@ -1,4 +1,9 @@ +option(enable_hdradio "nghost hdradio plugin" OFF) if(enable_hdradio) + find_package(SDL REQUIRED) + find_package(SDL_image REQUIRED) + find_package(SDL_gfx REQUIRED) + find_package(X11 REQUIRED) include_directories(${CMAKE_SOURCE_DIR}/src/plugins/interface ${CMAKE_SOURCE_DIR}/src/core ${CMAKE_SOURCE_DIR}/src/gui2 ${CMAKE_SOURCE_DIR}/src/net ${CMAKE_SOURCE_DIR}/src/log Modified: libnghost/src/plugins/actionevents/ncarinfo/CMakeLists.txt =================================================================== --- libnghost/src/plugins/actionevents/ncarinfo/CMakeLists.txt 2010-03-15 20:15:52 UTC (rev 2074) +++ libnghost/src/plugins/actionevents/ncarinfo/CMakeLists.txt 2010-03-16 18:08:41 UTC (rev 2075) @@ -1,4 +1,6 @@ +option(enable_ncarinfo "nghost2 ncarinfo plugin" OFF) if(enable_ncarinfo) + find_package(Qt4 REQUIRED) include_directories(${CMAKE_SOURCE_DIR}/src/plugins/interface ${CMAKE_SOURCE_DIR}/src/core ${CMAKE_SOURCE_DIR}/src/dao ${CMAKE_SOURCE_DIR}/src/gui2 ${CMAKE_SOURCE_DIR}/src/net Modified: libnghost/src/plugins/actionevents/ng2dbus/CMakeLists.txt =================================================================== --- libnghost/src/plugins/actionevents/ng2dbus/CMakeLists.txt 2010-03-15 20:15:52 UTC (rev 2074) +++ libnghost/src/plugins/actionevents/ng2dbus/CMakeLists.txt 2010-03-16 18:08:41 UTC (rev 2075) @@ -1,4 +1,6 @@ +option(enable_ng2dbus "nghost2 dbus plugin" OFF) if(enable_ng2dbus) + find_package(Qt4 REQUIRED) include_directories(${CMAKE_SOURCE_DIR}/src/plugins/interface ${CMAKE_SOURCE_DIR}/src/core ${CMAKE_SOURCE_DIR}/src/log) set(ng2dbus_headers ng2dbus.h adaptor.h nghostdbus.h) Modified: libnghost/src/plugins/actionevents/ngpsd/CMakeLists.txt =================================================================== --- libnghost/src/plugins/actionevents/ngpsd/CMakeLists.txt 2010-03-15 20:15:52 UTC (rev 2074) +++ libnghost/src/plugins/actionevents/ngpsd/CMakeLists.txt 2010-03-16 18:08:41 UTC (rev 2075) @@ -1,4 +1,6 @@ +option(enable_ngpsd "nghost2 gpsd plugin" OFF) if(enable_ngpsd) + pkg_check_modules(dbus REQUIRED dbus-1) include_directories(${CMAKE_SOURCE_DIR}/src/plugins/interface ${CMAKE_SOURCE_DIR}/src/core ${CMAKE_SOURCE_DIR}/src/log ${dbus_INCLUDE_DIRS}) Modified: libnghost/src/plugins/actionevents/test/CMakeLists.txt =================================================================== --- libnghost/src/plugins/actionevents/test/CMakeLists.txt 2010-03-15 20:15:52 UTC (rev 2074) +++ libnghost/src/plugins/actionevents/test/CMakeLists.txt 2010-03-16 18:08:41 UTC (rev 2075) @@ -1,4 +1,6 @@ +option(enable_test "nghost2 test plugin" OFF) if(enable_test) + find_package(Qt4 REQUIRED) include_directories(${CMAKE_SOURCE_DIR}/src/plugins/interface ${CMAKE_SOURCE_DIR}/src/core ${CMAKE_SOURCE_DIR}/src/log) set(test_headers test.h) Modified: libnghost/src/plugins/actionevents/time/CMakeLists.txt =================================================================== --- libnghost/src/plugins/actionevents/time/CMakeLists.txt 2010-03-15 20:15:52 UTC (rev 2074) +++ libnghost/src/plugins/actionevents/time/CMakeLists.txt 2010-03-16 18:08:41 UTC (rev 2075) @@ -1,4 +1,6 @@ +option(enable_time "nghost2 time plugin" OFF) if(enable_time) + find_package(SDL REQUIRED) include_directories(${CMAKE_SOURCE_DIR}/src/plugins/interface ${CMAKE_SOURCE_DIR}/src/core ${CMAKE_SOURCE_DIR}/src/log ${SDL_INCLUDE_DIR}) Modified: libnghost/src/plugins/actionevents/voicesynth/CMakeLists.txt =================================================================== --- libnghost/src/plugins/actionevents/voicesynth/CMakeLists.txt 2010-03-15 20:15:52 UTC (rev 2074) +++ libnghost/src/plugins/actionevents/voicesynth/CMakeLists.txt 2010-03-16 18:08:41 UTC (rev 2075) @@ -1,3 +1,4 @@ +option(enable_voicesynth "nghost2 voicesynth plugin" OFF) if(enable_voicesynth) include_directories(${CMAKE_SOURCE_DIR}/src/plugins/interface ${CMAKE_SOURCE_DIR}/src/core ${CMAKE_SOURCE_DIR}/src/log Modified: libnghost/src/plugins/client-plugins/Nweather/CMakeLists.txt =================================================================== --- libnghost/src/plugins/client-plugins/Nweather/CMakeLists.txt 2010-03-15 20:15:52 UTC (rev 2074) +++ libnghost/src/plugins/client-plugins/Nweather/CMakeLists.txt 2010-03-16 18:08:41 UTC (rev 2075) @@ -1,3 +1,4 @@ +option(enable_nweather "nghost2 nweather client plugin" OFF) if(enable_nweather) install(FILES weather.conf DESTINATION ${sysconfdir}/nghost) @@ -2,3 +3,3 @@ install(PROGRAMS nweather.py weather.py - DESTINATION ${datadir}/bin) + DESTINATION bin) endif(enable_nweather) Modified: libnghost/src/plugins/db/mysql/CMakeLists.txt =================================================================== --- libnghost/src/plugins/db/mysql/CMakeLists.txt 2010-03-15 20:15:52 UTC (rev 2074) +++ libnghost/src/plugins/db/mysql/CMakeLists.txt 2010-03-16 18:08:41 UTC (rev 2075) @@ -1,4 +1,6 @@ +option(enable_mysql "nghost2 mysql database plugin" OFF) if(enable_mysql) + find_package(MYSQL REQUIRED) include_directories(${CMAKE_SOURCE_DIR}/src/plugins/interface ${MYSQL_INCLUDE_DIR}) set(mysql_database_headers mysqldatabase.h) Modified: libnghost/src/plugins/db/sqlite/CMakeLists.txt =================================================================== --- libnghost/src/plugins/db/sqlite/CMakeLists.txt 2010-03-15 20:15:52 UTC (rev 2074) +++ libnghost/src/plugins/db/sqlite/CMakeLists.txt 2010-03-16 18:08:41 UTC (rev 2075) @@ -1,4 +1,6 @@ +option(enable_sqlite3 "nghost2 sqlite3 database plugin" ON) if(enable_sqlite3) + pkg_check_modules(sqlite3 REQUIRED sqlite3) include_directories(${CMAKE_SOURCE_DIR}/src/plugins/interface ${CMAKE_SOURCE_DIR}/src/core ${sqlite3_INCLUDE_DIRS}) set(sqlite_database_headers sqlitedatabase.h) Modified: libnghost/src/plugins/download/curl/CMakeLists.txt =================================================================== --- libnghost/src/plugins/download/curl/CMakeLists.txt 2010-03-15 20:15:52 UTC (rev 2074) +++ libnghost/src/plugins/download/curl/CMakeLists.txt 2010-03-16 18:08:41 UTC (rev 2075) @@ -1,4 +1,6 @@ +option(enable_curl "nghost2 curl download plugin" OFF) if(enable_curl) + find_package(CURL REQUIRED) include_directories(${CMAKE_SOURCE_DIR}/src/plugins/interface ${CMAKE_SOURCE_DIR}/src/log ${CURL_INCLUDE_DIRS}) set(curl_headers download.h) Modified: libnghost/src/plugins/interface/CMakeLists.txt =================================================================== --- libnghost/src/plugins/interface/CMakeLists.txt 2010-03-15 20:15:52 UTC (rev 2074) +++ libnghost/src/plugins/interface/CMakeLists.txt 2010-03-16 18:08:41 UTC (rev 2075) @@ -1,4 +1,7 @@ +option(enable_plugin "nghost plugin interface library" ON) if(enable_plugin) + find_library(libtool_LIBRARY ltdl DOC "Libtool libraries") + find_path(libtool_INCLUDE_DIR ltdl.h DOC "Libtool headers") configure_file(${CMAKE_CURRENT_SOURCE_DIR}/nghostplugin.pc.in ${CMAKE_BINARY_DIR}/nghostplugin.pc @ONLY) include_directories(${CMAKE_SOURCE_DIR}/src/log @@ -17,19 +20,16 @@ add_library(nghostplugin-static STATIC ${plugin_sources}) add_dependencies(nghostplugin-static nghostlog nghostcore nghostgui2) set_target_properties(nghostplugin-static PROPERTIES OUTPUT_NAME - nghostplugin) - set_target_properties(nghostplugin PROPERTIES CLEAN_DIRECT_OUTPUT 1) - set_target_properties(nghostplugin-static PROPERTIES - CLEAN_DIRECT_OUTPUT 1) - set_property(TARGET nghostplugin APPEND PROPERTY PUBLIC_HEADER - ${plugin_headers}) - set_property(TARGET nghostplugin PROPERTY SOVERSION 0.0.0) + nghostplugin CLEAN_DIRECT_OUTPUT 1) + set_target_properties(nghostplugin PROPERTIES CLEAN_DIRECT_OUTPUT 1 + PUBLIC_HEADER ${plugin_headers} SOVERSION 0.0.0) target_link_libraries(nghostplugin-static nghostlog nghostcore nghostgui2 ${libtool_LIBRARY}) + target_link_libraries(nghostplugin ${libtool_LIBRARY}) install(TARGETS nghostplugin nghostplugin-static - LIBRARY DESTINATION ${libdir} - ARCHIVE DESTINATION ${libdir} - PUBLIC_HEADER DESTINATION ${includedir}/nghost) + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib + PUBLIC_HEADER DESTINATION include/nghost) install(FILES ${CMAKE_BINARY_DIR}/nghostplugin.pc - DESTINATION ${libdir}/pkgconfig) + DESTINATION lib/pkgconfig) endif(enable_plugin) Modified: libnghost/src/plugins/interface/nghostplugin.pc.in =================================================================== --- libnghost/src/plugins/interface/nghostplugin.pc.in 2010-03-15 20:15:52 UTC (rev 2074) +++ libnghost/src/plugins/interface/nghostplugin.pc.in 2010-03-16 18:08:41 UTC (rev 2075) @@ -1,7 +1,7 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@/nghost +prefix=@CMAKE_INSTALL_PREFIX@ +exec_prefix=@CMAKE_INSTALL_PREFIX@/bin +libdir=@CMAKE_INSTALL_PREFIX@/lib +includedir=@CMAKE_INSTALL_PREFIX@/lib/nghost plugindir=@plugindir@ Name: nghostplugin Modified: libnghost/src/plugins/media/artgrabber/n2ograbber/CMakeLists.txt =================================================================== --- libnghost/src/plugins/media/artgrabber/n2ograbber/CMakeLists.txt 2010-03-15 20:15:52 UTC (rev 2074) +++ libnghost/src/plugins/media/artgrabber/n2ograbber/CMakeLists.txt 2010-03-16 18:08:41 UTC (rev 2075) @@ -1,4 +1,6 @@ +option(enable_artgrabbern2o2k "nghost2 n2o2k artgrabber plugin" OFF) if(enable_artgrabbern2o2k) + pkg_check_modules(xmlpp REQUIRED libxml++-2.6) include_directories(${CMAKE_SOURCE_DIR}/src/plugins/interface ${CMAKE_SOURCE_DIR}/src/log ${CMAKE_SOURCE_DIR}/src/core ${xmlpp_INCLUDE_DIRS}) Modified: libnghost/src/plugins/media/audio/gstreamer/CMakeLists.txt =================================================================== --- libnghost/src/plugins/media/audio/gstreamer/CMakeLists.txt 2010-03-15 20:15:52 UTC (rev 2074) +++ libnghost/src/plugins/media/audio/gstreamer/CMakeLists.txt 2010-03-16 18:08:41 UTC (rev 2075) @@ -1,4 +1,6 @@ +option(enable_audiogstreamer "nghost2 multimedia audio plugin - gstreamer" ON) if(enable_audiogstreamer) + pkg_check_modules(gstreamer REQUIRED gstreamer-0.10>=0.10.12) include_directories(${CMAKE_SOURCE_DIR}/src/plugins/interface ${CMAKE_SOURCE_DIR}/src/log ${CMAKE_SOURCE_DIR}/src/core ${gstreamer_INCLUDE_DIRS}) Modified: libnghost/src/plugins/media/video/gstreamer/CMakeLists.txt =================================================================== --- libnghost/src/plugins/media/video/gstreamer/CMakeLists.txt 2010-03-15 20:15:52 UTC (rev 2074) +++ libnghost/src/plugins/media/video/gstreamer/CMakeLists.txt 2010-03-16 18:08:41 UTC (rev 2075) @@ -1,4 +1,6 @@ +option(enable_videogstreamer "nghost2 multimedia video plugin - gstreamer" ON) if(enable_videogstreamer) + pkg_check_modules(gstreamer REQUIRED gstreamer-0.10>=0.10.12) include_directories(${CMAKE_SOURCE_DIR}/src/plugins/interface ${CMAKE_SOURCE_DIR}/src/log ${CMAKE_SOURCE_DIR}/src/core ${gstreamer_INCLUDE_DIRS}) Modified: libnghost/src/plugins/media/video/ipc/CMakeLists.txt =================================================================== --- libnghost/src/plugins/media/video/ipc/CMakeLists.txt 2010-03-15 20:15:52 UTC (rev 2074) +++ libnghost/src/plugins/media/video/ipc/CMakeLists.txt 2010-03-16 18:08:41 UTC (rev 2075) @@ -1,3 +1,4 @@ +option(enable_videoipc "nghost2 multimedia video plugin - ipc" OFF) if(enable_videoipc) include_directories(${CMAKE_SOURCE_DIR}/src/plugins/interface ${CMAKE_SOURCE_DIR}/src/log ${CMAKE_SOURCE_DIR}/src/core) Modified: libnghost/src/plugins/media/video/phonon/CMakeLists.txt =================================================================== --- libnghost/src/plugins/media/video/phonon/CMakeLists.txt 2010-03-15 20:15:52 UTC (rev 2074) +++ libnghost/src/plugins/media/video/phonon/CMakeLists.txt 2010-03-16 18:08:41 UTC (rev 2075) @@ -1,4 +1,7 @@ +option(enable_videophonon "nghost2 multimedia video plugin - phonon" ON) if(enable_videophonon) + find_package(Qt4 REQUIRED) + set(QT_USE_PHONON TRUE) include_directories(${CMAKE_SOURCE_DIR}/src/plugins/interface ${CMAKE_SOURCE_DIR}/src/log ${CMAKE_SOURCE_DIR}/src/core) set(videophonon_headers phononplayer.h) Modified: libnghost/src/plugins/media/video/phonon/phononplayer.h =================================================================== --- libnghost/src/plugins/media/video/phonon/phononplayer.h 2010-03-15 20:15:52 UTC (rev 2074) +++ libnghost/src/plugins/media/video/phonon/phononplayer.h 2010-03-16 18:08:41 UTC (rev 2075) @@ -23,7 +23,7 @@ // nghost_plugin.h defined virtual std::string pluginName()const{return "phonon media player";} virtual std::string pluginAuthor()const{return "Richard \"KShots\" F. Ostrow Jr. and Kevron \"Tripzero\" Rees";} - virtual std::string pluginDescription()const{return "Media player utilizing the Qt-4.5 phonon libraries";} + virtual std::string pluginDescription()const{return "Media player utilizing the Qt-4.x phonon libraries";} virtual std::string pluginVersion()const{return "0.0.1";} // nghost_plugin_media.h defined Modified: libnghost/src/plugins/media/video/xine/CMakeLists.txt =================================================================== --- libnghost/src/plugins/media/video/xine/CMakeLists.txt 2010-03-15 20:15:52 UTC (rev 2074) +++ libnghost/src/plugins/media/video/xine/CMakeLists.txt 2010-03-16 18:08:41 UTC (rev 2075) @@ -1,4 +1,6 @@ +option(enable_videoxine "nghost2 multimedia video plugin - xine" OFF) if(enable_videoxine) + pkg_check_modules(xine REQUIRED libxine) include_directories(${CMAKE_SOURCE_DIR}/src/plugins/interface ${CMAKE_SOURCE_DIR}/src/log ${CMAKE_SOURCE_DIR}/src/core ${xine_INCLUDE_DIRS}) Modified: libnghost/src/plugins/sample/CMakeLists.txt =================================================================== --- libnghost/src/plugins/sample/CMakeLists.txt 2010-03-15 20:15:52 UTC (rev 2074) +++ libnghost/src/plugins/sample/CMakeLists.txt 2010-03-16 18:08:41 UTC (rev 2075) @@ -1,3 +1,4 @@ +option(enable_sample "nghost2 sample plugin" OFF) if(enable_sample) include_directories(${CMAKE_SOURCE_DIR}/src/plugins/interface) set(sample_headers sample.h) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ks...@us...> - 2010-03-15 20:16:00
|
Revision: 2074 http://nghost.svn.sourceforge.net/nghost/?rev=2074&view=rev Author: kshots Date: 2010-03-15 20:15:52 +0000 (Mon, 15 Mar 2010) Log Message: ----------- * Adjusted nscan code to utilize system dbus rather than session dbus - appears to successfully register an object and service now... Modified Paths: -------------- nghost2/branches/nghost2-qt/src/nscan/nscan.cpp Modified: nghost2/branches/nghost2-qt/src/nscan/nscan.cpp =================================================================== --- nghost2/branches/nghost2-qt/src/nscan/nscan.cpp 2010-03-04 17:31:41 UTC (rev 2073) +++ nghost2/branches/nghost2-qt/src/nscan/nscan.cpp 2010-03-15 20:15:52 UTC (rev 2074) @@ -19,13 +19,13 @@ connect(this, SIGNAL(SourceAdded(const QString &, const QString &)), dbus, SIGNAL(SourceAdded(const QString &, const QString &))); connect(this, SIGNAL(SourceRemoved(const QString &, const QString &)), dbus, SIGNAL(SourceRemoved(const QString &, const QString &))); connect(this, SIGNAL(watchTriggered(int, int, QString, QString)), dbus, SIGNAL(watchTriggered(int, int, QString, QString))); - if(!QDBusConnection::sessionBus().registerObject("/org/openice/nscan", this)) + if(!QDBusConnection::systemBus().registerObject("/org/openice/nscan", this)) { QDBusError e = QDBusConnection::sessionBus().lastError(); ndebug::out(ndebug::LOG_ERR, "%s:%s(%d) - Failed to register dbus object '/org/openice/nscan' - %s: %s", __FILE__, __FUNCTION__, __LINE__, e.name().toAscii().constData(), e.message().toAscii().constData()); exit(1); } - if(!QDBusConnection::sessionBus().registerService("org.openice.nscan")) + if(!QDBusConnection::systemBus().registerService("org.openice.nscan")) { QDBusError e = QDBusConnection::sessionBus().lastError(); ndebug::out(ndebug::LOG_ERR, "%s:%s(%d) - Failed to register dbus service 'org.openice.nscan' - %s: %s", __FILE__, __FUNCTION__, __LINE__, e.name().toAscii().constData(), e.message().toAscii().constData()); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <nan...@us...> - 2010-03-04 17:31:47
|
Revision: 2073 http://nghost.svn.sourceforge.net/nghost/?rev=2073&view=rev Author: nanonymous Date: 2010-03-04 17:31:41 +0000 (Thu, 04 Mar 2010) Log Message: ----------- fixed linker errors Modified Paths: -------------- nghost2/branches/nghost2-qt/src/nghost/event.cpp nghost2/branches/nghost2-qt/src/nghost/event.h nghost2/branches/nghost2-qt/src/nghost/nscan.cpp Modified: nghost2/branches/nghost2-qt/src/nghost/event.cpp =================================================================== --- nghost2/branches/nghost2-qt/src/nghost/event.cpp 2010-03-04 17:30:59 UTC (rev 2072) +++ nghost2/branches/nghost2-qt/src/nghost/event.cpp 2010-03-04 17:31:41 UTC (rev 2073) @@ -220,7 +220,7 @@ if(ifButtonEvent()) return 1; if(ifSliderEvent()) return 1; if(ifListboxEvent()) return 1; - if(ifDesktopEvent()) return 1; +// if(ifDesktopEvent()) return 1; nghost::inputClass::ifEventExit(); if(nghost::inputClass::ifEventEntry() || nghost::inputClass::ifEventVisible()) { @@ -397,7 +397,7 @@ return 0; } -int EventClass::ifDesktopEvent() +/*int EventClass::ifDesktopEvent() { for(size_t i=0;i<screen->desktops.size();i++) { @@ -415,7 +415,7 @@ } return 0; } - +*/ int EventClass::doAction(nghost::ActionClass a) { string action=a.name,action_type=a.action_class,action2=a.method; @@ -711,12 +711,12 @@ screen->redraw(); notifyScreenSubscribers(); } - else if(action_type=="desktop") +/* else if(action_type=="desktop") { for(size_t i=0;i<screen->desktops.size();i++) if(action==screen->desktops[i]->getName()) doDesktopAction(a,i); - } + }*/ else if(action_type=="popup") ///ACTION_CLASS: popup ///ACTION_TEMPLATE popup:nameofpopupTemplate numbuttons "OnOkay:action 'params'" "OnCancel:action..." "text line1" "text line2" etc... @@ -1141,7 +1141,7 @@ return 0; } -int EventClass::doDesktopAction(nghost::ActionClass a, size_t i) +/*int EventClass::doDesktopAction(nghost::ActionClass a, size_t i) { if(a.method == "load") ///ACTION_TEMPLATE: desktop:name load "category" @@ -1180,7 +1180,7 @@ return -1; } return 1; -} +}*/ int EventClass::doMediaAction(nghost::ActionClass a) { Modified: nghost2/branches/nghost2-qt/src/nghost/event.h =================================================================== --- nghost2/branches/nghost2-qt/src/nghost/event.h 2010-03-04 17:30:59 UTC (rev 2072) +++ nghost2/branches/nghost2-qt/src/nghost/event.h 2010-03-04 17:31:41 UTC (rev 2073) @@ -72,7 +72,7 @@ int ifButtonEvent(); int ifSliderEvent(); int ifListboxEvent(); - int ifDesktopEvent(); +// int ifDesktopEvent(); int doAction(nghost::ActionClass); int doEventSubscriberAction(nghost::ActionClass); int doScreenAction(nghost::ActionClass action); Modified: nghost2/branches/nghost2-qt/src/nghost/nscan.cpp =================================================================== --- nghost2/branches/nghost2-qt/src/nghost/nscan.cpp 2010-03-04 17:30:59 UTC (rev 2072) +++ nghost2/branches/nghost2-qt/src/nghost/nscan.cpp 2010-03-04 17:31:41 UTC (rev 2073) @@ -10,11 +10,25 @@ } +void NScanScan::itemFoundEvent(QString item) +{ +Q_UNUSED(item) +} +void NScanScan::progress(int percent) +{ +Q_UNUSED(percent) +} + NScan::NScan() { m_ActionClass = "nscan"; } +NScan::~NScan() +{ + +} + void NScan::onAction(nghost::ActionClass action) { if(action.method == "scan") @@ -30,3 +44,4 @@ } } + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <nan...@us...> - 2010-03-04 17:31:05
|
Revision: 2072 http://nghost.svn.sourceforge.net/nghost/?rev=2072&view=rev Author: nanonymous Date: 2010-03-04 17:30:59 +0000 (Thu, 04 Mar 2010) Log Message: ----------- removed deprecated desktop stuff Modified Paths: -------------- libnghost/src/gui2/screen.cpp Modified: libnghost/src/gui2/screen.cpp =================================================================== --- libnghost/src/gui2/screen.cpp 2010-03-04 17:22:11 UTC (rev 2071) +++ libnghost/src/gui2/screen.cpp 2010-03-04 17:30:59 UTC (rev 2072) @@ -402,7 +402,7 @@ newbar->move(x,y); progressbars.push_back(newbar); } - else if(i_type=="desktop") +/* else if(i_type=="desktop") { Desktop *d=new Desktop; d->init(gfx); @@ -417,7 +417,7 @@ d->setFolderIcon(SKINDIR+"folder.png"); d->loadDesktop(); desktops.push_back(d); - } + }*/ else if(i_type=="include") { int si = getScreenFromName(i_action); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ks...@us...> - 2010-03-04 17:22:17
|
Revision: 2071 http://nghost.svn.sourceforge.net/nghost/?rev=2071&view=rev Author: kshots Date: 2010-03-04 17:22:11 +0000 (Thu, 04 Mar 2010) Log Message: ----------- * Updated nghost2-qt to link to qt properly Modified Paths: -------------- nghost2/branches/nghost2-qt/CMakeLists.txt nghost2/branches/nghost2-qt/src/nghost/CMakeLists.txt Modified: nghost2/branches/nghost2-qt/CMakeLists.txt =================================================================== --- nghost2/branches/nghost2-qt/CMakeLists.txt 2010-03-04 17:15:14 UTC (rev 2070) +++ nghost2/branches/nghost2-qt/CMakeLists.txt 2010-03-04 17:22:11 UTC (rev 2071) @@ -70,6 +70,8 @@ set(need_nghostnet ON) set(need_nghostplugin ON) set(need_libtool ON) + set(QT_USE_QTDBUS TRUE) + set(QT_USE_QTSQL TRUE) endif(enable_nghost) if(need_libtool) find_library(libtool_LIBRARY Modified: nghost2/branches/nghost2-qt/src/nghost/CMakeLists.txt =================================================================== --- nghost2/branches/nghost2-qt/src/nghost/CMakeLists.txt 2010-03-04 17:15:14 UTC (rev 2070) +++ nghost2/branches/nghost2-qt/src/nghost/CMakeLists.txt 2010-03-04 17:22:11 UTC (rev 2071) @@ -41,7 +41,7 @@ ${nghostgui2_LIBRARIES} ${nghostlog_LIBRARIES} ${nghostnet_LIBRARIES} ${nghostplugin_LIBRARIES} ${SDLIMAGE_LIBRARY} ${SDLTTF_LIBRARY} ${SDL_gfx_LIBRARY} - ${libtool_LIBRARY}) + ${libtool_LIBRARY} ${QT_LIBRARIES}) install(TARGETS nghost RUNTIME DESTINATION ${exec_prefix}) endif(enable_nghost) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <nan...@us...> - 2010-03-04 17:15:21
|
Revision: 2070 http://nghost.svn.sourceforge.net/nghost/?rev=2070&view=rev Author: nanonymous Date: 2010-03-04 17:15:14 +0000 (Thu, 04 Mar 2010) Log Message: ----------- fixed some compile errors Modified Paths: -------------- nghost2/branches/nghost2-qt/src/nghost/nscan.cpp nghost2/branches/nghost2-qt/src/nghost/nscan.h Modified: nghost2/branches/nghost2-qt/src/nghost/nscan.cpp =================================================================== --- nghost2/branches/nghost2-qt/src/nghost/nscan.cpp 2010-03-04 17:07:32 UTC (rev 2069) +++ nghost2/branches/nghost2-qt/src/nghost/nscan.cpp 2010-03-04 17:15:14 UTC (rev 2070) @@ -1,11 +1,11 @@ #include "nscan.h" -NScanScanEvents::NScanScanEvents(std::string objectname) +NScanScan::NScanScan(QString objectname) { } -NScanScanEvents::~NScanScanEvents() +NScanScan::~NScanScan() { } @@ -15,7 +15,7 @@ m_ActionClass = "nscan"; } -NScan::onAction(nghost::ActionClass action) +void NScan::onAction(nghost::ActionClass action) { if(action.method == "scan") ///ACTION_TEMPLATE: nscan:null scan "tableName" "path|path|path" "ext|ext|ext" "daoclass" Modified: nghost2/branches/nghost2-qt/src/nghost/nscan.h =================================================================== --- nghost2/branches/nghost2-qt/src/nghost/nscan.h 2010-03-04 17:07:32 UTC (rev 2069) +++ nghost2/branches/nghost2-qt/src/nghost/nscan.h 2010-03-04 17:15:14 UTC (rev 2070) @@ -3,7 +3,7 @@ #include "actionclass.h" #include "plugin_genericAction.h" -#include "eventsubscriber" +#include "eventsubscriber.h" #include "eventevents.h" #include <string> @@ -13,8 +13,8 @@ { Q_OBJECT public: - NScanScanEvents(QString objectname); - ~NScanScanEvents(); + NScanScan(QString objectname); + ~NScanScan(); public slots: void itemFoundEvent(QString item); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <nan...@us...> - 2010-03-04 17:07:45
|
Revision: 2069 http://nghost.svn.sourceforge.net/nghost/?rev=2069&view=rev Author: nanonymous Date: 2010-03-04 17:07:32 +0000 (Thu, 04 Mar 2010) Log Message: ----------- fixed a number of errors and warnings Modified Paths: -------------- libnghost/src/gui2/button.cpp libnghost/src/gui2/effects.cpp libnghost/src/gui2/gfxengine.cpp libnghost/src/gui2/input.cpp Modified: libnghost/src/gui2/button.cpp =================================================================== --- libnghost/src/gui2/button.cpp 2010-03-03 20:48:58 UTC (rev 2068) +++ libnghost/src/gui2/button.cpp 2010-03-04 17:07:32 UTC (rev 2069) @@ -51,7 +51,7 @@ string t; string fontatt; string font; - for(int i=0; i<options.size(); i++) + for(uint i=0; i<options.size(); i++) { if(options[i].name == "text") { Modified: libnghost/src/gui2/effects.cpp =================================================================== --- libnghost/src/gui2/effects.cpp 2010-03-03 20:48:58 UTC (rev 2068) +++ libnghost/src/gui2/effects.cpp 2010-03-04 17:07:32 UTC (rev 2069) @@ -149,7 +149,7 @@ { Uint32 pixel = SDL_MapRGBA(surface->format, color.r, color.g, color.b, color.unused); - SDL_Rect foo = {x,y,1,1}; + SDL_Rect foo = {(Sint16)x, (Sint16)y, 1, 1}; SDL_FillRect (surface, &foo , pixel); } Modified: libnghost/src/gui2/gfxengine.cpp =================================================================== --- libnghost/src/gui2/gfxengine.cpp 2010-03-03 20:48:58 UTC (rev 2068) +++ libnghost/src/gui2/gfxengine.cpp 2010-03-04 17:07:32 UTC (rev 2069) @@ -308,7 +308,7 @@ ndebug::out(ndebug::LOG_ERR, "%s:%s(%d) - NULL surface passed to me, and I won't do it", __FILE__, __FUNCTION__, __LINE__); return -1; } - SDL_Rect coords={x, y, srf->w, srf->h}; + SDL_Rect coords={(Sint16)x, (Sint16)y, (Uint16)srf->w, (Uint16)srf->h}; SDL_BlitSurface(srf, NULL, screen, &coords); return 1; } Modified: libnghost/src/gui2/input.cpp =================================================================== --- libnghost/src/gui2/input.cpp 2010-03-03 20:48:58 UTC (rev 2068) +++ libnghost/src/gui2/input.cpp 2010-03-04 17:07:32 UTC (rev 2069) @@ -66,7 +66,7 @@ int nghost::inputClass::check(nRect R) { - SDL_Rect r={R.x,R.y,R.w,R.h}; + SDL_Rect r={(Sint16)R.x,(Sint16)R.y,(Uint16)R.w,(Uint16)R.h}; return check(r); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ks...@us...> - 2010-03-03 20:49:04
|
Revision: 2068 http://nghost.svn.sourceforge.net/nghost/?rev=2068&view=rev Author: kshots Date: 2010-03-03 20:48:58 +0000 (Wed, 03 Mar 2010) Log Message: ----------- * Fixed the remainder of the header hell issues by fixing basedb.hpp (basedb.hpp was split into basedb.h and basedb.cpp to keep Qt headers out of nghost headers) Modified Paths: -------------- libnghost/src/dao/CMakeLists.txt libnghost/src/dao/GenericListDao.cpp libnghost/src/dao/GenericListDao.h libnghost/src/dao/IListboxDao.h libnghost/src/dao/baseobject.h libnghost/src/dao/desktopdao.cpp libnghost/src/dao/extendedmediadao.cpp libnghost/src/dao/listboxdao.cpp libnghost/src/dao/listboxdao.h libnghost/src/dao/mediadao.cpp libnghost/src/dao/mediadao.h libnghost/src/dao/playerdao.cpp libnghost/src/dao/skindao.cpp libnghost/src/gui2/listbox.cpp libnghost/src/gui2/listbox.h libnghost/src/gui2/nwm.cpp libnghost/src/gui2/screen.cpp Added Paths: ----------- libnghost/src/dao/basedb.cpp libnghost/src/dao/basedb.h Removed Paths: ------------- libnghost/src/dao/basedb.hpp Modified: libnghost/src/dao/CMakeLists.txt =================================================================== --- libnghost/src/dao/CMakeLists.txt 2010-03-03 19:28:39 UTC (rev 2067) +++ libnghost/src/dao/CMakeLists.txt 2010-03-03 20:48:58 UTC (rev 2068) @@ -7,12 +7,12 @@ ${SDLIMAGE_INCLUDE_DIR} ${taglib_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR}) set(dao_headers populate.h dbtables.h playerdao.h baseobject.h - basedb.hpp extendedmediadao.h mediadao.h listboxdao.h + basedb.h extendedmediadao.h mediadao.h listboxdao.h desktopdao.h IListboxDao.h DaoHelper.h GenericListDao.h skindao.h) - set(dao_sources populate.cpp playerdao.cpp extendedmediadao.cpp - mediadao.cpp listboxdao.cpp desktopdao.cpp DaoHelper.cpp - GenericListDao.cpp skindao.cpp) + set(dao_sources basedb.cpp populate.cpp playerdao.cpp + extendedmediadao.cpp mediadao.cpp listboxdao.cpp desktopdao.cpp + DaoHelper.cpp GenericListDao.cpp skindao.cpp) add_library(nghostdao SHARED ${dao_sources}) add_library(nghostdao-static STATIC ${dao_sources}) add_dependencies(nghostdao-static nghostcore nghostlog nghostplugin) Modified: libnghost/src/dao/GenericListDao.cpp =================================================================== --- libnghost/src/dao/GenericListDao.cpp 2010-03-03 19:28:39 UTC (rev 2067) +++ libnghost/src/dao/GenericListDao.cpp 2010-03-03 20:48:58 UTC (rev 2068) @@ -17,12 +17,15 @@ * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ +#include <QSqlQuery> +#include <QSqlDatabase> +#include <QSqlError> +#include <QVariant> + #include "skindao.h" -#include <basedb.hpp> +#include <basedb.h> #include <string> -#include <QSqlQuery> -#include <QSqlDatabase> #include "dbtables.h" using namespace std; Modified: libnghost/src/dao/GenericListDao.h =================================================================== --- libnghost/src/dao/GenericListDao.h 2010-03-03 19:28:39 UTC (rev 2067) +++ libnghost/src/dao/GenericListDao.h 2010-03-03 20:48:58 UTC (rev 2068) @@ -23,7 +23,7 @@ #include <string> #include <vector> #include "baseobject.h" -#include "basedb.hpp" +#include "basedb.h" #include "IListboxDao.h" Modified: libnghost/src/dao/IListboxDao.h =================================================================== --- libnghost/src/dao/IListboxDao.h 2010-03-03 19:28:39 UTC (rev 2067) +++ libnghost/src/dao/IListboxDao.h 2010-03-03 20:48:58 UTC (rev 2068) @@ -1,7 +1,7 @@ #ifndef _ILISTBOXDAO_H_ #define _ILISTBOXDAO_H_ -#include "basedb.hpp" +#include "basedb.h" namespace nghost { Added: libnghost/src/dao/basedb.cpp =================================================================== --- libnghost/src/dao/basedb.cpp (rev 0) +++ libnghost/src/dao/basedb.cpp 2010-03-03 20:48:58 UTC (rev 2068) @@ -0,0 +1,189 @@ +/* + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU Lesser General Public License, + * version 2.1, as published by the Free Software Foundation. + * + * This program is distributed in the hope it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for + * more details. + * + * You should have received a copy of the GNU Lesser General Public License along with + * this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. + * + */ + +#include "basedb.h" + +#include <QObject> +#include <QVariantList> +#include <QSqlDatabase> +#include <QSqlQuery> +#include <QSqlError> +#include <cstdlib> + +using namespace nghost; +using namespace std; + +BaseDB::~BaseDB() +{ + ndebug::out(ndebug::LOG_DEBUG, "BaseDB: Destroying db object. Table: %s", table.c_str()); +} + +void +BaseDB::setTable(string tablename) +{ + if(tablename == "") return; + table = tablename; + if(!tableExists()) reloadTable(); +} + +void +BaseDB::init(string tablename, string tablestring) +{ + string dbname = getOption("database"); + ndebug::out(ndebug::LOG_DEBUG, "BaseDB: Initializing db object. Table: %s",tablename.c_str()); + tableString = tablestring; + + QSqlDatabase db = QSqlDatabase::addDatabase("QSQLITE"); + db.setDatabaseName(dbname.c_str()); + + ndebug::out(ndebug::LOG_INFO, "BaseDB: Using db/db-file: %s",dbname.c_str()); + + if(! db.open()) + { + ndebug::out(ndebug::LOG_ERR, "%s:%s(%d) BaseDB: database not found %s", __FILE__, __FUNCTION__, __LINE__, dbname.c_str()); + exit(1); + } + setTable(tablename); +} + +void +BaseDB::reloadTable() +{ + //printf("BaseDB: reloading table %s",table.c_str()); + //dropTable(); + //createTable(); +} + +bool +BaseDB::tableExists() +{ + bool exists=false; + string query = "SELECT * FROM "+table+" LIMIT 0,1"; + ndebug::out(ndebug::LOG_DEBUG, "BaseDB: checking for existing table with %s",query.c_str()); + QSqlQuery q; + if(!q.exec(query.c_str()) ) + { + ndebug::out(ndebug::LOG_WARNING, "%s:%s(%d) - Error while exec'ing query:\nError: %s", __FILE__, __FUNCTION__, __LINE__, q.lastError().text().toAscii().constData()); + return false; + } + int numrows = q.size(); + if(numrows <= 0 ) + exists = false; + else exists = true; + + ndebug::out(ndebug::LOG_DEBUG, "BaseDB: Table '%s' exists? %d because %d rows where found.\n", table.c_str(), exists, numrows); + return exists; +} + +void +BaseDB::renameTable(string newname) +{ + dropTable(newname); + string query = "ALTER TABLE "+table+" RENAME TO "+newname; + QSqlQuery q; + q.exec(query.c_str()); +} + +void +BaseDB::update(NameValuePair<string> param, NameValuePair<string> qualifier) +{ + update<string, string>(param, qualifier); +} + +void +BaseDB::deleteRow(NameValuePair<string> qualifier) +{ + deleteRow<string>(qualifier); +} + +void +BaseDB::deleteRows(string colname, vector<string> values) +{ + ostringstream query; + ostringstream tempval; + QSqlQuery q; + + query << "DELETE FROM "<< table<< " WHERE "<<colname<<" = ?"; + ndebug::out(ndebug::LOG_DEBUG, "BaseDB: %s: %s",__FUNCTION__, query.str().c_str()); + + q.prepare(query.str().c_str()); + + QVariantList vs; + + for(int i=0; (unsigned)i<values.size(); i++) + { + vs<<QString::fromStdString(values[i]); + } + + q.addBindValue(vs); + q.execBatch(); +} + +void +BaseDB::dropTable(string tablename) +{ + string query="DROP TABLE IF EXISTS "+tablename; + ndebug::out(ndebug::LOG_DEBUG, "BaseDB: Dropping Table %s with query:? %s",tablename.c_str(),query.c_str()); + QSqlQuery q; + q.exec(query.c_str()); +} + +void +BaseDB::createTable() +{ + string t = tableString; + string query; + string::size_type i=t.find("%s",0); + if(i!=string::npos) query=t.replace(i, 2, table); + else query = t; + ndebug::out(ndebug::LOG_DEBUG, "BaseDB: Creating Table %s with query:? %s",table.c_str(),query.c_str()); + QSqlQuery q; + q.exec(query.c_str()); +} + +void +BaseDB::fixFilename(string * filename) +{ + string::size_type i=0; + while(1) + { + i = filename->find(" ",i); + if(i == string::npos) + break; + filename->replace(i,1,"\\ "); + i+=2; + } +} + +void +BaseDB::unfixFilename(string * filename) +{ + string::size_type i=0; + i=filename->find("\\",0); + if(i == string::npos) + return; + else + { + filename->replace(i,1,""); + unfixFilename(filename); + } +} + +void +BaseDB::queryexec(const string & query)const +{ + QSqlQuery().exec(query.c_str()); +} Copied: libnghost/src/dao/basedb.h (from rev 2064, libnghost/src/dao/basedb.hpp) =================================================================== --- libnghost/src/dao/basedb.h (rev 0) +++ libnghost/src/dao/basedb.h 2010-03-03 20:48:58 UTC (rev 2068) @@ -0,0 +1,152 @@ +/* + * timedate - Displays time and date and daily events + * Copyright (c) <2009>, Intel Corporation. + * + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU Lesser General Public License, + * version 2.1, as published by the Free Software Foundation. + * + * This program is distributed in the hope it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for + * more details. + * + * You should have received a copy of the GNU Lesser General Public License along with + * this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. + * + */ + +#ifndef _BASEDB_H_ +#define _BASEDB_H_ + +# include <string> +# include <sstream> +# include <ndebug.h> +# include <vector> +# include <settings.h> + +namespace nghost +{ + class BaseDB + { + public: + BaseDB(){} + virtual ~BaseDB(); + + void setTable(std::string tablename); + virtual void init(std::string tablename, std::string tablestring); + virtual void reloadTable(); + virtual bool tableExists(); + virtual void renameTable(std::string newname); + template<typename T> void insert(DictionaryList<T> params); + template<typename T> void insert(NameValuePair<T> param); + virtual void insert(DictionaryList<std::string> params){insert<std::string>(params);} + template<typename T, typename TT, typename T3> void update(T col, TT colval, NameValuePair<T3> qualifier); + template<typename T, typename TT> void update(NameValuePair<T> param, NameValuePair<TT> qualifier){update<std::string, T, TT>(param.name, param.value, qualifier);} + template<typename T, typename TT> void update(DictionaryList<T> params, NameValuePair<TT> qualifier); + virtual void update(NameValuePair<std::string> param, NameValuePair<std::string> qualifier); + template<typename T> void deleteRow(NameValuePair<T> qualifier); + virtual void deleteRow(NameValuePair<std::string> qualifier); + void deleteRows(std::string colname, std::vector<std::string> values); + virtual void dropTable(){dropTable(table);} + virtual void dropTable(std::string tablename); + virtual void createTable(); + std::string fixInvalids(std::string filename){return filename;} + + protected: + + void fixFilename(std::string* filename); + void unfixFilename(std::string* filename); + + void queryexec(const std::string & query)const; + + std::string table; + std::string tableString; + + }; //BaseDB class + + template<typename T> + inline void + BaseDB::insert(DictionaryList<T> params) + { + std::string query = "INSERT INTO "+table+" ("; + std::ostringstream endquery; + endquery<<" VALUES ( "; + for(size_t i=0; i< params.size(); i++) + { + query+=" `"+fixInvalids(params[i].name)+"`"; + std::ostringstream tempval; + tempval<<params[i].value; + endquery<<"'"<<fixInvalids(tempval.str())<<"'"; + if(i < params.size()-1) + { + query+=","; + endquery<<","; + } + } + endquery<<" )"; + query+=" )"+endquery.str(); + ndebug::out(ndebug::LOG_DEBUG, "BaseDB: %s",query.c_str()); + queryexec(query); + } + + template<typename T> + inline void + BaseDB::insert(NameValuePair<T> param) + { + std::string query = "INSERT INTO "+table+" ("; + std::ostringstream endquery; + endquery<<" VALUES ( "; + query+=" `"+fixInvalids(param.name)+"`"; + std::ostringstream tempval; + tempval<<param.value; + endquery<<"'"<<fixInvalids(tempval.str())<<"'"; + endquery<<" )"; + query+=" )"+endquery.str(); + ndebug::out(ndebug::LOG_DEBUG, "BaseDB: %s",query.c_str()); + queryexec(query); + } + + template<typename T, typename TT, typename T3> + inline void + BaseDB::update(T col, TT colval, NameValuePair<T3> qualifier) + { + std::ostringstream query; + std::ostringstream tempval; + std::ostringstream tempcolval; + tempval<<qualifier.value; + tempcolval<<colval; + query << "UPDATE "<< table << + " SET `"<<col<<"` = '"<<fixInvalids(tempcolval.str())<< + "' WHERE `"<<fixInvalids(qualifier.name)<<"` = '"<<fixInvalids(tempval.str())<<"'"; + ndebug::out(ndebug::LOG_DEBUG, "BaseDB: Update: %s",query.str().c_str()); + queryexec(query.str()); + } + + template <typename T, typename TT> + inline void + BaseDB::update(DictionaryList<T> params, NameValuePair<TT> qualifier) + { + for(size_t i=0;i<params.size();i++) + { + update<T,TT>(params[i],qualifier); + } + } + + template <typename T> + inline void + BaseDB::deleteRow(NameValuePair<T> qualifier) + { + std::ostringstream query; + std::ostringstream tempval; + tempval<<qualifier.value; + query << "DELETE FROM "<< table<< + " WHERE "<<qualifier.name<<" = "<<fixInvalids(tempval.str()); + ndebug::out(ndebug::LOG_DEBUG, "BaseDB: %s: %s",__FUNCTION__, query.str().c_str()); + queryexec(query.str()); + } +} // namespace nghost + +#endif + Deleted: libnghost/src/dao/basedb.hpp =================================================================== --- libnghost/src/dao/basedb.hpp 2010-03-03 19:28:39 UTC (rev 2067) +++ libnghost/src/dao/basedb.hpp 2010-03-03 20:48:58 UTC (rev 2068) @@ -1,324 +0,0 @@ -/* - * timedate - Displays time and date and daily events - * Copyright (c) <2009>, Intel Corporation. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms and conditions of the GNU Lesser General Public License, - * version 2.1, as published by the Free Software Foundation. - * - * This program is distributed in the hope it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for - * more details. - * - * You should have received a copy of the GNU Lesser General Public License along with - * this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. - * - */ - -#ifndef _BASEDB_H_ -#define _BASEDB_H_ - -#include <QObject> -#include <QVariantList> -#include <QSqlDatabase> -#include <QSqlQuery> -#include <QSqlError> -#include <string> -#include <sstream> -#include <stdio.h> -#include <stdlib.h> -#include <vector> -#include <ndebug.h> -#include <settings.h> - -using namespace std; -using namespace nghost; - -class BaseDB -{ -public: - BaseDB() - { - - } - - - virtual ~BaseDB() - { - printf("BaseDB: Destroying db object. Table: %s",table.c_str()); - } - - void setTable(string tablename) - { - if(tablename == "") return; - table = tablename; - - if(!tableExists()) - reloadTable(); - } - - virtual void - init(string tablename, string tablestring) - { - string dbname = nghost::getOption("database"); - printf("BaseDB: Initializing db object. Table: %s",tablename.c_str()); - tableString = tablestring; - - QSqlDatabase db = QSqlDatabase::addDatabase("QSQLITE"); - db.setDatabaseName(dbname.c_str()); - - nghost::ndebug::out(nghost::ndebug::LOG_INFO, "BaseDB: Using db/db-file: %s",dbname.c_str()); - - if(! db.open()) - { - printf("BaseDB: database not found %s",dbname.c_str()); - exit(1); - } - setTable(tablename); - } - - virtual void - reloadTable() - { - //printf("BaseDB: reloading table %s",table.c_str()); - //dropTable(); - //createTable(); - } - - virtual bool tableExists() - { - bool exists=false; - string query = "SELECT * FROM "+table+" LIMIT 0,1"; - printf("BaseDB: checking for existing table with %s\n",query.c_str()); - QSqlQuery q; - if(!q.exec(query.c_str()) ) - { - printf("BaseDB: Error while exec'ing query:\n"); - printf("Error: %s\n",q.lastError().text().toStdString().c_str()); - return false; - } - int numrows = q.size(); - if(numrows <= 0 ) - exists = false; - else exists = true; - - printf("BaseDB: Table '%s' exists? %d because %d rows where found.\n", table.c_str(), exists, numrows); - return exists; - } - - virtual void - renameTable(string newname) - { - dropTable(newname); - string query = "ALTER TABLE "+table+" RENAME TO "+newname; - QSqlQuery q; - q.exec(query.c_str()); - } - - template<typename T> - void insert(DictionaryList<T> params) - { - string query = "INSERT INTO "+table+" ("; - ostringstream endquery; - endquery<<" VALUES ( "; - for(size_t i=0; i< params.size(); i++) - { - query+=" `"+fixInvalids(params[i].name)+"`"; - ostringstream tempval; - tempval<<params[i].value; - endquery<<"'"<<fixInvalids(tempval.str())<<"'"; - if(i < params.size()-1) - { - query+=","; - endquery<<","; - } - } - endquery<<" )"; - query+=" )"+endquery.str(); - printf("BaseDB: %s",query.c_str()); - QSqlQuery q; - q.exec(query.c_str()); - } - - template<typename T> - void - insert(NameValuePair<T> param) - { - string query = "INSERT INTO "+table+" ("; - ostringstream endquery; - endquery<<" VALUES ( "; - query+=" `"+fixInvalids(param.name)+"`"; - ostringstream tempval; - tempval<<param.value; - endquery<<"'"<<fixInvalids(tempval.str())<<"'"; - endquery<<" )"; - query+=" )"+endquery.str(); - printf("BaseDB: %s",query.c_str()); - QSqlQuery q; - q.exec(query.c_str()); - } - - virtual void - insert(DictionaryList<string> params) - { - insert<string>(params); - } - - template<typename T, typename TT, typename T3> - void - update(T col, TT colval, NameValuePair<T3> qualifier) - { - ostringstream query; - ostringstream tempval; - ostringstream tempcolval; - tempval<<qualifier.value; - tempcolval<<colval; - query << "UPDATE "<< table << - " SET `"<<col<<"` = '"<<fixInvalids(tempcolval.str())<< - "' WHERE `"<<fixInvalids(qualifier.name)<<"` = '"<<fixInvalids(tempval.str())<<"'"; - printf("BaseDB: Update: %s",query.str().c_str()); - QSqlQuery q; - q.exec(query.str().c_str()); - } - - template<typename T, typename TT> - void - update(NameValuePair<T> param, NameValuePair<TT> qualifier) - { - update<string,T,TT>(param.name, param.value, qualifier); - } - - template<typename T, typename TT> - void - update(DictionaryList<T> params, NameValuePair<TT> qualifier) - { - for(size_t i=0;i<params.size();i++) - { - update<T,TT>(params[i],qualifier); - } - } - - virtual void update(NameValuePair<string> param, NameValuePair<string> qualifier) - { - update<string,string>(param,qualifier); - } - - template<typename T> - void deleteRow(NameValuePair<T> qualifier) - { - ostringstream query; - ostringstream tempval; - tempval<<qualifier.value; - query << "DELETE FROM "<< table<< - " WHERE "<<qualifier.name<<" = "<<fixInvalids(tempval.str()); - printf("BaseDB: %s: %s",__FUNCTION__, query.str().c_str()); - QSqlQuery q; - q.exec(query.str().c_str()); - } - - virtual void - deleteRow(NameValuePair<string> qualifier) - { - deleteRow<string>(qualifier); - } - - void - deleteRows(string colname, vector<string> values) - { - ostringstream query; - ostringstream tempval; - QSqlQuery q; - - query << "DELETE FROM "<< table<< - " WHERE "<<colname<<" = ?"; - printf("BaseDB: %s: %s\n",__FUNCTION__, query.str().c_str()); - - q.prepare(query.str().c_str()); - - QVariantList vs; - - for(int i=0; (unsigned)i<values.size(); i++) - { - vs<<QString::fromStdString(values[i]); - } - - q.addBindValue(vs); - q.execBatch(); - } - - virtual void - dropTable() - { - dropTable(table); - } - - virtual void - dropTable(string tablename) - { - string query="DROP TABLE IF EXISTS "+tablename; - printf("BaseDB: Dropping Table %s with query:? %s",tablename.c_str(),query.c_str()); - QSqlQuery q; - q.exec(query.c_str()); - } - - virtual void - createTable() - { - string t = tableString; - string query; - string::size_type i=t.find("%s",0); - if(i!=string::npos) query=t.replace(i, 2, table); - else query = t; - printf("BaseDB: Creating Table %s with query:? %s",table.c_str(),query.c_str()); - QSqlQuery q; - q.exec(query.c_str()); - } - - - - string - fixInvalids(string filename) - { - return filename; - } - -protected: - - void - fixFilename(string* filename) - { - std::string::size_type i=0; - while(1) - { - i = filename->find(" ",i); - if(i == string::npos) - break; - filename->replace(i,1,"\\ "); - i+=2; - } - } - - void - unfixFilename(string* filename) - { - std::string::size_type i=0; - i=filename->find("\\",0); - if(i == string::npos) - return; - else - { - filename->replace(i,1,""); - unfixFilename(filename); - } - - } - - string table; - string tableString; - -}; //BaseDB class - -#endif - Modified: libnghost/src/dao/baseobject.h =================================================================== --- libnghost/src/dao/baseobject.h 2010-03-03 19:28:39 UTC (rev 2067) +++ libnghost/src/dao/baseobject.h 2010-03-03 20:48:58 UTC (rev 2068) @@ -22,7 +22,7 @@ #include <plugin_errorlog.h> -#include "basedb.hpp" +#include "basedb.h" #include <ndebug.h> Modified: libnghost/src/dao/desktopdao.cpp =================================================================== --- libnghost/src/dao/desktopdao.cpp 2010-03-03 19:28:39 UTC (rev 2067) +++ libnghost/src/dao/desktopdao.cpp 2010-03-03 20:48:58 UTC (rev 2068) @@ -17,11 +17,12 @@ * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ +#include <QSqlQuery> +#include <QVariant> #include "desktopdao.h" #include "dbtables.h" #include <ndebug.h> -#include <QSqlQuery> #include <vector> #include <string> #include <fstream> Modified: libnghost/src/dao/extendedmediadao.cpp =================================================================== --- libnghost/src/dao/extendedmediadao.cpp 2010-03-03 19:28:39 UTC (rev 2067) +++ libnghost/src/dao/extendedmediadao.cpp 2010-03-03 20:48:58 UTC (rev 2068) @@ -17,6 +17,8 @@ * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ +#include <QSqlQuery> +#include <QVariant> #include "extendedmediadao.h" #include "baseobject.h" #include "dbtables.h" @@ -99,7 +101,7 @@ vector<ExMediaObj*> list = getAll(); DictionaryList<string> returnList; - for(uint i=0;i<list.size();i++) + for(unsigned int i=0;i<list.size();i++) { ostringstream combo; string t,a,al; Modified: libnghost/src/dao/listboxdao.cpp =================================================================== --- libnghost/src/dao/listboxdao.cpp 2010-03-03 19:28:39 UTC (rev 2067) +++ libnghost/src/dao/listboxdao.cpp 2010-03-03 20:48:58 UTC (rev 2068) @@ -1,7 +1,8 @@ +#include <QSqlQuery> +#include <QVariant> #include "listboxdao.h" #include "dbtables.h" -#include <QSqlQuery> #include <string> using namespace std; Modified: libnghost/src/dao/listboxdao.h =================================================================== --- libnghost/src/dao/listboxdao.h 2010-03-03 19:28:39 UTC (rev 2067) +++ libnghost/src/dao/listboxdao.h 2010-03-03 20:48:58 UTC (rev 2068) @@ -2,7 +2,7 @@ #define _LISTBOXDAO_H_ #include "baseobject.h" -#include "basedb.hpp" +#include "basedb.h" #include <string> Modified: libnghost/src/dao/mediadao.cpp =================================================================== --- libnghost/src/dao/mediadao.cpp 2010-03-03 19:28:39 UTC (rev 2067) +++ libnghost/src/dao/mediadao.cpp 2010-03-03 20:48:58 UTC (rev 2068) @@ -1,12 +1,12 @@ +#include <QVariant> +#include <QSqlQuery> #include "mediadao.h" -#include "basedb.hpp" +#include "basedb.h" #include "dbtables.h" #include "populate.h" -#include <QSqlQuery> #include <vector> #include <string> -#include "basedb.hpp" using namespace std; Modified: libnghost/src/dao/mediadao.h =================================================================== --- libnghost/src/dao/mediadao.h 2010-03-03 19:28:39 UTC (rev 2067) +++ libnghost/src/dao/mediadao.h 2010-03-03 20:48:58 UTC (rev 2068) @@ -2,7 +2,7 @@ #define _MEDIADAO_H_ #include "baseobject.h" -#include "basedb.hpp" +#include "basedb.h" #include "IListboxDao.h" #include <string> Modified: libnghost/src/dao/playerdao.cpp =================================================================== --- libnghost/src/dao/playerdao.cpp 2010-03-03 19:28:39 UTC (rev 2067) +++ libnghost/src/dao/playerdao.cpp 2010-03-03 20:48:58 UTC (rev 2068) @@ -1,3 +1,5 @@ +#include <QSqlQuery> +#include <QVariant> #include "playerdao.h" #include "baseobject.h" #include "dbtables.h" @@ -56,7 +58,7 @@ DictionaryList<std::string> reallist; - for(uint i=0; i<list.size(); i++) + for(unsigned int i=0; i<list.size(); i++) { //cout<<"PlayerDao: getPlaylist(): list item:"<<list[i]<<endl; reallist.push_back(NameValuePair<string>("",list[i])); @@ -69,7 +71,7 @@ nghost::PlayerDao::setPlaylist(DictionaryList<std::string> filenamelist) { ostringstream list; - for(uint i=0; i<filenamelist.size(); i++) + for(unsigned int i=0; i<filenamelist.size(); i++) { list<<filenamelist[i].value<<","; } Modified: libnghost/src/dao/skindao.cpp =================================================================== --- libnghost/src/dao/skindao.cpp 2010-03-03 19:28:39 UTC (rev 2067) +++ libnghost/src/dao/skindao.cpp 2010-03-03 20:48:58 UTC (rev 2068) @@ -47,7 +47,7 @@ string skinname = list.at(list.size()-2); GenericListObject* obj = new GenericListObject(); - uint n = strtoparse.find("skin.xml"); + unsigned int n = strtoparse.find("skin.xml"); obj->name = skinname; if(n != string::npos) Modified: libnghost/src/gui2/listbox.cpp =================================================================== --- libnghost/src/gui2/listbox.cpp 2010-03-03 19:28:39 UTC (rev 2067) +++ libnghost/src/gui2/listbox.cpp 2010-03-03 20:48:58 UTC (rev 2068) @@ -17,8 +17,6 @@ * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#warning header hell -#include <QVariant> // needed to quell errors about out-of-order headers... would be better to fix this than let it stand #include "listbox.h" #include "listboxdao.h" #include "ndebug.h" Modified: libnghost/src/gui2/listbox.h =================================================================== --- libnghost/src/gui2/listbox.h 2010-03-03 19:28:39 UTC (rev 2067) +++ libnghost/src/gui2/listbox.h 2010-03-03 20:48:58 UTC (rev 2068) @@ -150,7 +150,7 @@ image *alpha; private: - std::vector<string> listselections; + std::vector<std::string> listselections; int listposition; int alphapos; int updateAlpha(); Modified: libnghost/src/gui2/nwm.cpp =================================================================== --- libnghost/src/gui2/nwm.cpp 2010-03-03 19:28:39 UTC (rev 2067) +++ libnghost/src/gui2/nwm.cpp 2010-03-03 20:48:58 UTC (rev 2068) @@ -18,10 +18,6 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#warning header hell -// The next two #includes are needed to fix errors about out-of-order headers. Should fix root cause rather than use this patch, but this gets us running -#include <QVariant> -#include <QWidget> #include "nwm.h" #include <input.h> #include <string> Modified: libnghost/src/gui2/screen.cpp =================================================================== --- libnghost/src/gui2/screen.cpp 2010-03-03 19:28:39 UTC (rev 2067) +++ libnghost/src/gui2/screen.cpp 2010-03-03 20:48:58 UTC (rev 2068) @@ -17,8 +17,6 @@ * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#warning header hell -#include <QVariant> // needed to quell errors about out-of-order headers... should fix root cause rather than this patch #include "screen.h" #include "settings.h" #include "DaoHelper.h" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ks...@us...> - 2010-03-03 19:28:45
|
Revision: 2067 http://nghost.svn.sourceforge.net/nghost/?rev=2067&view=rev Author: kshots Date: 2010-03-03 19:28:39 +0000 (Wed, 03 Mar 2010) Log Message: ----------- * Adjusted nghost2-qt's nscan project to utilize QtSQL library Modified Paths: -------------- nghost2/branches/nghost2-qt/CMakeLists.txt Modified: nghost2/branches/nghost2-qt/CMakeLists.txt =================================================================== --- nghost2/branches/nghost2-qt/CMakeLists.txt 2010-03-03 19:22:29 UTC (rev 2066) +++ nghost2/branches/nghost2-qt/CMakeLists.txt 2010-03-03 19:28:39 UTC (rev 2067) @@ -55,6 +55,7 @@ set(need_nghostnet ON) set(need_qt ON) set(QT_USE_QTDBUS TRUE) + set(QT_USE_QTSQL TRUE) endif(enable_nscan) if(enable_nghost) set(need_sdl ON) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |