Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 95 → Rev 96

/trunk/Scribus/configure.in
124,8 → 124,16
AC_ENABLE_SHARED(yes)
AC_ENABLE_STATIC(no)
KDE_PROG_LIBTOOL
hapy=no
KDE_CHECK_PYTHON(1.5)
 
COMPILE_PYTHON=no
AC_ARG_WITH(python, [ --without-python Do not compile the Scripter Plugin],[ COMPILE_PYTHON=no ],[ COMPILE_PYTHON=yes ])
if test $hapy = no; then
COMPILE_PYTHON=no
fi
AM_CONDITIONAL(COMPILE_PYTHON, test x$COMPILE_PYTHON = xyes)
 
AC_CHECK_HEADER(cups/cups.h, [foo=""],[hacups=no])
if test $hacups = yes; then
AC_DEFINE_UNQUOTED(HAVE_CUPS, 1, [Cups])
182,5 → 190,8
else
echo "TiffLib installed: No"
fi
if test $COMPILE_PYTHON = no; then
echo "The Scripter-Plugin will no be build."
fi
echo ""
echo "Start make now."
/trunk/Scribus/admin/acinclude.m4.in
3974,6 → 3974,7
AC_SUBST(PYTHONLIB)
AC_SUBST(LIBPYTHON)
AC_SUBST(PYTHONMODDIR)
hapy=yes
AC_DEFINE(HAVE_PYTHON, 1, [Define if you have the development files for python])
fi
 
/trunk/Scribus/ChangeLogCVS
1,4 → 1,7
Changes since Version 1.1.2
06.11.2003 Added a --without-python option to ./configure for
those who don't have a use for the Scripter-Plugin.
 
05.11.2003 Improved the Preview in the charselect plugin.
 
04.11.2003 When you resize a Textframe with the Mouse and press
/trunk/Scribus/scribus/libabout/about.cpp
32,7 → 32,7
tabLayout1->addWidget( PixmapLabel1 );
BuildID = new QLabel( tab, "BB" );
BuildID->setAlignment(Qt::AlignCenter);
QString bu = "05. November 2003 ";
QString bu = "06. November 2003 ";
#ifdef HAVE_CMS
bu += "C";
#else
/trunk/Scribus/scribus/plugins/scriptplugin/samples/Makefile.am
1,7 → 1,7
####### kdevelop will overwrite this part!!! (begin)##########
 
 
EXTRA_DIST = Sample1.py Calender.py trait_de_coupe.py pochette_cd.py htmlimport.py 3columnUSLTR.py 3columnA4.py ReadMe
EXTRA_DIST = Sample1.py Calender.py trait_de_coupe.py pochette_cd.py htmlimport.py 3columnUSLTR.py 3columnA4.py legende.py moins_10_pourcent_group.py plus_10_pourcent_group.py ReadMe
 
install-data-local:
$(mkinstalldirs) $(prefix)/lib/scribus/samples/
19,6 → 19,12
$(mkinstalldirs) $(prefix)/lib/scribus/samples/
$(INSTALL_DATA) $(srcdir)/3columnA4.py $(prefix)/lib/scribus/samples/3columnA4.py
$(mkinstalldirs) $(prefix)/lib/scribus/samples/
$(INSTALL_DATA) $(srcdir)/legende.py $(prefix)/lib/scribus/samples/legende.py
$(mkinstalldirs) $(prefix)/lib/scribus/samples/
$(INSTALL_DATA) $(srcdir)/moins_10_pourcent_group.py $(prefix)/lib/scribus/samples/moins_10_pourcent_group.py
$(mkinstalldirs) $(prefix)/lib/scribus/samples/
$(INSTALL_DATA) $(srcdir)/plus_10_pourcent_group.py $(prefix)/lib/scribus/samples/plus_10_pourcent_group.py
$(mkinstalldirs) $(prefix)/lib/scribus/samples/
$(INSTALL_DATA) $(srcdir)/ReadMe $(prefix)/lib/scribus/samples/ReadMe
 
uninstall-local:
29,6 → 35,9
-rm -f $(prefix)/lib/scribus/samples/htmlimport.py
-rm -f $(prefix)/lib/scribus/samples/3columnUSLTR.py
-rm -f $(prefix)/lib/scribus/samples/3columnA4.py
-rm -f $(prefix)/lib/scribus/samples/moins_10_pourcent_group.py
-rm -f $(prefix)/lib/scribus/samples/plus_10_pourcent_group.py
-rm -f $(prefix)/lib/scribus/samples/legende.py
-rm -f $(prefix)/lib/scribus/samples/ReadMe
 
####### kdevelop will overwrite this part!!! (end)############
/trunk/Scribus/scribus/plugins/scriptplugin/Makefile.am
1,3 → 1,4
if COMPILE_PYTHON
SUBDIRS = doc samples
pluginsdir = $(prefix)/lib/scribus/plugins
AM_CPPFLAGS = -I$(top_builddir)/scribus $(PYTHONINC)
9,3 → 10,4
EXTRA_DIST = cmdvar.h cmdutil.cpp cmdutil.h cmddialog.cpp cmddialog.h cmddoc.cpp cmddoc.h cmdpage.cpp cmdpage.h cmdobj.cpp cmdobj.h cmdgetprop.cpp cmdgetprop.h cmdsetprop.cpp cmdsetprop.h cmdtext.cpp cmdtext.h cmdmani.cpp cmdmani.h cmdcolor.cpp cmdcolor.h cmdmisc.cpp cmdmisc.h scriptplugin.cpp scriptplugin.h pconsole.cpp pconsole.h conswin.cpp conswin.h
KDE_OPTIONS = qtonly
AM_LDFLAGS = -Xlinker -s $(PYTHONLIB) $(LIBPYTHON)
endif
/trunk/Scribus/scribus/plugins/libchar/charselect.h
37,10 → 37,11
Q_OBJECT
 
public:
Zoom( QWidget* parent, QPixmap pix);
Zoom( QWidget* parent, QPixmap pix, uint val);
~Zoom();
void paintEvent(QPaintEvent *);
QPixmap pixm;
QString valu;
};
 
class ChTable;
/trunk/Scribus/scribus/plugins/libchar/charselect.cpp
36,12 → 36,15
}
}
 
Zoom::Zoom(QWidget* parent, QPixmap pix) : QDialog( parent, "Edit", false, WStyle_Customize | WStyle_NoBorderEx)
Zoom::Zoom(QWidget* parent, QPixmap pix, uint val) : QDialog( parent, "Edit", false, WStyle_Customize | WStyle_NoBorderEx)
{
resize(pix.width()+2,pix.height()+2);
setMinimumSize(QSize(pix.width()+2,pix.height()+2));
setMaximumSize(QSize(pix.width()+2,pix.height()+2));
QString tmp;
resize(pix.width()+2,pix.height()+20);
setMinimumSize(QSize(pix.width()+2,pix.height()+20));
setMaximumSize(QSize(pix.width()+2,pix.height()+20));
pixm = pix;
tmp.sprintf("%04X", val);
valu = "0x"+tmp;
}
 
Zoom::~Zoom()
56,6 → 59,7
p.setBrush(NoBrush);
p.drawRect(0, 0, width(), height());
p.drawPixmap(1, 1, pixm);
p.drawText(5, height()-3, valu);
p.end();
}
 
95,7 → 99,7
p->end();
}
delete p;
dia = new Zoom(this, pixm);
dia = new Zoom(this, pixm, par->Zeich[r*32+c]);
QPoint ps = QCursor::pos();
dia->move(ps.x()-2, ps.y()-2);
dia->show();