[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-11-10 12:32:35
[Download RAW message or body]
CVS commit by amantia:
Synch with the BE branch.
M +1 -1 quanta.kdevelop 1.102
M +3 -3 quanta/dialogs/copyto.cpp 1.10
M +15 -12 quanta/project/project.cpp 1.126
--- quanta/quanta.kdevelop #1.101:1.102
@@ -142,5 +142,5 @@
<tree>
<hidenonprojectfiles>false</hidenonprojectfiles>
- <hidepatterns/>
+ <hidepatterns></hidepatterns>
<showvcsfields>true</showvcsfields>
</tree>
--- quanta/quanta/dialogs/copyto.cpp #1.9:1.10
@@ -59,9 +59,9 @@ KURL CopyTo::copy(const KURL& urlToCopy,
KFileItem item(entry, urlToCopy, false, true);
destURL = targetDirURL;
- destURL.setPath(destURL.path(1)+urlToCopy.fileName());
+ destURL.setPath(destURL.path(1) + urlToCopy.fileName());
if (item.isDir())
destURL.adjustPath(1);
- KIO::CopyJob *job = KIO::copy( urlToCopy, destURL, true );
+ KIO::CopyJob *job = KIO::copy(urlToCopy, destURL, true);
connect( job, SIGNAL(result( KIO::Job *)),
SLOT (slotResult( KIO::Job *)));
@@ -106,5 +106,5 @@ KURL::List CopyTo::copy( KURL::List sour
KFileItem item(entry, srcURL, false, true);
KURL u = targetDirURL;
- u.setPath(targetDirURL.path(1)+srcURL.fileName());
+ u.setPath(targetDirURL.path(1) + srcURL.fileName());
if (item.isDir())
u.adjustPath(1);
--- quanta/quanta/project/project.cpp #1.125:1.126
@@ -803,11 +803,14 @@ void Project::slotAddDirectory(const KUR
if ( relURL.path().startsWith("/") || relURL.path().startsWith("."))
{
+ KURL destination = baseURL;
+ if (showDlg)
+ {
KURLRequesterDlg *urlRequesterDlg = new KURLRequesterDlg( baseURL.prettyURL(), \
this, "");
urlRequesterDlg->setCaption(i18n("%1: Copy to \
Project").arg(dirURL.prettyURL(0, KURL::StripFileProtocol)));
urlRequesterDlg->urlRequester()->setMode( KFile::Directory | \
KFile::ExistingOnly); urlRequesterDlg->exec();
- KURL destination = urlRequesterDlg->selectedURL();
+ destination = urlRequesterDlg->selectedURL();
delete urlRequesterDlg;
-
+ }
if ( (showDlg == false) ||
(!destination.isEmpty()) )
@@ -1204,7 +1207,7 @@ void Project::slotAcceptCreateProject()
{
KURL url;
- QuantaCommon::setUrl(url,qConfig.globalDataDir+"quanta/templates/");
+ QuantaCommon::setUrl(url, qConfig.globalDataDir + "quanta/templates/");
slotAddDirectory(url, false);
- QuantaCommon::setUrl(templateURL,"templates/");
+ QuantaCommon::setUrl(templateURL, "templates/");
createTemplateDir = false;
}
@@ -1212,7 +1215,7 @@ void Project::slotAcceptCreateProject()
{
KURL url;
- QuantaCommon::setUrl(url,locateLocal("data","quanta/templates/"));
+ QuantaCommon::setUrl(url, locateLocal("data", "quanta/templates/"));
slotAddDirectory(url, false);
- QuantaCommon::setUrl(templateURL,"templates/");
+ QuantaCommon::setUrl(templateURL, "templates/");
createTemplateDir = false;
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic