-rw-r--r-- | core/launcher/launcher.cpp | 5 | ||||
-rw-r--r-- | core/launcher/launcherview.cpp | 5 | ||||
-rw-r--r-- | core/launcher/launcherview.h | 1 |
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 | |||
@@ -1166,17 +1166,20 @@ void Launcher::launcherMessage( const QCString &msg, const QByteArray &data) | |||
1166 | stream >> fam; | 1166 | stream >> fam; |
1167 | int size; | 1167 | int size; |
1168 | stream >> size; | 1168 | stream >> size; |
1169 | int weight; | 1169 | int weight; |
1170 | stream >> weight; | 1170 | stream >> weight; |
1171 | int italic; | 1171 | int italic; |
1172 | stream >> italic; | 1172 | stream >> italic; |
1173 | if ( tabs->view(id) ) | 1173 | if ( tabs->view(id) ) |
1174 | tabs->view(id)->setViewFont( QFont(fam, size, weight, italic!=0) ); | 1174 | if ( !fam. isEmpty ( )) |
1175 | tabs->view(id)->setViewFont( QFont(fam, size, weight, italic!=0) ); | ||
1176 | else | ||
1177 | tabs->view(id)->unsetViewFont(); | ||
1175 | qDebug( "setFont: %s, %d, %d, %d", fam.latin1(), size, weight, italic ); | 1178 | qDebug( "setFont: %s, %d, %d, %d", fam.latin1(), size, weight, italic ); |
1176 | } | 1179 | } |
1177 | else if ( msg == "setBusyIndicatorType(QString)" ) { | 1180 | else if ( msg == "setBusyIndicatorType(QString)" ) { |
1178 | QString type; | 1181 | QString type; |
1179 | stream >> type; | 1182 | stream >> type; |
1180 | tabs->setBusyIndicatorType(type); | 1183 | tabs->setBusyIndicatorType(type); |
1181 | } | 1184 | } |
1182 | } | 1185 | } |
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 | |||
@@ -845,16 +845,21 @@ void LauncherView::setTextColor( const QColor &tc ) | |||
845 | icons->viewport()->update(); | 845 | icons->viewport()->update(); |
846 | } | 846 | } |
847 | 847 | ||
848 | void LauncherView::setViewFont( const QFont &f ) | 848 | void LauncherView::setViewFont( const QFont &f ) |
849 | { | 849 | { |
850 | icons->setFont( f ); | 850 | icons->setFont( f ); |
851 | } | 851 | } |
852 | 852 | ||
853 | void LauncherView::unsetViewFont( ) | ||
854 | { | ||
855 | icons->unsetFont( ); | ||
856 | } | ||
857 | |||
853 | void LauncherView::resizeEvent(QResizeEvent *e) | 858 | void LauncherView::resizeEvent(QResizeEvent *e) |
854 | { | 859 | { |
855 | QVBox::resizeEvent( e ); | 860 | QVBox::resizeEvent( e ); |
856 | if ( e->size().width() != e->oldSize().width() ) | 861 | if ( e->size().width() != e->oldSize().width() ) |
857 | sort(); | 862 | sort(); |
858 | } | 863 | } |
859 | 864 | ||
860 | void LauncherView::populate( AppLnkSet *folder, const QString& typefilter ) | 865 | void LauncherView::populate( AppLnkSet *folder, const QString& typefilter ) |
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 | |||
@@ -59,16 +59,17 @@ public: | |||
59 | enum BackgroundType { Ruled, SolidColor, Image }; | 59 | enum BackgroundType { Ruled, SolidColor, Image }; |
60 | void setBackgroundType( BackgroundType t, const QString & ); | 60 | void setBackgroundType( BackgroundType t, const QString & ); |
61 | BackgroundType backgroundType() const { return bgType; } | 61 | BackgroundType backgroundType() const { return bgType; } |
62 | 62 | ||
63 | void setTextColor( const QColor & ); | 63 | void setTextColor( const QColor & ); |
64 | QColor textColor() const { return textCol; } | 64 | QColor textColor() const { return textCol; } |
65 | 65 | ||
66 | void setViewFont( const QFont & ); | 66 | void setViewFont( const QFont & ); |
67 | void unsetViewFont ( ); | ||
67 | 68 | ||
68 | void setBusyIndicatorType ( const QString &type ); | 69 | void setBusyIndicatorType ( const QString &type ); |
69 | 70 | ||
70 | public slots: | 71 | public slots: |
71 | void populate( AppLnkSet *folder, const QString& categoryfilter ); | 72 | void populate( AppLnkSet *folder, const QString& categoryfilter ); |
72 | 73 | ||
73 | signals: | 74 | signals: |
74 | void clicked( const AppLnk * ); | 75 | void clicked( const AppLnk * ); |