[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    playground/multimedia/kdetv/plugins/osd/elegant
From:       Yannig Perre <yannig.perre () laposte ! net>
Date:       2008-10-16 19:31:23
Message-ID: 1224185483.985967.32497.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 872276 by yannig:

Make OSD elegant compiling.

 M  +5 -1      CMakeLists.txt  
 M  +7 -5      elegant.cpp  
 M  +1 -0      elegant.h  


--- trunk/playground/multimedia/kdetv/plugins/osd/elegant/CMakeLists.txt #872275:872276
@@ -5,7 +5,11 @@
 
 kde4_add_plugin(kdetv_elegant ${kdetv_elegant_PART_SRCS})
 
-target_link_libraries(kdetv_elegant ${KDE4_KDECORE_LIBS})
+target_link_libraries(kdetv_elegant
+    libkdetv
+    ${KDE4_KDECORE_LIBS}
+    ${KDE4_KDE3SUPPORT_LIBS}
+)
 
 install(TARGETS kdetv_elegant DESTINATION ${PLUGIN_INSTALL_DIR})
 
--- trunk/playground/multimedia/kdetv/plugins/osd/elegant/elegant.cpp #872275:872276
@@ -48,11 +48,13 @@
       fontBold(true), fontItalic(false), fontUnderline(false), autoFontSize(false)
 {
     timer = new QTimer( this );
-    popup = new KPopupTitle( p, "display" );
-    popup->hide();
+    // popup = new KPopupTitle( p, "display" );
+    popup = new KMenu( "display", p );
+    popup->hideContextMenu();
 
     // FIXME: Don't use system colors, they may not work or look bad as OSD
-    popup->setPaletteBackgroundColor( QColor( 200, 200, 200 ) );
+    // TODO: Use new KDE OSD
+    // popup->setPaletteBackgroundColor( QColor( 200, 200, 200 ) );
 
     readConfig();
     applySettings();
@@ -141,7 +143,7 @@
 void KdetvElegant::clear()
 {
     static QPixmap kwicon = KIconLoader::global()->loadIcon("kdetv", KIconLoader::NoGroup, iconSize);
-    popup->setTitle(i18n("Elegant OSD"), &kwicon);
+    // FIXME: popup->setTitle(i18n("Elegant OSD"), &kwicon);
 }
 
 void KdetvElegant::showPopup()
@@ -159,7 +161,7 @@
 
 void KdetvElegant::display( const QString &text, const QPixmap &icon )
 {
-    popup->setTitle(text, &icon);
+    // FIXME: popup->setTitle(text, &icon);
     showPopup();
 }
 
--- trunk/playground/multimedia/kdetv/plugins/osd/elegant/elegant.h #872275:872276
@@ -81,6 +81,7 @@
 
 private:
     QWidget *parent;
+    KMenu *popup;
     QTimer *timer;
     ElegantConfigWidget *form;
     int timeout;
[prev in list] [next in list] [prev in thread] [next in thread]