summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie/big-screen/example/osplitter_example.cpp28
-rw-r--r--libopie/big-screen/example/osplitter_example.h20
-rw-r--r--libopie/big-screen/example/osplitter_example.obin0 -> 17276 bytes
-rw-r--r--libopie/big-screen/example/osplitter_example.pro13
-rw-r--r--libopie/big-screen/obigscreen_p.h20
-rw-r--r--libopie/big-screen/osplitter.cpp165
-rw-r--r--libopie/big-screen/osplitter.h22
7 files changed, 228 insertions, 40 deletions
diff --git a/libopie/big-screen/example/osplitter_example.cpp b/libopie/big-screen/example/osplitter_example.cpp
new file mode 100644
index 0000000..e337379
--- a/dev/null
+++ b/libopie/big-screen/example/osplitter_example.cpp
@@ -0,0 +1,28 @@
+#include <qdir.h>
+#include <qlayout.h>
+
+#include "../osplitter.h"
+
+#include <qpe/qpeapplication.h>
+#include <opie/oapplicationfactory.h>
+
+#include "osplitter_example.h"
+
+OPIE_EXPORT_APP( OApplicationFactory<OSplitterExample> )
+
+OSplitterExample::OSplitterExample( QWidget *w,const char* n,WFlags f )
+ : QWidget( w, n, f ){
+ QVBoxLayout * lay = new QVBoxLayout(this);
+ OSplitter * splitter = new OSplitter( Horizontal, this );
+ lay->addWidget( splitter );
+
+ OFileSelector *selector = new OFileSelector( splitter, OFileSelector::FileSelector,
+ OFileSelector::Normal, QDir::homeDirPath(),
+ QString::null );
+ splitter->addWidget( selector, "zoom", tr("Selector 1") );
+
+ selector = new OFileSelector( splitter, OFileSelector::FileSelector, OFileSelector::Normal,
+ QDir::homeDirPath(), QString::null );
+ splitter->addWidget( selector, "zoom", tr("Selector 2") );
+
+}
diff --git a/libopie/big-screen/example/osplitter_example.h b/libopie/big-screen/example/osplitter_example.h
new file mode 100644
index 0000000..ae8f120
--- a/dev/null
+++ b/libopie/big-screen/example/osplitter_example.h
@@ -0,0 +1,20 @@
+/*
+ * May be used, copied and modified wihtout any limitation
+ */
+
+#ifndef OSPlitter_EXAMPLE_H
+#define OSPlitter_EXAMPLE_H
+
+#include <qvbox.h>
+#include <opie/ofileselector.h>
+
+class OSplitterExample : public QWidget {
+ Q_OBJECT
+public:
+ static QString appName() { return QString::fromLatin1("osplitter_example"); }
+ OSplitterExample( QWidget *parent, const char* name, WFlags fl );
+
+};
+
+
+#endif
diff --git a/libopie/big-screen/example/osplitter_example.o b/libopie/big-screen/example/osplitter_example.o
new file mode 100644
index 0000000..e52d5d9
--- a/dev/null
+++ b/libopie/big-screen/example/osplitter_example.o
Binary files differ
diff --git a/libopie/big-screen/example/osplitter_example.pro b/libopie/big-screen/example/osplitter_example.pro
new file mode 100644
index 0000000..b12bf17
--- a/dev/null
+++ b/libopie/big-screen/example/osplitter_example.pro
@@ -0,0 +1,13 @@
+CONFIG = qt warn_on
+TEMPLATE = app
+TARGET = osplitter_example
+
+HEADERS = osplitter_example.h ../osplitter.h
+SOURCES = osplitter_example.cpp ../osplitter.cpp
+
+INCLUDEPATH += $(OPIEDIR)/include ../
+DEPENDSPATH += $(OPIEDIR)/include
+
+LIBS += -lqpe -lopie
+
+include ( $(OPIEDIR)/include.pro ) \ No newline at end of file
diff --git a/libopie/big-screen/obigscreen_p.h b/libopie/big-screen/obigscreen_p.h
new file mode 100644
index 0000000..ed256d9
--- a/dev/null
+++ b/libopie/big-screen/obigscreen_p.h
@@ -0,0 +1,20 @@
+#ifndef OPIE_BIG_SCREEN_PRIVATE
+#define OPIE_BIG_SCREEN_PRIVATE
+
+namespace Opie {
+
+struct OSplitterContainer {
+ bool operator==( const OSplitterContainer& o)const {
+ if (widget != o.widget ) return false;
+ if (icon != o.icon ) return false;
+ if (name != o.name ) return false;
+ return true;
+ }
+ QWidget* widget;
+ QString icon;
+ QString name;
+};
+
+}
+
+#endif
diff --git a/libopie/big-screen/osplitter.cpp b/libopie/big-screen/osplitter.cpp
index dcb5cc5..ce53ee1 100644
--- a/libopie/big-screen/osplitter.cpp
+++ b/libopie/big-screen/osplitter.cpp
@@ -35,11 +35,4 @@
-struct OSplitterContainer {
- QWidget* widget;
- const QString& icon
- const QString& name;
-};
-
-
/**
*
@@ -59,10 +52,13 @@ struct OSplitterContainer {
*/
OSplitter::OSplitter( Orientation orient, QWidget* parent, const char* name, WFlags fl )
- : QWidget( parent, name, fl )
+ : QFrame( parent, name, fl )
{
m_orient = orient;
m_hbox = 0;
- m_tabWidget = 0;
m_size_policy = 330;
+ setFontPropagation( AllChildren );
+ setPalettePropagation( AllChildren );
+
+ m_tabWidget = new OTabWidget(this);
}
@@ -90,5 +86,7 @@ OSplitter::~OSplitter() {
void OSplitter::setSizeChange( int width_height ) {
m_size_policy = width_height;
- relayout();
+ QSize sz(width(), height() );
+ QResizeEvent ev(sz, sz );
+ resizeEvent(&ev);
}
@@ -113,8 +111,8 @@ void OSplitter::addWidget( QWidget* wid, const QString& icon, const QString& lab
}
#endif
- OSplitterContainer cont;
+ Opie::OSplitterContainer cont;
cont.widget = wid;
cont.icon =icon;
- cont.label = label;
+ cont.name = label;
m_container.append( cont );
@@ -128,6 +126,7 @@ void OSplitter::addWidget( QWidget* wid, const QString& icon, const QString& lab
/**
- * Removes the widget from the tab widgets. OSplitter drops ownership
- * of this widget and the widget will be reparented to 0.
+ * 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.
*
@@ -135,8 +134,13 @@ void OSplitter::addWidget( QWidget* wid, const QString& icon, const QString& lab
*/
void OSplitter::removeWidget( QWidget* w) {
- /* if not widget nor parent or parent not any of my master childs return */
- if (!w && w->parent() && ( w->parent() != m_hbox || w->parent() != m_tabWidget ) )
+ 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 )
@@ -144,13 +148,8 @@ void OSplitter::removeWidget( QWidget* w) {
- /* Find the widget, reparent it and remove it from our list */
- ContainerList::Iterator it;
- for ( it = m_container.begin(); it != m_container.end(); ++it )
- if ( (*it).widget == w ) {
- w.reparent( 0, w.getWFlags );
- it = m_container.remove( it );
- break;
- }
+ /* Find reparent it and remove it from our list */
+ w->reparent( 0, 0, QPoint(0, 0));
+ it = m_container.remove( it );
}
@@ -165,12 +164,13 @@ void OSplitter::removeWidget( QWidget* w) {
void OSplitter::setCurrentWidget( QWidget* w) {
if (m_tabWidget )
- m_tabWidget->setCurrentWidget( w );
- else
- m_hbox->setFocus( w );
+ m_tabWidget->setCurrentTab( w );
+// else
+ // m_hbox->setFocus( w );
}
/**
- * This is an overloaded member function and only differs in the argument it takes.
+ * 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
*
@@ -188,5 +188,5 @@ void OSplitter::setCurrentWidget( const QString& label ) {
/**
- * return the currently activated widget if in tab widget moud
+ * return the currently activated widget if in tab widget mode
* or null because all widgets are visible
*/
@@ -198,5 +198,5 @@ QWidget* OSplitter::currentWidget() {
}
-
+#if 0
/**
* @reimplented for internal reasons
@@ -204,5 +204,10 @@ QWidget* OSplitter::currentWidget() {
*/
QSize OSplitter::sizeHint()const {
+ if (m_hbox )
+ return m_hbox->sizeHint();
+ else
+ return m_tabWidget->sizeHint();
}
+#endif
/**
@@ -210,4 +215,104 @@ QSize OSplitter::sizeHint()const {
*/
void OSplitter::resizeEvent( QResizeEvent* res ) {
+ QFrame::resizeEvent( res );
+ /*
+ *
+ */
+// qWarning("Old size was width = %d height = %d", res->oldSize().width(), res->oldSize().height() );
+// 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();
+ }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();
+ }
+}
+
+
+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 );
+}
+
+void OSplitter::addToBox( const Opie::OSplitterContainer& con ) {
+ QWidget* wid = con.widget;
+ wid->reparent(m_hbox, 0, QPoint(0, 0) );
+}
+void OSplitter::removeFromTab( QWidget* wid ) {
+ m_tabWidget->removePage( wid );
+}
+
+void OSplitter::changeTab() {
+ 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 );
+
+ for ( ContainerList::Iterator it = m_container.begin(); it != m_container.end(); ++it ) {
+ qWarning("Widget is %s", (*it).name.latin1() );
+ addToTab( (*it) );
+ }
+
+ delete m_hbox;
+ m_hbox = 0;
+ m_tabWidget->setGeometry( frameRect() );
+ m_tabWidget->show();
+
+}
+
+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();
+}
+
+
+void OSplitter::commonChangeBox() {
+ for (ContainerList::Iterator it = m_container.begin(); it != m_container.end(); ++it ) {
+ qWarning("Adding to box %s", (*it).name.latin1() );
+ addToBox( (*it) );
+ }
+ delete m_tabWidget;
+ m_tabWidget = 0;
}
diff --git a/libopie/big-screen/osplitter.h b/libopie/big-screen/osplitter.h
index 05849af..bc4f80b 100644
--- a/libopie/big-screen/osplitter.h
+++ b/libopie/big-screen/osplitter.h
@@ -32,13 +32,13 @@
#include <qstring.h>
-#include <qwidget.h>
+#include <qframe.h>
#include <qvaluelist.h>
+#include "obigscreen_p.h"
/* forward declarations */
class OTabWidget;
class QHBox;
-struct OSplitterContainer;
-template class QValueList<OSplitterContainer>;
+//template class QValueList<Opie::OSplitterContainer>;
@@ -60,8 +60,8 @@ template class QValueList<OSplitterContainer>;
* @author zecke
*/
-class OSplitter : public QWidget{
+class OSplitter : public QFrame{
Q_OBJECT
public:
- typedef QValueList<OSplitterContainer> ContainerList;
+ typedef QValueList<Opie::OSplitterContainer> ContainerList;
OSplitter( Qt::Orientation = Horizontal, QWidget *parent = 0,
const char* name = 0, WFlags fl = 0 );
@@ -77,5 +77,5 @@ public:
QWidget* currentWidget();
- QSize sizeHint()const;
+// QSize sizeHint()const;
protected:
@@ -83,9 +83,11 @@ protected:
private:
- void relayout();
- void addToTab( const OSplitterContainer& );
- void addToBox( const OSplitterContainer& );
+ void addToTab( const Opie::OSplitterContainer& );
+ void addToBox( const Opie::OSplitterContainer& );
void removeFromTab( QWidget* );
- void removeFromBox( QWidget* );
+ void changeTab();
+ void changeHBox();
+ void changeVBox();
+ void commonChangeBox();
QHBox *m_hbox;
OTabWidget *m_tabWidget;