(cherry picked from commit 9b60260916)
v3.5.13-sru
Timothy Pearson 13 years ago committed by Slávek Banko
parent 7b8c23b930
commit d1e7b687e1

@ -21,6 +21,8 @@ include_directories(
link_directories( link_directories(
${TQT_LIBRARY_DIRS} ${TQT_LIBRARY_DIRS}
${CMAKE_BINARY_DIR}/kbfxlib/common
${CMAKE_BINARY_DIR}/kbfxlib/data
) )
@ -34,12 +36,12 @@ set( ${target}_SRCS
kbfxplasmacanvasitemwrapper.cpp kbfxplasmacanvasstack.cpp kbfxplasmacanvasview.cpp kbfxplasmacanvasitemwrapper.cpp kbfxplasmacanvasstack.cpp kbfxplasmacanvasview.cpp
kbfxplasmaindexitem.cpp kbfxplasmaindexview.cpp kbfxspinx.cpp kbfxspinxmenu.cpp kbfxplasmaindexitem.cpp kbfxplasmaindexview.cpp kbfxspinx.cpp kbfxspinxmenu.cpp
kbfxspinxpopup.cpp kbfxspinxscrollbar.cpp kbfxspinxtoolbar.cpp kbfxspinxtoolbutton.cpp kbfxspinxpopup.cpp kbfxspinxscrollbar.cpp kbfxspinxtoolbar.cpp kbfxspinxtoolbutton.cpp
kbfxspinxtop.cpp kbfxspinxview.cpp kbfxtooltip.cpp kbfxspinxtop.cpp kbfxspinxview.cpp kbfxtooltip.cpp kbfxspinx.skel
) )
tde_add_kpart( ${target} AUTOMOC tde_add_kpart( ${target} AUTOMOC
SOURCES ${${target}_SRCS} SOURCES ${${target}_SRCS}
LINK kdecore-shared kdeui-shared kbfxspinx kbfxdata kbfxcommon LINK kdecore-shared kdeui-shared kio-shared kbfxcommon kbfxdata
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -169,7 +169,7 @@ KbfxPlasmaCanvasItem::setSource ( KbfxDataSource src )
else else
{ {
setLabelText ( src.name() ); setLabelText ( src.name() );
setName ( src.name() ); setName ( src.name().ascii() );
setComment ( src.comment() ); setComment ( src.comment() );
setIconPath ( src.icon() ); setIconPath ( src.icon() );

@ -245,8 +245,10 @@ KbfxPlasmaCanvasView::startDrag ()
qDebug ( "null source" ); qDebug ( "null source" );
return; return;
} }
TQStrList uriList;
uriList.append(src->contentPath().ascii());
TQUriDrag *drag = TQUriDrag *drag =
new TQUriDrag ( TQStrList ( src->contentPath () ), this, new TQUriDrag ( uriList, this,
src->name ().ascii () ); src->name ().ascii () );
drag->setFileNames ( TQStringList ( src->contentPath () ) ); drag->setFileNames ( TQStringList ( src->contentPath () ) );
drag->setPixmap ( m_currentItem->dragPixmap () ); drag->setPixmap ( m_currentItem->dragPixmap () );

@ -228,7 +228,7 @@ KbfxPlasmaIndexView::loadList ( KbfxDataStack * stkPtr )
item->setType ( KbfxPlasmaCanvasItem::INDEX ); item->setType ( KbfxPlasmaCanvasItem::INDEX );
item->setText ( it.data ().name ); item->setText ( it.data ().name );
item->setName ( it.data ().name ); item->setName ( it.data ().name.ascii() );
item->setLabelText ( it.data ().name ); item->setLabelText ( it.data ().name );
item->setIcon ( it.data ().icon ); item->setIcon ( it.data ().icon );
item->setId ( it.key () ); item->setId ( it.key () );

Loading…
Cancel
Save