Advertisement
smit_mehta

Patch for 193874

Mar 19th, 2012
65
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 4.53 KB | None | 0 0
  1. *** /home/smit/Videos/timeadjustdialog.cpp 2012-03-19 22:24:19.000000000 +0530
  2. --- /home/smit/new_digikam/digikam-software-compilation/extra/kipi-plugins/timeadjust/timeadjustdialog.cpp 2012-03-19 22:30:44.000000000 +0530
  3. ***************
  4. *** 65,70 ****
  5. --- 64,71 ----
  6. #include <kstandarddirs.h>
  7. #include <ktoolinvocation.h>
  8. #include <kvbox.h>
  9. + #include <KIO/NetAccess>
  10. + #include <kde_file.h>
  11.  
  12. // LibKIPI includes
  13.  
  14. ***************
  15. *** 77,83 ****
  16. --- 78,86 ----
  17. #include "kphostsettings.h"
  18. #include "kpimageinfo.h"
  19. #include "kpversion.h"
  20. + #include "kpmetadata.h"
  21. #include "clockphotodialog.h"
  22. + #include "KIO/NetAccess"
  23.  
  24. using namespace KIPIPlugins;
  25.  
  26. ***************
  27. *** 107,112 ****
  28. --- 111,117 ----
  29. updEXIFDigDateCheck = 0;
  30. updIPTCDateCheck = 0;
  31. updXMPDateCheck = 0;
  32. + updFileNameCheck = 0;
  33. useFileDateTypeChooser = 0;
  34. useMetaDateTypeChooser = 0;
  35. adjTypeChooser = 0;
  36. ***************
  37. *** 143,148 ****
  38. --- 148,154 ----
  39. QCheckBox* updEXIFDigDateCheck;
  40. QCheckBox* updIPTCDateCheck;
  41. QCheckBox* updXMPDateCheck;
  42. + QCheckBox* updFileNameCheck;
  43.  
  44. QComboBox* useFileDateTypeChooser;
  45. QComboBox* useMetaDateTypeChooser;
  46. ***************
  47. *** 312,317 ****
  48. --- 318,324 ----
  49. d->updEXIFDigDateCheck = new QCheckBox(i18n("EXIF: digitized"), d->updateGroupBox);
  50. d->updIPTCDateCheck = new QCheckBox(i18n("IPTC: created"), d->updateGroupBox);
  51. d->updXMPDateCheck = new QCheckBox(i18n("XMP"), d->updateGroupBox);
  52. + d->updFileNameCheck = new QCheckBox(i18n("Filename"), d->updateGroupBox);
  53.  
  54. updateGBLayout->setMargin(spacingHint());
  55. updateGBLayout->setSpacing(spacingHint());
  56. ***************
  57. *** 325,330 ****
  58. --- 332,338 ----
  59. updateGBLayout->addWidget(d->updEXIFDigDateCheck, 2, 1, 1, 1);
  60. updateGBLayout->addWidget(d->updIPTCDateCheck, 2, 0, 1, 1);
  61. updateGBLayout->addWidget(d->updXMPDateCheck, 0, 2, 1, 1);
  62. + updateGBLayout->addWidget(d->updFileNameCheck, 1, 2, 1, 1);
  63.  
  64. if (!KPMetadata::supportXmp())
  65. {
  66. ***************
  67. *** 445,450 ****
  68. --- 453,459 ----
  69. d->updEXIFDigDateCheck->setChecked(group.readEntry("Update EXIF Digitization Time", false));
  70. d->updIPTCDateCheck->setChecked(group.readEntry("Update IPTC Time", false));
  71. d->updXMPDateCheck->setChecked(group.readEntry("Update XMP Creation Time", false));
  72. + d->updFileNameCheck->setChecked(group.readEntry("Update Filename", false));
  73.  
  74. KConfigGroup group2 = config.group(QString("Time Adjust Dialog"));
  75. restoreDialogSize(group2);
  76. ***************
  77. *** 477,482 ****
  78. --- 486,492 ----
  79. group.writeEntry("Update EXIF Digitization Time", d->updEXIFDigDateCheck->isChecked());
  80. group.writeEntry("Update IPTC Time", d->updIPTCDateCheck->isChecked());
  81. group.writeEntry("Update XMP Creation Time", d->updXMPDateCheck->isChecked());
  82. + group.writeEntry("Update File Name", d->updFileNameCheck->isChecked());
  83.  
  84. KConfigGroup group2 = config.group(QString("Time Adjust Dialog"));
  85. saveDialogSize(group2);
  86. ***************
  87. *** 793,798 ****
  88. --- 803,809 ----
  89.  
  90. for (int i=0; i<d->imageURLs.size(); ++i)
  91. {
  92. +
  93. KUrl url = d->imageURLs[i];
  94. if (d->useCustomDateBtn->isChecked()) dateTime = customTime;
  95. else dateTime = d->imageOriginalDates[i];
  96. ***************
  97. *** 803,809 ****
  98. if (d->updAppDateCheck->isChecked())
  99. {
  100. KPImageInfo info(d->interface, url);
  101. info.setDate(dateTime);
  102. }
  103.  
  104. if (metadataChanged)
  105. --- 814,842 ----
  106. if (d->updAppDateCheck->isChecked())
  107. {
  108. KPImageInfo info(d->interface, url);
  109. ! info.setDate(dateTime);
  110. ! }
  111. !
  112. ! if (d->updFileNameCheck->isChecked())
  113. ! {
  114. ! QString newdate;
  115. !
  116. ! QFileInfo image(url.path());
  117. !
  118. !
  119. ! newdate = dateTime.toString(QString("yyyyMMddThhmmss"));
  120. ! newdate += image.suffix();
  121. !
  122. ! KUrl newUrl = url;
  123. ! newUrl.setFileName(newdate);
  124. !
  125. ! KIO::NetAccess::move(url, newUrl, 0);
  126. !
  127. ! KPMetadata newm(d->interface);
  128. !
  129. ! if (newm.hasSidecar(url.toLocalFile()))
  130. ! KDE::rename(newm.sidecarPath(url.toLocalFile()),newm.sidecarPath(newUrl.toLocalFile()));
  131. !
  132. }
  133.  
  134. if (metadataChanged)
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement