summaryrefslogtreecommitdiff
authorzecke <zecke>2003-09-02 21:28:27 (UTC)
committer zecke <zecke>2003-09-02 21:28:27 (UTC)
commit88d625d9695582d57852f94581f71bb18c00a8a1 (patch) (unidiff)
treec04adb455e19c160a755c50b9bdf95425bfd06e1
parent3cf3fc001922a7ef34c7ff95751beb569809383b (diff)
downloadopie-88d625d9695582d57852f94581f71bb18c00a8a1.zip
opie-88d625d9695582d57852f94581f71bb18c00a8a1.tar.gz
opie-88d625d9695582d57852f94581f71bb18c00a8a1.tar.bz2
New impressive example and test suite
Now OSplitter is almost done
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie/big-screen/example/osplitter_mail.cpp70
-rw-r--r--libopie/big-screen/example/osplitter_mail.h48
-rw-r--r--libopie/big-screen/example/osplitter_mail.pro12
-rw-r--r--libopie/big-screen/osplitter.cpp55
-rw-r--r--libopie/big-screen/osplitter.h10
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 @@
1
2#include <qstring.h>
3#include <qlabel.h>
4#include <qheader.h>
5#include <qlayout.h>
6
7#include <qpe/qpeapplication.h>
8#include <opie/oapplicationfactory.h>
9
10#include "../osplitter.h"
11
12#include "osplitter_mail.h"
13
14
15OPIE_EXPORT_APP( OApplicationFactory<ListViews> )
16
17class Folder {
18 int dummy;
19};
20
21// -----------------------------------------------------------------
22
23ListViews::ListViews( QWidget* p, const char* name, WFlags fl )
24 : QWidget( p, name, fl ) {
25 m_lstFolders.setAutoDelete( true );
26 QHBoxLayout *lay = new QHBoxLayout(this);
27
28 m_splitter = new OSplitter( Horizontal, this, "SPlitter 1" );
29 lay->addWidget( m_splitter );
30 connect(m_splitter, SIGNAL(sizeChange(bool, const QSize& ) ),
31 this, SLOT(slotSizeChange(bool, const QSize& ) ) );
32
33 m_overview = new QListView( m_splitter );
34 m_overview->header()->setClickEnabled( FALSE );
35 m_overview->addColumn( tr("Folder") );
36 m_overview->setMaximumWidth( 200 );
37 m_splitter->addWidget( m_overview, "zoom", tr("Folder Overview") );
38 m_splitter->setSizeChange( 300 );
39
40 /* OSplitter starts with the small mode */
41 m_messages = 0;
42 m_message = m_attach = 0;
43
44 splitti = new OSplitter( Vertical, m_splitter, "Splitti2" );
45 splitti->setSizeChange( 300 );
46 splitti->setSizePolicy( QSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding ) );
47
48 QLabel *lbl = new QLabel(splitti);
49 lbl->setTextFormat ( Qt::RichText );
50 lbl->setText("<br><br><b>Test Test Test</b><br><br><p>Fooooo hjhh</p>");
51
52 m_messages = new QListView( splitti );
53 m_messages->addColumn(" Messages ");
54
55 folder1 = new QListView( splitti );
56 folder1->addColumn( "Messages 2 " );
57
58 splitti->addWidget(m_messages, "mail", tr("Mails") );
59 splitti->addWidget(folder1, "folder", tr("Folder") );
60 splitti->addWidget( lbl, "logo", tr("Label") );
61 m_message = lbl;
62
63 m_splitter->addWidget( splitti );
64
65}
66
67
68ListViews::~ListViews() {
69
70}
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 @@
1/*
2 * You may use, modify and distribute this code without any limitation
3 */
4
5/*
6 * Header file for a more complete email client like
7 * layout
8 */
9
10#ifndef OPIE_SPLITTER_MAIL_EXAMPLE_H
11#define OPIE_SPLITTER_MAIL_EXAMPLE_H
12
13#include <qwidget.h>
14#include <qlist.h>
15#include <qlistview.h>
16
17class Folder;
18class QLabel;
19
20class OSplitter;
21class ListViews : public QWidget {
22 Q_OBJECT
23public:
24 static QString appName() { return QString::fromLatin1("osplitter-mail"); }
25 ListViews( QWidget* parent, const char * name, WFlags fl );
26 ~ListViews();
27
28private:
29 void initFolders();
30 void initFolder( Folder *folder, unsigned int &count );
31
32 QListView *m_messages, *m_overview;
33 QLabel *m_message, *m_attach;
34 QList<QListView> m_folders; // used in tab mode
35 QList<Folder> m_lstFolders;
36 bool m_mode : 1; // bitfield
37 OSplitter *m_splitter;
38 OSplitter *splitti;
39 QListView *folder1;
40#if 0
41//private slots:
42// void slotFolderChanged( QListViewItem* );
43// void slotMessageChanged();
44// void slotSizeChange( bool, const QSize& );
45#endif
46};
47
48#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 @@
1CONFIG += qt warn_on
2TEMPLATE = app
3TARGET = osplitter-mail
4
5INCLUDEPATH += $(OPIEDIR)/include
6DEPENDSPATH += $(OPIEDIR)/include
7
8HEADERS = osplitter_mail.h
9SOURCES = osplitter_mail.cpp
10
11LIBS += -lqpe -lopie
12include ( $(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
@@ -71,16 +71,17 @@ OSplitter::OSplitter( Orientation orient, QWidget* parent, const char* name, WFl
71 71
72 72
73/** 73/**
74 * Destructor destructs this object and cleans up. All child 74 * Destructor destructs this object and cleans up. All child
75 * widgets will be deleted 75 * widgets will be deleted
76 * @see addWidget 76 * @see addWidget
77 */ 77 */
78OSplitter::~OSplitter() { 78OSplitter::~OSplitter() {
79 qWarning("Deleted Splitter");
79 m_splitter.setAutoDelete( true ); 80 m_splitter.setAutoDelete( true );
80 m_splitter.clear(); 81 m_splitter.clear();
81 82
82 delete m_hbox; 83 delete m_hbox;
83 delete m_tabWidget; 84 delete m_tabWidget;
84} 85}
85 86
86 87
@@ -149,17 +150,17 @@ void OSplitter::setSizeChange( int width_height ) {
149 */ 150 */
150void OSplitter::addWidget( OSplitter* split ) { 151void OSplitter::addWidget( OSplitter* split ) {
151 m_splitter.append( split ); 152 m_splitter.append( split );
152 153
153 /* 154 /*
154 * set tab widget 155 * set tab widget
155 */ 156 */
156 if (m_tabWidget ) 157 if (m_tabWidget )
157 split->setTabWidget( m_tabWidget ); 158 setTabWidget( m_parentTab );
158 else{ 159 else{
159 Opie::OSplitterContainer con; 160 Opie::OSplitterContainer con;
160 con.widget =split; 161 con.widget =split;
161 addToBox( con ); 162 addToBox( con );
162 } 163 }
163} 164}
164 165
165/* 166/*
@@ -301,57 +302,64 @@ QWidget* OSplitter::currentWidget() const{
301 if (m_tabWidget) 302 if (m_tabWidget)
302 return m_tabWidget->currentWidget(); 303 return m_tabWidget->currentWidget();
303 else if (m_parentTab ) 304 else if (m_parentTab )
304 return m_parentTab->currentWidget(); 305 return m_parentTab->currentWidget();
305 306
306 return 0l; 307 return 0l;
307} 308}
308 309
309#if 0 310
310/** 311/**
311 * @reimplented for internal reasons 312 * @reimplented for internal reasons
312 * returns the sizeHint of one of its sub widgets 313 * returns the sizeHint of one of its sub widgets
313 */ 314 */
314QSize OSplitter::sizeHint()const { 315QSize OSplitter::sizeHint()const {
315 return QSize(10, 10); 316 if (m_parentTab )
317 return QFrame::sizeHint();
316 318
317 if (m_hbox ) 319 if (m_hbox )
318 return m_hbox->sizeHint(); 320 return m_hbox->sizeHint();
319 else 321 else
320 return m_tabWidget->sizeHint(); 322 return m_tabWidget->sizeHint();
321} 323}
322 324
323QSize OSplitter::minimumSizeHint()const { 325QSize OSplitter::minimumSizeHint()const {
324 return QSize(10, 10 ); 326 if (m_parentTab )
327 return QFrame::minimumSizeHint();
328 if (m_hbox)
329 return m_hbox->sizeHint();
330 else
331 return m_tabWidget->sizeHint();
325} 332}
326#endif 333
327 334
328/** 335/**
329 * @reimplemented for internal reasons 336 * @reimplemented for internal reasons
330 */ 337 */
331void OSplitter::resizeEvent( QResizeEvent* res ) { 338void OSplitter::resizeEvent( QResizeEvent* res ) {
332 QFrame::resizeEvent( res ); 339 QFrame::resizeEvent( res );
333 /* 340 /*
334 * 341 *
335 */ 342 */
336// qWarning("Old size was width = %d height = %d", res->oldSize().width(), res->oldSize().height() ); 343// qWarning("Old size was width = %d height = %d", res->oldSize().width(), res->oldSize().height() );
337 bool mode = true; 344 bool mode = true;
338 qWarning("New size is width = %d height = %d", res->size().width(), res->size().height() ); 345 qWarning("New size is width = %d height = %d %s", res->size().width(), res->size().height(), name() );
339 if ( res->size().width() > m_size_policy && 346 if ( res->size().width() > m_size_policy &&
340 m_orient == Horizontal ) { 347 m_orient == Horizontal ) {
341 changeHBox(); 348 changeHBox();
342 mode = false; 349 mode = false;
343 }else if ( (res->size().width() <= m_size_policy && 350 }else if ( (res->size().width() <= m_size_policy &&
344 m_orient == Horizontal ) || 351 m_orient == Horizontal ) ||
345 (res->size().height() <= m_size_policy && 352 (res->size().height() <= m_size_policy &&
346 m_orient == Vertical ) ) { 353 m_orient == Vertical ) ) {
347 changeTab(); 354 changeTab();
348 }else if ( res->size().height() > m_size_policy && 355 }else if ( res->size().height() > m_size_policy &&
349 m_size_policy == Vertical ) { 356 m_orient == Vertical ) {
357 qWarning("Changng to vbox %s", name() );
350 changeVBox(); 358 changeVBox();
351 mode = false; 359 mode = false;
352 } 360 }
353 361
354 emit sizeChanged(mode, m_orient ); 362 emit sizeChanged(mode, m_orient );
355} 363}
356 364
357/* 365/*
@@ -393,39 +401,46 @@ void OSplitter::removeFromTab( QWidget* wid ) {
393 */ 401 */
394void OSplitter::changeTab() { 402void OSplitter::changeTab() {
395 /* if we're the owner of the tab widget */ 403 /* if we're the owner of the tab widget */
396 if (m_tabWidget ) { 404 if (m_tabWidget ) {
397 m_tabWidget->setGeometry( frameRect() ); 405 m_tabWidget->setGeometry( frameRect() );
398 return; 406 return;
399 } 407 }
400 408
401 qWarning(" New Tab Widget "); 409 qWarning(" New Tab Widget %s", name() );
402 /* 410 /*
403 * and add all widgets this will reparent them 411 * and add all widgets this will reparent them
404 * delete m_hbox set it to 0 412 * delete m_hbox set it to 0
405 * 413 *
406 */ 414 */
407 OTabWidget *tab; 415 OTabWidget *tab;
408 if ( m_parentTab ) { 416 if ( m_parentTab ) {
409 tab = m_parentTab; 417 tab = m_parentTab;
410 tab->removePage( this ); 418 /* expensive but needed cause we're called from setTabWidget and resizeEvent*/
419 if (!m_container.isEmpty() ) {
420 ContainerList::Iterator it = m_container.begin();
421 for (; it != m_container.end(); ++it )
422 m_parentTab->removePage( (*it).widget );
423 }
411 }else 424 }else
412 tab = m_tabWidget = new OTabWidget( this ); 425 tab = m_tabWidget = new OTabWidget( this );
413 426
414 connect(tab, SIGNAL(currentChanged(QWidget*) ), 427 connect(tab, SIGNAL(currentChanged(QWidget*) ),
415 this, SIGNAL(currentChanged(QWidget*) ) ); 428 this, SIGNAL(currentChanged(QWidget*) ) );
416 429
417 for ( ContainerList::Iterator it = m_container.begin(); it != m_container.end(); ++it ) { 430 for ( ContainerList::Iterator it = m_container.begin(); it != m_container.end(); ++it ) {
418 qWarning("Widget is %s", (*it).name.latin1() ); 431 qWarning("Widget is %s", (*it).name.latin1() );
419 addToTab( (*it) ); 432 addToTab( (*it) );
420 } 433 }
421 434
422 for ( OSplitter* split = m_splitter.first(); split; split = m_splitter.next() ) 435 for ( OSplitter* split = m_splitter.first(); split; split = m_splitter.next() ) {
436 split->reparent(this, 0, QPoint(0, 0) );
423 split->setTabWidget( tab ); 437 split->setTabWidget( tab );
438 }
424 439
425 440
426 delete m_hbox; 441 delete m_hbox;
427 m_hbox = 0; 442 m_hbox = 0;
428 if (!m_tabWidget ) 443 if (!m_tabWidget )
429 return; 444 return;
430 445
431 m_tabWidget->setGeometry( frameRect() ); 446 m_tabWidget->setGeometry( frameRect() );
@@ -438,77 +453,81 @@ void OSplitter::changeTab() {
438 * this is recursive as well 453 * this is recursive as well
439 */ 454 */
440void OSplitter::changeHBox() { 455void OSplitter::changeHBox() {
441 if (m_hbox ) { 456 if (m_hbox ) {
442 m_hbox->setGeometry( frameRect() ); 457 m_hbox->setGeometry( frameRect() );
443 return; 458 return;
444 } 459 }
445 460
446 qWarning("new HBox"); 461 qWarning("new HBox %s", name() );
447 m_hbox = new QHBox( this ); 462 m_hbox = new QHBox( this );
448 commonChangeBox(); 463 commonChangeBox();
449} 464}
450 465
451void OSplitter::changeVBox() { 466void OSplitter::changeVBox() {
452 if (m_hbox ) { 467 if (m_hbox ) {
453 m_hbox->setGeometry( frameRect() ); 468 m_hbox->setGeometry( frameRect() );
454 return; 469 return;
455 } 470 }
456 471
457 qWarning("New VBOX"); 472 qWarning("New VBOX %s", name() );
458 m_hbox = new QVBox( this ); 473 m_hbox = new QVBox( this );
459 474
460 commonChangeBox(); 475 commonChangeBox();
461 476
462} 477}
463 478
464/* 479/*
465 * common box code 480 * common box code
466 * first remove and add children 481 * first remove and add children
467 * the other splitters 482 * the other splitters
468 * it is recursive as well due the call to setTabWidget 483 * it is recursive as well due the call to setTabWidget
469 */ 484 */
470void OSplitter::commonChangeBox() { 485void OSplitter::commonChangeBox() {
486 qWarning(" Name of Splitters is %s", name() );
471 487
472 for (ContainerList::Iterator it = m_container.begin(); it != m_container.end(); ++it ) { 488 for (ContainerList::Iterator it = m_container.begin(); it != m_container.end(); ++it ) {
473 /* only if parent tab.. m_tabWidgets gets deleted and would do that as well */ 489 /* only if parent tab.. m_tabWidgets gets deleted and would do that as well */
474 if (m_parentTab ) 490 if (m_parentTab )
475 removeFromTab( (*it).widget ); 491 removeFromTab( (*it).widget );
476 qWarning("Adding to box %s", (*it).name.latin1() ); 492 qWarning("Adding to box %s", (*it).name.latin1() );
477 addToBox( (*it) ); 493 addToBox( (*it) );
478 } 494 }
479 for ( OSplitter* split = m_splitter.first(); split; split = m_splitter.next() ) { 495 for ( OSplitter* split = m_splitter.first(); split; split = m_splitter.next() ) {
480 /* tell them the world had changed */ 496 /* tell them the world had changed */
481 split->setTabWidget( 0 ); 497 split->setTabWidget( 0 );
482 Opie::OSplitterContainer con; 498 Opie::OSplitterContainer con;
483 con.widget = split; 499 con.widget = split;
500// con.widget = split->m_tabWidget ? static_cast<QWidget*>(split->m_tabWidget)
501// : static_cast<QWidget*>(split->m_hbox);
484 addToBox( con ); 502 addToBox( con );
485 } 503 }
486 504
487 505
488 506
489 if (m_parentTab ) 507 if (m_parentTab )
490 m_parentTab->addTab(this, iconName(), label() ); 508 m_parentTab->addTab(m_hbox, iconName(), label() );
491 else { 509 else {
510 qWarning(" setting Box geometry for %s", name() );
492 m_hbox->setGeometry( frameRect() ); 511 m_hbox->setGeometry( frameRect() );
493 m_hbox->show(); 512 m_hbox->show();
494 delete m_tabWidget; 513 delete m_tabWidget;
495 m_tabWidget = 0; 514 m_tabWidget = 0;
496 } 515 }
497} 516}
498 517
499/* 518/*
500 * sets the tabwidget, removes tabs, and relayouts the widget 519 * sets the tabwidget, removes tabs, and relayouts the widget
501 */ 520 */
502void OSplitter::setTabWidget( OTabWidget* wid) { 521void OSplitter::setTabWidget( OTabWidget* wid) {
503 /* clean up cause m_parentTab will not be available for us */ 522 /* clean up cause m_parentTab will not be available for us */
504 if ( m_parentTab ) { 523 if ( m_parentTab ) {
505 if (m_hbox ) 524 if (m_hbox )
506 m_parentTab->removePage( this ); 525 m_parentTab->removePage( m_hbox );
507 else if (!m_container.isEmpty() ){ 526 else if (!m_container.isEmpty() ){
508 ContainerList::Iterator it = m_container.begin(); 527 ContainerList::Iterator it = m_container.begin();
509 for ( ; it != m_container.end(); ++it ) 528 for ( ; it != m_container.end(); ++it )
510 m_parentTab->removePage( (*it).widget ); 529 m_parentTab->removePage( (*it).widget );
511 } 530 }
512 } 531 }
513 /* the parent Splitter changed so either make us indepent or dep */ 532 /* the parent Splitter changed so either make us indepent or dep */
514 533
@@ -521,18 +540,20 @@ void OSplitter::setTabWidget( OTabWidget* wid) {
521 if ( layoutMode() ) 540 if ( layoutMode() )
522 changeTab(); 541 changeTab();
523 else if (m_orient == Horizontal ) 542 else if (m_orient == Horizontal )
524 changeHBox(); 543 changeHBox();
525 else 544 else
526 changeVBox(); 545 changeVBox();
527 546
528 /* our own crap is added and children from change* */ 547 /* our own crap is added and children from change* */
529 delete tab; 548 if (m_parentTab ) {
530 delete box; 549 delete tab;
550 delete box;
551 }
531} 552}
532 553
533 554
534#if 0 555#if 0
535void OSplitter::reparentAll() { 556void OSplitter::reparentAll() {
536 if (m_container.isEmpty() ) 557 if (m_container.isEmpty() )
537 return; 558 return;
538 559
@@ -547,14 +568,14 @@ void OSplitter::reparentAll() {
547/** 568/**
548 * @internal 569 * @internal
549 */ 570 */
550bool OSplitter::layoutMode()const { 571bool OSplitter::layoutMode()const {
551 if ( size().width() > m_size_policy && 572 if ( size().width() > m_size_policy &&
552 m_orient == Horizontal ) { 573 m_orient == Horizontal ) {
553 return false; 574 return false;
554 }else if ( size().height() > m_size_policy && 575 }else if ( size().height() > m_size_policy &&
555 m_size_policy == Vertical ) { 576 m_orient == Vertical ) {
556 return false; 577 return false;
557 } 578 }
558 579
559 return true; 580 return true;
560} 581}
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
@@ -37,16 +37,22 @@
37 37
38#include "obigscreen_p.h" 38#include "obigscreen_p.h"
39 39
40/* forward declarations */ 40/* forward declarations */
41class OTabWidget; 41class OTabWidget;
42class QHBox; 42class QHBox;
43//template class QValueList<Opie::OSplitterContainer>; 43//template class QValueList<Opie::OSplitterContainer>;
44 44
45/*
46 * TODO
47 * -check API docu
48 * -one more example
49 * -allow inserting at a position
50 */
45 51
46/** 52/**
47 * 53 *
48 * If you've widgets that could be placed side by side but you think 54 * If you've widgets that could be placed side by side but you think
49 * on small resolutions is not enough place but it would really make sense 55 * on small resolutions is not enough place but it would really make sense
50 * on bigger resolutions this class will help you. 56 * on bigger resolutions this class will help you.
51 * You can add as many widgets you want to it. Set a poliy on which width/height it 57 * You can add as many widgets you want to it. Set a poliy on which width/height it
52 * should switch the layout. 58 * should switch the layout.
@@ -97,18 +103,18 @@ signals:
97 * true if in small screen mode 103 * true if in small screen mode
98 * false if in bigscreen 104 * false if in bigscreen
99 * this signal is emitted after the layout switch 105 * this signal is emitted after the layout switch
100 * @param b The layout mode 106 * @param b The layout mode
101 * @param ori The orientation 107 * @param ori The orientation
102 */ 108 */
103 void sizeChanged( bool b, Orientation ori); 109 void sizeChanged( bool b, Orientation ori);
104public: 110public:
105// QSize sizeHint()const; 111 QSize sizeHint()const;
106// QSize minimumSizeHint()const; 112 QSize minimumSizeHint()const;
107 113
108protected: 114protected:
109 void resizeEvent( QResizeEvent* ); 115 void resizeEvent( QResizeEvent* );
110 116
111private: 117private:
112 /* true if OTabMode */ 118 /* true if OTabMode */
113 bool layoutMode()const; 119 bool layoutMode()const;
114// void reparentAll(); 120// void reparentAll();