"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "src/DirList.cpp" between
xfe-1.42.tar.gz and xfe-1.43.tar.gz

About: Xfe (X File Explorer) is a file manager and browser (using the FOX toolkit).

DirList.cpp  (xfe-1.42):DirList.cpp  (xfe-1.43)
skipping to change at line 537 skipping to change at line 537
// Set open up timer // Set open up timer
getApp()->addTimeout(this, ID_EXPAND_TIMER, EXPAND_INTERVAL); getApp()->addTimeout(this, ID_EXPAND_TIMER, EXPAND_INTERVAL);
// Set icon to open folder icon // Set icon to open folder icon
setItemOpenIcon(item, minifolderopenicon); setItemOpenIcon(item, minifolderopenicon);
// See if this is writable // See if this is writable
if (::isWritable(dropdirectory)) if (::isWritable(dropdirectory))
{ {
item->setSelected(TRUE);
acceptDrop(DRAG_ACCEPT); acceptDrop(DRAG_ACCEPT);
int x, y; int x, y;
FXuint state; FXuint state;
getCursorPosition(x, y, state); getCursorPosition(x, y, state);
TreeItem* item = (TreeItem*)getItemAt(x, y); TreeItem* item = (TreeItem*)getItemAt(x, y);
if (prevSelItem && (prevSelItem != item)) if (prevSelItem && (prevSelItem != item))
{ {
if (!isItemCurrent(prevSelItem)) if (!isItemCurrent(prevSelItem))
{ {
closeItem(prevSelItem); closeItem(prevSelItem);
prevSelItem->setSelected(FALSE);
} }
prevSelItem = NULL; prevSelItem = NULL;
} }
if (item && (prevSelItem != item)) if (item && (prevSelItem != item))
{ {
openItem(item); openItem(item);
prevSelItem = item; prevSelItem = item;
} }
} }
} }
skipping to change at line 634 skipping to change at line 636
if (event->state&SHIFTMASK) if (event->state&SHIFTMASK)
{ {
ctrlshiftkey = true; ctrlshiftkey = true;
} }
} }
// Get DND data // Get DND data
// This is done before displaying the popup menu to fix a drag and drop prob lem with konqueror and dolphin file managers // This is done before displaying the popup menu to fix a drag and drop prob lem with konqueror and dolphin file managers
FXbool dnd = getDNDData(FROM_DRAGNDROP, urilistType, data, len); FXbool dnd = getDNDData(FROM_DRAGNDROP, urilistType, data, len);
int xx, yy;
DirItem* item=NULL;
// Display the dnd dialog if the control or shift key were not pressed // Display the dnd dialog if the control or shift key were not pressed
if (confirm_dnd & !ctrlshiftkey) if (confirm_dnd & !ctrlshiftkey)
{ {
// Get item
FXuint state;
getCursorPosition(xx, yy, state);
item = (DirItem*)getItemAt(xx, yy);
// Display a popup to select the drag type // Display a popup to select the drag type
dropaction = DRAG_REJECT; dropaction = DRAG_REJECT;
FXMenuPane menu(this); FXMenuPane menu(this);
int x, y; int x, y;
FXuint state;
getRoot()->getCursorPosition(x, y, state); getRoot()->getCursorPosition(x, y, state);
new FXMenuCommand(&menu, _("Copy here"), copy_clpicon, this, DirList::ID _DRAG_COPY); new FXMenuCommand(&menu, _("Copy here"), copy_clpicon, this, DirList::ID _DRAG_COPY);
new FXMenuCommand(&menu, _("Move here"), moveiticon, this, DirList::ID_D RAG_MOVE); new FXMenuCommand(&menu, _("Move here"), moveiticon, this, DirList::ID_D RAG_MOVE);
new FXMenuCommand(&menu, _("Link here"), minilinkicon, this, DirList::ID _DRAG_LINK); new FXMenuCommand(&menu, _("Link here"), minilinkicon, this, DirList::ID _DRAG_LINK);
new FXMenuSeparator(&menu); new FXMenuSeparator(&menu);
new FXMenuCommand(&menu, _("Cancel"), NULL, this, DirList::ID_DRAG_REJEC T); new FXMenuCommand(&menu, _("Cancel"), NULL, this, DirList::ID_DRAG_REJEC T);
menu.create(); menu.create();
allowPopupScroll = true; // Allow keyboard scrolling allowPopupScroll = true; // Allow keyboard scrolling
menu.popup(NULL, x, y); menu.popup(NULL, x, y);
getApp()->runModalWhileShown(&menu); getApp()->runModalWhileShown(&menu);
skipping to change at line 701 skipping to change at line 710
else if (dropaction == DRAG_MOVE) else if (dropaction == DRAG_MOVE)
{ {
f = new File(this, _("File move"), MOVE, num); f = new File(this, _("File move"), MOVE, num);
} }
else if (dropaction == DRAG_LINK) else if (dropaction == DRAG_LINK)
{ {
f = new File(this, _("File symlink"), SYMLINK, num); f = new File(this, _("File symlink"), SYMLINK, num);
} }
else else
{ {
// Deselect item
if (item)
{
item->setSelected(FALSE);
}
FXFREE(&data); FXFREE(&data);
return(0); return(0);
} }
// Target directory // Target directory
FXString targetdir = dropdirectory; FXString targetdir = dropdirectory;
while (*p) while (*p)
{ {
while (*q && *q != '\r') while (*q && *q != '\r')
skipping to change at line 960 skipping to change at line 974
dragfiles = FXString::null; dragfiles = FXString::null;
item = (TreeItem*)firstitem; item = (TreeItem*)firstitem;
while (item) while (item)
{ {
if (item->isSelected()) if (item->isSelected())
{ {
if (!dragfiles.empty()) if (!dragfiles.empty())
{ {
dragfiles += "\r\n"; dragfiles += "\r\n";
} }
dragfiles += ::fileToURI(getItemPathname(item)); dragfiles += FXURL::encode(::fileToURI(getItemPathname(item)));
} }
if (item->first) if (item->first)
{ {
item = (TreeItem*)item->first; item = (TreeItem*)item->first;
} }
else else
{ {
while (!item->next && item->parent) while (!item->next && item->parent)
{ {
item = (TreeItem*)item->parent; item = (TreeItem*)item->parent;
 End of changes. 7 change blocks. 
2 lines changed or deleted 16 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)