author | simon <simon> | 2003-03-25 20:30:12 (UTC) |
---|---|---|
committer | simon <simon> | 2003-03-25 20:30:12 (UTC) |
commit | 3a4ee8d8a53ca17703b34f84e1a411056ee7e50f (patch) (unidiff) | |
tree | 6010cc8c464767725a7ab8b973428945dca62994 /core/launcher | |
parent | f7395e72a415322101ee3e22cb0e10b6bdf60a63 (diff) | |
download | opie-3a4ee8d8a53ca17703b34f84e1a411056ee7e50f.zip opie-3a4ee8d8a53ca17703b34f84e1a411056ee7e50f.tar.gz opie-3a4ee8d8a53ca17703b34f84e1a411056ee7e50f.tar.bz2 |
- keep an eye on resize events on the desktop widget, which are an
indication for things like life rotation. upon a resize re-layout things
(taskbar, tabs and maxwindow rect)
-rw-r--r-- | core/launcher/desktop.cpp | 31 | ||||
-rw-r--r-- | core/launcher/desktop.h | 2 | ||||
-rw-r--r-- | core/launcher/taskbar.h | 3 |
3 files changed, 28 insertions, 8 deletions
diff --git a/core/launcher/desktop.cpp b/core/launcher/desktop.cpp index 86527f6..6def126 100644 --- a/core/launcher/desktop.cpp +++ b/core/launcher/desktop.cpp | |||
@@ -498,41 +498,42 @@ Desktop::Desktop() : | |||
498 | launcher = new Launcher( 0, 0, WStyle_Customize | QWidget::WGroupLeader ); | 498 | launcher = new Launcher( 0, 0, WStyle_Customize | QWidget::WGroupLeader ); |
499 | 499 | ||
500 | connect( launcher, SIGNAL( busy() ), tb, SLOT( startWait() ) ); | 500 | connect( launcher, SIGNAL( busy() ), tb, SLOT( startWait() ) ); |
501 | connect( launcher, SIGNAL( notBusy( const QString& ) ), tb, SLOT( stopWait( const QString& ) ) ); | 501 | connect( launcher, SIGNAL( notBusy( const QString& ) ), tb, SLOT( stopWait( const QString& ) ) ); |
502 | 502 | ||
503 | int displayw = qApp->desktop() ->width(); | 503 | int displayw = qApp->desktop() ->width(); |
504 | int displayh = qApp->desktop() ->height(); | 504 | int displayh = qApp->desktop() ->height(); |
505 | 505 | ||
506 | 506 | ||
507 | QSize sz = tb->sizeHint(); | 507 | QSize sz = tb->sizeHint(); |
508 | 508 | ||
509 | setGeometry( 0, displayh - sz.height(), displayw, sz.height() ); | 509 | setGeometry( 0, displayh - sz.height(), displayw, sz.height() ); |
510 | tb->setGeometry( 0, displayh - sz.height(), displayw, sz.height() ); | 510 | layout(); |
511 | 511 | ||
512 | tb->show(); | 512 | tb->show(); |
513 | launcher->showMaximized(); | 513 | launcher->showMaximized(); |
514 | launcher->show(); | 514 | launcher->show(); |
515 | launcher->raise(); | 515 | launcher->raise(); |
516 | #if defined(QPE_HAVE_MEMALERTER) | 516 | #if defined(QPE_HAVE_MEMALERTER) |
517 | 517 | ||
518 | initMemalerter(); | 518 | initMemalerter(); |
519 | #endif | 519 | #endif |
520 | // start services | 520 | // start services |
521 | startTransferServer(); | 521 | startTransferServer(); |
522 | ( void ) new IrServer( this ); | 522 | ( void ) new IrServer( this ); |
523 | 523 | ||
524 | packageSlave = new PackageSlave( this ); | 524 | packageSlave = new PackageSlave( this ); |
525 | 525 | ||
526 | qApp->installEventFilter( this ); | 526 | qApp->installEventFilter( this ); |
527 | qApp->desktop()->installEventFilter( this ); | ||
527 | 528 | ||
528 | qApp-> setMainWidget ( launcher ); | 529 | qApp-> setMainWidget ( launcher ); |
529 | } | 530 | } |
530 | 531 | ||
531 | void Desktop::show() | 532 | void Desktop::show() |
532 | { | 533 | { |
533 | login( TRUE ); | 534 | login( TRUE ); |
534 | QWidget::show(); | 535 | QWidget::show(); |
535 | } | 536 | } |
536 | 537 | ||
537 | Desktop::~Desktop() | 538 | Desktop::~Desktop() |
538 | { | 539 | { |
@@ -723,30 +724,25 @@ void Desktop::toggleNumLockState() | |||
723 | { | 724 | { |
724 | tb->toggleNumLockState(); | 725 | tb->toggleNumLockState(); |
725 | } | 726 | } |
726 | 727 | ||
727 | void Desktop::toggleCapsLockState() | 728 | void Desktop::toggleCapsLockState() |
728 | { | 729 | { |
729 | tb->toggleCapsLockState(); | 730 | tb->toggleCapsLockState(); |
730 | } | 731 | } |
731 | 732 | ||
732 | void Desktop::styleChange( QStyle &s ) | 733 | void Desktop::styleChange( QStyle &s ) |
733 | { | 734 | { |
734 | QWidget::styleChange( s ); | 735 | QWidget::styleChange( s ); |
735 | int displayw = qApp->desktop() ->width(); | 736 | layout(); |
736 | int displayh = qApp->desktop() ->height(); | ||
737 | |||
738 | QSize sz = tb->sizeHint(); | ||
739 | |||
740 | tb->setGeometry( 0, displayh - sz.height(), displayw, sz.height() ); | ||
741 | } | 737 | } |
742 | 738 | ||
743 | void DesktopApplication::shutdown() | 739 | void DesktopApplication::shutdown() |
744 | { | 740 | { |
745 | if ( type() != GuiServer ) | 741 | if ( type() != GuiServer ) |
746 | return ; | 742 | return ; |
747 | ShutdownImpl *sd = new ShutdownImpl( 0, 0, WDestructiveClose ); | 743 | ShutdownImpl *sd = new ShutdownImpl( 0, 0, WDestructiveClose ); |
748 | connect( sd, SIGNAL( shutdown( ShutdownImpl::Type ) ), | 744 | connect( sd, SIGNAL( shutdown( ShutdownImpl::Type ) ), |
749 | this, SLOT( shutdown( ShutdownImpl::Type ) ) ); | 745 | this, SLOT( shutdown( ShutdownImpl::Type ) ) ); |
750 | sd->showMaximized(); | 746 | sd->showMaximized(); |
751 | } | 747 | } |
752 | 748 | ||
@@ -797,48 +793,69 @@ void DesktopApplication::restart() | |||
797 | #elif defined(QT_QWS_CASSIOPEIA) | 793 | #elif defined(QT_QWS_CASSIOPEIA) |
798 | 794 | ||
799 | execl( "/bin/sh", "sh", 0 ); | 795 | execl( "/bin/sh", "sh", 0 ); |
800 | #else | 796 | #else |
801 | 797 | ||
802 | execl( ( qpeDir() + "/bin/qpe" ).latin1(), "qpe", 0 ); | 798 | execl( ( qpeDir() + "/bin/qpe" ).latin1(), "qpe", 0 ); |
803 | #endif | 799 | #endif |
804 | 800 | ||
805 | exit( 1 ); | 801 | exit( 1 ); |
806 | #endif | 802 | #endif |
807 | } | 803 | } |
808 | 804 | ||
805 | void Desktop::layout() | ||
806 | { | ||
807 | int displayw = qApp->desktop() ->width(); | ||
808 | int displayh = qApp->desktop() ->height(); | ||
809 | |||
810 | QSize sz = tb->sizeHint(); | ||
811 | |||
812 | tb->setGeometry( 0, displayh - sz.height(), displayw, sz.height() ); | ||
813 | tb->calcMaxWindowRect(); | ||
814 | } | ||
815 | |||
809 | void Desktop::startTransferServer() | 816 | void Desktop::startTransferServer() |
810 | { | 817 | { |
811 | // start qcop bridge server | 818 | // start qcop bridge server |
812 | qcopBridge = new QCopBridge( 4243 ); | 819 | qcopBridge = new QCopBridge( 4243 ); |
813 | if ( !qcopBridge->ok() ) { | 820 | if ( !qcopBridge->ok() ) { |
814 | delete qcopBridge; | 821 | delete qcopBridge; |
815 | qcopBridge = 0; | 822 | qcopBridge = 0; |
816 | } | 823 | } |
817 | // start transfer server | 824 | // start transfer server |
818 | transferServer = new TransferServer( 4242 ); | 825 | transferServer = new TransferServer( 4242 ); |
819 | if ( !transferServer->ok() ) { | 826 | if ( !transferServer->ok() ) { |
820 | delete transferServer; | 827 | delete transferServer; |
821 | transferServer = 0; | 828 | transferServer = 0; |
822 | } | 829 | } |
823 | if ( !transferServer || !qcopBridge ) | 830 | if ( !transferServer || !qcopBridge ) |
824 | startTimer( 2000 ); | 831 | startTimer( 2000 ); |
825 | } | 832 | } |
826 | 833 | ||
827 | void Desktop::timerEvent( QTimerEvent *e ) | 834 | void Desktop::timerEvent( QTimerEvent *e ) |
828 | { | 835 | { |
829 | killTimer( e->timerId() ); | 836 | killTimer( e->timerId() ); |
830 | startTransferServer(); | 837 | startTransferServer(); |
831 | } | 838 | } |
832 | 839 | ||
840 | bool Desktop::eventFilter( QObject *o, QEvent *ev ) | ||
841 | { | ||
842 | if ( o != qApp->desktop() || ev->type() != QEvent::Resize ) | ||
843 | return QWidget::eventFilter( o, ev ); | ||
844 | |||
845 | layout(); | ||
846 | |||
847 | return QWidget::eventFilter( o, ev ); | ||
848 | } | ||
849 | |||
833 | void Desktop::terminateServers() | 850 | void Desktop::terminateServers() |
834 | { | 851 | { |
835 | delete transferServer; | 852 | delete transferServer; |
836 | delete qcopBridge; | 853 | delete qcopBridge; |
837 | transferServer = 0; | 854 | transferServer = 0; |
838 | qcopBridge = 0; | 855 | qcopBridge = 0; |
839 | } | 856 | } |
840 | 857 | ||
841 | void DesktopApplication::rereadVolumes() | 858 | void DesktopApplication::rereadVolumes() |
842 | { | 859 | { |
843 | Config cfg( "qpe" ); | 860 | Config cfg( "qpe" ); |
844 | cfg. setGroup ( "Volume" ); | 861 | cfg. setGroup ( "Volume" ); |
diff --git a/core/launcher/desktop.h b/core/launcher/desktop.h index 4024c38..86d8aa8 100644 --- a/core/launcher/desktop.h +++ b/core/launcher/desktop.h | |||
@@ -125,30 +125,32 @@ public slots: | |||
125 | void execAutoStart(); | 125 | void execAutoStart(); |
126 | void togglePower(); | 126 | void togglePower(); |
127 | void toggleLight(); | 127 | void toggleLight(); |
128 | void toggleNumLockState(); | 128 | void toggleNumLockState(); |
129 | void toggleCapsLockState(); | 129 | void toggleCapsLockState(); |
130 | void toggleSymbolInput(); | 130 | void toggleSymbolInput(); |
131 | void terminateServers(); | 131 | void terminateServers(); |
132 | 132 | ||
133 | protected: | 133 | protected: |
134 | void executeOrModify( const QString& appLnkFile ); | 134 | void executeOrModify( const QString& appLnkFile ); |
135 | void styleChange( QStyle & ); | 135 | void styleChange( QStyle & ); |
136 | void timerEvent( QTimerEvent *e ); | 136 | void timerEvent( QTimerEvent *e ); |
137 | virtual bool eventFilter( QObject *o, QEvent *ev ); | ||
137 | 138 | ||
138 | QWidget *bg; | 139 | QWidget *bg; |
139 | Launcher *launcher; | 140 | Launcher *launcher; |
140 | TaskBar *tb; | 141 | TaskBar *tb; |
141 | 142 | ||
142 | private: | 143 | private: |
144 | void layout(); | ||
143 | void startTransferServer(); | 145 | void startTransferServer(); |
144 | bool recoverMemory(); | 146 | bool recoverMemory(); |
145 | 147 | ||
146 | QCopBridge *qcopBridge; | 148 | QCopBridge *qcopBridge; |
147 | TransferServer *transferServer; | 149 | TransferServer *transferServer; |
148 | PackageSlave *packageSlave; | 150 | PackageSlave *packageSlave; |
149 | 151 | ||
150 | QDateTime suspendTime; | 152 | QDateTime suspendTime; |
151 | }; | 153 | }; |
152 | 154 | ||
153 | 155 | ||
154 | #endif // __DESKTOP_H__ | 156 | #endif // __DESKTOP_H__ |
diff --git a/core/launcher/taskbar.h b/core/launcher/taskbar.h index cd631ef..a0bf395 100644 --- a/core/launcher/taskbar.h +++ b/core/launcher/taskbar.h | |||
@@ -52,26 +52,27 @@ public slots: | |||
52 | void stopWait(const QString&); | 52 | void stopWait(const QString&); |
53 | void stopWait(); | 53 | void stopWait(); |
54 | void clearStatusBar(); | 54 | void clearStatusBar(); |
55 | void toggleNumLockState(); | 55 | void toggleNumLockState(); |
56 | void toggleCapsLockState(); | 56 | void toggleCapsLockState(); |
57 | void toggleSymbolInput(); | 57 | void toggleSymbolInput(); |
58 | 58 | ||
59 | protected: | 59 | protected: |
60 | void resizeEvent( QResizeEvent * ); | 60 | void resizeEvent( QResizeEvent * ); |
61 | void styleChange( QStyle & ); | 61 | void styleChange( QStyle & ); |
62 | void setStatusMessage( const QString &text ); | 62 | void setStatusMessage( const QString &text ); |
63 | 63 | ||
64 | private slots: | 64 | public slots: |
65 | void calcMaxWindowRect(); | 65 | void calcMaxWindowRect(); |
66 | private slots: | ||
66 | void receive( const QCString &msg, const QByteArray &data ); | 67 | void receive( const QCString &msg, const QByteArray &data ); |
67 | 68 | ||
68 | private: | 69 | private: |
69 | 70 | ||
70 | QTimer *waitTimer; | 71 | QTimer *waitTimer; |
71 | Wait *waitIcon; | 72 | Wait *waitIcon; |
72 | InputMethods *inputMethods; | 73 | InputMethods *inputMethods; |
73 | SysTray *sysTray; | 74 | SysTray *sysTray; |
74 | // MRUList *mru; | 75 | // MRUList *mru; |
75 | RunningAppBar* runningAppBar; | 76 | RunningAppBar* runningAppBar; |
76 | QWidgetStack *stack; | 77 | QWidgetStack *stack; |
77 | QTimer *clearer; | 78 | QTimer *clearer; |