From b934e2eeea5fb58fa637a02985f8c805f632cb39 Mon Sep 17 00:00:00 2001 From: harlekin Date: Thu, 10 Apr 2003 15:09:57 +0000 Subject: small icon size is 14 for > 200 pixel width and font 18 for > 600 --- diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp index ac7b779..c562f6c 100644 --- a/library/qpeapplication.cpp +++ b/library/qpeapplication.cpp @@ -92,9 +92,9 @@ class QPEApplicationData { public: - QPEApplicationData ( ) - : presstimer( 0 ), presswidget( 0 ), rightpressed( false ), kbgrabbed( false ), - notbusysent( false ), preloaded( false ), forceshow( false ), nomaximize( false ), + QPEApplicationData ( ) + : presstimer( 0 ), presswidget( 0 ), rightpressed( false ), kbgrabbed( false ), + notbusysent( false ), preloaded( false ), forceshow( false ), nomaximize( false ), keep_running( true ), qpe_main_widget( 0 ) { @@ -516,13 +516,13 @@ QPEApplication::QPEApplication( int & argc, char **argv, Type t ) AppLnk::setBigIconSize( 28 ); } else if ( dw > 600 ) { - setFont( QFont( "helvetica", 12 ) ); + setFont( QFont( "helvetica", 18 ) ); AppLnk::setSmallIconSize( 24 ); AppLnk::setBigIconSize( 48 ); } else if ( dw > 200 ) { setFont( QFont( "helvetica", 10 ) ); - AppLnk::setSmallIconSize( 16 ); + AppLnk::setSmallIconSize( 14 ); AppLnk::setBigIconSize( 32 ); } @@ -814,7 +814,7 @@ bool QPEApplication::qwsEventFilter( QWSEvent * e ) if ( active && ((int) active-> winId ( ) == ke-> simpleData.window )) { if ( d-> kbgrabbed ) { // we grabbed the keyboard QChar ch ( ke-> simpleData.unicode ); - QKeyEvent qke ( ke-> simpleData. is_press ? QEvent::KeyPress : QEvent::KeyRelease, + QKeyEvent qke ( ke-> simpleData. is_press ? QEvent::KeyPress : QEvent::KeyRelease, ke-> simpleData.keycode, ch. latin1 ( ), ke-> simpleData.modifiers, @@ -822,13 +822,13 @@ bool QPEApplication::qwsEventFilter( QWSEvent * e ) ke-> simpleData.is_auto_repeat, 1 ); QObject *which = QWidget::keyboardGrabber ( ); - if ( !which ) + if ( !which ) which = QApplication::focusWidget ( ); - if ( !which ) + if ( !which ) which = QApplication::activeWindow ( ); - if ( !which ) + if ( !which ) which = qApp; - + QApplication::sendEvent ( which, &qke ); } else { // we didn't grab the keyboard, so send the event to the launcher @@ -837,7 +837,7 @@ bool QPEApplication::qwsEventFilter( QWSEvent * e ) } } return true; - } + } } if ( e->type == QWSEvent::Focus ) { QWSFocusEvent * fe = ( QWSFocusEvent* ) e; @@ -1047,9 +1047,9 @@ void QPEApplication::systemMessage( const QCString& msg, const QByteArray& data } else if ( msg == "toggleApplicationMenu()" ) { QWidget *active = activeWindow ( ); - + if ( active ) { - QPEMenuToolFocusManager *man = QPEMenuToolFocusManager::manager ( ); + QPEMenuToolFocusManager *man = QPEMenuToolFocusManager::manager ( ); bool oldactive = man-> isActive ( ); man-> setActive( !man-> isActive() ); -- cgit v0.9.0.2