Port qlscribe to Qt 6

git-svn-id: https://svn.code.sf.net/p/qlscribe/svn/trunk@187 cac9541e-1b8d-4bfa-827e-589bba606050

.gitignore

@@ -0,0 +1 @@
+/build/

CMakeLists.txt

@@ -18,9 +18,14 @@
 #
 #    $Id$ 
 
-PROJECT( qlscribe )
+CMAKE_MINIMUM_REQUIRED(VERSION 3.21)
+PROJECT(qlscribe VERSION 0.17 LANGUAGES CXX)
 
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0)
+SET(CMAKE_CXX_STANDARD 17)
+SET(CMAKE_CXX_STANDARD_REQUIRED ON)
+SET(CMAKE_AUTOMOC ON)
+SET(CMAKE_AUTOUIC ON)
+SET(CMAKE_AUTORCC ON)
 
 SET( FINAL_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} CACHE PATH "Final install path")
 SET( CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake )
@@ -32,6 +37,6 @@ SET( QLSCRIBE_DBUS_PATH /org/lightscribe )
 SET( QLSCRIBE_DBUS_MANAGER_PATH ${QLSCRIBE_DBUS_PATH}/printManager ) # path to manager
 SET( QLSCRIBE_DBUS_DRIVES_PATH ${QLSCRIBE_DBUS_PATH}/drives )   # base path under which drives located
 
-SUBDIRS( src )
-SUBDIRS( resources )
-SUBDIRS( lscribed )
+ADD_SUBDIRECTORY(src)
+ADD_SUBDIRECTORY(resources)
+ADD_SUBDIRECTORY(lscribed)

ChangeLog

@@ -3,5 +3,5 @@
         * For historical reasons: this is when I imported qlscribe into
           SourceForge.
 
-        $Revision:$ $Date:$
+        $Revision$ $Date$
 

INSTALL

@@ -1,6 +1,30 @@
 Qt lightScribe Installaton instructions
 =======================================
 
+To compile qlscribe succesfully you may need additional packages installed. 
+
+So for Ubuntu folowing packages are required:
+    build-essential
+    cmake
+    libqt4-dev
+    libdbus-1-dev
+
+For 64 bit Ubuntu you need also to install folowing packages:
+    ia32-libs
+    libc6-dev-i386 (maverick only, see notes)
+    g++-multilib
+
+    (Note: this will work for maverick (10.10) version, for lucid and karmic 
+     /usr/lib32/libstdc++.so.5 is missing in ia32-libs so you would have to 
+     find it see https://bugs.launchpad.net/ubuntu/+source/ia32-libs/+bug/431091 )
+    (Note: On 64 bit if you get "undefined reference std::_Rb_tree_increment..." link error it is
+     possible that link /usr/lib32/libstdc++.so points to /usr/lib32/libstdc++.so.5... change it
+     so it points /usr/lib32/libstdc++.so.6...)
+
+For 64 bit Ubuntu libdbus-1-dev does not have link for i386 libdbus-1.so you may need to create one manually:
+     sudo ln -s libdbus-1.so.3 /lib/i386-linux-gnu/libdbus-1.so
+    
+
 To compile and install, first download release from http://qlscribe.sourceforge.net/
 or check out project from subversion repository for particular release:
 
@@ -30,7 +54,7 @@ Include files should be in ${LIGHTSCRIBEDIR}/include and lib in ${LIGHTSCRIBEDIR
 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 cp /usr/local/share/qlscribe/org.lightscribe.printManager.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

NEWS

@@ -1,5 +1,20 @@
 NEWS - list of user-visible changes between releases of qlscribe
 
+New in 0.17
+-----------
+* Ported the application and build system from Qt 4 to Qt 6.
+* Modernized the CMake build while retaining the required LightScribe daemon.
+
+New in 0.16
+    Fixed build on 64 bit Ubuntu Saucy
+    Fixed bug with alarm() not found
+    Added instructions for 64 bit
+
+New in 0.15
+    Added ability to align regular text to left, right or center the same way as rounded text
+    Fixed issue with filters in open dialog
+    Added image preview to Qt open file dialog
+
 New in 0.14
     Added Software Render for preview to make preview when no drive is available
     Items have Z coordinate set to remove ambiguity
@@ -76,4 +91,3 @@ New in 0.2:
 New in 0.1: 
     Open/save as implemented. Text, round text and image items can be inserted and edited
     Print preview and print is working (no exclusive lock or tray lock on printing yet)
-

cmake/FindDbus32.cmake

@@ -32,7 +32,7 @@ FIND_LIBRARY( DBUS_LIBRARY dbus-1 )
 get_filename_component( _dbusLibPath ${DBUS_LIBRARY} PATH )
 
 FIND_PATH( DBUS_LIBINCLUDE_DIR dbus/dbus-arch-deps.h
-           PATHS /lib /usr/lib /usr/local/lib ${_dbusLibPath}
+           PATHS /lib /usr/lib /usr/local/lib /usr/lib/x86_64-linux-gnu /usr/lib/i386-linux-gnu ${_dbusLibPath}
            PATH_SUFFIXES dbus-1.0/include )
 
 if( DBUS_INCLUDE_DIR AND DBUS_LIBINCLUDE_DIR AND DBUS_LIBRARY )

debian/changelog

@@ -1,4 +1,6 @@
-qlscribe (0.14-0ubuntu1) unstable; urgency=low
+qlscribe (0.15-0lenny1) unstable; urgency=low
+  * Release 0.16 imported
+  * Release 0.15 imported
   * Release 0.14 imported
   * Release 0.13 imported
   * Release 0.12 imported

debian/control

@@ -2,7 +2,7 @@ Source: qlscribe
 Section: qt
 Priority: optional
 Maintainer: Vyacheslav Kononenko <vyacheslav@kononenko.net>
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 7), cmake, qt4-qmake, libqt4-dev, libdbus-1-dev, lightscribepublicsdk, lightscribe
 Standards-Version: 3.7.3
 Homepage: http://qlscribe.sourceforge.net/
 

lscribed/drives.cpp

@@ -278,7 +278,7 @@ void Drive::routine()
 
          function = "LS_DiscPrintMgr_EnumDiscPrinters";
          EnumDiscPrinters printers = manager.EnumDiscPrinters();
-         if( m_index >= printers.Count() )
+         if( m_index >= int( printers.Count() ) )
             throw std::string( "internal error: invalid index" );
 
          DiscPrinter printer = printers.Item( m_index );

lscribed/main.cpp

@@ -23,6 +23,7 @@
 #include <signal.h>
 #include <stdlib.h>
 #include <syslog.h>
+#include <unistd.h>
 
 #include "lscribed.h"
 #include "dbuscpp.h"

src/CMakeLists.txt

@@ -18,62 +18,30 @@
 #
 #    $Id$ 
 
-FIND_PACKAGE( Qt4 REQUIRED )
-SET( QT_USE_QTDBUS 1 )
+FIND_PACKAGE(Qt6 6.5 REQUIRED COMPONENTS Core Gui Widgets DBus)
 
 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 )
+     qdialogsettings.cpp previewinjector.cpp )
 
 SET( QLSCRIBE_UIS qdialogtext.ui qdialogroundtext.ui qdialogpixmap.ui
      qdialogprint.ui qdialogprogress.ui qdialogcdproperties.ui qdialogsettings.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 )
-
 ADD_DEFINITIONS( -Wall )
 
 CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/qlscribe.h.in ${CMAKE_CURRENT_BINARY_DIR}/qlscribe.h @ONLY )
 
-INCLUDE( ${QT_USE_FILE} )
-
-QT4_WRAP_UI( QLSCRIBE_UI_HDRS ${QLSCRIBE_UIS} )
-
-QT4_WRAP_CPP( QLSCRIBE_MOC_SRCS ${QLSCRIBE_MOC_HDRS} )
-
-QT4_ADD_RESOURCES( QLSCRIBE_RCC_SRCS ../resources/qlscribe.qrc )
-
-MACRO(ADD_DBUS_INTERFACE _sources _interface _basename)
-         GET_FILENAME_COMPONENT(_infile ${_interface} ABSOLUTE)
-         SET(_header ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.h)
-         SET(_impl   ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.cpp)
-         SET(_moc    ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.moc)
-
-         ADD_CUSTOM_COMMAND(OUTPUT ${_impl} ${_header}
-           COMMAND ${QT_DBUSXML2CPP_EXECUTABLE} -m -i qlightscribe.h -p ${_basename} ${_infile}
-           DEPENDS ${_infile})
-
-         SET_SOURCE_FILES_PROPERTIES(${_impl} PROPERTIES SKIP_AUTOMOC TRUE)
-
-         QT4_GENERATE_MOC(${_header} ${_moc})
-
-         SET(${_sources} ${${_sources}} ${_impl} ${_header} ${_moc})
-         MACRO_ADD_FILE_DEPENDENCIES(${_impl} ${_moc})
-ENDMACRO(ADD_DBUS_INTERFACE)
-
-ADD_DBUS_INTERFACE( QLSCRIBE_DBUS_SRCS lightscribe.xml lightscribe_interface )
+SET_SOURCE_FILES_PROPERTIES(lightscribe.xml PROPERTIES INCLUDE qlightscribe.h)
+QT6_ADD_DBUS_INTERFACE(QLSCRIBE_DBUS_SRCS lightscribe.xml lightscribe_interface)
 
 INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} )
 
-ADD_EXECUTABLE( qlscribe ${QLSCRIBE_SRCS} ${QLSCRIBE_MOC_SRCS}
-                         ${QLSCRIBE_RCC_SRCS} ${QLSCRIBE_UI_HDRS} 
-                         ${QLSCRIBE_DBUS_SRCS} )
+ADD_EXECUTABLE(qlscribe ${QLSCRIBE_SRCS} ${QLSCRIBE_UIS}
+                        ${QLSCRIBE_DBUS_SRCS} ../resources/qlscribe.qrc)
 
-TARGET_LINK_LIBRARIES( qlscribe ${QT_LIBRARIES} )
+TARGET_LINK_LIBRARIES(qlscribe PRIVATE Qt6::Core Qt6::Gui Qt6::Widgets Qt6::DBus)
 
 INSTALL( TARGETS qlscribe 
          DESTINATION bin )
-

src/lightscribe.xml

@@ -24,7 +24,7 @@
 <node>
   <interface name="org.lightscribe.printManager">
     <method name="getDrives">
-      <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QObject2StringMap"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QObject2StringMap"/>
       <arg type="a{ss}" direction="out"/>
     </method>
   </interface>
@@ -44,15 +44,15 @@
       <arg name="status" type="i" direction="out"/>
     </signal>
     <method name="preview">
-      <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="const PrintParameters &amp;"/>
-      <annotation name="com.trolltech.QtDBus.QtTypeName.In2" value="QSize"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="const PrintParameters &amp;"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.In2" value="QSize"/>
       <arg type="s" direction="out"/>
       <arg name="params" type="(iiiii)" 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;"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="const PrintParameters &amp;"/>
       <arg name="params" type="(iiiii)" direction="in"/>
       <arg name="image" type="ay" direction="in"/>
     </method>

src/main.cpp

@@ -34,7 +34,7 @@
 
 std::ostream &operator<<( std::ostream &os, const QString &str )
 {
-   return os << str.toAscii().data();
+   return os << str.toUtf8().constData();
 }
 
 void usage()

src/mainwindow.cpp

@@ -28,6 +28,7 @@
 #include "qdialogprogress.h"
 #include "qdialogcdproperties.h"
 #include "qdialogsettings.h"
+#include "previewinjector.h"
 
 #include <QMenuBar>
 #include <QStatusBar>
@@ -40,6 +41,7 @@
 #include <QCloseEvent>
 #include <QApplication>
 #include <QClipboard>
+#include <QMimeData>
 #include <QSettings>
 #include <QImageReader>
 #include <QPicture>
@@ -74,7 +76,8 @@ MainWindow::MainWindow( bool enablePrint )
                                       SLOT(map()) );
       m_newLabelMapper->setMapping( action, modeTitle );
    }
-   connect( m_newLabelMapper, SIGNAL(mapped(int)), this, SLOT(onMenuNewLabel(int)) );
+   connect(m_newLabelMapper, &QSignalMapper::mappedInt,
+           this, &MainWindow::onMenuNewLabel);
 
    m_menuFile->addAction( tr( "Open...", "Menu item \"Open\"" ),
                           this,
@@ -168,7 +171,8 @@ MainWindow::MainWindow( bool enablePrint )
        m_insertMapper->setMapping( action, i->first );
        connect( action, SIGNAL(triggered()), m_insertMapper, SLOT(map()) );
     }
-    connect( m_insertMapper, SIGNAL(mapped(int)), this, SLOT(onMenuInsert(int)) );
+    connect(m_insertMapper, &QSignalMapper::mappedInt,
+            this, &MainWindow::onMenuInsert);
 
     connect( QApplication::clipboard(), SIGNAL(changed(QClipboard::Mode)),
              this, SLOT(updateMenu()) );
@@ -330,18 +334,23 @@ void MainWindow::onMenuInsert( int id )
 
 void MainWindow::onMenuOpen()
 {
-   QString filter( tr("qlscribe document (*.qlx)\nImages ( ") );
+   QString filter( tr("qlscribe document (*.qlx);;Images ( ") );
    QList<QByteArray> list = QImageReader::supportedImageFormats();
    foreach( QByteArray arr, list ) {
        filter += QString( "*." ) + arr.data() + " ";
    }
-   filter += tr( ")\nAll Files (*)" );
+   filter += tr( ");;All Files (*)" );
 
-   QString fileName = QFileDialog::getOpenFileName( this, 
-                                                    tr( "Open:" ), 
-                                                    QString(), 
-                                                    filter );
-   
+   QFileDialog fd( this, "Open:", QString(), filter );
+
+   bool injectPreview = QSettings().value( cfgInjectPreview, true ).toBool();
+   PreviewInjector pj( injectPreview ? &fd : 0 );
+   fd.setFileMode( QFileDialog::ExistingFile );
+
+   if( fd.exec() != QDialog::Accepted )
+       return;
+
+   QString fileName = fd.selectedFiles().value(0);
    if( fileName.isNull() )
       return;
 
@@ -539,7 +548,7 @@ void MainWindow::onMenuAbout()
    QMessageBox::about( this,
                        tr( "About" ),
                        tr( "<h3>qlscribe - Qt lisghtScribe</h3>"
-                           "<p>release 0.14 $Revision$</p>"
+                           "<p>release 0.17</p>"
                            "<p>visit project at home page "
                            "<a href=\"http://qlscribe.sourceforge.net/\">qlscribe.sourceforge.net</a></p>" ) );
 }

src/mainwindow.h

@@ -21,7 +21,7 @@
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
-#include <QtGui/QMainWindow>
+#include <QMainWindow>
 
 class QMdiArea;
 class QSignalMapper;

src/previewinjector.cpp

@@ -0,0 +1,60 @@
+#include "previewinjector.h"
+
+#include <QFileDialog>
+#include <QLabel>
+#include <QSplitter>
+#include <QImageReader>
+
+PreviewInjector::PreviewInjector( QFileDialog * dl ) :
+    m_label( 0 ),
+    m_size( 160, 120 )
+{
+    if( !dl )
+        return;
+
+    QSplitter *sp = dl->findChild<QSplitter *>("splitter");
+    if( !sp )
+        return;
+
+    m_label = new QLabel;
+    m_label->resize( m_size );
+    sp->addWidget( m_label );
+    connect( dl, SIGNAL(currentChanged(QString)),SLOT(onSelectionChanged(QString)));
+}
+
+PreviewInjector::~PreviewInjector()
+{
+    delete m_label;
+}
+
+void PreviewInjector::onSelectionChanged(QString file)
+{
+    QImageReader reader( file );
+
+    if( !reader.canRead() ) {
+        m_label->setPixmap( QPixmap() );
+        return;
+    }
+
+    m_label->resize( m_size );
+    QSize toSize = m_size;
+    QSize sz = reader.size();
+    if( !sz.isNull() ) {
+        double r1 = m_label->size().width() / double( sz.width() );
+        double r2 = m_label->size().height() / double( sz.height() );
+
+        double ratio = std::max( r1, r2 );
+        if( ratio < 1.0 ) {
+            toSize.setWidth( sz.width() * ratio );
+            toSize.setHeight( sz.height() * ratio );
+        }
+    }
+
+    reader.setScaledSize( toSize );
+    QImage img = reader.read();
+    if( img.isNull() ) {
+        m_label->setPixmap( QPixmap() );
+        return;
+    }
+    m_label->setPixmap( QPixmap::fromImage( img ) );
+}

src/previewinjector.h

@@ -0,0 +1,27 @@
+#ifndef PREVIEWINJECTOR_HPP
+#define PREVIEWINJECTOR_HPP
+
+#include <QObject>
+#include <QSize>
+
+class QFileDialog;
+class QLabel;
+
+class PreviewInjector : public QObject {
+    Q_OBJECT
+public:
+
+    PreviewInjector( QFileDialog * dl );
+    ~PreviewInjector();
+
+    bool injected() const { return m_label; }
+
+private slots:
+    void onSelectionChanged(QString );
+
+private:
+    QLabel *m_label;
+    QSize   m_size;
+};
+
+#endif // PREVIEWINJECTOR_HPP

src/qcdscene.cpp

@@ -31,11 +31,10 @@
 #include <QXmlStreamWriter>
 #include <QMessageBox>
 #include <QGraphicsView>
-#include <QRegExp>
 #include <QApplication>
 #include <QClipboard>
 #include <QMimeData>
-#include <QRegExp>
+#include <QFileInfo>
 
 QCDScene::QCDScene( QObject * parent )
    : QGraphicsScene( parent ),
@@ -83,7 +82,7 @@ void QCDScene::start( LabelMode mode )
 
 bool QCDScene::load( const QString &fileName, QString *errMessage )
 {
-   if( QRegExp( ".*.\\.qlx$", Qt::CaseInsensitive ).exactMatch( fileName ) ) {
+   if (fileName.endsWith(".qlx", Qt::CaseInsensitive)) {
       QFile file( fileName );
       if( !file.open( QIODevice::ReadOnly | QIODevice::Text ) ) {
          if( errMessage )
@@ -188,9 +187,7 @@ void QCDScene::setName()
       }
       m_name = "Unnamed_" + QString::number( m_index );
    } else {
-      QRegExp rx( "(.*/)?(.*)\\.qlx" );
-      rx.indexIn( m_fileName );
-      m_name = rx.cap( 2 );
+      m_name = QFileInfo(m_fileName).completeBaseName();
    }
 
    updateTitles();
@@ -405,7 +402,7 @@ void QCDScene::getItemFromClipboard()
 
 void QCDScene::contextMenuEvent( QGraphicsSceneContextMenuEvent *mouseEvent )
 {
-   QGraphicsItem *item = itemAt( mouseEvent->scenePos() );
+   QGraphicsItem *item = itemAt(mouseEvent->scenePos(), QTransform());
    if( !item )
       return;
    item->setSelected( true );
@@ -520,4 +517,3 @@ void QCDScene::unredo( bool undo )
    }
    setChanged( false );
 }
-

src/qcdview.cpp

@@ -160,7 +160,9 @@ void QCDView::drawForeground ( QPainter * painter, const QRectF & rect )
          QPainter paint( &alpha );
          paint.setWorldTransform( painter->transform() );
          drawCD( &paint, rectf, true );
-         m_mask->setAlphaChannel( alpha );
+         QImage maskImage = m_mask->toImage().convertToFormat(QImage::Format_ARGB32);
+         maskImage.setAlphaChannel(alpha.toImage());
+         *m_mask = QPixmap::fromImage(maskImage);
       }
 
    }

src/qdialogcdproperties.h

@@ -22,7 +22,7 @@
 #ifndef QDIALOGCDPROPERTIES_H
 #define QDIALOGCDPROPERTIES_H
 
-#include <QtGui/QDialog>
+#include <QDialog>
 
 namespace Ui {
     class QDialogCDProperties;

src/qdialogpixmap.cpp

@@ -22,10 +22,12 @@
 #include "ui_qdialogpixmap.h"
 #include "qlightpixmapitem.h"
 #include "qcdscene.h"
+#include "previewinjector.h"
 
 #include <QImageReader>
 #include <QFileDialog>
 #include <QMessageBox>
+#include <QSettings>
 
 QDialogPixmap::QDialogPixmap(QWidget *parent) :
     QItemDialog( parent ),
@@ -118,8 +120,19 @@ void QDialogPixmap::onLoadImage()
    foreach( QByteArray arr, list ) {
        filter += QString( "*." ) + arr.data() + " ";
    }
-   filter += tr( ")\nAll Files (*)" );
-   QString fileName = QFileDialog::getOpenFileName( this, "Load image:", QString(), filter );
+   filter += tr( ");;All Files (*.*)" );
+
+   QFileDialog fd( this, "Load image:", QString(), filter );
+   //fd.setOption( QFileDialog::DontUseNativeDialog ); // for testing
+
+   bool injectPreview = QSettings().value( cfgInjectPreview, true ).toBool();
+   PreviewInjector pj( injectPreview ? &fd : 0 );
+   fd.setFileMode( QFileDialog::ExistingFile );
+
+   if( fd.exec() != QDialog::Accepted )
+       return;
+
+   QString fileName = fd.selectedFiles().value(0);
    if( fileName.isNull() )
       return;
 

src/qdialogprint.h

@@ -21,7 +21,7 @@
 #ifndef QDIALOGPRINT_H
 #define QDIALOGPRINT_H
 
-#include <QtGui/QDialog>
+#include <QDialog>
 
 #include "qlightscribe.h"
 

src/qdialogprogress.cpp

@@ -27,6 +27,7 @@
 #include <QMessageBox>
 #include <QAbstractButton>
 #include <QTime>
+#include <QElapsedTimer>
 #include <QTimer>
 #include <QSettings>
 
@@ -34,7 +35,7 @@ QDialogProgress::QDialogProgress( QWidget *parent, QLightDrive *drive )
    : QDialog(parent),
     m_ui(new Ui::QDialogProgress),
     m_drive( drive ),
-    m_start( new QTime ),
+    m_start(new QElapsedTimer),
     m_timer( new QTimer( this ) )
 {
     m_ui->setupUi(this);

src/qdialogprogress.h

@@ -21,7 +21,7 @@
 #ifndef QDIALOGPROGRESS_H
 #define QDIALOGPROGRESS_H
 
-#include <QtGui/QDialog>
+#include <QDialog>
 
 namespace Ui {
     class QDialogProgress;
@@ -29,7 +29,7 @@ namespace Ui {
 
 class QCDScene;
 class QAbstractButton;
-class QTime;
+class QElapsedTimer;
 class QTimer;
 class QLightDrive;
 
@@ -56,7 +56,7 @@ private:
 
     Ui::QDialogProgress *m_ui;
     QLightDrive         *m_drive;
-    QTime               *m_start;
+    QElapsedTimer       *m_start;
     QTimer              *m_timer;
 };
 

src/qdialogsettings.cpp

@@ -60,11 +60,13 @@ bool QDialogSettings::exec( QWidget *parent )
    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() );
+   dialog.m_ui->chkPreview->setChecked( sts.value( cfgInjectPreview, true ).toBool() );
 
    if( dialog.QDialog::exec() == Rejected ) return false;
 
    sts.setValue( cfgDefaultFont, dialog.m_font );
    sts.setValue( cfgEjectAfterFinish, dialog.m_ui->chkEject->isChecked() );
+   sts.setValue( cfgInjectPreview, dialog.m_ui->chkPreview->isChecked() );
 
    return true;
 }

src/qdialogsettings.h

@@ -21,7 +21,7 @@
 #ifndef QDIALOGSETTINGS_H
 #define QDIALOGSETTINGS_H
 
-#include <QtGui/QDialog>
+#include <QDialog>
 
 namespace Ui {
     class QDialogSettings;

src/qdialogsettings.ui

@@ -1,48 +1,49 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>QDialogSettings</class>
- <widget class="QDialog" name="QDialogSettings" >
-  <property name="windowModality" >
+ <widget class="QDialog" name="QDialogSettings">
+  <property name="windowModality">
    <enum>Qt::NonModal</enum>
   </property>
-  <property name="geometry" >
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>305</width>
-    <height>156</height>
+    <width>320</width>
+    <height>170</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Settings</string>
   </property>
-  <property name="modal" >
+  <property name="modal">
    <bool>false</bool>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout_2" >
+  <layout class="QVBoxLayout" name="verticalLayout_2">
    <item>
-    <widget class="QFrame" name="frame" >
-     <property name="frameShape" >
+    <widget class="QFrame" name="frame">
+     <property name="frameShape">
       <enum>QFrame::StyledPanel</enum>
      </property>
-     <property name="frameShadow" >
+     <property name="frameShadow">
       <enum>QFrame::Raised</enum>
      </property>
-     <layout class="QVBoxLayout" name="verticalLayout" >
+     <layout class="QVBoxLayout" name="verticalLayout">
       <item>
-       <layout class="QFormLayout" name="formLayout" >
-        <item row="0" column="0" >
-         <widget class="QLabel" name="label" >
-          <property name="text" >
+       <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" >
+        <item row="0" column="1">
+         <widget class="QFontComboBox" name="fontName">
+          <property name="enabled">
            <bool>false</bool>
           </property>
-          <property name="editable" >
+          <property name="editable">
            <bool>false</bool>
           </property>
          </widget>
@@ -50,13 +51,13 @@
        </layout>
       </item>
       <item>
-       <layout class="QHBoxLayout" name="horizontalLayout" >
+       <layout class="QHBoxLayout" name="horizontalLayout">
         <item>
-         <spacer name="horizontalSpacer" >
-          <property name="orientation" >
+         <spacer name="horizontalSpacer">
+          <property name="orientation">
            <enum>Qt::Horizontal</enum>
           </property>
-          <property name="sizeHint" stdset="0" >
+          <property name="sizeHint" stdset="0">
            <size>
             <width>40</width>
             <height>20</height>
@@ -65,15 +66,15 @@
          </spacer>
         </item>
         <item>
-         <widget class="QPushButton" name="btnFont" >
-          <property name="text" >
+         <widget class="QPushButton" name="btnFont">
+          <property name="text">
            <string>Font...</string>
           </property>
          </widget>
         </item>
         <item>
-         <widget class="QPushButton" name="btnLastUsedFont" >
-          <property name="text" >
+         <widget class="QPushButton" name="btnLastUsedFont">
+          <property name="text">
            <string>Last used</string>
           </property>
          </widget>
@@ -81,21 +82,28 @@
        </layout>
       </item>
       <item>
-       <widget class="QCheckBox" name="chkEject" >
-        <property name="text" >
+       <widget class="QCheckBox" name="chkEject">
+        <property name="text">
          <string>Eject tray after finish</string>
         </property>
        </widget>
       </item>
+      <item>
+       <widget class="QCheckBox" name="chkPreview">
+        <property name="text">
+         <string>Enable image preview in open dialog</string>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>
    <item>
-    <widget class="QDialogButtonBox" name="buttonBox" >
-     <property name="orientation" >
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
-     <property name="standardButtons" >
+     <property name="standardButtons">
       <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
      </property>
     </widget>
@@ -110,11 +118,11 @@
    <receiver>QDialogSettings</receiver>
    <slot>accept()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>248</x>
      <y>254</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>157</x>
      <y>274</y>
     </hint>
@@ -126,11 +134,11 @@
    <receiver>QDialogSettings</receiver>
    <slot>reject()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>316</x>
      <y>260</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>286</x>
      <y>274</y>
     </hint>

src/qdialogtext.cpp

@@ -22,8 +22,8 @@
 #include "ui_qdialogtext.h"
 #include "qcdscene.h"
 #include "qdialogsettings.h"
+#include "qlighttextitem.h"
 
-#include <QGraphicsSimpleTextItem>
 #include <QFontDialog>
 #include <QColorDialog>
 
@@ -55,19 +55,20 @@ void QDialogText::changeEvent(QEvent *e)
 
 bool QDialogText::exec( QGraphicsItem *graphicsItem )
 {
-   QGraphicsSimpleTextItem *item = dynamic_cast< QGraphicsSimpleTextItem * >( graphicsItem );
+   QLightTextItem *item = dynamic_cast< QLightTextItem * >( graphicsItem );
    if( !item )
       return false;
 
    QCDScene scene;
    m_ui->cdView->setScene( &scene );
-   m_item = new QGraphicsSimpleTextItem;
+   m_item = new QLightTextItem;
 
    m_item->setPos( item->pos() );
    m_item->setText( item->text() );
    m_item->setFont( item->font() );
-   m_item->setBrush( item->brush() );
+   m_item->setColor( item->color() );
    m_item->setTransform( item->transform() );
+   m_item->setAlignment( item->alignment() );
 
    scene.addItem( m_item, true );
 
@@ -75,19 +76,27 @@ bool QDialogText::exec( QGraphicsItem *graphicsItem )
    m_ui->spinY->setValue( m_item->pos().y() );
    m_ui->textEdit->setPlainText( m_item->text() );
 
+   int index = 0;
+   if( m_item->alignment() == Qt::AlignRight ) index = 2;
+   else if( m_item->alignment() == Qt::AlignCenter ) index = 1;
+
+   m_ui->comboAlignment->setCurrentIndex( index );
+
    colorChanged();
    fontChanged();
 
    connect( m_ui->textEdit, SIGNAL(textChanged()),        this, SLOT(textChanged()) );
    connect( m_ui->spinX,    SIGNAL(valueChanged(double)), this, SLOT(posChanged()) );
    connect( m_ui->spinY,    SIGNAL(valueChanged(double)), this, SLOT(posChanged()) );
+   connect( m_ui->comboAlignment, SIGNAL(currentIndexChanged(int)),this, SLOT(alignChanged()) );
 
    if( QDialog::exec() == Rejected ) return false;
 
    item->setPos( m_item->pos() );
    item->setText( m_item->text() );
    item->setFont( m_item->font() );
-   item->setBrush( m_item->brush() );
+   item->setColor( m_item->color() );
+   item->setAlignment( m_item->alignment() );
 
    return true;
 }
@@ -105,11 +114,11 @@ void QDialogText::onFont()
 
 void QDialogText::onColor()
 {
-   QColor color = QColorDialog::getColor( m_item->brush().color(), this );
+   QColor color = QColorDialog::getColor( m_item->color(), this );
    if( color.isValid() ){
-      m_item->setBrush( color );
+      m_item->setColor( color );
       colorChanged();
-   }
+  }
 }
 
 void QDialogText::fontChanged()
@@ -120,7 +129,7 @@ void QDialogText::fontChanged()
 void QDialogText::colorChanged()
 {
    QPixmap pixmap( m_ui->colorWidget->size() );
-   pixmap.fill( m_item->brush().color() );
+   pixmap.fill( m_item->color() );
    m_ui->colorWidget->setPixmap( pixmap );
 }
 
@@ -134,3 +143,9 @@ void QDialogText::posChanged()
    m_item->setPos( m_ui->spinX->value(), m_ui->spinY->value() );
 }
 
+void QDialogText::alignChanged()
+{
+   Qt::Alignment align[] = { Qt::AlignLeft, Qt::AlignCenter, Qt::AlignRight };
+   m_item->setAlignment( align[ m_ui->comboAlignment->currentIndex() ] );
+}
+

src/qdialogtext.h

@@ -16,7 +16,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
-    $Id:$ */
+    $Id$ */
 
 #ifndef QDIALOGTEXT_H
 #define QDIALOGTEXT_H
@@ -27,7 +27,7 @@ namespace Ui {
     class QDialogText;
 }
 
-class QGraphicsSimpleTextItem;
+class QLightTextItem;
 
 class QDialogText : public QItemDialog {
     Q_OBJECT
@@ -48,10 +48,11 @@ private slots:
    void fontChanged();
    void colorChanged();
    void posChanged();
+   void alignChanged();
 
 private:
-    Ui::QDialogText         *m_ui;
-    QGraphicsSimpleTextItem *m_item;
+    Ui::QDialogText  *m_ui;
+    QLightTextItem   *m_item;
 };
 
 #endif // QDIALOGTEXT_H

src/qdialogtext.ui

@@ -1,10 +1,11 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>QDialogText</class>
- <widget class="QDialog" name="QDialogText" >
-  <property name="enabled" >
+ <widget class="QDialog" name="QDialogText">
+  <property name="enabled">
    <bool>true</bool>
   </property>
-  <property name="geometry" >
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
@@ -12,70 +13,70 @@
     <height>627</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Text properties</string>
   </property>
-  <layout class="QHBoxLayout" name="horizontalLayout_3" >
+  <layout class="QHBoxLayout" name="horizontalLayout_3">
    <item>
-    <layout class="QVBoxLayout" name="verticalLayout" >
+    <layout class="QVBoxLayout" name="verticalLayout">
      <item>
-      <widget class="QFrame" name="frame" >
-       <property name="frameShape" >
+      <widget class="QFrame" name="frame">
+       <property name="frameShape">
         <enum>QFrame::StyledPanel</enum>
        </property>
-       <property name="frameShadow" >
+       <property name="frameShadow">
         <enum>QFrame::Raised</enum>
        </property>
-       <property name="lineWidth" >
+       <property name="lineWidth">
         <number>3</number>
        </property>
-       <layout class="QVBoxLayout" name="verticalLayout_2" >
+       <layout class="QVBoxLayout" name="verticalLayout_2">
         <item>
-         <layout class="QHBoxLayout" name="horizontalLayout" >
-          <property name="sizeConstraint" >
+         <layout class="QHBoxLayout" name="horizontalLayout">
+          <property name="sizeConstraint">
            <enum>QLayout::SetMaximumSize</enum>
           </property>
-          <property name="bottomMargin" >
+          <property name="bottomMargin">
            <number>0</number>
           </property>
           <item>
-           <layout class="QFormLayout" name="formLayout" >
-            <item row="0" column="0" >
-             <widget class="QLabel" name="label" >
-              <property name="text" >
+           <layout class="QFormLayout" name="formLayout">
+            <item row="0" column="0">
+             <widget class="QLabel" name="label">
+              <property name="text">
                <string>X:</string>
               </property>
              </widget>
             </item>
-            <item row="0" column="1" >
-             <widget class="QDoubleSpinBox" name="spinX" >
-              <property name="decimals" >
+            <item row="0" column="1">
+             <widget class="QDoubleSpinBox" name="spinX">
+              <property name="decimals">
                <number>1</number>
               </property>
-              <property name="minimum" >
+              <property name="minimum">
                <double>-61.000000000000000</double>
               </property>
-              <property name="maximum" >
+              <property name="maximum">
                <double>61.000000000000000</double>
               </property>
              </widget>
             </item>
-            <item row="1" column="0" >
-             <widget class="QLabel" name="label_2" >
-              <property name="text" >
+            <item row="1" column="0">
+             <widget class="QLabel" name="label_2">
+              <property name="text">
                <string>Y:</string>
               </property>
              </widget>
             </item>
-            <item row="1" column="1" >
-             <widget class="QDoubleSpinBox" name="spinY" >
-              <property name="decimals" >
+            <item row="1" column="1">
+             <widget class="QDoubleSpinBox" name="spinY">
+              <property name="decimals">
                <number>1</number>
               </property>
-              <property name="minimum" >
+              <property name="minimum">
                <double>-61.000000000000000</double>
               </property>
-              <property name="maximum" >
+              <property name="maximum">
                <double>61.000000000000000</double>
               </property>
              </widget>
@@ -83,11 +84,11 @@
            </layout>
           </item>
           <item>
-           <spacer name="horizontalSpacer" >
-            <property name="orientation" >
+           <spacer name="horizontalSpacer">
+            <property name="orientation">
              <enum>Qt::Horizontal</enum>
             </property>
-            <property name="sizeHint" stdset="0" >
+            <property name="sizeHint" stdset="0">
              <size>
               <width>13</width>
               <height>20</height>
@@ -96,70 +97,104 @@
            </spacer>
           </item>
           <item>
-           <layout class="QFormLayout" name="formLayout_3" >
-            <item row="0" column="0" >
-             <widget class="QLabel" name="label_5" >
-              <property name="text" >
+           <layout class="QFormLayout" name="formLayout_3">
+            <property name="fieldGrowthPolicy">
+             <enum>QFormLayout::ExpandingFieldsGrow</enum>
+            </property>
+            <item row="0" column="0">
+             <widget class="QLabel" name="label_5">
+              <property name="text">
                <string>Font:</string>
               </property>
              </widget>
             </item>
-            <item row="1" column="0" >
-             <widget class="QLabel" name="label_6" >
-              <property name="text" >
+            <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>
+            <item row="3" column="0">
+             <widget class="QLabel" name="label_6">
+              <property name="text">
                <string>Color:</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>
-            <item row="1" column="1" >
-             <widget class="QLabel" name="colorWidget" >
-              <property name="minimumSize" >
+            <item row="3" column="1">
+             <widget class="QLabel" name="colorWidget">
+              <property name="minimumSize">
                <size>
                 <width>20</width>
                 <height>20</height>
                </size>
               </property>
-              <property name="maximumSize" >
+              <property name="maximumSize">
                <size>
                 <width>20</width>
                 <height>20</height>
                </size>
               </property>
-              <property name="baseSize" >
+              <property name="baseSize">
                <size>
                 <width>0</width>
                 <height>0</height>
                </size>
               </property>
-              <property name="frameShape" >
+              <property name="frameShape">
                <enum>QFrame::Box</enum>
-              </property>
-              <property name="text" >
+           </property>
+
+           <property name="text">
                <string/>
               </property>
-              <property name="textFormat" >
+              <property name="textFormat">
                <enum>Qt::PlainText</enum>
               </property>
              </widget>
             </item>
+            <item row="2" column="1">
+             <widget class="QComboBox" name="comboAlignment" >
+               <property name="currentIndex" >
+                  <number>0</number>
+                </property>
+              <item>
+                 <property name="text" >
+                     <string>Left</string>
+                    </property>
+                  </item>
+                <item>
+                   <property name="text" >
+                       <string>Center</string>
+                      </property>
+                    </item>
+                  <item>
+                     <property name="text" >
+                         <string>Right</string>
+                        </property>
+                      </item>
+                   </widget>
+               </item>
+
+            <item row="2" column="0">
+             <widget class="QLabel" name="label_4">
+              <property name="text">
+               <string>Alignment:</string>
+              </property>
+             </widget>
+            </item>
            </layout>
           </item>
           <item>
-           <spacer name="horizontalSpacer_2" >
-            <property name="orientation" >
+           <spacer name="horizontalSpacer_2">
+            <property name="orientation">
              <enum>Qt::Horizontal</enum>
             </property>
-            <property name="sizeHint" stdset="0" >
+            <property name="sizeHint" stdset="0">
              <size>
               <width>17</width>
               <height>20</height>
@@ -168,20 +203,20 @@
            </spacer>
           </item>
           <item>
-           <layout class="QFormLayout" name="formLayout_4" >
-            <property name="fieldGrowthPolicy" >
+           <layout class="QFormLayout" name="formLayout_4">
+            <property name="fieldGrowthPolicy">
              <enum>QFormLayout::ExpandingFieldsGrow</enum>
             </property>
-            <item row="1" column="0" >
-             <widget class="QPushButton" name="btnColor" >
-              <property name="text" >
+            <item row="1" column="0">
+             <widget class="QPushButton" name="btnColor">
+              <property name="text">
                <string>Color...</string>
               </property>
              </widget>
             </item>
-            <item row="0" column="0" >
-             <widget class="QPushButton" name="btnFont" >
-              <property name="text" >
+            <item row="0" column="0">
+             <widget class="QPushButton" name="btnFont">
+              <property name="text">
                <string>Font...</string>
               </property>
              </widget>
@@ -191,26 +226,26 @@
          </layout>
         </item>
         <item>
-         <layout class="QHBoxLayout" name="horizontalLayout_2" >
+         <layout class="QHBoxLayout" name="horizontalLayout_2">
           <item>
-           <widget class="QLabel" name="label_3" >
-            <property name="text" >
+           <widget class="QLabel" name="label_3">
+            <property name="text">
              <string>Text</string>
             </property>
-            <property name="alignment" >
+            <property name="alignment">
              <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
             </property>
            </widget>
           </item>
           <item>
-           <widget class="QPlainTextEdit" name="textEdit" >
-            <property name="sizePolicy" >
-             <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
+           <widget class="QPlainTextEdit" name="textEdit">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
-            <property name="maximumSize" >
+            <property name="maximumSize">
              <size>
               <width>16777215</width>
               <height>50</height>
@@ -221,20 +256,20 @@
          </layout>
         </item>
         <item>
-         <widget class="QCDView" name="cdView" >
-          <property name="sizePolicy" >
-           <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
+         <widget class="QCDView" name="cdView">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
             <horstretch>0</horstretch>
             <verstretch>2</verstretch>
            </sizepolicy>
           </property>
-          <property name="baseSize" >
+          <property name="baseSize">
            <size>
             <width>0</width>
             <height>0</height>
            </size>
           </property>
-          <property name="interactive" >
+          <property name="interactive">
            <bool>false</bool>
           </property>
          </widget>
@@ -243,11 +278,11 @@
       </widget>
      </item>
      <item>
-      <widget class="QDialogButtonBox" name="buttonBox" >
-       <property name="orientation" >
+      <widget class="QDialogButtonBox" name="buttonBox">
+       <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
-       <property name="standardButtons" >
+       <property name="standardButtons">
         <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
        </property>
       </widget>
@@ -278,11 +313,11 @@
    <receiver>QDialogText</receiver>
    <slot>accept()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>258</x>
      <y>582</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>157</x>
      <y>274</y>
     </hint>
@@ -294,11 +329,11 @@
    <receiver>QDialogText</receiver>
    <slot>reject()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>326</x>
      <y>582</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>286</x>
      <y>274</y>
     </hint>

src/qlightpixmapitem.cpp

@@ -123,7 +123,7 @@ void QShapeControllerPixmap::readData( const QString &element,
       }
       pixmapItem->imageName( data );
       pixmapItem->setPixmap( pixmap );
-      pixmapItem->setOffset( -QPointF( pixmap.size().height(), pixmap.size().width()  ) / 2.0 );
+      pixmapItem->setOffset( -QPointF( pixmap.size().width(), pixmap.size().height()  ) / 2.0 );
       return;
    }
 }

src/qlightroundtextitem.cpp

@@ -129,7 +129,7 @@ QPainterPath QLightRoundTextItem::shape() const
    const double pad = 1;
 
    for( int i = 0; i < m_text.size(); ++i )
-      arcAngle += mcs.width( m_text[ i ] );
+      arcAngle += mcs.horizontalAdvance(m_text[i]);
 
    double height = ( mcs.height() * 2 ) / 3;
    double in, out;
@@ -192,10 +192,10 @@ void QLightRoundTextItem::paint( QPainter *painter, const QStyleOptionGraphicsIt
    switch( m_alignment ) {
       case Qt::AlignCenter :
       case Qt::AlignHCenter :
-         angle += mcs.width( m_text ) / diam * ( m_outside ? -1 : 1 );
+         angle += mcs.horizontalAdvance(m_text) / diam * ( m_outside ? -1 : 1 );
          break;
       case Qt::AlignRight :
-         angle += mcs.width( m_text ) / radi * ( m_outside ? -1 : 1 );
+         angle += mcs.horizontalAdvance(m_text) / radi * ( m_outside ? -1 : 1 );
          break;
    }
 
@@ -213,12 +213,12 @@ void QLightRoundTextItem::paint( QPainter *painter, const QStyleOptionGraphicsIt
    for( int i = 0; i < m_text.size(); ++i ) {
       QChar ch = m_text[ i ];
 
-      double d = ( prevWidth + mcs.width( ch ) ) / diam;
+      double d = (prevWidth + mcs.horizontalAdvance(ch)) / diam;
       trans.reset();
       trans.rotateRadians( m_outside ? d : -d );
       painter->setWorldTransform( trans, true );
 
-      prevWidth = mcs.width( ch );
+      prevWidth = mcs.horizontalAdvance(ch);
 
       painter->drawText( int( -prevWidth / 2.0 ),
                          int( m_outside ? -m_radius : m_radius ),
@@ -227,7 +227,7 @@ void QLightRoundTextItem::paint( QPainter *painter, const QStyleOptionGraphicsIt
    painter->restore();
    if (option->state & QStyle::State_Selected) {
       painter->setPen( QPen( option->palette.windowText(), 0, Qt::DashLine ) );
-      painter->setBrush(Qt::NoBrush);
+      painter->setBrush( Qt::NoBrush );
       painter->drawPath( shape() );
    }
 }
@@ -371,4 +371,3 @@ void QShapeControllerRoundText::readData( const QString &element,
       return;
    }
 }
-

src/qlightroundtextitem.h

@@ -28,7 +28,7 @@
 
 class QLightRoundTextItem : public QAbstractGraphicsShapeItem {
 public:
-   enum { Type = UserType + 1 };
+    enum { Type = UserType + 1 };
 
     QLightRoundTextItem( QGraphicsItem * parent = 0 );
 

src/qlightscribe.cpp

@@ -109,24 +109,25 @@ QLightDrive::QLightDrive( QObject *parent, const QString &path, const QString &n
 static
 void printScene( QCDScene *scene, QByteArray &array )
 {
-   QImage image( 2772, 2772, QImage::Format_RGB888 );
-   image.fill( 0xFFFFFFFF );
+    const int resolution = 2772;
+    QImage image( resolution, resolution, QImage::Format_RGB888 );
+    image.fill( 0xFFFFFFFF );
 
-   scene->clearSelection();
-   {
-      QPainter painter( &image );
-      scene->render( &painter, image.rect() );
-   }
-   image.setDotsPerMeterX( 23622 );
-   image.setDotsPerMeterY( 23622 );
+    scene->clearSelection();
+    {
+        QPainter painter( &image );
+        scene->render( &painter, image.rect() );
+    }
+    image.setDotsPerMeterX( resolution * 8 );
+    image.setDotsPerMeterY( resolution * 8 );
 
-   array.clear();
-   QBuffer buffer( &array );
-   buffer.open( QIODevice::WriteOnly );
-   image.save( &buffer, "bmp", 100 );
+    array.clear();
+    QBuffer buffer( &array );
+    buffer.open( QIODevice::WriteOnly );
+    image.save( &buffer, "bmp", 100 );
 }
 
-QPixmap QLightDrive::preview( const PrintParameters &params, QCDScene *scene, const QSize &size ) throw( QString )
+QPixmap QLightDrive::preview(const PrintParameters &params, QCDScene *scene, const QSize &size)
 {
    qApp->setOverrideCursor( Qt::WaitCursor );
    QByteArray array;
@@ -149,7 +150,7 @@ QPixmap QLightDrive::preview( const PrintParameters &params, QCDScene *scene, co
    return pixmap;
 }
 
-void QLightDrive::print( const PrintParameters &params, QCDScene *scene ) throw( QString )
+void QLightDrive::print(const PrintParameters &params, QCDScene *scene)
 {
    qApp->setOverrideCursor( Qt::WaitCursor );
    QByteArray array;

src/qlightscribe.h

@@ -24,6 +24,7 @@
 #include "qlscribe.h"
 
 #include <QPixmap>
+#include <QObject>
 #include <QMap>
 #include <QMetaType>
 
@@ -86,8 +87,8 @@ public:
    double innerRadius() const { return m_innerRadius; }
    double outerRadius() const { return m_outerRadius; }
 
-   QPixmap preview( const PrintParameters &params, QCDScene *scene, const QSize &size ) throw( QString );
-   void print( const PrintParameters &params, QCDScene *scene ) throw( QString );
+   QPixmap preview(const PrintParameters &params, QCDScene *scene, const QSize &size);
+   void print(const PrintParameters &params, QCDScene *scene);
 
    friend class QLightScribe;
 

src/qlighttextitem.cpp

@@ -25,6 +25,7 @@
 
 #include <QXmlStreamWriter>
 #include <QXmlStreamReader>
+#include <QTextDocument>
 
 
 QLightTextItem::QLightTextItem()
@@ -39,6 +40,58 @@ QVariant QLightTextItem::itemChange( GraphicsItemChange change, const QVariant &
    return value;
 }
 
+QString QLightTextItem::text() const
+{
+    return QGraphicsSimpleTextItem::text();
+}
+
+QColor QLightTextItem::color() const
+{
+    return this->brush().color();
+}
+
+Qt::Alignment QLightTextItem::alignment() const
+{
+    return m_alignment;
+}
+
+void QLightTextItem::setText( const QString &txt )
+{
+    QGraphicsSimpleTextItem::setText( txt );
+    updateTrans();
+}
+
+void QLightTextItem::setFont( const QFont &font )
+{
+    QGraphicsSimpleTextItem::setFont( font );
+    updateTrans();
+}
+
+
+void QLightTextItem::setColor( const QColor &color )
+{
+    this->setBrush( color );
+}
+
+
+void QLightTextItem::setAlignment( Qt::Alignment align )
+{
+    m_alignment = align;
+    updateTrans();
+}
+
+void QLightTextItem::updateTrans()
+{
+    double size = this->boundingRect().width();
+
+    QTransform trans;
+    trans.scale(  0.5, 0.5 );
+    switch( m_alignment ) {
+    case Qt::AlignRight :   trans.translate( -size, 0 ); break;
+    case Qt::AlignCenter :  trans.translate( -size / 2.0, 0 ); break;
+    }
+    this->setTransform( trans );
+}
 
 RegisterController< QShapeControllerText > regControllerText;
 
@@ -69,20 +122,21 @@ QItemDialog *QShapeControllerText::createDialog( QWidget *parent ) const
 
 void QShapeControllerText::writeData( QXmlStreamWriter &writer, const QGraphicsItem *item ) const
 {
-   const QGraphicsSimpleTextItem *textItem = static_cast< const QGraphicsSimpleTextItem * >( item );
+   const QLightTextItem *textItem = static_cast< const QLightTextItem * >( item );
    writer.writeEmptyElement( "pos" );
    writer.writeAttribute( QXmlStreamAttribute( "x", QString::number( textItem->pos().x() ) ) );
    writer.writeAttribute( QXmlStreamAttribute( "y", QString::number( textItem->pos().y() ) ) );
    writer.writeAttribute( QXmlStreamAttribute( "z", QString::number( textItem->zValue() ) ) );
 
    writer.writeTextElement( "font", textItem->font().toString() );
-   writer.writeTextElement( "color", textItem->brush().color().name() );
+   writer.writeTextElement( "color", textItem->color().name() );
    writer.writeTextElement( "text", textItem->text() );
+   writer.writeTextElement( "alignment", QString::number( textItem->alignment() ) );
 }
 
 void QShapeControllerText::replace( QGraphicsItem *item, const QString &from, const QString &to ) const
 {
-   QGraphicsSimpleTextItem *textItem = static_cast< QGraphicsSimpleTextItem * >( item );
+   QLightTextItem *textItem = static_cast< QLightTextItem * >( item );
 
    bool placeHolder = textItem->text().left( 1 ) == "?" && textItem->text().right( 1 ) == "?";
 
@@ -102,7 +156,7 @@ void QShapeControllerText::readData( const QString &element,
                                      const QString &data,
                                      QGraphicsItem *item ) const
 {
-   QGraphicsSimpleTextItem *textItem = static_cast< QGraphicsSimpleTextItem * >( item );
+   QLightTextItem *textItem = static_cast< QLightTextItem * >( item );
 
    if( element == "pos" ) {
       textItem->setPos( attrs.value( "x" ).toString().toDouble(),
@@ -119,7 +173,7 @@ void QShapeControllerText::readData( const QString &element,
    }
 
    if( element == "color" ) {
-      textItem->setBrush( QColor( data ) );
+      textItem->setColor( QColor( data ) );
       return;
    }
 
@@ -127,4 +181,9 @@ void QShapeControllerText::readData( const QString &element,
       textItem->setText( data );
       return;
    }
+
+   if( element == "alignment" ) {
+      textItem->setAlignment( Qt::Alignment( data.toInt() ) );
+      return;
+   }
 }

src/qlighttextitem.h

@@ -30,9 +30,22 @@ class QLightTextItem : public QGraphicsSimpleTextItem
 public:
     QLightTextItem();
 
+    QString text() const;
+    Qt::Alignment alignment() const;
+    QColor color() const;
+
+    void setText( const QString &txt );
+    void setColor( const QColor &color );
+    void setFont( const QFont &font );
+    void setAlignment( Qt::Alignment align );
+
 protected:
    virtual QVariant itemChange ( GraphicsItemChange change, const QVariant & value );
 
+private:
+   void updateTrans();
+
+   Qt::Alignment m_alignment;
 };
 
 class QShapeControllerText : public QShapeController {

src/qlscribe.h.in

@@ -67,6 +67,7 @@ const char * const DBusManagerPath = "@QLSCRIBE_DBUS_MANAGER_PATH@";
 // config keys
 const char * const cfgDefaultFont      = "DefaultTextFont";
 const char * const cfgEjectAfterFinish = "EjectAfterFinish";
+const char * const cfgInjectPreview    = "InjectPreview";
 
 
 #endif // QLSCRIBE_H

src/qlscribe.pro

@@ -21,7 +21,8 @@ SOURCES += main.cpp \
     qlightpixmapitem.cpp \
     qdialogcdproperties.cpp \
     qconsoleprintprogress.cpp \
-    qdialogsettings.cpp
+    qdialogsettings.cpp \
+    previewinjector.cpp
 QMAKE_LIBS += -llightscribe
 HEADERS += mainwindow.h \
     qlightroundtextitem.h \
@@ -38,7 +39,8 @@ HEADERS += mainwindow.h \
     qlightpixmapitem.h \
     qdialogcdproperties.h \
     qconsoleprintprogress.h \
-    qdialogsettings.h
+    qdialogsettings.h \
+    previewinjector.h
 FORMS += qdialogtext.ui \
     qdialogroundtext.ui \
     qdialogpixmap.ui \