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

List:       kde-commits
Subject:    quanta
From:       Andras Mantia <amantia () freemail ! hu>
Date:       2003-06-23 9:55:31
[Download RAW message or body]

CVS commit by amantia: 

"Roaming user fixes" can be present in 3.1.3, so enable them. 
Warn about existing files on rename (#60187).

CCMAIL: 60187-done@bugs.kde.org


  M +1 -0      ChangeLog   1.180
  M +11 -3     quanta/project/project.cpp   1.97
  M +2 -2      quanta/quanta_init.cpp   1.294


--- quanta/ChangeLog  #1.179:1.180
@@ -49,4 +49,5 @@
       clipboard and selection
     - don't close quanta, if the user cancelled the toolbar saving [#59952]
+    - warn about existing files on rename [#60187]
 
   - new features:

--- quanta/quanta/quanta_init.cpp  #1.293:1.294
@@ -585,5 +585,5 @@ void QuantaApp::saveOptions()
     m_config->writeEntry("PHP Debugger Port", phpDebugPort );
     m_config->writeEntry("Top folders", fTab->topURLList.toStringList());
-#if KDE_VERSION >= KDE_MAKE_VERSION(3,1,90)
+#if KDE_VERSION >= KDE_MAKE_VERSION(3,1,3)
     m_config->writePathEntry("List of opened files", \
m_doc->openedFiles().toStringList());  #else
@@ -799,5 +799,5 @@ void QuantaApp::openLastFiles()
   m_config->setGroup("General Options");
 
-#if KDE_VERSION >= KDE_MAKE_VERSION(3,1,90)
+#if KDE_VERSION >= KDE_MAKE_VERSION(3,1,3)
   QStringList urls = m_config->readPathListEntry("List of opened files");
 #else

--- quanta/quanta/project/project.cpp  #1.96:1.97
@@ -876,6 +876,13 @@ void Project::slotRename(const KURL& url
       oldURL = QExtFileInfo::toRelative(url, baseURL);
       newURL = QExtFileInfo::toRelative(newUrl, baseURL);
+      bool proceed = true;
+      if (QExtFileInfo::exists(newUrl))
+      {
+        QString s = (newUrl.isLocalFile()) ? newUrl.path() : newUrl.prettyURL();
+        proceed = KMessageBox::warningYesNo(this, i18n("<qt>The file <b>%1</b> \
already exists.<br>Do you want to overwrite it?</qt>").arg(s),i18n("Overwrite")) == \
KMessageBox::Yes; +      }
+      if (proceed)
+      {
       //start the rename job
-
       KIO::SimpleJob *job = KIO::rename( url, newUrl, true );
       connect( job, SIGNAL( result( KIO::Job *) ), SLOT( slotRenameFinished( \
KIO::Job *) )); @@ -880,4 +887,5 @@ void Project::slotRename(const KURL& url
       KIO::SimpleJob *job = KIO::rename( url, newUrl, true );
       connect( job, SIGNAL( result( KIO::Job *) ), SLOT( slotRenameFinished( \
KIO::Job *) )); +      }
     }
   }


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