diff --git a/CMakeLists.txt b/CMakeLists.txt index f0d008a..fe19591 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,8 +25,11 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0) SET( CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake ) SET( QLSCRIBE_DBUS_SERVICE org.lightscribe ) -SET( QLSCRIBE_DBUS_MANAGER /org/lightscribe/Manager ) # path to manager -SET( QLSCRIBE_DBUS_DRIVES /org/lightscribe/drives ) # base path under which drives located +SET( QLSCRIBE_DBUS_MANAGER_SERVICE ${QLSCRIBE_DBUS_SERVICE}.Manager ) +SET( QLSCRIBE_DBUS_DRIVES_SERVICE ${QLSCRIBE_DBUS_SERVICE}.drives ) +SET( QLSCRIBE_DBUS_PATH /org/lightscribe ) +SET( QLSCRIBE_DBUS_MANAGER_PATH ${QLSCRIBE_DBUS_PATH}/Manager ) # path to manager +SET( QLSCRIBE_DBUS_DRIVES_PATH ${QLSCRIBE_DBUS_PATH}/drives ) # base path under which drives located SUBDIRS( src ) SUBDIRS( resources ) diff --git a/INSTALL b/INSTALL index 8ec3e64..6a16249 100644 --- a/INSTALL +++ b/INSTALL @@ -4,31 +4,36 @@ Qt lightScribe Installaton instructions To compile and install, first download release from http://qlscribe.sourceforge.net/ or check out project from subversion repository for particular release: - svn co https://qlscribe.svn.sourceforge.net/svnroot/qlscribe/tags/release-N.M qlscribe + svn co https://qlscribe.svn.sourceforge.net/svnroot/qlscribe/tags/release-N.M qlscribe or if you want to test latest development version: - svn co https://qlscribe.svn.sourceforge.net/svnroot/qlscribe/trunk qlscribe + svn co https://qlscribe.svn.sourceforge.net/svnroot/qlscribe/trunk qlscribe Then go to the source directory and type: - mkdir build - cd build - cmake .. + mkdir build + cd build + cmake .. (If you want to install in a different path, use instead: - cmake .. -DCMAKE_INSTALL_PREFIX=/install/path) - make - sudo make install + cmake .. -DCMAKE_INSTALL_PREFIX=/install/path) + make + sudo make install If cmake fails to find lightScribe API specify environment variable LIGHTSCRIBEDIR: - LIGHTSCRIBEDIR=/opt/lightscribe cmake .. + LIGHTSCRIBEDIR=/opt/lightscribe cmake .. Include files should be in ${LIGHTSCRIBEDIR}/include and lib in ${LIGHTSCRIBEDIR}/lib -Once installed, you can start Qt lightScribe by typing "qlscribe", but due to API -requirement if you want to burn qlscribe has to be started by root as "sudo qlscribe" +You need manually install dbus config and service files. They are located in INSTALL_PATH/share/qlscribe +So on my ubuntu system I do + sudo cp /usr/local/share/qlscribe/lightscribe.conf /etc/dbus-1/system.d/ + sudo cp /usr/local/share/qlscribe/org.lightscribe.Manager.service /usr/share/dbus-1/system-services/ + sudo /etc/init.d/dbus reload + +Your system may have different path please refer dbus system daemon documentation You need to download lightScribe SDK for qlscribe to build and lightScribe runtime for qlscribe to run. For details see lightScribe webpage: diff --git a/NEWS b/NEWS index 661966b..8c7d5dd 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,11 @@ NEWS - list of user-visible changes between releases of qlscribe +New in 0.8: + Application is splitted into 2 parts: qlscribe and dbus daemon lscribed + qlscribe does not require sticky bit and can be compiled in 64 bit mode if necessary + lscribed provides lightScribe service through system bus + lscribed is activated by dbus daemon and automatically terminates after 5 minutes of inactivity + New in 0.7: Z-order of items saved and resored Bugfix for not loading radius for round text diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 391eaa7..c02b74a 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -337,8 +337,8 @@ void MainWindow::onMenuPrint() { QCDScene *cdscene = getScene( m_mdiArea ); if( !cdscene ) - return; + return; try { QDialogProgress::exec( this, cdscene ); }