48 files changed, 309 insertions, 152 deletions
diff --git a/libopie2/opieui/big-screen/obigscreen_p.h b/libopie2/opieui/big-screen/obigscreen_p.h index db8fc83..a85a56c 100644 --- a/libopie2/opieui/big-screen/obigscreen_p.h +++ b/libopie2/opieui/big-screen/obigscreen_p.h @@ -6,8 +6,9 @@ class QWidget; -namespace Opie -{ +namespace Opie { +namespace Ui { +namespace Private{ struct OSplitterContainer { @@ -23,6 +24,8 @@ struct OSplitterContainer QString name; }; -}; +} +} +} #endif diff --git a/libopie2/opieui/big-screen/osplitter.cpp b/libopie2/opieui/big-screen/osplitter.cpp index 89f3793..bcfd3a6 100644 --- a/libopie2/opieui/big-screen/osplitter.cpp +++ b/libopie2/opieui/big-screen/osplitter.cpp @@ -35,7 +35,8 @@ #include <qvaluelist.h> #include <qvbox.h> -using namespace Opie; +using namespace Opie::Ui; +using namespace Opie::Ui::Private; /** * @@ -168,7 +169,7 @@ void OSplitter::addWidget( OSplitter* split ) setTabWidget( m_parentTab ); else { - Opie::OSplitterContainer con; + OSplitterContainer con; con.widget =split; addToBox( con ); } @@ -213,7 +214,7 @@ void OSplitter::addWidget( QWidget* wid, const QString& icon, const QString& lab return; } #endif - Opie::OSplitterContainer cont; + OSplitterContainer cont; cont.widget = wid; cont.icon =icon; cont.name = label; @@ -396,7 +397,7 @@ void OSplitter::resizeEvent( QResizeEvent* res ) * Adds a container to a tab either the parent tab * or our own */ -void OSplitter::addToTab( const Opie::OSplitterContainer& con ) +void OSplitter::addToTab( const Opie::Ui::Private::OSplitterContainer& con ) { QWidget *wid = con.widget; // not needed widgetstack will reparent as well wid.reparent(m_tabWidget, wid->getWFlags(), QPoint(0, 0) ); @@ -410,7 +411,7 @@ void OSplitter::addToTab( const Opie::OSplitterContainer& con ) /* * adds a container to the box */ -void OSplitter::addToBox( const Opie::OSplitterContainer& con ) +void OSplitter::addToBox( const Opie::Ui::Private::OSplitterContainer& con ) { QWidget* wid = con.widget; wid->reparent(m_hbox, 0, QPoint(0, 0) ); @@ -545,7 +546,7 @@ void OSplitter::commonChangeBox() { /* tell them the world had changed */ split->setTabWidget( 0 ); - Opie::OSplitterContainer con; + OSplitterContainer con; con.widget = split; // con.widget = split->m_tabWidget ? static_cast<QWidget*>(split->m_tabWidget) // : static_cast<QWidget*>(split->m_hbox); diff --git a/libopie2/opieui/big-screen/osplitter.h b/libopie2/opieui/big-screen/osplitter.h index 2daae7f..7b5ea53 100644 --- a/libopie2/opieui/big-screen/osplitter.h +++ b/libopie2/opieui/big-screen/osplitter.h @@ -48,8 +48,8 @@ class QHBox; * -allow inserting at a position */ -namespace Opie -{ +namespace Opie{ +namespace Ui { class OTabWidget; /** @@ -73,7 +73,7 @@ class OSplitter : public QFrame { Q_OBJECT public: - typedef QValueList<Opie::OSplitterContainer> ContainerList; + typedef QValueList<Opie::Ui::Private::OSplitterContainer> ContainerList; OSplitter( Qt::Orientation = Horizontal, QWidget *parent = 0, const char* name = 0, WFlags fl = 0 ); ~OSplitter(); @@ -124,8 +124,8 @@ private: bool layoutMode()const; // void reparentAll(); void setTabWidget( OTabWidget*); - void addToTab( const Opie::OSplitterContainer& ); - void addToBox( const Opie::OSplitterContainer& ); + void addToTab( const Opie::Ui::Private::OSplitterContainer& ); + void addToBox( const Opie::Ui::Private::OSplitterContainer& ); void removeFromTab( QWidget* ); void changeTab(); void changeHBox(); @@ -145,6 +145,7 @@ private: struct Private; Private *d; }; -}; +} +} #endif diff --git a/libopie2/opieui/big-screen/owidgetstack.cpp b/libopie2/opieui/big-screen/owidgetstack.cpp index 57e97e3..a0a6355 100644 --- a/libopie2/opieui/big-screen/owidgetstack.cpp +++ b/libopie2/opieui/big-screen/owidgetstack.cpp @@ -32,11 +32,11 @@ #include <qapplication.h> #include <qwidgetstack.h> -namespace { +namespace Opie { +namespace Ui { const int mode_size = 330; -} -using namespace Opie; + /** * This is the standard widget. For simple usage see the example. Normally this widget @@ -433,3 +433,6 @@ void OWidgetStack::switchTop() { delete m_stack; m_stack = 0; } + +} +}
\ No newline at end of file diff --git a/libopie2/opieui/big-screen/owidgetstack.h b/libopie2/opieui/big-screen/owidgetstack.h index 53818c8..d2f9a9f 100644 --- a/libopie2/opieui/big-screen/owidgetstack.h +++ b/libopie2/opieui/big-screen/owidgetstack.h @@ -35,8 +35,8 @@ class QWidgetStack; -namespace Opie -{ +namespace Opie { +namespace Ui { /** * * OWidgetStack is the answer to the problem of using Opie at different screen @@ -127,6 +127,7 @@ private: Private *d; }; -}; +} +} #endif diff --git a/libopie2/opieui/fileselector/ofiledialog.cpp b/libopie2/opieui/fileselector/ofiledialog.cpp index e7daead..beb4d6c 100644 --- a/libopie2/opieui/fileselector/ofiledialog.cpp +++ b/libopie2/opieui/fileselector/ofiledialog.cpp @@ -39,7 +39,7 @@ #include <qapplication.h> #include <qlayout.h> -using namespace Opie; +using namespace Opie::Ui; namespace { diff --git a/libopie2/opieui/fileselector/ofiledialog.h b/libopie2/opieui/fileselector/ofiledialog.h index 01a599b..dfecf3d 100644 --- a/libopie2/opieui/fileselector/ofiledialog.h +++ b/libopie2/opieui/fileselector/ofiledialog.h @@ -35,8 +35,8 @@ /* QT */ #include <qdialog.h> -namespace Opie -{ +namespace Opie { +namespace Ui { /** * This class places a OFileSelector inside a QDialog. @@ -104,6 +104,7 @@ private slots: void slotSelectorOk(); }; -}; +} +} #endif diff --git a/libopie2/opieui/fileselector/ofileselector.cpp b/libopie2/opieui/fileselector/ofileselector.cpp index 15cadd4..c4d5033 100644 --- a/libopie2/opieui/fileselector/ofileselector.cpp +++ b/libopie2/opieui/fileselector/ofileselector.cpp @@ -55,8 +55,11 @@ #include <qregexp.h> #include <qobjectlist.h> -using namespace Opie; +using namespace Opie::Ui::Private; +namespace Opie { +namespace Ui { +namespace Private { OFileViewInterface::OFileViewInterface( OFileSelector* selector ) : m_selector( selector ) {} @@ -810,6 +813,8 @@ void OFileViewFileSystem::activate( const QString& str) m_all = (str != QObject::tr("Files") ); } + +} /* Selector */ /** * @short new and complete c'tor @@ -1164,3 +1169,5 @@ void OFileSelector::setNameVisible( bool b ) m_nameBox->hide(); } +} +} diff --git a/libopie2/opieui/fileselector/ofileselector.h b/libopie2/opieui/fileselector/ofileselector.h index 7fa657b..2205963 100644 --- a/libopie2/opieui/fileselector/ofileselector.h +++ b/libopie2/opieui/fileselector/ofileselector.h @@ -52,11 +52,13 @@ class QHBox; typedef QMap<QString, QStringList> MimeTypes; -namespace Opie -{ +namespace Opie { +namespace Ui { +namespace Private { class OFileViewInterface; class OFileViewFileListView; +} /** @@ -73,8 +75,8 @@ class OFileViewFileListView; class OFileSelector : public QWidget { Q_OBJECT - friend class Opie::OFileViewInterface; - friend class Opie::OFileViewFileListView; + friend class Private::OFileViewInterface; + friend class Private::OFileViewFileListView; public: /** @@ -185,13 +187,13 @@ private: QLineEdit* m_lneEdit; // the LineEdit for the Name QComboBox *m_cmbView, *m_cmbMime; // two ComboBoxes to select the View and MimeType QWidgetStack* m_stack; // our widget stack which will contain the views - OFileViewInterface* currentView() const; // returns the currentView - OFileViewInterface* m_current; // here is the view saved + Private::OFileViewInterface* currentView() const; // returns the currentView + Private::OFileViewInterface* m_current; // here is the view saved bool m_shNew : 1; // should we show New? bool m_shClose : 1; // should we show Close? MimeTypes m_mimeType; // list of mimetypes - QMap<QString, OFileViewInterface*> m_views; // QString translated view name + ViewInterface Ptr + QMap<QString, Private::OFileViewInterface*> m_views; // QString translated view name + ViewInterface Ptr QHBox* m_nameBox; // the LineEdit + Label is hold here QHBox* m_cmbBox; // this holds the two combo boxes @@ -214,6 +216,7 @@ private slots: }; -}; +} +} #endif diff --git a/libopie2/opieui/fileselector/ofileselector_p.h b/libopie2/opieui/fileselector/ofileselector_p.h index 818ced9..376dc98 100644 --- a/libopie2/opieui/fileselector/ofileselector_p.h +++ b/libopie2/opieui/fileselector/ofileselector_p.h @@ -56,10 +56,10 @@ typedef QMap<QString, QStringList> MimeTypes; class QFileInfo; class QToolButton; -namespace Opie -{ - +namespace Opie{ +namespace Ui{ class OFileSelector; +namespace Private { class OFileViewInterface { @@ -186,6 +186,8 @@ private: QListView* m_view; }; -}; +} +} +} #endif diff --git a/libopie2/opieui/fileselector/ofileview.h b/libopie2/opieui/fileselector/ofileview.h index 495401b..aaf56b1 100644 --- a/libopie2/opieui/fileselector/ofileview.h +++ b/libopie2/opieui/fileselector/ofileview.h @@ -37,8 +37,9 @@ class QFileInfo; class QDir; class DocLnk; -namespace Opie -{ +namespace Opie { +namespace Ui { +namespace Private { /** * A OFileView is a specialised View for the @@ -90,6 +91,8 @@ public: QString name()const; }; -}; +} +} +} #endif diff --git a/libopie2/opieui/oclickablelabel.cpp b/libopie2/opieui/oclickablelabel.cpp index 4c4e581..53cb77a 100644 --- a/libopie2/opieui/oclickablelabel.cpp +++ b/libopie2/opieui/oclickablelabel.cpp @@ -29,7 +29,7 @@ #include <opie2/oclickablelabel.h> -using namespace Opie; +using namespace Opie::Ui; /** * This constructs the clickable ButtonLabel diff --git a/libopie2/opieui/oclickablelabel.h b/libopie2/opieui/oclickablelabel.h index b224d61..90859a0 100644 --- a/libopie2/opieui/oclickablelabel.h +++ b/libopie2/opieui/oclickablelabel.h @@ -33,8 +33,8 @@ /* QT */ #include <qlabel.h> -namespace Opie -{ +namespace Opie{ +namespace Ui { /** * This class is a special QLabel which can behave @@ -98,6 +98,7 @@ private: Private *d; // private d pointer }; -}; +} +} #endif diff --git a/libopie2/opieui/odialog.cpp b/libopie2/opieui/odialog.cpp index 4d269d4..27f8d20 100644 --- a/libopie2/opieui/odialog.cpp +++ b/libopie2/opieui/odialog.cpp @@ -32,6 +32,8 @@ #warning Make Margin and Spacing device dependend and configurable! +using namespace Opie::Ui; + int ODialog::mMarginSize = 5; int ODialog::mSpacingSize = 2; diff --git a/libopie2/opieui/odialog.h b/libopie2/opieui/odialog.h index ceff612..57f534c 100644 --- a/libopie2/opieui/odialog.h +++ b/libopie2/opieui/odialog.h @@ -55,6 +55,9 @@ class QLayoutItem; // 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 +namespace Opie { +namespace Ui { + class ODialog : public QDialog { Q_OBJECT @@ -88,4 +91,6 @@ class ODialog : public QDialog ODialogPrivate *d; }; +} +} #endif // ODIALOG_H diff --git a/libopie2/opieui/ofontselector.cpp b/libopie2/opieui/ofontselector.cpp index f93781f..b19c26e 100644 --- a/libopie2/opieui/ofontselector.cpp +++ b/libopie2/opieui/ofontselector.cpp @@ -38,10 +38,10 @@ #include <qlabel.h> #include <qmultilineedit.h> -using namespace Opie; -namespace Opie -{ +namespace Opie { +namespace Ui { +namespace Private { class OFontSelectorPrivate { @@ -56,11 +56,6 @@ public: FontDatabase m_fdb; }; -}; - -namespace -{ - class FontListItem : public QListBoxText { public: @@ -95,7 +90,13 @@ private: QValueList<int> m_sizes; QString m_name; }; +} +} +} + +using namespace Opie::Ui; +using namespace Opie::Ui::Private; static int findItemCB( QComboBox *box, const QString &str ) { @@ -107,7 +108,6 @@ static int findItemCB( QComboBox *box, const QString &str ) return -1; } -} /* static same as anon. namespace */ static int qt_version() { @@ -426,3 +426,4 @@ void OFontSelector::resizeEvent ( QResizeEvent *re ) d->m_preview->setFixedHeight ( d->m_preview->height()); } + diff --git a/libopie2/opieui/ofontselector.h b/libopie2/opieui/ofontselector.h index ad51819..1d97233 100644 --- a/libopie2/opieui/ofontselector.h +++ b/libopie2/opieui/ofontselector.h @@ -35,10 +35,11 @@ class QListBox; -namespace Opie -{ - +namespace Opie { +namespace Ui { +namespace Private { class OFontSelectorPrivate; +} /** * This class lets you chose a Font out of a list of Fonts. @@ -95,10 +96,11 @@ private: void changeFont ( ); private: - OFontSelectorPrivate *d; + Private::OFontSelectorPrivate *d; }; -}; +} +} #endif diff --git a/libopie2/opieui/oimageeffect.cpp b/libopie2/opieui/oimageeffect.cpp index 9a58bb9..be47eb2 100644 --- a/libopie2/opieui/oimageeffect.cpp +++ b/libopie2/opieui/oimageeffect.cpp @@ -41,6 +41,10 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define DegreesToRadians(x) ((x)*M_PI/180.0) using namespace std; +using namespace Opie::Core; + +namespace Opie { +namespace Ui { inline unsigned int intensityValue(unsigned int color) { @@ -3765,4 +3769,5 @@ void OImageEffect::contrastHSV(QImage &img, bool sharpen) - +} +} diff --git a/libopie2/opieui/oimageeffect.h b/libopie2/opieui/oimageeffect.h index fb4d22d..4f86d5b 100644 --- a/libopie2/opieui/oimageeffect.h +++ b/libopie2/opieui/oimageeffect.h @@ -39,6 +39,8 @@ class QImage; class QSize; class QColor; +namespace Opie { +namespace Ui { /** * This class includes various @ref QImage based graphical effects. * @@ -556,4 +558,7 @@ private: unsigned int background); }; +} +} + #endif diff --git a/libopie2/opieui/olistview.cpp b/libopie2/opieui/olistview.cpp index 0ee2fde..38670b4 100644 --- a/libopie2/opieui/olistview.cpp +++ b/libopie2/opieui/olistview.cpp @@ -36,6 +36,11 @@ #include <opie2/odebug.h> #include <opie2/olistview.h> +using namespace Opie::Core; + + +namespace Opie { +namespace Ui { /*====================================================================================== * OListView *======================================================================================*/ @@ -755,3 +760,5 @@ ONamedListViewItem* ONamedListViewItem::find( const QString& column, const QStri return 0; } +} +} diff --git a/libopie2/opieui/olistview.h b/libopie2/opieui/olistview.h index 59b0973..8195a62 100644 --- a/libopie2/opieui/olistview.h +++ b/libopie2/opieui/olistview.h @@ -36,6 +36,9 @@ #include <qdatastream.h> #include <qstringlist.h> + +namespace Opie { +namespace Ui { class OListViewItem; @@ -54,6 +57,7 @@ class OListViewItem; */ class OListView: public QListView { + Q_OBJECT public: /** * Constructor. @@ -139,8 +143,10 @@ class OListView: public QListView private: QColor m_alternateBackground; - bool m_fullWidth; + bool m_fullWidth : 1; QPen m_columnSeparator; + class Private; + Private *d; }; #ifndef QT_NO_DATASTREAM @@ -242,8 +248,10 @@ class OListViewItem: public QListViewItem virtual void expand(){}; private: - bool m_known; - bool m_odd; + bool m_known : 1; + bool m_odd : 1; + class Private; + Private *d; }; #ifndef QT_NO_DATASTREAM @@ -354,6 +362,9 @@ class ONamedListView: public OListView virtual ONamedListViewItem* find( ONamedListViewItem* start, const QString& column, const QString& text, int recurse = -1 ) const; virtual ONamedListViewItem* find( const QString& column, const QString& text, int recurse = -1 ) const; + private: + class Private; + Private *d; }; /*====================================================================================== @@ -403,7 +414,13 @@ class ONamedListViewItem: public OListViewItem */ virtual ONamedListViewItem* find( int column, const QString& text, int recurse = -1 ) const; virtual ONamedListViewItem* find( const QString& column, const QString& text, int recurse = -1 ) const; -}; + private: + class Private; + Private *d; + +}; +} +} #endif // OLISTVIEW_H diff --git a/libopie2/opieui/opieui.pro b/libopie2/opieui/opieui.pro index 1be8db5..e895edc 100644 --- a/libopie2/opieui/opieui.pro +++ b/libopie2/opieui/opieui.pro @@ -6,11 +6,9 @@ HEADERS = oclickablelabel.h \ ofontselector.h \ oimageeffect.h \ olistview.h \ - omessagebox.h \ opixmapeffect.h \ opopupmenu.h \ opixmapprovider.h \ - oresource.h \ oselector.h \ oseparator.h \ otabinfo.h \ @@ -31,7 +29,6 @@ SOURCES = oclickablelabel.cpp \ opixmapeffect.cpp \ opopupmenu.cpp \ opixmapprovider.cpp \ - oresource.cpp \ oselector.cpp \ oseparator.cpp \ otabbar.cpp \ diff --git a/libopie2/opieui/opixmapeffect.cpp b/libopie2/opieui/opixmapeffect.cpp index 05f851d..794c7b2 100644 --- a/libopie2/opieui/opixmapeffect.cpp +++ b/libopie2/opieui/opixmapeffect.cpp @@ -17,6 +17,8 @@ #include <opie2/opixmapeffect.h> #include <opie2/oimageeffect.h> + +using namespace Opie::Ui; //====================================================================== // // Gradient effects diff --git a/libopie2/opieui/opixmapeffect.h b/libopie2/opieui/opixmapeffect.h index 283fe2d..b780f9f 100644 --- a/libopie2/opieui/opixmapeffect.h +++ b/libopie2/opieui/opixmapeffect.h @@ -15,6 +15,9 @@ typedef QPixmap OPixmap; class QColor; + +namespace Opie { +namespace Ui { /** * This class includes various pixmap-based graphical effects. * @@ -210,6 +213,7 @@ public: */ static OPixmap selectedPixmap( const OPixmap &pixmap, const QColor &col ); }; - +} +} #endif diff --git a/libopie2/opieui/opixmapprovider.cpp b/libopie2/opieui/opixmapprovider.cpp index 7be9e3b..7eb67a2 100644 --- a/libopie2/opieui/opixmapprovider.cpp +++ b/libopie2/opieui/opixmapprovider.cpp @@ -20,6 +20,8 @@ #include <opie2/opixmapprovider.h> +using namespace Opie::Ui; + OPixmapProvider::~OPixmapProvider() {} void OPixmapProvider::virtual_hook( int , void* ) diff --git a/libopie2/opieui/opixmapprovider.h b/libopie2/opieui/opixmapprovider.h index 5b76647..9d9bd69 100644 --- a/libopie2/opieui/opixmapprovider.h +++ b/libopie2/opieui/opixmapprovider.h @@ -23,7 +23,10 @@ #include <qpixmap.h> +namespace Opie { +namespace Ui { /** + * \todo make usefull * A tiny abstract class with just one method: * @ref pixmapFor() * @@ -48,7 +51,12 @@ public: virtual QPixmap pixmapFor( const QString& text, int size = 0 ) = 0; protected: virtual void virtual_hook( int id, void* data ); +private: + class Private; + Private *d; }; +} +} #endif // OPIXMAPPROVIDER_H diff --git a/libopie2/opieui/opopupmenu.cpp b/libopie2/opieui/opopupmenu.cpp index d5cc575..3ab8490 100644 --- a/libopie2/opieui/opopupmenu.cpp +++ b/libopie2/opieui/opopupmenu.cpp @@ -27,6 +27,9 @@ #include <opie2/opopupmenu.h> #include <opie2/oconfig.h> +using namespace Opie::Core; +using namespace Opie::Ui; + OPopupTitle::OPopupTitle(QWidget *parent, const char *name) : QWidget(parent, name) { diff --git a/libopie2/opieui/opopupmenu.h b/libopie2/opieui/opopupmenu.h index 54e4301..419a954 100644 --- a/libopie2/opieui/opopupmenu.h +++ b/libopie2/opieui/opopupmenu.h @@ -31,6 +31,8 @@ #include <opie2/opixmapeffect.h> +namespace Opie { +namespace Ui { /** * Title widget for use in @ref OPopupMenu. * @@ -256,4 +258,7 @@ private: OPopupMenuPrivate *d; }; +} +} + #endif diff --git a/libopie2/opieui/oselector.cpp b/libopie2/opieui/oselector.cpp index 23b3ce3..5f6f10f 100644 --- a/libopie2/opieui/oselector.cpp +++ b/libopie2/opieui/oselector.cpp @@ -36,6 +36,8 @@ * The contents of the selector are drawn by derived class. */ +using namespace Opie::Ui; + OXYSelector::OXYSelector( QWidget *parent, const char *name ) : QWidget( parent, name ) { diff --git a/libopie2/opieui/oselector.h b/libopie2/opieui/oselector.h index f832239..fe75a46 100644 --- a/libopie2/opieui/oselector.h +++ b/libopie2/opieui/oselector.h @@ -27,6 +27,9 @@ #include <qrangecontrol.h> #include <qpixmap.h> + +namespace Opie { +namespace Ui { /** * OXYSelector is the base class for other widgets which * provides the ability to choose from a two-dimensional @@ -512,6 +515,8 @@ private: OColorPrivate *d; }; +} +} #endif // __OSELECT_H__ diff --git a/libopie2/opieui/oseparator.cpp b/libopie2/opieui/oseparator.cpp index b93c225..bbc4381 100644 --- a/libopie2/opieui/oseparator.cpp +++ b/libopie2/opieui/oseparator.cpp @@ -36,6 +36,8 @@ /* QT */ +using namespace Opie::Core; +using namespace Opie::Ui; OSeparator::OSeparator(QWidget* parent, const char* name, WFlags f) : QFrame(parent, name, f) diff --git a/libopie2/opieui/oseparator.h b/libopie2/opieui/oseparator.h index e59b3f4..6fc4344 100644 --- a/libopie2/opieui/oseparator.h +++ b/libopie2/opieui/oseparator.h @@ -35,6 +35,9 @@ #include <qframe.h> +namespace Opie { +namespace Ui { + /** * Standard horizontal or vertical separator. * @@ -86,5 +89,7 @@ private: class OSeparatorPrivate* d; }; +} +} #endif // OSEPARATOR_H diff --git a/libopie2/opieui/otabbar.cpp b/libopie2/opieui/otabbar.cpp index cd3a34b..a62e18b 100644 --- a/libopie2/opieui/otabbar.cpp +++ b/libopie2/opieui/otabbar.cpp @@ -31,7 +31,7 @@ #include <opie2/otabbar.h> -using namespace Opie; +using namespace Opie::Ui; OTabBar::OTabBar( QWidget *parent , const char *name ) :QTabBar( parent, name ) diff --git a/libopie2/opieui/otabbar.h b/libopie2/opieui/otabbar.h index 2f35c85..925ae96 100644 --- a/libopie2/opieui/otabbar.h +++ b/libopie2/opieui/otabbar.h @@ -35,8 +35,8 @@ /* QT */ #include <qtabbar.h> -namespace Opie -{ +namespace Opie { +namespace Ui { /** * @class OTabBar @@ -80,6 +80,7 @@ private: Private *d; }; -}; +} +} #endif diff --git a/libopie2/opieui/otabinfo.h b/libopie2/opieui/otabinfo.h index 4a6ce14..426c45a 100644 --- a/libopie2/opieui/otabinfo.h +++ b/libopie2/opieui/otabinfo.h @@ -38,8 +38,8 @@ class QWidget; -namespace Opie -{ +namespace Opie{ +namespace Ui { /** * @class OTabInfo @@ -135,6 +135,7 @@ private: */ typedef QList<OTabInfo> OTabInfoList; -}; +} +} #endif diff --git a/libopie2/opieui/otabwidget.cpp b/libopie2/opieui/otabwidget.cpp index f47c90b..a9f7da9 100644 --- a/libopie2/opieui/otabwidget.cpp +++ b/libopie2/opieui/otabwidget.cpp @@ -41,7 +41,7 @@ #include <qcombobox.h> #include <qwidgetstack.h> -using namespace Opie; +using namespace Opie::Ui; OTabWidget::OTabWidget( QWidget *parent, const char *name, TabStyle s, TabPosition p ) : QWidget( parent, name ) diff --git a/libopie2/opieui/otabwidget.h b/libopie2/opieui/otabwidget.h index 092f22c..6a64b7d 100644 --- a/libopie2/opieui/otabwidget.h +++ b/libopie2/opieui/otabwidget.h @@ -38,15 +38,14 @@ #include <qwidget.h> #include <qlist.h> -using namespace Opie; class QComboBox; class QPixmap; class QTabBar; class QWidgetStack; -namespace Opie -{ +namespace Opie { +namespace Ui { class OTabBar; @@ -287,6 +286,7 @@ private: void slotTabListSelected( int ); }; -}; +} +} #endif diff --git a/libopie2/opieui/otaskbarapplet.cpp b/libopie2/opieui/otaskbarapplet.cpp index a67356d..b5268f0 100644 --- a/libopie2/opieui/otaskbarapplet.cpp +++ b/libopie2/opieui/otaskbarapplet.cpp @@ -28,5 +28,55 @@ Boston, MA 02111-1307, USA. */ +#include <opie2/otaskbarapplet.h> + +#include <qpe/qpeapplication.h> +#include <qframe.h> + +using namespace Opie::Ui; + + +/** + * \todo no example yet!!! + * If you want to implement an Applet for the Opie Taskbar + * use this interface. + * The only specail thing about applets is that you need to build + * it as plugin/library and do EXPORT_OPIE_APPLET_v1( YourApplet ) + * at the bottom of your application. This takes care of + * the activation and implementing the TaskbarAppletInterface. + * You also need to add a static int position() functions to your + * application. + * \code + * class MyApplet : public OTaskBarApplet { + * public: + * static int position() { return 3: } + * void doStuff() { + * popup( myWidget ); + * } + * }; + * EXPORT_OPIE_APPLET_v1( MyApplet ) + * \endcode + * + * @author Michael Lauer + * @version 0.5 + * @see TaskbarAppletInterface + */ +OTaskbarApplet::OTaskbarApplet( QWidget* parent, const char* name ) + :QWidget( parent, name ){ + setFixedHeight( 18 ); + setFixedWidth( 14 ); +} + +OTaskbarApplet::~OTaskbarApplet(){ +} + +void OTaskbarApplet::popup( QWidget* widget ){ + QPoint curPos = mapToGlobal( QPoint( 0, 0 ) ); + int w = widget->sizeHint().width(); + int x = curPos.x() - (w/2 ); + if ( (x+w) > QPEApplication::desktop()->width() ) + x = QPEApplication::desktop()->width()-w; + widget->move( x, curPos.y()-widget->sizeHint().height() ); + widget->show(); +} -// Empty on purpose until we shipped Opie 1.0 (see otaskbarapplet.h for explanation) diff --git a/libopie2/opieui/otaskbarapplet.h b/libopie2/opieui/otaskbarapplet.h index 074367f..0c85ee7 100644 --- a/libopie2/opieui/otaskbarapplet.h +++ b/libopie2/opieui/otaskbarapplet.h @@ -33,11 +33,20 @@ #define OTASKBARAPPLET_H #include <qpe/taskbarappletinterface.h> +#include <qpe/qcom.h> +#include <qwidget.h> + +class QMouseEvent; + +namespace Opie { +namespace Ui { +namespace Private { /*====================================================================================== * OTaskbarAppletWrapper *======================================================================================*/ +class OTaskbarAppletWrapperPrivate; template<class T> class OTaskbarAppletWrapper : public TaskbarAppletInterface { public: @@ -80,14 +89,10 @@ template<class T> class OTaskbarAppletWrapper : public TaskbarAppletInterface private: T* _applet; + OTaskbarAppletWrapperPrivate *d; }; -#include <qframe.h> -#include <qwidget.h> -#include <qpe/qpeapplication.h> - -class QMouseEvent; - +} /*====================================================================================== * OTaskbarApplet *======================================================================================*/ @@ -103,28 +108,22 @@ class QMouseEvent; class OTaskbarApplet : public QWidget { public: - OTaskbarApplet( QWidget* parent, const char* name = 0 ):QWidget( parent, name ) - { - setFixedHeight( 18 ); - setFixedWidth( 14 ); - } + OTaskbarApplet( QWidget* parent, const char* name = 0 ); + virtual ~OTaskbarApplet(); - virtual ~OTaskbarApplet() - { + protected: + virtual void popup( QWidget* widget ); +private: + class Private; + Private *d; +}; +} } - protected: - virtual void popup( QWidget* widget ) - { - QPoint curPos = mapToGlobal( QPoint( 0, 0 ) ); - int w = widget->sizeHint().width(); - int x = curPos.x() - (w/2 ); - if ( (x+w) > QPEApplication::desktop()->width() ) - x = QPEApplication::desktop()->width()-w; - widget->move( x, curPos.y()-widget->sizeHint().height() ); - widget->show(); +#define EXPORT_OPIE_APPLET_v1( AppLet ) \ + Q_EXPORT_INTERFACE() { \ + Q_CREATE_INSTANCE( Opie::Ui::Private::OTaskbarAppletWrapper<AppLet> ) \ } -}; #endif diff --git a/libopie2/opieui/otimepicker.cpp b/libopie2/opieui/otimepicker.cpp index 66f9ce0..7de0fd3 100644 --- a/libopie2/opieui/otimepicker.cpp +++ b/libopie2/opieui/otimepicker.cpp @@ -27,14 +27,18 @@ Boston, MA 02111-1307, USA. */ +/* OPIE */ +#include <opie2/otimepicker.h> + /* QT */ +#include <qgroupbox.h> #include <qlayout.h> #include <qlineedit.h> -/* OPIE */ -#include <opie2/otimepicker.h> -using namespace Opie; + +namespace Opie { +namespace Ui { /** * Constructs the widget @@ -220,6 +224,8 @@ void OTimePicker::setHour(int h) OTimePickerDialog::OTimePickerDialog ( QWidget* parent, const char* name, WFlags fl ) : OTimePickerDialogBase (parent , name, true , fl) { + m_timePicker = new OTimePicker( GroupBox1, "m_timePicker" ); + GroupBox1Layout->addWidget( m_timePicker, 0, 0 ); connect ( m_timePicker, SIGNAL( timeChanged(const QTime&) ), this, SLOT( setTime(const QTime&) ) ); @@ -290,3 +296,6 @@ void OTimePickerDialog::setMinute ( const QString& minute ) setTime ( m_time ); } } + +} +} diff --git a/libopie2/opieui/otimepicker.h b/libopie2/opieui/otimepicker.h index 2da7773..01bb557 100644 --- a/libopie2/opieui/otimepicker.h +++ b/libopie2/opieui/otimepicker.h @@ -32,7 +32,7 @@ /* OPIE */ #include <opie2/oclickablelabel.h> -#include "otimepickerbase.h" +#include <opie2/otimepickerbase.h> /* QT */ #include <qwidget.h> @@ -40,10 +40,9 @@ #include <qdatetime.h> #include <qdialog.h> -using namespace Opie; -// namespace Opie -// { +namespace Opie { +namespace Ui { /** * A class to pick time. It uses clickable labels @@ -114,12 +113,20 @@ public slots: void setMinute( const QString& minute ); private: + OTimePicker *m_timePicker; QTime m_time; class Private; Private* d; }; -// }; +} +} +/* for Qt2 */ +#if ( QT_VERSION-0 >= 0x030000 ) +#error "Fix the UI File to use namespaces" +#else +typedef Opie::Ui::OTimePicker OUIOTimePicker; +#endif #endif diff --git a/libopie2/opieui/otimepickerbase.ui b/libopie2/opieui/otimepickerbase.ui index 3e7f2fb..c2eb7c5 100644 --- a/libopie2/opieui/otimepickerbase.ui +++ b/libopie2/opieui/otimepickerbase.ui @@ -11,7 +11,7 @@ <rect> <x>0</x> <y>0</y> - <width>210</width> + <width>182</width> <height>137</height> </rect> </property> @@ -249,44 +249,8 @@ <name>spacing</name> <number>6</number> </property> - <widget row="0" column="0" > - <class>OTimePicker</class> - <property stdset="1"> - <name>name</name> - <cstring>m_timePicker</cstring> - </property> - <property stdset="1"> - <name>sizePolicy</name> - <sizepolicy> - <hsizetype>3</hsizetype> - <vsizetype>3</vsizetype> - </sizepolicy> - </property> - </widget> </grid> </widget> </vbox> </widget> -<customwidgets> - <customwidget> - <class>OTimePicker</class> - <header location="local">otimepicker.h</header> - <sizehint> - <width>-1</width> - <height>-1</height> - </sizehint> - <container>0</container> - <sizepolicy> - <hordata>7</hordata> - <verdata>1</verdata> - </sizepolicy> - <pixmap>image0</pixmap> - </customwidget> -</customwidgets> -<images> - <image> - <name>image0</name> - <data format="XPM.GZ" length="646">789c6dd2c10ac2300c00d07bbf2234b7229d1ddec44f503c0ae2a154410f53d0ed20e2bf6bdb656dd6861dd23d9a66591b0587fd1654235ebded6f0edcd53e419d87ae7b1f4f9b8f906d0bfe012317426a70b07bdc2f3ec77f8ed6b89559061a0343d06a124cc105596482585094bc0ae599b04646c9018926491b2205e140c485cace25755c175d0a967b622ff900b8cc9c7d29af594ea722d589167f813aa852ba07d94b9dce296e883fe7bb163f23896753</data> - </image> -</images> </UI> diff --git a/libopie2/opieui/oversatileview.cpp b/libopie2/opieui/oversatileview.cpp index 78154b7..f6c6410 100644 --- a/libopie2/opieui/oversatileview.cpp +++ b/libopie2/opieui/oversatileview.cpp @@ -40,6 +40,9 @@ #include <qaction.h> #include <qpopupmenu.h> +using namespace Opie::Core; +using namespace Opie::Ui; + /* XPM */ static const char * view_icon_xpm[] = { "16 16 16 1", diff --git a/libopie2/opieui/oversatileview.h b/libopie2/opieui/oversatileview.h index 8af21dc..61b61db 100644 --- a/libopie2/opieui/oversatileview.h +++ b/libopie2/opieui/oversatileview.h @@ -45,7 +45,6 @@ class QHeader; class QIconSet; class QIconViewItem; -class OListView; class QListViewItem; class QPopupMenu; class QString; @@ -54,6 +53,10 @@ class QString; class QIconDragItem; #endif +namespace Opie { +namespace Ui { +class OListView; + class OVersatileView : public QWidgetStack { Q_OBJECT @@ -390,5 +393,7 @@ public: }; +} +} #endif diff --git a/libopie2/opieui/oversatileviewitem.cpp b/libopie2/opieui/oversatileviewitem.cpp index 66de8eb..03c6738 100644 --- a/libopie2/opieui/oversatileviewitem.cpp +++ b/libopie2/opieui/oversatileviewitem.cpp @@ -31,6 +31,8 @@ #include <opie2/oversatileviewitem.h> #include <opie2/oversatileview.h> +using namespace Opie::Ui; + OVersatileViewItem::OVersatileViewItem( OVersatileView * parent ) :OListViewItem( parent->_listview ), QIconViewItem( parent->_iconview ), _versatileview( parent ) diff --git a/libopie2/opieui/oversatileviewitem.h b/libopie2/opieui/oversatileviewitem.h index ee8ee20..c4977af 100644 --- a/libopie2/opieui/oversatileviewitem.h +++ b/libopie2/opieui/oversatileviewitem.h @@ -40,6 +40,9 @@ #include <opie2/olistview.h> +namespace Opie { +namespace Ui { + class OVersatileView; class OVersatileViewItem : public OListViewItem, public QIconViewItem @@ -97,4 +100,6 @@ class OVersatileViewItem : public OListViewItem, public QIconViewItem }; +} +} #endif diff --git a/libopie2/opieui/owait.cpp b/libopie2/opieui/owait.cpp index 8bb4ed6..9519888 100644 --- a/libopie2/opieui/owait.cpp +++ b/libopie2/opieui/owait.cpp @@ -38,6 +38,8 @@ #include <qlayout.h> #include <qpainter.h> +using namespace Opie::Ui; + static int frame = 0; /** diff --git a/libopie2/opieui/owait.h b/libopie2/opieui/owait.h index 3267064..03c33e4 100644 --- a/libopie2/opieui/owait.h +++ b/libopie2/opieui/owait.h @@ -37,6 +37,9 @@ #include <qpixmap.h> #include <qtimer.h> + +namespace Opie { +namespace Ui { /** * This class displays a animated waiting icon in the middle of the screen. * @@ -82,5 +85,6 @@ class OWait : public QDialog class Private; Private *d; }; - +} +} #endif |