5 files changed, 176 insertions, 19 deletions

diff --git a/libopie/big-screen/example/osplitter_mail.cpp b/libopie/big-screen/example/osplitter_mail.cpp
new file mode 100644
index 0000000..91442c8
--- a/dev/null
+++ b/libopie/big-screen/example/osplitter_mail.cpp
@@ -0,0 +1,70 @@
+
+#include <qstring.h>
+#include <qlabel.h>
+#include <qheader.h>
+#include <qlayout.h>
+
+#include <qpe/qpeapplication.h>
+#include <opie/oapplicationfactory.h>
+
+#include "../osplitter.h"
+
+#include "osplitter_mail.h"
+
+
+OPIE_EXPORT_APP( OApplicationFactory<ListViews> )
+
+class Folder {
+    int dummy;
+};
+
+// -----------------------------------------------------------------
+
+ListViews::ListViews( QWidget* p, const char* name, WFlags fl )
+    : QWidget( p, name, fl ) {
+    m_lstFolders.setAutoDelete( true );
+    QHBoxLayout *lay = new QHBoxLayout(this);
+
+    m_splitter = new OSplitter( Horizontal, this, "SPlitter 1" );
+    lay->addWidget( m_splitter );
+    connect(m_splitter, SIGNAL(sizeChange(bool, const QSize& ) ),
+            this, SLOT(slotSizeChange(bool, const QSize& ) ) );
+
+    m_overview = new QListView( m_splitter );
+    m_overview->header()->setClickEnabled( FALSE );
+    m_overview->addColumn( tr("Folder") );
+    m_overview->setMaximumWidth( 200 );
+    m_splitter->addWidget( m_overview, "zoom", tr("Folder Overview") );
+    m_splitter->setSizeChange( 300 );
+
+    /* OSplitter starts with the small mode */
+    m_messages = 0;
+    m_message = m_attach  = 0;
+
+    splitti = new OSplitter( Vertical, m_splitter, "Splitti2" );
+    splitti->setSizeChange( 300 );
+    splitti->setSizePolicy( QSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding ) );
+
+    QLabel *lbl = new QLabel(splitti);
+    lbl->setTextFormat ( Qt::RichText );
+    lbl->setText("<br><br><b>Test Test  Test</b><br><br><p>Fooooo hjhh</p>");
+
+    m_messages = new QListView( splitti );
+    m_messages->addColumn(" Messages ");
+
+    folder1 = new QListView( splitti );
+    folder1->addColumn( "Messages 2 " );
+
+    splitti->addWidget(m_messages, "mail", tr("Mails") );
+    splitti->addWidget(folder1, "folder", tr("Folder") );
+    splitti->addWidget( lbl, "logo", tr("Label") );
+    m_message = lbl;
+
+    m_splitter->addWidget( splitti );
+
+}
+
+
+ListViews::~ListViews() {
+
+}
diff --git a/libopie/big-screen/example/osplitter_mail.h b/libopie/big-screen/example/osplitter_mail.h
new file mode 100644
index 0000000..d76f264
--- a/dev/null
+++ b/libopie/big-screen/example/osplitter_mail.h
@@ -0,0 +1,48 @@
+/*
+ * You may use, modify and distribute this code without any limitation
+ */
+
+/*
+ * Header file for a more complete email client like
+ * layout
+ */
+
+#ifndef OPIE_SPLITTER_MAIL_EXAMPLE_H
+#define OPIE_SPLITTER_MAIL_EXAMPLE_H
+
+#include <qwidget.h>
+#include <qlist.h>
+#include <qlistview.h>
+
+class Folder;
+class QLabel;
+
+class OSplitter;
+class ListViews : public QWidget {
+    Q_OBJECT
+public:
+    static QString appName() { return QString::fromLatin1("osplitter-mail"); }
+    ListViews( QWidget* parent, const char * name, WFlags fl );
+    ~ListViews();
+
+private:
+    void initFolders();
+    void initFolder( Folder *folder, unsigned int &count );
+
+    QListView *m_messages, *m_overview;
+    QLabel *m_message, *m_attach;
+    QList<QListView> m_folders; // used in tab mode
+    QList<Folder> m_lstFolders;
+    bool m_mode : 1; // bitfield
+    OSplitter *m_splitter;
+    OSplitter *splitti;
+    QListView *folder1;
+#if 0
+//private slots:
+//    void slotFolderChanged( QListViewItem* );
+//    void slotMessageChanged();
+//    void slotSizeChange( bool, const QSize& );
+#endif
+};
+
+#endif
diff --git a/libopie/big-screen/example/osplitter_mail.pro b/libopie/big-screen/example/osplitter_mail.pro
new file mode 100644
index 0000000..ec6e626
--- a/dev/null
+++ b/libopie/big-screen/example/osplitter_mail.pro
@@ -0,0 +1,12 @@
+CONFIG += qt warn_on
+TEMPLATE = app
+TARGET = osplitter-mail
+
+INCLUDEPATH +=  $(OPIEDIR)/include
+DEPENDSPATH +=  $(OPIEDIR)/include
+
+HEADERS = osplitter_mail.h
+SOURCES = osplitter_mail.cpp
+
+LIBS += -lqpe -lopie
+include ( $(OPIEDIR)/include.pro )
diff --git a/libopie/big-screen/osplitter.cpp b/libopie/big-screen/osplitter.cpp
index d06568f..47f856d 100644
--- a/libopie/big-screen/osplitter.cpp
+++ b/libopie/big-screen/osplitter.cpp
@@ -67,24 +67,25 @@ OSplitter::OSplitter( Orientation orient, QWidget* parent, const char* name, WFl
     m_parentTab = 0;
     changeTab();
 
 }
 
 
 /**
  * Destructor destructs this object and cleans up. All child
  * widgets will be deleted
  * @see addWidget
  */
 OSplitter::~OSplitter() {
+    qWarning("Deleted Splitter");
     m_splitter.setAutoDelete( true );
     m_splitter.clear();
 
     delete m_hbox;
     delete m_tabWidget;
 }
 
 
 /**
  * Sets the label for the Splitter. This label will be used
  * if a parent splitter is arranged as TabWidget but
  * this splitter is in fullscreen mode. Then a tab with OSplitter::label()
@@ -145,25 +146,25 @@ void OSplitter::setSizeChange( int width_height ) {
 /**
  * This functions allows to add another OSplitter and to share
  * the OTabBar in small screen mode. The ownerships gets transfered.
  * OSplitters are always added after normal widget items
  */
 void OSplitter::addWidget( OSplitter* split ) {
     m_splitter.append( split );
 
     /*
      * set tab widget
      */
     if (m_tabWidget )
-        split->setTabWidget( m_tabWidget );
+        setTabWidget( m_parentTab );
     else{
         Opie::OSplitterContainer con;
         con.widget =split;
         addToBox( con );
     }
 }
 
 /*
  * If in a tab it should be removed
  * and if in a hbox  the reparent kills it too
  */
 /**
@@ -297,65 +298,72 @@ void OSplitter::setCurrentWidget( int tab ) {
  * return the currently activated widget if in tab widget mode
  * or null because all widgets are visible
  */
 QWidget* OSplitter::currentWidget() const{
     if (m_tabWidget)
         return m_tabWidget->currentWidget();
     else if (m_parentTab )
         return m_parentTab->currentWidget();
 
     return 0l;
 }
 
-#if 0
+
 /**
  * @reimplented for internal reasons
  * returns the sizeHint of one of its sub widgets
  */
 QSize OSplitter::sizeHint()const {
-    return QSize(10, 10);
+    if (m_parentTab )
+        return QFrame::sizeHint();
 
     if (m_hbox )
         return m_hbox->sizeHint();
     else
         return m_tabWidget->sizeHint();
 }
 
 QSize OSplitter::minimumSizeHint()const {
-    return QSize(10, 10 );
+    if (m_parentTab )
+        return QFrame::minimumSizeHint();
+    if (m_hbox)
+        return m_hbox->sizeHint();
+    else
+        return m_tabWidget->sizeHint();
 }
-#endif
+
 
 /**
  * @reimplemented for internal reasons
  */
 void OSplitter::resizeEvent( QResizeEvent* res ) {
     QFrame::resizeEvent( res );
     /*
      *
      */
 //    qWarning("Old size was width = %d height = %d", res->oldSize().width(), res->oldSize().height() );
     bool mode = true;
-    qWarning("New size is  width = %d height = %d", res->size().width(), res->size().height() );
+    qWarning("New size is  width = %d height = %d  %s", res->size().width(), res->size().height(), name() );
     if ( res->size().width() > m_size_policy &&
          m_orient == Horizontal ) {
         changeHBox();
         mode = false;
     }else if ( (res->size().width() <= m_size_policy &&
                m_orient == Horizontal ) ||
                (res->size().height() <= m_size_policy &&
                 m_orient == Vertical ) ) {
         changeTab();
     }else if ( res->size().height() > m_size_policy &&
-               m_size_policy == Vertical ) {
+               m_orient == Vertical ) {
+        qWarning("Changng to vbox %s", name() );
         changeVBox();
         mode = false;
     }
 
     emit sizeChanged(mode, m_orient );
 }
 
 /*
  * Adds a container to a tab either the parent tab
  * or our own
  */
 void OSplitter::addToTab( const Opie::OSplitterContainer& con ) {
@@ -389,172 +397,185 @@ void OSplitter::removeFromTab( QWidget* wid ) {
 
 /*
  * switches over to a OTabWidget layout
  * it is recursive
  */
 void OSplitter::changeTab() {
     /* if we're the owner of the tab widget */
     if (m_tabWidget ) {
         m_tabWidget->setGeometry( frameRect() );
         return;
     }
 
-    qWarning(" New Tab Widget ");
+    qWarning(" New Tab Widget %s", name() );
     /*
      * and add all widgets this will reparent them
      * delete m_hbox set it to 0
      *
      */
     OTabWidget *tab;
     if ( m_parentTab ) {
         tab = m_parentTab;
-        tab->removePage( this );
+        /* expensive but needed cause we're called from setTabWidget and resizeEvent*/
+        if (!m_container.isEmpty() ) {
+            ContainerList::Iterator it = m_container.begin();
+            for (; it != m_container.end(); ++it )
+                m_parentTab->removePage( (*it).widget );
+        }
     }else
         tab = m_tabWidget = new OTabWidget( this );
 
     connect(tab, SIGNAL(currentChanged(QWidget*) ),
             this, SIGNAL(currentChanged(QWidget*) ) );
 
     for ( ContainerList::Iterator it = m_container.begin(); it != m_container.end(); ++it ) {
         qWarning("Widget is %s", (*it).name.latin1() );
         addToTab( (*it) );
     }
 
-    for ( OSplitter* split = m_splitter.first(); split; split = m_splitter.next() )
+    for ( OSplitter* split = m_splitter.first(); split; split = m_splitter.next() ) {
+        split->reparent(this, 0, QPoint(0, 0) );
         split->setTabWidget( tab );
+    }
 
 
     delete m_hbox;
     m_hbox = 0;
     if (!m_tabWidget )
         return;
 
     m_tabWidget->setGeometry( frameRect() );
     m_tabWidget->show();
 
 }
 
 /*
  * changes over to a box
  * this is recursive as well
  */
 void OSplitter::changeHBox() {
     if (m_hbox ) {
         m_hbox->setGeometry( frameRect() );
         return;
     }
 
-    qWarning("new HBox");
+    qWarning("new HBox %s", name() );
     m_hbox = new QHBox( this );
     commonChangeBox();
 }
 
 void OSplitter::changeVBox() {
     if (m_hbox ) {
         m_hbox->setGeometry( frameRect() );
         return;
     }
 
-    qWarning("New VBOX");
+    qWarning("New VBOX %s", name() );
     m_hbox = new QVBox( this );
 
     commonChangeBox();
 
 }
 
 /*
  * common box code
  * first remove and add children
  * the other splitters
  * it is recursive as well due the call to setTabWidget
  */
 void OSplitter::commonChangeBox() {
+    qWarning(" Name of Splitters is %s", name() );
 
     for (ContainerList::Iterator it = m_container.begin(); it != m_container.end(); ++it ) {
         /* only if parent tab.. m_tabWidgets gets deleted and would do that as well */
         if (m_parentTab )
             removeFromTab( (*it).widget );
         qWarning("Adding to box %s", (*it).name.latin1() );
         addToBox( (*it) );
     }
     for ( OSplitter* split = m_splitter.first(); split; split = m_splitter.next() ) {
         /* tell them the world had changed */
         split->setTabWidget( 0 );
         Opie::OSplitterContainer con;
         con.widget = split;
+//        con.widget = split->m_tabWidget ? static_cast<QWidget*>(split->m_tabWidget)
+//                     : static_cast<QWidget*>(split->m_hbox);
         addToBox( con );
     }
 
 
 
     if (m_parentTab )
-        m_parentTab->addTab(this, iconName(), label() );
+        m_parentTab->addTab(m_hbox, iconName(), label() );
     else {
+        qWarning(" setting Box geometry for %s", name() );
         m_hbox->setGeometry( frameRect() );
         m_hbox->show();
         delete m_tabWidget;
         m_tabWidget = 0;
     }
 }
 
 /*
  * sets the tabwidget, removes tabs, and relayouts the widget
  */
 void OSplitter::setTabWidget( OTabWidget* wid) {
     /* clean up cause m_parentTab will not be available for us */
     if ( m_parentTab ) {
         if (m_hbox )
-            m_parentTab->removePage( this );
+            m_parentTab->removePage( m_hbox );
         else if (!m_container.isEmpty() ){
             ContainerList::Iterator it = m_container.begin();
             for ( ; it != m_container.end(); ++it )
                 m_parentTab->removePage( (*it).widget );
         }
     }
     /* the parent Splitter changed so either make us indepent or dep */
 
     m_parentTab = wid;
 
     QWidget *tab =  m_tabWidget;
     QWidget *box =  m_hbox;
     m_hbox = 0; m_tabWidget = 0;
 
     if ( layoutMode() )
         changeTab();
     else if (m_orient == Horizontal )
         changeHBox();
     else
         changeVBox();
 
     /* our own crap is added and children from change* */
-    delete tab;
-    delete box;
+    if (m_parentTab ) {
+        delete tab;
+        delete box;
+    }
 }
 
 
 #if 0
 void OSplitter::reparentAll() {
     if (m_container.isEmpty() )
         return;
 
     ContainerList::Iterator it = m_container.begin();
     for ( ; it != m_container.end(); ++it )
         (*it).wid->reparent(0, 0, QPoint(0, 0) );
 
 
 }
 #endif
 
 /**
  *  @internal
  */
 bool OSplitter::layoutMode()const {
     if ( size().width() > m_size_policy &&
          m_orient == Horizontal ) {
         return false;
     }else if ( size().height() > m_size_policy &&
-               m_size_policy == Vertical ) {
+               m_orient == Vertical ) {
         return false;
     }
 
     return true;
 }
diff --git a/libopie/big-screen/osplitter.h b/libopie/big-screen/osplitter.h
index 2bcde57..33a085f 100644
--- a/libopie/big-screen/osplitter.h
+++ b/libopie/big-screen/osplitter.h
@@ -33,24 +33,30 @@
 
 #include <qframe.h>
 #include <qvaluelist.h>
 #include <qlist.h>
 
 #include "obigscreen_p.h"
 
 /* forward declarations */
 class OTabWidget;
 class QHBox;
 //template class QValueList<Opie::OSplitterContainer>;
 
+/*
+ * TODO
+ * -check API docu
+ * -one more example
+ * -allow inserting at a position
+ */
 
 /**
  *
  * If you've widgets that could be placed side by side but you think
  * on small resolutions is not enough place but it would really make sense
  * on bigger resolutions this class will help you.
  * You can add as many widgets you want to it. Set a poliy on which width/height it
  * should switch the layout.
  * You can either say to place widgets vertical or horizontal.
  * This class uses QHBox, QVBox and QTAbWidget internally.
  * OSplitter takes ownership of the widgets
  *
@@ -93,26 +99,26 @@ signals:
     void currentChanged( QWidget* );
 
     /**
      * emitted whenever a border is crossed
      * true if in small screen mode
      * false if in bigscreen
      * this signal is emitted after the layout switch
      * @param b The layout mode
      * @param ori The orientation
      */
     void sizeChanged( bool b, Orientation ori);
 public:
-//    QSize sizeHint()const;
-//    QSize minimumSizeHint()const;
+    QSize sizeHint()const;
+    QSize minimumSizeHint()const;
 
 protected:
     void resizeEvent( QResizeEvent* );
 
 private:
     /* true if OTabMode */
     bool layoutMode()const;
 //    void reparentAll();
     void setTabWidget( OTabWidget*);
     void addToTab( const Opie::OSplitterContainer& );
     void addToBox( const Opie::OSplitterContainer& );
     void removeFromTab( QWidget* );