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

List:       kde-commits
Subject:    branches/work/kde4-systray-rewrite/kdelibs/kdeui
From:       Stephan Kulow <coolo () kde ! org>
Date:       2006-07-14 8:42:14
Message-ID: 1152866534.717583.16035.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 562179 by coolo:

commit Aaron's patch (with small changes of mine I might reconsider)


 M  +2 -2      CMakeLists.txt  
 D             ksystemtray.cpp  
 D             ksystemtray.h  
 M  +1 -2      tests/ksystemtraytest.cpp  
 A             widgets/ksystemtray.cpp   \
trunk/KDE/kdelibs/kdeui/widgets/ksystemtray.cpp#560488 [License: LGPL (v2+)]  A       \
widgets/ksystemtray.h   trunk/KDE/kdelibs/kdeui/widgets/ksystemtray.h#560488 \
[License: LGPL (v2)]


--- branches/work/kde4-systray-rewrite/kdelibs/kdeui/CMakeLists.txt #562178:562179
@@ -52,7 +52,6 @@
  kmainwindow.cpp
  kseparator.cpp
  krestrictedline.cpp
- ksystemtray.cpp
  keditcl1.cpp
  keditcl2.cpp
  kshortcutdialog.cpp
@@ -151,6 +150,7 @@
  widgets/kpushbutton.cpp
  widgets/kselector.cpp
  widgets/ksqueezedtextlabel.cpp
+ widgets/ksystemtray.cpp
  widgets/ktabbar.cpp
  widgets/ktabwidget.cpp
  widgets/ktextedit.cpp
@@ -207,7 +207,6 @@
  knotificationrestrictions.h
  kseparator.h
  krestrictedline.h
- ksystemtray.h
  keditcl.h
  kkeydialog.h
  kurllabel.h
@@ -281,6 +280,7 @@
  kcompletion.h
  kmessageboxmessagehandler.h
  kpassivepopupmessagehandler.h
+ widgets/ksystemtray.h
  DESTINATION ${INCLUDE_INSTALL_DIR})
 
 QT4_GENERATE_MOC(liveui/kliveui.cpp ${CMAKE_CURRENT_BINARY_DIR}/kliveui.moc)
--- branches/work/kde4-systray-rewrite/kdelibs/kdeui/tests/ksystemtraytest.cpp \
#562178:562179 @@ -10,8 +10,7 @@
 	KCmdLineArgs::init(argc, argv, &aboutData);
         KApplication app;
 	QLabel *l = new QLabel("System Tray Main Window", 0L);
-	KSystemTray *tray = new KSystemTray( l );
-	tray->setText("Test");
+	KSystemTray *tray = new KSystemTray( "test", l );
 	l->show();
 	tray->show();
 


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