← Back to branch summary

~berthold-daum/zora/trunk

« back to all changes in this revision

Viewing changes to com.bdaum.zoom.ui/src/com/bdaum/zoom/ui/internal/views/CatalogView.java

  • Committer: bdaum
  • Date: 2015-12-26 10:21:51 UTC
  • Revision ID: berthold.daum@bdaum.de-20151226102151-44f1j5113167thb9
Version 2.4.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
com.bdaum.zoom.ui/src/com/bdaum/zoom/ui/internal/views/CatalogView.java
157
157
import com.bdaum.zoom.ui.internal.dialogs.SlideshowEditDialog;
158
158
import com.bdaum.zoom.ui.internal.dialogs.WebGalleryEditDialog;
159
159
import com.bdaum.zoom.ui.internal.hover.IGalleryHover;
 
160
import com.bdaum.zoom.ui.internal.operations.SlideshowPropertiesOperation;
160
161
import com.bdaum.zoom.ui.internal.wizards.MergeCatWizard;
161
162
 
162
163
@SuppressWarnings("restriction")
1700
1701
                                                                        cloneCollection((SmartCollectionImpl) o),
1701
1702
                                                                        (GroupImpl) obj);
1702
1703
                                                else if (o instanceof SlideShowImpl) {
1703
 
                                                        SlideShowImpl oldSm = (SlideShowImpl) o;
1704
 
                                                        SlideShowImpl newSm = new SlideShowImpl(
1705
 
                                                                        oldSm.getName(), oldSm.getDescription(),
1706
 
                                                                        false, 5000,
1707
 
                                                                        Constants.SLIDE_TRANSITION_FADE, 1000,
1708
 
                                                                        Constants.SLIDE_TITLEONLY, 2000,
1709
 
                                                                        oldSm.getAdhoc(), oldSm.getAdhoc(),
1710
 
                                                                        oldSm.getLastAccessDate());
 
1704
                                                        // SlideShowImpl oldSm = (SlideShowImpl) o;
 
1705
                                                        SlideShowImpl newSm = SlideshowPropertiesOperation
 
1706
                                                                        .cloneSlideshow((SlideShowImpl) o);
 
1707
                                                        // SlideShowImpl newSm = new SlideShowImpl(
 
1708
                                                        // oldSm.getName(), oldSm.getDescription(),
 
1709
                                                        // false, 5000,
 
1710
                                                        // Constants.SLIDE_TRANSITION_FADE, 1000,
 
1711
                                                        // Constants.SLIDE_TITLEONLY, 2000,
 
1712
                                                        // oldSm.getAdhoc(), oldSm.getSkipDublettes(),
 
1713
                                                        // oldSm.getVoiceNotes(),
 
1714
                                                        // oldSm.getLastAccessDate());
1711
1715
                                                        final GroupImpl group = (GroupImpl) obj;
1712
1716
                                                        group.addSlideshow(newSm.getStringId());
1713
1717
                                                        newSm.setGroup_slideshow_parent(group.getStringId());
1738
1742
                                                oldSm.getName(), false, oldSm.getAlbum(),
1739
1743
                                                oldSm.getAdhoc(), oldSm.getNetwork(), null,
1740
1744
                                                oldSm.getColorCode(), oldSm.getLastAccessDate(), 0,
1741
 
                                                null);
 
1745
                                                oldSm.getPerspective(), null);
1742
1746
                                for (Criterion oldCrit : oldSm.getCriterion())
1743
1747
                                        newSm.addCriterion(new CriterionImpl(oldCrit.getField(),
1744
1748
                                                        oldCrit.getSubfield(), oldCrit.getValue(), oldCrit