[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/kpdf/annotations/kdegraphics/kpdf
From:       Enrico Ros <rosenric () dei ! unipd ! it>
Date:       2005-07-27 22:09:33
Message-ID: 1122502173.188870.8480.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 439361 by eros:

Merging trunk changes (now 3.5) till 2005-07-27.
patch_137 (http://tinyurl.com/8j5nb)


 M  +1 -1      core/document.cpp  
 M  +1 -1      part.cpp  


--- branches/kpdf/annotations/kdegraphics/kpdf/core/document.cpp #439360:439361
@@ -751,7 +751,7 @@
             {
                 if ( currentPage >= pageCount )
                 {
-                    if ( noDialogs || KMessageBox::questionYesNo(0, i18n("End of \
document reached.\nContinue from the beginning?")) == KMessageBox::Yes ) +            \
if ( noDialogs || KMessageBox::questionYesNo(0, i18n("End of document \
reached.\nContinue from the beginning?"), QString::null, KStdGuiItem::cont(), \
KStdGuiItem::cancel()) == KMessageBox::Yes )  currentPage = 0;
                     else
                         break;
--- branches/kpdf/annotations/kdegraphics/kpdf/part.cpp #439360:439361
@@ -660,7 +660,7 @@
     {
         if ( KIO::NetAccess::exists( saveURL, false, widget() ) )
         {
-            if ( KMessageBox::questionYesNo( widget(), i18n("A file named \"%1\" \
already exists. Are you sure you want to overwrite it?").arg(saveURL.filename())) != \
KMessageBox::Yes ) +            if ( KMessageBox::warningContinueCancel( widget(), \
i18n("A file named \"%1\" already exists. Are you sure you want to overwrite \
it?").arg( saveURL.filename(), QString::null, i18n("Overwrite") ) ) != \
KMessageBox::Continue )  return;
         }
 


[prev in list] [next in list] [prev in thread] [next in thread]