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

List:       kde-commits
Subject:    KDE/kdebase/workspace/systemsettings
From:       Ben Cooksley <sourtooth () gmail ! com>
Date:       2009-11-07 2:51:48
Message-ID: 1257562308.957994.26274.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1045999 by bcooksley:

Update Dolphin tooltips copy in System Settings.
Move tooltips to application component and remove tooltips from core library.
Port to QWidget based tooltips from QPainter based tooltips.
CCMAIL: peter.penz@gmx.at

 M  +5 -0      app/CMakeLists.txt  
 M  +1 -1      app/SettingsBase.h  
 A             app/ToolTips (directory)  
 A             app/ToolTips/ktooltip.cpp   core/ToolTips/KToolTipManager.cpp#1042976 \
[License: GPL (v2+)]  A             app/ToolTips/ktooltip.h   \
core/ToolTips/KTipLabel.h#1042976 [License: GPL (v2+)]  A             \
app/ToolTips/ktooltipwindow.cpp   [License: GPL (v2+)]  A             \
app/ToolTips/ktooltipwindow_p.h   core/ToolTips/KStyleOptionToolTip.h#1042976 \
[License: GPL (v2+)]  A             app/ToolTips/tooltipmanager.cpp   \
core/ToolTipManager.cpp#1042976 [License: GPL (v2+)]  A             \
app/ToolTips/tooltipmanager.h   core/ToolTipManager.h#1042976 [License: GPL (v2+)]  M \
+2 -11     core/CMakeLists.txt    D             core/ToolTipManager.cpp  
 D             core/ToolTipManager.h  
 D             core/ToolTips/KFormattedBalloonTipDelegate.cpp  
 D             core/ToolTips/KFormattedBalloonTipDelegate.h  
 D             core/ToolTips/KStyleOptionToolTip.cpp  
 D             core/ToolTips/KStyleOptionToolTip.h  
 D             core/ToolTips/KTipLabel.cpp  
 D             core/ToolTips/KTipLabel.h  
 D             core/ToolTips/KToolTip.cpp  
 D             core/ToolTips/KToolTip.h  
 D             core/ToolTips/KToolTipDelegate.cpp  
 D             core/ToolTips/KToolTipDelegate.h  
 D             core/ToolTips/KToolTipItem.cpp  
 D             core/ToolTips/KToolTipItem.h  
 D             core/ToolTips/KToolTipManager.cpp  
 D             core/ToolTips/KToolTipManager.h  
 D             core/ToolTips/SystemSettingsBalloonToolTipDelegate.cpp  
 D             core/ToolTips/SystemSettingsBalloonToolTipDelegate.h  
 D             core/ToolTips/SystemSettingsToolTipItem.cpp  
 D             core/ToolTips/SystemSettingsToolTipItem.h  


--- trunk/KDE/kdebase/workspace/systemsettings/app/CMakeLists.txt #1045998:1045999
@@ -1,6 +1,11 @@
+include_directories( ToolTips )
+
 SET( systemsettings_SRCS
      SystemSettingsApp.cpp
      SettingsBase.cpp
+     ToolTips/ktooltip.cpp
+     ToolTips/ktooltipwindow.cpp
+     ToolTips/tooltipmanager.cpp
      main.cpp )
 
 KDE4_ADD_APP_ICON( systemsettings_SRCS \
                "${KDE4_ICON_INSTALL_DIR}/oxygen/*/categories/preferences-system.png" \
                )
--- trunk/KDE/kdebase/workspace/systemsettings/app/SettingsBase.h #1045998:1045999
@@ -22,7 +22,7 @@
 
 #include "MenuItem.h"
 #include "BaseMode.h"
-#include "ToolTipManager.h"
+#include "tooltipmanager.h"
 #include "ui_configDialog.h"
 
 #include <QMap>
--- trunk/KDE/kdebase/workspace/systemsettings/core/CMakeLists.txt #1045998:1045999
@@ -7,16 +7,6 @@
     ModuleView.cpp
     BaseData.cpp
     BaseMode.cpp
-    ToolTips/SystemSettingsBalloonToolTipDelegate.cpp
-    ToolTips/KFormattedBalloonTipDelegate.cpp
-    ToolTips/SystemSettingsToolTipItem.cpp
-    ToolTips/KStyleOptionToolTip.cpp
-    ToolTips/KTipLabel.cpp
-    ToolTips/KToolTip.cpp
-    ToolTips/KToolTipDelegate.cpp
-    ToolTips/KToolTipItem.cpp
-    ToolTips/KToolTipManager.cpp
-    ToolTipManager.cpp
     ExternalAppModule.cpp
 )
 
@@ -30,13 +20,14 @@
     BaseData.h
     BaseMode.h
     ModuleView.h
-    ToolTipManager.h
 )
 
 kde4_add_library( systemsettingsview SHARED ${systemsettingsview_LIB_SRCS} )
 
 target_link_libraries( systemsettingsview ${KDE4_KDECORE_LIBS} ${KDE4_KUTILS_LIBS} )
 
+set_target_properties( systemsettingsview PROPERTIES SOVERSION 1 )
+
 install( TARGETS systemsettingsview  ${INSTALL_TARGETS_DEFAULT_ARGS} )
 install( FILES ${systemsettingsview_LIB_HDRS} DESTINATION \
${INCLUDE_INSTALL_DIR}/systemsettingsview COMPONENT Devel )  INSTALL( FILES \
systemsettingsview.desktop systemsettingsexternalapp.desktop DESTINATION \
${SERVICETYPES_INSTALL_DIR} )


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