| -rw-r--r-- | libopie2/opieui/odialog.cpp | 16 | ||||
| -rw-r--r-- | libopie2/opieui/odialog.h | 10 | ||||
| -rw-r--r-- | libopie2/opieui/oimageeffect.cpp | 41 | ||||
| -rw-r--r-- | libopie2/opieui/olistview.cpp | 20 | ||||
| -rw-r--r-- | libopie2/opieui/opieui.pro | 22 | ||||
| -rw-r--r-- | libopie2/opieui/oseparator.cpp | 12 | ||||
| -rw-r--r-- | libopie2/opieui/oversatileview.cpp | 25 |
7 files changed, 75 insertions, 71 deletions
diff --git a/libopie2/opieui/odialog.cpp b/libopie2/opieui/odialog.cpp index 00a7a7e..4d269d4 100644 --- a/libopie2/opieui/odialog.cpp +++ b/libopie2/opieui/odialog.cpp @@ -2,4 +2,3 @@ This file is part of the Opie Project - - Copyright (C) 2003 Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de> + Copyright (C) 2003 Michael 'Mickey' Lauer <mickey@Vanille.de> =. @@ -33,8 +32,11 @@ -int ODialog::mMarginSize = 5; // 11 like in KDialog is probably too much for PDA -int ODialog::mSpacingSize = 2; // 6 like in KDialog is probably too much for PDA +#warning Make Margin and Spacing device dependend and configurable! + +int ODialog::mMarginSize = 5; +int ODialog::mSpacingSize = 2; ODialog::ODialog(QWidget *parent, const char *name, bool modal, WFlags f) - : QDialog(parent, name, modal, f) + :QDialog(parent, name, modal, f) { + // d = new ODialogPrivate(); } @@ -43,3 +45,3 @@ int ODialog::marginHint() { - return( mMarginSize ); + return( mMarginSize ); } @@ -49,3 +51,3 @@ int ODialog::spacingHint() { - return( mSpacingSize ); + return( mSpacingSize ); } diff --git a/libopie2/opieui/odialog.h b/libopie2/opieui/odialog.h index 4116ed7..ceff612 100644 --- a/libopie2/opieui/odialog.h +++ b/libopie2/opieui/odialog.h @@ -2,4 +2,3 @@ This file is part of the Opie Project - - (C) 2003 Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de> + (C) 2003 Michael 'Mickey' Lauer <mickey@Vanille.de> =. @@ -51,5 +50,8 @@ class QLayoutItem; * - * @author Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de> + * @author Michael 'Mickey' Lauer <mickey@Vanille.de> */ + // lets fix up Qt instead! Size does matter. -zecke + // while that may be true, reducing maintainance effort for the future does also matter - + // and I believe that maintaining a patch against QtE is more work than our classes -mml @@ -85,3 +87,3 @@ class ODialog : public QDialog class ODialogPrivate; - ODialogPrivate *d; // d pointer always needed! -zecke + ODialogPrivate *d; diff --git a/libopie2/opieui/oimageeffect.cpp b/libopie2/opieui/oimageeffect.cpp index 01e7c6f..9a58bb9 100644 --- a/libopie2/opieui/oimageeffect.cpp +++ b/libopie2/opieui/oimageeffect.cpp @@ -36,3 +36,4 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#include "oimageeffect.h" +#include <opie2/oimageeffect.h> +#include <opie2/odebug.h> @@ -65,3 +66,3 @@ QImage OImageEffect::gradient(const QSize &size, const QColor &ca, if (size.width() == 0 || size.height() == 0) { - qDebug( "WARNING: OImageEffect::gradient: invalid image" ); + odebug << "WARNING: OImageEffect::gradient: invalid image" << oendl; return image; @@ -351,3 +352,3 @@ QImage OImageEffect::unbalancedGradient(const QSize &size, const QColor &ca, if (size.width() == 0 || size.height() == 0) { - qDebug( "WARNING: OImageEffect::unbalancedGradient : invalid image" ); + odebug << "WARNING: OImageEffect::unbalancedGradient : invalid image" << oendl; return image; @@ -570,3 +571,3 @@ QImage& OImageEffect::intensity(QImage &image, float percent) if (image.width() == 0 || image.height() == 0) { - qDebug( "WARNING: OImageEffect::intensity : invalid image" ); + odebug << "WARNING: OImageEffect::intensity : invalid image" << oendl; return image; @@ -635,3 +636,3 @@ QImage& OImageEffect::channelIntensity(QImage &image, float percent, if (image.width() == 0 || image.height() == 0) { - qDebug( "WARNING: OImageEffect::channelIntensity : invalid image" ); + odebug << "WARNING: OImageEffect::channelIntensity : invalid image" << oendl; return image; @@ -725,3 +726,3 @@ QImage& OImageEffect::modulate(QImage &image, QImage &modImage, bool reverse, modImage.width() == 0 || modImage.height() == 0) { - qDebug( "WARNING: OImageEffect::modulate : invalid image" ); + odebug << "WARNING: OImageEffect::modulate : invalid image" << oendl; return image; @@ -854,3 +855,3 @@ QImage& OImageEffect::blend(const QColor& clr, QImage& dst, float opacity) if (opacity < 0.0 || opacity > 1.0) { - qDebug( "WARNING: OImageEffect::blend : invalid opacity. Range [0, 1] "); + odebug << "WARNING: OImageEffect::blend : invalid opacity. Range [0, 1] " << oendl; return dst; @@ -897,3 +898,3 @@ QImage& OImageEffect::blend(QImage& src, QImage& dst, float opacity) if (src.width() != dst.width() || src.height() != dst.height()) { - qDebug( "WARNING: OImageEffect::blend : src and destination images are not the same size" ); + odebug << "WARNING: OImageEffect::blend : src and destination images are not the same size" << oendl; return dst; @@ -902,3 +903,3 @@ QImage& OImageEffect::blend(QImage& src, QImage& dst, float opacity) if (opacity < 0.0 || opacity > 1.0) { - qDebug( "WARNING: OImageEffect::blend : invalid opacity. Range [0, 1]" ); + odebug << "WARNING: OImageEffect::blend : invalid opacity. Range [0, 1]" << oendl; return dst; @@ -942,3 +943,3 @@ QImage& OImageEffect::blend(QImage &image, float initial_intensity, if (image.width() == 0 || image.height() == 0 || image.depth()!=32 ) { - qDebug( "WARNING: OImageEffect::blend : invalid image" ); + odebug << "WARNING: OImageEffect::blend : invalid image" << oendl; return image; @@ -1135,3 +1136,3 @@ QImage& OImageEffect::blend(QImage &image, float initial_intensity, } - else qDebug( "OImageEffect::blend effect not implemented" ); + else odebug << "OImageEffect::blend effect not implemented" << oendl; return image; @@ -1165,3 +1166,3 @@ QImage& OImageEffect::blend(QImage &image1, QImage &image2, blendImage.width() == 0 || blendImage.height() == 0) { - qDebug( "OImageEffect::blend effect invalid image" ); + odebug << "OImageEffect::blend effect invalid image" << oendl; return image1; @@ -1263,3 +1264,3 @@ QImage& OImageEffect::hash(QImage &image, Lighting lite, unsigned int spacing) if (image.width() == 0 || image.height() == 0) { - qDebug( "OImageEffect::hash effect invalid image" ); + odebug << "OImageEffect::hash effect invalid image" << oendl; return image; @@ -1771,3 +1772,3 @@ bool OImageEffect::blend( { - qDebug( "OImageEffect::blend : Sizes not correct" ); + odebug << "OImageEffect::blend : Sizes not correct" << oendl; return false; @@ -1988,3 +1989,3 @@ void OImageEffect::normalize(QImage &img) if(!normalize_map || !histogram){ - qWarning("Unable to allocate normalize histogram and map"); + owarn << "Unable to allocate normalize histogram and map" << oendl; free(normalize_map); @@ -2104,3 +2105,3 @@ void OImageEffect::equalize(QImage &img) if(!histogram || !map || !equalize_map){ - qWarning("Unable to allocate equalize histogram and maps"); + owarn << "Unable to allocate equalize histogram and maps" << oendl; free(histogram); @@ -2189,3 +2190,3 @@ QImage OImageEffect::sample(QImage &src, int w, int h) if(!x_offset || !y_offset){ - qWarning("Unable to allocate pixels buffer"); + owarn << "Unable to allocate pixels buffer" << oendl; free(x_offset); @@ -2207,3 +2208,3 @@ QImage OImageEffect::sample(QImage &src, int w, int h) if(!pixels){ - qWarning("Unable to allocate pixels buffer"); + owarn << "Unable to allocate pixels buffer" << oendl; free(pixels); @@ -2235,3 +2236,3 @@ QImage OImageEffect::sample(QImage &src, int w, int h) if(!pixels){ - qWarning("Unable to allocate pixels buffer"); + owarn << "Unable to allocate pixels buffer" << oendl; free(pixels); @@ -3074,3 +3075,3 @@ QImage OImageEffect::oilPaint(QImage &src, int radius) if(src.depth() < 32){ - qWarning("Oil Paint source image < 32bpp. Convert before using!"); + owarn << "Oil Paint source image < 32bpp. Convert before using!" << oendl; return(src); diff --git a/libopie2/opieui/olistview.cpp b/libopie2/opieui/olistview.cpp index ec503dd..38f3fe2 100644 --- a/libopie2/opieui/olistview.cpp +++ b/libopie2/opieui/olistview.cpp @@ -2,4 +2,3 @@ This file is part of the Opie Project - - =. (C) 2003 Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de> + =. (C) 2003 Michael 'Mickey' Lauer <mickey@Vanille.de> .=l. @@ -39,2 +38,3 @@ +#include <opie2/odebug.h> #include <opie2/olistview.h> @@ -144,3 +144,3 @@ void OListView::serializeTo( QDataStream& s ) const #warning Caution... the binary format is still under construction... - qDebug( "storing OListView..." ); + odebug << "storing OListView..." << oendl; @@ -169,3 +169,3 @@ void OListView::serializeTo( QDataStream& s ) const - qDebug( "OListview stored." ); + odebug << "OListview stored." << oendl; } @@ -175,3 +175,3 @@ void OListView::serializeFrom( QDataStream& s ) #warning Caution... the binary format is still under construction... - qDebug( "loading OListView..." ); + odebug << "loading OListView..." << oendl; @@ -201,3 +201,3 @@ void OListView::serializeFrom( QDataStream& s ) - qDebug( "OListView loaded." ); + odebug << "OListView loaded." << oendl; @@ -379,3 +379,3 @@ void OListViewItem::serializeTo( QDataStream& s ) const #warning Caution... the binary format is still under construction... - qDebug( "storing OListViewItem..." ); + odebug << "storing OListViewItem..." << oendl; @@ -405,3 +405,3 @@ void OListViewItem::serializeTo( QDataStream& s ) const - qDebug( "OListviewItem stored." ); + odebug << "OListviewItem stored." << oendl; } @@ -412,3 +412,3 @@ void OListViewItem::serializeFrom( QDataStream& s ) #warning Caution... the binary format is still under construction... - qDebug( "loading OListViewItem..." ); + odebug << "loading OListViewItem..." << oendl; @@ -432,3 +432,3 @@ void OListViewItem::serializeFrom( QDataStream& s ) - qDebug( "OListViewItem loaded." ); + odebug << "OListViewItem loaded." << oendl; } diff --git a/libopie2/opieui/opieui.pro b/libopie2/opieui/opieui.pro index b455602..61f9bbb 100644 --- a/libopie2/opieui/opieui.pro +++ b/libopie2/opieui/opieui.pro @@ -12,5 +12,6 @@ HEADERS = olistview.h \ odialog.h \ - omessagebox.h \ - oresource.h \ - oseparator.h + omessagebox.h \ + oresource.h \ + otaskbarapplet.h \ + oseparator.h @@ -25,4 +26,5 @@ SOURCES = olistview.cpp \ odialog.cpp \ - oresource.cpp \ - oseparator.cpp + oresource.cpp \ + otaskbarapplet.cpp \ + oseparator.cpp @@ -31,8 +33,7 @@ TARGET = opieui2 VERSION = 1.8.2 + INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include -LIBS += -lopiecore2 -MOC_DIR = moc -OBJECTS_DIR = obj +LIBS += -lopiecore2 @@ -40,4 +41,2 @@ OBJECTS_DIR = obj include ( $(OPIEDIR)/include.pro ) - HEADERS += otaskbarapplet.h - SOURCES += otaskbarapplet.cpp } @@ -45,4 +44,3 @@ OBJECTS_DIR = obj contains( platform, x11 ) { - LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib - message( Warning: NO otaskbarapplet ATM ) + LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib } diff --git a/libopie2/opieui/oseparator.cpp b/libopie2/opieui/oseparator.cpp index 85181dc..98d42c7 100644 --- a/libopie2/opieui/oseparator.cpp +++ b/libopie2/opieui/oseparator.cpp @@ -2,3 +2,2 @@ This file is part of the Opie Project - Copyright (C) 2003 Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de> @@ -32,10 +31,11 @@ -/* QT */ - -#include <qstyle.h> - /* OPIE */ +#include <opie2/odebug.h> #include <opie2/oseparator.h> +/* QT */ + +#include <qstyle.h> + OSeparator::OSeparator(QWidget* parent, const char* name, WFlags f) @@ -71,3 +71,3 @@ void OSeparator::setOrientation(int orientation) default: - qWarning( "OSeparator::setOrientation(): invalid orientation, using default orientation HLine" ); + owarn << "OSeparator::setOrientation(): invalid orientation, using default orientation HLine" << oendl; diff --git a/libopie2/opieui/oversatileview.cpp b/libopie2/opieui/oversatileview.cpp index 6808539..65fe3d8 100644 --- a/libopie2/opieui/oversatileview.cpp +++ b/libopie2/opieui/oversatileview.cpp @@ -30,2 +30,9 @@ +/* OPIE */ + +#include <opie2/odebug.h> +#include <opie2/oversatileview.h> +#include <opie2/oversatileviewitem.h> +#include <opie2/olistview.h> + /* QT */ @@ -46,8 +53,2 @@ -/* OPIE */ - -#include <opie2/oversatileview.h> -#include <opie2/oversatileviewitem.h> -#include <opie2/olistview.h> - /* XPM */ @@ -291,3 +292,3 @@ void OVersatileView::setDefaultPixmaps( int mode, QPixmap& leaf, QPixmap& opened { - qDebug( "OVersatileView::setDefaultPixmaps(): invalid mode" ); + odebug << "OVersatileView::setDefaultPixmaps(): invalid mode" << oendl; } @@ -319,3 +320,3 @@ void OVersatileView::setViewMode( int mode ) { - qDebug( "OVersatileView::setViewMode(): invalid mode" ); + odebug << "OVersatileView::setViewMode(): invalid mode" << oendl; } @@ -345,3 +346,3 @@ bool OVersatileView::isValidViewMode( int mode ) const { - qDebug( "OVersatileView::isValidViewMode(): Requested operation not valid in current mode." ); + odebug << "OVersatileView::isValidViewMode(): Requested operation not valid in current mode." << oendl; return true; @@ -353,3 +354,3 @@ bool OVersatileView::isValidViewMode( int mode ) const { - qDebug( "OVersatileView::isValidViewMode(): Requested operation not valid in current mode." ); + odebug << "OVersatileView::isValidViewMode(): Requested operation not valid in current mode." << oendl; return false; @@ -359,3 +360,3 @@ bool OVersatileView::isValidViewMode( int mode ) const { - qWarning( "OVersatileView::isValidViewMode(): Inconsistent object state!" ); + owarn << "OVersatileView::isValidViewMode(): Inconsistent object state!" << oendl; return true; @@ -450,3 +451,3 @@ void OVersatileView::expanded( QListViewItem *item ) // QListView { - //qDebug( "OVersatileView::expanded(): opening tree..." ); + //odebug << "OVersatileView::expanded(): opening tree..." << oendl; if ( !_treeopened.isNull() ) |