2 files changed, 0 insertions, 16 deletions

diff --git a/libopie2/opieui/big-screen/osplitter.cpp b/libopie2/opieui/big-screen/osplitter.cpp
index f50e7f0..78e919a 100644
--- a/libopie2/opieui/big-screen/osplitter.cpp
+++ b/libopie2/opieui/big-screen/osplitter.cpp
@@ -1,640 +1,625 @@
 /*
                =.            This file is part of the OPIE Project
              .=l.            Copyright (c)  2003 hOlgAr <zecke@handhelds.org>
            .>+-=
  _;:,     .>    :=|.         This library 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 library 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 "osplitter.h"
 
 /* OPIE */
 #include <opie2/otabwidget.h>
 #include <opie2/odebug.h>
 
 /* QT */
 #include <qvaluelist.h>
 #include <qvbox.h>
 
 using namespace Opie::Ui;
 using namespace Opie::Ui::Internal;
 
 /**
  *
  * This is the constructor of OSplitter
  * You might want to call setSizeChange to tell
  * OSplitter to change its layout when a specefic
  * mark was crossed. OSplitter sets a default value.
  *
  * You cann add widget with addWidget to the OSplitter.
  * OSplitter supports also grouping of Splitters where they
  * can share one OTabBar in small screen mode. This can be used
  * for email clients like vies but see the example.
  *
  * @param orient The orientation wether to layout horizontal or vertical
  * @param parent The parent of this widget
  * @param name   The name passed on to QObject
  * @param fl     Additional widgets flags passed to QWidget
  *
  * @short single c'tor of the OSplitter
  */
 OSplitter::OSplitter( Orientation orient, QWidget* parent, const char* name, WFlags fl )
         : QFrame( parent, name, fl )
 {
     m_orient = orient;
     m_hbox = 0;
     m_size_policy = 330;
     setFontPropagation( AllChildren );
     setPalettePropagation( AllChildren );
 
     /* start by default with the tab widget */
     m_tabWidget = 0;
     m_parentTab = 0;
     changeTab();
 
 }
 
 
 /**
  * Destructor destructs this object and cleans up. All child
  * widgets will be deleted
  * @see addWidget
  */
 OSplitter::~OSplitter()
 {
-    owarn << "Deleted Splitter" << oendl;
     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()
  * and iconName() gets added.
  *
  * @param name The name of the Label
  */
 void OSplitter::setLabel( const QString& name )
 {
     m_name = name;
 }
 
 /**
  * @see setLabel but this is for the icon retrieved by Resource
  *
  * @param name The name of the icon in example ( "zoom" )
  */
 void OSplitter::setIconName( const QString& name )
 {
     m_icon = name;
 }
 
 
 /**
  * returns the iconName
  * @see setIconName
  */
 QString OSplitter::iconName()const
 {
     return m_icon;
 }
 
 /**
  * returns the label set with setLabel
  * @see setLabel
  */
 QString OSplitter::label()const
 {
     return m_name;
 }
 
 /**
  * This function sets the size change policy of the splitter.
  * If this size marked is crossed the splitter will relayout.
  * Note: that depending on the set Orientation it'll either look
  * at the width or height.
  * Note: If you want to from side to side view to tabbed view you need
  * to make sure that the size you supply is not smaller than the minimum
  * size of your added widgets. Note that if you use widgets like QComboBoxes
  * you need to teach them to accept smaller sizes as well @see QWidget::setSizePolicy
  *
  * @param width_height The mark that will be watched. Interpreted depending on the Orientation of the Splitter.
  * @return void
  */
 void OSplitter::setSizeChange( int width_height )
 {
     m_size_policy = width_height;
     QSize sz(width(), height() );
     QResizeEvent ev(sz, sz );
     resizeEvent(&ev);
 }
 
 /**
  * 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 )
         setTabWidget( m_parentTab );
     else
     {
         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
  */
 /**
  * This removes the splitter again. You currently need to call this
  * before you delete or otherwise you can get mem corruption
  * or other weird behaviour.
  * Owner ship gets transfered back to you it's current parent
  * is 0
  */
 void OSplitter::removeWidget( OSplitter* split)
 {
     split->setTabWidget( 0 );
     split->reparent( 0, 0, QPoint(0, 0) );
 }
 
 /**
  * Adds a widget to the Splitter. The widgets gets inserted
  * at the end of either the Box or TabWidget.
  * Ownership gets transfered and the widgets gets reparented.
  * Note: icon and label is only available on small screensizes
  *  if size is smaller than the mark
  * Warning: No null checking of the widget is done. Only on debug
  * a message will be outputtet
  *
  * @param wid The widget which will be added
  * @param icon The icon of the possible Tab
  * @param label The label of the possible Tab
  */
 void OSplitter::addWidget( QWidget* wid, const QString& icon, const QString& label )
 {
 #ifdef DEBUG
     if (!wid )
-    {
-        owarn << "Widget is not valid!" << oendl;
         return;
-    }
 #endif
     OSplitterContainer cont;
     cont.widget = wid;
     cont.icon =icon;
     cont.name = label;
 
     m_container.append( cont );
 
     /*
      *
      */
     if (!m_splitter.isEmpty() && (m_tabWidget || m_parentTab ) )
         setTabWidget( m_parentTab );
     else
     {
         if (m_hbox )
             addToBox( cont );
         else
             addToTab( cont );
     }
 }
 
 
 /**
  * Removes the widget from the tab widgets if necessary.
  * OSplitter drops ownership of this widget and the widget
  * will be reparented i tto 0.
  * The widget will not be deleted.
  *
  * @param w The widget to be removed
  */
 void OSplitter::removeWidget( QWidget* w)
 {
     ContainerList::Iterator it;
     for ( it = m_container.begin(); it != m_container.end(); ++it )
         if ( (*it).widget == w )
             break;
 
     if (it == m_container.end() )
         return;
 
 
     /* only tab needs to be removed.. box recognizes it */
     if ( !m_hbox )
         removeFromTab( w );
 
 
     /* Find reparent it and remove it from our list */
 
     w->reparent( 0, 0, QPoint(0, 0));
     it = m_container.remove( it );
 
 }
 
 
 /**
  * This method will give focus to the widget. If in a tabwidget
  * the tabbar will be changed
  *
  * @param w The widget which will be set the current one
  */
 void OSplitter::setCurrentWidget( QWidget*  w)
 {
     if (m_tabWidget )
         m_tabWidget->setCurrentTab( w );
     //    else
     //      m_hbox->setFocus( w );
 
 }
 
 /**
  * This is an overloaded member function and only differs in the
  * argument it takes.
  * Searches list of widgets for label. It'll pick the first label it finds
  *
  * @param label Label to look for. First match will be taken
  */
 void OSplitter::setCurrentWidget( const QString& label )
 {
     ContainerList::Iterator it;
     for (it = m_container.begin(); it != m_container.end(); ++it )
     {
         if ( (*it).name == label )
         {
             setCurrentWidget( (*it).widget );
             break;
         }
     }
 }
 
 /**
  * This will only work when the TabWidget is active
  * If everything is visible this signal is kindly ignored
  * @see OTabWidget::setCurrentTab(int)
  *
  * @param tab The tab to make current
  */
 void OSplitter::setCurrentWidget( int tab )
 {
     if (m_tabWidget )
         m_tabWidget->setCurrentTab( 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;
 }
 /* wrong */
 #if 0
 /**
  * @reimplented for internal reasons
  * returns the sizeHint of one of its sub widgets
  */
 QSize OSplitter::sizeHint()const
 {
     if (m_parentTab )
         return QFrame::sizeHint();
 
     if (m_hbox )
         return m_hbox->sizeHint();
     else
         return m_tabWidget->sizeHint();
 }
 
 QSize OSplitter::minimumSizeHint()const
 {
     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 );
     /*
      *
      */
-    //    owarn << "Old size was width = " << res->oldSize().width() << " height = " << res->oldSize().height() << "" << oendl;
     bool mode = true;
-    owarn << "New size is  width = " << res->size().width() << " height = " << res->size().height() << "  " << name() << "" << oendl;
     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_orient == Vertical )
     {
-        owarn << "Changng to vbox " << name() << "" << oendl;
         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::Ui::Internal::OSplitterContainer& con )
 {
     QWidget *wid = con.widget;
     // not needed widgetstack will reparent as well    wid.reparent(m_tabWidget, wid->getWFlags(), QPoint(0, 0) );
     if (m_parentTab )
         m_parentTab->addTab( wid, con.icon, con.name );
     else
         m_tabWidget->addTab( wid, con.icon, con.name );
 }
 
 
 /*
  * adds a container to the box
  */
 void OSplitter::addToBox( const Opie::Ui::Internal::OSplitterContainer& con )
 {
     QWidget* wid = con.widget;
     wid->reparent(m_hbox, 0,  QPoint(0, 0) );
 }
 
 
 /*
  * Removes a widget from the tab
  */
 void OSplitter::removeFromTab( QWidget* wid )
 {
     if (m_parentTab )
         m_parentTab->removePage( wid );
     else
         m_tabWidget->removePage( 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 )
     {
         raise();
         show();
         m_tabWidget->setGeometry( frameRect() );
         return;
     }
 
-    owarn << " New Tab Widget " << name() << "" << oendl;
     /*
      * and add all widgets this will reparent them
      * delete m_hbox set it to 0
      *
      */
     OTabWidget *tab;
     if ( m_parentTab )
     {
         hide();
         tab = m_parentTab;
         /* 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 )
     {
-        owarn << "Widget is " << (*it).name << "" << oendl;
         addToTab( (*it) );
     }
 
     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;
     }
 
-    owarn << "new HBox " << name() << "" << oendl;
     m_hbox = new QHBox( this );
     commonChangeBox();
 }
 
 void OSplitter::changeVBox()
 {
     if (m_hbox )
     {
         m_hbox->setGeometry( frameRect() );
         return;
     }
 
-    owarn << "New VBOX " << name() << "" << oendl;
     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()
 {
-    owarn << " Name of Splitters is " << name() << "" << oendl;
-
     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 );
-        owarn << "Adding to box " << (*it).name << "" << oendl;
         addToBox( (*it) );
     }
     for ( OSplitter* split = m_splitter.first(); split; split = m_splitter.next() )
     {
         /* tell them the world had changed */
         split->setTabWidget( 0 );
         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(m_hbox, iconName(), label() );
     else
     {
-        owarn << " setting Box geometry for " << name() << "" << oendl;
         m_hbox->setGeometry( frameRect() );
         m_hbox->show();
         delete m_tabWidget;
         m_tabWidget = 0;
         show(); // also show this widget
     }
 }
 
 /*
  * 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( 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 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_orient == Vertical )
     {
         return false;
     }
 
     return true;
 }
diff --git a/libopie2/opieui/big-screen/owidgetstack.cpp b/libopie2/opieui/big-screen/owidgetstack.cpp
index 9c9f7ec..b14a643 100644
--- a/libopie2/opieui/big-screen/owidgetstack.cpp
+++ b/libopie2/opieui/big-screen/owidgetstack.cpp
@@ -217,193 +217,192 @@ QSizeHint OWidgetStack::minimumSizeHint()const {
 QWidget* OWidgetStack::widget( int id) const {
     return m_list[id];
 }
 
 /**
  * Tries to find the assigned id for the widget
  * or returns -1 if no widget could be found
  * @param wid The widget to look for
  */
 int OWidgetStack::id( QWidget* wid)const{
     if (m_list.isEmpty() )
         return -1;
 
     QMap<int, QWidget*>::ConstIterator it = m_list.begin();
     for ( ; it != m_list.end(); ++it )
         if ( it.data() == wid )
             break;
 
     /* if not at the end return the key */
     return it == m_list.end() ? -1 : it.key();
 }
 
 
 /**
  * This function returns the currently visible
  * widget. In BigScreen mode the mainwindow
  * is returned
  */
 QWidget* OWidgetStack::visibleWidget()const {
     if (m_mode == SmallScreen )
         return m_stack->visibleWidget();
     else
         return m_mWidget;
 
 }
 
 /**
  * This method raises the widget wit the specefic id.
  * Note that in BigScreen mode the widget is made visible
  * but the other ( previous) visible widget(s) will not
  * be made invisible. If you need this use hideWidget().
  *
  * @param id Raise the widget with id
  */
 void OWidgetStack::raiseWidget( int id) {
     return raiseWidget( widget( id ) );
 }
 
 /**
  * This is an overloaded function and only differs in its parameters.
  * @see raiseWidget( int )
  */
 void OWidgetStack::raiseWidget( QWidget* wid) {
     m_last = wid;
     if (m_mode == SmallScreen )
         m_stack->raiseWidget( wid );
     else {
         int ide;
         emit aboutToShow( wid );
         /* if someone is connected and the widget is actually available */
         if ( receivers( SIGNAL(aboutToShow(int) ) ) &&
              ( (ide = id( wid ) ) != -1 ) )
             emit aboutToShow( ide );
 
         /* ### FIXME PLACE THE WIDGET right */
         wid->show();
     }
 }
 
 /**
  * This will hide the currently visible widget
  * and raise the widget specified by the parameter.
  * Note that this method does not use visibleWIdget but remembers
  * the last raisedWidget
  */
 void OWidgetStack::hideWidget( int id) {
     /* hiding our main widget wouldn't be smart */
     if ( m_mode == BigScreen && m_last != m_mWidget )
         m_last->hide();
     raiseWidget( id );
 }
 
 /**
  * This is overloaded and only differs in the parameters
  * it takes.
  */
 void OWidgetStack::hideWidget( QWidget* wid) {
     /* still not smart */
     if ( m_mode == BigScreen && m_last != m_mWidget )
         m_last->hide();
 
     raiseWidget( wid );
 }
 
 
 bool OWidgetStack::eventFilter( QObject* obj, QEvent* e) {
-    owarn << " " << obj->name() << " " << obj->className() << "" << oendl;
     if ( e->type() == QEvent::Resize ) {
         QResizeEvent *res = static_cast<QResizeEvent*>( e );
         QSize size = res->size();
         if ( size.width() >= mode_size )
             switchTop();
         else
             switchStack();
     }
     return false;
 }
 
 
 /**
  * @internal_resons
  */
 void OWidgetStack::resizeEvent( QResizeEvent* ev ) {
     QFrame::resizeEvent( ev );
     if (m_mode == SmallScreen )
         m_stack->setGeometry( frameRect() );
     else
         if (m_mWidget )
             m_mWidget->setGeometry( frameRect() );
 
 }
 
 /**
  * setMainWindow gives the OWidgetStack a hint which
  * window should always stay inside the stack.
  * Normally the first added widget is considered to be
  * the mainwindow but you can change this with this
  * function.
  * If in BigScreen mode the current mainwindow will be reparented
  * and hidden. The position will be taken by the new one.
  * If the old MainWindow was hidden the new window will
  * also be hidden. If the window was visible the new mainwindow
  * will be made visible too and the old one hidden. If there
  * was no mainwindow it will be hidden as well.
  *
  * @param wid The new mainwindow
  */
 void OWidgetStack::setMainWindow( QWidget* wid ) {
     if (m_mode == BigScreen ) {
         bool wasVisible = false;
         if (m_mWidget ) {
             wasVisible = !m_mWidget->isHidden();
             /* hidden by default */
             m_mWidget->reparent(0, WType_TopLevel, QPoint(10, 10) );
         }
         wid->reparent(this, 0, frameRect().topLeft() );
 
         if (wasVisible)
             wid->show();
     }
 
     m_mWidget = wid;
 }
 
 /**
  * this is an overloaded member and only differs
  * in the type of arguments.
  * @see setMainWindow(QWidget*)
  */
 void OWidgetStack::setMainWindow( int id) {
     setMainWindow( widget( id ) );
 }
 
 
 /*
  * this function switches to a stack ;)
  */
 void OWidgetStack::switchStack() {
     if (m_stack ) {
         m_stack->setGeometry( frameRect() );
         return;
     }
 
     m_mode = SmallScreen;
     m_stack = new QWidgetStack(this);
 
     connect(m_stack, SIGNAL(aboutToShow(QWidget*) ),
             this, SIGNAL(aboutToShow(QWidget*) ) );
     connect(m_stack, SIGNAL(aboutToShow(int) ),
             this, SIGNAL(aboutToShow(int) ) );
 
     /* now reparent the widgets... luckily QWidgetSatck does most of the work */
     if (m_list.isEmpty() )
         return;
 
     QMap<int, QWidget*>::Iterator it = m_list.begin();
     for ( ; it != m_list.end(); ++it )
         m_stack->addWidget( it.data(), it.key() );
 
 
 }
 
 /*