author | mickeyl <mickeyl> | 2004-09-12 15:05:47 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2004-09-12 15:05:47 (UTC) |
commit | 1ecaa166126baf48c1ed280963b421d70e1afcda (patch) (unidiff) | |
tree | 32cb18504edb47019b11bf1704a165f9171fdaab | |
parent | 146ce9b20f9c225b8bea13beb9338684c20384a2 (diff) | |
download | opie-1ecaa166126baf48c1ed280963b421d70e1afcda.zip opie-1ecaa166126baf48c1ed280963b421d70e1afcda.tar.gz opie-1ecaa166126baf48c1ed280963b421d70e1afcda.tar.bz2 |
show text label and remove bogus sleep
-rw-r--r-- | library/qpeapplication.cpp | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp index ca90427..e1edd4c 100644 --- a/library/qpeapplication.cpp +++ b/library/qpeapplication.cpp | |||
@@ -1920,82 +1920,73 @@ void QPEApplication::internalSetStyle( const QString &style ) | |||
1920 | sty = iface-> style ( ); | 1920 | sty = iface-> style ( ); |
1921 | 1921 | ||
1922 | if ( sty ) { | 1922 | if ( sty ) { |
1923 | setStyle ( sty ); | 1923 | setStyle ( sty ); |
1924 | 1924 | ||
1925 | if ( lastiface ) | 1925 | if ( lastiface ) |
1926 | lastiface-> release ( ); | 1926 | lastiface-> release ( ); |
1927 | lastiface = iface; | 1927 | lastiface = iface; |
1928 | 1928 | ||
1929 | if ( lastlib ) { | 1929 | if ( lastlib ) { |
1930 | lastlib-> unload ( ); | 1930 | lastlib-> unload ( ); |
1931 | delete lastlib; | 1931 | delete lastlib; |
1932 | } | 1932 | } |
1933 | lastlib = lib; | 1933 | lastlib = lib; |
1934 | } | 1934 | } |
1935 | else { | 1935 | else { |
1936 | if ( iface ) | 1936 | if ( iface ) |
1937 | iface-> release ( ); | 1937 | iface-> release ( ); |
1938 | delete lib; | 1938 | delete lib; |
1939 | 1939 | ||
1940 | setStyle ( new LightStyle ( )); | 1940 | setStyle ( new LightStyle ( )); |
1941 | } | 1941 | } |
1942 | } | 1942 | } |
1943 | #endif | 1943 | #endif |
1944 | } | 1944 | } |
1945 | 1945 | ||
1946 | /*! | 1946 | /*! |
1947 | \internal | 1947 | \internal |
1948 | */ | 1948 | */ |
1949 | void QPEApplication::prepareForTermination( bool willrestart ) | 1949 | void QPEApplication::prepareForTermination( bool willrestart ) |
1950 | { | 1950 | { |
1951 | if ( willrestart ) { | 1951 | if ( willrestart ) { |
1952 | // Draw a big wait icon, the image can be altered in later revisions | 1952 | QLabel *lblWait = new QLabel( tr( "Please wait..." ), 0, "wait hack", QWidget::WStyle_Customize | |
1953 | // QWidget *d = QApplication::desktop(); | ||
1954 | QImage img = Resource::loadImage( "launcher/new_wait" ); | ||
1955 | QPixmap pix; | ||
1956 | pix.convertFromImage( img.smoothScale( 1 * img.width(), 1 * img.height() ) ); | ||
1957 | QLabel *lblWait = new QLabel( 0, "wait hack!", QWidget::WStyle_Customize | | ||
1958 | QWidget::WStyle_NoBorder | QWidget::WStyle_Tool ); | 1953 | QWidget::WStyle_NoBorder | QWidget::WStyle_Tool ); |
1959 | lblWait->setPixmap( pix ); | ||
1960 | lblWait->setAlignment( QWidget::AlignCenter ); | 1954 | lblWait->setAlignment( QWidget::AlignCenter ); |
1961 | lblWait->show(); | 1955 | lblWait->show(); |
1962 | lblWait->showMaximized(); | 1956 | lblWait->showMaximized(); |
1963 | } | 1957 | } |
1964 | #ifndef SINGLE_APP | ||
1965 | { QCopEnvelope envelope( "QPE/System", "forceQuit()" ); | 1958 | { QCopEnvelope envelope( "QPE/System", "forceQuit()" ); |
1966 | } | 1959 | } |
1967 | processEvents(); // ensure the message goes out. | 1960 | processEvents(); // ensure the message goes out. |
1968 | sleep( 1 ); // You have 1 second to comply. | ||
1969 | #endif | ||
1970 | } | 1961 | } |
1971 | 1962 | ||
1972 | /*! | 1963 | /*! |
1973 | \internal | 1964 | \internal |
1974 | */ | 1965 | */ |
1975 | void QPEApplication::shutdown() | 1966 | void QPEApplication::shutdown() |
1976 | { | 1967 | { |
1977 | // Implement in server's QPEApplication subclass | 1968 | // Implement in server's QPEApplication subclass |
1978 | } | 1969 | } |
1979 | 1970 | ||
1980 | /*! | 1971 | /*! |
1981 | \internal | 1972 | \internal |
1982 | */ | 1973 | */ |
1983 | void QPEApplication::restart() | 1974 | void QPEApplication::restart() |
1984 | { | 1975 | { |
1985 | // Implement in server's QPEApplication subclass | 1976 | // Implement in server's QPEApplication subclass |
1986 | } | 1977 | } |
1987 | 1978 | ||
1988 | static QPtrDict<void>* stylusDict = 0; | 1979 | static QPtrDict<void>* stylusDict = 0; |
1989 | static void createDict() | 1980 | static void createDict() |
1990 | { | 1981 | { |
1991 | if ( !stylusDict ) | 1982 | if ( !stylusDict ) |
1992 | stylusDict = new QPtrDict<void>; | 1983 | stylusDict = new QPtrDict<void>; |
1993 | } | 1984 | } |
1994 | 1985 | ||
1995 | /*! | 1986 | /*! |
1996 | Returns the current StylusMode for widget \a w. | 1987 | Returns the current StylusMode for widget \a w. |
1997 | 1988 | ||
1998 | \sa setStylusOperation() StylusMode | 1989 | \sa setStylusOperation() StylusMode |
1999 | */ | 1990 | */ |
2000 | QPEApplication::StylusMode QPEApplication::stylusOperation( QWidget* w ) | 1991 | QPEApplication::StylusMode QPEApplication::stylusOperation( QWidget* w ) |
2001 | { | 1992 | { |