| author | sandman <sandman> | 2002-10-31 03:12:25 (UTC) |
|---|---|---|
| committer | sandman <sandman> | 2002-10-31 03:12:25 (UTC) |
| commit | 702ab550d1f6b06e779935457e5e25748c8e6fc3 (patch) (side-by-side diff) | |
| tree | 852cc6e93f2f0e7c7293e1faab09ab19c17d9c0a | |
| parent | d4c2baf3d4998001462ac1be04523b216da02500 (diff) | |
| download | opie-702ab550d1f6b06e779935457e5e25748c8e6fc3.zip opie-702ab550d1f6b06e779935457e5e25748c8e6fc3.tar.gz opie-702ab550d1f6b06e779935457e5e25748c8e6fc3.tar.bz2 | |
launcher side enhancements to support the "use global font" option from
launcher-settings
| -rw-r--r-- | core/launcher/launcher.cpp | 3 | ||||
| -rw-r--r-- | core/launcher/launcherview.cpp | 5 | ||||
| -rw-r--r-- | core/launcher/launcherview.h | 1 |
3 files changed, 9 insertions, 0 deletions
diff --git a/core/launcher/launcher.cpp b/core/launcher/launcher.cpp index 5a9ee1b..767efb2 100644 --- a/core/launcher/launcher.cpp +++ b/core/launcher/launcher.cpp @@ -1173,3 +1173,6 @@ void Launcher::launcherMessage( const QCString &msg, const QByteArray &data) if ( tabs->view(id) ) + if ( !fam. isEmpty ( )) tabs->view(id)->setViewFont( QFont(fam, size, weight, italic!=0) ); + else + tabs->view(id)->unsetViewFont(); qDebug( "setFont: %s, %d, %d, %d", fam.latin1(), size, weight, italic ); diff --git a/core/launcher/launcherview.cpp b/core/launcher/launcherview.cpp index 9fc4565..2a051a6 100644 --- a/core/launcher/launcherview.cpp +++ b/core/launcher/launcherview.cpp @@ -852,2 +852,7 @@ void LauncherView::setViewFont( const QFont &f ) +void LauncherView::unsetViewFont( ) +{ + icons->unsetFont( ); +} + void LauncherView::resizeEvent(QResizeEvent *e) diff --git a/core/launcher/launcherview.h b/core/launcher/launcherview.h index 194e4a2..82a319b 100644 --- a/core/launcher/launcherview.h +++ b/core/launcher/launcherview.h @@ -66,2 +66,3 @@ public: void setViewFont( const QFont & ); + void unsetViewFont ( ); |