summaryrefslogtreecommitdiffstats
path: root/kicker
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-09-15 21:18:46 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-09-15 21:18:46 +0000
commit3b07f92513f03772805943cf9ee77921f7c8aafe (patch)
tree40551727899bcf4d1f717058fb2f2ab2dbfc70b2 /kicker
parent6eb49d190a25e04bc155976a73cb047c7d5473a3 (diff)
downloadtdebase-3b07f92513f03772805943cf9ee77921f7c8aafe.tar.gz
tdebase-3b07f92513f03772805943cf9ee77921f7c8aafe.zip
Part 2/2 of prior commit
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1175772 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kicker')
-rw-r--r--kicker/kicker/core/containerarea.cpp29
1 files changed, 18 insertions, 11 deletions
diff --git a/kicker/kicker/core/containerarea.cpp b/kicker/kicker/core/containerarea.cpp
index 1bd80bc65..889c48ce8 100644
--- a/kicker/kicker/core/containerarea.cpp
+++ b/kicker/kicker/core/containerarea.cpp
@@ -93,9 +93,9 @@ ContainerArea::ContainerArea(KConfig* _c,
setBackgroundOrigin( WidgetOrigin );
m_contents = viewport();
-
+
m_layout = new ContainerAreaLayout(m_contents);
-
+
// Install an event filter to propagate layout hints coming from m_contents.
m_contents->installEventFilter(this);
@@ -404,14 +404,14 @@ void ContainerArea::removeAllContainers()
void ContainerArea::configure()
{
setBackground();
-
+
for (BaseContainer::Iterator it = m_containers.begin();
it != m_containers.end();
++it)
{
(*it)->configure();
}
-
+
resizeContents();
}
@@ -1277,12 +1277,12 @@ void ContainerArea::dropEvent(TQDropEvent *ev)
}
a = new ServiceMenuButtonContainer(relPath, m_opMenu, m_contents);
}
- else if (url.isLocalFile())
+ else if (url.isLocalFile())
{
TQFileInfo fi(url.path());
- if (fi.isDir())
+ if (fi.isDir())
{ // directory
- switch (PanelDirDropMenu().exec(mapToGlobal(ev->pos())))
+ switch (PanelDirDropMenu().exec(mapToGlobal(ev->pos())))
{
case PanelDirDropMenu::Browser:
a = new BrowserButtonContainer(url.path(), m_opMenu,
@@ -1294,7 +1294,14 @@ void ContainerArea::dropEvent(TQDropEvent *ev)
default: ;
}
}
- else if ( KMimeType::findByURL(url)->name() == "application/x-desktop" )
+ TQString foundMimeName = KMimeType::findByURL(url)->name();
+ else if ( (foundMimeName == "application/x-desktop")
+ || (foundMimeName == "media/builtin-mydocuments")
+ || (foundMimeName == "media/builtin-mycomputer")
+ || (foundMimeName == "media/builtin-mynetworkplaces")
+ || (foundMimeName == "media/builtin-printers")
+ || (foundMimeName == "media/builtin-trash")
+ || (foundMimeName == "media/builtin-webbrowser") )
{
// a local desktop file being dragged from an external program.
// Make a copy first.
@@ -1675,7 +1682,7 @@ void ContainerArea::setPosition(KPanelExtension::Position p)
resizeContents(width(), 0);
}
}
-
+
for (BaseContainer::ConstIterator it = m_containers.constBegin();
it != m_containers.constEnd();
++it)
@@ -1689,7 +1696,7 @@ void ContainerArea::setPosition(KPanelExtension::Position p)
}
m_layout->setEnabled(true);
-
+
setContentsPos(0, 0);
m_contents->move(0, 0);
setBackground();
@@ -1918,7 +1925,7 @@ int ContainerArea::heightForWidth(int w) const
DragIndicator::DragIndicator(TQWidget* parent, const char* name)
- : TQWidget(parent, name)
+ : TQWidget(parent, name)
{
setBackgroundOrigin(AncestorOrigin);
}