"Fossies" - the Fresh Open Source Software Archive  

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

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

File.cpp  (xfe-1.41):File.cpp  (xfe-1.42)
skipping to change at line 503 skipping to change at line 503
datalabel->setText(size); datalabel->setText(size);
} }
// Give cancel button an opportunity to be clicked // Give cancel button an opportunity to be clicked
if (cancelButton) if (cancelButton)
{ {
getApp()->runModalWhileEvents(cancelButton); getApp()->runModalWhileEvents(cancelButton);
} }
// Set labels for progress dialog // Set labels for progress dialog
FXString label = _("Source:")+source; FXString label = _("Source: ")+source;
if (uplabel) if (uplabel)
{ {
uplabel->setText(::truncLine(label, MAX_MESSAGE_LENGTH)); uplabel->setText(::truncLine(label, MAX_MESSAGE_LENGTH));
} }
label = _("Target:")+target; label = _("Target: ")+target;
if (downlabel) if (downlabel)
{ {
downlabel->setText(::truncLine(label, MAX_MESSAGE_LENGTH) ); downlabel->setText(::truncLine(label, MAX_MESSAGE_LENGTH) );
} }
getApp()->repaint(); getApp()->repaint();
// If cancel button was clicked, close files and return // If cancel button was clicked, close files and return
if (cancelled) if (cancelled)
{ {
::close(dst); ::close(dst);
skipping to change at line 911 skipping to change at line 911
MessageBox::error(this, BOX_OK, _("Error"), _("Destination %s is identic al to source"), targetfile.text()); MessageBox::error(this, BOX_OK, _("Error"), _("Destination %s is identic al to source"), targetfile.text());
return(-1); return(-1);
} }
// Target already exists // Target already exists
if (::exists(targetfile)) if (::exists(targetfile))
{ {
// Overwrite dialog if necessary // Overwrite dialog if necessary
if ( (!(overwrite_all | skip_all)) & confirm_dialog ) if ( (!(overwrite_all | skip_all)) & confirm_dialog )
{ {
FXString label = _("Source:")+source; FXString label = _("Source: ")+source;
if (uplabel) if (uplabel)
{ {
uplabel->setText(::multiLines(label, MAX_MESSAGE_ LENGTH)); uplabel->setText(::multiLines(label, MAX_MESSAGE_ LENGTH));
} }
label = _("Target:")+targetfile; label = _("Target: ")+targetfile;
if (downlabel) if (downlabel)
{ {
downlabel->setText(::multiLines(label, MAX_MESSAG E_LENGTH)); downlabel->setText(::multiLines(label, MAX_MESSAG E_LENGTH));
} }
getApp()->repaint(); getApp()->repaint();
forceTimeout(); forceTimeout();
FXuint answer = getOverwriteAnswer(source, targetfile); FXuint answer = getOverwriteAnswer(source, targetfile);
switch (answer) switch (answer)
{ {
// Cancel // Cancel
skipping to change at line 1014 skipping to change at line 1014
getApp()->runModalWhileEvents(cancelButton); getApp()->runModalWhileEvents(cancelButton);
} }
// Set labels for progress dialog // Set labels for progress dialog
FXString label = _("Delete folder: ")+file; FXString label = _("Delete folder: ")+file;
if (uplabel) if (uplabel)
{ {
uplabel->setText(::truncLine(label, MAX_MESSAGE_LENGTH)); uplabel->setText(::truncLine(label, MAX_MESSAGE_LENGTH));
} }
dirname = FXPath::directory(FXPath::absolute(file)); dirname = FXPath::directory(FXPath::absolute(file));
label = _("From:")+dirname; label = _("From: ")+dirname;
if (downlabel) if (downlabel)
{ {
downlabel->setText(::truncLine(label, MAX_MESSAGE_LENGTH)); downlabel->setText(::truncLine(label, MAX_MESSAGE_LENGTH));
} }
getApp()->repaint(); getApp()->repaint();
// If cancel button was clicked, return // If cancel button was clicked, return
if (cancelled) if (cancelled)
{ {
closedir(dirp); closedir(dirp);
skipping to change at line 1099 skipping to change at line 1099
getApp()->runModalWhileEvents(cancelButton); getApp()->runModalWhileEvents(cancelButton);
} }
// Set labels for progress dialog // Set labels for progress dialog
FXString label = _("Delete:")+file; FXString label = _("Delete:")+file;
if (uplabel) if (uplabel)
{ {
uplabel->setText(::truncLine(label, MAX_MESSAGE_LENGTH)); uplabel->setText(::truncLine(label, MAX_MESSAGE_LENGTH));
} }
dirname = FXPath::directory(FXPath::absolute(file)); dirname = FXPath::directory(FXPath::absolute(file));
label = _("From:")+dirname; label = _("From: ")+dirname;
if (downlabel) if (downlabel)
{ {
downlabel->setText(::truncLine(label, MAX_MESSAGE_LENGTH)); downlabel->setText(::truncLine(label, MAX_MESSAGE_LENGTH));
} }
getApp()->repaint(); getApp()->repaint();
// If cancel button was clicked, return // If cancel button was clicked, return
if (cancelled) if (cancelled)
{ {
return(false); return(false);
skipping to change at line 1273 skipping to change at line 1273
// Force timeout checking for progress dialog // Force timeout checking for progress dialog
checkTimeout(); checkTimeout();
// Give cancel button an opportunity to be clicked // Give cancel button an opportunity to be clicked
if (cancelButton) if (cancelButton)
{ {
getApp()->runModalWhileEvents(cancelButton); getApp()->runModalWhileEvents(cancelButton);
} }
// Set labels for progress dialog // Set labels for progress dialog
FXString label = _("Source:")+source; FXString label = _("Source: ")+source;
if (uplabel) if (uplabel)
{ {
uplabel->setText(::truncLine(label, MAX_MESSAGE_LENGTH)); uplabel->setText(::truncLine(label, MAX_MESSAGE_LENGTH));
} }
label = _("Target:")+target; label = _("Target: ")+target;
if (downlabel) if (downlabel)
{ {
downlabel->setText(::truncLine(label, MAX_MESSAGE_LENGTH)); downlabel->setText(::truncLine(label, MAX_MESSAGE_LENGTH));
} }
getApp()->repaint(); getApp()->repaint();
// Target file already exists // Target file already exists
if (::exists(targetfile)) if (::exists(targetfile))
{ {
// Overwrite dialog if necessary // Overwrite dialog if necessary
 End of changes. 8 change blocks. 
8 lines changed or deleted 8 lines changed or added

Home  |  About  |  All  |  Newest  |  Fossies Dox  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTPS