summaryrefslogtreecommitdiff
authorsandman <sandman>2002-10-31 03:12:25 (UTC)
committer sandman <sandman>2002-10-31 03:12:25 (UTC)
commit702ab550d1f6b06e779935457e5e25748c8e6fc3 (patch) (side-by-side diff)
tree852cc6e93f2f0e7c7293e1faab09ab19c17d9c0a
parentd4c2baf3d4998001462ac1be04523b216da02500 (diff)
downloadopie-702ab550d1f6b06e779935457e5e25748c8e6fc3.zip
opie-702ab550d1f6b06e779935457e5e25748c8e6fc3.tar.gz
opie-702ab550d1f6b06e779935457e5e25748c8e6fc3.tar.bz2
launcher side enhancements to support the "use global font" option from
launcher-settings
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/launcher.cpp5
-rw-r--r--core/launcher/launcherview.cpp5
-rw-r--r--core/launcher/launcherview.h1
3 files changed, 10 insertions, 1 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
@@ -1170,9 +1170,12 @@ void Launcher::launcherMessage( const QCString &msg, const QByteArray &data)
stream >> weight;
int italic;
stream >> italic;
if ( tabs->view(id) )
- tabs->view(id)->setViewFont( QFont(fam, size, weight, italic!=0) );
+ 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 );
}
else if ( msg == "setBusyIndicatorType(QString)" ) {
QString type;
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
@@ -849,8 +849,13 @@ void LauncherView::setViewFont( const QFont &f )
{
icons->setFont( f );
}
+void LauncherView::unsetViewFont( )
+{
+ icons->unsetFont( );
+}
+
void LauncherView::resizeEvent(QResizeEvent *e)
{
QVBox::resizeEvent( e );
if ( e->size().width() != e->oldSize().width() )
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
@@ -63,8 +63,9 @@ public:
void setTextColor( const QColor & );
QColor textColor() const { return textCol; }
void setViewFont( const QFont & );
+ void unsetViewFont ( );
void setBusyIndicatorType ( const QString &type );
public slots: