KDE/kdebase/workspace/plasma
Marco Martin
notmart at gmail.com
Mon Sep 14 23:21:13 CEST 2009
On Monday 14 September 2009, Marco Martin wrote:
> SVN commit 1023511 by mart:
>
> move stuff around:
> all containments,applets etc are in the subdirectory of their topic:
> that is
> generic: stuff that is condivided among different shells
> desktop: desktop shell specific
> netbook: shell, containments, applets and dataengines used for the
> netbook shell
> screensaver: the shell and containment of the screensaver overlay
> CCMAIL:plasma-devel at kde.org
let me know if there are problems, here builds i hope having done svn add to
everything is needed :)
move of stuff was pretty arbitrary, individual components can still be moved
around, esp individual applets (atm kickoff,pager,tasks and trash are in
desktop, all others in generic)
also, in moving i noticed the screensaver shell still tried to include and use
appletbrowser.h, i really wonder why it was still building. now those parts
are just commented out but a port is badly needed.
>
> M +4 -9 CMakeLists.txt
> D animators (directory)
> D applets (directory)
> D containmentactions (directory)
> D containments (directory)
> D dataengines (directory)
> A desktop (directory)
> A desktop/CMakeLists.txt
> AM desktop/containments (directory) containments#1023065
> M +0 -1 desktop/containments/CMakeLists.txt
> D desktop/containments/screensaver (directory)
> A desktop/shells (directory)
> A desktop/shells/CMakeLists.txt
> A desktop/shells/desktop (directory) shells/desktop#1023065
> A desktop/shells/desktop/CMakeLists.txt
> shells/desktop/CMakeLists.txt#1023440 M +1 -1
> desktop/shells/desktop/interactiveconsole.cpp
> A desktop/shells/desktop/plasmaapp.cpp
> shells/desktop/plasmaapp.cpp#1023450 [License: LGPL (v2+)] A
> generic (directory)
> A generic/CMakeLists.txt
> AM generic/animators (directory) animators#1023065
> AM generic/applets (directory) applets#1023065
> AM generic/containmentactions (directory)
> containmentactions#1023065 AM generic/dataengines (directory)
> dataengines#1023065 AM generic/runners (directory)
> runners#1023065
> AM generic/scriptengines (directory) scriptengines#1023065
> A generic/shells (directory)
> A generic/shells/CMakeLists.txt
> A generic/shells/plasmoidviewer (directory)
> shells/plasmoidviewer#1023065 AM generic/wallpapers (directory)
> wallpapers#1023065 D runners (directory)
> A screensaver (directory)
> A screensaver/CMakeLists.txt
> A screensaver/containments (directory)
> A screensaver/containments/CMakeLists.txt
> A screensaver/containments/screensaver (directory)
> containments/screensaver#1023065 A screensaver/shells
> (directory)
> A screensaver/shells/CMakeLists.txt
> A screensaver/shells/screensaver (directory)
> shells/screensaver#1023065 M +10 -20
> screensaver/shells/screensaver/CMakeLists.txt
> M +1 -1 screensaver/shells/screensaver/backgrounddialog.cpp
> M +13 -8 screensaver/shells/screensaver/saverview.cpp
> M +1 -2 screensaver/shells/screensaver/saverview.h
> D scriptengines (directory)
> D shells/desktop (directory)
> D shells/plasmoidviewer (directory)
> D shells/screensaver (directory)
> D wallpapers (directory)
>
>
> --- trunk/KDE/kdebase/workspace/plasma/CMakeLists.txt #1023510:1023511
> @@ -1,13 +1,8 @@
> add_definitions(-DKDE_DEFAULT_DEBUG_AREA=1204)
>
> -add_subdirectory(animators)
> -add_subdirectory(applets)
> -add_subdirectory(containments)
> -add_subdirectory(containmentactions)
> -add_subdirectory(dataengines)
> +add_subdirectory(desktop)
> +add_subdirectory(generic)
> add_subdirectory(netbook)
> -add_subdirectory(runners)
> -add_subdirectory(scriptengines)
> -add_subdirectory(shells)
> +add_subdirectory(screensaver)
> add_subdirectory(tools)
> -add_subdirectory(wallpapers)
> +
> ** trunk/KDE/kdebase/workspace/plasma/desktop/containments #property
> svn:mergeinfo +
> --- trunk/KDE/kdebase/workspace/plasma/desktop/containments/CMakeLists.txt
> #1023065:1023511 @@ -1,3 +1,2 @@
> add_subdirectory(desktop)
> add_subdirectory(panel)
> -add_subdirectory(screensaver)
> ---
> trunk/KDE/kdebase/workspace/plasma/desktop/shells/desktop/interactiveconsol
>e.cpp #1023065:1023511 @@ -41,7 +41,7 @@
>
> #include <Plasma/Corona>
>
> -#include "scriptengine.h"
> +#include "scripting/scriptengine.h"
>
> //TODO:
> // use text editor KPart for syntax highlighting?
> ** trunk/KDE/kdebase/workspace/plasma/generic/animators #property
> svn:mergeinfo +
> ** trunk/KDE/kdebase/workspace/plasma/generic/applets #property
> svn:mergeinfo +
> ** trunk/KDE/kdebase/workspace/plasma/generic/containmentactions #property
> svn:mergeinfo +
> ** trunk/KDE/kdebase/workspace/plasma/generic/dataengines #property
> svn:mergeinfo +
> ** trunk/KDE/kdebase/workspace/plasma/generic/runners #property
> svn:mergeinfo +
> ** trunk/KDE/kdebase/workspace/plasma/generic/scriptengines #property
> svn:mergeinfo +
> ** trunk/KDE/kdebase/workspace/plasma/generic/wallpapers #property
> svn:mergeinfo +
> ---
> trunk/KDE/kdebase/workspace/plasma/screensaver/shells/screensaver/CMakeList
>s.txt #1023065:1023511 @@ -1,26 +1,17 @@
> include_directories(${KDEBASE_WORKSPACE_SOURCE_DIR}/libs
> ${KDEBASE_WORKSPACE_SOURCE_DIR}/plasma/shells/common)
>
> set(appletbrowserdialog_SRCS
> - ../common/widgetsExplorer/kcategorizeditemsviewmodels.cpp
> - ../common/widgetsExplorer/plasmaappletitemmodel.cpp
> - ../common/widgetsExplorer/appleticon.cpp
> - ../common/widgetsExplorer/appletsfiltering.cpp
> - ../common/widgetsExplorer/applettooltip.cpp
> - ../common/widgetsExplorer/appletslist.cpp
> - ../common/widgetsExplorer/managewidgets.cpp
> - ../common/widgetsExplorer/widgetexplorer.cpp
> - ../common/widgetsExplorer/openwidgetassistant.cpp
> + ../../../shells/common/widgetsExplorer/kcategorizeditemsviewmodels.cpp
> + ../../../shells/common/widgetsExplorer/plasmaappletitemmodel.cpp
> + ../../../shells/common/widgetsExplorer/appleticon.cpp
> + ../../../shells/common/widgetsExplorer/appletsfiltering.cpp
> + ../../../shells/common/widgetsExplorer/applettooltip.cpp
> + ../../../shells/common/widgetsExplorer/appletslist.cpp
> + ../../../shells/common/widgetsExplorer/managewidgets.cpp
> + ../../../shells/common/widgetsExplorer/widgetexplorer.cpp
> + ../../../shells/common/widgetsExplorer/openwidgetassistant.cpp
> )
>
> -set(wallpaper_SRCS
> - ../common/wallpaperpreview.cpp
> -)
> -
> -kde4_add_ui_files (
> - appletbrowserdialog_SRCS
> - ../common/kcategorizeditemsviewbase.ui
> -)
> -
> set(plasma-overlay_SRCS
> backgrounddialog.cpp
> main.cpp
> @@ -28,7 +19,6 @@
> savercorona.cpp
> saverview.cpp
> ${appletbrowserdialog_SRCS}
> - ${wallpaper_SRCS}
> )
>
> kde4_add_ui_files(plasma-overlay_SRCS BackgroundDialog.ui)
> @@ -40,7 +30,7 @@
> kde4_add_executable(plasma-overlay ${plasma-overlay_SRCS})
>
> target_link_libraries(plasma-overlay ${KDE4_PLASMA_LIBS} kworkspace
> ${KDE4_KIO_LIBS} ${KDE4_KFILE_LIBS} -
> ${X11_X11_LIB} )
> + ${X11_X11_LIB} plasmagenericshell)
> if(X11_Xrender_FOUND)
> target_link_libraries(plasma-overlay ${X11_Xrender_LIB})
> endif(X11_Xrender_FOUND)
> ---
> trunk/KDE/kdebase/workspace/plasma/screensaver/shells/screensaver/backgroun
>ddialog.cpp #1023065:1023511 @@ -27,7 +27,7 @@
> //#include <Plasma/Corona>
>
> #include "plasmaapp.h"
> -#include "wallpaperpreview.h"
> +#include "plasmagenericshell/wallpaperpreview.h"
>
> #include "../../../libs/kworkspace/screenpreviewwidget.h"
>
> ---
> trunk/KDE/kdebase/workspace/plasma/screensaver/shells/screensaver/saverview
>.cpp #1023065:1023511 @@ -32,14 +32,13 @@
> #include <Plasma/Containment>
> #include <Plasma/Svg>
>
> -#include "appletbrowser.h"
> +//#include "appletbrowser.h"
> #include "plasmaapp.h"
>
> static const int SUPPRESS_SHOW_TIMEOUT = 500; // Number of millis to
> prevent reshow of dashboard
>
> SaverView::SaverView(Plasma::Containment *containment, QWidget *parent)
>
> : Plasma::View(containment, parent),
>
> - m_appletBrowser(0),
> m_suppressShow(false),
> m_setupMode(false),
> m_init(false)
> @@ -62,7 +61,7 @@
>
> SaverView::~SaverView()
> {
> - delete m_appletBrowser;
> +// delete m_appletBrowser;
> }
>
> void SaverView::enableSetupMode()
> @@ -94,6 +93,7 @@
>
> void SaverView::showAppletBrowser()
> {
> + /*
> if (!m_appletBrowser) {
> m_appletBrowser = new Plasma::AppletBrowser(this,
> Qt::FramelessWindowHint ); m_appletBrowser->setContainment(containment());
> @@ -115,18 +115,21 @@
>
> //TODO give the filter kbd focus
> m_appletBrowser->setHidden(m_appletBrowser->isVisible());
> + */
> }
>
> void SaverView::hideAppletBrowser()
> {
> + /*
> if (m_appletBrowser) {
> m_appletBrowser->hide();
> }
> + */
> }
>
> void SaverView::appletBrowserDestroyed()
> {
> - m_appletBrowser = 0;
> + //m_appletBrowser = 0;
> }
>
> void SaverView::paintEvent(QPaintEvent *event)
> @@ -175,6 +178,7 @@
>
> bool SaverView::eventFilter(QObject *watched, QEvent *event)
> {
> +#if 0
> if (watched != m_appletBrowser) {
> /*if (event->type() == QEvent::MouseButtonPress) {
> QMouseEvent *me = static_cast<QMouseEvent *>(event);
> @@ -218,7 +222,7 @@
> } else if (event->type() == QEvent::MouseButtonRelease) {
> m_appletBrowserDragStart = QPoint();
> }
> -
> +#endif
> return false;
> }
>
> @@ -253,11 +257,11 @@
> disconnect(containment(),
> SIGNAL(showAddWidgetsInterface(QPointF)), this, SLOT(showAppletBrowser()));
> connect(newContainment, SIGNAL(showAddWidgetsInterface(QPointF)), this,
> SLOT(showAppletBrowser())); }
> -
> +/*
> if (m_appletBrowser) {
> m_appletBrowser->setContainment(newContainment);
> }
> -
> +*/
> View::setContainment(newContainment);
> }
>
> @@ -266,9 +270,10 @@
> if (isHidden()) {
> return;
> }
> + /*
> if (m_appletBrowser) {
> m_appletBrowser->hide();
> - }
> + }*/
>
> disconnect(containment(), SIGNAL(showAddWidgetsInterface(QPointF)),
> this, SLOT(showAppletBrowser()));
>
> ---
> trunk/KDE/kdebase/workspace/plasma/screensaver/shells/screensaver/saverview
>.h #1023065:1023511 @@ -27,7 +27,6 @@
>
> namespace Plasma
> {
> - class AppletBrowser;
> class Containment;
> }
>
> @@ -71,7 +70,7 @@
> void suppressShowTimeout();
>
> private:
> - Plasma::AppletBrowser *m_appletBrowser;
> + //Plasma::AppletBrowser *m_appletBrowser;
> QPoint m_appletBrowserDragStart;
> bool m_suppressShow : 1;
> bool m_setupMode : 1;
--
Marco Martin
More information about the Plasma-devel
mailing list