summaryrefslogtreecommitdiff
authorzecke <zecke>2003-09-02 18:15:07 (UTC)
committer zecke <zecke>2003-09-02 18:15:07 (UTC)
commit3cf3fc001922a7ef34c7ff95751beb569809383b (patch) (side-by-side diff)
tree4fb5fba6b8684b7a9a6cf88e3eb3e02068e73a52
parente87caebc920ad256d210eeb31aeb134318f0c104 (diff)
downloadopie-3cf3fc001922a7ef34c7ff95751beb569809383b.zip
opie-3cf3fc001922a7ef34c7ff95751beb569809383b.tar.gz
opie-3cf3fc001922a7ef34c7ff95751beb569809383b.tar.bz2
Allow adding child Osplitters and sharing
the same OTabBar ( untested ) but the normal mode still works
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie/big-screen/osplitter.cpp263
-rw-r--r--libopie/big-screen/osplitter.h28
2 files changed, 266 insertions, 25 deletions
diff --git a/libopie/big-screen/osplitter.cpp b/libopie/big-screen/osplitter.cpp
index 1cd0fd5..d06568f 100644
--- a/libopie/big-screen/osplitter.cpp
+++ b/libopie/big-screen/osplitter.cpp
@@ -39,12 +39,15 @@
* 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
*
@@ -58,29 +61,71 @@ OSplitter::OSplitter( Orientation orient, QWidget* parent, const char* name, WFl
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() {
+ 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
@@ -95,12 +140,48 @@ void OSplitter::setSizeChange( int 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 )
+ split->setTabWidget( m_tabWidget );
+ 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
+ */
+/**
+ * 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
@@ -121,16 +202,23 @@ void OSplitter::addWidget( QWidget* wid, const QString& icon, const QString& lab
cont.widget = wid;
cont.icon =icon;
cont.name = label;
m_container.append( cont );
- if (m_hbox )
- addToBox( cont );
- else
- addToTab( 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
@@ -206,17 +294,19 @@ 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() {
- if ( m_hbox )
- return 0l;
- else
+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
@@ -241,105 +331,230 @@ QSize OSplitter::minimumSizeHint()const {
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() );
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 ) {
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 ) {
QWidget *wid = con.widget;
// not needed widgetstack will reparent as well wid.reparent(m_tabWidget, wid->getWFlags(), QPoint(0, 0) );
- m_tabWidget->addTab( wid, con.icon, con.name );
+ 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::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 ) {
- m_tabWidget->removePage( 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 ) {
m_tabWidget->setGeometry( frameRect() );
return;
}
qWarning(" New Tab Widget ");
/*
* and add all widgets this will reparent them
* delete m_hbox set it to 0
*
*/
- m_tabWidget = new OTabWidget( this );
- connect(m_tabWidget, SIGNAL(currentChanged(QWidget*) ),
+ OTabWidget *tab;
+ if ( m_parentTab ) {
+ tab = m_parentTab;
+ tab->removePage( this );
+ }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() )
+ 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");
m_hbox = new QHBox( this );
commonChangeBox();
- delete m_tabWidget;
- m_tabWidget = 0;
- m_hbox->setGeometry( frameRect() );
- m_hbox->show();
}
void OSplitter::changeVBox() {
if (m_hbox ) {
m_hbox->setGeometry( frameRect() );
return;
}
qWarning("New VBOX");
m_hbox = new QVBox( this );
commonChangeBox();
- delete m_tabWidget;
- m_tabWidget = 0;
- m_hbox->setGeometry( frameRect() );
- m_hbox->show();
-}
+}
+/*
+ * common box code
+ * first remove and add children
+ * the other splitters
+ * it is recursive as well due the call to setTabWidget
+ */
void OSplitter::commonChangeBox() {
+
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) );
}
- delete m_tabWidget;
- m_tabWidget = 0;
+ 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;
+ addToBox( con );
+ }
+
+
+
+ if (m_parentTab )
+ m_parentTab->addTab(this, iconName(), label() );
+ else {
+ 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 );
+ 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_size_policy == Vertical ) {
+ return false;
+ }
+
+ return true;
}
diff --git a/libopie/big-screen/osplitter.h b/libopie/big-screen/osplitter.h
index db69fc6..2bcde57 100644
--- a/libopie/big-screen/osplitter.h
+++ b/libopie/big-screen/osplitter.h
@@ -30,12 +30,13 @@
#define OPIE_SPLITTER_H
#include <qstring.h>
#include <qframe.h>
#include <qvaluelist.h>
+#include <qlist.h>
#include "obigscreen_p.h"
/* forward declarations */
class OTabWidget;
class QHBox;
@@ -64,49 +65,74 @@ class OSplitter : public QFrame{
public:
typedef QValueList<Opie::OSplitterContainer> ContainerList;
OSplitter( Qt::Orientation = Horizontal, QWidget *parent = 0,
const char* name = 0, WFlags fl = 0 );
~OSplitter();
+ void setLabel( const QString& name );
+ void setIconName( const QString& name );
+ QString label()const;
+ QString iconName()const;
+
void setSizeChange( int width_height );
+ void addWidget( OSplitter* splitter );
void addWidget( QWidget* wid, const QString& icon, const QString& label );
void removeWidget( QWidget* );
+ void removeWidget( OSplitter* );
void setCurrentWidget( QWidget* );
void setCurrentWidget( const QString& label );
void setCurrentWidget( int );
- QWidget* currentWidget();
+ QWidget* currentWidget()const;
signals:
/**
* Emitted if in tab and comes directly from the tab widget
*
*/
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;
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* );
void changeTab();
void changeHBox();
void changeVBox();
void commonChangeBox();
QHBox *m_hbox;
OTabWidget *m_tabWidget;
+ OTabWidget *m_parentTab;
Orientation m_orient;
int m_size_policy;
ContainerList m_container;
+ QList<OSplitter> m_splitter;
+
+ QString m_icon, m_name;
struct Private;
Private *d;
};