Tagging the 0.9 release

git-svn-id: https://svn.code.sf.net/p/qlscribe/svn/tags/release-0.9@129 cac9541e-1b8d-4bfa-827e-589bba606050
2009-03-11 00:50:51 +00:00
40 changed files with 136 additions and 745 deletions
@@ -26,10 +26,10 @@ SET( FINAL_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} CACHE PATH "Final install path
 SET( CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake )

 SET( QLSCRIBE_DBUS_SERVICE org.lightscribe )
-SET( QLSCRIBE_DBUS_MANAGER_SERVICE ${QLSCRIBE_DBUS_SERVICE}.printManager )
+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}/printManager ) # path to manager
+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 )
@@ -1,22 +1,5 @@
 NEWS - list of user-visible changes between releases of qlscribe

-New in 0.12:
-    Fixed bug for round text not updating last used font
-    Main window stores/restores position and size from/to config
-    Round text changes radius and angle when dragged by mouse instead of moving the center
-    Added ability to open image as a document
-    Bugfix for labels opened from commandline not updating menu
-    Bugfix for not properly drawing partially covered window background
-
-New in 0.11:
-    Application settings added with default font to use and option to eject media
-    Added functionality to eject media after print
-    Debian packages use standard procedure to install/upgrade config files
-
-New in 0.10:
-    Undo/Redo mechanism implemented
-    Some minor bugfixes
-
 New in 0.9:
    Parameter --image added to print label in console mode into image
    Parameter --file added to process file in format KEY=VALUE
@@ -18,9 +18,9 @@
 #
 #    $Id$ 

-FIND_PATH( LSCRIBE_INCLUDE_DIR lightscribe.h /usr/local/include /usr/include/lightscribe $ENV{LIGHTSCRIBEDIR}/include )
+FIND_PATH( LSCRIBE_INCLUDE_DIR lightscribe.h /usr/local/include $ENV{LIGHTSCRIBEDIR}/include )

-FIND_LIBRARY( LSCRIBE_LIBRARY lightscribe /usr/local/lib /opt/lightscribe/lib /opt/lightscribe/lib32 $ENV{LIGHTSCRIBEDIR}/lib )
+FIND_LIBRARY( LSCRIBE_LIBRARY lightscribe /usr/local/lib $ENV{LIGHTSCRIBEDIR}/lib )

 if( LSCRIBE_INCLUDE_DIR AND LSCRIBE_LIBRARY )
    SET( LSCRIBE_FOUND TRUE )
@@ -1,9 +1,4 @@
-qlscribe (0.13-0ubuntu1) unstable; urgency=low
-  * Release 0.13 imported
-  * Release 0.12 imported
-  * Release 0.11 imported
-  * Release 0.10 imported
-  * Release 0.9 imported
+qlscribe (0.8-0ubuntu1) unstable; urgency=low
  * Release 0.8 imported
  * Initial release

@@ -1 +0,0 @@
-/usr/share/dbus-1/system-services/org.lightscribe.printManager.service
@@ -2,6 +2,8 @@
 set -e

 if [ "$1" = "configure" ] ; then
+	cp -f /usr/share/qlscribe/lightscribe.conf /etc/dbus-1/system.d/
+	cp -f /usr/share/qlscribe/org.lightscribe.Manager.service /usr/share/dbus-1/system-services/
 	/etc/init.d/dbus reload
 fi

@@ -2,12 +2,15 @@
 set -e

 if [ "$1" = "remove" -o "$1" = "upgrade" ] ; then
-	if PID=`pidof lscribed` ; then
+	PID=`pidof lscribed`
+	if [ "X$PID" != "X" ] ; then
 		kill $PID
 	fi
 fi

 if [ "$1" = "remove" ] ; then
+	rm -f /etc/dbus-1/system.d/lightscribe.conf
+	rm -f /usr/share/dbus-1/system-services/org.lightscribe.Manager.service
 	/etc/init.d/dbus reload
 fi

@@ -15,9 +15,9 @@ configure-stamp:
 	# Add here commands to configure the package.
 	mkdir -p build
 	cd build; cmake .. -DCMAKE_INSTALL_PREFIX=$(CURDIR)/debian/qlscribe/usr \
-                           -DFINAL_INSTALL_PREFIX=/usr \
-			   -DDBUS_SYSTEM_POLICY_DIR=$(CURDIR)/debian/qlscribe/etc/dbus-1/system.d \
-			   -DDBUS_SYSTEM_SERVICE_DIR=$(CURDIR)/debian/qlscribe/usr/share/dbus-1/system-services
+                           -DFINAL_INSTALL_PREFIX=/usr
+	touch configure-stamp
+

 build: build-stamp

@@ -70,7 +70,7 @@ your disk id from http://www.freedb.org/ or similar. Copy it and run this comman
 <p>Check that file have proper data, it should look similar 
 to this:</p>

-<pre><code># xmcd CD database file
+<code><pre># xmcd CD database file
 #^M

 # Track frame offsets:
@@ -105,7 +105,7 @@ EXTT2=
 EXTT3=
 EXTT4=
 EXTT5=
-PLAYORDER=</code></pre>
+PLAYORDER=</pre></code>
 <h4>5 Test you template</h4>
 <p>Now we can test how our created at step 2-3 template works with the data. Run qlscribe 
 in console mode to print label as an image:</p>
@@ -22,7 +22,7 @@ FIND_PACKAGE( Dbus32 REQUIRED )
 FIND_PACKAGE( LightScribe REQUIRED )

 SET( LSCRIBED_CONF_FILE ${CMAKE_CURRENT_BINARY_DIR}/lightscribe.conf )
-SET( LSCRIBED_SERVICE_FILE ${CMAKE_CURRENT_BINARY_DIR}/${QLSCRIBE_DBUS_SERVICE}.printManager.service )
+SET( LSCRIBED_SERVICE_FILE ${CMAKE_CURRENT_BINARY_DIR}/${QLSCRIBE_DBUS_SERVICE}.Manager.service )

 CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/lscribed.h.in ${CMAKE_CURRENT_BINARY_DIR}/lscribed.h @ONLY )
 CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/lightscribe.conf.in ${LSCRIBED_CONF_FILE}  @ONLY )
@@ -34,24 +34,6 @@ IF( CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND CMAKE_COMPILER_IS_GNUCXX )
     SET( CMAKE_EXE_LINKER_FLAGS "-m32 -pthread ${CMAKE_EXE_LINKER_FLAGS}" )
 ENDIF( CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND CMAKE_COMPILER_IS_GNUCXX )

-IF (DBUS_SYSTEM_POLICY_DIR)
-     INSTALL( FILES ${LSCRIBED_CONF_FILE} DESTINATION ${DBUS_SYSTEM_POLICY_DIR})
-ELSE (DBUS_SYSTEM_POLICY_DIR)
-     MESSAGE(STATUS "It is necessary to specify the directory where the client policy file for Qt Lightscribe is installed as DBUS_SYSTEM_POLICY_DIR.")
-     MESSAGE(STATUS "Otherwise it will be installed into share/qlscribe")
-     MESSAGE(STATUS "Normally this is /etc/dbus-1/system.d on a Linux system")
-     INSTALL( FILES ${LSCRIBED_CONF_FILE} DESTINATION share/qlscribe )
-ENDIF (DBUS_SYSTEM_POLICY_DIR)
-
-IF (DBUS_SYSTEM_SERVICE_DIR)
-     INSTALL( FILES ${LSCRIBED_SERVICE_FILE} DESTINATION ${DBUS_SYSTEM_SERVICE_DIR})
-ELSE (DBUS_SYSTEM_SERVICE_DIR)
-     MESSAGE(STATUS "It is necessary to specify the directory where the client service file for Qt Lightscribe is installed as DBUS_SYSTEM_SERVICE_DIR.")
-     MESSAGE(STATUS "Otherwise it will be installed into share/qlscribe")
-     MESSAGE(STATUS "Normally this is /usr/share/dbus-1/services on a Linux system")
-     INSTALL( FILES ${LSCRIBED_SERVICE_FILE} DESTINATION share/qlscribe )
-ENDIF (DBUS_SYSTEM_SERVICE_DIR)
-
 SET( LSCRIBED_SRCS main.cpp dbuscpp.cpp drives.cpp managerhandler.cpp drivehandler.cpp
                   introspecthandler.cpp )

@@ -64,4 +46,5 @@ ADD_EXECUTABLE( lscribed ${LSCRIBED_SRCS} )
 TARGET_LINK_LIBRARIES( lscribed ${LSCRIBE_LIBRARIES} ${DBUS_LIBRARIES} pthread )

 INSTALL( TARGETS lscribed DESTINATION sbin )
+INSTALL( FILES ${LSCRIBED_CONF_FILE} ${LSCRIBED_SERVICE_FILE} DESTINATION share/qlscribe )

@@ -46,12 +46,12 @@ static const char *strDriveIntrospect =
    </signal>\
    <method name=\"preview\">\
      <arg type=\"s\" direction=\"out\"/>\
-      <arg name=\"params\" type=\"(iiiii)\" direction=\"in\"/>\
+      <arg name=\"params\" type=\"(iiii)\" direction=\"in\"/>\
      <arg name=\"image\" type=\"ay\" direction=\"in\"/>\
      <arg name=\"previewSize\" type=\"(ii)\" direction=\"in\"/>\
    </method>\
    <method name=\"print\">\
-      <arg name=\"params\" type=\"(iiiii)\" direction=\"in\"/>\
+      <arg name=\"params\" type=\"(iiii)\" direction=\"in\"/>\
      <arg name=\"image\" type=\"ay\" direction=\"in\"/>\
    </method>\
    <method name=\"abort\">\
@@ -24,12 +24,10 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include <syslog.h>
 #include <lightscribe_cxx.h>
 #include <fstream>
 #include <iostream>

-
 using namespace LightScribe;

 static pthread_key_t drivesKey;
@@ -199,7 +197,6 @@ void Drive::routine()
      LS_DrawOptions options;
      LS_PrintQuality quality;
      LS_MediaOptimizationLevel level;
-      bool eject= false;

      char *image = 0;
      int imageSize = 0;
@@ -208,16 +205,15 @@ void Drive::routine()

      try {
         DBusCpp::MessageConstIter iter = m_message->constIter();
-         if( iter.signature() != "(iiiii)" )
-            throw std::string( "invalid argument for params: " ) + iter.signature() + ", (iiiii) expected";
+         if( iter.signature() != "(iiii)" )
+            throw std::string( "invalid argument for params: " ) + iter.signature() + ", (iiii) expected";

         DBusCpp::MessageConstIter sub = iter.recurse();

         mode    = LS_LabelMode( sub.getValue<int32_t>() ); sub.next();
         options = LS_DrawOptions( sub.getValue<int32_t>() ); sub.next();
         quality = LS_PrintQuality( sub.getValue<int32_t>() ); sub.next();
-         level   = LS_MediaOptimizationLevel( sub.getValue<int32_t>() ); sub.next();
-         eject   = sub.getValue<int32_t>();
+         level   = LS_MediaOptimizationLevel( sub.getValue<int32_t>() );

         if( !iter.next() )
            throw std::string( "image argument missing" );
@@ -244,7 +240,6 @@ void Drive::routine()
         std::cout << "exception " << str << std::endl;
         DBusCpp::Message reply = m_message->newError( DBUS_ERROR_INVALID_ARGS, str.c_str() );
         man.connection().send( reply );
-         syslog( LOG_ERR, "error in parsing request: %s", str.c_str() );
         continue;
      }

@@ -283,49 +278,15 @@ void Drive::routine()

         DiscPrinter printer = printers.Item( m_index );

-         {
-            function = "LS_DiscPrinter_OpenPrintSession";
-            DiscPrintSession session = printer.OpenPrintSession();
+         function = "LS_DiscPrinter_OpenPrintSession";
+         DiscPrintSession session = printer.OpenPrintSession();

-            DBusCpp::Message reply = m_message->newMethodReturn();
+         DBusCpp::Message reply = m_message->newMethodReturn();

-            if( preview ) {
+         if( preview ) {

-               syslog( LOG_INFO, "generating preview into temp file %s", tmpFile.c_str() );
-               function = "LS_DiscPrintSession_PrintPreview";
-               session.PrintPreview( LS_windows_bitmap,
-                                     mode,
-                                     options,
-                                     quality,
-                                     level,
-                                     image + 14,
-                                     bitmapHeaderSize - 14,
-                                     image + bitmapHeaderSize,
-                                     imageSize - bitmapHeaderSize,
-                                     const_cast< char *>( tmpFile.c_str() ),
-                                     LS_windows_bitmap,
-                                     size,
-                                     true );
-               reply.append( tmpFile );
-               man.connection().send( reply );
-
-            } else {
-
-               syslog( LOG_INFO, "printing label with parameters: mode %d, options %d, quality %d, level %d, eject %d",
-                       mode, options, quality, level, eject );
-
-               LS_PrintCallbacks callbacks;
-               callbacks.AbortLabel = clAbortLabel;
-               callbacks.ReportPrepareProgress = clReportPrepareProgress;
-               callbacks.ReportLabelProgress = clReportLabelProgress;
-               callbacks.ReportFinished = clReportFinished;
-               callbacks.ReportLabelTimeEstimate = clReportLabelTimeEstimate;
-               session.SetProgressCallback( &callbacks );
-
-               man.connection().send( reply );
-
-               function = 0;
-               session.PrintDisc( LS_windows_bitmap,
+            function = "LS_DiscPrintSession_PrintPreview";
+            session.PrintPreview( LS_windows_bitmap,
                                  mode,
                                  options,
                                  quality,
@@ -333,11 +294,37 @@ void Drive::routine()
                                  image + 14,
                                  bitmapHeaderSize - 14,
                                  image + bitmapHeaderSize,
-                                  imageSize - bitmapHeaderSize );
-            }
+                                  imageSize - bitmapHeaderSize,
+                                  const_cast< char *>( tmpFile.c_str() ),
+                                  LS_windows_bitmap,
+                                  size,
+                                  true );
+            reply.append( tmpFile );
+            man.connection().send( reply );
+
+         } else {
+
+            LS_PrintCallbacks callbacks;
+            callbacks.AbortLabel = clAbortLabel;
+            callbacks.ReportPrepareProgress = clReportPrepareProgress;
+            callbacks.ReportLabelProgress = clReportLabelProgress;
+            callbacks.ReportFinished = clReportFinished;
+            callbacks.ReportLabelTimeEstimate = clReportLabelTimeEstimate;
+            session.SetProgressCallback( &callbacks );
+
+            man.connection().send( reply );
+
+            function = 0;
+            session.PrintDisc( LS_windows_bitmap,
+                               mode,
+                               options,
+                               quality,
+                               level,
+                               image + 14,
+                               bitmapHeaderSize - 14,
+                               image + bitmapHeaderSize,
+                               imageSize - bitmapHeaderSize );
         }
-         if( !preview && eject )
-            printer.OpenDriveTray();
      }
      catch( LightScribe::LSException &ex ) {
         if( function ) {
@@ -345,7 +332,6 @@ void Drive::routine()
            sprintf( message, "\"%s()\" failed with code 0x%X", function, ex.GetCode() );
            DBusCpp::Message reply = m_message->newError( DBUS_ERROR_FAILED, message );
            man.connection().send( reply );
-            syslog( LOG_ERR, "%s", message );
         } else
            clReportFinished( ex.GetCode() );
         continue;
@@ -353,7 +339,6 @@ void Drive::routine()
      catch( const std::string &str ) {
         DBusCpp::Message reply = m_message->newError( DBUS_ERROR_FAILED, str.c_str() );
         man.connection().send( reply );
-         syslog( LOG_ERR, "operation failed: \"%s\"", str.c_str() );
         continue;
      }
   }
@@ -45,7 +45,7 @@ DBusHandlerResult IntrospectHandler::processMessage( const Message &msg )
                          std::string( DBusManagerPath + pathlen, sublen )
                          + "\"/>";
         } else
-            introspect += "<node name=\"printManager\"/><node name=\"drives\"/>";
+            introspect += "<node name=\"Manager\"/><node name=\"drives\"/>";
      }
      introspect += "</node>";

@@ -7,12 +7,15 @@
  <!-- Only root can own the service -->
  <policy user="root">
    <allow own="@QLSCRIBE_DBUS_MANAGER_SERVICE@"/>
+    <allow send_interface="@QLSCRIBE_DBUS_MANAGER_SERVICE@"/>
+    <allow send_interface="@QLSCRIBE_DBUS_DRIVES_SERVICE@"/>
  </policy>

  <!-- Allow anyone to invoke methods on the interfaces -->
  <policy context="default">
-    <allow send_destination="@QLSCRIBE_DBUS_MANAGER_SERVICE@"/>
-    <allow send_destination="@QLSCRIBE_DBUS_DRIVES_SERVICE@"/>
+    <allow send_interface="@QLSCRIBE_DBUS_MANAGER_SERVICE@"/>
+    <allow send_interface="@QLSCRIBE_DBUS_DRIVES_SERVICE@"/>
+    <allow receive_interface="@QLSCRIBE_DBUS_DRIVES_SERVICE@"/>
  </policy>

 </busconfig>
@@ -22,7 +22,6 @@
 #include <string.h>
 #include <signal.h>
 #include <stdlib.h>
-#include <syslog.h>

 #include "lscribed.h"
 #include "dbuscpp.h"
@@ -53,7 +52,6 @@ void onAlarm( int )
      lastActivity = curr;
      return;
   }
-   syslog( LOG_INFO, "terminating due to inactivity timeout" );
   terminateOnTimeout = true;
 }

@@ -67,7 +65,6 @@ void usage()

 int main( int argc, char **argv )
 {
-   openlog( "lscribed", LOG_PID, LOG_DAEMON );
   for( int i = 1; i < argc; ++i ) {
      if( strcmp( argv[i], "--help" ) == 0 ) {
         usage();
@@ -105,13 +102,11 @@ int main( int argc, char **argv )
   int ret = dbus_bus_request_name( conn.ptr(), DBusServiceName, DBUS_NAME_FLAG_REPLACE_EXISTING, &err );
   if( dbus_error_is_set( &err ) ) {
      std::cerr << "dbus_bus_request_name error: " << err.message << std::endl;
-      syslog( LOG_ERR, "dbus_bus_request_name error: %s", err.message );
      dbus_error_free( &err );
      return 2;
   }
   if( ret != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER ) {
      std::cerr << "could not get ownership of \"" << DBusServiceName << "\" terminating" << std::endl;
-      syslog( LOG_ERR, "could not get ownership of \"%s\" terminating", DBusServiceName );
      return 3;
   }

@@ -24,15 +24,14 @@ SET( QT_USE_QTDBUS 1 )
 SET( QLSCRIBE_SRCS main.cpp mainwindow.cpp qcdscene.cpp qcdview.cpp
     qdialogpixmap.cpp qdialogroundtext.cpp qdialogtext.cpp qlightroundtextitem.cpp 
     qlightscribe.cpp qshapefactory.cpp qlighttextitem.cpp qlightpixmapitem.cpp 
-     qdialogprint.cpp qdialogprogress.cpp qdialogcdproperties.cpp qconsoleprintprogress.cpp
-     qdialogsettings.cpp )
+     qdialogprint.cpp qdialogprogress.cpp qdialogcdproperties.cpp qconsoleprintprogress.cpp)

 SET( QLSCRIBE_UIS qdialogtext.ui qdialogroundtext.ui qdialogpixmap.ui
-     qdialogprint.ui qdialogprogress.ui qdialogcdproperties.ui qdialogsettings.ui )
+     qdialogprint.ui qdialogprogress.ui qdialogcdproperties.ui)

 SET( QLSCRIBE_MOC_HDRS mainwindow.h qcdscene.h qdialogpixmap.h qdialogroundtext.h
     qdialogtext.h qlightscribe.h qdialogprint.h qdialogprogress.h
-     qdialogcdproperties.h qconsoleprintprogress.h qdialogsettings.h )
+     qdialogcdproperties.h qconsoleprintprogress.h)

 ADD_DEFINITIONS( -Wall )

@@ -47,13 +47,13 @@
      <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="const PrintParameters &amp;"/>
      <annotation name="com.trolltech.QtDBus.QtTypeName.In2" value="QSize"/>
      <arg type="s" direction="out"/>
-      <arg name="params" type="(iiiii)" direction="in"/>
+      <arg name="params" type="(iiii)" direction="in"/>
      <arg name="image" type="ay" direction="in"/>
      <arg name="previewSize" type="(ii)" direction="in"/>
    </method>
    <method name="print">
      <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="const PrintParameters &amp;"/>
-      <arg name="params" type="(iiiii)" direction="in"/>
+      <arg name="params" type="(iiii)" direction="in"/>
      <arg name="image" type="ay" direction="in"/>
    </method>
    <method name="abort">
@@ -56,9 +56,6 @@ void usage()
 int main( int argc, char **argv )
 {
   QApplication app( argc, argv );
-   app.setApplicationName( "qlscribe" );
-   //app.setOrganizationName( "" );
-   app.setOrganizationDomain( "qlscribe.sourceforge.org" );
   app.addLibraryPath( "/usr/lib32/qt4/plugins" );
   app.setWindowIcon( QIcon( ":/qlscribe64.png" ) );

@@ -27,7 +27,6 @@
 #include "qdialogprint.h"
 #include "qdialogprogress.h"
 #include "qdialogcdproperties.h"
-#include "qdialogsettings.h"

 #include <QMenuBar>
 #include <QStatusBar>
@@ -40,8 +39,6 @@
 #include <QCloseEvent>
 #include <QApplication>
 #include <QClipboard>
-#include <QSettings>
-#include <QImageReader>


 MainWindow::MainWindow( bool enablePrint )
@@ -77,8 +74,7 @@ MainWindow::MainWindow( bool enablePrint )

   m_menuFile->addAction( tr( "Open...", "Menu item \"Open\"" ),
                          this,
-                          SLOT(onMenuOpen()),
-                          QKeySequence( Qt::CTRL + Qt::Key_O ) );
+                          SLOT(onMenuOpen()) );

   m_actionSave = m_menuFile->addAction( tr( "Save", "Menu item \"Save\"" ),
                                         this,
@@ -111,21 +107,11 @@ MainWindow::MainWindow( bool enablePrint )
   m_menuFile->addAction( tr( "Exit", "Menu item \"Exit\"" ),
                          this,
                          SLOT(close()),
-                          QKeySequence( Qt::CTRL + Qt::Key_Q ) );
+                          QKeySequence( Qt::CTRL + Qt::Key_X ) );


   m_menuEdit = menuBar()->addMenu( tr( "Edit",   "Menu item \"Edit\"" ) );

-   m_actionUndo = m_menuEdit->addAction( tr( "Undo", "Menu item \"Undo\"" ),
-                                         this,
-                                         SLOT(onMenuUndo()),
-                                         QKeySequence( Qt::CTRL + Qt::Key_Z ) );
-
-   m_actionRedo = m_menuEdit->addAction( tr( "Redo", "Menu item \"Redo\"" ),
-                                         this,
-                                         SLOT(onMenuRedo()),
-                                         QKeySequence( Qt::CTRL + Qt::Key_R ) );
-
   m_actionCopy = m_menuEdit->addAction( tr( "Copy", "Menu item \"Copy\"" ),
                                         this,
                                         SLOT(onMenuCopy()),
@@ -143,12 +129,6 @@ MainWindow::MainWindow( bool enablePrint )

   m_menuInsert = m_menuEdit->addMenu( tr( "Insert", "Menu item \"Insert\"" ) );

-   m_menuEdit->addSeparator();
-
-   m_actionSettings = m_menuEdit->addAction( tr( "Settings...", "Menu item \"Settings\"" ),
-                                             this,
-                                             SLOT(onMenuSettings()) );
-
   m_menuHelp = menuBar()->addMenu( tr( "Help", "Menu item \"Help\"" ) );

   m_menuHelp->addAction( tr( "About...", "Menu item \"About\"" ),
@@ -175,13 +155,6 @@ MainWindow::MainWindow( bool enablePrint )
             this, SLOT(updateMenu()) );

    updateMenu();
-
-    QSettings settings;
-
-    settings.beginGroup( "MainWindow");
-    resize( settings.value( "size", QSize(800, 400) ).toSize() );
-    move( settings.value( "pos", QPoint(200, 200) ).toPoint() );
-    settings.endGroup();
 }

 MainWindow::~MainWindow()
@@ -199,8 +172,6 @@ void MainWindow::open( const QStringList &files )
         delete newView;
         continue;
      }
-      connect( scene, SIGNAL(selectionChanged()), this, SLOT(updateMenu()) );
-      connect( scene, SIGNAL(changed()), this, SLOT(updateMenu()) );

      QMdiSubWindow *subWindow = m_mdiArea->addSubWindow( newView );
      subWindow->show();
@@ -266,13 +237,6 @@ bool MainWindow::saveScene( QCDScene *scene )
             return;
          }
    }
-    QSettings settings;
-
-    settings.beginGroup( "MainWindow" );
-    settings.setValue( "size", size());
-    settings.setValue( "pos", pos());
-    settings.endGroup();
-
    event->accept();
 }

@@ -280,11 +244,10 @@ void MainWindow::onMenuNewLabel( int mode )
 {
   QCDView *newView = new QCDView;
   QCDScene *scene = new QCDScene( newView );
-   scene->start( LabelMode( mode ) );
+   scene->setLabelMode( LabelMode( mode ) );
   newView->setScene( scene );
   scene->setName();
   connect( scene, SIGNAL(selectionChanged()), this, SLOT(updateMenu()) );
-   connect( scene, SIGNAL(changed()), this, SLOT(updateMenu()) );

   QMdiSubWindow *subWindow = m_mdiArea->addSubWindow( newView );
   subWindow->show();
@@ -323,23 +286,18 @@ void MainWindow::onMenuInsert( int id )
      return;
   }

+   item->setFlag( QGraphicsItem::ItemIsMovable, true );
+   item->setFlag( QGraphicsItem::ItemIsSelectable, true );
   cdscene->addItem( item );
   cdscene->setChanged();
 }

 void MainWindow::onMenuOpen()
 {
-   QString filter( tr("qlscribe document (*.qlx)\nImages ( ") );
-   QList<QByteArray> list = QImageReader::supportedImageFormats();
-   foreach( QByteArray arr, list ) {
-       filter += QString( "*." ) + arr.data() + " ";
-   }
-   filter += tr( ")\nAll Files (*)" );
-
   QString fileName = QFileDialog::getOpenFileName( this, 
                                                    tr( "Open:" ), 
                                                    QString(), 
-                                                    filter );
+                                                    tr("qlscribe document (*.qlx)") );
   
   if( fileName.isNull() )
      return;
@@ -353,7 +311,6 @@ void MainWindow::onMenuOpen()
      return;
   }
   connect( scene, SIGNAL(selectionChanged()), this, SLOT(updateMenu()) );
-   connect( scene, SIGNAL(changed()), this, SLOT(updateMenu()) );

   QMdiSubWindow *subWindow = m_mdiArea->addSubWindow( newView );
   subWindow->show();
@@ -410,8 +367,8 @@ void MainWindow::onMenuPrint()
 {
   QCDScene *cdscene = getScene( m_mdiArea );
   if( !cdscene )
-      return;

+      return;
   try {
      QDialogProgress::exec( this, cdscene );
   }
@@ -420,20 +377,6 @@ void MainWindow::onMenuPrint()
   }
 }

-void MainWindow::onMenuUndo()
-{
-   QCDScene *scene = getScene( m_mdiArea );
-   if( scene ) 
-      scene->undo();
-}
-
-void MainWindow::onMenuRedo()
-{
-   QCDScene *scene = getScene( m_mdiArea );
-   if( scene )
-      scene->redo();
-}
-
 void MainWindow::onMenuCopy()
 {
   QCDScene *scene = getScene( m_mdiArea );
@@ -460,7 +403,7 @@ void MainWindow::onMenuAbout()
   QMessageBox::about( this,
                       tr( "About" ),
                       tr( "<h3>qlscribe - Qt lisghtScribe</h3>"
-                           "<p>release 0.13 $Revision$</p>"
+                           "<p>release 0.9 $Revision$</p>"
                           "<p>visit project at home page "
                           "<a href=\"http://qlscribe.sourceforge.net/\">qlscribe.sourceforge.net</a></p>" ) );
 }
@@ -470,11 +413,6 @@ void MainWindow::onMenuQtAbout()
   QMessageBox::aboutQt( this );
 }

-void MainWindow::onMenuSettings()
-{
-   QDialogSettings::exec( this );
-}
-
 void MainWindow::updateMenu()
 {
   QCDScene *scene = getScene( m_mdiArea );
@@ -487,15 +425,10 @@ void MainWindow::updateMenu()
   m_menuInsert->setEnabled( scene );

   if( !scene ) {
-      m_actionUndo->setEnabled( false );
-      m_actionRedo->setEnabled( false );
      m_actionCopy->setEnabled( false );
      m_actionCut->setEnabled( false );
      m_actionPaste->setEnabled( false );
   } else {
-      m_actionUndo->setEnabled( scene->canUndo() );
-      m_actionRedo->setEnabled( scene->canRedo() );
-
      const QMimeData *mdata = QApplication::clipboard()->mimeData();
      m_actionPaste->setEnabled( mdata && mdata->hasFormat( itemMimeType ) );

@@ -48,12 +48,9 @@ private slots:
   void onMenuProperties();
   void onMenuPrintPreview();
   void onMenuPrint();
-   void onMenuUndo();
-   void onMenuRedo();
   void onMenuCopy();
   void onMenuCut();
   void onMenuPaste();
-   void onMenuSettings();
   void onMenuInsert( int id );
   void onMenuAbout();
   void onMenuQtAbout();
@@ -75,12 +72,9 @@ private:
   QAction        *m_actionLabelProperties;
   QAction        *m_actionPrint;
   QAction        *m_actionPrintPreview;
-   QAction        *m_actionUndo;
-   QAction        *m_actionRedo;
   QAction        *m_actionCopy;
   QAction        *m_actionCut;
   QAction        *m_actionPaste;
-   QAction        *m_actionSettings;

   QSignalMapper  *m_insertMapper;
   QSignalMapper  *m_newLabelMapper;
@@ -20,7 +20,6 @@

 #include "qcdscene.h"
 #include "qshapefactory.h"
-#include "qlightpixmapitem.h"

 #include <QMenu>
 #include <QMessageBox>
@@ -35,19 +34,15 @@
 #include <QApplication>
 #include <QClipboard>
 #include <QMimeData>
-#include <QRegExp>

 QCDScene::QCDScene( QObject * parent )
   : QGraphicsScene( parent ),
   m_index( 0 ),
   m_saved( true ),
-   m_itemMoved( false ),
   m_labelMode( modeFull ),
-   m_cdColor( Qt::white ),
-   m_undoPosition( m_undoBuffer.end() )
+   m_cdColor( Qt::white )
 {
   setSceneRect( -60.0, -60.0, 60.0 * 2, 60.0 * 2 );
-
 }

 //#include <iostream>
@@ -75,64 +70,33 @@ void QCDScene::replace( const QString2String &strings )
   }
 }

-void QCDScene::start( LabelMode mode )
-{
-   setLabelMode( mode );
-   pushUndo();
-}
-
 bool QCDScene::load( const QString &fileName, QString *errMessage )
 {
-   if( QRegExp( ".*.\\.qlx$", Qt::CaseInsensitive ).exactMatch( fileName ) ) {
-      QFile file( fileName );
-      if( !file.open( QIODevice::ReadOnly | QIODevice::Text ) ) {
-         if( errMessage )
-            *errMessage = "cannot open file for reading";
-         else
-            QMessageBox::critical( 0, tr( "Error" ), tr( "Cannot open file for reading\n" ) + fileName );
-         return false;
-      }
-      QXmlStreamReader reader( &file );
-      try {
-         read( reader );
-      }
-      catch( const QString &err ) {
-         if( errMessage )
-            *errMessage = err;
-         else
-            QMessageBox::critical( 0, tr( "Error" ), tr( "Cannot read file " ) + fileName + "\n" + err );
-         return false;
-      }
-      m_fileName = fileName;
-      m_saved = true;
-      setName();
-
-      pushUndo();
-      return true;
-   }
-   QShapeFactory &sfactory = QShapeFactory::instance();
-   QLightPixmapItem *item =
-         static_cast<QLightPixmapItem *>(sfactory.create( QShapeControllerPixmap::Type ) );
-   addItem( item );
-   if( item->loadImage( fileName ) ) {
-      QSize size = item->pixmap().size();
-      item->setOffset( -QPointF( size.height(), size.width()  ) / 2.0 );
-      item->setTransform( QTransform().scale( size.width() ? 120.0 / size.width() : 1.0,
-                                             size.height() ? 120.0 / size.height() : 1.0 ) );
-      setName();
-      pushUndo();
-      return true;
-   } else {
+   QFile file( fileName );
+   if( !file.open( QIODevice::ReadOnly | QIODevice::Text ) ) {
      if( errMessage )
-         *errMessage = "cannot load image";
+         *errMessage = "cannot open file for reading";
      else
-         QMessageBox::critical( 0, tr( "Error" ), tr( "Cannot load image " ) +
-                                fileName + "\n" );
+         QMessageBox::critical( 0, tr( "Error" ), tr( "Cannot open file for reading\n" ) + fileName );
+      return false;
   }
-   return false;
+   QXmlStreamReader reader( &file );
+   try {
+      read( reader );
+   }
+   catch( const QString &err ) {
+      if( errMessage )
+         *errMessage = err;
+      else
+         QMessageBox::critical( 0, tr( "Error" ), tr( "Cannot read file " ) + fileName + "\n" + err );
+      return false;
+   }
+   m_fileName = fileName;
+   m_saved = true;
+   setName();
+   return true;
 }

-
 bool QCDScene::save()
 {
   QFile file( m_fileName );
@@ -179,32 +143,10 @@ void QCDScene::setName()
   updateTitles();
 }

-void QCDScene::setChanged( bool undo )
+void QCDScene::setChanged()
 {
   m_saved = false;
   updateTitles();
-
-   if( undo && m_undoPosition != m_undoBuffer.end() )
-      pushUndo();
-
-   emit changed();
-}
-
-void QCDScene::pushUndo()
-{
-   if( canRedo() ) {
-      UndoBuffer::iterator pos = m_undoBuffer.begin() + 1 + ( m_undoPosition - m_undoBuffer.begin() );
-      m_undoBuffer.erase( pos, m_undoBuffer.end() );
-   }
-
-   QString data;
-   QXmlStreamWriter writer( &data );
-   write( writer );
-   m_undoBuffer.push_back( data );
-   if( m_undoBuffer.size() > 20 )
-      m_undoBuffer.pop_front();
-
-   m_undoPosition = m_undoBuffer.end() - 1;
 }

 void QCDScene::updateTitles() const
@@ -388,16 +330,6 @@ void QCDScene::contextMenuEvent( QGraphicsSceneContextMenuEvent *mouseEvent )
   menu.exec( mouseEvent->screenPos() );
 }

-void QCDScene::mouseReleaseEvent ( QGraphicsSceneMouseEvent *mouseEvent )
-{
-   if( m_itemMoved ) {
-      setChanged();
-      m_itemMoved = false;
-   }
-
-   QGraphicsScene::mouseReleaseEvent( mouseEvent );
-}
-
 void QCDScene::onMenuEdit()
 {
   QList<QGraphicsItem *> list = selectedItems();
@@ -455,37 +387,4 @@ void QCDScene::sendItemTo( bool front )
         zValue = item->zValue() - 0.1;
   }
   selectedItem->setZValue( zValue );
-   setChanged();
-}
-
-bool QCDScene::canUndo() const
-{
-   return m_undoPosition - m_undoBuffer.begin() > 0;
-}
-
-bool QCDScene::canRedo() const
-{
-   return m_undoBuffer.end() - m_undoPosition > 1;
-}
-
-void QCDScene::unredo( bool undo )
-{
-   if( undo ) {
-      if( !canUndo() )
-      return;
-      --m_undoPosition;
-   } else {
-      if( !canRedo() )
-         return;
-      ++m_undoPosition;
-   }
-
-   try {
-      clear();
-      QXmlStreamReader reader( *m_undoPosition );
-      read( reader );
-   }
-   catch(...) {
-   }
-   setChanged( false );
 }
@@ -44,19 +44,13 @@ public:

   bool isSaved() const { return m_saved; }
   bool isUnnamed() const { return m_fileName.isEmpty(); }
-   bool canUndo() const;
-   bool canRedo() const;

-   void itemMoved() { m_itemMoved = true; }
-   void setChanged( bool undo = true );
+   void setChanged();
   void setName();
-   void start( LabelMode mode );
   bool load( const QString &fileName, QString *errMessage = 0 );
   void replace( const QString2String &strings );
   bool save();
   bool saveAs( const QString &fileName );
-   void undo() { unredo( true ); }
-   void redo() { unredo( false ); }

   void putItemToClipboard( bool move );
   void getItemFromClipboard();
@@ -65,12 +59,8 @@ public:
   void redrawViews() const;
   QString name() const { return m_name; }

-signals:
-   void changed();
-
 protected:
   virtual void contextMenuEvent( QGraphicsSceneContextMenuEvent *contextMenuEvent );
-   virtual void mouseReleaseEvent ( QGraphicsSceneMouseEvent *mouseEvent );

 private slots:
   void onMenuEdit();
@@ -85,21 +75,14 @@ private:
   bool readItem( QXmlStreamReader &reader );
   void read( QXmlStreamReader &reader );
   void sendItemTo( bool front );
-   void pushUndo();
-   void unredo( bool undo );

 private:
-   typedef QList<QString> UndoBuffer;
-
-   QString                    m_name;
-   QString                    m_fileName;
-   int                        m_index;
-   bool                       m_saved;
-   bool                       m_itemMoved;
-   LabelMode                  m_labelMode;
-   QColor                     m_cdColor;
-   UndoBuffer                 m_undoBuffer;
-   UndoBuffer::const_iterator m_undoPosition;
+   QString   m_name;
+   QString   m_fileName;
+   int       m_index;
+   bool      m_saved;
+   LabelMode m_labelMode;
+   QColor    m_cdColor;
 };

 #endif //QCDSCENE_H
@@ -147,19 +147,18 @@ void QCDView::drawForeground ( QPainter * painter, const QRectF & rect )
         m_labelMode = cdscene->labelMode();

      *m_mask = QPixmap( frameSize() );
-      QRectF rectf( QPointF( -frameSize().width(), -frameSize().height() ), frameSize() * 2 );

      {
         QPainter paint( m_mask );
         paint.setWorldTransform( painter->transform() );
-         drawCD( &paint, rectf, false );
+         drawCD( &paint, rect, false );
      }

      {
         QPixmap alpha( frameSize() );
         QPainter paint( &alpha );
         paint.setWorldTransform( painter->transform() );
-         drawCD( &paint, rectf, true );
+         drawCD( &paint, rect, true );
         m_mask->setAlphaChannel( alpha );
      }

@@ -28,7 +28,6 @@
 #include <QAbstractButton>
 #include <QTime>
 #include <QTimer>
-#include <QSettings>

 QDialogProgress::QDialogProgress( QWidget *parent, QLightDrive *drive )
   : QDialog(parent),
@@ -69,8 +68,6 @@ bool QDialogProgress::exec( QWidget *parent, QCDScene *scene )
   if( !drive )
      return false;

-   params.m_ejectAfterComplete = QSettings().value( cfgEjectAfterFinish, false ).toBool();
-
   QDialogProgress dialog( parent, drive );
   dialog.setWindowTitle( tr( "Printing: " ) + scene->name() );

@@ -22,7 +22,6 @@
 #include "ui_qdialogroundtext.h"
 #include "qlightroundtextitem.h"
 #include "qcdscene.h"
-#include "qdialogsettings.h"

 #include <QFontDialog>
 #include <QColorDialog>
@@ -133,7 +132,6 @@ void QDialogRoundText::onFont()
   //font.setPointSizeF( font.pointSizeF() / 2.0 );
   if( ok ) {
      m_item->setFont( font );
-      QDialogSettings::setLastUsedFont( font );
      fontChanged();
   }
 }
@@ -1,99 +0,0 @@
-/*  qlscribe - Qt based application to print lightScribe discs
-
-    Copyright (C) 2009 Vyacheslav Kononenko <vyacheslav@kononenko.net>
-
-    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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-    $Id$ */
-
-#include "qdialogsettings.h"
-#include "ui_qdialogsettings.h"
-#include "qlscribe.h"
-
-#include <QSettings>
-#include <QFontDialog>
-
-QFont *QDialogSettings::m_lastUsedFont = 0;
-
-QDialogSettings::QDialogSettings(QWidget *parent) :
-    QDialog( parent ),
-    m_ui( new Ui::QDialogSettings )
-{
-   m_ui->setupUi( this );
-   connect( m_ui->btnFont,          SIGNAL(clicked()), this, SLOT(onFont()) );
-   connect( m_ui->btnLastUsedFont,  SIGNAL(clicked()), this, SLOT(onLastUsedFont()) );
-   m_ui->btnLastUsedFont->setEnabled( m_lastUsedFont );
-}
-
-QDialogSettings::~QDialogSettings()
-{
-    delete m_ui;
-}
-
-void QDialogSettings::changeEvent(QEvent *e)
-{
-    switch (e->type()) {
-    case QEvent::LanguageChange:
-        m_ui->retranslateUi(this);
-        break;
-    default:
-        break;
-    }
-}
-
-bool QDialogSettings::exec( QWidget *parent )
-{
-   QDialogSettings dialog( parent );
-   QSettings sts;
-   dialog.m_font = sts.value( cfgDefaultFont ).value<QFont>();
-   dialog.m_ui->fontName->setCurrentFont( dialog.m_font );
-   dialog.m_ui->chkEject->setChecked( sts.value( cfgEjectAfterFinish, false ).toBool() );
-
-   if( dialog.QDialog::exec() == Rejected ) return false;
-
-   sts.setValue( cfgDefaultFont, dialog.m_font );
-   sts.setValue( cfgEjectAfterFinish, dialog.m_ui->chkEject->isChecked() );
-
-   return true;
-}
-
-void QDialogSettings::onFont()
-{
-   bool ok = true;
-   QFont font = QFontDialog::getFont( &ok, m_font, this );
-   if( ok ) {
-      m_font = font;
-      m_ui->fontName->setCurrentFont( font );
-   }
-}
-
-void QDialogSettings::onLastUsedFont()
-{
-   if( m_lastUsedFont ) {
-      m_font = *m_lastUsedFont;
-      m_ui->fontName->setCurrentFont( *m_lastUsedFont );
-   }
-}
-
-void QDialogSettings::setLastUsedFont( const QFont &font )
-{
-   if( !m_lastUsedFont ) m_lastUsedFont = new QFont( font );
-   else *m_lastUsedFont = font;
-}
-
-QFont QDialogSettings::defaultFont()
-{
-   return QSettings().value( cfgDefaultFont ).value<QFont>();
-}
@@ -1,56 +0,0 @@
-/*  qlscribe - Qt based application to print lightScribe discs
-
-    Copyright (C) 2009 Vyacheslav Kononenko <vyacheslav@kononenko.net>
-
-    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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-    $Id$ */
-
-#ifndef QDIALOGSETTINGS_H
-#define QDIALOGSETTINGS_H
-
-#include <QtGui/QDialog>
-
-namespace Ui {
-    class QDialogSettings;
-}
-
-class QDialogSettings : public QDialog {
-    Q_OBJECT
-    Q_DISABLE_COPY(QDialogSettings)
-public:
-
-   static bool exec( QWidget *parent = 0 );
-   static void setLastUsedFont( const QFont &font );
-   static QFont defaultFont();
-
-private:
-    explicit QDialogSettings( QWidget *parent = 0 );
-    virtual ~QDialogSettings();
-
-protected:
-    virtual void changeEvent(QEvent *e);
-
-private slots:
-   void onFont();
-   void onLastUsedFont();
-
-private:
-    Ui::QDialogSettings *m_ui;
-    QFont                m_font;
-    static QFont        *m_lastUsedFont;
-};
-
-#endif // QDIALOGSETTINGS_H
@@ -1,140 +0,0 @@
-<ui version="4.0" >
- <class>QDialogSettings</class>
- <widget class="QDialog" name="QDialogSettings" >
-  <property name="windowModality" >
-   <enum>Qt::NonModal</enum>
-  </property>
-  <property name="geometry" >
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>305</width>
-    <height>156</height>
-   </rect>
-  </property>
-  <property name="windowTitle" >
-   <string>Settings</string>
-  </property>
-  <property name="modal" >
-   <bool>false</bool>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout_2" >
-   <item>
-    <widget class="QFrame" name="frame" >
-     <property name="frameShape" >
-      <enum>QFrame::StyledPanel</enum>
-     </property>
-     <property name="frameShadow" >
-      <enum>QFrame::Raised</enum>
-     </property>
-     <layout class="QVBoxLayout" name="verticalLayout" >
-      <item>
-       <layout class="QFormLayout" name="formLayout" >
-        <item row="0" column="0" >
-         <widget class="QLabel" name="label" >
-          <property name="text" >
-           <string>Default font:</string>
-          </property>
-         </widget>
-        </item>
-        <item row="0" column="1" >
-         <widget class="QFontComboBox" name="fontName" >
-          <property name="enabled" >
-           <bool>false</bool>
-          </property>
-          <property name="editable" >
-           <bool>false</bool>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-      <item>
-       <layout class="QHBoxLayout" name="horizontalLayout" >
-        <item>
-         <spacer name="horizontalSpacer" >
-          <property name="orientation" >
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeHint" stdset="0" >
-           <size>
-            <width>40</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item>
-         <widget class="QPushButton" name="btnFont" >
-          <property name="text" >
-           <string>Font...</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QPushButton" name="btnLastUsedFont" >
-          <property name="text" >
-           <string>Last used</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-      <item>
-       <widget class="QCheckBox" name="chkEject" >
-        <property name="text" >
-         <string>Eject tray after finish</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <widget class="QDialogButtonBox" name="buttonBox" >
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="standardButtons" >
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-     </property>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>accepted()</signal>
-   <receiver>QDialogSettings</receiver>
-   <slot>accept()</slot>
-   <hints>
-    <hint type="sourcelabel" >
-     <x>248</x>
-     <y>254</y>
-    </hint>
-    <hint type="destinationlabel" >
-     <x>157</x>
-     <y>274</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>rejected()</signal>
-   <receiver>QDialogSettings</receiver>
-   <slot>reject()</slot>
-   <hints>
-    <hint type="sourcelabel" >
-     <x>316</x>
-     <y>260</y>
-    </hint>
-    <hint type="destinationlabel" >
-     <x>286</x>
-     <y>274</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
-</ui>
@@ -21,7 +21,6 @@
 #include "qdialogtext.h"
 #include "ui_qdialogtext.h"
 #include "qcdscene.h"
-#include "qdialogsettings.h"

 #include <QGraphicsSimpleTextItem>
 #include <QFontDialog>
@@ -98,7 +97,6 @@ void QDialogText::onFont()
   QFont font = QFontDialog::getFont( &ok, m_item->font(), this );
   if( ok ) {
      m_item->setFont( font );
-      QDialogSettings::setLastUsedFont( font );
      fontChanged();
   }
 }
@@ -1,8 +1,8 @@
 <ui version="4.0" >
 <class>QDialogText</class>
 <widget class="QDialog" name="QDialogText" >
-  <property name="enabled" >
-   <bool>true</bool>
+  <property name="windowModality" >
+   <enum>Qt::NonModal</enum>
  </property>
  <property name="geometry" >
   <rect>
@@ -15,6 +15,9 @@
  <property name="windowTitle" >
   <string>Text properties</string>
  </property>
+  <property name="modal" >
+   <bool>false</bool>
+  </property>
  <layout class="QHBoxLayout" name="horizontalLayout_3" >
   <item>
    <layout class="QVBoxLayout" name="verticalLayout" >
@@ -29,21 +29,10 @@ QLightPixmapItem::QLightPixmapItem()
 {
 }

-bool QLightPixmapItem::loadImage( const QString &name )
-{
-   QPixmap pixmap( name );
-   if( pixmap.isNull() )
-      return false;
-   m_imageName = name;
-   setPixmap( pixmap );
-   return true;
-}
-
-
 QVariant QLightPixmapItem::itemChange( GraphicsItemChange change, const QVariant & value )
 {
   if( scene() && change == ItemPositionHasChanged )
-      static_cast<QCDScene *>( scene() )->itemMoved();
+      static_cast<QCDScene *>( scene() )->setChanged();

   return value;
 }
@@ -25,11 +25,11 @@

 #include "qshapefactory.h"

-class QLightPixmapItem : public QGraphicsPixmapItem {
+class QLightPixmapItem : public QGraphicsPixmapItem
+{
 public:
    QLightPixmapItem();

-    bool loadImage( const QString &name );
    void imageName( const QString &name ) { m_imageName = name; }
    const QString &imageName() const { return m_imageName; }

@@ -21,7 +21,6 @@
 #include "qlightroundtextitem.h"
 #include "qdialogroundtext.h"
 #include "qcdscene.h"
-#include "qdialogsettings.h"

 #include <QPainter>
 #include <QFontMetrics>
@@ -29,7 +28,6 @@
 #include <QMessageBox>
 #include <QXmlStreamWriter>
 #include <QTextLayout>
-#include <QGraphicsSceneMouseEvent>

 #include <math.h>

@@ -232,38 +230,14 @@ void QLightRoundTextItem::paint( QPainter *painter, const QStyleOptionGraphicsIt
   }
 }

-inline
-double distance( const QPointF &p1, const QPointF &p2 )
+QVariant QLightRoundTextItem::itemChange( GraphicsItemChange change, const QVariant & value )
 {
-   QPointF d = p1 - p2;
-   return sqrt( d.x() * d.x() + d.y() * d.y() );
+   if( scene() && change == ItemPositionHasChanged )
+      static_cast<QCDScene *>( scene() )->setChanged();
+
+   return value;
 }

-inline
-double angle( const QPointF &p1, const QPointF &p2 )
-{
-   QPointF d = p1 - p2;
-   return atan2( d.y(), d.x() ) * 180.0 / 3.14159;
-}
-
-void QLightRoundTextItem::mouseMoveEvent( QGraphicsSceneMouseEvent *event )
-{
-   if( event->buttons() & Qt::LeftButton ) {
-      double dradi = distance( scenePos(), event->lastScenePos() ) - distance( scenePos(), event->scenePos() );
-      double dangle = ::angle( scenePos(), event->lastScenePos() ) - ::angle( scenePos(), event->scenePos() );
-
-      prepareGeometryChange();
-      m_radius -= dradi;
-      m_angle -= dangle;
-      if( m_angle > 360.0 ) m_angle -= 360.0;
-      if( m_angle < 0.0 ) m_angle += 360.0;
-
-      static_cast<QCDScene *>( scene() )->itemMoved();
-   } else
-      event->ignore();
-}
-
-
 RegisterController< QShapeControllerRoundText > regControllerRoundText;

 QString QShapeControllerRoundText::name() const
@@ -279,7 +253,6 @@ QString QShapeControllerRoundText::menuName() const
 QGraphicsItem *QShapeControllerRoundText::create() const
 {
   QLightRoundTextItem *item = new QLightRoundTextItem;
-   item->setFont( QDialogSettings::defaultFont() );
   return item;
 }

@@ -55,7 +55,7 @@ public:
    virtual int type() const { return Type; }

 protected:
-   virtual void mouseMoveEvent( QGraphicsSceneMouseEvent *event );
+   virtual QVariant itemChange ( GraphicsItemChange change, const QVariant & value );

 private:
    QFont         m_font;
@@ -37,7 +37,7 @@
 QDBusArgument &operator<<( QDBusArgument &argument, const PrintParameters &p )
 {
     argument.beginStructure();
-     argument << p.m_labelMode << p.m_drawOptions << p.m_printQuality << p.m_mediaOptimizationLevel << (int) p.m_ejectAfterComplete;
+     argument << p.m_labelMode << p.m_drawOptions << p.m_printQuality << p.m_mediaOptimizationLevel;
     argument.endStructure();
     return argument;
 }
@@ -46,14 +46,13 @@
 const QDBusArgument &operator>>( const QDBusArgument &argument, PrintParameters &p )
 {
     argument.beginStructure();
-     int drawOptions = 0, labelMode = 0, mediaOptimizationLevel = 0, printQuality = 0, ejectAfterComplete = 0;
-     argument >> labelMode >> drawOptions >> printQuality >> mediaOptimizationLevel >> ejectAfterComplete;
+     int drawOptions = 0, labelMode = 0, mediaOptimizationLevel = 0, printQuality = 0;
+     argument >> labelMode >> drawOptions >> printQuality >> mediaOptimizationLevel;
     argument.endStructure();
     p = PrintParameters( LabelMode( labelMode ),
                          DrawOptions( drawOptions ),
                          PrintQuality( printQuality ),
-                          MediaOptimizationLevel( mediaOptimizationLevel ),
-                          ejectAfterComplete );
+                          MediaOptimizationLevel( mediaOptimizationLevel ) );
     return argument;
 }

@@ -35,20 +35,13 @@ struct PrintParameters {
   DrawOptions            m_drawOptions;
   PrintQuality           m_printQuality;
   MediaOptimizationLevel m_mediaOptimizationLevel;
-   bool                   m_ejectAfterComplete;

   PrintParameters()
            : m_labelMode( modeFull ), m_drawOptions( drawDefault ),
-            m_printQuality( qualityBest ), m_mediaOptimizationLevel( mediaRecognized ), m_ejectAfterComplete( false )  {}
-   PrintParameters( LabelMode labelMode,
-                    DrawOptions drawOptions,
-                    PrintQuality printQuality,
-                    MediaOptimizationLevel mediaOptimizationLevel,
-                    bool ejectAfterComplete )
+            m_printQuality( qualityBest ), m_mediaOptimizationLevel( mediaRecognized )  {}
+   PrintParameters( LabelMode labelMode, DrawOptions drawOptions, PrintQuality printQuality, MediaOptimizationLevel mediaOptimizationLevel )
            : m_labelMode( labelMode ), m_drawOptions( drawOptions ),
-            m_printQuality( printQuality ), m_mediaOptimizationLevel( mediaOptimizationLevel ),
-            m_ejectAfterComplete( ejectAfterComplete )
-   {}
+            m_printQuality( printQuality ), m_mediaOptimizationLevel( mediaOptimizationLevel )  {}
 };

 Q_DECLARE_METATYPE( PrintParameters );
@@ -21,7 +21,6 @@
 #include "qlighttextitem.h"
 #include "qdialogtext.h"
 #include "qcdscene.h"
-#include "qdialogsettings.h"

 #include <QXmlStreamWriter>
 #include <QXmlStreamReader>
@@ -34,7 +33,7 @@ QLightTextItem::QLightTextItem()
 QVariant QLightTextItem::itemChange( GraphicsItemChange change, const QVariant & value )
 {
   if( scene() && change == ItemPositionHasChanged )
-      static_cast<QCDScene *>( scene() )->itemMoved();
+      static_cast<QCDScene *>( scene() )->setChanged();

   return value;
 }
@@ -54,8 +53,7 @@ QString QShapeControllerText::menuName() const

 QGraphicsItem *QShapeControllerText::create() const
 {
-   QLightTextItem *item = new QLightTextItem;
-   item->setFont( QDialogSettings::defaultFont() );
+   QGraphicsItem *item = new QLightTextItem;
   item->setTransform( QTransform().scale( 0.5, 0.5 ), true );
   item->setPos( 0, -40.0 );

@@ -64,9 +64,4 @@ const char * const itemMimeType = "application/x-qlscribe;item";
 const char * const DBusServiceName = "@QLSCRIBE_DBUS_MANAGER_SERVICE@";
 const char * const DBusManagerPath = "@QLSCRIBE_DBUS_MANAGER_PATH@";

-// config keys
-const char * const cfgDefaultFont      = "DefaultTextFont";
-const char * const cfgEjectAfterFinish = "EjectAfterFinish";
-
-
 #endif // QLSCRIBE_H
@@ -20,8 +20,7 @@ SOURCES += main.cpp \
    qlighttextitem.cpp \
    qlightpixmapitem.cpp \
    qdialogcdproperties.cpp \
-    qconsoleprintprogress.cpp \
-    qdialogsettings.cpp
+    qconsoleprintprogress.cpp
 QMAKE_LIBS += -llightscribe
 HEADERS += mainwindow.h \
    qlightroundtextitem.h \
@@ -37,12 +36,10 @@ HEADERS += mainwindow.h \
    qlighttextitem.h \
    qlightpixmapitem.h \
    qdialogcdproperties.h \
-    qconsoleprintprogress.h \
-    qdialogsettings.h
+    qconsoleprintprogress.h
 FORMS += qdialogtext.ui \
    qdialogroundtext.ui \
    qdialogpixmap.ui \
    qdialogprint.ui \
    qdialogprogress.ui \
-    qdialogcdproperties.ui \
-    qdialogsettings.ui
+    qdialogcdproperties.ui
@@ -118,13 +118,7 @@ QString QShapeFactory::name( int type ) const
 QGraphicsItem *QShapeFactory::create( int type ) const
 {
   QShapeController *ctrl = getController( type );
-   if( !ctrl ) return 0;
-   QGraphicsItem *item = ctrl->create();
-   if( item ) {
-      item->setFlag( QGraphicsItem::ItemIsMovable, true );
-      item->setFlag( QGraphicsItem::ItemIsSelectable, true );
-   }
-   return item;
+   return ctrl ? ctrl->create() : 0;
 }

 bool QShapeFactory::edit( QGraphicsItem *item, QWidget *parent ) const
				`@@ -1 +0,0 @@`
				`/usr/share/dbus-1/system-services/org.lightscribe.printManager.service`