--- kdebase-3.5.5/kicker/kicker/core/default-apps~ 2005-11-19 14:00:21 +0300 +++ kdebase-3.5.5/kicker/kicker/core/default-apps 2006-11-20 19:56:29 +0300 @@ -1,2 +1,4 @@ -Home.desktop -Internet/konqbrowser.desktop +kde-konqbrowser.desktop +kde-Kontact.desktop +oowriter.desktop +oocalc.desktop --- kdebase-3.5.8/kicker/kicker/core/containerarea.cpp~ 2007-11-19 17:55:11 +0300 +++ kdebase-3.5.8/kicker/kicker/core/containerarea.cpp 2007-11-19 19:21:35 +0300 @@ -147,6 +147,7 @@ void ContainerArea::defaultContainerConf containers.append(new KMenuButtonContainer(m_opMenu, m_contents)); +#if 0 int dsize; if (orientation() == Qt::Horizontal) { @@ -210,11 +211,34 @@ void ContainerArea::defaultContainerConf delete button; } } +#endif + + // system menu + BaseContainer *b = new ExtensionButtonContainer("systemmenu.desktop", m_opMenu, m_contents); + if(b) + { + containers.append(b); + } + + // desktop button + containers.append(new DesktopButtonContainer(m_opMenu, m_contents)); PluginManager* manager = PluginManager::the(); + // quicklauncher applet + AppletContainer* a = manager->createAppletContainer( + "quicklauncher.desktop", + true, + QString::null, + m_opMenu, + m_contents); + if (a) + { + containers.append(a); + } + // pager applet - AppletContainer* a = manager->createAppletContainer( + a = manager->createAppletContainer( "minipagerapplet.desktop", true, QString::null, @@ -222,7 +246,6 @@ void ContainerArea::defaultContainerConf m_contents); if (a) { - a->setFreeSpace(0.09); containers.append(a); } @@ -235,7 +258,19 @@ void ContainerArea::defaultContainerConf m_contents); if (a) { - a->setFreeSpace(0.09); + containers.append(a); + } + + // storage media applet + a = manager->createAppletContainer( + "mediaapplet.desktop", + true, + QString::null, + m_opMenu, + m_contents); + if (a) + { + a->setFreeSpace(1); containers.append(a); } @@ -265,6 +300,19 @@ void ContainerArea::defaultContainerConf containers.append(a); } + // trash applet + a = manager->createAppletContainer( + "trashapplet.desktop", + true, + QString::null, + m_opMenu, + m_contents ); + if (a) + { + a->setFreeSpace(1); + containers.append(a); + } + for (BaseContainer::Iterator it = containers.begin(); it != containers.end(); ++it)