Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 ruglory
|
55a282b326 |
+8
-9
@@ -22,15 +22,14 @@ PROJECT( qlscribe )
|
||||
|
||||
CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0)
|
||||
|
||||
SET( CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake )
|
||||
# lightSribe provides library only for m32 (yet?)
|
||||
IF( CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND CMAKE_COMPILER_IS_GNUCXX )
|
||||
ADD_DEFINITIONS( -m32 )
|
||||
SET( CMAKE_EXE_LINKER_FLAGS "-m32 ${CMAKE_EXE_LINKER_FLAGS}" )
|
||||
ENDIF( CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND CMAKE_COMPILER_IS_GNUCXX )
|
||||
|
||||
SET( QLSCRIBE_DBUS_SERVICE org.lightscribe )
|
||||
SET( QLSCRIBE_DBUS_MANAGER_SERVICE ${QLSCRIBE_DBUS_SERVICE}.Manager )
|
||||
SET( QLSCRIBE_DBUS_DRIVES_SERVICE ${QLSCRIBE_DBUS_SERVICE}.drives )
|
||||
SET( QLSCRIBE_DBUS_PATH /org/lightscribe )
|
||||
SET( QLSCRIBE_DBUS_MANAGER_PATH ${QLSCRIBE_DBUS_PATH}/Manager ) # path to manager
|
||||
SET( QLSCRIBE_DBUS_DRIVES_PATH ${QLSCRIBE_DBUS_PATH}/drives ) # base path under which drives located
|
||||
SET( CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake )
|
||||
FIND_PACKAGE( Qt4 REQUIRED )
|
||||
FIND_PACKAGE( LightScribe REQUIRED )
|
||||
|
||||
SUBDIRS( src )
|
||||
SUBDIRS( resources )
|
||||
SUBDIRS( lscribed )
|
||||
|
||||
@@ -4,36 +4,26 @@ Qt lightScribe Installaton instructions
|
||||
To compile and install, first download release from http://qlscribe.sourceforge.net/
|
||||
or check out project from subversion repository for particular release:
|
||||
|
||||
svn co https://qlscribe.svn.sourceforge.net/svnroot/qlscribe/tags/release-N.M qlscribe
|
||||
svn co https://qlscribe.svn.sourceforge.net/svnroot/qlscribe/tags/release-N.M qlscribe
|
||||
|
||||
or if you want to test latest development version:
|
||||
|
||||
svn co https://qlscribe.svn.sourceforge.net/svnroot/qlscribe/trunk qlscribe
|
||||
svn co https://qlscribe.svn.sourceforge.net/svnroot/qlscribe/trunk qlscribe
|
||||
|
||||
Then go to the source directory and type:
|
||||
|
||||
mkdir build
|
||||
cd build
|
||||
cmake ..
|
||||
mkdir build
|
||||
cd build
|
||||
cmake ..
|
||||
|
||||
(If you want to install in a different path, use instead:
|
||||
cmake .. -DCMAKE_INSTALL_PREFIX=/install/path)
|
||||
make
|
||||
sudo make install
|
||||
cmake .. -DCMAKE_INSTALL_PREFIX=/install/path)
|
||||
make
|
||||
sudo make install
|
||||
|
||||
If cmake fails to find lightScribe API specify environment variable LIGHTSCRIBEDIR:
|
||||
|
||||
LIGHTSCRIBEDIR=/opt/lightscribe cmake ..
|
||||
|
||||
Include files should be in ${LIGHTSCRIBEDIR}/include and lib in ${LIGHTSCRIBEDIR}/lib
|
||||
|
||||
You need manually install dbus config and service files. They are located in INSTALL_PATH/share/qlscribe
|
||||
So on my ubuntu system I do
|
||||
sudo cp /usr/local/share/qlscribe/lightscribe.conf /etc/dbus-1/system.d/
|
||||
sudo cp /usr/local/share/qlscribe/org.lightscribe.Manager.service /usr/share/dbus-1/system-services/
|
||||
sudo /etc/init.d/dbus reload
|
||||
|
||||
Your system may have different path please refer dbus system daemon documentation
|
||||
Once installed, you can start Qt lightScribe by typing "qlscribe", but due to API
|
||||
requirement if you want to burn qlscribe has to be started by root "sudo qlscribe"
|
||||
|
||||
You need to download lightScribe SDK for qlscribe to build and lightScribe runtime
|
||||
for qlscribe to run. For details see lightScribe webpage:
|
||||
|
||||
@@ -1,41 +1,5 @@
|
||||
NEWS - list of user-visible changes between releases of qlscribe
|
||||
|
||||
New in 0.8:
|
||||
Application is splitted into 2 parts: qlscribe and dbus daemon lscribed
|
||||
qlscribe does not require sticky bit and can be compiled in 64 bit mode if necessary
|
||||
lscribed provides lightScribe service through system bus
|
||||
lscribed is activated by dbus daemon and automatically terminates after 5 minutes of inactivity
|
||||
|
||||
New in 0.7:
|
||||
Z-order of items saved and resored
|
||||
Bugfix for not loading radius for round text
|
||||
Console mode printing implemented
|
||||
While printing in console mode text can be replaced by application parameter
|
||||
|
||||
New in 0.6:
|
||||
Label mode and background color is added to scene
|
||||
Added dialog to edit properties (color and mode) of the scene (label)
|
||||
Scene passes mode to the print dialog
|
||||
|
||||
New in 0.5:
|
||||
Bugfix for crash on writing
|
||||
CD inner size increased to 25mm on QCDView
|
||||
Maximum image size increased to 150
|
||||
Fixed bug with not setting color on round text
|
||||
Text scaled to 1/2
|
||||
Fixed bug with missing button "OK" on pixmap edit dialog
|
||||
|
||||
New in 0.4:
|
||||
Scene detects when item is moved by mouse and changes status to unsaved
|
||||
On installation sticky bit is set, qlscribe becomes root when burns label
|
||||
Bugfix on progress dialog crush with empty document printed
|
||||
|
||||
New in 0.3:
|
||||
Documents keep their names and detect changes (changes on item postion through window
|
||||
itself is not detected yet)
|
||||
Main window on close scan all documents and confirm to save changed ones
|
||||
Document window confirm to save on close
|
||||
|
||||
New in 0.2:
|
||||
Print progress dialog shows elapsed/estimated time
|
||||
Bugfix for not loading angle in round text item
|
||||
|
||||
@@ -1,55 +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$
|
||||
|
||||
FIND_PATH( DBUS_INCLUDE_DIR dbus/dbus.h
|
||||
PATH_SUFFIXES dbus-1.0 )
|
||||
|
||||
IF( CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" )
|
||||
FIND_LIBRARY( DBUS_LIBRARY dbus-1
|
||||
PATHS /lib32 /usr/lib32 /usr/local/lib32
|
||||
NO_DEFAULT_PATH )
|
||||
ENDIF( CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" )
|
||||
|
||||
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}
|
||||
PATH_SUFFIXES dbus-1.0/include )
|
||||
|
||||
if( DBUS_INCLUDE_DIR AND DBUS_LIBINCLUDE_DIR AND DBUS_LIBRARY )
|
||||
SET( Dbus32_FOUND TRUE )
|
||||
SET( DBUS_LIBRARIES ${DBUS_LIBRARY} )
|
||||
INCLUDE_DIRECTORIES(${DBUS_INCLUDE_DIR} ${DBUS_LIBINCLUDE_DIR} )
|
||||
ENDIF( DBUS_INCLUDE_DIR AND DBUS_LIBINCLUDE_DIR AND DBUS_LIBRARY )
|
||||
|
||||
IF( Dbus32_FOUND )
|
||||
IF( NOT Dbus32_FIND_QUIETLY )
|
||||
MESSAGE( STATUS "Found dbus include: ${DBUS_INCLUDE_DIR}" )
|
||||
MESSAGE( STATUS "Found dbus libraries: ${DBUS_LIBRARIES}" )
|
||||
ENDIF( NOT Dbus32_FIND_QUIETLY )
|
||||
ELSE( Dbus32_FOUND )
|
||||
IF( Dbus32_FIND_REQUIRED )
|
||||
MESSAGE( FATAL_ERROR "Could not find dbus" )
|
||||
ENDIF( Dbus32_FIND_REQUIRED )
|
||||
ENDIF( Dbus32_FOUND )
|
||||
|
||||
MARK_AS_ADVANCED( Dbus32_FOUND DBUS_INCLUDE_DIR DBUS_LIBRARY DBUS_LIBINCLUDE_DIR )
|
||||
@@ -18,14 +18,13 @@
|
||||
#
|
||||
# $Id$
|
||||
|
||||
FIND_PATH( LSCRIBE_INCLUDE_DIR lightscribe.h /usr/local/include $ENV{LIGHTSCRIBEDIR}/include )
|
||||
FIND_PATH( LSCRIBE_INCLUDE_DIR lightscribe.h /usr/local/include )
|
||||
|
||||
FIND_LIBRARY( LSCRIBE_LIBRARY lightscribe /usr/local/lib $ENV{LIGHTSCRIBEDIR}/lib )
|
||||
FIND_LIBRARY( LSCRIBE_LIBRARY lightscribe /usr/local/lib )
|
||||
|
||||
if( LSCRIBE_INCLUDE_DIR AND LSCRIBE_LIBRARY )
|
||||
SET( LSCRIBE_FOUND TRUE )
|
||||
SET( LSCRIBE_LIBRARIES ${LSCRIBE_LIBRARY} )
|
||||
INCLUDE_DIRECTORIES(${LSCRIBE_INCLUDE_DIR})
|
||||
ENDIF( LSCRIBE_INCLUDE_DIR AND LSCRIBE_LIBRARY )
|
||||
|
||||
IF( LSCRIBE_FOUND )
|
||||
@@ -39,4 +38,3 @@ ELSE( LSCRIBE_FOUND )
|
||||
ENDIF( LightScribe_FIND_REQUIRED )
|
||||
ENDIF( LSCRIBE_FOUND )
|
||||
|
||||
MARK_AS_ADVANCED( LSCRIBE_INCLUDE_DIR LSCRIBE_LIBRARY LSCRIBE_FOUND )
|
||||
|
||||
Vendored
-6
@@ -1,6 +0,0 @@
|
||||
qlscribe (0.7-0ubuntu1) unstable; urgency=low
|
||||
|
||||
* Initial release
|
||||
|
||||
-- Vyacheslav Kononenko <vyacheslav@kononenko.net> Sun, 15 Feb 2009 21:49:41 -0500
|
||||
|
||||
Vendored
-1
@@ -1 +0,0 @@
|
||||
7
|
||||
Vendored
-13
@@ -1,13 +0,0 @@
|
||||
Source: qlscribe
|
||||
Section: qt
|
||||
Priority: optional
|
||||
Maintainer: Vyacheslav Kononenko <vyacheslav@kononenko.net>
|
||||
Build-Depends: debhelper (>= 7)
|
||||
Standards-Version: 3.7.3
|
||||
Homepage: http://qlscribe.sourceforge.net/
|
||||
|
||||
Package: qlscribe
|
||||
Architecture: i386
|
||||
Depends: ${shlibs:Depends}, lightscribe, libstdc++5
|
||||
Description: Qt based application to print lightScribe discs
|
||||
Qt lightScribe is a GUI application to burn labels on lightScribe capable drives.
|
||||
Vendored
-36
@@ -1,36 +0,0 @@
|
||||
This package was debianized by Vyacheslav Kononenko <vyacheslav@kononenko.net> on
|
||||
Sun, 15 Feb 2009 21:49:41 -0500.
|
||||
|
||||
It was downloaded from https://sourceforge.net/project/platformdownload.php?group_id=251217
|
||||
|
||||
Upstream Author(s):
|
||||
|
||||
Vyacheslav Kononenko <vyacheslav@kononenko.net>
|
||||
|
||||
Copyright:
|
||||
|
||||
<Copyright (C) 2009 Vyacheslav Kononenko>
|
||||
|
||||
License:
|
||||
|
||||
This package 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 package 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 package; if not, write to the Free Software
|
||||
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
|
||||
On Debian systems, the complete text of the GNU General
|
||||
Public License can be found in `/usr/share/common-licenses/GPL'.
|
||||
|
||||
The Debian packaging is (C) 2009, Vyacheslav Kononenko <vyacheslav@kononenko.net> and
|
||||
is licensed under the GPL, see above.
|
||||
|
||||
|
||||
Vendored
-2
@@ -1,2 +0,0 @@
|
||||
usr/bin
|
||||
usr/sbin
|
||||
Vendored
-2
@@ -1,2 +0,0 @@
|
||||
NEWS
|
||||
README
|
||||
Vendored
-90
@@ -1,90 +0,0 @@
|
||||
#!/usr/bin/make -f
|
||||
# -*- makefile -*-
|
||||
# Sample debian/rules that uses debhelper.
|
||||
# This file was originally written by Joey Hess and Craig Small.
|
||||
# As a special exception, when this file is copied by dh-make into a
|
||||
# dh-make output file, you may use that output file without restriction.
|
||||
# This special exception was added by Craig Small in version 0.37 of dh-make.
|
||||
|
||||
# Uncomment this to turn on verbose mode.
|
||||
#export DH_VERBOSE=1
|
||||
|
||||
configure: configure-stamp
|
||||
configure-stamp:
|
||||
dh_testdir
|
||||
# Add here commands to configure the package.
|
||||
mkdir -p build
|
||||
cd build; cmake .. -DCMAKE_INSTALL_PREFIX=$(CURDIR)/debian/qlscribe/usr
|
||||
touch configure-stamp
|
||||
|
||||
|
||||
build: build-stamp
|
||||
|
||||
build-stamp: configure-stamp
|
||||
dh_testdir
|
||||
|
||||
# Add here commands to compile the package.
|
||||
cd build; $(MAKE)
|
||||
#docbook-to-man debian/qlscribe.sgml > qlscribe.1
|
||||
|
||||
touch $@
|
||||
|
||||
clean:
|
||||
dh_testdir
|
||||
dh_testroot
|
||||
rm -f build-stamp configure-stamp
|
||||
|
||||
# Add here commands to clean up after the build process.
|
||||
rm -rf build
|
||||
|
||||
dh_clean
|
||||
|
||||
install: build
|
||||
dh_testdir
|
||||
dh_testroot
|
||||
dh_clean -k
|
||||
dh_installdirs
|
||||
|
||||
# Add here commands to install the package into debian/qlscribe.
|
||||
cd build; $(MAKE) install
|
||||
|
||||
|
||||
# Build architecture-independent files here.
|
||||
binary-indep: build install
|
||||
# We have nothing to do by default.
|
||||
|
||||
# Build architecture-dependent files here.
|
||||
binary-arch: build install
|
||||
dh_testdir
|
||||
dh_testroot
|
||||
dh_installchangelogs ChangeLog
|
||||
# dh_installdocs
|
||||
# dh_installexamples
|
||||
dh_install
|
||||
dh_desktop
|
||||
dh_icons
|
||||
# dh_installmenu
|
||||
# dh_installdebconf
|
||||
# dh_installlogrotate
|
||||
# dh_installemacsen
|
||||
# dh_installpam
|
||||
dh_installmime
|
||||
# dh_python
|
||||
# dh_installinit
|
||||
# dh_installcron
|
||||
# dh_installinfo
|
||||
# dh_installman
|
||||
# dh_link
|
||||
# dh_strip
|
||||
dh_compress
|
||||
# dh_fixperms #need suid
|
||||
# dh_perl
|
||||
# dh_makeshlibs
|
||||
dh_installdeb
|
||||
dh_shlibdeps -- --ignore-missing-info
|
||||
dh_gencontrol
|
||||
dh_md5sums
|
||||
dh_builddeb
|
||||
|
||||
binary: binary-indep binary-arch
|
||||
.PHONY: build clean binary-indep binary-arch binary install configure
|
||||
@@ -1,50 +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$
|
||||
|
||||
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}.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 )
|
||||
CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/service.in ${LSCRIBED_SERVICE_FILE} @ONLY )
|
||||
|
||||
# lightSribe provides library only for m32 (yet?)
|
||||
IF( CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND CMAKE_COMPILER_IS_GNUCXX )
|
||||
ADD_DEFINITIONS( -m32 )
|
||||
SET( CMAKE_EXE_LINKER_FLAGS "-m32 -pthread ${CMAKE_EXE_LINKER_FLAGS}" )
|
||||
ENDIF( CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND CMAKE_COMPILER_IS_GNUCXX )
|
||||
|
||||
SET( LSCRIBED_SRCS main.cpp dbuscpp.cpp drives.cpp managerhandler.cpp drivehandler.cpp
|
||||
introspecthandler.cpp )
|
||||
|
||||
ADD_DEFINITIONS( -Wall )
|
||||
|
||||
INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} )
|
||||
|
||||
ADD_EXECUTABLE( lscribed ${LSCRIBED_SRCS} )
|
||||
|
||||
TARGET_LINK_LIBRARIES( lscribed ${LSCRIBE_LIBRARIES} ${DBUS_LIBRARIES} )
|
||||
|
||||
INSTALL( TARGETS lscribed DESTINATION sbin )
|
||||
INSTALL( FILES ${LSCRIBED_CONF_FILE} ${LSCRIBED_SERVICE_FILE} DESTINATION share/qlscribe )
|
||||
|
||||
@@ -1,219 +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 "dbuscpp.h"
|
||||
#include "lscribed.h"
|
||||
|
||||
using namespace DBusCpp;
|
||||
|
||||
MessageHandler::~MessageHandler()
|
||||
{
|
||||
}
|
||||
|
||||
std::string MessageHandler::generateInrospectHeader( const std::string &nodename )
|
||||
{
|
||||
std::string rez = "<!DOCTYPE node PUBLIC \"-//freedesktop//DTD D-BUS Object Introspection 1.0//EN\" "
|
||||
"\"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd\">";
|
||||
|
||||
rez += " <node";
|
||||
if( !nodename.empty() )
|
||||
rez += "=\"" + nodename + "\"";
|
||||
rez += "> <interface name=\"org.freedesktop.DBus.Introspectable\">"
|
||||
" <method name=\"Introspect\">"
|
||||
" <arg name=\"data\" direction=\"out\" type=\"s\"/>"
|
||||
" </method>"
|
||||
"</interface>";
|
||||
return rez;
|
||||
}
|
||||
|
||||
namespace {
|
||||
DBusObjectPathVTable vtable;
|
||||
DBusHandlerResult processMessage( DBusConnection *connPtr,
|
||||
DBusMessage *messagePtr,
|
||||
void *data )
|
||||
{
|
||||
Message message = Message::parameter( messagePtr );
|
||||
lastActivity = time( 0 );
|
||||
return reinterpret_cast< MessageHandler * >( data )->processMessage( message );
|
||||
}
|
||||
}
|
||||
|
||||
Connection::Connection( DBusConnection *conn )
|
||||
: m_connection( conn )
|
||||
{
|
||||
if( !vtable.message_function )
|
||||
vtable.message_function = processMessage;
|
||||
}
|
||||
|
||||
Connection::~Connection()
|
||||
{
|
||||
for( Handlers::iterator it = m_handlers.begin(); it != m_handlers.end(); ++it ) {
|
||||
dbus_connection_unregister_object_path( m_connection, it->first.c_str() );
|
||||
delete it->second;
|
||||
}
|
||||
}
|
||||
|
||||
dbus_uint32_t Connection::send( const Message &msg )
|
||||
{
|
||||
dbus_uint32_t rez;
|
||||
dbus_connection_send( m_connection, msg.m_message, &rez );
|
||||
return rez;
|
||||
}
|
||||
|
||||
void Connection::registerHandler( const std::string &path, MessageHandler *handler, bool fallback )
|
||||
{
|
||||
handler->m_connection = this;
|
||||
m_handlers.insert( std::make_pair( path, handler ) );
|
||||
if( fallback )
|
||||
dbus_connection_register_fallback( m_connection, path.c_str(), &vtable, handler );
|
||||
else
|
||||
dbus_connection_register_object_path( m_connection, path.c_str(), &vtable, handler );
|
||||
}
|
||||
|
||||
|
||||
MessageIter::MessageIter( const MessageIter &an )
|
||||
: m_iter( an.m_iter ), m_container( an.m_container )
|
||||
{
|
||||
if( m_container )
|
||||
const_cast< MessageIter & >( an ).m_container = 0;
|
||||
}
|
||||
|
||||
MessageIter::~MessageIter()
|
||||
{
|
||||
if( m_container )
|
||||
dbus_message_iter_close_container( m_container, &m_iter );
|
||||
}
|
||||
|
||||
MessageIter MessageIter::openContainer( int elemType, const char *signature )
|
||||
{
|
||||
MessageIter rez;
|
||||
dbus_message_iter_open_container( &m_iter, elemType, signature, &rez.m_iter );
|
||||
rez.m_container = &m_iter;
|
||||
|
||||
return rez;
|
||||
}
|
||||
|
||||
void MessageIter::append( const char *str )
|
||||
{
|
||||
dbus_message_iter_append_basic( &m_iter, DBUS_TYPE_STRING, &str );
|
||||
}
|
||||
|
||||
std::string MessageConstIter::signature() const
|
||||
{
|
||||
char *ptr = dbus_message_iter_get_signature( const_cast< DBusMessageIter *>( &m_iter ) );
|
||||
std::string rez( ptr );
|
||||
dbus_free( ptr );
|
||||
return rez;
|
||||
}
|
||||
|
||||
MessageConstIter MessageConstIter::recurse() const
|
||||
{
|
||||
MessageConstIter rez;
|
||||
dbus_message_iter_recurse( const_cast< DBusMessageIter *>( &m_iter ), &rez.m_iter );
|
||||
return rez;
|
||||
}
|
||||
|
||||
void *MessageConstIter::getFixedArray( int &elements ) const
|
||||
{
|
||||
void *data =0;
|
||||
dbus_message_iter_get_fixed_array( const_cast< DBusMessageIter *>( &m_iter ), &data, &elements );
|
||||
return data;
|
||||
}
|
||||
|
||||
Message::Message( int type )
|
||||
{
|
||||
m_message = dbus_message_new( type );
|
||||
}
|
||||
|
||||
Message::Message( const Message &msg )
|
||||
: m_message( msg.m_message )
|
||||
{
|
||||
dbus_message_ref( m_message );
|
||||
}
|
||||
|
||||
Message::Message( DBusMessage *msg, bool ownership )
|
||||
: m_message( msg )
|
||||
{
|
||||
if( !ownership )
|
||||
dbus_message_ref( m_message );
|
||||
}
|
||||
|
||||
Message::~Message()
|
||||
{
|
||||
dbus_message_unref( m_message );
|
||||
}
|
||||
|
||||
Message Message::newSignal( const std::string &path,
|
||||
const std::string &interface,
|
||||
const std::string &name )
|
||||
{
|
||||
return Message( dbus_message_new_signal( path.c_str(), interface.c_str(), name.c_str() ),
|
||||
true );
|
||||
}
|
||||
|
||||
Message Message::newMethodReturn() const
|
||||
{
|
||||
return Message( dbus_message_new_method_return( m_message ), true );
|
||||
}
|
||||
|
||||
Message Message::newError( const char *error, const char *message ) const
|
||||
{
|
||||
return Message( dbus_message_new_error( m_message, error, message ), true );
|
||||
}
|
||||
|
||||
MessageConstIter Message::constIter() const
|
||||
{
|
||||
MessageConstIter rez;
|
||||
dbus_message_iter_init( m_message, &rez.m_iter );
|
||||
return rez;
|
||||
}
|
||||
|
||||
MessageIter Message::appendIter()
|
||||
{
|
||||
MessageIter rez;
|
||||
dbus_message_iter_init_append( m_message, &rez.m_iter );
|
||||
return rez;
|
||||
}
|
||||
|
||||
void Message::append( const char *str )
|
||||
{
|
||||
dbus_message_append_args( m_message, DBUS_TYPE_STRING, &str, DBUS_TYPE_INVALID );
|
||||
}
|
||||
|
||||
void Message::append( int32_t i )
|
||||
{
|
||||
dbus_message_append_args( m_message, DBUS_TYPE_INT32, &i, DBUS_TYPE_INVALID );
|
||||
}
|
||||
|
||||
const char *Message::path() const
|
||||
{
|
||||
return dbus_message_get_path( m_message );
|
||||
}
|
||||
|
||||
const char *Message::interface() const
|
||||
{
|
||||
return dbus_message_get_interface( m_message );
|
||||
}
|
||||
|
||||
const char *Message::member() const
|
||||
{
|
||||
return dbus_message_get_member( m_message );
|
||||
}
|
||||
|
||||
@@ -1,144 +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 DBUSCPP_H
|
||||
#define DBUSCPP_H
|
||||
|
||||
#include <dbus/dbus.h>
|
||||
#include <string>
|
||||
#include <map>
|
||||
|
||||
namespace DBusCpp {
|
||||
|
||||
class Message;
|
||||
class Connection;
|
||||
|
||||
class MessageHandler {
|
||||
public:
|
||||
MessageHandler() : m_connection( 0 ) {}
|
||||
virtual ~MessageHandler();
|
||||
|
||||
virtual DBusHandlerResult processMessage( const Message &msg ) = 0;
|
||||
|
||||
Connection *connection() const { return m_connection; }
|
||||
|
||||
static std::string generateInrospectHeader( const std::string &nodename = std::string() );
|
||||
|
||||
friend class Connection;
|
||||
|
||||
private:
|
||||
Connection *m_connection;
|
||||
};
|
||||
|
||||
class Connection {
|
||||
public:
|
||||
Connection( DBusConnection *conn );
|
||||
Connection( const Connection &conn ) : m_connection( conn.m_connection ) {}
|
||||
~Connection();
|
||||
|
||||
dbus_uint32_t send( const Message &msg );
|
||||
void registerHandler( const std::string &path, MessageHandler *handler, bool fallback );
|
||||
void flush() { dbus_connection_flush( m_connection ); }
|
||||
|
||||
DBusConnection *ptr() const { return m_connection; }
|
||||
private:
|
||||
typedef std::map< std::string, MessageHandler * > Handlers;
|
||||
|
||||
DBusConnection *m_connection;
|
||||
Handlers m_handlers;
|
||||
};
|
||||
|
||||
class MessageIter {
|
||||
public:
|
||||
MessageIter( const MessageIter &an );
|
||||
~MessageIter();
|
||||
|
||||
MessageIter openContainer( int eemType, const char *signature );
|
||||
|
||||
void append( const std::string &str ) { append( str.c_str() ); }
|
||||
void append( const char *str );
|
||||
friend class Message;
|
||||
private:
|
||||
MessageIter() : m_container( 0 ) {}
|
||||
|
||||
DBusMessageIter m_iter;
|
||||
DBusMessageIter *m_container;
|
||||
};
|
||||
|
||||
class MessageConstIter {
|
||||
public:
|
||||
MessageConstIter recurse() const;
|
||||
|
||||
std::string signature() const;
|
||||
bool next() { return dbus_message_iter_next( &m_iter ); }
|
||||
bool hasNext() const { return dbus_message_iter_has_next( const_cast< DBusMessageIter *>( &m_iter ) ); }
|
||||
|
||||
void *getFixedArray( int &elements ) const;
|
||||
template <typename T> T getValue() const
|
||||
{
|
||||
T rez = T();
|
||||
dbus_message_iter_get_basic( const_cast< DBusMessageIter *>( &m_iter ), &rez );
|
||||
return rez;
|
||||
}
|
||||
|
||||
friend class Message;
|
||||
private:
|
||||
DBusMessageIter m_iter;
|
||||
};
|
||||
|
||||
class Message {
|
||||
public:
|
||||
explicit Message( int type );
|
||||
Message( const Message &msg );
|
||||
~Message();
|
||||
|
||||
static Message parameter( DBusMessage *msg ) { return Message( msg, false ); }
|
||||
|
||||
Message newMethodReturn() const;
|
||||
Message newError( const char *error, const char *message ) const;
|
||||
|
||||
static Message newSignal( const std::string &path,
|
||||
const std::string &interface,
|
||||
const std::string &name );
|
||||
|
||||
bool isMethodCall( const char *interface, const char *method ) const
|
||||
{ return dbus_message_is_method_call( m_message, interface, method ); }
|
||||
|
||||
MessageConstIter constIter() const;
|
||||
MessageIter appendIter();
|
||||
void append( const std::string &str ) { append( str.c_str() ); }
|
||||
void append( const char *str );
|
||||
void append( int32_t i );
|
||||
|
||||
const char *path() const;
|
||||
const char *interface() const;
|
||||
const char *member() const;
|
||||
|
||||
friend class Connection;
|
||||
private:
|
||||
Message( DBusMessage *msg, bool ownership );
|
||||
|
||||
DBusMessage *m_message;
|
||||
};
|
||||
|
||||
|
||||
}
|
||||
|
||||
#endif // DBUSCPP_H
|
||||
@@ -1,116 +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 <iostream>
|
||||
|
||||
#include <string.h>
|
||||
|
||||
#include "lscribed.h"
|
||||
#include "drivehandler.h"
|
||||
#include "drives.h"
|
||||
|
||||
using namespace DBusCpp;
|
||||
|
||||
static const char *strDriveIntrospect =
|
||||
"<interface name=\"org.lightscribe.drive\">\
|
||||
<signal name=\"prepareProgress\">\
|
||||
<arg name=\"current\" type=\"i\" direction=\"out\"/>\
|
||||
<arg name=\"final\" type=\"i\" direction=\"out\"/>\
|
||||
</signal>\
|
||||
<signal name=\"labelProgress\">\
|
||||
<arg name=\"current\" type=\"i\" direction=\"out\"/>\
|
||||
<arg name=\"final\" type=\"i\" direction=\"out\"/>\
|
||||
</signal>\
|
||||
<signal name=\"timeEstimate\">\
|
||||
<arg name=\"time\" type=\"i\" direction=\"out\"/>\
|
||||
</signal>\
|
||||
<signal name=\"finished\">\
|
||||
<arg name=\"status\" type=\"i\" direction=\"out\"/>\
|
||||
</signal>\
|
||||
<method name=\"preview\">\
|
||||
<arg type=\"s\" direction=\"out\"/>\
|
||||
<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=\"(iiii)\" direction=\"in\"/>\
|
||||
<arg name=\"image\" type=\"ay\" direction=\"in\"/>\
|
||||
</method>\
|
||||
<method name=\"abort\">\
|
||||
</method>\
|
||||
<method name=\"name\">\
|
||||
<arg direction=\"out\" type=\"s\"/>\
|
||||
</method>\
|
||||
</interface>";
|
||||
|
||||
|
||||
DBusHandlerResult DriveHandler::processMessage( const Message &msg )
|
||||
{
|
||||
DBusHandlerResult rez = DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
|
||||
|
||||
const char *path = msg.path();
|
||||
if( !path )
|
||||
return rez;
|
||||
|
||||
const char *item = strrchr( path, '/' );
|
||||
if( !item )
|
||||
return rez;
|
||||
|
||||
if( item[ 0 ] == '/' ) ++item;
|
||||
|
||||
DrivesManager &manager = DrivesManager::instance();
|
||||
|
||||
if( msg.isMethodCall( "org.freedesktop.DBus.Introspectable", "Introspect" ) ) {
|
||||
|
||||
std::string introspect = generateInrospectHeader();
|
||||
if( strcmp( item, "drives" ) == 0 ) {
|
||||
for( DrivesManager::const_iterator it = manager.begin(); it != manager.end(); ++it )
|
||||
introspect += "<node name=\"" + (*it)->path() + "\"/>";
|
||||
}
|
||||
else
|
||||
introspect += strDriveIntrospect;
|
||||
introspect += "</node>";
|
||||
|
||||
Message reply = msg.newMethodReturn();
|
||||
reply.append( introspect );
|
||||
connection()->send( reply );
|
||||
return rez = DBUS_HANDLER_RESULT_HANDLED;
|
||||
}
|
||||
|
||||
const char *interface = msg.interface();
|
||||
if( !interface || strcmp( interface, "org.lightscribe.drive" ) )
|
||||
return rez;
|
||||
|
||||
const char *member = msg.member();
|
||||
if( !member )
|
||||
return rez;
|
||||
|
||||
DrivesManager::const_iterator f = manager.find( item );
|
||||
if( f == manager.end() )
|
||||
return rez;
|
||||
|
||||
rez = DBUS_HANDLER_RESULT_HANDLED;
|
||||
std::cout << "calling method " << member << " on item " << item << std::endl;
|
||||
(*f)->invoke( member, msg );
|
||||
return rez;
|
||||
}
|
||||
|
||||
|
||||
@@ -1,35 +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 DRIVEHANDLER_H
|
||||
#define DRIVEHANDLER_H
|
||||
|
||||
#include "dbuscpp.h"
|
||||
|
||||
namespace DBusCpp {
|
||||
|
||||
class DriveHandler : public MessageHandler {
|
||||
public:
|
||||
virtual DBusHandlerResult processMessage( const Message &msg );
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
#endif // DRIVEHANDLER_H
|
||||
@@ -1,406 +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 "drives.h"
|
||||
#include "lscribed.h"
|
||||
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
#include <lightscribe_cxx.h>
|
||||
#include <fstream>
|
||||
#include <iostream>
|
||||
|
||||
using namespace LightScribe;
|
||||
|
||||
static pthread_key_t drivesKey;
|
||||
|
||||
static Drive *getDriveForThread()
|
||||
{
|
||||
return reinterpret_cast<Drive *>( pthread_getspecific( drivesKey ) );
|
||||
}
|
||||
|
||||
static bool clAbortLabel()
|
||||
{
|
||||
Drive *drive = getDriveForThread();
|
||||
return drive ? drive->isAborted() : true;
|
||||
}
|
||||
|
||||
static void clReportPrepareProgress( long current, long final )
|
||||
{
|
||||
Drive *drive = getDriveForThread();
|
||||
if( drive ) {
|
||||
DBusCpp::Message msg = DBusCpp::Message::newSignal( drive->fullPath(),
|
||||
"org.lightscribe.drive",
|
||||
"prepareProgress" );
|
||||
msg.append( current );
|
||||
msg.append( final );
|
||||
DrivesManager::instance().connection().send( msg );
|
||||
}
|
||||
}
|
||||
|
||||
static void clReportLabelProgress( long current, long final )
|
||||
{
|
||||
Drive *drive = getDriveForThread();
|
||||
if( drive ) {
|
||||
DBusCpp::Message msg = DBusCpp::Message::newSignal( drive->fullPath(),
|
||||
"org.lightscribe.drive",
|
||||
"labelProgress" );
|
||||
msg.append( current );
|
||||
msg.append( final );
|
||||
DrivesManager::instance().connection().send( msg );
|
||||
}
|
||||
}
|
||||
|
||||
void clReportFinished( LSError status )
|
||||
{
|
||||
Drive *drive = getDriveForThread();
|
||||
if( drive ) {
|
||||
DBusCpp::Message msg = DBusCpp::Message::newSignal( drive->fullPath(),
|
||||
"org.lightscribe.drive",
|
||||
"finished" );
|
||||
msg.append( status );
|
||||
DrivesManager::instance().connection().send( msg );
|
||||
}
|
||||
}
|
||||
|
||||
static bool clReportLabelTimeEstimate( long time )
|
||||
{
|
||||
Drive *drive = getDriveForThread();
|
||||
if( drive ) {
|
||||
DBusCpp::Message msg = DBusCpp::Message::newSignal( drive->fullPath(),
|
||||
"org.lightscribe.drive",
|
||||
"timeEstimate" );
|
||||
msg.append( time );
|
||||
DrivesManager::instance().connection().send( msg );
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
static std::string generateTmp()
|
||||
{
|
||||
char *temp = tempnam( 0, ".bmp" );
|
||||
std::string rez( temp );
|
||||
free( temp );
|
||||
return rez;
|
||||
}
|
||||
|
||||
Drive::Drive( int index, const std::string &path, const std::string &name )
|
||||
: m_index( index ), m_path( path ), m_name( name ), m_threadStarted( false ), m_message( 0 )
|
||||
{
|
||||
}
|
||||
|
||||
Drive::~Drive()
|
||||
{
|
||||
if( m_threadStarted ) {
|
||||
pthread_cancel( m_thread );
|
||||
pthread_join( m_thread, 0 );
|
||||
pthread_cond_destroy( &m_cond );
|
||||
}
|
||||
}
|
||||
|
||||
std::string Drive::fullPath() const
|
||||
{
|
||||
return std::string( DBusDrivesPath ) + "/" + path();
|
||||
}
|
||||
|
||||
bool Drive::active() const
|
||||
{
|
||||
return m_message != 0;
|
||||
}
|
||||
|
||||
void *routine( void *ptr )
|
||||
{
|
||||
reinterpret_cast< Drive * >( ptr )->routine();
|
||||
return ptr;
|
||||
}
|
||||
|
||||
|
||||
static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
|
||||
|
||||
void Drive::invoke( const std::string &method, const DBusCpp::Message &msg )
|
||||
{
|
||||
DrivesManager &man = DrivesManager::instance();
|
||||
if( method == "name" ) {
|
||||
DBusCpp::Message reply = msg.newMethodReturn();
|
||||
reply.append( name() );
|
||||
man.connection().send( reply );
|
||||
return;
|
||||
}
|
||||
if( method == "abort" ) {
|
||||
m_aborted = true;
|
||||
DBusCpp::Message reply = msg.newMethodReturn();
|
||||
man.connection().send( reply );
|
||||
return;
|
||||
}
|
||||
if( method == "preview" || method == "print" ) {
|
||||
if( !m_threadStarted ) {
|
||||
m_threadStarted = true;
|
||||
pthread_cond_init( &m_cond, 0 );
|
||||
pthread_create( &m_thread, 0, ::routine, this );
|
||||
}
|
||||
pthread_mutex_lock( &mutex );
|
||||
if( m_message ) {
|
||||
DBusCpp::Message reply = msg.newError( DBUS_ERROR_FAILED, "drive is busy, try again later" );
|
||||
man.connection().send( reply );
|
||||
}
|
||||
m_aborted = false;
|
||||
m_message = new DBusCpp::Message( msg );
|
||||
pthread_cond_signal( &m_cond );
|
||||
pthread_mutex_unlock( &mutex );
|
||||
return;
|
||||
}
|
||||
DBusCpp::Message reply = msg.newError( DBUS_ERROR_UNKNOWN_METHOD, "method is not supported" );
|
||||
man.connection().send( reply );
|
||||
}
|
||||
|
||||
void Drive::routine()
|
||||
{
|
||||
pthread_setspecific( drivesKey, this );
|
||||
DrivesManager &man = DrivesManager::instance();
|
||||
|
||||
bool first = true;
|
||||
while( true ) {
|
||||
pthread_mutex_lock( &mutex );
|
||||
|
||||
if( first )
|
||||
first = false;
|
||||
else {
|
||||
delete m_message;
|
||||
m_message = 0;
|
||||
}
|
||||
while( !m_message )
|
||||
pthread_cond_wait( &m_cond, &mutex );
|
||||
|
||||
pthread_mutex_unlock( &mutex );
|
||||
|
||||
bool preview = strcmp( m_message->member(), "preview" ) == 0;
|
||||
|
||||
LS_LabelMode mode;
|
||||
LS_DrawOptions options;
|
||||
LS_PrintQuality quality;
|
||||
LS_MediaOptimizationLevel level;
|
||||
|
||||
char *image = 0;
|
||||
int imageSize = 0;
|
||||
|
||||
LS_Size size;
|
||||
|
||||
try {
|
||||
DBusCpp::MessageConstIter iter = m_message->constIter();
|
||||
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>() );
|
||||
|
||||
if( !iter.next() )
|
||||
throw std::string( "image argument missing" );
|
||||
|
||||
if( iter.signature() != "ay" )
|
||||
throw std::string( "invalid argument for image: " ) + iter.signature() + ", ay expected";
|
||||
|
||||
sub = iter.recurse();
|
||||
|
||||
image = reinterpret_cast< char * >( sub.getFixedArray( imageSize ) );
|
||||
|
||||
if( preview ) {
|
||||
if( !iter.next() )
|
||||
throw std::string( "size argument missing" );
|
||||
if( iter.signature() != "(ii)" )
|
||||
throw std::string( "invalid argument for size: " ) + iter.signature() + ", (ii) expected";
|
||||
|
||||
sub = iter.recurse();
|
||||
size.x = sub.getValue<int32_t>(); sub.next();
|
||||
size.y = sub.getValue<int32_t>();
|
||||
}
|
||||
}
|
||||
catch( const std::string &str ) {
|
||||
std::cout << "exception " << str << std::endl;
|
||||
DBusCpp::Message reply = m_message->newError( DBUS_ERROR_INVALID_ARGS, str.c_str() );
|
||||
man.connection().send( reply );
|
||||
continue;
|
||||
}
|
||||
|
||||
std::string tmpFile;
|
||||
if( preview )
|
||||
tmpFile = generateTmp();
|
||||
|
||||
if( m_index == -1 ) {
|
||||
DBusCpp::Message reply = m_message->newMethodReturn();
|
||||
|
||||
if( preview ) { // this is debug drive, so just write input into output
|
||||
std::ofstream out( tmpFile.c_str() );
|
||||
out.write( image, imageSize );
|
||||
out.close();
|
||||
|
||||
reply.append( tmpFile );
|
||||
}
|
||||
man.connection().send( reply );
|
||||
continue;
|
||||
}
|
||||
|
||||
const char *function = 0;
|
||||
try {
|
||||
const size_t bitmapHeaderSize = 54;
|
||||
|
||||
if( size_t( imageSize ) <= bitmapHeaderSize )
|
||||
throw "Invalid image";
|
||||
|
||||
function = "LS_DiscPrintMgr_Create";
|
||||
DiscPrintMgr manager;
|
||||
|
||||
function = "LS_DiscPrintMgr_EnumDiscPrinters";
|
||||
EnumDiscPrinters printers = manager.EnumDiscPrinters();
|
||||
if( m_index >= printers.Count() )
|
||||
throw std::string( "internal error: invalid index" );
|
||||
|
||||
DiscPrinter printer = printers.Item( m_index );
|
||||
|
||||
function = "LS_DiscPrinter_OpenPrintSession";
|
||||
DiscPrintSession session = printer.OpenPrintSession();
|
||||
|
||||
DBusCpp::Message reply = m_message->newMethodReturn();
|
||||
|
||||
if( preview ) {
|
||||
|
||||
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 {
|
||||
|
||||
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 );
|
||||
}
|
||||
}
|
||||
catch( LightScribe::LSException &ex ) {
|
||||
if( function ) {
|
||||
char message[ 255 ];
|
||||
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 );
|
||||
} else
|
||||
clReportFinished( ex.GetCode() );
|
||||
continue;
|
||||
}
|
||||
catch( const std::string &str ) {
|
||||
DBusCpp::Message reply = m_message->newError( DBUS_ERROR_FAILED, str.c_str() );
|
||||
man.connection().send( reply );
|
||||
continue;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
DrivesManager::DrivesManager()
|
||||
: m_connection( 0 )
|
||||
{
|
||||
}
|
||||
|
||||
void DrivesManager::init( DBusCpp::Connection conn, bool debug )
|
||||
{
|
||||
pthread_key_create( &drivesKey, 0 );
|
||||
m_connection = conn;
|
||||
|
||||
if( debug )
|
||||
m_drives.push_back( new Drive( -1, "drived", "Debug printer" ) );
|
||||
|
||||
DiscPrintMgr manager;
|
||||
EnumDiscPrinters printers = manager.EnumDiscPrinters();
|
||||
const unsigned count = printers.Count();
|
||||
for( unsigned i = 0; i < count; ++i ) {
|
||||
DiscPrinter printer = printers.Item( i );
|
||||
|
||||
char path[ 10 ];
|
||||
sprintf( path, "drive%d", i );
|
||||
m_drives.push_back( new Drive( i, path, printer.GetPrinterDisplayName() ) );
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
DrivesManager::~DrivesManager()
|
||||
{
|
||||
for( const_iterator f = begin(); f != end(); ++f )
|
||||
delete *f;
|
||||
}
|
||||
|
||||
DrivesManager &DrivesManager::instance()
|
||||
{
|
||||
static DrivesManager theManager;
|
||||
return theManager;
|
||||
|
||||
}
|
||||
|
||||
bool DrivesManager::active() const
|
||||
{
|
||||
for( const_iterator f = begin(); f != end(); ++f )
|
||||
if( (*f)->active() )
|
||||
return true;
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
DrivesManager::const_iterator DrivesManager::find( const std::string &path ) const
|
||||
{
|
||||
const_iterator f;
|
||||
for( f = begin(); f != end(); ++f )
|
||||
if( (*f)->path() == path )
|
||||
break;
|
||||
|
||||
return f;
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -1,83 +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 DRIVES_H
|
||||
#define DRIVES_H
|
||||
|
||||
#include <vector>
|
||||
#include <string>
|
||||
|
||||
#include "dbuscpp.h"
|
||||
|
||||
class Drive {
|
||||
public:
|
||||
const std::string &path() const { return m_path; }
|
||||
std::string fullPath() const;
|
||||
const std::string &name() const { return m_name; }
|
||||
bool isAborted() const { return m_aborted; }
|
||||
|
||||
void invoke( const std::string &method, const DBusCpp::Message &msg );
|
||||
bool active() const;
|
||||
|
||||
friend class DrivesManager;
|
||||
friend void *routine( void * );
|
||||
|
||||
private:
|
||||
Drive( int index, const std::string &path, const std::string &name );
|
||||
~Drive();
|
||||
|
||||
void routine();
|
||||
|
||||
int m_index;
|
||||
std::string m_path;
|
||||
std::string m_name;
|
||||
bool m_aborted;
|
||||
bool m_threadStarted;
|
||||
pthread_t m_thread;
|
||||
pthread_cond_t m_cond;
|
||||
DBusCpp::Message *m_message;
|
||||
};
|
||||
|
||||
class DrivesManager {
|
||||
public:
|
||||
typedef std::vector< Drive * > Drives;
|
||||
typedef Drives::const_iterator const_iterator;
|
||||
|
||||
static DrivesManager &instance();
|
||||
|
||||
void init( DBusCpp::Connection conn, bool debug );
|
||||
|
||||
const_iterator begin() const { return m_drives.begin(); }
|
||||
const_iterator end() const { return m_drives.end(); }
|
||||
const_iterator find( const std::string &path ) const;
|
||||
|
||||
bool active() const;
|
||||
|
||||
DBusCpp::Connection connection() const { return m_connection; }
|
||||
|
||||
private:
|
||||
DrivesManager();
|
||||
~DrivesManager();
|
||||
|
||||
Drives m_drives;
|
||||
DBusCpp::Connection m_connection;
|
||||
};
|
||||
|
||||
#endif // DRIVES_H
|
||||
@@ -1,58 +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 "introspecthandler.h"
|
||||
#include "lscribed.h"
|
||||
|
||||
#include <string.h>
|
||||
|
||||
using namespace DBusCpp;
|
||||
|
||||
DBusHandlerResult IntrospectHandler::processMessage( const Message &msg )
|
||||
{
|
||||
if( msg.isMethodCall( "org.freedesktop.DBus.Introspectable", "Introspect" ) ) {
|
||||
const char *path = msg.path();
|
||||
if( !path )
|
||||
return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
|
||||
|
||||
int pathlen = strlen( path );
|
||||
|
||||
std::string introspect = generateInrospectHeader();
|
||||
|
||||
if( strncmp( path, DBusManagerPath, pathlen ) == 0 ) {
|
||||
if( pathlen != 1 ) ++pathlen;
|
||||
const char *end = strchr( DBusManagerPath + pathlen, '/' );
|
||||
if( end ) {
|
||||
const int sublen = end - DBusManagerPath - pathlen;
|
||||
introspect += "<node name=\"" +
|
||||
std::string( DBusManagerPath + pathlen, sublen )
|
||||
+ "\"/>";
|
||||
} else
|
||||
introspect += "<node name=\"Manager\"/><node name=\"drives\"/>";
|
||||
}
|
||||
introspect += "</node>";
|
||||
|
||||
Message reply = msg.newMethodReturn();
|
||||
reply.append( introspect );
|
||||
connection()->send( reply );
|
||||
return DBUS_HANDLER_RESULT_HANDLED;
|
||||
}
|
||||
return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
|
||||
}
|
||||
@@ -1,35 +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 INTROSPECTHANDLER_H
|
||||
#define INTROSPECTHANDLER_H
|
||||
|
||||
#include "dbuscpp.h"
|
||||
|
||||
namespace DBusCpp {
|
||||
|
||||
class IntrospectHandler : public MessageHandler {
|
||||
public:
|
||||
virtual DBusHandlerResult processMessage( const Message &msg );
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
#endif // INTROSPECTHANDLER_H
|
||||
@@ -1,21 +0,0 @@
|
||||
<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
|
||||
"http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
|
||||
<busconfig>
|
||||
|
||||
<!-- ../system.conf have denied everything, so we just punch some holes -->
|
||||
|
||||
<!-- 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_interface="@QLSCRIBE_DBUS_MANAGER_SERVICE@"/>
|
||||
<allow send_interface="@QLSCRIBE_DBUS_DRIVES_SERVICE@"/>
|
||||
<allow receive_interface="@QLSCRIBE_DBUS_DRIVES_SERVICE@"/>
|
||||
</policy>
|
||||
|
||||
</busconfig>
|
||||
@@ -1,34 +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 LSCRIBED_H
|
||||
#define LSCRIBED_H
|
||||
|
||||
#include <map>
|
||||
#include <string>
|
||||
|
||||
const char * const DBusServiceName = "@QLSCRIBE_DBUS_MANAGER_SERVICE@";
|
||||
const char * const DBusPath = "@QLSCRIBE_DBUS_PATH@";
|
||||
const char * const DBusManagerPath = "@QLSCRIBE_DBUS_MANAGER_PATH@";
|
||||
const char * const DBusDrivesPath = "@QLSCRIBE_DBUS_DRIVES_PATH@";
|
||||
|
||||
extern unsigned int lastActivity;
|
||||
|
||||
#endif // LSCRIBED_H
|
||||
@@ -1,20 +0,0 @@
|
||||
# -------------------------------------------------
|
||||
# Project created by QtCreator 2009-02-22T16:31:18
|
||||
# -------------------------------------------------
|
||||
QT -= core \
|
||||
gui
|
||||
TARGET = lscribed
|
||||
TEMPLATE = lib
|
||||
INCLUDEPATH += /usr/include/dbus-1.0/
|
||||
CONFIG += staticlib
|
||||
SOURCES += main.cpp \
|
||||
dbuscpp.cpp \
|
||||
managerhandler.cpp \
|
||||
drivehandler.cpp \
|
||||
introspecthandler.cpp \
|
||||
drives.cpp
|
||||
HEADERS += dbuscpp.h \
|
||||
drivehandler.h \
|
||||
managerhandler.h \
|
||||
introspecthandler.h \
|
||||
drives.h
|
||||
@@ -1,129 +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 <iostream>
|
||||
#include <string.h>
|
||||
#include <signal.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "lscribed.h"
|
||||
#include "dbuscpp.h"
|
||||
#include "introspecthandler.h"
|
||||
#include "managerhandler.h"
|
||||
#include "drivehandler.h"
|
||||
#include "drives.h"
|
||||
|
||||
unsigned int lastActivity = 0;
|
||||
unsigned int activityTimeout = 300; // 5 min by default
|
||||
bool terminateOnTimeout = false;
|
||||
int alarmInterval = 1;
|
||||
bool debug = false;
|
||||
|
||||
void onAlarm( int )
|
||||
{
|
||||
alarm( alarmInterval );
|
||||
unsigned int curr = time( 0 );
|
||||
|
||||
if( lastActivity == 0 ) {
|
||||
lastActivity = curr;
|
||||
return;
|
||||
}
|
||||
if( curr - lastActivity < activityTimeout )
|
||||
return;
|
||||
|
||||
if( DrivesManager::instance().active() ) {
|
||||
lastActivity = curr;
|
||||
return;
|
||||
}
|
||||
terminateOnTimeout = true;
|
||||
}
|
||||
|
||||
void usage()
|
||||
{
|
||||
std::cerr << "usage: lscribed [--help] [--timeout t] [--debug]" << std::endl;
|
||||
std::cerr << "\t--help print this message" << std::endl;
|
||||
std::cerr << "\t--timeout interval (seconds) to terminate after inactivity 0 - disable, default 300" << std::endl;
|
||||
std::cerr << "\t--debug to enable virtual drive and print debug statements" << std::endl;
|
||||
}
|
||||
|
||||
int main( int argc, char **argv )
|
||||
{
|
||||
for( int i = 1; i < argc; ++i ) {
|
||||
if( strcmp( argv[i], "--help" ) == 0 ) {
|
||||
usage();
|
||||
return 1;
|
||||
}
|
||||
|
||||
if( strcmp( argv[i], "--timeout" ) == 0 ) {
|
||||
if( i == argc - 1 ) {
|
||||
std::cerr << "Error: agrument for --timeout expected" << std::endl;
|
||||
usage();
|
||||
return 2;
|
||||
}
|
||||
activityTimeout = atoi( argv[ ++ i ] );
|
||||
continue;
|
||||
}
|
||||
if( strcmp( argv[i], "--debug" ) == 0 ) {
|
||||
debug = true;
|
||||
continue;
|
||||
}
|
||||
std::cerr << "Error: unknown parameter " << argv[ i ] << std::endl;
|
||||
usage();
|
||||
return 3;
|
||||
}
|
||||
dbus_threads_init_default();
|
||||
|
||||
DBusError err;
|
||||
dbus_error_init( &err );
|
||||
|
||||
DBusCpp::Connection conn ( dbus_bus_get_private( DBUS_BUS_SYSTEM, &err ) );
|
||||
if( dbus_error_is_set( &err ) ) {
|
||||
std::cerr << "dbus_bus_get() error: " << err.message << std::endl;
|
||||
dbus_error_free( &err );
|
||||
return 1;
|
||||
}
|
||||
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;
|
||||
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;
|
||||
return 3;
|
||||
}
|
||||
|
||||
conn.registerHandler( "/", new DBusCpp::IntrospectHandler, true );
|
||||
conn.registerHandler( DBusManagerPath, new DBusCpp::ManagerHandler, false );
|
||||
conn.registerHandler( DBusDrivesPath, new DBusCpp::DriveHandler, true );
|
||||
|
||||
DrivesManager::instance().init( conn, debug );
|
||||
if( activityTimeout ) {
|
||||
signal( SIGALRM, onAlarm );
|
||||
alarm( alarmInterval );
|
||||
}
|
||||
|
||||
while( dbus_connection_read_write_dispatch( conn.ptr(), 10 ) ) {
|
||||
if( terminateOnTimeout )
|
||||
dbus_connection_close( conn.ptr() );
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
@@ -1,73 +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 "lscribed.h"
|
||||
#include "managerhandler.h"
|
||||
#include "drives.h"
|
||||
|
||||
using namespace DBusCpp;
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
static const char *strManagerIntrospect =
|
||||
"<interface name=\"org.lightscribe.printManager\">\
|
||||
<method name=\"getDrives\">\
|
||||
<arg type=\"a{ss}\" direction=\"out\"/>\
|
||||
</method>\
|
||||
</interface>";
|
||||
|
||||
|
||||
DBusHandlerResult ManagerHandler::processMessage( const Message &msg )
|
||||
{
|
||||
if( msg.isMethodCall( "org.freedesktop.DBus.Introspectable", "Introspect" ) ) {
|
||||
Message reply = msg.newMethodReturn();
|
||||
std::string introspect = generateInrospectHeader();
|
||||
introspect += strManagerIntrospect;
|
||||
introspect += "</node>";
|
||||
reply.append( introspect );
|
||||
|
||||
connection()->send( reply );
|
||||
return DBUS_HANDLER_RESULT_HANDLED;
|
||||
}
|
||||
|
||||
if( msg.isMethodCall( "org.lightscribe.printManager", "getDrives" ) ) {
|
||||
Message reply = msg.newMethodReturn();
|
||||
|
||||
MessageIter args = reply.appendIter();
|
||||
{
|
||||
MessageIter sub = args.openContainer( DBUS_TYPE_ARRAY, "{ss}" );
|
||||
|
||||
DrivesManager &manager = DrivesManager::instance();
|
||||
for( DrivesManager::const_iterator it = manager.begin(); it != manager.end(); ++it ) {
|
||||
MessageIter itemIterator = sub.openContainer( DBUS_TYPE_DICT_ENTRY, 0 );
|
||||
|
||||
itemIterator.append( std::string( DBusDrivesPath ) + "/" + (*it)->path() );
|
||||
itemIterator.append( (*it)->name() );
|
||||
}
|
||||
}
|
||||
|
||||
connection()->send( reply );
|
||||
return DBUS_HANDLER_RESULT_HANDLED;
|
||||
}
|
||||
|
||||
return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
|
||||
}
|
||||
|
||||
|
||||
@@ -1,35 +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 MANAGERHANDLER_H
|
||||
#define MANAGERHANDLER_H
|
||||
|
||||
#include "dbuscpp.h"
|
||||
|
||||
namespace DBusCpp {
|
||||
|
||||
class ManagerHandler : public MessageHandler {
|
||||
public:
|
||||
virtual DBusHandlerResult processMessage( const Message &msg );
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
#endif // INTROSPECTHANDLER_H
|
||||
@@ -1,4 +0,0 @@
|
||||
[D-BUS Service]
|
||||
Name=@QLSCRIBE_DBUS_MANAGER_SERVICE@
|
||||
Exec=@CMAKE_INSTALL_PREFIX@/sbin/lscribed
|
||||
User=root
|
||||
@@ -1,36 +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$
|
||||
|
||||
SET( DESKTOP_DIR share/applications )
|
||||
SET( MIME_DIR share/mime/packages )
|
||||
SET( ICON_DIR share/icons/hicolor )
|
||||
|
||||
INSTALL( FILES qlscribe.desktop DESTINATION ${DESKTOP_DIR} )
|
||||
|
||||
INSTALL( FILES qlscribe.xml DESTINATION ${MIME_DIR} )
|
||||
|
||||
MACRO( INSTALL_ICON SIZE )
|
||||
INSTALL( FILES qlscribe${SIZE}.png DESTINATION ${ICON_DIR}/${SIZE}x${SIZE}/apps RENAME qlscribe.png )
|
||||
ENDMACRO( INSTALL_ICON )
|
||||
|
||||
INSTALL_ICON( 64 )
|
||||
INSTALL_ICON( 48 )
|
||||
INSTALL_ICON( 32 )
|
||||
|
||||
@@ -1,9 +0,0 @@
|
||||
[Desktop Entry]
|
||||
Encoding=UTF-8
|
||||
Name=Qt lightScribe
|
||||
Exec=qlscribe
|
||||
Icon=qlscribe.png
|
||||
Terminal=false
|
||||
Type=Application
|
||||
MimeType=application/x-qlscribe;
|
||||
Categories=AudioVideo;DiscBurning;
|
||||
Binary file not shown.
@@ -1,7 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
|
||||
<mime-type type="application/x-qlscribe">
|
||||
<comment>Qt lightScribe label document</comment>
|
||||
<glob pattern="*.qlx"/>
|
||||
</mime-type>
|
||||
</mime-info>
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 2.4 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 4.3 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 6.1 KiB |
+9
-40
@@ -18,58 +18,27 @@
|
||||
#
|
||||
# $Id$
|
||||
|
||||
FIND_PACKAGE( Qt4 REQUIRED )
|
||||
SET( QT_USE_QTDBUS 1 )
|
||||
SET( QLSCRIBE_SRCS main.cpp mainwindow.cpp qcdscene.cpp qcdview.cpp qdialogpixmap.cpp qdialogroundtext.cpp
|
||||
qdialogtext.cpp qgraphicsroundtextitem.cpp qlightscribe.cpp qshapecontrollers.cpp qshapefactory.cpp
|
||||
qdialogprint.cpp qdialogprogress.cpp )
|
||||
|
||||
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)
|
||||
|
||||
SET( QLSCRIBE_UIS qdialogtext.ui qdialogroundtext.ui qdialogpixmap.ui
|
||||
qdialogprint.ui qdialogprogress.ui qdialogcdproperties.ui)
|
||||
SET( QLSCRIBE_UIS qdialogtext.ui qdialogroundtext.ui qdialogpixmap.ui qdialogprint.ui qdialogprogress.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)
|
||||
qdialogtext.h qlightscribe.h qdialogprint.h qdialogprogress.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} )
|
||||
|
||||
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)
|
||||
INCLUDE_DIRECTORIES( ${CMAKE_BINARY_DIR}/src ${CMAKE_SOURCE_DIR}/src )
|
||||
|
||||
ADD_CUSTOM_COMMAND(OUTPUT ${_impl} ${_header}
|
||||
COMMAND ${QT_DBUSXML2CPP_EXECUTABLE} -m -i qlightscribe.h -p ${_basename} ${_infile}
|
||||
DEPENDS ${_infile})
|
||||
ADD_EXECUTABLE( qlscribe ${QLSCRIBE_SRCS} ${QLSCRIBE_MOC_SRCS} ${QLSCRIBE_UI_HDRS} )
|
||||
|
||||
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 )
|
||||
|
||||
INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} )
|
||||
|
||||
ADD_EXECUTABLE( qlscribe ${QLSCRIBE_SRCS} ${QLSCRIBE_MOC_SRCS} ${QLSCRIBE_UI_HDRS} ${QLSCRIBE_DBUS_SRCS} )
|
||||
|
||||
TARGET_LINK_LIBRARIES( qlscribe ${QT_LIBRARIES} )
|
||||
|
||||
INSTALL( TARGETS qlscribe
|
||||
DESTINATION bin
|
||||
PERMISSIONS OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE SETUID )
|
||||
TARGET_LINK_LIBRARIES( qlscribe ${QT_LIBRARIES} ${LSCRIBE_LIBRARIES} )
|
||||
|
||||
INSTALL( TARGETS qlscribe DESTINATION bin )
|
||||
|
||||
@@ -1,65 +0,0 @@
|
||||
<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
|
||||
"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
|
||||
|
||||
<!-- 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$
|
||||
-->
|
||||
<node>
|
||||
<interface name="org.lightscribe.printManager">
|
||||
<method name="getDrives">
|
||||
<annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QObject2StringMap"/>
|
||||
<arg type="a{ss}" direction="out"/>
|
||||
</method>
|
||||
</interface>
|
||||
<interface name="org.lightscribe.drive">
|
||||
<signal name="prepareProgress">
|
||||
<arg name="current" type="i" direction="out"/>
|
||||
<arg name="final" type="i" direction="out"/>
|
||||
</signal>
|
||||
<signal name="labelProgress">
|
||||
<arg name="current" type="i" direction="out"/>
|
||||
<arg name="final" type="i" direction="out"/>
|
||||
</signal>
|
||||
<signal name="timeEstimate">
|
||||
<arg name="time" type="i" direction="out"/>
|
||||
</signal>
|
||||
<signal name="finished">
|
||||
<arg name="status" type="i" direction="out"/>
|
||||
</signal>
|
||||
<method name="preview">
|
||||
<annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="const PrintParameters &"/>
|
||||
<annotation name="com.trolltech.QtDBus.QtTypeName.In2" value="QSize"/>
|
||||
<arg type="s" direction="out"/>
|
||||
<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 &"/>
|
||||
<arg name="params" type="(iiii)" direction="in"/>
|
||||
<arg name="image" type="ay" direction="in"/>
|
||||
</method>
|
||||
<method name="abort">
|
||||
</method>
|
||||
<method name="name">
|
||||
<arg type="s" direction="out"/>
|
||||
</method>
|
||||
</interface>
|
||||
</node>
|
||||
+5
-115
@@ -19,124 +19,14 @@
|
||||
$Id$ */
|
||||
|
||||
#include <QApplication>
|
||||
#include <QMessageBox>
|
||||
#include <QMap>
|
||||
#include "mainwindow.h"
|
||||
#include "qcdscene.h"
|
||||
#include "qlightscribe.h"
|
||||
#include "qconsoleprintprogress.h"
|
||||
|
||||
#include <iostream>
|
||||
|
||||
std::ostream &operator<<( std::ostream &os, const QString &str )
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
return os << str.toAscii().data();
|
||||
}
|
||||
|
||||
void usage()
|
||||
{
|
||||
std::cout << "Usage: \n"
|
||||
<< "To run GUI: qlscribe [filename] [filename] ...\n"
|
||||
<< "To print label in console mode: qlscribe --print [--drive Index] [--replace KEY=VALUE] filename\n"
|
||||
<< "\tParameters:\n"
|
||||
<< "\t\t--help | -h - print this message\n"
|
||||
<< "\t\t--print | -p - switch to print mode\n"
|
||||
<< "\t\t--drive | -d NUMBER - use this drive, starts from 0, 0 is default\n"
|
||||
<< "\t\t--replace | -r KEY=VALUE - replace text from KEY to VALUE\n"
|
||||
<< std::endl;
|
||||
}
|
||||
|
||||
int main( int argc, char **argv )
|
||||
{
|
||||
QApplication app( argc, argv );
|
||||
QApplication app(argc, argv);
|
||||
app.addLibraryPath( "/usr/lib32/qt4/plugins" );
|
||||
MainWindow mwindow;
|
||||
mwindow.show();
|
||||
|
||||
bool doPrint = false;
|
||||
QStringList arguments = app.arguments();
|
||||
QStringList files;
|
||||
QCDScene::QString2String replacements;
|
||||
int driveIndex = 0;
|
||||
PrintParameters params;
|
||||
bool labelModeOverriden = false;
|
||||
|
||||
for( int i = 1; i < arguments.size(); ++i ) {
|
||||
QString arg = arguments[i];
|
||||
if( arg == "--print" || arg == "-p" ) {
|
||||
doPrint = true;
|
||||
continue;
|
||||
}
|
||||
if( arg == "--help" || arg == "-h" ) {
|
||||
usage();
|
||||
return 0;
|
||||
}
|
||||
if( arg == "--replace" || arg == "-r" ) {
|
||||
if( i == arguments.size() - 1 ) {
|
||||
std::cerr << "Error: arg#" << i
|
||||
<< " argument expected for \"" << arg << "\" not enough parameters" << std::endl;
|
||||
return 1;
|
||||
}
|
||||
QString param = arguments[ ++i ];
|
||||
int pos = param.indexOf( '=' );
|
||||
if( pos == -1 ) {
|
||||
std::cerr << "Error: arg#" << i
|
||||
<< " invalid argument for replacement, KEY=VALUE expected, missing =" << std::endl;
|
||||
return 2;
|
||||
}
|
||||
replacements[ param.left( pos ) ] = param.right( param.size() - pos - 1 );
|
||||
continue;
|
||||
}
|
||||
if( arg == "--drive" || arg == "-d" ) {
|
||||
if( i == arguments.size() - 1 ) {
|
||||
std::cerr << "Error: arg#" << i
|
||||
<< " argument expected for \"" << arg << "\" not enough parameters" << std::endl;
|
||||
return 1;
|
||||
}
|
||||
QString param = arguments[ ++i ];
|
||||
driveIndex = param.toInt();
|
||||
}
|
||||
if( arg[0] != '-' )
|
||||
files.append( arg );
|
||||
}
|
||||
|
||||
if( doPrint && files.size() != 1 ) {
|
||||
if( files.size() )
|
||||
std::cerr << "Error: only one filename expected to print, got " << files.size() << " instead" << std::endl;
|
||||
else
|
||||
std::cerr << "Error: filename required to print" << std::endl;
|
||||
return 3;
|
||||
}
|
||||
|
||||
int rez = 0;
|
||||
|
||||
if( doPrint ) {
|
||||
// print here
|
||||
QCDScene scene;
|
||||
QString err;
|
||||
if( !scene.load( files.front(), &err ) ) {
|
||||
std::cerr << "Error: cannot read \"" << files.front() << "\" - " << err << std::endl;
|
||||
return 5;
|
||||
}
|
||||
scene.replace( replacements );
|
||||
if( !labelModeOverriden )
|
||||
params.m_labelMode = scene.labelMode();
|
||||
|
||||
QLightScribe *scribe = QLightScribe::instance();
|
||||
QList< QLightDrive * > drives = scribe->getDrives();
|
||||
if( driveIndex >= drives.size() ) {
|
||||
std::cerr << "Error: drive " << driveIndex << " specified, but there are only " << drives.size() << " drives" << std::endl;
|
||||
return 6;
|
||||
}
|
||||
std::cout << "Printing label " << files.front() << std::endl;
|
||||
|
||||
QLightDrive *drive = drives[driveIndex];
|
||||
QConsolePrintProgress progress( drive );
|
||||
drive->print( params, &scene );
|
||||
rez = app.exec();
|
||||
} else {
|
||||
MainWindow mwindow( true );
|
||||
mwindow.show();
|
||||
mwindow.open( files );
|
||||
rez = app.exec();
|
||||
}
|
||||
return rez;
|
||||
return app.exec();
|
||||
}
|
||||
|
||||
+74
-158
@@ -19,14 +19,13 @@
|
||||
$Id$ */
|
||||
|
||||
#include "mainwindow.h"
|
||||
#include "qlightroundtextitem.h"
|
||||
#include "qgraphicsroundtextitem.h"
|
||||
#include "qcdview.h"
|
||||
#include "qcdscene.h"
|
||||
#include "qshapefactory.h"
|
||||
#include "qlightscribe.h"
|
||||
#include "qdialogprint.h"
|
||||
#include "qdialogprogress.h"
|
||||
#include "qdialogcdproperties.h"
|
||||
|
||||
#include <QMenuBar>
|
||||
#include <QStatusBar>
|
||||
@@ -35,40 +34,30 @@
|
||||
#include <QMessageBox>
|
||||
#include <QSignalMapper>
|
||||
#include <QFileDialog>
|
||||
#include <QXmlStreamWriter>
|
||||
#include <QLabel>
|
||||
#include <QCloseEvent>
|
||||
|
||||
/*#include <QImage>
|
||||
#include <QBuffer>
|
||||
#include <QGraphicsScene>
|
||||
#include <QFontDialog>
|
||||
#include <QPainter>*/
|
||||
|
||||
MainWindow::MainWindow( bool enablePrint )
|
||||
: QMainWindow( 0 ),
|
||||
//#include <lightscribe.h>
|
||||
|
||||
MainWindow::MainWindow(QWidget *parent) :
|
||||
QMainWindow(parent),
|
||||
m_mdiArea( new QMdiArea( this ) ),
|
||||
m_menuFile( 0 ), m_menuInsert( 0 ),
|
||||
m_insertMapper( new QSignalMapper( this ) ),
|
||||
m_newLabelMapper( new QSignalMapper( this ) )
|
||||
m_insertMapper( new QSignalMapper( this ) )
|
||||
{
|
||||
setWindowTitle( tr( "Qt lightScribe", "Main window title \"Qt lightScribe\"" ) );
|
||||
setCentralWidget( m_mdiArea );
|
||||
|
||||
m_menuFile = menuBar()->addMenu( tr( "File", "Menu item \"File\"" ) );
|
||||
|
||||
{
|
||||
QMenu *newSubMenu = m_menuFile->addMenu( tr( "New label", "Menu item \"New lable\"" ) );
|
||||
QAction *action = newSubMenu->addAction( tr( "Full", "Menu item \"Full\"" ),
|
||||
m_newLabelMapper,
|
||||
SLOT(map()) );
|
||||
m_newLabelMapper->setMapping( action, modeFull );
|
||||
|
||||
action = newSubMenu->addAction( tr( "Content", "Menu item \"Content\"" ),
|
||||
m_newLabelMapper,
|
||||
SLOT(map()) );
|
||||
m_newLabelMapper->setMapping( action, modeContent );
|
||||
|
||||
action = newSubMenu->addAction( tr( "Title", "Menu item \"Title\"" ),
|
||||
m_newLabelMapper,
|
||||
SLOT(map()) );
|
||||
m_newLabelMapper->setMapping( action, modeTitle );
|
||||
}
|
||||
connect( m_newLabelMapper, SIGNAL(mapped(int)), this, SLOT(onMenuNewLabel(int)) );
|
||||
m_menuFile->addAction( tr( "New", "Menu item \"New\"" ),
|
||||
this,
|
||||
SLOT(onMenuNew()) );
|
||||
|
||||
m_menuFile->addAction( tr( "Open...", "Menu item \"Open\"" ),
|
||||
this,
|
||||
@@ -85,22 +74,13 @@ MainWindow::MainWindow( bool enablePrint )
|
||||
|
||||
m_menuFile->addSeparator();
|
||||
|
||||
m_menuFile->addAction( tr( "Label properties...", "Menu item \"Label propeties...\"" ),
|
||||
this,
|
||||
SLOT(onMenuProperties()) );
|
||||
|
||||
m_menuFile->addSeparator();
|
||||
|
||||
m_menuFile->addAction( tr( "Print preview...", "Menu item \"Print preview\"" ),
|
||||
this,
|
||||
SLOT(onMenuPrintPreview()) );
|
||||
|
||||
QAction *printAction =
|
||||
m_menuFile->addAction( tr( "Print...", "Menu item \"Print\"" ),
|
||||
this,
|
||||
SLOT(onMenuPrint()) );
|
||||
if( !enablePrint )
|
||||
printAction->setEnabled( false );
|
||||
m_menuFile->addAction( tr( "Print...", "Menu item \"Print\"" ),
|
||||
this,
|
||||
SLOT(onMenuPrint()) );
|
||||
|
||||
m_menuFile->addAction( tr( "Exit", "Menu item \"Exit\"" ),
|
||||
this,
|
||||
@@ -131,95 +111,16 @@ MainWindow::MainWindow( bool enablePrint )
|
||||
|
||||
MainWindow::~MainWindow()
|
||||
{
|
||||
QLightScribe *lscribe = QLightScribe::instance();
|
||||
lscribe->stopThread();
|
||||
lscribe->wait( 1000 );
|
||||
}
|
||||
|
||||
void MainWindow::open( const QStringList &files )
|
||||
{
|
||||
foreach( QString fileName, files ) {
|
||||
QCDView *newView = new QCDView;
|
||||
QCDScene *scene = new QCDScene( newView );
|
||||
newView->setScene( scene );
|
||||
|
||||
if( !scene->load( fileName ) ) {
|
||||
delete newView;
|
||||
continue;
|
||||
}
|
||||
|
||||
QMdiSubWindow *subWindow = m_mdiArea->addSubWindow( newView );
|
||||
subWindow->show();
|
||||
}
|
||||
}
|
||||
|
||||
bool MainWindow::saveSceneAs( QCDScene *scene )
|
||||
{
|
||||
QString fileName =
|
||||
QFileDialog::getSaveFileName( this,
|
||||
scene->name() + tr( ": save as" ),
|
||||
QString(),
|
||||
tr("qlscribe document (*.qlx)") );
|
||||
if( fileName.isNull() )
|
||||
return false;
|
||||
|
||||
if( !fileName.contains( '.' ) )
|
||||
fileName += ".qlx";
|
||||
|
||||
return scene->saveAs( fileName );
|
||||
}
|
||||
|
||||
bool MainWindow::saveScene( QCDScene *scene )
|
||||
{
|
||||
return scene->isUnnamed() ? saveSceneAs( scene ) : scene->save();
|
||||
}
|
||||
|
||||
|
||||
void MainWindow::closeEvent(QCloseEvent *event)
|
||||
{
|
||||
bool saveAll = false;
|
||||
QList< QMdiSubWindow * > subs = m_mdiArea->subWindowList();
|
||||
foreach( QMdiSubWindow *sub, subs ) {
|
||||
QCDView *cdview = dynamic_cast< QCDView * >( sub->widget() );
|
||||
if( !cdview )
|
||||
continue;
|
||||
|
||||
QCDScene *scene = cdview->scene();
|
||||
if( !scene || scene->isSaved() )
|
||||
continue;
|
||||
|
||||
bool save = saveAll;
|
||||
if( !save ) {
|
||||
QMessageBox::StandardButton button =
|
||||
QMessageBox::question( this,
|
||||
tr( "Confirmation" ),
|
||||
scene->name() + tr( " is unsaved, do you want to save?" ),
|
||||
QMessageBox::Save | QMessageBox::SaveAll | QMessageBox::Discard | QMessageBox::Cancel );
|
||||
if( button == QMessageBox::Cancel ) {
|
||||
event->ignore();
|
||||
return;
|
||||
}
|
||||
if( button == QMessageBox::SaveAll ) {
|
||||
saveAll = true;
|
||||
save = true;
|
||||
}
|
||||
if( button == QMessageBox::Save )
|
||||
save = true;
|
||||
}
|
||||
if( save )
|
||||
if( !saveScene( scene ) ) {
|
||||
event->ignore();
|
||||
return;
|
||||
}
|
||||
}
|
||||
event->accept();
|
||||
}
|
||||
|
||||
void MainWindow::onMenuNewLabel( int mode )
|
||||
void MainWindow::onMenuNew()
|
||||
{
|
||||
QCDView *newView = new QCDView;
|
||||
QCDScene *scene = new QCDScene( newView );
|
||||
scene->setLabelMode( LabelMode( mode ) );
|
||||
newView->setScene( scene );
|
||||
scene->setName();
|
||||
|
||||
newView->setScene( new QCDScene( newView ) );
|
||||
//newView->setWindowTitle( "Baba" );
|
||||
QMdiSubWindow *subWindow = m_mdiArea->addSubWindow( newView );
|
||||
subWindow->show();
|
||||
}
|
||||
@@ -260,7 +161,6 @@ void MainWindow::onMenuInsert( int id )
|
||||
item->setFlag( QGraphicsItem::ItemIsMovable, true );
|
||||
item->setFlag( QGraphicsItem::ItemIsSelectable, true );
|
||||
cdscene->addItem( item );
|
||||
cdscene->setChanged();
|
||||
}
|
||||
|
||||
void MainWindow::onMenuOpen()
|
||||
@@ -273,38 +173,33 @@ void MainWindow::onMenuOpen()
|
||||
if( fileName.isNull() )
|
||||
return;
|
||||
|
||||
QFile file( fileName );
|
||||
if( !file.open( QIODevice::ReadOnly | QIODevice::Text ) ) {
|
||||
QMessageBox::critical( this, tr( "Error" ), tr( "Cannot open file for reading\n" ) + fileName );
|
||||
return;
|
||||
}
|
||||
|
||||
QCDView *newView = new QCDView;
|
||||
QCDScene *scene = new QCDScene( newView );
|
||||
newView->setScene( scene );
|
||||
|
||||
if( !scene->load( fileName ) ) {
|
||||
|
||||
QXmlStreamReader reader( &file );
|
||||
try {
|
||||
scene->read( reader );
|
||||
}
|
||||
catch( const QString &err ) {
|
||||
QMessageBox::critical( this, tr( "Error" ), tr( "Cannot read file " ) + fileName + "\n" + err );
|
||||
delete newView;
|
||||
return;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
//newView->setWindowTitle( "Baba" );
|
||||
QMdiSubWindow *subWindow = m_mdiArea->addSubWindow( newView );
|
||||
subWindow->show();
|
||||
}
|
||||
|
||||
void MainWindow::onMenuSave()
|
||||
{
|
||||
QCDScene *scene = getScene( m_mdiArea );
|
||||
if( scene )
|
||||
saveScene( scene );
|
||||
}
|
||||
|
||||
void MainWindow::onMenuSaveAs()
|
||||
{
|
||||
QCDScene *scene = getScene( m_mdiArea );
|
||||
if( scene )
|
||||
saveSceneAs( scene );
|
||||
}
|
||||
|
||||
void MainWindow::onMenuProperties()
|
||||
{
|
||||
QCDScene *scene = getScene( m_mdiArea );
|
||||
if( scene )
|
||||
QDialogCDProperties::exec( this, scene );
|
||||
}
|
||||
|
||||
void MainWindow::onMenuPrintPreview()
|
||||
@@ -313,23 +208,21 @@ void MainWindow::onMenuPrintPreview()
|
||||
if( !cdscene )
|
||||
return;
|
||||
|
||||
PrintParameters params;
|
||||
params.m_labelMode = cdscene->labelMode();
|
||||
QLightScribe::PrintParameters params;
|
||||
QLightDrive *drive = QDialogPrint::exec( this, params );
|
||||
if( !drive )
|
||||
return;
|
||||
|
||||
try {
|
||||
QPixmap pixmap = drive->preview( params, cdscene, QSize( 400, 400 ) );
|
||||
QPixmap pixmap = QLightScribe::instance()->preview( drive, params, cdscene, QSize( 400, 400 ) );
|
||||
|
||||
QLabel *label = new QLabel;
|
||||
label->setPixmap( pixmap );
|
||||
QMdiSubWindow *subWindow = m_mdiArea->addSubWindow( label );
|
||||
subWindow->setWindowTitle( "Preview: " + cdscene->name() );
|
||||
subWindow->show();
|
||||
}
|
||||
catch( const QString &err ) {
|
||||
QMessageBox::critical( this, tr( "Error on print preview" ), err );
|
||||
QMessageBox::critical( this, tr( "Error" ), err );
|
||||
}
|
||||
}
|
||||
|
||||
@@ -337,22 +230,45 @@ void MainWindow::onMenuPrint()
|
||||
{
|
||||
QCDScene *cdscene = getScene( m_mdiArea );
|
||||
if( !cdscene )
|
||||
|
||||
return;
|
||||
try {
|
||||
QDialogProgress::exec( this, cdscene );
|
||||
}
|
||||
catch( const QString &err ) {
|
||||
QMessageBox::critical( this, tr( "Error on print" ), err );
|
||||
}
|
||||
|
||||
QDialogProgress::exec( this, cdscene );
|
||||
}
|
||||
|
||||
void MainWindow::onMenuSaveAs()
|
||||
{
|
||||
QCDScene *cdscene = getScene( m_mdiArea );
|
||||
if( !cdscene )
|
||||
return;
|
||||
|
||||
QString fileName =
|
||||
QFileDialog::getSaveFileName( this,
|
||||
tr( "Save as:" ),
|
||||
QString(),
|
||||
tr("qlscribe document (*.qlx)") );
|
||||
if( fileName.isNull() )
|
||||
return;
|
||||
|
||||
if( !fileName.contains( '.' ) )
|
||||
fileName += ".qlx";
|
||||
|
||||
QFile file( fileName );
|
||||
if( !file.open( QIODevice::WriteOnly | QIODevice::Truncate | QIODevice::Text ) ) {
|
||||
QMessageBox::warning( this, tr( "Warning" ), tr( "Cannot open file for writing: " ) + fileName );
|
||||
return;
|
||||
}
|
||||
QXmlStreamWriter writer( &file );
|
||||
writer.setAutoFormatting( true );
|
||||
cdscene->write( writer );
|
||||
}
|
||||
|
||||
|
||||
void MainWindow::onMenuAbout()
|
||||
{
|
||||
QMessageBox::about( this,
|
||||
tr( "About" ),
|
||||
tr( "<h3>qlscribe - Qt lisghtScribe</h3>"
|
||||
"<p>release 0.8 $Revision$</p>"
|
||||
"<p>release 0.2 $Revision$</p>"
|
||||
"<p>visit project at home page "
|
||||
"<a href=\"http://qlscribe.sourceforge.net/\">qlscribe.sourceforge.net</a></p>" ) );
|
||||
}
|
||||
|
||||
+2
-13
@@ -25,27 +25,19 @@
|
||||
|
||||
class QMdiArea;
|
||||
class QSignalMapper;
|
||||
class QCDScene;
|
||||
|
||||
class MainWindow : public QMainWindow {
|
||||
Q_OBJECT
|
||||
Q_DISABLE_COPY(MainWindow)
|
||||
public:
|
||||
explicit MainWindow( bool enablePrint );
|
||||
explicit MainWindow(QWidget *parent = 0);
|
||||
virtual ~MainWindow();
|
||||
|
||||
bool saveScene( QCDScene *scene );
|
||||
void open( const QStringList &files );
|
||||
|
||||
protected:
|
||||
virtual void closeEvent( QCloseEvent *event );
|
||||
|
||||
private slots:
|
||||
void onMenuNewLabel( int mode );
|
||||
void onMenuNew();
|
||||
void onMenuOpen();
|
||||
void onMenuSave();
|
||||
void onMenuSaveAs();
|
||||
void onMenuProperties();
|
||||
void onMenuPrintPreview();
|
||||
void onMenuPrint();
|
||||
void onMenuInsert( int id );
|
||||
@@ -53,8 +45,6 @@ private slots:
|
||||
void onMenuQtAbout();
|
||||
|
||||
private:
|
||||
bool saveSceneAs( QCDScene *scene );
|
||||
|
||||
QMdiArea *m_mdiArea;
|
||||
|
||||
QMenu *m_menuFile;
|
||||
@@ -62,7 +52,6 @@ private:
|
||||
QMenu *m_menuHelp;
|
||||
|
||||
QSignalMapper *m_insertMapper;
|
||||
QSignalMapper *m_newLabelMapper;
|
||||
};
|
||||
|
||||
#endif // MAINWINDOW_H
|
||||
|
||||
+6
-188
@@ -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:$ */
|
||||
|
||||
#include "qcdscene.h"
|
||||
#include "qshapefactory.h"
|
||||
@@ -25,19 +25,10 @@
|
||||
#include <QMessageBox>
|
||||
#include <QGraphicsItem>
|
||||
#include <QGraphicsSceneMouseEvent>
|
||||
#include <QFile>
|
||||
#include <QXmlStreamReader>
|
||||
#include <QXmlStreamWriter>
|
||||
#include <QMessageBox>
|
||||
#include <QGraphicsView>
|
||||
#include <QRegExp>
|
||||
|
||||
QCDScene::QCDScene( QObject * parent )
|
||||
: QGraphicsScene( parent ),
|
||||
m_index( 0 ),
|
||||
m_saved( true ),
|
||||
m_labelMode( modeFull ),
|
||||
m_cdColor( Qt::white )
|
||||
: QGraphicsScene( parent )
|
||||
{
|
||||
setSceneRect( -60.0, -60.0, 60.0 * 2, 60.0 * 2 );
|
||||
}
|
||||
@@ -48,147 +39,20 @@ QCDScene::~QCDScene()
|
||||
{
|
||||
}
|
||||
|
||||
void QCDScene::replace( const QString2String &strings )
|
||||
{
|
||||
QShapeFactory &sfactory = QShapeFactory::instance();
|
||||
QList<QGraphicsItem *> list = items();
|
||||
|
||||
for( QString2String::const_iterator st = strings.begin(); st != strings.end(); ++st ) {
|
||||
foreach(QGraphicsItem *item, list ) {
|
||||
QShapeFactory::iterator f = sfactory.find( item->type() );
|
||||
if( f != sfactory.end() )
|
||||
f->second->replace( item, st.key(), st.value() );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
bool QCDScene::load( const QString &fileName, QString *errMessage )
|
||||
{
|
||||
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();
|
||||
return true;
|
||||
}
|
||||
|
||||
bool QCDScene::save()
|
||||
{
|
||||
QFile file( m_fileName );
|
||||
if( !file.open( QIODevice::WriteOnly | QIODevice::Truncate | QIODevice::Text ) ) {
|
||||
QMessageBox::warning( 0, tr( "Warning" ), tr( "Cannot open file for writing: " ) + m_fileName );
|
||||
return false;
|
||||
}
|
||||
QXmlStreamWriter writer( &file );
|
||||
writer.setAutoFormatting( true );
|
||||
write( writer );
|
||||
m_saved = true;
|
||||
setName();
|
||||
return true;
|
||||
}
|
||||
|
||||
void QCDScene::setLabelMode( LabelMode mode )
|
||||
{
|
||||
m_labelMode = mode;
|
||||
update();
|
||||
setChanged();
|
||||
}
|
||||
|
||||
void QCDScene::setCDColor( const QColor &color )
|
||||
{
|
||||
m_cdColor = color;
|
||||
update();
|
||||
setChanged();
|
||||
}
|
||||
|
||||
void QCDScene::setName()
|
||||
{
|
||||
if( m_fileName.isEmpty() ) {
|
||||
if( !m_index ) {
|
||||
static int index = 1;
|
||||
m_index = index++;
|
||||
}
|
||||
m_name = "Unnamed_" + QString::number( m_index );
|
||||
} else {
|
||||
QRegExp rx( "(.*/)?(.*)\\.qlx" );
|
||||
rx.indexIn( m_fileName );
|
||||
m_name = rx.cap( 2 );
|
||||
}
|
||||
|
||||
updateTitles();
|
||||
}
|
||||
|
||||
void QCDScene::setChanged()
|
||||
{
|
||||
m_saved = false;
|
||||
updateTitles();
|
||||
}
|
||||
|
||||
void QCDScene::updateTitles() const
|
||||
{
|
||||
QString name = tr( "Label: ", "Window title \"Label\"" ) + m_name;
|
||||
if( !m_saved )
|
||||
name += " *";
|
||||
|
||||
QList<QGraphicsView *> allViews = views();
|
||||
foreach( QGraphicsView *view, allViews ) {
|
||||
view->setWindowTitle( name );
|
||||
}
|
||||
}
|
||||
|
||||
void QCDScene::redrawViews() const
|
||||
{
|
||||
}
|
||||
|
||||
bool QCDScene::saveAs( const QString &fileName )
|
||||
{
|
||||
QFile file( fileName );
|
||||
if( !file.open( QIODevice::WriteOnly | QIODevice::Truncate | QIODevice::Text ) ) {
|
||||
QMessageBox::warning( 0, tr( "Warning" ), tr( "Cannot open file for writing: " ) + fileName );
|
||||
return false;
|
||||
}
|
||||
QXmlStreamWriter writer( &file );
|
||||
writer.setAutoFormatting( true );
|
||||
write( writer );
|
||||
m_saved = true;
|
||||
m_fileName = fileName;
|
||||
setName();
|
||||
return true;
|
||||
}
|
||||
|
||||
void QCDScene::write( QXmlStreamWriter &writer )
|
||||
{
|
||||
writer.writeStartDocument();
|
||||
writer.writeStartElement( "scene" );
|
||||
writer.writeAttribute( QXmlStreamAttribute( "mode", QString::number( m_labelMode ) ) );
|
||||
writer.writeAttribute( QXmlStreamAttribute( "color", m_cdColor.name() ) );
|
||||
|
||||
QShapeFactory &sfactory = QShapeFactory::instance();
|
||||
QList<QGraphicsItem *> list = items();
|
||||
foreach(QGraphicsItem *item, list ) {
|
||||
QShapeFactory::iterator f = sfactory.find( item->type() );
|
||||
for( QList<QGraphicsItem *>::const_iterator it = list.begin(); it != list.end(); ++it ) {
|
||||
QShapeFactory::iterator f = sfactory.find( (*it)->type() );
|
||||
if( f == sfactory.end() ) {
|
||||
QMessageBox::warning( 0, tr( "Warning" ), tr( "Cannot find controller for type %n", 0, item->type() ) );
|
||||
QMessageBox::warning( 0, tr( "Warning" ), tr( "Cannot find controller for type %n", 0, (*it)->type() ) );
|
||||
continue;
|
||||
}
|
||||
f->second->write( writer, item );
|
||||
f->second->write( writer, *it );
|
||||
}
|
||||
|
||||
writer.writeEndElement();
|
||||
@@ -212,9 +76,6 @@ void QCDScene::read( QXmlStreamReader &reader )
|
||||
throw QString( "QCDScene: missing expected root element \"scene\", got \"" )
|
||||
+ elementName + "\" intead";
|
||||
|
||||
m_labelMode = LabelMode( reader.attributes().value( "mode" ).toString().toInt() );
|
||||
QString colorStr = reader.attributes().value( "color" ).toString();
|
||||
m_cdColor = colorStr.isEmpty() ? Qt::white : QColor( colorStr );
|
||||
gotScene = true;
|
||||
continue;
|
||||
}
|
||||
@@ -249,9 +110,6 @@ void QCDScene::contextMenuEvent( QGraphicsSceneContextMenuEvent *mouseEvent )
|
||||
item->setSelected( true );
|
||||
QMenu menu;
|
||||
menu.addAction( tr( "edit..." ), this, SLOT( onMenuEdit() ) );
|
||||
menu.addAction( tr( "bring to Front" ), this, SLOT( onMenuToFront() ) );
|
||||
menu.addAction( tr( "send to Back" ), this, SLOT( onMenuToBack() ) );
|
||||
menu.addAction( tr( "delete" ), this, SLOT( onMenuDelete() ) );
|
||||
menu.exec( mouseEvent->screenPos() );
|
||||
}
|
||||
|
||||
@@ -263,43 +121,3 @@ void QCDScene::onMenuEdit()
|
||||
QGraphicsItem *item = list.front();
|
||||
QShapeFactory::instance().edit( item, 0 );
|
||||
}
|
||||
|
||||
void QCDScene::onMenuToFront()
|
||||
{
|
||||
sendItemTo( true );
|
||||
}
|
||||
|
||||
void QCDScene::onMenuToBack()
|
||||
{
|
||||
sendItemTo( false );
|
||||
}
|
||||
|
||||
void QCDScene::onMenuDelete()
|
||||
{
|
||||
QList<QGraphicsItem *> list = selectedItems();
|
||||
if( list.empty() )
|
||||
return;
|
||||
QGraphicsItem *item = list.front();
|
||||
removeItem( item );
|
||||
delete item;
|
||||
setChanged();
|
||||
}
|
||||
|
||||
void QCDScene::sendItemTo( bool front )
|
||||
{
|
||||
if ( selectedItems().isEmpty())
|
||||
return;
|
||||
|
||||
QGraphicsItem *selectedItem = selectedItems().first();
|
||||
QList<QGraphicsItem *> overlapItems = selectedItem->collidingItems();
|
||||
|
||||
qreal zValue = 0;
|
||||
foreach( QGraphicsItem *item, overlapItems ) {
|
||||
if( front && item->zValue() >= zValue )
|
||||
zValue = item->zValue() + 0.1;
|
||||
|
||||
if( !front && item->zValue() <= zValue )
|
||||
zValue = item->zValue() - 0.1;
|
||||
}
|
||||
selectedItem->setZValue( zValue );
|
||||
}
|
||||
|
||||
+3
-40
@@ -16,13 +16,11 @@
|
||||
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 QCDSCENE_H
|
||||
#define QCDSCENE_H
|
||||
|
||||
#include "qlscribe.h"
|
||||
|
||||
#include <QGraphicsScene>
|
||||
|
||||
class QXmlStreamWriter;
|
||||
@@ -31,52 +29,17 @@ class QXmlStreamReader;
|
||||
class QCDScene : public QGraphicsScene {
|
||||
Q_OBJECT
|
||||
public:
|
||||
typedef QMap<QString,QString> QString2String;
|
||||
|
||||
QCDScene( QObject * parent = 0 );
|
||||
virtual ~QCDScene();
|
||||
|
||||
LabelMode labelMode() const { return m_labelMode; }
|
||||
void setLabelMode( LabelMode mode );
|
||||
|
||||
QColor cdColor() const { return m_cdColor; }
|
||||
void setCDColor( const QColor &color );
|
||||
|
||||
bool isSaved() const { return m_saved; }
|
||||
bool isUnnamed() const { return m_fileName.isEmpty(); }
|
||||
|
||||
void setChanged();
|
||||
void setName();
|
||||
bool load( const QString &fileName, QString *errMessage = 0 );
|
||||
void replace( const QString2String &strings );
|
||||
bool save();
|
||||
bool saveAs( const QString &fileName );
|
||||
|
||||
void updateTitles() const;
|
||||
void redrawViews() const;
|
||||
QString name() const { return m_name; }
|
||||
void write( QXmlStreamWriter &writer );
|
||||
void read( QXmlStreamReader &reader );
|
||||
|
||||
protected:
|
||||
virtual void contextMenuEvent( QGraphicsSceneContextMenuEvent *contextMenuEvent );
|
||||
|
||||
private slots:
|
||||
void onMenuEdit();
|
||||
void onMenuToFront();
|
||||
void onMenuToBack();
|
||||
void onMenuDelete();
|
||||
|
||||
private:
|
||||
void write( QXmlStreamWriter &writer );
|
||||
void read( QXmlStreamReader &reader );
|
||||
void sendItemTo( bool front );
|
||||
|
||||
private:
|
||||
QString m_name;
|
||||
QString m_fileName;
|
||||
int m_index;
|
||||
bool m_saved;
|
||||
LabelMode m_labelMode;
|
||||
QColor m_cdColor;
|
||||
};
|
||||
|
||||
#endif //QCDSCENE_H
|
||||
|
||||
+8
-80
@@ -16,19 +16,14 @@
|
||||
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:$ */
|
||||
|
||||
#include "qcdview.h"
|
||||
#include "qcdscene.h"
|
||||
#include "mainwindow.h"
|
||||
|
||||
#include <QCloseEvent>
|
||||
#include <QMessageBox>
|
||||
|
||||
QCDView::QCDView( QWidget *parent )
|
||||
: QGraphicsView( parent ),
|
||||
m_mask( new QPixmap ),
|
||||
m_labelMode( -1 )
|
||||
m_mask( new QPixmap )
|
||||
{
|
||||
setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
|
||||
setVerticalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
|
||||
@@ -54,37 +49,10 @@ QCDScene *QCDView::scene() const
|
||||
return static_cast< QCDScene * >( QGraphicsView::scene() );
|
||||
}
|
||||
|
||||
void QCDView::closeEvent( QCloseEvent *event )
|
||||
{
|
||||
QCDScene *cdscene = scene();
|
||||
if( cdscene && !cdscene->isSaved() ) {
|
||||
QMessageBox::StandardButton button =
|
||||
QMessageBox::question( this,
|
||||
tr( "Confitmation" ),
|
||||
cdscene->name() + tr( " is changed, do you want to save it?" ),
|
||||
QMessageBox::Yes | QMessageBox::No | QMessageBox::Cancel );
|
||||
|
||||
if( button == QMessageBox::Cancel ) {
|
||||
event->ignore();
|
||||
return;
|
||||
}
|
||||
if( button == QMessageBox::Yes ) {
|
||||
QWidget *parent = parentWidget();
|
||||
for( ; parent->parentWidget(); parent = parent->parentWidget() );
|
||||
if( !static_cast< MainWindow * >( parent )->saveScene( cdscene ) ) {
|
||||
event->ignore();
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
event->accept();
|
||||
}
|
||||
|
||||
inline
|
||||
void drawCircle( QPainter *painter, double radi )
|
||||
{
|
||||
painter->drawEllipse( QRectF( -radi, -radi, radi * 2, radi * 2 ) );
|
||||
painter->drawEllipse( -radi, -radi, radi * 2, radi * 2 );
|
||||
}
|
||||
|
||||
void QCDView::drawCD( QPainter *painter, const QRectF & rect, bool alpha )
|
||||
@@ -92,47 +60,11 @@ void QCDView::drawCD( QPainter *painter, const QRectF & rect, bool alpha )
|
||||
painter->setBrush( alpha ? Qt::lightGray : Qt::gray );
|
||||
painter->drawRect( rect );
|
||||
|
||||
const double fullInner = 24.7, fullOuter = 60.0;
|
||||
painter->setBrush( alpha ? Qt::black : Qt::white );
|
||||
drawCircle( painter, 59.0 );
|
||||
|
||||
QCDScene *cdscene = scene();
|
||||
if( cdscene ) {
|
||||
double inner = 0, outer = 0;
|
||||
switch( cdscene->labelMode() ) {
|
||||
case modeFull : inner = 24.7; outer = 60.0; break;
|
||||
case modeTitle : inner = 32.0; outer = 37.4; break;
|
||||
case modeContent : inner = 25.8; outer = 37.4; break;
|
||||
}
|
||||
if( alpha ) {
|
||||
painter->setBrush( Qt::black );
|
||||
drawCircle( painter, outer );
|
||||
|
||||
painter->setBrush( Qt::lightGray );
|
||||
drawCircle( painter, inner );
|
||||
} else {
|
||||
QColor darker( cdscene->cdColor().darker( 150 ) );
|
||||
if( outer < fullOuter ) {
|
||||
painter->setBrush( darker );
|
||||
drawCircle( painter, fullOuter );
|
||||
}
|
||||
|
||||
painter->setBrush( cdscene->cdColor() );
|
||||
drawCircle( painter, outer );
|
||||
|
||||
if( inner > fullInner ) {
|
||||
painter->setBrush( darker );
|
||||
drawCircle( painter, inner );
|
||||
}
|
||||
|
||||
painter->setBrush( Qt::darkGray );
|
||||
drawCircle( painter, fullInner );
|
||||
}
|
||||
} else {
|
||||
painter->setBrush( alpha ? Qt::black : Qt::white );
|
||||
drawCircle( painter, fullOuter );
|
||||
|
||||
painter->setBrush( alpha ? Qt::lightGray : Qt::darkGray );
|
||||
drawCircle( painter, fullInner );
|
||||
}
|
||||
painter->setBrush( alpha ? Qt::lightGray : Qt::darkGray );
|
||||
drawCircle( painter, 21.7 );
|
||||
|
||||
painter->setBrush( alpha ? Qt::white : Qt::gray );
|
||||
drawCircle( painter, 10.7 );
|
||||
@@ -141,11 +73,7 @@ void QCDView::drawCD( QPainter *painter, const QRectF & rect, bool alpha )
|
||||
void QCDView::drawForeground ( QPainter * painter, const QRectF & rect )
|
||||
{
|
||||
if( !painter ) return;
|
||||
QCDScene *cdscene = scene();
|
||||
if( m_mask->size() != frameSize() || ( cdscene && m_labelMode != cdscene->labelMode() ) ) {
|
||||
if( cdscene )
|
||||
m_labelMode = cdscene->labelMode();
|
||||
|
||||
if( m_mask->size() != frameSize() ) {
|
||||
*m_mask = QPixmap( frameSize() );
|
||||
|
||||
{
|
||||
|
||||
+1
-3
@@ -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 QCDVIEW_H
|
||||
#define QCDVIEW_H
|
||||
@@ -39,7 +39,6 @@ public:
|
||||
virtual QSize sizeHint () const;
|
||||
|
||||
protected:
|
||||
virtual void closeEvent( QCloseEvent *event );
|
||||
|
||||
void drawForeground ( QPainter * painter, const QRectF & rect );
|
||||
void drawBackground ( QPainter * painter, const QRectF & rect );
|
||||
@@ -49,7 +48,6 @@ private:
|
||||
void drawCD( QPainter * painter, const QRectF & rect, bool alpha );
|
||||
|
||||
QPixmap *m_mask;
|
||||
int m_labelMode;
|
||||
};
|
||||
|
||||
#endif // QCDVIEW_H
|
||||
|
||||
@@ -1,48 +0,0 @@
|
||||
#include "qconsoleprintprogress.h"
|
||||
#include "qlightscribe.h"
|
||||
|
||||
#include <QApplication>
|
||||
|
||||
#include <iostream>
|
||||
|
||||
std::ostream &operator<<( std::ostream &os, const QString &str );
|
||||
|
||||
QConsolePrintProgress::QConsolePrintProgress( QLightDrive *drive )
|
||||
: m_drive( drive )
|
||||
{
|
||||
connect( drive, SIGNAL(prepareProgress(int,int)), this, SLOT(onPrepareProgress(int,int)) );
|
||||
connect( drive, SIGNAL(labelProgress(int,int)), this, SLOT(onLabelProgress(int,int)) );
|
||||
connect( drive, SIGNAL(timeEstimate(int)), this, SLOT(onTimeEstimate(int)) );
|
||||
connect( drive, SIGNAL(finished(int)), this, SLOT(onFinished(int)) );
|
||||
|
||||
}
|
||||
|
||||
QConsolePrintProgress::~QConsolePrintProgress()
|
||||
{
|
||||
}
|
||||
|
||||
void QConsolePrintProgress::onPrepareProgress( int current, int final )
|
||||
{
|
||||
std::cout << "Preparing label: " << current << '/' << final << " \r";
|
||||
}
|
||||
|
||||
void QConsolePrintProgress::onLabelProgress( int current, int final )
|
||||
{
|
||||
std::cout << "Printing label: " << current << '/' << final << " \r";
|
||||
}
|
||||
|
||||
void QConsolePrintProgress::onTimeEstimate( int time )
|
||||
{
|
||||
std::cout << std::endl;
|
||||
}
|
||||
|
||||
void QConsolePrintProgress::onFinished( int status )
|
||||
{
|
||||
std::cout << "\n";
|
||||
if( !status )
|
||||
std::cout << "Print successfull" << std::endl;
|
||||
else
|
||||
std::cout << "Print failed: 0x" << QString::number( status, 16 ) << std::endl;
|
||||
|
||||
qApp->exit( status );
|
||||
}
|
||||
@@ -1,24 +0,0 @@
|
||||
#ifndef QCONSOLEPRINTPROGRESS_H
|
||||
#define QCONSOLEPRINTPROGRESS_H
|
||||
|
||||
#include <QObject>
|
||||
|
||||
class QLightDrive;
|
||||
|
||||
class QConsolePrintProgress : public QObject {
|
||||
Q_OBJECT
|
||||
public:
|
||||
QConsolePrintProgress( QLightDrive *drive );
|
||||
~QConsolePrintProgress();
|
||||
|
||||
private slots:
|
||||
void onPrepareProgress( int current, int final );
|
||||
void onLabelProgress( int current, int final );
|
||||
void onTimeEstimate( int time );
|
||||
void onFinished(int status );
|
||||
|
||||
private:
|
||||
QLightDrive *m_drive;
|
||||
};
|
||||
|
||||
#endif // QCONSOLEPRINTPROGRESS_H
|
||||
@@ -1,100 +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 "qdialogcdproperties.h"
|
||||
#include "ui_qdialogcdproperties.h"
|
||||
|
||||
#include "qcdscene.h"
|
||||
|
||||
#include <QColorDialog>
|
||||
|
||||
QDialogCDProperties::QDialogCDProperties(QWidget *parent) :
|
||||
QDialog(parent),
|
||||
m_ui(new Ui::QDialogCDProperties)
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
connect( m_ui->btnColor, SIGNAL(clicked()), this, SLOT(onColor()) );
|
||||
connect( m_ui->radioModeFull, SIGNAL(toggled(bool)), this, SLOT(onChangeMode()) );
|
||||
connect( m_ui->radioModeContent, SIGNAL(toggled(bool)), this, SLOT(onChangeMode()) );
|
||||
connect( m_ui->radioModeTitle, SIGNAL(toggled(bool)), this, SLOT(onChangeMode()) );
|
||||
}
|
||||
|
||||
bool QDialogCDProperties::exec( QWidget *parent, QCDScene *scene )
|
||||
{
|
||||
QCDScene lscene;
|
||||
lscene.setLabelMode( scene->labelMode() );
|
||||
lscene.setCDColor( scene->cdColor() );
|
||||
|
||||
QDialogCDProperties dialog( parent );
|
||||
dialog.setWindowTitle( tr( "Label properties: ", "Dialog title \"Label properties: \"" )
|
||||
+ scene->name() );
|
||||
dialog.m_ui->cdView->setScene( &lscene );
|
||||
switch( scene->labelMode() ) {
|
||||
case modeFull : dialog.m_ui->radioModeFull->setChecked( true ); break;
|
||||
case modeTitle : dialog.m_ui->radioModeTitle->setChecked( true ); break;
|
||||
case modeContent : dialog.m_ui->radioModeContent->setChecked( true ); break;
|
||||
}
|
||||
|
||||
if( dialog.QDialog::exec() == Rejected ) return false;
|
||||
|
||||
scene->setLabelMode( lscene.labelMode() );
|
||||
scene->setCDColor( lscene.cdColor() );
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
QDialogCDProperties::~QDialogCDProperties()
|
||||
{
|
||||
delete m_ui;
|
||||
}
|
||||
|
||||
void QDialogCDProperties::changeEvent(QEvent *e)
|
||||
{
|
||||
switch (e->type()) {
|
||||
case QEvent::LanguageChange:
|
||||
m_ui->retranslateUi(this);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
void QDialogCDProperties::onChangeMode()
|
||||
{
|
||||
QCDScene *scene = m_ui->cdView->scene();
|
||||
if( m_ui->radioModeFull->isChecked() )
|
||||
scene->setLabelMode( modeFull );
|
||||
|
||||
if( m_ui->radioModeTitle->isChecked() )
|
||||
scene->setLabelMode( modeTitle );
|
||||
|
||||
if( m_ui->radioModeContent->isChecked() )
|
||||
scene->setLabelMode( modeContent );
|
||||
}
|
||||
|
||||
void QDialogCDProperties::onColor()
|
||||
{
|
||||
QCDScene *scene = m_ui->cdView->scene();
|
||||
QColor color = QColorDialog::getColor( scene->cdColor(), this );
|
||||
if( color.isValid() ){
|
||||
scene->setCDColor( color );
|
||||
}
|
||||
}
|
||||
@@ -1,53 +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 QDIALOGCDPROPERTIES_H
|
||||
#define QDIALOGCDPROPERTIES_H
|
||||
|
||||
#include <QtGui/QDialog>
|
||||
|
||||
namespace Ui {
|
||||
class QDialogCDProperties;
|
||||
}
|
||||
|
||||
class QCDScene;
|
||||
|
||||
class QDialogCDProperties : public QDialog {
|
||||
Q_OBJECT
|
||||
Q_DISABLE_COPY(QDialogCDProperties)
|
||||
public:
|
||||
static bool exec( QWidget *parent, QCDScene *scene );
|
||||
|
||||
protected:
|
||||
virtual void changeEvent(QEvent *e);
|
||||
|
||||
private slots:
|
||||
void onChangeMode();
|
||||
void onColor();
|
||||
|
||||
private:
|
||||
explicit QDialogCDProperties(QWidget *parent = 0);
|
||||
virtual ~QDialogCDProperties();
|
||||
|
||||
Ui::QDialogCDProperties *m_ui;
|
||||
};
|
||||
|
||||
#endif // QDIALOGCDPROPERTIES_H
|
||||
@@ -1,191 +0,0 @@
|
||||
<ui version="4.0" >
|
||||
<class>QDialogCDProperties</class>
|
||||
<widget class="QDialog" name="QDialogCDProperties" >
|
||||
<property name="windowModality" >
|
||||
<enum>Qt::NonModal</enum>
|
||||
</property>
|
||||
<property name="geometry" >
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>398</width>
|
||||
<height>532</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle" >
|
||||
<string>Label properties</string>
|
||||
</property>
|
||||
<property name="modal" >
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_3" >
|
||||
<item>
|
||||
<layout class="QVBoxLayout" name="verticalLayout" >
|
||||
<item>
|
||||
<widget class="QFrame" name="frame" >
|
||||
<property name="frameShape" >
|
||||
<enum>QFrame::StyledPanel</enum>
|
||||
</property>
|
||||
<property name="frameShadow" >
|
||||
<enum>QFrame::Raised</enum>
|
||||
</property>
|
||||
<property name="lineWidth" >
|
||||
<number>3</number>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_4" >
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout" >
|
||||
<item>
|
||||
<layout class="QFormLayout" name="formLayout" >
|
||||
<item row="0" column="0" >
|
||||
<widget class="QLabel" name="label" >
|
||||
<property name="text" >
|
||||
<string>Label mode:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="1" >
|
||||
<widget class="QFrame" name="frame_2" >
|
||||
<property name="frameShape" >
|
||||
<enum>QFrame::StyledPanel</enum>
|
||||
</property>
|
||||
<property name="frameShadow" >
|
||||
<enum>QFrame::Raised</enum>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_3" >
|
||||
<item>
|
||||
<widget class="QRadioButton" name="radioModeFull" >
|
||||
<property name="text" >
|
||||
<string>Full</string>
|
||||
</property>
|
||||
<property name="checked" >
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QRadioButton" name="radioModeTitle" >
|
||||
<property name="text" >
|
||||
<string>Title</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QRadioButton" name="radioModeContent" >
|
||||
<property name="text" >
|
||||
<string>Content</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="btnColor" >
|
||||
<property name="text" >
|
||||
<string>Change color...</string>
|
||||
</property>
|
||||
<property name="autoDefault" >
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<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>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QCDView" name="cdView" >
|
||||
<property name="sizePolicy" >
|
||||
<sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>2</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="baseSize" >
|
||||
<size>
|
||||
<width>0</width>
|
||||
<height>0</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="interactive" >
|
||||
<bool>false</bool>
|
||||
</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>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<customwidgets>
|
||||
<customwidget>
|
||||
<class>QCDView</class>
|
||||
<extends>QGraphicsView</extends>
|
||||
<header>qcdview.h</header>
|
||||
</customwidget>
|
||||
</customwidgets>
|
||||
<tabstops>
|
||||
<tabstop>buttonBox</tabstop>
|
||||
</tabstops>
|
||||
<resources/>
|
||||
<connections>
|
||||
<connection>
|
||||
<sender>buttonBox</sender>
|
||||
<signal>accepted()</signal>
|
||||
<receiver>QDialogCDProperties</receiver>
|
||||
<slot>accept()</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel" >
|
||||
<x>258</x>
|
||||
<y>582</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel" >
|
||||
<x>157</x>
|
||||
<y>274</y>
|
||||
</hint>
|
||||
</hints>
|
||||
</connection>
|
||||
<connection>
|
||||
<sender>buttonBox</sender>
|
||||
<signal>rejected()</signal>
|
||||
<receiver>QDialogCDProperties</receiver>
|
||||
<slot>reject()</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel" >
|
||||
<x>326</x>
|
||||
<y>582</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel" >
|
||||
<x>286</x>
|
||||
<y>274</y>
|
||||
</hint>
|
||||
</hints>
|
||||
</connection>
|
||||
</connections>
|
||||
</ui>
|
||||
@@ -79,7 +79,6 @@ bool QDialogPixmap::exec( QGraphicsItem *graphicsItem )
|
||||
m_ui->spinWidth->setValue( scale.x() );
|
||||
m_ui->spinHeight->setValue( scale.y() );
|
||||
m_ui->lockedRatio->setChecked( scale.x() == scale.y() ? Qt::Checked : Qt::Unchecked );
|
||||
m_ui->buttonBox->setStandardButtons( m_ui->buttonBox->standardButtons() | QDialogButtonBox::Ok );
|
||||
}
|
||||
|
||||
connect( m_ui->spinX, SIGNAL(valueChanged(double)),
|
||||
|
||||
@@ -94,7 +94,7 @@
|
||||
<double>1.000000000000000</double>
|
||||
</property>
|
||||
<property name="maximum" >
|
||||
<double>200.000000000000000</double>
|
||||
<double>70.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
@@ -111,7 +111,7 @@
|
||||
<double>1.000000000000000</double>
|
||||
</property>
|
||||
<property name="maximum" >
|
||||
<double>200.000000000000000</double>
|
||||
<double>70.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
|
||||
+7
-16
@@ -46,7 +46,7 @@ void QDialogPrint::changeEvent(QEvent *e)
|
||||
}
|
||||
}
|
||||
|
||||
QLightDrive *QDialogPrint::exec( QWidget *parent, PrintParameters ¶ms )
|
||||
QLightDrive *QDialogPrint::exec( QWidget *parent, QLightScribe::PrintParameters ¶ms )
|
||||
{
|
||||
QList<QLightDrive *> drives = QLightScribe::instance()->getDrives();
|
||||
if( drives.isEmpty() ) {
|
||||
@@ -54,12 +54,6 @@ QLightDrive *QDialogPrint::exec( QWidget *parent, PrintParameters ¶ms )
|
||||
return 0;
|
||||
}
|
||||
QDialogPrint dialog( parent );
|
||||
switch( params.m_labelMode ) {
|
||||
case modeFull : dialog.m_ui->radioModeFull->setChecked( true ); break;
|
||||
case modeContent : dialog.m_ui->radioModeContent->setChecked( true ); break;
|
||||
case modeTitle : dialog.m_ui->radioModeTitle->setChecked( true ); break;
|
||||
}
|
||||
|
||||
int index = 0;
|
||||
foreach( QLightDrive *drv, drives ) {
|
||||
dialog.m_ui->comboDrive->insertItem( index++, drv->displayName() );
|
||||
@@ -67,25 +61,22 @@ QLightDrive *QDialogPrint::exec( QWidget *parent, PrintParameters ¶ms )
|
||||
if( dialog.QDialog::exec() == Rejected )
|
||||
return 0;
|
||||
|
||||
params = PrintParameters(); // reset to default
|
||||
|
||||
if( dialog.m_ui->radioModeFull->isChecked() )
|
||||
params.m_labelMode = modeFull;
|
||||
params = QLightScribe::PrintParameters(); // reset to default
|
||||
|
||||
if( dialog.m_ui->radioModeTitle->isChecked() )
|
||||
params.m_labelMode = modeTitle;
|
||||
params.m_labelMode = QLightScribe::modeTitle;
|
||||
|
||||
if( dialog.m_ui->radioModeContent->isChecked() )
|
||||
params.m_labelMode = modeContent;
|
||||
params.m_labelMode = QLightScribe::modeContent;
|
||||
|
||||
if( dialog.m_ui->radioQualityNormal->isChecked() )
|
||||
params.m_printQuality = qualityNormal;
|
||||
params.m_printQuality = QLightScribe::qualityNormal;
|
||||
|
||||
if( dialog.m_ui->radioQualityDraft->isChecked() )
|
||||
params.m_printQuality = qualityDraft;
|
||||
params.m_printQuality = QLightScribe::qualityDraft;
|
||||
|
||||
if( dialog.m_ui->radioMediaGeneric->isChecked() )
|
||||
params.m_mediaOptimizationLevel = mediaGeneric;
|
||||
params.m_mediaOptimizationLevel = QLightScribe::mediaGeneric;
|
||||
|
||||
return drives.at( dialog.m_ui->comboDrive->currentIndex() );
|
||||
}
|
||||
|
||||
+1
-1
@@ -33,7 +33,7 @@ class QDialogPrint : public QDialog {
|
||||
Q_OBJECT
|
||||
Q_DISABLE_COPY(QDialogPrint)
|
||||
public:
|
||||
static QLightDrive *exec( QWidget *parent, PrintParameters ¶ms );
|
||||
static QLightDrive *exec( QWidget *parent, QLightScribe::PrintParameters ¶ms );
|
||||
|
||||
protected:
|
||||
explicit QDialogPrint(QWidget *parent = 0);
|
||||
|
||||
+16
-19
@@ -22,17 +22,15 @@
|
||||
#include "ui_qdialogprogress.h"
|
||||
#include "qlightscribe.h"
|
||||
#include "qdialogprint.h"
|
||||
#include "qcdscene.h"
|
||||
|
||||
#include <QMessageBox>
|
||||
#include <QAbstractButton>
|
||||
#include <QTime>
|
||||
#include <QTimer>
|
||||
|
||||
QDialogProgress::QDialogProgress( QWidget *parent, QLightDrive *drive )
|
||||
: QDialog(parent),
|
||||
QDialogProgress::QDialogProgress(QWidget *parent) :
|
||||
QDialog(parent),
|
||||
m_ui(new Ui::QDialogProgress),
|
||||
m_drive( drive ),
|
||||
m_start( new QTime ),
|
||||
m_timer( new QTimer( this ) )
|
||||
{
|
||||
@@ -62,22 +60,21 @@ void QDialogProgress::changeEvent(QEvent *e)
|
||||
|
||||
bool QDialogProgress::exec( QWidget *parent, QCDScene *scene )
|
||||
{
|
||||
PrintParameters params;
|
||||
params.m_labelMode = scene->labelMode();
|
||||
QLightScribe::PrintParameters params;
|
||||
QLightDrive *drive = QDialogPrint::exec( parent, params );
|
||||
if( !drive )
|
||||
return false;
|
||||
|
||||
QDialogProgress dialog( parent, drive );
|
||||
dialog.setWindowTitle( tr( "Printing: " ) + scene->name() );
|
||||
QLightScribe *scribe = QLightScribe::instance();
|
||||
QDialogProgress dialog( parent );
|
||||
|
||||
connect( dialog.m_ui->buttonBox, SIGNAL(clicked(QAbstractButton*)), &dialog, SLOT(onButtonClicked(QAbstractButton*)) );
|
||||
connect( drive, SIGNAL(prepareProgress(int,int)), &dialog, SLOT(onPrepareProgress(int,int)) );
|
||||
connect( drive, SIGNAL(labelProgress(int,int)), &dialog, SLOT(onLabelProgress(int,int)) );
|
||||
connect( drive, SIGNAL(timeEstimate(int)), &dialog, SLOT(onTimeEstimate(int)) );
|
||||
connect( drive, SIGNAL(finished(int)), &dialog, SLOT(onFinished(int)) );
|
||||
connect( scribe, SIGNAL(prepareProgress(long,long)), &dialog, SLOT(onPrepareProgress(long,long)) );
|
||||
connect( scribe, SIGNAL(labelProgress(long,long)), &dialog, SLOT(onLabelProgress(long,long)) );
|
||||
connect( scribe, SIGNAL(timeEstimate(long)), &dialog, SLOT(onTimeEstimate(long)) );
|
||||
connect( scribe, SIGNAL(finished(int)), &dialog, SLOT(onFinished(int)) );
|
||||
|
||||
drive->print( params, scene );
|
||||
scribe->print( drive, params, scene );
|
||||
dialog.QDialog::exec();
|
||||
return true;
|
||||
}
|
||||
@@ -90,32 +87,32 @@ void QDialogProgress::onButtonClicked( QAbstractButton *button )
|
||||
tr( "Are you sure you want to interrupt?" ),
|
||||
QMessageBox::Yes | QMessageBox::No,
|
||||
QMessageBox::No ) == QMessageBox::Yes ) {
|
||||
m_drive->abort();
|
||||
QLightScribe::instance()->abort();
|
||||
button->setDisabled( true );
|
||||
}
|
||||
} else
|
||||
done( 0 );
|
||||
}
|
||||
|
||||
void QDialogProgress::onPrepareProgress( int current, int final )
|
||||
void QDialogProgress::onPrepareProgress( long current, long final )
|
||||
{
|
||||
m_ui->progressPreparation->setMaximum( final );
|
||||
m_ui->progressPreparation->setValue( current );
|
||||
}
|
||||
|
||||
void QDialogProgress::onLabelProgress( int current, int final )
|
||||
void QDialogProgress::onLabelProgress( long current, long final )
|
||||
{
|
||||
m_ui->progressPrinting->setMaximum( final );
|
||||
m_ui->progressPrinting->setValue( current );
|
||||
|
||||
if( current && final / double( current ) < 10.0 ) {
|
||||
if( current && double( current ) / final > 0.1 ) {
|
||||
int elapsed = m_start->elapsed();
|
||||
int estimate = int( double( elapsed ) / current * final );
|
||||
int estimate = double( elapsed ) / current * final;
|
||||
m_ui->timeEstimated->setTime( QTime().addMSecs( estimate ) );
|
||||
}
|
||||
}
|
||||
|
||||
void QDialogProgress::onTimeEstimate( int time )
|
||||
void QDialogProgress::onTimeEstimate( long time )
|
||||
{
|
||||
m_ui->timeEstimated->setTime( QTime().addSecs( time ) );
|
||||
}
|
||||
|
||||
@@ -31,7 +31,6 @@ class QCDScene;
|
||||
class QAbstractButton;
|
||||
class QTime;
|
||||
class QTimer;
|
||||
class QLightDrive;
|
||||
|
||||
class QDialogProgress : public QDialog {
|
||||
Q_OBJECT
|
||||
@@ -41,9 +40,9 @@ public:
|
||||
|
||||
protected slots:
|
||||
void onButtonClicked( QAbstractButton* button );
|
||||
void onPrepareProgress( int current, int final );
|
||||
void onLabelProgress( int current, int final );
|
||||
void onTimeEstimate( int time );
|
||||
void onPrepareProgress( long current, long final );
|
||||
void onLabelProgress( long current, long final );
|
||||
void onTimeEstimate( long time );
|
||||
void onFinished(int status );
|
||||
void onTimeout();
|
||||
|
||||
@@ -51,11 +50,10 @@ protected:
|
||||
virtual void changeEvent(QEvent *e);
|
||||
|
||||
private:
|
||||
QDialogProgress(QWidget *parent, QLightDrive *drive );
|
||||
explicit QDialogProgress(QWidget *parent = 0);
|
||||
virtual ~QDialogProgress();
|
||||
|
||||
Ui::QDialogProgress *m_ui;
|
||||
QLightDrive *m_drive;
|
||||
QTime *m_start;
|
||||
QTimer *m_timer;
|
||||
};
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
|
||||
#include "qdialogroundtext.h"
|
||||
#include "ui_qdialogroundtext.h"
|
||||
#include "qlightroundtextitem.h"
|
||||
#include "qgraphicsroundtextitem.h"
|
||||
#include "qcdscene.h"
|
||||
|
||||
#include <QFontDialog>
|
||||
@@ -55,13 +55,13 @@ void QDialogRoundText::changeEvent(QEvent *e)
|
||||
|
||||
bool QDialogRoundText::exec( QGraphicsItem *graphicsItem )
|
||||
{
|
||||
QLightRoundTextItem *item = dynamic_cast< QLightRoundTextItem * >( graphicsItem );
|
||||
QGraphicsRoundTextItem *item = dynamic_cast< QGraphicsRoundTextItem * >( graphicsItem );
|
||||
if( !item )
|
||||
return false;
|
||||
|
||||
QCDScene scene;
|
||||
m_ui->cdView->setScene( &scene );
|
||||
m_item = new QLightRoundTextItem;
|
||||
m_item = new QGraphicsRoundTextItem;
|
||||
|
||||
m_item->setPos( item->pos() );
|
||||
m_item->setText( item->text() );
|
||||
@@ -129,7 +129,6 @@ void QDialogRoundText::onFont()
|
||||
{
|
||||
bool ok = true;
|
||||
QFont font = QFontDialog::getFont( &ok, m_item->font(), this );
|
||||
//font.setPointSizeF( font.pointSizeF() / 2.0 );
|
||||
if( ok ) {
|
||||
m_item->setFont( font );
|
||||
fontChanged();
|
||||
|
||||
@@ -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 QDIALOGROUNDTEXT_H
|
||||
#define QDIALOGROUNDTEXT_H
|
||||
@@ -27,7 +27,7 @@ namespace Ui {
|
||||
class QDialogRoundText;
|
||||
}
|
||||
|
||||
class QLightRoundTextItem;
|
||||
class QGraphicsRoundTextItem;
|
||||
|
||||
class QDialogRoundText : public QItemDialog {
|
||||
Q_OBJECT
|
||||
@@ -54,8 +54,8 @@ private slots:
|
||||
void locChanged();
|
||||
|
||||
private:
|
||||
Ui::QDialogRoundText *m_ui;
|
||||
QLightRoundTextItem *m_item;
|
||||
Ui::QDialogRoundText *m_ui;
|
||||
QGraphicsRoundTextItem *m_item;
|
||||
};
|
||||
|
||||
#endif // QDIALOGROUNDTEXT_H
|
||||
|
||||
@@ -206,9 +206,6 @@
|
||||
</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>
|
||||
|
||||
+3
-4
@@ -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:$ */
|
||||
|
||||
#include "qdialogtext.h"
|
||||
#include "ui_qdialogtext.h"
|
||||
@@ -32,8 +32,8 @@ QDialogText::QDialogText(QWidget *parent) :
|
||||
m_item( 0 )
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
connect( m_ui->btnFont, SIGNAL(clicked()), this, SLOT(onFont()) );
|
||||
connect( m_ui->btnColor, SIGNAL(clicked()), this, SLOT(onColor()) );
|
||||
connect( m_ui->btnFont, SIGNAL(clicked()), this, SLOT(onFont()) );
|
||||
connect( m_ui->btnColor, SIGNAL(clicked()), this, SLOT(onColor()) );
|
||||
}
|
||||
|
||||
QDialogText::~QDialogText()
|
||||
@@ -66,7 +66,6 @@ bool QDialogText::exec( QGraphicsItem *graphicsItem )
|
||||
m_item->setText( item->text() );
|
||||
m_item->setFont( item->font() );
|
||||
m_item->setBrush( item->brush() );
|
||||
m_item->setTransform( item->transform() );
|
||||
|
||||
scene.addItem( m_item );
|
||||
|
||||
|
||||
@@ -18,96 +18,93 @@
|
||||
|
||||
$Id$ */
|
||||
|
||||
#include "qlightroundtextitem.h"
|
||||
#include "qgraphicsroundtextitem.h"
|
||||
#include "qdialogroundtext.h"
|
||||
#include "qcdscene.h"
|
||||
|
||||
#include <QPainter>
|
||||
#include <QFontMetrics>
|
||||
#include <QStyleOptionGraphicsItem>
|
||||
#include <QMessageBox>
|
||||
#include <QXmlStreamWriter>
|
||||
#include <QTextLayout>
|
||||
|
||||
#include <math.h>
|
||||
|
||||
QLightRoundTextItem::QLightRoundTextItem( QGraphicsItem *parent )
|
||||
QGraphicsRoundTextItem::QGraphicsRoundTextItem( QGraphicsItem *parent )
|
||||
: QAbstractGraphicsShapeItem( parent ),
|
||||
m_radius( 40.0 ),
|
||||
m_angle( 0.0 ),
|
||||
m_alignment( Qt::AlignLeft ),
|
||||
m_outside( true )
|
||||
{
|
||||
setBrush( Qt::black );
|
||||
}
|
||||
|
||||
const QFont & QLightRoundTextItem::font() const
|
||||
const QFont & QGraphicsRoundTextItem::font() const
|
||||
{
|
||||
return m_font;
|
||||
}
|
||||
|
||||
const QString & QLightRoundTextItem::text() const
|
||||
const QString & QGraphicsRoundTextItem::text() const
|
||||
{
|
||||
return m_text;
|
||||
}
|
||||
|
||||
double QLightRoundTextItem::radius() const
|
||||
double QGraphicsRoundTextItem::radius() const
|
||||
{
|
||||
return m_radius;
|
||||
}
|
||||
|
||||
double QLightRoundTextItem::angle() const
|
||||
double QGraphicsRoundTextItem::angle() const
|
||||
{
|
||||
return m_angle;
|
||||
}
|
||||
|
||||
Qt::Alignment QLightRoundTextItem::alignment() const
|
||||
Qt::Alignment QGraphicsRoundTextItem::alignment() const
|
||||
{
|
||||
return m_alignment;
|
||||
}
|
||||
|
||||
bool QLightRoundTextItem::outside() const
|
||||
bool QGraphicsRoundTextItem::outside() const
|
||||
{
|
||||
return m_outside;
|
||||
}
|
||||
|
||||
void QLightRoundTextItem::setFont( const QFont &font )
|
||||
void QGraphicsRoundTextItem::setFont( const QFont &font )
|
||||
{
|
||||
prepareGeometryChange();
|
||||
m_font = font;
|
||||
}
|
||||
|
||||
void QLightRoundTextItem::setText( const QString &text )
|
||||
void QGraphicsRoundTextItem::setText( const QString &text )
|
||||
{
|
||||
prepareGeometryChange();
|
||||
m_text = text;
|
||||
}
|
||||
|
||||
void QLightRoundTextItem::setRadius( double radius )
|
||||
void QGraphicsRoundTextItem::setRadius( double radius )
|
||||
{
|
||||
prepareGeometryChange();
|
||||
m_radius = radius;
|
||||
}
|
||||
|
||||
void QLightRoundTextItem::setAngle( double angle )
|
||||
void QGraphicsRoundTextItem::setAngle( double angle )
|
||||
{
|
||||
prepareGeometryChange();
|
||||
m_angle = angle;
|
||||
}
|
||||
|
||||
void QLightRoundTextItem::setAlignment( Qt::Alignment alignment )
|
||||
void QGraphicsRoundTextItem::setAlignment( Qt::Alignment alignment )
|
||||
{
|
||||
prepareGeometryChange();
|
||||
m_alignment = alignment;
|
||||
}
|
||||
|
||||
void QLightRoundTextItem::setOutside( bool outside )
|
||||
void QGraphicsRoundTextItem::setOutside( bool outside )
|
||||
{
|
||||
prepareGeometryChange();
|
||||
m_outside = outside;
|
||||
}
|
||||
|
||||
QRectF QLightRoundTextItem::boundingRect() const
|
||||
QRectF QGraphicsRoundTextItem::boundingRect() const
|
||||
{
|
||||
double height = m_radius;
|
||||
if( m_outside ) {
|
||||
@@ -118,11 +115,9 @@ QRectF QLightRoundTextItem::boundingRect() const
|
||||
return QRectF( -height, -height, 2 * height, 2 * height );
|
||||
}
|
||||
|
||||
QPainterPath QLightRoundTextItem::shape() const
|
||||
QPainterPath QGraphicsRoundTextItem::shape() const
|
||||
{
|
||||
QFont font( m_font );
|
||||
font.setPointSizeF( m_font.pointSizeF() / 2 );
|
||||
QFontMetrics mcs( font );
|
||||
QFontMetrics mcs( m_font );
|
||||
double arcAngle = 0.0;
|
||||
const double pad = 1;
|
||||
|
||||
@@ -169,20 +164,18 @@ QPainterPath QLightRoundTextItem::shape() const
|
||||
}
|
||||
|
||||
|
||||
void QLightRoundTextItem::paint( QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget )
|
||||
void QGraphicsRoundTextItem::paint( QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget )
|
||||
{
|
||||
Q_UNUSED( option );
|
||||
Q_UNUSED( widget );
|
||||
if( !painter || !m_radius ) return;
|
||||
painter->save();
|
||||
|
||||
QFont font( m_font );
|
||||
font.setPointSizeF( m_font.pointSizeF() / 2 );
|
||||
painter->setFont( font );
|
||||
painter->setFont( m_font );
|
||||
|
||||
//painter->drawEllipse( - m_radius, - m_radius, m_radius * 2, m_radius * 2 );
|
||||
|
||||
QFontMetrics mcs( font );
|
||||
QFontMetrics mcs( m_font );
|
||||
|
||||
const double radi = m_radius - ( m_outside ? 0 : mcs.xHeight() );
|
||||
const double diam = 2 * radi;
|
||||
@@ -199,14 +192,8 @@ void QLightRoundTextItem::paint( QPainter *painter, const QStyleOptionGraphicsIt
|
||||
|
||||
QTransform trans;
|
||||
trans.rotateRadians( angle );
|
||||
painter->setRenderHint( QPainter::TextAntialiasing, true );
|
||||
painter->setWorldTransform( trans, true );
|
||||
|
||||
QPen p;
|
||||
p.setBrush( brush() );
|
||||
painter->setPen( p );
|
||||
painter->setBrush( Qt::NoBrush );
|
||||
|
||||
int prevWidth = 0;
|
||||
for( int i = 0; i < m_text.size(); ++i ) {
|
||||
QChar ch = m_text[ i ];
|
||||
@@ -215,12 +202,9 @@ void QLightRoundTextItem::paint( QPainter *painter, const QStyleOptionGraphicsIt
|
||||
trans.reset();
|
||||
trans.rotateRadians( m_outside ? d : -d );
|
||||
painter->setWorldTransform( trans, true );
|
||||
|
||||
prevWidth = mcs.width( ch );
|
||||
|
||||
painter->drawText( int( -prevWidth / 2.0 ),
|
||||
int( m_outside ? -m_radius : m_radius ),
|
||||
ch );
|
||||
painter->drawText( -prevWidth / 2.0, m_outside ? -m_radius : m_radius, ch );
|
||||
}
|
||||
painter->restore();
|
||||
if (option->state & QStyle::State_Selected) {
|
||||
@@ -230,14 +214,6 @@ void QLightRoundTextItem::paint( QPainter *painter, const QStyleOptionGraphicsIt
|
||||
}
|
||||
}
|
||||
|
||||
QVariant QLightRoundTextItem::itemChange( GraphicsItemChange change, const QVariant & value )
|
||||
{
|
||||
if( scene() && change == ItemPositionHasChanged )
|
||||
static_cast<QCDScene *>( scene() )->setChanged();
|
||||
|
||||
return value;
|
||||
}
|
||||
|
||||
RegisterController< QShapeControllerRoundText > regControllerRoundText;
|
||||
|
||||
QString QShapeControllerRoundText::name() const
|
||||
@@ -252,8 +228,7 @@ QString QShapeControllerRoundText::menuName() const
|
||||
|
||||
QGraphicsItem *QShapeControllerRoundText::create() const
|
||||
{
|
||||
QLightRoundTextItem *item = new QLightRoundTextItem;
|
||||
return item;
|
||||
return new QGraphicsRoundTextItem;
|
||||
}
|
||||
|
||||
QItemDialog *QShapeControllerRoundText::createDialog( QWidget *parent ) const
|
||||
@@ -261,20 +236,12 @@ QItemDialog *QShapeControllerRoundText::createDialog( QWidget *parent ) const
|
||||
return new QDialogRoundText( parent );
|
||||
}
|
||||
|
||||
void QShapeControllerRoundText::replace( QGraphicsItem *item, const QString &from, const QString &to ) const
|
||||
{
|
||||
QLightRoundTextItem *textItem = static_cast< QLightRoundTextItem * >( item );
|
||||
if( textItem->text() == from )
|
||||
textItem->setText( to );
|
||||
}
|
||||
|
||||
void QShapeControllerRoundText::writeData( QXmlStreamWriter &writer, const QGraphicsItem *item ) const
|
||||
{
|
||||
const QLightRoundTextItem *textItem = static_cast< const QLightRoundTextItem * >( item );
|
||||
const QGraphicsRoundTextItem *textItem = static_cast< const QGraphicsRoundTextItem * >( 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( "radius", QString::number( textItem->radius() ) );
|
||||
writer.writeTextElement( "angle", QString::number( textItem->angle() ) );
|
||||
@@ -290,12 +257,11 @@ void QShapeControllerRoundText::readData( const QString &element,
|
||||
const QString &data,
|
||||
QGraphicsItem *item ) const
|
||||
{
|
||||
QLightRoundTextItem *textItem = static_cast< QLightRoundTextItem * >( item );
|
||||
QGraphicsRoundTextItem *textItem = static_cast< QGraphicsRoundTextItem * >( item );
|
||||
|
||||
if( element == "pos" ) {
|
||||
textItem->setPos( attrs.value( "x" ).toString().toDouble(),
|
||||
attrs.value( "y" ).toString().toDouble() );
|
||||
textItem->setZValue( attrs.value( "z" ).toString().toDouble() );
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -321,11 +287,6 @@ void QShapeControllerRoundText::readData( const QString &element,
|
||||
return;
|
||||
}
|
||||
|
||||
if( element == "radius" ) {
|
||||
textItem->setRadius( data.toDouble() );
|
||||
return;
|
||||
}
|
||||
|
||||
if( element == "angle" ) {
|
||||
textItem->setAngle( data.toDouble() );
|
||||
return;
|
||||
@@ -16,21 +16,21 @@
|
||||
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 QLIGHTROUNDTEXTITEM_H
|
||||
#define QLIGHTROUNDTEXTITEM_H
|
||||
#ifndef QGRAPHICSROUNDTEXTITEM_H
|
||||
#define QGRAPHICSROUNDTEXTITEM_H
|
||||
|
||||
#include "qshapefactory.h"
|
||||
|
||||
#include <QAbstractGraphicsShapeItem>
|
||||
#include <QFont>
|
||||
|
||||
class QLightRoundTextItem : public QAbstractGraphicsShapeItem {
|
||||
class QGraphicsRoundTextItem : public QAbstractGraphicsShapeItem {
|
||||
public:
|
||||
enum { Type = UserType + 1 };
|
||||
|
||||
QLightRoundTextItem( QGraphicsItem * parent = 0 );
|
||||
QGraphicsRoundTextItem( QGraphicsItem * parent = 0 );
|
||||
|
||||
const QFont &font() const;
|
||||
const QString &text() const;
|
||||
@@ -53,10 +53,6 @@ public:
|
||||
QWidget *widget );
|
||||
|
||||
virtual int type() const { return Type; }
|
||||
|
||||
protected:
|
||||
virtual QVariant itemChange ( GraphicsItemChange change, const QVariant & value );
|
||||
|
||||
private:
|
||||
QFont m_font;
|
||||
QString m_text;
|
||||
@@ -68,13 +64,12 @@ private:
|
||||
|
||||
class QShapeControllerRoundText : public QShapeController {
|
||||
public:
|
||||
enum { Type = QLightRoundTextItem::Type };
|
||||
enum { Type = QGraphicsRoundTextItem::Type };
|
||||
|
||||
virtual QString name() const;
|
||||
virtual QString menuName() const;
|
||||
|
||||
virtual QGraphicsItem *create() const;
|
||||
virtual void replace( QGraphicsItem *item, const QString &from, const QString &to ) const;
|
||||
|
||||
protected:
|
||||
virtual QItemDialog *createDialog( QWidget *parent ) const;
|
||||
@@ -86,4 +81,4 @@ protected:
|
||||
};
|
||||
|
||||
|
||||
#endif // QLIGHTROUNDTEXTITEM_H
|
||||
#endif // QGRAPHICSROUNDTEXTITEM_H
|
||||
@@ -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 QLIGHTPIXMAPITEM_H
|
||||
#define QLIGHTPIXMAPITEM_H
|
||||
|
||||
#include <QGraphicsPixmapItem>
|
||||
|
||||
#include "qshapefactory.h"
|
||||
|
||||
class QLightPixmapItem : public QGraphicsPixmapItem
|
||||
{
|
||||
public:
|
||||
QLightPixmapItem();
|
||||
|
||||
protected:
|
||||
virtual QVariant itemChange ( GraphicsItemChange change, const QVariant & value );
|
||||
};
|
||||
|
||||
class QShapeControllerPixmap : public QShapeController {
|
||||
public:
|
||||
enum { Type = QLightPixmapItem::Type };
|
||||
|
||||
virtual QString name() const;
|
||||
virtual QString menuName() const;
|
||||
|
||||
virtual QGraphicsItem *create() const;
|
||||
|
||||
protected:
|
||||
virtual QItemDialog *createDialog( QWidget *parent ) const;
|
||||
virtual void writeData( QXmlStreamWriter &writer, const QGraphicsItem *item ) const;
|
||||
virtual void readData( const QString &element,
|
||||
const QXmlStreamAttributes &attrs,
|
||||
const QString &data,
|
||||
QGraphicsItem *item ) const;
|
||||
};
|
||||
|
||||
|
||||
#endif // QLIGHTPIXMAPITEM_H
|
||||
+266
-100
@@ -20,41 +20,33 @@
|
||||
|
||||
#include "qlightscribe.h"
|
||||
#include "qcdscene.h"
|
||||
#include "lightscribe_interface.h"
|
||||
|
||||
#include <QApplication>
|
||||
#include <QMutex>
|
||||
#include <QWaitCondition>
|
||||
#include <QPainter>
|
||||
#include <QBuffer>
|
||||
#include <QTemporaryFile>
|
||||
#include <QDBusConnection>
|
||||
#include <QDBusArgument>
|
||||
#include <QMessageBox>
|
||||
|
||||
//#include <lightscribe_cxx.h>
|
||||
#include <lightscribe_cxx.h>
|
||||
|
||||
//using namespace LightScribe;
|
||||
// Marshall the PrintParameters data into a D-BUS argument
|
||||
QDBusArgument &operator<<( QDBusArgument &argument, const PrintParameters &p )
|
||||
{
|
||||
argument.beginStructure();
|
||||
argument << p.m_labelMode << p.m_drawOptions << p.m_printQuality << p.m_mediaOptimizationLevel;
|
||||
argument.endStructure();
|
||||
return argument;
|
||||
}
|
||||
using namespace LightScribe;
|
||||
|
||||
// Retrieve the PrintProperties data from the D-BUS argument
|
||||
const QDBusArgument &operator>>( const QDBusArgument &argument, PrintParameters &p )
|
||||
{
|
||||
argument.beginStructure();
|
||||
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 ) );
|
||||
return argument;
|
||||
}
|
||||
struct QLightScribe::Task {
|
||||
enum Action { getDrives, preview, print, stop };
|
||||
Action m_action;
|
||||
bool m_done;
|
||||
QLightDrive *m_selectedDrive;
|
||||
PrintParameters m_parameters;
|
||||
QSize m_size;
|
||||
QImage *m_image;
|
||||
|
||||
QList< QLightDrive * > m_drives;
|
||||
QTemporaryFile m_tmpFile;
|
||||
QString m_error;
|
||||
|
||||
Task( Action action ) : m_action( action ), m_done( false ), m_selectedDrive( 0 ), m_image( 0 ) {}
|
||||
~Task() { delete m_image; }
|
||||
};
|
||||
|
||||
QLightScribe *QLightScribe::instance()
|
||||
{
|
||||
@@ -63,108 +55,282 @@ QLightScribe *QLightScribe::instance()
|
||||
}
|
||||
|
||||
QLightScribe::QLightScribe()
|
||||
: m_managerPrx( new OrgLightscribePrintManagerInterface( DBusServiceName,
|
||||
DBusManagerPath,
|
||||
QDBusConnection::systemBus(),
|
||||
this ) )
|
||||
: m_task( 0 ),
|
||||
m_aborted( false ),
|
||||
m_mutex( new QMutex ),
|
||||
m_waitQueue( new QWaitCondition ),
|
||||
m_waitDone( new QWaitCondition )
|
||||
{
|
||||
qDBusRegisterMetaType<PrintParameters>();
|
||||
qDBusRegisterMetaType<QObject2StringMap>();
|
||||
start();
|
||||
}
|
||||
|
||||
QLightScribe::~QLightScribe()
|
||||
{
|
||||
delete m_waitDone;
|
||||
delete m_waitQueue;
|
||||
delete m_mutex;
|
||||
}
|
||||
|
||||
QList< QLightDrive * > QLightScribe::getDrives()
|
||||
QList< QLightDrive * > QLightScribe::getDrives( bool refresh )
|
||||
{
|
||||
if( m_drives.empty() ) {
|
||||
qApp->setOverrideCursor( Qt::WaitCursor );
|
||||
QDBusReply<QObject2StringMap> reply = m_managerPrx->getDrives();
|
||||
qApp->restoreOverrideCursor();
|
||||
if( !reply.isValid() ) {
|
||||
QMessageBox::critical( 0, tr( "DBus Error" ), tr( "Error on request: " ) + reply.error().message() );
|
||||
} else {
|
||||
const QObject2StringMap &map = reply.value();
|
||||
for( QObject2StringMap::const_iterator i = map.begin(); i != map.end(); ++i )
|
||||
m_drives.push_back( new QLightDrive( this, i.key(), i.value() ) );
|
||||
if( m_drives.empty() || refresh ) {
|
||||
QMutexLocker lock( m_mutex );
|
||||
if( m_task ) // what should we do?
|
||||
return m_drives;
|
||||
|
||||
m_task = new Task( Task::getDrives );
|
||||
m_waitQueue->wakeOne();
|
||||
|
||||
while( !m_task->m_done )
|
||||
m_waitDone->wait( m_mutex );
|
||||
|
||||
while( m_drives.count() ) {
|
||||
delete m_drives.front();
|
||||
m_drives.erase( m_drives.begin() );
|
||||
}
|
||||
m_drives = m_task->m_drives;
|
||||
|
||||
delete m_task;
|
||||
m_task = 0;
|
||||
}
|
||||
return m_drives;
|
||||
}
|
||||
|
||||
QLightDrive::QLightDrive( QObject *parent, const QString &path, const QString &name )
|
||||
: QObject( parent ),
|
||||
m_drivePrx( new OrgLightscribeDriveInterface( DBusServiceName, path, QDBusConnection::systemBus(), this ) ),
|
||||
m_displayName( name ),
|
||||
m_path( path )
|
||||
{
|
||||
connect( m_drivePrx, SIGNAL(finished(int)), this, SIGNAL(finished(int)) );
|
||||
connect( m_drivePrx, SIGNAL(prepareProgress( int, int )), this, SIGNAL(prepareProgress( int, int )) );
|
||||
connect( m_drivePrx, SIGNAL(labelProgress( int , int )), this, SIGNAL(labelProgress( int, int )) );
|
||||
connect( m_drivePrx, SIGNAL(timeEstimate( int )), this, SIGNAL(timeEstimate( int )) );
|
||||
}
|
||||
|
||||
static
|
||||
void printScene( QCDScene *scene, QByteArray &array )
|
||||
QImage *printScene( QCDScene *scene )
|
||||
{
|
||||
QImage image( 2772, 2772, QImage::Format_RGB888 );
|
||||
image.fill( 0xFFFFFFFF );
|
||||
QImage *image = new QImage( 2772, 2772, QImage::Format_RGB888 );
|
||||
image->fill( 0xFFFFFFFF );
|
||||
|
||||
scene->clearSelection();
|
||||
{
|
||||
QPainter painter( &image );
|
||||
scene->render( &painter, image.rect() );
|
||||
QPainter painter( image );
|
||||
scene->render( &painter, image->rect() );
|
||||
}
|
||||
image.setDotsPerMeterX( 23622 );
|
||||
image.setDotsPerMeterY( 23622 );
|
||||
image->setDotsPerMeterX( 23622 );
|
||||
image->setDotsPerMeterY( 23622 );
|
||||
|
||||
array.clear();
|
||||
QBuffer buffer( &array );
|
||||
buffer.open( QIODevice::WriteOnly );
|
||||
image.save( &buffer, "bmp", 100 );
|
||||
return image;
|
||||
}
|
||||
|
||||
QPixmap QLightDrive::preview( const PrintParameters ¶ms, QCDScene *scene, const QSize &size ) throw( QString )
|
||||
QPixmap QLightScribe::preview( QLightDrive *drive, const PrintParameters ¶ms, QCDScene *scene, const QSize &size ) throw( QString )
|
||||
{
|
||||
qApp->setOverrideCursor( Qt::WaitCursor );
|
||||
QByteArray array;
|
||||
printScene( scene, array );
|
||||
QMutexLocker lock( m_mutex );
|
||||
if( m_task ) // what should we do?
|
||||
return QPixmap();
|
||||
|
||||
/*QList<QVariant> argumentList;
|
||||
argumentList << qVariantFromValue( params ) << qVariantFromValue( array )
|
||||
<< qVariantFromValue( size );
|
||||
QDBusReply<QString> reply = m_drivePrx->callWithArgumentList( QDBus::BlockWithGui,
|
||||
QLatin1String( "preview" ),
|
||||
argumentList);*/
|
||||
QDBusReply<QString> reply = m_drivePrx->preview( params, array, size );
|
||||
qApp->restoreOverrideCursor();
|
||||
if( !reply.isValid() )
|
||||
throw QString( "DBus error: (%1) %2" ).arg( reply.error().name(), reply.error().message() );
|
||||
m_task = new Task( Task::preview );
|
||||
m_task->m_selectedDrive = drive;
|
||||
m_task->m_parameters = params;
|
||||
m_task->m_size = size;
|
||||
m_task->m_image = printScene( scene );
|
||||
|
||||
m_aborted = false;
|
||||
|
||||
m_waitQueue->wakeOne();
|
||||
|
||||
while( !m_task->m_done )
|
||||
m_waitDone->wait( m_mutex );
|
||||
|
||||
QString err = m_task->m_error;
|
||||
QPixmap pixmap;
|
||||
if( err.isEmpty() )
|
||||
pixmap.load( m_task->m_tmpFile.fileName(), "bmp" );
|
||||
|
||||
delete m_task;
|
||||
m_task = 0;
|
||||
|
||||
if( !err.isEmpty() )
|
||||
throw err;
|
||||
|
||||
QString fname = reply.value();
|
||||
QPixmap pixmap( fname );
|
||||
QFile( fname ).remove();
|
||||
return pixmap;
|
||||
}
|
||||
|
||||
void QLightDrive::print( const PrintParameters ¶ms, QCDScene *scene ) throw( QString )
|
||||
void QLightScribe::print( QLightDrive *drive, const PrintParameters ¶ms, QCDScene *scene )
|
||||
{
|
||||
qApp->setOverrideCursor( Qt::WaitCursor );
|
||||
QByteArray array;
|
||||
printScene( scene, array );
|
||||
/*QList<QVariant> argumentList;
|
||||
argumentList << qVariantFromValue( params ) << qVariantFromValue( array );
|
||||
QDBusReply<void> reply = callWithArgumentList( QDBus::BlockWithGui,
|
||||
QLatin1String( "print" ),
|
||||
argumentList);*/
|
||||
QDBusReply<void> reply = m_drivePrx->print( params, array );
|
||||
qApp->restoreOverrideCursor();
|
||||
if( !reply.isValid() )
|
||||
throw QString( "DBus error: (%1) %2" ).arg( reply.error().name(), reply.error().message() );
|
||||
QMutexLocker lock( m_mutex );
|
||||
if( m_task ) // what should we do?
|
||||
return;
|
||||
|
||||
m_task = new Task( Task::print );
|
||||
m_task->m_selectedDrive = drive;
|
||||
m_task->m_parameters = params;
|
||||
m_task->m_image = printScene( scene );
|
||||
|
||||
m_aborted = false;
|
||||
|
||||
m_waitQueue->wakeOne();
|
||||
}
|
||||
|
||||
void QLightDrive::abort()
|
||||
void QLightScribe::abort()
|
||||
{
|
||||
m_drivePrx->abort();
|
||||
m_aborted = true;
|
||||
}
|
||||
|
||||
void QLightScribe::stopThread()
|
||||
{
|
||||
QMutexLocker lock( m_mutex );
|
||||
delete m_task;
|
||||
m_task = new Task( Task::stop );
|
||||
m_waitQueue->wakeOne();
|
||||
}
|
||||
|
||||
bool QLightScribe::clAbortLabel()
|
||||
{
|
||||
return QLightScribe::instance()->m_aborted;
|
||||
}
|
||||
|
||||
void QLightScribe::clReportPrepareProgress(long current, long final)
|
||||
{
|
||||
emit instance()->prepareProgress( current, final );
|
||||
}
|
||||
|
||||
void QLightScribe::clReportLabelProgress(long current, long final)
|
||||
{
|
||||
emit instance()->labelProgress( current, final );
|
||||
}
|
||||
|
||||
void QLightScribe::clReportFinished(LSError status)
|
||||
{
|
||||
emit instance()->finished( status );
|
||||
}
|
||||
|
||||
bool QLightScribe::clReportLabelTimeEstimate(long time)
|
||||
{
|
||||
emit instance()->timeEstimate( time );
|
||||
return false;
|
||||
}
|
||||
|
||||
void QLightScribe::run()
|
||||
{
|
||||
QMutexLocker lock( m_mutex );
|
||||
while( true ) {
|
||||
while( m_task == 0 || m_task->m_done )
|
||||
m_waitQueue->wait( m_mutex );
|
||||
|
||||
if( m_task->m_action == Task::stop )
|
||||
break;
|
||||
|
||||
QString function;
|
||||
try {
|
||||
function = "LS_DiscPrintMgr_Create";
|
||||
DiscPrintMgr manager;
|
||||
|
||||
function = "LS_DiscPrintMgr_EnumDiscPrinters";
|
||||
EnumDiscPrinters printers = manager.EnumDiscPrinters();
|
||||
|
||||
function = "";
|
||||
|
||||
if( m_task->m_action == Task::getDrives ) {
|
||||
const unsigned count = printers.Count();
|
||||
|
||||
for( unsigned i = 0; i < count; ++i ) {
|
||||
DiscPrinter printer = printers.Item( i );
|
||||
|
||||
QLightDrive *drive = new QLightDrive;
|
||||
drive->m_displayName = QString::fromStdString( printer.GetPrinterDisplayName() );
|
||||
drive->m_productName = QString::fromStdString( printer.GetPrinterProductName() );
|
||||
drive->m_vendorName = QString::fromStdString( printer.GetPrinterVendorName() );
|
||||
drive->m_path = QString::fromStdString( printer.GetPrinterPath() );
|
||||
drive->m_innerRadius = printer.GetDriveInnerRadius() / 1000.0;
|
||||
drive->m_outerRadius = printer.GetDriveOuterRadius() / 1000.0;
|
||||
|
||||
m_task->m_drives.append( drive );
|
||||
}
|
||||
} else {
|
||||
|
||||
QByteArray ba;
|
||||
QBuffer buffer( &ba );
|
||||
buffer.open( QIODevice::WriteOnly );
|
||||
m_task->m_image->save( &buffer, "bmp", 100 );
|
||||
|
||||
int found = -1;
|
||||
for( size_t i = 0; i < printers.Count(); ++i )
|
||||
if( printers.Item( i ).GetPrinterDisplayName() == m_task->m_selectedDrive->displayName().toStdString() ) {
|
||||
found = i;
|
||||
break;
|
||||
}
|
||||
if( found == -1 )
|
||||
throw tr( "Cannot find drive: \"" ) + m_task->m_selectedDrive->displayName() + "\"";
|
||||
|
||||
DiscPrinter printer = printers.Item( found );
|
||||
function = "LS_DiscPrinter_OpenPrintSession";
|
||||
DiscPrintSession session = printer.OpenPrintSession();
|
||||
|
||||
LS_PrintCallbacks callbacks;
|
||||
callbacks.AbortLabel = clAbortLabel;
|
||||
callbacks.ReportPrepareProgress = clReportPrepareProgress;
|
||||
callbacks.ReportLabelProgress = clReportLabelProgress;
|
||||
callbacks.ReportFinished = clReportFinished;
|
||||
callbacks.ReportLabelTimeEstimate = clReportLabelTimeEstimate;
|
||||
|
||||
session.SetProgressCallback( &callbacks );
|
||||
|
||||
const size_t bitmapHeaderSize = 54;
|
||||
|
||||
if( m_task->m_action == Task::preview ) {
|
||||
|
||||
LS_Size size;
|
||||
size.x = m_task->m_size.width();
|
||||
size.y = m_task->m_size.height();
|
||||
|
||||
m_task->m_tmpFile.open();
|
||||
|
||||
function = "LS_DiscPrintSession_PrintPreview";
|
||||
session.PrintPreview( LS_windows_bitmap,
|
||||
LS_LabelMode( m_task->m_parameters.m_labelMode ),
|
||||
LS_DrawOptions( m_task->m_parameters.m_drawOptions ),
|
||||
LS_PrintQuality( m_task->m_parameters.m_printQuality ),
|
||||
LS_MediaOptimizationLevel( m_task->m_parameters.m_mediaOptimizationLevel ),
|
||||
ba.data() + 14,
|
||||
bitmapHeaderSize - 14,
|
||||
ba.data() + bitmapHeaderSize,
|
||||
ba.size() - bitmapHeaderSize,
|
||||
m_task->m_tmpFile.fileName().toAscii().data(),
|
||||
LS_windows_bitmap,
|
||||
size,
|
||||
true );
|
||||
} else {
|
||||
PrintParameters params = m_task->m_parameters;
|
||||
delete m_task;
|
||||
m_task = 0;
|
||||
lock.unlock();
|
||||
// print here
|
||||
try {
|
||||
//printer.AddExclusiveUse();
|
||||
//printer.LockDriveTray();
|
||||
session.PrintDisc( LS_windows_bitmap,
|
||||
LS_LabelMode( params.m_labelMode ),
|
||||
LS_DrawOptions( params.m_drawOptions ),
|
||||
LS_PrintQuality( params.m_printQuality ),
|
||||
LS_MediaOptimizationLevel( params.m_mediaOptimizationLevel ),
|
||||
ba.data() + 14,
|
||||
bitmapHeaderSize - 14,
|
||||
ba.data() + bitmapHeaderSize,
|
||||
ba.size() - bitmapHeaderSize );
|
||||
}
|
||||
catch( LightScribe::LSException &ex ) {
|
||||
emit finished( ex.GetCode() );
|
||||
throw;
|
||||
}
|
||||
|
||||
//printer.UnlockDriveTray();
|
||||
//printer.ReleaseExclusiveUse();
|
||||
}
|
||||
function = "";
|
||||
}
|
||||
}
|
||||
catch( LightScribe::LSException &ex ) {
|
||||
if( m_task )
|
||||
m_task->m_error = function + tr( " failed with code 0x" ) + QString::number( ex.GetCode(), 16 );
|
||||
}
|
||||
catch( const QString &err ) {
|
||||
if( m_task )
|
||||
m_task->m_error = err;
|
||||
}
|
||||
if( m_task ) {
|
||||
m_task->m_done = true;
|
||||
m_waitDone->wakeAll();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+99
-55
@@ -21,55 +21,115 @@
|
||||
#ifndef QLIGHTSCRIBE_H
|
||||
#define QLIGHTSCRIBE_H
|
||||
|
||||
#include "qlscribe.h"
|
||||
|
||||
#include <QThread>
|
||||
#include <QPixmap>
|
||||
#include <QMap>
|
||||
#include <QMetaType>
|
||||
|
||||
#include <map>
|
||||
|
||||
#include <lightscribe_errors.h>
|
||||
|
||||
class QCDScene;
|
||||
class QMutex;
|
||||
class QWaitCondition;
|
||||
|
||||
class QLightDrive;
|
||||
|
||||
struct PrintParameters {
|
||||
LabelMode m_labelMode;
|
||||
DrawOptions m_drawOptions;
|
||||
PrintQuality m_printQuality;
|
||||
MediaOptimizationLevel m_mediaOptimizationLevel;
|
||||
|
||||
PrintParameters()
|
||||
: m_labelMode( modeFull ), m_drawOptions( drawDefault ),
|
||||
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 ) {}
|
||||
};
|
||||
|
||||
Q_DECLARE_METATYPE( PrintParameters );
|
||||
|
||||
typedef QMap<QString,QString> QObject2StringMap;
|
||||
Q_DECLARE_METATYPE( QObject2StringMap );
|
||||
|
||||
class OrgLightscribePrintManagerInterface;
|
||||
|
||||
class QLightScribe : public QObject {
|
||||
class QLightScribe : public QThread {
|
||||
Q_OBJECT
|
||||
public:
|
||||
enum LabelMode {
|
||||
/** label the entire disc */
|
||||
modeFull=0,
|
||||
/** label within the title mode constraints */
|
||||
modeTitle=1,
|
||||
/** label within the content mode constraints */
|
||||
modeContent=2
|
||||
};
|
||||
|
||||
enum DrawOptions {
|
||||
/** disable scaling of bitmaps; they will be cropped if needed */
|
||||
drawDefault=0,
|
||||
/** Fit the height to the label size */
|
||||
drawFitHeightToLabel=1,
|
||||
/** Fit the width to the label size */
|
||||
drawFitWidthToLabel=2,
|
||||
/** Fit the smallest dimension to the label size */
|
||||
drawFitSmallestToLabel=4
|
||||
};
|
||||
|
||||
enum PrintQuality {
|
||||
/** Best and slowest. */
|
||||
qualityBest=0,
|
||||
/** OK for everyday use. */
|
||||
qualityNormal=1,
|
||||
/** Fast but lower contrast. */
|
||||
qualityDraft=2
|
||||
};
|
||||
|
||||
enum MediaOptimizationLevel {
|
||||
/** Require that media is present and optimized labeling
|
||||
* parameters are available */
|
||||
mediaRecognized,
|
||||
/** Require that media is present but optimized labeling
|
||||
* parameters are not available */
|
||||
mediaGeneric
|
||||
};
|
||||
|
||||
struct PrintParameters {
|
||||
LabelMode m_labelMode;
|
||||
DrawOptions m_drawOptions;
|
||||
PrintQuality m_printQuality;
|
||||
MediaOptimizationLevel m_mediaOptimizationLevel;
|
||||
|
||||
PrintParameters()
|
||||
: m_labelMode( modeFull ), m_drawOptions( drawDefault ),
|
||||
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 ) {}
|
||||
};
|
||||
|
||||
static QLightScribe *instance();
|
||||
|
||||
QList<QLightDrive *> getDrives();
|
||||
QList< QLightDrive * > getDrives( bool refresh = false );
|
||||
QPixmap preview( QLightDrive *drive, const PrintParameters ¶ms, QCDScene *scene, const QSize &size ) throw( QString );
|
||||
void print( QLightDrive *drive, const PrintParameters ¶ms, QCDScene *scene );
|
||||
|
||||
friend bool clAbortLabel();
|
||||
public slots:
|
||||
void abort();
|
||||
void stopThread();
|
||||
|
||||
signals:
|
||||
void prepareProgress( long current, long final );
|
||||
void labelProgress( long current, long final );
|
||||
void timeEstimate( long time );
|
||||
void finished( int status );
|
||||
|
||||
protected:
|
||||
virtual void run ();
|
||||
|
||||
private:
|
||||
static bool clAbortLabel();
|
||||
static void clReportPrepareProgress(long current, long final);
|
||||
static void clReportLabelProgress(long current, long final);
|
||||
static void clReportFinished(LSError status);
|
||||
static bool clReportLabelTimeEstimate(long time);
|
||||
|
||||
QLightScribe();
|
||||
virtual ~QLightScribe();
|
||||
|
||||
OrgLightscribePrintManagerInterface *m_managerPrx;
|
||||
QList< QLightDrive * > m_drives;
|
||||
struct Task;
|
||||
|
||||
QList< QLightDrive * > m_drives;
|
||||
Task *m_task;
|
||||
bool m_aborted;
|
||||
QMutex *m_mutex;
|
||||
QWaitCondition *m_waitQueue;
|
||||
QWaitCondition *m_waitDone;
|
||||
};
|
||||
|
||||
class OrgLightscribeDriveInterface;
|
||||
|
||||
class QLightDrive : public QObject {
|
||||
Q_OBJECT
|
||||
class QLightDrive {
|
||||
public:
|
||||
const QString &productName() const { return m_productName; }
|
||||
const QString &vendorName() const { return m_vendorName; }
|
||||
@@ -79,32 +139,16 @@ public:
|
||||
double innerRadius() const { return m_innerRadius; }
|
||||
double outerRadius() const { return m_outerRadius; }
|
||||
|
||||
QPixmap preview( const PrintParameters ¶ms, QCDScene *scene, const QSize &size ) throw( QString );
|
||||
void print( const PrintParameters ¶ms, QCDScene *scene ) throw( QString );
|
||||
|
||||
friend class QLightScribe;
|
||||
|
||||
public slots:
|
||||
void abort();
|
||||
|
||||
signals:
|
||||
void prepareProgress( int current, int final );
|
||||
void labelProgress( int current, int final );
|
||||
void timeEstimate( int time );
|
||||
void finished( int status );
|
||||
|
||||
private:
|
||||
QLightDrive( QObject *parent, const QString &path, const QString &name );
|
||||
QString m_productName;
|
||||
QString m_vendorName;
|
||||
QString m_displayName;
|
||||
QString m_path;
|
||||
|
||||
OrgLightscribeDriveInterface *m_drivePrx;
|
||||
|
||||
QString m_productName;
|
||||
QString m_vendorName;
|
||||
QString m_displayName;
|
||||
QString m_path;
|
||||
|
||||
double m_innerRadius;
|
||||
double m_outerRadius;
|
||||
double m_innerRadius;
|
||||
double m_outerRadius;
|
||||
};
|
||||
|
||||
#endif // QLIGHTSCRIBE_H
|
||||
|
||||
@@ -1,119 +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 "qlighttextitem.h"
|
||||
#include "qdialogtext.h"
|
||||
#include "qcdscene.h"
|
||||
|
||||
#include <QXmlStreamWriter>
|
||||
#include <QXmlStreamReader>
|
||||
|
||||
|
||||
QLightTextItem::QLightTextItem()
|
||||
{
|
||||
}
|
||||
|
||||
QVariant QLightTextItem::itemChange( GraphicsItemChange change, const QVariant & value )
|
||||
{
|
||||
if( scene() && change == ItemPositionHasChanged )
|
||||
static_cast<QCDScene *>( scene() )->setChanged();
|
||||
|
||||
return value;
|
||||
}
|
||||
|
||||
|
||||
RegisterController< QShapeControllerText > regControllerText;
|
||||
|
||||
QString QShapeControllerText::name() const
|
||||
{
|
||||
return "text";
|
||||
}
|
||||
|
||||
QString QShapeControllerText::menuName() const
|
||||
{
|
||||
return QObject::tr( "Text", "QShapeControllerText name" );
|
||||
}
|
||||
|
||||
QGraphicsItem *QShapeControllerText::create() const
|
||||
{
|
||||
QGraphicsItem *item = new QLightTextItem;
|
||||
item->setTransform( QTransform().scale( 0.5, 0.5 ), true );
|
||||
item->setPos( 0, -40.0 );
|
||||
|
||||
return item;
|
||||
}
|
||||
|
||||
QItemDialog *QShapeControllerText::createDialog( QWidget *parent ) const
|
||||
{
|
||||
return new QDialogText( parent );
|
||||
}
|
||||
|
||||
void QShapeControllerText::writeData( QXmlStreamWriter &writer, const QGraphicsItem *item ) const
|
||||
{
|
||||
const QGraphicsSimpleTextItem *textItem = static_cast< const QGraphicsSimpleTextItem * >( 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( "text", textItem->text() );
|
||||
}
|
||||
|
||||
void QShapeControllerText::replace( QGraphicsItem *item, const QString &from, const QString &to ) const
|
||||
{
|
||||
QGraphicsSimpleTextItem *textItem = static_cast< QGraphicsSimpleTextItem * >( item );
|
||||
if( textItem->text() == from )
|
||||
textItem->setText( to );
|
||||
}
|
||||
|
||||
|
||||
void QShapeControllerText::readData( const QString &element,
|
||||
const QXmlStreamAttributes &attrs,
|
||||
const QString &data,
|
||||
QGraphicsItem *item ) const
|
||||
{
|
||||
QGraphicsSimpleTextItem *textItem = static_cast< QGraphicsSimpleTextItem * >( item );
|
||||
|
||||
if( element == "pos" ) {
|
||||
textItem->setPos( attrs.value( "x" ).toString().toDouble(),
|
||||
attrs.value( "y" ).toString().toDouble() );
|
||||
textItem->setZValue( attrs.value( "z" ).toString().toDouble() );
|
||||
return;
|
||||
}
|
||||
|
||||
if( element == "font" ) {
|
||||
QFont font;
|
||||
font.fromString( data );
|
||||
textItem->setFont( font );
|
||||
return;
|
||||
}
|
||||
|
||||
if( element == "color" ) {
|
||||
textItem->setBrush( QColor( data ) );
|
||||
return;
|
||||
}
|
||||
|
||||
if( element == "text" ) {
|
||||
textItem->setText( data );
|
||||
return;
|
||||
}
|
||||
}
|
||||
@@ -1,65 +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 QLSCRIBE_H
|
||||
#define QLSCRIBE_H
|
||||
|
||||
enum LabelMode {
|
||||
/** label the entire disc */
|
||||
modeFull=0,
|
||||
/** label within the title mode constraints */
|
||||
modeTitle=1,
|
||||
/** label within the content mode constraints */
|
||||
modeContent=2
|
||||
};
|
||||
|
||||
enum DrawOptions {
|
||||
/** disable scaling of bitmaps; they will be cropped if needed */
|
||||
drawDefault=0,
|
||||
/** Fit the height to the label size */
|
||||
drawFitHeightToLabel=1,
|
||||
/** Fit the width to the label size */
|
||||
drawFitWidthToLabel=2,
|
||||
/** Fit the smallest dimension to the label size */
|
||||
drawFitSmallestToLabel=4
|
||||
};
|
||||
|
||||
enum PrintQuality {
|
||||
/** Best and slowest. */
|
||||
qualityBest=0,
|
||||
/** OK for everyday use. */
|
||||
qualityNormal=1,
|
||||
/** Fast but lower contrast. */
|
||||
qualityDraft=2
|
||||
};
|
||||
|
||||
enum MediaOptimizationLevel {
|
||||
/** Require that media is present and optimized labeling
|
||||
* parameters are available */
|
||||
mediaRecognized,
|
||||
/** Require that media is present but optimized labeling
|
||||
* parameters are not available */
|
||||
mediaGeneric
|
||||
};
|
||||
|
||||
const char * const DBusServiceName = "@QLSCRIBE_DBUS_MANAGER_SERVICE@";
|
||||
const char * const DBusManagerPath = "@QLSCRIBE_DBUS_MANAGER_PATH@";
|
||||
|
||||
#endif // QLSCRIBE_H
|
||||
+7
-14
@@ -7,39 +7,32 @@ QMAKE_LFLAGS += -m32
|
||||
QMAKE_LIBDIR = /usr/lib32
|
||||
SOURCES += main.cpp \
|
||||
mainwindow.cpp \
|
||||
qlightroundtextitem.cpp \
|
||||
qgraphicsroundtextitem.cpp \
|
||||
qcdview.cpp \
|
||||
qcdscene.cpp \
|
||||
qshapefactory.cpp \
|
||||
qshapecontrollers.cpp \
|
||||
qdialogtext.cpp \
|
||||
qdialogroundtext.cpp \
|
||||
qlightscribe.cpp \
|
||||
qdialogpixmap.cpp \
|
||||
qdialogprint.cpp \
|
||||
qdialogprogress.cpp \
|
||||
qlighttextitem.cpp \
|
||||
qlightpixmapitem.cpp \
|
||||
qdialogcdproperties.cpp \
|
||||
qconsoleprintprogress.cpp
|
||||
qdialogprogress.cpp
|
||||
QMAKE_LIBS += -llightscribe
|
||||
HEADERS += mainwindow.h \
|
||||
qlightroundtextitem.h \
|
||||
qgraphicsroundtextitem.h \
|
||||
qcdview.h \
|
||||
qcdscene.h \
|
||||
qshapefactory.h \
|
||||
qshapecontrollers.h \
|
||||
qdialogtext.h \
|
||||
qdialogroundtext.h \
|
||||
qlightscribe.h \
|
||||
qdialogpixmap.h \
|
||||
qdialogprint.h \
|
||||
qdialogprogress.h \
|
||||
qlighttextitem.h \
|
||||
qlightpixmapitem.h \
|
||||
qdialogcdproperties.h \
|
||||
qconsoleprintprogress.h
|
||||
qdialogprogress.h
|
||||
FORMS += qdialogtext.ui \
|
||||
qdialogroundtext.ui \
|
||||
qdialogpixmap.ui \
|
||||
qdialogprint.ui \
|
||||
qdialogprogress.ui \
|
||||
qdialogcdproperties.ui
|
||||
qdialogprogress.ui
|
||||
|
||||
@@ -18,25 +18,78 @@
|
||||
|
||||
$Id$ */
|
||||
|
||||
#include "qlightpixmapitem.h"
|
||||
#include "qshapecontrollers.h"
|
||||
#include "qdialogtext.h"
|
||||
#include "qdialogpixmap.h"
|
||||
#include "qcdscene.h"
|
||||
|
||||
#include <QXmlStreamWriter>
|
||||
#include <QXmlStreamReader>
|
||||
|
||||
QLightPixmapItem::QLightPixmapItem()
|
||||
RegisterController< QShapeControllerText > regControllerText;
|
||||
|
||||
QString QShapeControllerText::name() const
|
||||
{
|
||||
return "text";
|
||||
}
|
||||
|
||||
QVariant QLightPixmapItem::itemChange( GraphicsItemChange change, const QVariant & value )
|
||||
QString QShapeControllerText::menuName() const
|
||||
{
|
||||
if( scene() && change == ItemPositionHasChanged )
|
||||
static_cast<QCDScene *>( scene() )->setChanged();
|
||||
|
||||
return value;
|
||||
return QObject::tr( "Text", "QShapeControllerText name" );
|
||||
}
|
||||
|
||||
QGraphicsItem *QShapeControllerText::create() const
|
||||
{
|
||||
return new QGraphicsSimpleTextItem;
|
||||
}
|
||||
|
||||
QItemDialog *QShapeControllerText::createDialog( QWidget *parent ) const
|
||||
{
|
||||
return new QDialogText( parent );
|
||||
}
|
||||
|
||||
void QShapeControllerText::writeData( QXmlStreamWriter &writer, const QGraphicsItem *item ) const
|
||||
{
|
||||
const QGraphicsSimpleTextItem *textItem = static_cast< const QGraphicsSimpleTextItem * >( item );
|
||||
writer.writeEmptyElement( "pos" );
|
||||
writer.writeAttribute( QXmlStreamAttribute( "x", QString::number( textItem->pos().x() ) ) );
|
||||
writer.writeAttribute( QXmlStreamAttribute( "y", QString::number( textItem->pos().y() ) ) );
|
||||
|
||||
writer.writeTextElement( "font", textItem->font().toString() );
|
||||
writer.writeTextElement( "color", textItem->brush().color().name() );
|
||||
writer.writeTextElement( "text", textItem->text() );
|
||||
}
|
||||
|
||||
|
||||
void QShapeControllerText::readData( const QString &element,
|
||||
const QXmlStreamAttributes &attrs,
|
||||
const QString &data,
|
||||
QGraphicsItem *item ) const
|
||||
{
|
||||
QGraphicsSimpleTextItem *textItem = static_cast< QGraphicsSimpleTextItem * >( item );
|
||||
|
||||
if( element == "pos" ) {
|
||||
textItem->setPos( attrs.value( "x" ).toString().toDouble(),
|
||||
attrs.value( "y" ).toString().toDouble() );
|
||||
return;
|
||||
}
|
||||
|
||||
if( element == "font" ) {
|
||||
QFont font;
|
||||
font.fromString( data );
|
||||
textItem->setFont( font );
|
||||
return;
|
||||
}
|
||||
|
||||
if( element == "color" ) {
|
||||
textItem->setBrush( QColor( data ) );
|
||||
return;
|
||||
}
|
||||
|
||||
if( element == "text" ) {
|
||||
textItem->setText( data );
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
RegisterController< QShapeControllerPixmap > regControllerPixmap;
|
||||
|
||||
@@ -52,7 +105,7 @@ QString QShapeControllerPixmap::menuName() const
|
||||
|
||||
QGraphicsItem *QShapeControllerPixmap::create() const
|
||||
{
|
||||
QGraphicsPixmapItem *item = new QLightPixmapItem;
|
||||
QGraphicsPixmapItem *item = new QGraphicsPixmapItem;
|
||||
item->setShapeMode( QGraphicsPixmapItem::BoundingRectShape );
|
||||
item->setTransformationMode( Qt::SmoothTransformation );
|
||||
|
||||
@@ -70,9 +123,10 @@ void QShapeControllerPixmap::writeData( QXmlStreamWriter &writer, const QGraphic
|
||||
= static_cast< const QGraphicsPixmapItem * >( item );
|
||||
|
||||
writer.writeEmptyElement( "pos" );
|
||||
writer.writeAttribute( QXmlStreamAttribute( "x", QString::number( pixmapItem->pos().x() ) ) );
|
||||
writer.writeAttribute( QXmlStreamAttribute( "y", QString::number( pixmapItem->pos().y() ) ) );
|
||||
writer.writeAttribute( QXmlStreamAttribute( "z", QString::number( pixmapItem->zValue() ) ) );
|
||||
writer.writeAttribute(
|
||||
QXmlStreamAttribute( "x", QString::number( pixmapItem->pos().x() ) ) );
|
||||
writer.writeAttribute(
|
||||
QXmlStreamAttribute( "y", QString::number( pixmapItem->pos().y() ) ) );
|
||||
|
||||
QPointF scale = pixmapItem->transform().map( QPointF( 1.0, 1.0 ) );
|
||||
writer.writeEmptyElement( "scale" );
|
||||
@@ -95,7 +149,6 @@ void QShapeControllerPixmap::readData( const QString &element,
|
||||
if( element == "pos" ) {
|
||||
pixmapItem->setPos( attrs.value( "x" ).toString().toDouble(),
|
||||
attrs.value( "y" ).toString().toDouble() );
|
||||
pixmapItem->setZValue( attrs.value( "z" ).toString().toDouble() );
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -18,32 +18,22 @@
|
||||
|
||||
$Id$ */
|
||||
|
||||
#ifndef QLIGHTTEXTITEM_H
|
||||
#define QLIGHTTEXTITEM_H
|
||||
|
||||
#include <QGraphicsSimpleTextItem>
|
||||
#ifndef QSHAPECONTROLLERS_H
|
||||
#define QSHAPECONTROLLERS_H
|
||||
|
||||
#include "qshapefactory.h"
|
||||
|
||||
class QLightTextItem : public QGraphicsSimpleTextItem
|
||||
{
|
||||
public:
|
||||
QLightTextItem();
|
||||
|
||||
protected:
|
||||
virtual QVariant itemChange ( GraphicsItemChange change, const QVariant & value );
|
||||
|
||||
};
|
||||
#include <QGraphicsSimpleTextItem>
|
||||
#include <QGraphicsPixmapItem>
|
||||
|
||||
class QShapeControllerText : public QShapeController {
|
||||
public:
|
||||
enum { Type = QLightTextItem::Type };
|
||||
enum { Type = QGraphicsSimpleTextItem::Type };
|
||||
|
||||
virtual QString name() const;
|
||||
virtual QString menuName() const;
|
||||
|
||||
virtual QGraphicsItem *create() const;
|
||||
virtual void replace( QGraphicsItem *item, const QString &from, const QString &to ) const;
|
||||
|
||||
protected:
|
||||
virtual QItemDialog *createDialog( QWidget *parent ) const;
|
||||
@@ -54,4 +44,22 @@ protected:
|
||||
QGraphicsItem *item ) const;
|
||||
};
|
||||
|
||||
#endif // QLIGHTTEXTITEM_H
|
||||
class QShapeControllerPixmap : public QShapeController {
|
||||
public:
|
||||
enum { Type = QGraphicsPixmapItem::Type };
|
||||
|
||||
virtual QString name() const;
|
||||
virtual QString menuName() const;
|
||||
|
||||
virtual QGraphicsItem *create() const;
|
||||
|
||||
protected:
|
||||
virtual QItemDialog *createDialog( QWidget *parent ) const;
|
||||
virtual void writeData( QXmlStreamWriter &writer, const QGraphicsItem *item ) const;
|
||||
virtual void readData( const QString &element,
|
||||
const QXmlStreamAttributes &attrs,
|
||||
const QString &data,
|
||||
QGraphicsItem *item ) const;
|
||||
};
|
||||
|
||||
#endif // QSHAPECONTROLLERS_H
|
||||
+1
-10
@@ -16,10 +16,9 @@
|
||||
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:$ */
|
||||
|
||||
#include "qshapefactory.h"
|
||||
#include "qcdscene.h"
|
||||
|
||||
#include <QGraphicsItem>
|
||||
#include <QMessageBox>
|
||||
@@ -44,10 +43,6 @@ bool QShapeController::edit( QGraphicsItem *item, QWidget *parent ) const
|
||||
throw;
|
||||
}
|
||||
delete dialog;
|
||||
|
||||
if( rez && item->scene() )
|
||||
static_cast< QCDScene * >( item->scene() )->setChanged();
|
||||
|
||||
return rez;
|
||||
}
|
||||
|
||||
@@ -88,10 +83,6 @@ QGraphicsItem *QShapeController::read( QXmlStreamReader &reader ) const
|
||||
return item;
|
||||
}
|
||||
|
||||
void QShapeController::replace( QGraphicsItem *, const QString &, const QString & ) const
|
||||
{
|
||||
}
|
||||
|
||||
QShapeFactory &QShapeFactory::QShapeFactory::instance()
|
||||
{
|
||||
static QShapeFactory inst;
|
||||
|
||||
+1
-4
@@ -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 QSHAPEFACTORY_H
|
||||
#define QSHAPEFACTORY_H
|
||||
@@ -46,13 +46,10 @@ public:
|
||||
virtual QString name() const = 0;
|
||||
virtual QString menuName() const = 0;
|
||||
virtual QGraphicsItem *create() const = 0;
|
||||
|
||||
bool edit( QGraphicsItem *item, QWidget *parent ) const;
|
||||
void write( QXmlStreamWriter &writer, const QGraphicsItem *item ) const;
|
||||
QGraphicsItem *read( QXmlStreamReader &reader ) const;
|
||||
|
||||
virtual void replace( QGraphicsItem *item, const QString &from, const QString &to ) const;
|
||||
|
||||
protected:
|
||||
virtual QItemDialog *createDialog( QWidget *parent ) const = 0;
|
||||
virtual void writeData( QXmlStreamWriter &writer, const QGraphicsItem *item ) const = 0;
|
||||
|
||||
Reference in New Issue
Block a user