summaryrefslogtreecommitdiff
authorharlekin <harlekin>2003-04-10 15:09:57 (UTC)
committer harlekin <harlekin>2003-04-10 15:09:57 (UTC)
commitb934e2eeea5fb58fa637a02985f8c805f632cb39 (patch) (side-by-side diff)
treeb9c7fb2c62cf5d8c75711cf6aaec609a61eb58b6
parenta7debbf487db4f832cafe7791351f2ef17210e73 (diff)
downloadopie-b934e2eeea5fb58fa637a02985f8c805f632cb39.zip
opie-b934e2eeea5fb58fa637a02985f8c805f632cb39.tar.gz
opie-b934e2eeea5fb58fa637a02985f8c805f632cb39.tar.bz2
small icon size is 14 for > 200 pixel width and font 18 for > 600
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--library/qpeapplication.cpp26
1 files changed, 13 insertions, 13 deletions
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp
index ac7b779..c562f6c 100644
--- a/library/qpeapplication.cpp
+++ b/library/qpeapplication.cpp
@@ -91,11 +91,11 @@
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 )
{
qcopq.setAutoDelete( TRUE );
@@ -515,15 +515,15 @@ QPEApplication::QPEApplication( int & argc, char **argv, Type t )
AppLnk::setSmallIconSize( 10 );
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 );
}
@@ -813,32 +813,32 @@ bool QPEApplication::qwsEventFilter( QWSEvent * e )
QWidget * active = activeWindow ( );
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,
QString ( ch ),
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
QCopEnvelope e ( "QPE/Launcher", "deviceButton(int,int,int)" );
e << int( ke-> simpleData.keycode ) << int( ke-> simpleData. is_press ) << int( ke-> simpleData.is_auto_repeat );
}
}
return true;
- }
+ }
}
if ( e->type == QWSEvent::Focus ) {
QWSFocusEvent * fe = ( QWSFocusEvent* ) e;
if ( !fe->simpleData.get_focus ) {
@@ -1046,11 +1046,11 @@ void QPEApplication::systemMessage( const QCString& msg, const QByteArray& data
applyStyle();
}
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() );