| Summary: | command line switches: graphics export to directory does not work with relative paths | ||
|---|---|---|---|
| Product: | [Applications] umbrello | Reporter: | Daniel Franke <franke.daniel> |
| Component: | general | Assignee: | Umbrello Development Group <umbrello-devel> |
| Status: | RESOLVED FIXED | ||
| Severity: | normal | ||
| Priority: | NOR | ||
| Version First Reported In: | unspecified | ||
| Target Milestone: | --- | ||
| Platform: | unspecified | ||
| OS: | Linux | ||
| Latest Commit: | Version Fixed/Implemented In: | ||
| Sentry Crash Report: | |||
|
Description
Daniel Franke
2006-07-11 10:32:06 UTC
SVN commit 561550 by danxuliu:
Added support for relative paths when exporting images from command line
BUG: 130600
M +11 -1 main.cpp
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/main.cpp #561549:561550
@@ -182,7 +182,17 @@
KURL directory;
QCStringList directoryOpt = args->getOptionList("directory");
if (directoryOpt.size() > 0) {
- directory = KURL(directoryOpt.last());
+ QString directoryPath(directoryOpt.last());
+
+ if (KURL::isRelativeURL(directoryPath)) {
+ QString currentDirectory = KCmdLineArgs::cwd();
+ if (!currentDirectory.endsWith("/")) {
+ currentDirectory.append("/");
+ }
+ directory = KURL(currentDirectory, directoryPath);
+ } else {
+ directory = KURL(directoryPath);
+ }
} else {
directory = KURL(UMLApp::app()->getDocument()->URL().directory());
}
On Wednesday 12 July 2006 15:29, Daniel Calvi SVN commit 561582 by danxuliu:
Simplified creation of directory URL to export images to.
Thanks to Carsten Pfeiffer for the suggestion.
CCBUG: 130600
M +1 -11 main.cpp
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/main.cpp #561581:561582
@@ -182,17 +182,7 @@
KURL directory;
QCStringList directoryOpt = args->getOptionList("directory");
if (directoryOpt.size() > 0) {
- QString directoryPath(directoryOpt.last());
-
- if (KURL::isRelativeURL(directoryPath)) {
- QString currentDirectory = KCmdLineArgs::cwd();
- if (!currentDirectory.endsWith("/")) {
- currentDirectory.append("/");
- }
- directory = KURL(currentDirectory, directoryPath);
- } else {
- directory = KURL(directoryPath);
- }
+ directory = KCmdLineArgs::makeURL(directoryOpt.last());
} else {
directory = KURL(UMLApp::app()->getDocument()->URL().directory());
}
|