| -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 @@ -1,7 +1,6 @@ /* 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> =. .=l. .>+-= @@ -31,23 +30,26 @@ #include <opie2/odialog.h> -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(); } int ODialog::marginHint() { - return( mMarginSize ); + return( mMarginSize ); } int ODialog::spacingHint() { - return( mSpacingSize ); + return( mSpacingSize ); } // Placeholder for even more sophisticed things 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 @@ -1,7 +1,6 @@ /* 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. .>+-= @@ -49,9 +48,12 @@ class QLayoutItem; * @ref marginHint() between the buttons and the separator and a * @ref marginHint() above the separator as well. * - * @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 class ODialog : public QDialog { @@ -83,7 +85,7 @@ class ODialog : public QDialog static int mSpacingSize; class ODialogPrivate; - ODialogPrivate *d; // d pointer always needed! -zecke + ODialogPrivate *d; }; #endif // ODIALOG_H 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 @@ -34,7 +34,8 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include <qimage.h> #include <stdlib.h> -#include "oimageeffect.h" +#include <opie2/oimageeffect.h> +#include <opie2/odebug.h> #define MaxRGB 255L #define DegreesToRadians(x) ((x)*M_PI/180.0) @@ -63,7 +64,7 @@ QImage OImageEffect::gradient(const QSize &size, const QColor &ca, QImage image(size, 32); if (size.width() == 0 || size.height() == 0) { - qDebug( "WARNING: OImageEffect::gradient: invalid image" ); + odebug << "WARNING: OImageEffect::gradient: invalid image" << oendl; return image; } @@ -349,7 +350,7 @@ QImage OImageEffect::unbalancedGradient(const QSize &size, const QColor &ca, QImage image(size, 32); if (size.width() == 0 || size.height() == 0) { - qDebug( "WARNING: OImageEffect::unbalancedGradient : invalid image" ); + odebug << "WARNING: OImageEffect::unbalancedGradient : invalid image" << oendl; return image; } @@ -568,7 +569,7 @@ QImage OImageEffect::unbalancedGradient(const QSize &size, const QColor &ca, 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; } @@ -633,7 +634,7 @@ QImage& OImageEffect::channelIntensity(QImage &image, float percent, RGBComponent channel) { if (image.width() == 0 || image.height() == 0) { - qDebug( "WARNING: OImageEffect::channelIntensity : invalid image" ); + odebug << "WARNING: OImageEffect::channelIntensity : invalid image" << oendl; return image; } @@ -723,7 +724,7 @@ QImage& OImageEffect::modulate(QImage &image, QImage &modImage, bool reverse, { if (image.width() == 0 || image.height() == 0 || modImage.width() == 0 || modImage.height() == 0) { - qDebug( "WARNING: OImageEffect::modulate : invalid image" ); + odebug << "WARNING: OImageEffect::modulate : invalid image" << oendl; return image; } @@ -852,7 +853,7 @@ QImage& OImageEffect::blend(const QColor& clr, QImage& dst, float opacity) return dst; 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; } @@ -895,12 +896,12 @@ QImage& OImageEffect::blend(QImage& src, QImage& dst, float opacity) return dst; 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; } 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; } @@ -940,7 +941,7 @@ QImage& OImageEffect::blend(QImage &image, float initial_intensity, bool anti_dir) { 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; } @@ -1133,7 +1134,7 @@ 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; } @@ -1163,7 +1164,7 @@ QImage& OImageEffect::blend(QImage &image1, QImage &image2, if (image1.width() == 0 || image1.height() == 0 || image2.width() == 0 || image2.height() == 0 || blendImage.width() == 0 || blendImage.height() == 0) { - qDebug( "OImageEffect::blend effect invalid image" ); + odebug << "OImageEffect::blend effect invalid image" << oendl; return image1; } @@ -1261,7 +1262,7 @@ unsigned int OImageEffect::uHash(unsigned int c) 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; } @@ -1769,7 +1770,7 @@ bool OImageEffect::blend( lower.depth() != 32 ) { - qDebug( "OImageEffect::blend : Sizes not correct" ); + odebug << "OImageEffect::blend : Sizes not correct" << oendl; return false; } @@ -1986,7 +1987,7 @@ void OImageEffect::normalize(QImage &img) histogram = (int *)calloc(MaxRGB+1, sizeof(int)); normalize_map = (unsigned int *)malloc((MaxRGB+1)*sizeof(unsigned int)); if(!normalize_map || !histogram){ - qWarning("Unable to allocate normalize histogram and map"); + owarn << "Unable to allocate normalize histogram and map" << oendl; free(normalize_map); free(histogram); return; @@ -2102,7 +2103,7 @@ void OImageEffect::equalize(QImage &img) equalize_map = (int *)malloc((MaxRGB+1)*sizeof(unsigned int)); if(!histogram || !map || !equalize_map){ - qWarning("Unable to allocate equalize histogram and maps"); + owarn << "Unable to allocate equalize histogram and maps" << oendl; free(histogram); free(map); free(equalize_map); @@ -2187,7 +2188,7 @@ QImage OImageEffect::sample(QImage &src, int w, int h) x_offset = (double *)malloc(w*sizeof(double)); y_offset = (double *)malloc(h*sizeof(double)); if(!x_offset || !y_offset){ - qWarning("Unable to allocate pixels buffer"); + owarn << "Unable to allocate pixels buffer" << oendl; free(x_offset); free(y_offset); return(src); @@ -2205,7 +2206,7 @@ QImage OImageEffect::sample(QImage &src, int w, int h) unsigned int *pixels; pixels = (unsigned int *)malloc(src.width()*sizeof(unsigned int)); if(!pixels){ - qWarning("Unable to allocate pixels buffer"); + owarn << "Unable to allocate pixels buffer" << oendl; free(pixels); free(x_offset); free(y_offset); @@ -2233,7 +2234,7 @@ QImage OImageEffect::sample(QImage &src, int w, int h) unsigned char *pixels; pixels = (unsigned char *)malloc(src.width()*sizeof(unsigned char)); if(!pixels){ - qWarning("Unable to allocate pixels buffer"); + owarn << "Unable to allocate pixels buffer" << oendl; free(pixels); free(x_offset); free(y_offset); @@ -3072,7 +3073,7 @@ QImage OImageEffect::oilPaint(QImage &src, int radius) { // TODO 8bpp src! 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); } int j, k, i, x, y; 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 @@ -1,7 +1,6 @@ /* 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. .>+-= _;:, .> :=|. This program is free software; you can @@ -37,6 +36,7 @@ /* OPIE */ +#include <opie2/odebug.h> #include <opie2/olistview.h> /*====================================================================================== @@ -142,7 +142,7 @@ OListViewItem* OListView::childFactory() void OListView::serializeTo( QDataStream& s ) const { #warning Caution... the binary format is still under construction... - qDebug( "storing OListView..." ); + odebug << "storing OListView..." << oendl; // store number of columns and the labels s << columns(); @@ -167,13 +167,13 @@ void OListView::serializeTo( QDataStream& s ) const item = item->nextSibling(); } - qDebug( "OListview stored." ); + odebug << "OListview stored." << oendl; } void OListView::serializeFrom( QDataStream& s ) { #warning Caution... the binary format is still under construction... - qDebug( "loading OListView..." ); + odebug << "loading OListView..." << oendl; int cols; s >> cols; @@ -199,7 +199,7 @@ void OListView::serializeFrom( QDataStream& s ) s >> *item; } - qDebug( "OListView loaded." ); + odebug << "OListView loaded." << oendl; } @@ -377,7 +377,7 @@ OListViewItem* OListViewItem::childFactory() void OListViewItem::serializeTo( QDataStream& s ) const { #warning Caution... the binary format is still under construction... - qDebug( "storing OListViewItem..." ); + odebug << "storing OListViewItem..." << oendl; // store item text for ( int i = 0; i < listView()->columns(); ++i ) @@ -403,14 +403,14 @@ void OListViewItem::serializeTo( QDataStream& s ) const item = item->nextSibling(); } - qDebug( "OListviewItem stored." ); + odebug << "OListviewItem stored." << oendl; } void OListViewItem::serializeFrom( QDataStream& s ) { #warning Caution... the binary format is still under construction... - qDebug( "loading OListViewItem..." ); + odebug << "loading OListViewItem..." << oendl; for ( int i = 0; i < listView()->columns(); ++i ) { @@ -430,7 +430,7 @@ void OListViewItem::serializeFrom( QDataStream& s ) s >> (*item); } - 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 @@ -10,9 +10,10 @@ HEADERS = olistview.h \ oversatileview.h \ oversatileviewitem.h \ odialog.h \ - omessagebox.h \ - oresource.h \ - oseparator.h + omessagebox.h \ + oresource.h \ + otaskbarapplet.h \ + oseparator.h SOURCES = olistview.cpp \ oimageeffect.cpp \ @@ -23,27 +24,24 @@ SOURCES = olistview.cpp \ oversatileview.cpp \ oversatileviewitem.cpp \ odialog.cpp \ - oresource.cpp \ - oseparator.cpp + oresource.cpp \ + otaskbarapplet.cpp \ + oseparator.cpp INTERFACES = TARGET = opieui2 VERSION = 1.8.2 + INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include -LIBS += -lopiecore2 -MOC_DIR = moc -OBJECTS_DIR = obj +LIBS += -lopiecore2 !contains( platform, x11 ) { include ( $(OPIEDIR)/include.pro ) - HEADERS += otaskbarapplet.h - SOURCES += otaskbarapplet.cpp } 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 @@ -1,6 +1,5 @@ /* This file is part of the Opie Project - Copyright (C) 2003 Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de> Copyright (C) 1997 Michael Roth <mroth@wirlweb.de> =. @@ -30,14 +29,15 @@ */ -/* 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) : QFrame(parent, name, f) { @@ -69,7 +69,7 @@ void OSeparator::setOrientation(int orientation) break; default: - qWarning( "OSeparator::setOrientation(): invalid orientation, using default orientation HLine" ); + owarn << "OSeparator::setOrientation(): invalid orientation, using default orientation HLine" << oendl; case Horizontal: case HLine: 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 @@ -28,6 +28,13 @@ */ +/* OPIE */ + +#include <opie2/odebug.h> +#include <opie2/oversatileview.h> +#include <opie2/oversatileviewitem.h> +#include <opie2/olistview.h> + /* QT */ #include <qaction.h> @@ -44,12 +51,6 @@ #include <qstring.h> #include <qwidgetstack.h> -/* OPIE */ - -#include <opie2/oversatileview.h> -#include <opie2/oversatileviewitem.h> -#include <opie2/olistview.h> - /* XPM */ static const char * view_icon_xpm[] = { "16 16 16 1", @@ -289,7 +290,7 @@ void OVersatileView::setDefaultPixmaps( int mode, QPixmap& leaf, QPixmap& opened } else { - qDebug( "OVersatileView::setDefaultPixmaps(): invalid mode" ); + odebug << "OVersatileView::setDefaultPixmaps(): invalid mode" << oendl; } } @@ -317,7 +318,7 @@ void OVersatileView::setViewMode( int mode ) } else { - qDebug( "OVersatileView::setViewMode(): invalid mode" ); + odebug << "OVersatileView::setViewMode(): invalid mode" << oendl; } } @@ -343,7 +344,7 @@ bool OVersatileView::isValidViewMode( int mode ) const { if ( _viewmode != mode ) { - qDebug( "OVersatileView::isValidViewMode(): Requested operation not valid in current mode." ); + odebug << "OVersatileView::isValidViewMode(): Requested operation not valid in current mode." << oendl; return true; } } @@ -351,13 +352,13 @@ bool OVersatileView::isValidViewMode( int mode ) const { if ( _viewmode != mode ) { - qDebug( "OVersatileView::isValidViewMode(): Requested operation not valid in current mode." ); + odebug << "OVersatileView::isValidViewMode(): Requested operation not valid in current mode." << oendl; return false; } } default: { - qWarning( "OVersatileView::isValidViewMode(): Inconsistent object state!" ); + owarn << "OVersatileView::isValidViewMode(): Inconsistent object state!" << oendl; return true; } } @@ -448,7 +449,7 @@ void OVersatileView::onItem( QIconViewItem * item ) void OVersatileView::expanded( QListViewItem *item ) // QListView { - //qDebug( "OVersatileView::expanded(): opening tree..." ); + //odebug << "OVersatileView::expanded(): opening tree..." << oendl; if ( !_treeopened.isNull() ) item->setPixmap( 0, _treeopened ); emit( expanded( static_cast<OVersatileViewItem*>( item ) ) ); |