10 files changed, 445 insertions, 0 deletions
diff --git a/libopie2/opieui/omenubar.cpp b/libopie2/opieui/omenubar.cpp
new file mode 100644
index 0000000..bee2815
--- a/dev/null
+++ b/libopie2/opieui/omenubar.cpp
@@ -0,0 +1,36 @@
+/*
+                             This file is part of the Opie Project
+                             Copyright (C) 2003 Michael Lauer <mickey@tm.informatik.uni-frankfurt.de>
+              =.
+            .=l.
+           .>+-=
+ _;:,     .>    :=|.         This program is free software; you can
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
+.="- .-=="i,     .._         License as published by the Free Software
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
+     ._= =}       :          or (at your option) any later version.
+    .%`+i>       _;_.
+    .i_,=:_.      -<s.       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
+..}^=.=       =       ;      Library General Public License for more
++=   -.     .`     .:       details.
+ :     =  ...= . :.=-
+ -.   .:....=;==+<;          You should have received a copy of the GNU
+  -_. . .   )=.  =           Library General Public License along with
+    --        :-=`           this library; see the file COPYING.LIB.
+                             If not, write to the Free Software Foundation,
+                             Inc., 59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
+*/
+#include <omenubar.h>
+OMenuBar::OMenuBar(QWidget* parent, const char* name)
+:OpieMenuBar(parent, name)
+{
+}
diff --git a/libopie2/opieui/omenubar.h b/libopie2/opieui/omenubar.h
new file mode 100644
index 0000000..234885f
--- a/dev/null
+++ b/libopie2/opieui/omenubar.h
@@ -0,0 +1,49 @@
+/*
+                             This file is part of the Opie Project
+                             Copyright (C) 2003 Patrick S. Vogt <tille@handhelds.org>
+              =.
+            .=l.
+           .>+-=
+ _;:,     .>    :=|.         This program is free software; you can
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
+.="- .-=="i,     .._         License as published by the Free Software
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
+     ._= =}       :          or (at your option) any later version.
+    .%`+i>       _;_.
+    .i_,=:_.      -<s.       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
+..}^=.=       =       ;      Library General Public License for more
++=   -.     .`     .:       details.
+ :     =  ...= . :.=-
+ -.   .:....=;==+<;          You should have received a copy of the GNU
+  -_. . .   )=.  =           Library General Public License along with
+    --        :-=`           this library; see the file COPYING.LIB.
+                             If not, write to the Free Software Foundation,
+                             Inc., 59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
+*/
+#ifndef OMENUBAR_H
+#define OMENUBAR_H
+#include "opiemenubar.h"
+class OMenuBar : public OpieMenuBar
+{
+  Q_OBJECT
+  public:
+  OMenuBar(QWidget* parent = 0, const char* name = 0 );
+};
+#endif // OAPPLICATION_H
diff --git a/libopie2/opieui/omessagebox.h b/libopie2/opieui/omessagebox.h
new file mode 100644
index 0000000..1a0f554
--- a/dev/null
+++ b/libopie2/opieui/omessagebox.h
@@ -0,0 +1,53 @@
+/*
+                             This file is part of the Opie Project
+                             Copyright (C) 2003 Patrick S. Vogt <tille@handhelds.org>
+              =.
+            .=l.
+           .>+-=
+ _;:,     .>    :=|.         This program is free software; you can
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
+.="- .-=="i,     .._         License as published by the Free Software
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
+     ._= =}       :          or (at your option) any later version.
+    .%`+i>       _;_.
+    .i_,=:_.      -<s.       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
+..}^=.=       =       ;      Library General Public License for more
++=   -.     .`     .:       details.
+ :     =  ...= . :.=-
+ -.   .:....=;==+<;          You should have received a copy of the GNU
+  -_. . .   )=.  =           Library General Public License along with
+    --        :-=`           this library; see the file COPYING.LIB.
+                             If not, write to the Free Software Foundation,
+                             Inc., 59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
+*/
+#ifndef OMESSAGEBOX_H
+#define OMESSAGEBOX_H
+#ifdef QWS
+#include <qpe/qpemessagebox.h>
+#else
+#include <qmessagebox.h>
+#endif
+class OMessageBox 
+#ifdef QWS
+: public QPEMessageBox
+#else
+: public QMessageBox
+#endif
+{
+};
+#endif // OAPPLICATION_H
diff --git a/libopie2/opieui/opiemenubar.cpp b/libopie2/opieui/opiemenubar.cpp
new file mode 100644
index 0000000..98715d7
--- a/dev/null
+++ b/libopie2/opieui/opiemenubar.cpp
@@ -0,0 +1,43 @@
+/*
+                             This file is part of the Opie Project
+                             Copyright (C) 2003 Patrick S. Vogt <tille@handhelds.org>
+              =.
+            .=l.
+           .>+-=
+ _;:,     .>    :=|.         This program is free software; you can
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
+.="- .-=="i,     .._         License as published by the Free Software
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
+     ._= =}       :          or (at your option) any later version.
+    .%`+i>       _;_.
+    .i_,=:_.      -<s.       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
+..}^=.=       =       ;      Library General Public License for more
++=   -.     .`     .:       details.
+ :     =  ...= . :.=-
+ -.   .:....=;==+<;          You should have received a copy of the GNU
+  -_. . .   )=.  =           Library General Public License along with
+    --        :-=`           this library; see the file COPYING.LIB.
+                             If not, write to the Free Software Foundation,
+                             Inc., 59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
+*/
+#include "opiemenubar.h"
+OpieMenuBar::OpieMenuBar(QWidget* parent, const char* name )
+#ifdef QWS
+    : QPEMenuBar(parent,name)
+#else
+    : QMenuBar(parent,name)
+#endif
+{
+}
diff --git a/libopie2/opieui/opiemenubar.h b/libopie2/opieui/opiemenubar.h
new file mode 100644
index 0000000..ccd72cc
--- a/dev/null
+++ b/libopie2/opieui/opiemenubar.h
@@ -0,0 +1,52 @@
+/*
+                             This file is part of the Opie Project
+                             Copyright (C) 2003 Patrick S. Vogt <tille@handhelds.org>
+              =.
+            .=l.
+           .>+-=
+ _;:,     .>    :=|.         This program is free software; you can
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
+.="- .-=="i,     .._         License as published by the Free Software
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
+     ._= =}       :          or (at your option) any later version.
+    .%`+i>       _;_.
+    .i_,=:_.      -<s.       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
+..}^=.=       =       ;      Library General Public License for more
++=   -.     .`     .:       details.
+ :     =  ...= . :.=-
+ -.   .:....=;==+<;          You should have received a copy of the GNU
+  -_. . .   )=.  =           Library General Public License along with
+    --        :-=`           this library; see the file COPYING.LIB.
+                             If not, write to the Free Software Foundation,
+                             Inc., 59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
+*/
+#ifndef OPIE_MENUBAR_H
+#define OPIE_MENUBAR_H
+#ifdef QWS
+#include <qpe/qpemenubar.h>
+#else
+#include <qmenubar.h>
+#endif
+class OpieMenuBar
+#ifdef QWS
+: public QPEMenuBar
+#else
+: public QMenuBar
+#endif
+{
+ public:
+    OpieMenuBar(QWidget* parent = 0, const char* name = 0);
+};
+#endif
diff --git a/libopie2/opieui/opieui.pro b/libopie2/opieui/opieui.pro
index 1b6ecdf..68a5c5f 100644
--- a/libopie2/opieui/opieui.pro
+++ b/libopie2/opieui/opieui.pro
@@ -1,58 +1,67 @@
 TEMPLATE    = lib
 CONFIG      += qt warn_on debug
 DESTDIR     = $(OPIEDIR)/lib
 HEADERS     = ocompletionbox.h       \
              ocombobox.h            \
              oeditlistbox.h         \
              olineedit.h            \
              olistview.h            \
              oimageeffect.h         \
              opixmapeffect.h        \
              opopupmenu.h           \
              opixmapprovider.h      \
              oselector.h            \
              oversatileview.h       \
              oversatileviewitem.h   \
              #ojanuswidget.h         \
              odialog.h              \
+              omenubar.h             \
+              opiemenubar.h          \
+              omessagebox.h          \
+              oresource.h            \
+              otoolbar.h            \
              oseparator.h           
 #              otaskbarapplet.h
 SOURCES     = ocompletionbox.cpp     \
              ocombobox.cpp          \
              oeditlistbox.cpp       \
              olineedit.cpp          \
              olistview.cpp          \
              oimageeffect.cpp       \
              opixmapeffect.cpp      \
              opopupmenu.cpp         \
              opixmapprovider.cpp    \
              oselector.cpp          \
              oversatileview.cpp     \
              oversatileviewitem.cpp \
              #ojanuswidget.cpp       \
              odialog.cpp            \
+              omenubar.cpp           \
+              opiemenubar.cpp        \
+              oresource.cpp          \
+              otoolbar.cpp           \
              oseparator.cpp         #\
 #              otaskbarapplet.cpp
 INTERFACES  =
 TARGET      = opieui2
 VERSION     = 1.8.1
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS        += -lopiecore2
 MOC_DIR     = moc
 OBJECTS_DIR = obj
 !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 )
 }
diff --git a/libopie2/opieui/oresource.cpp b/libopie2/opieui/oresource.cpp
new file mode 100644
index 0000000..d97307f
--- a/dev/null
+++ b/libopie2/opieui/oresource.cpp
@@ -0,0 +1,58 @@
+/*
+                             This file is part of the Opie Project
+                             Copyright (C) 2003 Patrick S. Vogt <tille@handhelds.org>
+              =.
+            .=l.
+           .>+-=
+ _;:,     .>    :=|.         This program is free software; you can
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
+.="- .-=="i,     .._         License as published by the Free Software
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
+     ._= =}       :          or (at your option) any later version.
+    .%`+i>       _;_.
+    .i_,=:_.      -<s.       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
+..}^=.=       =       ;      Library General Public License for more
++=   -.     .`     .:       details.
+ :     =  ...= . :.=-
+ -.   .:....=;==+<;          You should have received a copy of the GNU
+  -_. . .   )=.  =           Library General Public License along with
+    --        :-=`           this library; see the file COPYING.LIB.
+                             If not, write to the Free Software Foundation,
+                             Inc., 59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
+*/
+#include <opie2/oapplication.h>
+#include <opie2/odebug.h>
+#include "oresource.h"
+#ifdef QWS
+namespace Resource
+{
+QPixmap loadPixmap( const QString& pix )
+{
+    QString filename;
+    filename.sprintf( "%s/%s.png", (const char*) oApp->opieDir(), (const char*) pix );
+    QPixmap pixmap( filename );
+    if ( pixmap.isNull() )
+    {
+        odebug << "libopie2 resource: can't find pixmap " << filename << oendl;;
+    }
+    return pixmap;
+};
+};
+#endif
diff --git a/libopie2/opieui/oresource.h b/libopie2/opieui/oresource.h
new file mode 100644
index 0000000..499d255
--- a/dev/null
+++ b/libopie2/opieui/oresource.h
@@ -0,0 +1,49 @@
+/*
+                             This file is part of the Opie Project
+                             Copyright (C) 2003 Michael Lauer <mickey@tm.informatik.uni-frankfurt.de>
+                             Copyright (C) 2003 Patrick S. Vogt <tille@handhelds.org>
+              =.
+            .=l.
+           .>+-=
+ _;:,     .>    :=|.         This program is free software; you can
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
+.="- .-=="i,     .._         License as published by the Free Software
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
+     ._= =}       :          or (at your option) any later version.
+    .%`+i>       _;_.
+    .i_,=:_.      -<s.       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
+..}^=.=       =       ;      Library General Public License for more
++=   -.     .`     .:       details.
+ :     =  ...= . :.=-
+ -.   .:....=;==+<;          You should have received a copy of the GNU
+  -_. . .   )=.  =           Library General Public License along with
+    --        :-=`           this library; see the file COPYING.LIB.
+                             If not, write to the Free Software Foundation,
+                             Inc., 59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
+*/
+#ifndef ORESOURCE_H
+#define ORESOURCE_H
+#ifdef QWS
+#include <qpe/resource.h>
+#else
+#include <qpixmap.h>
+namespace Resource
+{
+    QPixmap loadPixmap( const QString& );
+}
+#endif
+#endif
diff --git a/libopie2/opieui/otoolbar.cpp b/libopie2/opieui/otoolbar.cpp
new file mode 100644
index 0000000..c7f2727
--- a/dev/null
+++ b/libopie2/opieui/otoolbar.cpp
@@ -0,0 +1,41 @@
+/*
+                             This file is part of the Opie Project
+                             Copyright (C) 2003 Patrick S. Vogt <tille@handhelds.org>
+              =.
+            .=l.
+           .>+-=
+ _;:,     .>    :=|.         This program is free software; you can
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
+.="- .-=="i,     .._         License as published by the Free Software
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
+     ._= =}       :          or (at your option) any later version.
+    .%`+i>       _;_.
+    .i_,=:_.      -<s.       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
+..}^=.=       =       ;      Library General Public License for more
++=   -.     .`     .:       details.
+ :     =  ...= . :.=-
+ -.   .:....=;==+<;          You should have received a copy of the GNU
+  -_. . .   )=.  =           Library General Public License along with
+    --        :-=`           this library; see the file COPYING.LIB.
+                             If not, write to the Free Software Foundation,
+                             Inc., 59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
+*/
+#include "otoolbar.h"
+OToolBar::OToolBar( QMainWindow *parent, const char* name)
+#ifdef QWS
+    : QPEToolBar(parent, name)
+#else
+    : QToolBar(parent, name)
+#endif
+{
+}
diff --git a/libopie2/opieui/otoolbar.h b/libopie2/opieui/otoolbar.h
new file mode 100644
index 0000000..e16d8df
--- a/dev/null
+++ b/libopie2/opieui/otoolbar.h
@@ -0,0 +1,55 @@
+/*
+                             This file is part of the Opie Project
+                             Copyright (C) 2003 Patrick S. Vogt <tille@handhelds.org>
+              =.
+            .=l.
+           .>+-=
+ _;:,     .>    :=|.         This program is free software; you can
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
+.="- .-=="i,     .._         License as published by the Free Software
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
+     ._= =}       :          or (at your option) any later version.
+    .%`+i>       _;_.
+    .i_,=:_.      -<s.       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
+..}^=.=       =       ;      Library General Public License for more
++=   -.     .`     .:       details.
+ :     =  ...= . :.=-
+ -.   .:....=;==+<;          You should have received a copy of the GNU
+  -_. . .   )=.  =           Library General Public License along with
+    --        :-=`           this library; see the file COPYING.LIB.
+                             If not, write to the Free Software Foundation,
+                             Inc., 59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
+*/
+#ifndef OTOOLBAR_H
+#define OTOOLBAR_H
+#ifdef QWS
+#include <qpe/qpetoolbar.h>
+#else
+#include <qtoolbar.h>
+#endif
+class OToolBar
+#ifdef QWS
+: public QPEToolBar
+#else
+: public QToolBar
+#endif
+{
+ public:
+    OToolBar( QMainWindow *parent=0, const char* name = 0);
+};
+#endif // OAPPLICATION_H

diff --git a/libopie2/opieui/omenubar.cpp b/libopie2/opieui/omenubar.cpp new file mode 100644 index 0000000..bee2815 --- a/dev/null +++ b/libopie2/opieui/omenubar.cpp
@@ -0,0 +1,36 @@
		1	/*
		2	This file is part of the Opie Project
		3
		4	Copyright (C) 2003 Michael Lauer <mickey@tm.informatik.uni-frankfurt.de>
		5	=.
		6	.=l.
		7	.>+-=
		8	_;:, .> :=\|. This program is free software; you can
		9	.> <`_, > . <= redistribute it and/or modify it under
		10	:`=1 )Y*s>-.-- : the terms of the GNU Library General Public
		11	.="- .-=="i, .._ License as published by the Free Software
		12	- . .-<_> .<> Foundation; either version 2 of the License,
		13	._= =} : or (at your option) any later version.
		14	.%`+i> _;_.
		15	.i_,=:_. -<s. This program is distributed in the hope that
		16	+ . -:. = it will be useful, but WITHOUT ANY WARRANTY;
		17	: .. .:, . . . without even the implied warranty of
		18	=_ + =;=\|` MERCHANTABILITY or FITNESS FOR A
		19	_.=:. : :=>`: PARTICULAR PURPOSE. See the GNU
		20	..}^=.= = ; Library General Public License for more
		21	++= -. .` .: details.
		22	: = ...= . :.=-
		23	-. .:....=;==+<; You should have received a copy of the GNU
		24	-_. . . )=. = Library General Public License along with
		25	-- :-=` this library; see the file COPYING.LIB.
		26	If not, write to the Free Software Foundation,
		27	Inc., 59 Temple Place - Suite 330,
		28	Boston, MA 02111-1307, USA.
		29	*/
		30
		31	#include <omenubar.h>
		32
		33	OMenuBar::OMenuBar(QWidget* parent, const char* name)
		34	:OpieMenuBar(parent, name)
		35	{
		36	}


diff --git a/libopie2/opieui/omenubar.h b/libopie2/opieui/omenubar.h new file mode 100644 index 0000000..234885f --- a/dev/null +++ b/libopie2/opieui/omenubar.h
@@ -0,0 +1,49 @@
		1	/*
		2	This file is part of the Opie Project
		3
		4	Copyright (C) 2003 Patrick S. Vogt <tille@handhelds.org>
		5	=.
		6	.=l.
		7	.>+-=
		8	_;:, .> :=\|. This program is free software; you can
		9	.> <`_, > . <= redistribute it and/or modify it under
		10	:`=1 )Y*s>-.-- : the terms of the GNU Library General Public
		11	.="- .-=="i, .._ License as published by the Free Software
		12	- . .-<_> .<> Foundation; either version 2 of the License,
		13	._= =} : or (at your option) any later version.
		14	.%`+i> _;_.
		15	.i_,=:_. -<s. This program is distributed in the hope that
		16	+ . -:. = it will be useful, but WITHOUT ANY WARRANTY;
		17	: .. .:, . . . without even the implied warranty of
		18	=_ + =;=\|` MERCHANTABILITY or FITNESS FOR A
		19	_.=:. : :=>`: PARTICULAR PURPOSE. See the GNU
		20	..}^=.= = ; Library General Public License for more
		21	++= -. .` .: details.
		22	: = ...= . :.=-
		23	-. .:....=;==+<; You should have received a copy of the GNU
		24	-_. . . )=. = Library General Public License along with
		25	-- :-=` this library; see the file COPYING.LIB.
		26	If not, write to the Free Software Foundation,
		27	Inc., 59 Temple Place - Suite 330,
		28	Boston, MA 02111-1307, USA.
		29	*/
		30
		31	#ifndef OMENUBAR_H
		32	#define OMENUBAR_H
		33
		34
		35
		36
		37	#include "opiemenubar.h"
		38
		39
		40
		41	class OMenuBar : public OpieMenuBar
		42	{
		43	Q_OBJECT
		44
		45	public:
		46	OMenuBar(QWidget* parent = 0, const char* name = 0 );
		47	};
		48
		49	#endif // OAPPLICATION_H


diff --git a/libopie2/opieui/omessagebox.h b/libopie2/opieui/omessagebox.h new file mode 100644 index 0000000..1a0f554 --- a/dev/null +++ b/libopie2/opieui/omessagebox.h
@@ -0,0 +1,53 @@
		1	/*
		2	This file is part of the Opie Project
		3
		4	Copyright (C) 2003 Patrick S. Vogt <tille@handhelds.org>
		5	=.
		6	.=l.
		7	.>+-=
		8	_;:, .> :=\|. This program is free software; you can
		9	.> <`_, > . <= redistribute it and/or modify it under
		10	:`=1 )Y*s>-.-- : the terms of the GNU Library General Public
		11	.="- .-=="i, .._ License as published by the Free Software
		12	- . .-<_> .<> Foundation; either version 2 of the License,
		13	._= =} : or (at your option) any later version.
		14	.%`+i> _;_.
		15	.i_,=:_. -<s. This program is distributed in the hope that
		16	+ . -:. = it will be useful, but WITHOUT ANY WARRANTY;
		17	: .. .:, . . . without even the implied warranty of
		18	=_ + =;=\|` MERCHANTABILITY or FITNESS FOR A
		19	_.=:. : :=>`: PARTICULAR PURPOSE. See the GNU
		20	..}^=.= = ; Library General Public License for more
		21	++= -. .` .: details.
		22	: = ...= . :.=-
		23	-. .:....=;==+<; You should have received a copy of the GNU
		24	-_. . . )=. = Library General Public License along with
		25	-- :-=` this library; see the file COPYING.LIB.
		26	If not, write to the Free Software Foundation,
		27	Inc., 59 Temple Place - Suite 330,
		28	Boston, MA 02111-1307, USA.
		29	*/
		30
		31	#ifndef OMESSAGEBOX_H
		32	#define OMESSAGEBOX_H
		33
		34
		35
		36	#ifdef QWS
		37	#include <qpe/qpemessagebox.h>
		38	#else
		39	#include <qmessagebox.h>
		40	#endif
		41
		42
		43
		44	class OMessageBox
		45	#ifdef QWS
		46	: public QPEMessageBox
		47	#else
		48	: public QMessageBox
		49	#endif
		50	{
		51	};
		52
		53	#endif // OAPPLICATION_H


diff --git a/libopie2/opieui/opiemenubar.cpp b/libopie2/opieui/opiemenubar.cpp new file mode 100644 index 0000000..98715d7 --- a/dev/null +++ b/libopie2/opieui/opiemenubar.cpp
@@ -0,0 +1,43 @@
		1	/*
		2	This file is part of the Opie Project
		3
		4	Copyright (C) 2003 Patrick S. Vogt <tille@handhelds.org>
		5	=.
		6	.=l.
		7	.>+-=
		8	_;:, .> :=\|. This program is free software; you can
		9	.> <`_, > . <= redistribute it and/or modify it under
		10	:`=1 )Y*s>-.-- : the terms of the GNU Library General Public
		11	.="- .-=="i, .._ License as published by the Free Software
		12	- . .-<_> .<> Foundation; either version 2 of the License,
		13	._= =} : or (at your option) any later version.
		14	.%`+i> _;_.
		15	.i_,=:_. -<s. This program is distributed in the hope that
		16	+ . -:. = it will be useful, but WITHOUT ANY WARRANTY;
		17	: .. .:, . . . without even the implied warranty of
		18	=_ + =;=\|` MERCHANTABILITY or FITNESS FOR A
		19	_.=:. : :=>`: PARTICULAR PURPOSE. See the GNU
		20	..}^=.= = ; Library General Public License for more
		21	++= -. .` .: details.
		22	: = ...= . :.=-
		23	-. .:....=;==+<; You should have received a copy of the GNU
		24	-_. . . )=. = Library General Public License along with
		25	-- :-=` this library; see the file COPYING.LIB.
		26	If not, write to the Free Software Foundation,
		27	Inc., 59 Temple Place - Suite 330,
		28	Boston, MA 02111-1307, USA.
		29	*/
		30
		31
		32	#include "opiemenubar.h"
		33
		34	OpieMenuBar::OpieMenuBar(QWidget* parent, const char* name )
		35	#ifdef QWS
		36	: QPEMenuBar(parent,name)
		37	#else
		38	: QMenuBar(parent,name)
		39	#endif
		40	{
		41	}
		42
		43


diff --git a/libopie2/opieui/opiemenubar.h b/libopie2/opieui/opiemenubar.h new file mode 100644 index 0000000..ccd72cc --- a/dev/null +++ b/libopie2/opieui/opiemenubar.h
@@ -0,0 +1,52 @@
		1	/*
		2	This file is part of the Opie Project
		3
		4	Copyright (C) 2003 Patrick S. Vogt <tille@handhelds.org>
		5	=.
		6	.=l.
		7	.>+-=
		8	_;:, .> :=\|. This program is free software; you can
		9	.> <`_, > . <= redistribute it and/or modify it under
		10	:`=1 )Y*s>-.-- : the terms of the GNU Library General Public
		11	.="- .-=="i, .._ License as published by the Free Software
		12	- . .-<_> .<> Foundation; either version 2 of the License,
		13	._= =} : or (at your option) any later version.
		14	.%`+i> _;_.
		15	.i_,=:_. -<s. This program is distributed in the hope that
		16	+ . -:. = it will be useful, but WITHOUT ANY WARRANTY;
		17	: .. .:, . . . without even the implied warranty of
		18	=_ + =;=\|` MERCHANTABILITY or FITNESS FOR A
		19	_.=:. : :=>`: PARTICULAR PURPOSE. See the GNU
		20	..}^=.= = ; Library General Public License for more
		21	++= -. .` .: details.
		22	: = ...= . :.=-
		23	-. .:....=;==+<; You should have received a copy of the GNU
		24	-_. . . )=. = Library General Public License along with
		25	-- :-=` this library; see the file COPYING.LIB.
		26	If not, write to the Free Software Foundation,
		27	Inc., 59 Temple Place - Suite 330,
		28	Boston, MA 02111-1307, USA.
		29	*/
		30
		31	#ifndef OPIE_MENUBAR_H
		32	#define OPIE_MENUBAR_H
		33
		34	#ifdef QWS
		35	#include <qpe/qpemenubar.h>
		36	#else
		37	#include <qmenubar.h>
		38	#endif
		39
		40	class OpieMenuBar
		41	#ifdef QWS
		42	: public QPEMenuBar
		43	#else
		44	: public QMenuBar
		45	#endif
		46	{
		47	public:
		48	OpieMenuBar(QWidget* parent = 0, const char* name = 0);
		49	};
		50	#endif
		51
		52


diff --git a/libopie2/opieui/opieui.pro b/libopie2/opieui/opieui.pro index 1b6ecdf..68a5c5f 100644 --- a/libopie2/opieui/opieui.pro +++ b/libopie2/opieui/opieui.pro
@@ -1,58 +1,67 @@
1	TEMPLATE = lib	1	TEMPLATE = lib
2	CONFIG += qt warn_on debug	2	CONFIG += qt warn_on debug
3	DESTDIR = $(OPIEDIR)/lib	3	DESTDIR = $(OPIEDIR)/lib
4	HEADERS = ocompletionbox.h \	4	HEADERS = ocompletionbox.h \
5	ocombobox.h \	5	ocombobox.h \
6	oeditlistbox.h \	6	oeditlistbox.h \
7	olineedit.h \	7	olineedit.h \
8	olistview.h \	8	olistview.h \
9	oimageeffect.h \	9	oimageeffect.h \
10	opixmapeffect.h \	10	opixmapeffect.h \
11	opopupmenu.h \	11	opopupmenu.h \
12	opixmapprovider.h \	12	opixmapprovider.h \
13	oselector.h \	13	oselector.h \
14	oversatileview.h \	14	oversatileview.h \
15	oversatileviewitem.h \	15	oversatileviewitem.h \
16	#ojanuswidget.h \	16	#ojanuswidget.h \
17	odialog.h \	17	odialog.h \
		18	omenubar.h \
		19	opiemenubar.h \
		20	omessagebox.h \
		21	oresource.h \
		22	otoolbar.h \
18	oseparator.h	23	oseparator.h
19	# otaskbarapplet.h	24	# otaskbarapplet.h
20		25
21	SOURCES = ocompletionbox.cpp \	26	SOURCES = ocompletionbox.cpp \
22	ocombobox.cpp \	27	ocombobox.cpp \
23	oeditlistbox.cpp \	28	oeditlistbox.cpp \
24	olineedit.cpp \	29	olineedit.cpp \
25	olistview.cpp \	30	olistview.cpp \
26	oimageeffect.cpp \	31	oimageeffect.cpp \
27	opixmapeffect.cpp \	32	opixmapeffect.cpp \
28	opopupmenu.cpp \	33	opopupmenu.cpp \
29	opixmapprovider.cpp \	34	opixmapprovider.cpp \
30	oselector.cpp \	35	oselector.cpp \
31	oversatileview.cpp \	36	oversatileview.cpp \
32	oversatileviewitem.cpp \	37	oversatileviewitem.cpp \
33	#ojanuswidget.cpp \	38	#ojanuswidget.cpp \
34	odialog.cpp \	39	odialog.cpp \
		40	omenubar.cpp \
		41	opiemenubar.cpp \
		42	oresource.cpp \
		43	otoolbar.cpp \
35	oseparator.cpp #\	44	oseparator.cpp #\
36	# otaskbarapplet.cpp	45	# otaskbarapplet.cpp
37		46
38	INTERFACES =	47	INTERFACES =
39	TARGET = opieui2	48	TARGET = opieui2
40	VERSION = 1.8.1	49	VERSION = 1.8.1
41	INCLUDEPATH += $(OPIEDIR)/include	50	INCLUDEPATH += $(OPIEDIR)/include
42	DEPENDPATH += $(OPIEDIR)/include	51	DEPENDPATH += $(OPIEDIR)/include
43	LIBS += -lopiecore2	52	LIBS += -lopiecore2
44	MOC_DIR = moc	53	MOC_DIR = moc
45	OBJECTS_DIR = obj	54	OBJECTS_DIR = obj
46		55
47		56
48	!contains( platform, x11 ) {	57	!contains( platform, x11 ) {
49	include ( $(OPIEDIR)/include.pro )	58	include ( $(OPIEDIR)/include.pro )
50	HEADERS += otaskbarapplet.h	59	HEADERS += otaskbarapplet.h
51	SOURCES += otaskbarapplet.cpp	60	SOURCES += otaskbarapplet.cpp
52	}	61	}
53		62
54	contains( platform, x11 ) {	63	contains( platform, x11 ) {
55	LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib	64	LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib
56	message( Warning: NO otaskbarapplet ATM )	65	message( Warning: NO otaskbarapplet ATM )
57	}	66	}
58		67


diff --git a/libopie2/opieui/oresource.cpp b/libopie2/opieui/oresource.cpp new file mode 100644 index 0000000..d97307f --- a/dev/null +++ b/libopie2/opieui/oresource.cpp
@@ -0,0 +1,58 @@
		1	/*
		2	This file is part of the Opie Project
		3
		4	Copyright (C) 2003 Patrick S. Vogt <tille@handhelds.org>
		5	=.
		6	.=l.
		7	.>+-=
		8	_;:, .> :=\|. This program is free software; you can
		9	.> <`_, > . <= redistribute it and/or modify it under
		10	:`=1 )Y*s>-.-- : the terms of the GNU Library General Public
		11	.="- .-=="i, .._ License as published by the Free Software
		12	- . .-<_> .<> Foundation; either version 2 of the License,
		13	._= =} : or (at your option) any later version.
		14	.%`+i> _;_.
		15	.i_,=:_. -<s. This program is distributed in the hope that
		16	+ . -:. = it will be useful, but WITHOUT ANY WARRANTY;
		17	: .. .:, . . . without even the implied warranty of
		18	=_ + =;=\|` MERCHANTABILITY or FITNESS FOR A
		19	_.=:. : :=>`: PARTICULAR PURPOSE. See the GNU
		20	..}^=.= = ; Library General Public License for more
		21	++= -. .` .: details.
		22	: = ...= . :.=-
		23	-. .:....=;==+<; You should have received a copy of the GNU
		24	-_. . . )=. = Library General Public License along with
		25	-- :-=` this library; see the file COPYING.LIB.
		26	If not, write to the Free Software Foundation,
		27	Inc., 59 Temple Place - Suite 330,
		28	Boston, MA 02111-1307, USA.
		29	*/
		30
		31	#include <opie2/oapplication.h>
		32	#include <opie2/odebug.h>
		33
		34	#include "oresource.h"
		35
		36
		37	#ifdef QWS
		38	namespace Resource
		39	{
		40
		41	QPixmap loadPixmap( const QString& pix )
		42	{
		43	QString filename;
		44	filename.sprintf( "%s/%s.png", (const char) oApp->opieDir(), (const char) pix );
		45	QPixmap pixmap( filename );
		46	if ( pixmap.isNull() )
		47	{
		48	odebug << "libopie2 resource: can't find pixmap " << filename << oendl;;
		49	}
		50	return pixmap;
		51	};
		52
		53	};
		54
		55	#endif
		56
		57
		58


diff --git a/libopie2/opieui/oresource.h b/libopie2/opieui/oresource.h new file mode 100644 index 0000000..499d255 --- a/dev/null +++ b/libopie2/opieui/oresource.h
@@ -0,0 +1,49 @@
		1	/*
		2	This file is part of the Opie Project
		3
		4	Copyright (C) 2003 Michael Lauer <mickey@tm.informatik.uni-frankfurt.de>
		5	Copyright (C) 2003 Patrick S. Vogt <tille@handhelds.org>
		6	=.
		7	.=l.
		8	.>+-=
		9	_;:, .> :=\|. This program is free software; you can
		10	.> <`_, > . <= redistribute it and/or modify it under
		11	:`=1 )Y*s>-.-- : the terms of the GNU Library General Public
		12	.="- .-=="i, .._ License as published by the Free Software
		13	- . .-<_> .<> Foundation; either version 2 of the License,
		14	._= =} : or (at your option) any later version.
		15	.%`+i> _;_.
		16	.i_,=:_. -<s. This program is distributed in the hope that
		17	+ . -:. = it will be useful, but WITHOUT ANY WARRANTY;
		18	: .. .:, . . . without even the implied warranty of
		19	=_ + =;=\|` MERCHANTABILITY or FITNESS FOR A
		20	_.=:. : :=>`: PARTICULAR PURPOSE. See the GNU
		21	..}^=.= = ; Library General Public License for more
		22	++= -. .` .: details.
		23	: = ...= . :.=-
		24	-. .:....=;==+<; You should have received a copy of the GNU
		25	-_. . . )=. = Library General Public License along with
		26	-- :-=` this library; see the file COPYING.LIB.
		27	If not, write to the Free Software Foundation,
		28	Inc., 59 Temple Place - Suite 330,
		29	Boston, MA 02111-1307, USA.
		30	*/
		31
		32	#ifndef ORESOURCE_H
		33	#define ORESOURCE_H
		34
		35	#ifdef QWS
		36	#include <qpe/resource.h>
		37	#else
		38	#include <qpixmap.h>
		39
		40	namespace Resource
		41	{
		42	QPixmap loadPixmap( const QString& );
		43	}
		44
		45	#endif
		46
		47	#endif
		48
		49


diff --git a/libopie2/opieui/otoolbar.cpp b/libopie2/opieui/otoolbar.cpp new file mode 100644 index 0000000..c7f2727 --- a/dev/null +++ b/libopie2/opieui/otoolbar.cpp
@@ -0,0 +1,41 @@
		1	/*
		2	This file is part of the Opie Project
		3
		4	Copyright (C) 2003 Patrick S. Vogt <tille@handhelds.org>
		5	=.
		6	.=l.
		7	.>+-=
		8	_;:, .> :=\|. This program is free software; you can
		9	.> <`_, > . <= redistribute it and/or modify it under
		10	:`=1 )Y*s>-.-- : the terms of the GNU Library General Public
		11	.="- .-=="i, .._ License as published by the Free Software
		12	- . .-<_> .<> Foundation; either version 2 of the License,
		13	._= =} : or (at your option) any later version.
		14	.%`+i> _;_.
		15	.i_,=:_. -<s. This program is distributed in the hope that
		16	+ . -:. = it will be useful, but WITHOUT ANY WARRANTY;
		17	: .. .:, . . . without even the implied warranty of
		18	=_ + =;=\|` MERCHANTABILITY or FITNESS FOR A
		19	_.=:. : :=>`: PARTICULAR PURPOSE. See the GNU
		20	..}^=.= = ; Library General Public License for more
		21	++= -. .` .: details.
		22	: = ...= . :.=-
		23	-. .:....=;==+<; You should have received a copy of the GNU
		24	-_. . . )=. = Library General Public License along with
		25	-- :-=` this library; see the file COPYING.LIB.
		26	If not, write to the Free Software Foundation,
		27	Inc., 59 Temple Place - Suite 330,
		28	Boston, MA 02111-1307, USA.
		29	*/
		30
		31	#include "otoolbar.h"
		32
		33	OToolBar::OToolBar( QMainWindow parent, const char name)
		34	#ifdef QWS
		35	: QPEToolBar(parent, name)
		36	#else
		37	: QToolBar(parent, name)
		38	#endif
		39	{
		40
		41	}


diff --git a/libopie2/opieui/otoolbar.h b/libopie2/opieui/otoolbar.h new file mode 100644 index 0000000..e16d8df --- a/dev/null +++ b/libopie2/opieui/otoolbar.h
@@ -0,0 +1,55 @@
		1	/*
		2	This file is part of the Opie Project
		3
		4	Copyright (C) 2003 Patrick S. Vogt <tille@handhelds.org>
		5	=.
		6	.=l.
		7	.>+-=
		8	_;:, .> :=\|. This program is free software; you can
		9	.> <`_, > . <= redistribute it and/or modify it under
		10	:`=1 )Y*s>-.-- : the terms of the GNU Library General Public
		11	.="- .-=="i, .._ License as published by the Free Software
		12	- . .-<_> .<> Foundation; either version 2 of the License,
		13	._= =} : or (at your option) any later version.
		14	.%`+i> _;_.
		15	.i_,=:_. -<s. This program is distributed in the hope that
		16	+ . -:. = it will be useful, but WITHOUT ANY WARRANTY;
		17	: .. .:, . . . without even the implied warranty of
		18	=_ + =;=\|` MERCHANTABILITY or FITNESS FOR A
		19	_.=:. : :=>`: PARTICULAR PURPOSE. See the GNU
		20	..}^=.= = ; Library General Public License for more
		21	++= -. .` .: details.
		22	: = ...= . :.=-
		23	-. .:....=;==+<; You should have received a copy of the GNU
		24	-_. . . )=. = Library General Public License along with
		25	-- :-=` this library; see the file COPYING.LIB.
		26	If not, write to the Free Software Foundation,
		27	Inc., 59 Temple Place - Suite 330,
		28	Boston, MA 02111-1307, USA.
		29	*/
		30
		31	#ifndef OTOOLBAR_H
		32	#define OTOOLBAR_H
		33
		34
		35
		36	#ifdef QWS
		37	#include <qpe/qpetoolbar.h>
		38	#else
		39	#include <qtoolbar.h>
		40	#endif
		41
		42
		43
		44	class OToolBar
		45	#ifdef QWS
		46	: public QPEToolBar
		47	#else
		48	: public QToolBar
		49	#endif
		50	{
		51	public:
		52	OToolBar( QMainWindow parent=0, const char name = 0);
		53	};
		54
		55	#endif // OAPPLICATION_H