-rw-r--r-- | core/launcher/serverapp.cpp | 19 | ||||
-rw-r--r-- | core/launcher/systray.cpp | 8 | ||||
-rw-r--r-- | core/launcher/systray.h | 1 |
3 files changed, 28 insertions, 0 deletions
diff --git a/core/launcher/serverapp.cpp b/core/launcher/serverapp.cpp index 522ef07..28316a4 100644 --- a/core/launcher/serverapp.cpp +++ b/core/launcher/serverapp.cpp | |||
@@ -598,216 +598,235 @@ void ServerApplication::toggleLight() | |||
598 | 598 | ||
599 | /* | 599 | /* |
600 | * We still listen to key events but handle them in | 600 | * We still listen to key events but handle them in |
601 | * a special class | 601 | * a special class |
602 | */ | 602 | */ |
603 | 603 | ||
604 | bool ServerApplication::eventFilter( QObject *o, QEvent *e) { | 604 | bool ServerApplication::eventFilter( QObject *o, QEvent *e) { |
605 | if ( e->type() != QEvent::KeyPress && | 605 | if ( e->type() != QEvent::KeyPress && |
606 | e->type() != QEvent::KeyRelease ) | 606 | e->type() != QEvent::KeyRelease ) |
607 | return QPEApplication::eventFilter( o, e ); | 607 | return QPEApplication::eventFilter( o, e ); |
608 | 608 | ||
609 | QKeyEvent *ke = static_cast<QKeyEvent*>( e ); | 609 | QKeyEvent *ke = static_cast<QKeyEvent*>( e ); |
610 | if ( kf->checkButtonAction( true, ke->key(), | 610 | if ( kf->checkButtonAction( true, ke->key(), |
611 | e->type() == QEvent::KeyPress, | 611 | e->type() == QEvent::KeyPress, |
612 | ke-> isAutoRepeat() )) | 612 | ke-> isAutoRepeat() )) |
613 | return true; | 613 | return true; |
614 | 614 | ||
615 | return QPEApplication::eventFilter( o, e ); | 615 | return QPEApplication::eventFilter( o, e ); |
616 | 616 | ||
617 | } | 617 | } |
618 | 618 | ||
619 | #ifdef Q_WS_QWS | 619 | #ifdef Q_WS_QWS |
620 | bool ServerApplication::qwsEventFilter( QWSEvent *e ) | 620 | bool ServerApplication::qwsEventFilter( QWSEvent *e ) |
621 | { | 621 | { |
622 | checkMemory(); | 622 | checkMemory(); |
623 | 623 | ||
624 | if ( e->type == QWSEvent::Mouse ) { | 624 | if ( e->type == QWSEvent::Mouse ) { |
625 | QWSMouseEvent *me = (QWSMouseEvent *)e; | 625 | QWSMouseEvent *me = (QWSMouseEvent *)e; |
626 | static bool up = TRUE; | 626 | static bool up = TRUE; |
627 | if ( me->simpleData.state&LeftButton ) { | 627 | if ( me->simpleData.state&LeftButton ) { |
628 | if ( up ) { | 628 | if ( up ) { |
629 | up = FALSE; | 629 | up = FALSE; |
630 | screenClick(TRUE); | 630 | screenClick(TRUE); |
631 | } | 631 | } |
632 | } else if ( !up ) { | 632 | } else if ( !up ) { |
633 | up = TRUE; | 633 | up = TRUE; |
634 | screenClick(FALSE); | 634 | screenClick(FALSE); |
635 | } | 635 | } |
636 | }else if ( e->type == QWSEvent::Key ) { | 636 | }else if ( e->type == QWSEvent::Key ) { |
637 | QWSKeyEvent * ke = static_cast<QWSKeyEvent*>( e ); | 637 | QWSKeyEvent * ke = static_cast<QWSKeyEvent*>( e ); |
638 | if ( kf->checkButtonAction( false, | 638 | if ( kf->checkButtonAction( false, |
639 | ke-> simpleData.keycode, | 639 | ke-> simpleData.keycode, |
640 | ke-> simpleData.is_press, | 640 | ke-> simpleData.is_press, |
641 | ke-> simpleData.is_auto_repeat ) ) | 641 | ke-> simpleData.is_auto_repeat ) ) |
642 | return true; | 642 | return true; |
643 | } | 643 | } |
644 | 644 | ||
645 | return QPEApplication::qwsEventFilter( e ); | 645 | return QPEApplication::qwsEventFilter( e ); |
646 | } | 646 | } |
647 | #endif | 647 | #endif |
648 | 648 | ||
649 | 649 | ||
650 | /* ### FIXME libqtopia Plugin Safe Mode */ | 650 | /* ### FIXME libqtopia Plugin Safe Mode */ |
651 | 651 | ||
652 | void ServerApplication::showSafeMode() | 652 | void ServerApplication::showSafeMode() |
653 | { | 653 | { |
654 | #if 0 | 654 | #if 0 |
655 | if ( QMessageBox::warning(0, tr("Safe Mode"), tr("<P>A system startup error occurred, " | 655 | if ( QMessageBox::warning(0, tr("Safe Mode"), tr("<P>A system startup error occurred, " |
656 | "and the system is now in Safe Mode. " | 656 | "and the system is now in Safe Mode. " |
657 | "Plugins are not loaded in Safe Mode. " | 657 | "Plugins are not loaded in Safe Mode. " |
658 | "You can use the Plugin Manager to " | 658 | "You can use the Plugin Manager to " |
659 | "disable plugins that cause system error."), tr("OK"), tr("Plugin Manager..."), 0) == 1 ) { | 659 | "disable plugins that cause system error."), tr("OK"), tr("Plugin Manager..."), 0) == 1 ) { |
660 | Global::execute( "pluginmanager" ); | 660 | Global::execute( "pluginmanager" ); |
661 | } | 661 | } |
662 | #endif | 662 | #endif |
663 | } | 663 | } |
664 | 664 | ||
665 | void ServerApplication::clearSafeMode() | 665 | void ServerApplication::clearSafeMode() |
666 | { | 666 | { |
667 | #if 0 | 667 | #if 0 |
668 | // If we've been running OK for a while then we won't bother going into | 668 | // If we've been running OK for a while then we won't bother going into |
669 | // safe mode immediately on the next crash. | 669 | // safe mode immediately on the next crash. |
670 | Config cfg( "PluginLoader" ); | 670 | Config cfg( "PluginLoader" ); |
671 | cfg.setGroup( "Global" ); | 671 | cfg.setGroup( "Global" ); |
672 | QString mode = cfg.readEntry( "Mode", "Normal" ); | 672 | QString mode = cfg.readEntry( "Mode", "Normal" ); |
673 | if ( mode == "MaybeSafe" ) { | 673 | if ( mode == "MaybeSafe" ) { |
674 | cfg.writeEntry( "Mode", "Normal" ); | 674 | cfg.writeEntry( "Mode", "Normal" ); |
675 | } | 675 | } |
676 | #endif | 676 | #endif |
677 | } | 677 | } |
678 | 678 | ||
679 | 679 | ||
680 | void ServerApplication::shutdown() | 680 | void ServerApplication::shutdown() |
681 | { | 681 | { |
682 | if ( type() != GuiServer ) | 682 | if ( type() != GuiServer ) |
683 | return; | 683 | return; |
684 | ShutdownImpl *sd = new ShutdownImpl( 0, 0, WDestructiveClose ); | 684 | ShutdownImpl *sd = new ShutdownImpl( 0, 0, WDestructiveClose ); |
685 | connect( sd, SIGNAL(shutdown(ShutdownImpl::Type)), | 685 | connect( sd, SIGNAL(shutdown(ShutdownImpl::Type)), |
686 | this, SLOT(shutdown(ShutdownImpl::Type)) ); | 686 | this, SLOT(shutdown(ShutdownImpl::Type)) ); |
687 | sd->showMaximized(); | 687 | sd->showMaximized(); |
688 | } | 688 | } |
689 | 689 | ||
690 | void ServerApplication::shutdown( ShutdownImpl::Type t ) | 690 | void ServerApplication::shutdown( ShutdownImpl::Type t ) |
691 | { | 691 | { |
692 | char *opt = 0; | 692 | char *opt = 0; |
693 | 693 | ||
694 | switch ( t ) { | 694 | switch ( t ) { |
695 | case ShutdownImpl::ShutdownSystem: | 695 | case ShutdownImpl::ShutdownSystem: |
696 | opt = "-h"; | 696 | opt = "-h"; |
697 | // fall through | 697 | // fall through |
698 | case ShutdownImpl::RebootSystem: | 698 | case ShutdownImpl::RebootSystem: |
699 | if ( opt == 0 ) | 699 | if ( opt == 0 ) |
700 | opt = "-r"; | 700 | opt = "-r"; |
701 | 701 | ||
702 | if ( execl( "/sbin/shutdown", "shutdown", opt, "now", ( void* ) 0) < 0 ) | 702 | if ( execl( "/sbin/shutdown", "shutdown", opt, "now", ( void* ) 0) < 0 ) |
703 | perror("shutdown"); | 703 | perror("shutdown"); |
704 | // ::syslog ( LOG_ERR, "Erroring execing shutdown\n" ); | 704 | // ::syslog ( LOG_ERR, "Erroring execing shutdown\n" ); |
705 | 705 | ||
706 | break; | 706 | break; |
707 | case ShutdownImpl::RestartDesktop: | 707 | case ShutdownImpl::RestartDesktop: |
708 | restart(); | 708 | restart(); |
709 | break; | 709 | break; |
710 | case ShutdownImpl::TerminateDesktop: | 710 | case ShutdownImpl::TerminateDesktop: |
711 | prepareForTermination( FALSE ); | 711 | prepareForTermination( FALSE ); |
712 | 712 | ||
713 | // This is a workaround for a Qt bug | 713 | // This is a workaround for a Qt bug |
714 | // clipboard applet has to stop its poll timer, or Qt/E | 714 | // clipboard applet has to stop its poll timer, or Qt/E |
715 | // will hang on quit() right before it emits aboutToQuit() | 715 | // will hang on quit() right before it emits aboutToQuit() |
716 | emit aboutToQuit ( ); | 716 | emit aboutToQuit ( ); |
717 | 717 | ||
718 | quit(); | 718 | quit(); |
719 | break; | 719 | break; |
720 | } | 720 | } |
721 | } | 721 | } |
722 | 722 | ||
723 | void ServerApplication::restart() | 723 | void ServerApplication::restart() |
724 | { | 724 | { |
725 | if ( allowRestart ) { | 725 | if ( allowRestart ) { |
726 | |||
727 | /* | ||
728 | * Applets and restart is a problem. Some applets delete | ||
729 | * their widgets even if ownership gets transfered to the | ||
730 | * parent (Systray ) but deleting the applet may be unsafe | ||
731 | * as well ( double deletion ). Some have topLevel widgets | ||
732 | * and when we dlclose and then delete the widget we will | ||
733 | * crash and an crash during restart is not nice | ||
734 | */ | ||
735 | #ifdef ALL_APPLETS_ON_THIS_WORLD_ARE_FIXED | ||
736 | /* same as above */ | ||
737 | emit aboutToQuit(); | ||
726 | prepareForTermination(TRUE); | 738 | prepareForTermination(TRUE); |
727 | doRestart = TRUE; | 739 | doRestart = TRUE; |
728 | quit(); | 740 | quit(); |
741 | #else | ||
742 | prepareForTermination( true ); | ||
743 | for ( int fd = 3; fd < 100; fd++ ) | ||
744 | close( fd ); | ||
745 | execl( ( qpeDir() + "/bin/qpe" ).latin1(), "qpe", 0 ); | ||
746 | exit( 1 ); | ||
747 | #endif | ||
729 | } | 748 | } |
730 | } | 749 | } |
731 | 750 | ||
732 | void ServerApplication::rereadVolumes() | 751 | void ServerApplication::rereadVolumes() |
733 | { | 752 | { |
734 | Config cfg( "qpe" ); | 753 | Config cfg( "qpe" ); |
735 | cfg. setGroup ( "Volume" ); | 754 | cfg. setGroup ( "Volume" ); |
736 | 755 | ||
737 | m_screentap_sound = cfg. readBoolEntry ( "TouchSound" ); | 756 | m_screentap_sound = cfg. readBoolEntry ( "TouchSound" ); |
738 | m_keyclick_sound = cfg. readBoolEntry ( "KeySound" ); | 757 | m_keyclick_sound = cfg. readBoolEntry ( "KeySound" ); |
739 | m_alarm_sound = cfg. readBoolEntry ( "AlarmSound" ); | 758 | m_alarm_sound = cfg. readBoolEntry ( "AlarmSound" ); |
740 | } | 759 | } |
741 | 760 | ||
742 | 761 | ||
743 | void ServerApplication::checkMemory() | 762 | void ServerApplication::checkMemory() |
744 | { | 763 | { |
745 | #if defined(QPE_HAVE_MEMALERTER) | 764 | #if defined(QPE_HAVE_MEMALERTER) |
746 | static bool ignoreNormal=TRUE; | 765 | static bool ignoreNormal=TRUE; |
747 | static bool existingMessage=FALSE; | 766 | static bool existingMessage=FALSE; |
748 | 767 | ||
749 | if(existingMessage) | 768 | if(existingMessage) |
750 | return; // don't show a second message while still on first | 769 | return; // don't show a second message while still on first |
751 | 770 | ||
752 | existingMessage = TRUE; | 771 | existingMessage = TRUE; |
753 | switch ( memstate ) { | 772 | switch ( memstate ) { |
754 | case MemUnknown: | 773 | case MemUnknown: |
755 | break; | 774 | break; |
756 | case MemLow: | 775 | case MemLow: |
757 | memstate = MemUnknown; | 776 | memstate = MemUnknown; |
758 | if ( !recoverMemory() ) { | 777 | if ( !recoverMemory() ) { |
759 | QMessageBox::warning( 0 , tr("Memory Status"), | 778 | QMessageBox::warning( 0 , tr("Memory Status"), |
760 | tr("Memory Low\nPlease save data.") ); | 779 | tr("Memory Low\nPlease save data.") ); |
761 | ignoreNormal = FALSE; | 780 | ignoreNormal = FALSE; |
762 | } | 781 | } |
763 | break; | 782 | break; |
764 | case MemNormal: | 783 | case MemNormal: |
765 | memstate = MemUnknown; | 784 | memstate = MemUnknown; |
766 | if ( !ignoreNormal ) { | 785 | if ( !ignoreNormal ) { |
767 | ignoreNormal = TRUE; | 786 | ignoreNormal = TRUE; |
768 | QMessageBox::information ( 0 , tr("Memory Status"), | 787 | QMessageBox::information ( 0 , tr("Memory Status"), |
769 | "Memory OK" ); | 788 | "Memory OK" ); |
770 | } | 789 | } |
771 | break; | 790 | break; |
772 | case MemVeryLow: | 791 | case MemVeryLow: |
773 | memstate = MemUnknown; | 792 | memstate = MemUnknown; |
774 | QMessageBox::critical( 0 , tr("Memory Status"), | 793 | QMessageBox::critical( 0 , tr("Memory Status"), |
775 | tr("Critical Memory Shortage\n" | 794 | tr("Critical Memory Shortage\n" |
776 | "Please end this application\n" | 795 | "Please end this application\n" |
777 | "immediately.") ); | 796 | "immediately.") ); |
778 | recoverMemory(); | 797 | recoverMemory(); |
779 | } | 798 | } |
780 | existingMessage = FALSE; | 799 | existingMessage = FALSE; |
781 | #endif | 800 | #endif |
782 | } | 801 | } |
783 | 802 | ||
784 | bool ServerApplication::recoverMemory() | 803 | bool ServerApplication::recoverMemory() |
785 | { | 804 | { |
786 | return FALSE; | 805 | return FALSE; |
787 | } | 806 | } |
788 | 807 | ||
789 | void ServerApplication::keyClick(int , bool press, bool ) | 808 | void ServerApplication::keyClick(int , bool press, bool ) |
790 | { | 809 | { |
791 | if ( press && m_keyclick_sound ) | 810 | if ( press && m_keyclick_sound ) |
792 | ODevice::inst() -> keySound(); | 811 | ODevice::inst() -> keySound(); |
793 | 812 | ||
794 | } | 813 | } |
795 | 814 | ||
796 | void ServerApplication::screenClick(bool press) | 815 | void ServerApplication::screenClick(bool press) |
797 | { | 816 | { |
798 | if ( press && m_screentap_sound ) | 817 | if ( press && m_screentap_sound ) |
799 | ODevice::inst() -> touchSound(); | 818 | ODevice::inst() -> touchSound(); |
800 | } | 819 | } |
801 | 820 | ||
802 | void ServerApplication::soundAlarm() { | 821 | void ServerApplication::soundAlarm() { |
803 | if ( me ()->m_alarm_sound ) | 822 | if ( me ()->m_alarm_sound ) |
804 | ODevice::inst()->alarmSound(); | 823 | ODevice::inst()->alarmSound(); |
805 | } | 824 | } |
806 | 825 | ||
807 | ServerApplication *ServerApplication::me ( ) | 826 | ServerApplication *ServerApplication::me ( ) |
808 | { | 827 | { |
809 | return static_cast<ServerApplication*>( qApp ); | 828 | return static_cast<ServerApplication*>( qApp ); |
810 | } | 829 | } |
811 | 830 | ||
812 | 831 | ||
813 | #include "serverapp.moc" | 832 | #include "serverapp.moc" |
diff --git a/core/launcher/systray.cpp b/core/launcher/systray.cpp index 64356ca..6122770 100644 --- a/core/launcher/systray.cpp +++ b/core/launcher/systray.cpp | |||
@@ -1,141 +1,149 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of the Qtopia Environment. | 4 | ** This file is part of the Qtopia Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | 20 | ||
21 | #include <qtopia/qpeapplication.h> | 21 | #include <qtopia/qpeapplication.h> |
22 | #include <qtopia/qlibrary.h> | 22 | #include <qtopia/qlibrary.h> |
23 | #include <qtopia/config.h> | 23 | #include <qtopia/config.h> |
24 | 24 | ||
25 | #include <qlayout.h> | 25 | #include <qlayout.h> |
26 | #include <qdir.h> | 26 | #include <qdir.h> |
27 | #include <qmessagebox.h> | 27 | #include <qmessagebox.h> |
28 | #include <qtranslator.h> | 28 | #include <qtranslator.h> |
29 | 29 | ||
30 | #include "systray.h" | 30 | #include "systray.h" |
31 | 31 | ||
32 | #include <stdlib.h> | 32 | #include <stdlib.h> |
33 | 33 | ||
34 | /* ### Single build floppies ### */ | 34 | /* ### Single build floppies ### */ |
35 | #if 0 | 35 | #if 0 |
36 | #ifdef QT_NO_COMPONENTS | 36 | #ifdef QT_NO_COMPONENTS |
37 | #include "../plugins/applets/clockapplet/clockappletimpl.h" | 37 | #include "../plugins/applets/clockapplet/clockappletimpl.h" |
38 | #endif | 38 | #endif |
39 | #endif | 39 | #endif |
40 | 40 | ||
41 | SysTray::SysTray( QWidget *parent ) : QFrame( parent ), layout(0) | 41 | SysTray::SysTray( QWidget *parent ) : QFrame( parent ), layout(0) |
42 | { | 42 | { |
43 | //setFrameStyle( QFrame::Panel | QFrame::Sunken ); | 43 | //setFrameStyle( QFrame::Panel | QFrame::Sunken ); |
44 | loadApplets(); | 44 | loadApplets(); |
45 | } | 45 | } |
46 | 46 | ||
47 | SysTray::~SysTray() | 47 | SysTray::~SysTray() |
48 | { | 48 | { |
49 | clearApplets(); | 49 | clearApplets(); |
50 | } | 50 | } |
51 | 51 | ||
52 | static int compareAppletPositions(const void *a, const void *b) | 52 | static int compareAppletPositions(const void *a, const void *b) |
53 | { | 53 | { |
54 | const TaskbarApplet* aa = *(const TaskbarApplet**)a; | 54 | const TaskbarApplet* aa = *(const TaskbarApplet**)a; |
55 | const TaskbarApplet* ab = *(const TaskbarApplet**)b; | 55 | const TaskbarApplet* ab = *(const TaskbarApplet**)b; |
56 | int d = ab->iface->position() - aa->iface->position(); | 56 | int d = ab->iface->position() - aa->iface->position(); |
57 | if ( d ) return d; | 57 | if ( d ) return d; |
58 | return QString::compare(ab->name,aa->name); | 58 | return QString::compare(ab->name,aa->name); |
59 | } | 59 | } |
60 | 60 | ||
61 | void SysTray::loadApplets() | 61 | void SysTray::loadApplets() |
62 | { | 62 | { |
63 | hide(); | 63 | hide(); |
64 | clearApplets(); | 64 | clearApplets(); |
65 | addApplets(); | 65 | addApplets(); |
66 | } | 66 | } |
67 | 67 | ||
68 | void SysTray::clearApplets() | 68 | void SysTray::clearApplets() |
69 | { | 69 | { |
70 | #ifndef QT_NO_COMPONENTS | 70 | #ifndef QT_NO_COMPONENTS |
71 | 71 | ||
72 | /* | ||
73 | * Note on clearing. SOme applets delete their | ||
74 | * applets themselves some don't do it | ||
75 | * and on restart this can crash. If we delete it | ||
76 | * here we might end up in a double deletion. We could | ||
77 | * use QGuardedPtr but that would be one QOBject | ||
78 | * for every applet more but only useful for restart | ||
79 | */ | ||
72 | QValueList<TaskbarApplet>::Iterator mit; | 80 | QValueList<TaskbarApplet>::Iterator mit; |
73 | for ( mit = appletList.begin(); mit != appletList.end(); ++mit ) { | 81 | for ( mit = appletList.begin(); mit != appletList.end(); ++mit ) { |
74 | (*mit).iface->release(); | 82 | (*mit).iface->release(); |
75 | (*mit).library->unload(); | 83 | (*mit).library->unload(); |
76 | delete (*mit).library; | 84 | delete (*mit).library; |
77 | } | 85 | } |
78 | 86 | ||
79 | #endif | 87 | #endif |
80 | appletList.clear(); | 88 | appletList.clear(); |
81 | if ( layout ) | 89 | if ( layout ) |
82 | delete layout; | 90 | delete layout; |
83 | layout = new QHBoxLayout( this, 0, 1 ); | 91 | layout = new QHBoxLayout( this, 0, 1 ); |
84 | layout->setAutoAdd(TRUE); | 92 | layout->setAutoAdd(TRUE); |
85 | } | 93 | } |
86 | 94 | ||
87 | void SysTray::addApplets() | 95 | void SysTray::addApplets() |
88 | { | 96 | { |
89 | hide(); | 97 | hide(); |
90 | #ifndef QT_NO_COMPONENTS | 98 | #ifndef QT_NO_COMPONENTS |
91 | Config cfg( "Taskbar" ); | 99 | Config cfg( "Taskbar" ); |
92 | cfg.setGroup( "Applets" ); | 100 | cfg.setGroup( "Applets" ); |
93 | QStringList exclude = cfg.readListEntry( "ExcludeApplets", ',' ); | 101 | QStringList exclude = cfg.readListEntry( "ExcludeApplets", ',' ); |
94 | 102 | ||
95 | QString lang = getenv( "LANG" ); | 103 | QString lang = getenv( "LANG" ); |
96 | QString path = QPEApplication::qpeDir() + "/plugins/applets"; | 104 | QString path = QPEApplication::qpeDir() + "/plugins/applets"; |
97 | QDir dir( path, "lib*.so" ); | 105 | QDir dir( path, "lib*.so" ); |
98 | QStringList list = dir.entryList(); | 106 | QStringList list = dir.entryList(); |
99 | QStringList::Iterator it; | 107 | QStringList::Iterator it; |
100 | int napplets=0; | 108 | int napplets=0; |
101 | TaskbarApplet* *applets = new TaskbarApplet*[list.count()]; | 109 | TaskbarApplet* *applets = new TaskbarApplet*[list.count()]; |
102 | for ( it = list.begin(); it != list.end(); ++it ) { | 110 | for ( it = list.begin(); it != list.end(); ++it ) { |
103 | if ( exclude.find( *it ) != exclude.end() ) | 111 | if ( exclude.find( *it ) != exclude.end() ) |
104 | continue; | 112 | continue; |
105 | TaskbarAppletInterface *iface = 0; | 113 | TaskbarAppletInterface *iface = 0; |
106 | QLibrary *lib = new QLibrary( path + "/" + *it ); | 114 | QLibrary *lib = new QLibrary( path + "/" + *it ); |
107 | if (( lib->queryInterface( IID_TaskbarApplet, (QUnknownInterface**)&iface ) == QS_OK ) && iface ) { | 115 | if (( lib->queryInterface( IID_TaskbarApplet, (QUnknownInterface**)&iface ) == QS_OK ) && iface ) { |
108 | TaskbarApplet *applet = new TaskbarApplet; | 116 | TaskbarApplet *applet = new TaskbarApplet; |
109 | applets[napplets++] = applet; | 117 | applets[napplets++] = applet; |
110 | applet->library = lib; | 118 | applet->library = lib; |
111 | applet->iface = iface; | 119 | applet->iface = iface; |
112 | 120 | ||
113 | QTranslator *trans = new QTranslator(qApp); | 121 | QTranslator *trans = new QTranslator(qApp); |
114 | QString type = (*it).left( (*it).find(".") ); | 122 | QString type = (*it).left( (*it).find(".") ); |
115 | QString tfn = QPEApplication::qpeDir()+"/i18n/"+lang+"/"+type+".qm"; | 123 | QString tfn = QPEApplication::qpeDir()+"/i18n/"+lang+"/"+type+".qm"; |
116 | if ( trans->load( tfn )) | 124 | if ( trans->load( tfn )) |
117 | qApp->installTranslator( trans ); | 125 | qApp->installTranslator( trans ); |
118 | else | 126 | else |
119 | delete trans; | 127 | delete trans; |
120 | } else { | 128 | } else { |
121 | exclude += *it; | 129 | exclude += *it; |
122 | delete lib; | 130 | delete lib; |
123 | } | 131 | } |
124 | } | 132 | } |
125 | cfg.writeEntry( "ExcludeApplets", exclude, ',' ); | 133 | cfg.writeEntry( "ExcludeApplets", exclude, ',' ); |
126 | qsort(applets,napplets,sizeof(applets[0]),compareAppletPositions); | 134 | qsort(applets,napplets,sizeof(applets[0]),compareAppletPositions); |
127 | while (napplets--) { | 135 | while (napplets--) { |
128 | TaskbarApplet *applet = applets[napplets]; | 136 | TaskbarApplet *applet = applets[napplets]; |
129 | applet->applet = applet->iface->applet( this ); | 137 | applet->applet = applet->iface->applet( this ); |
130 | appletList.append(*applet); | 138 | appletList.append(*applet); |
131 | } | 139 | } |
132 | delete [] applets; | 140 | delete [] applets; |
133 | #else /* ## FIXME single app */ | 141 | #else /* ## FIXME single app */ |
134 | TaskbarApplet * const applet = new TaskbarApplet(); | 142 | TaskbarApplet * const applet = new TaskbarApplet(); |
135 | applet->iface = new ClockAppletImpl(); | 143 | applet->iface = new ClockAppletImpl(); |
136 | applet->applet = applet->iface->applet( this ); | 144 | applet->applet = applet->iface->applet( this ); |
137 | appletList.append( applet ); | 145 | appletList.append( applet ); |
138 | #endif | 146 | #endif |
139 | show(); | 147 | show(); |
140 | } | 148 | } |
141 | 149 | ||
diff --git a/core/launcher/systray.h b/core/launcher/systray.h index 77c581f..b989d58 100644 --- a/core/launcher/systray.h +++ b/core/launcher/systray.h | |||
@@ -1,61 +1,62 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of the Qtopia Environment. | 4 | ** This file is part of the Qtopia Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | 20 | ||
21 | #ifndef __SYSTRAY_H__ | 21 | #ifndef __SYSTRAY_H__ |
22 | #define __SYSTRAY_H__ | 22 | #define __SYSTRAY_H__ |
23 | 23 | ||
24 | #ifndef QT_NO_COMPONENT | 24 | #ifndef QT_NO_COMPONENT |
25 | #include <qtopia/taskbarappletinterface.h> | 25 | #include <qtopia/taskbarappletinterface.h> |
26 | #endif | 26 | #endif |
27 | 27 | ||
28 | #include <qframe.h> | 28 | #include <qframe.h> |
29 | #include <qvaluelist.h> | 29 | #include <qvaluelist.h> |
30 | #include <qguardedptr.h> | ||
30 | 31 | ||
31 | class QHBoxLayout; | 32 | class QHBoxLayout; |
32 | class QLibrary; | 33 | class QLibrary; |
33 | 34 | ||
34 | struct TaskbarApplet | 35 | struct TaskbarApplet |
35 | { | 36 | { |
36 | #ifndef QT_NO_COMPONENT | 37 | #ifndef QT_NO_COMPONENT |
37 | QLibrary *library; | 38 | QLibrary *library; |
38 | TaskbarAppletInterface *iface; | 39 | TaskbarAppletInterface *iface; |
39 | #endif | 40 | #endif |
40 | QWidget *applet; | 41 | QWidget *applet; |
41 | QString name; | 42 | QString name; |
42 | }; | 43 | }; |
43 | 44 | ||
44 | class SysTray : public QFrame { | 45 | class SysTray : public QFrame { |
45 | Q_OBJECT | 46 | Q_OBJECT |
46 | public: | 47 | public: |
47 | SysTray( QWidget *parent ); | 48 | SysTray( QWidget *parent ); |
48 | ~SysTray(); | 49 | ~SysTray(); |
49 | 50 | ||
50 | void clearApplets(); | 51 | void clearApplets(); |
51 | void addApplets(); | 52 | void addApplets(); |
52 | 53 | ||
53 | private: | 54 | private: |
54 | void loadApplets(); | 55 | void loadApplets(); |
55 | QHBoxLayout *layout; | 56 | QHBoxLayout *layout; |
56 | QValueList<TaskbarApplet> appletList; | 57 | QValueList<TaskbarApplet> appletList; |
57 | }; | 58 | }; |
58 | 59 | ||
59 | 60 | ||
60 | #endif // __SYSTRAY_H__ | 61 | #endif // __SYSTRAY_H__ |
61 | 62 | ||