← Back to branch summary

~ubuntu-branches/ubuntu/maverick/k3b/maverick

« back to all changes in this revision

Viewing changes to src/projects/k3bdataurladdingdialog.h

  • Committer: Bazaar Package Importer
  • Author(s): Jonathan Thomas
  • Date: 2010-02-08 16:38:36 UTC
  • mfrom: (1.1.22 upstream) (2.1.5 sid)
  • Revision ID: james.westby@ubuntu.com-20100208163836-3iiu9xef2yzmfbmi
Tags: 1.70.0~beta1+svn1087124-0ubuntu1
https://launchpad.net/bugs/459058
* Merge with Debian Unstable, remaining changes:
  - Do not add build-depend on libdvdread-dev
  - Keep Kubuntu VCS entries
  - Suggest, not recommend libk3b6-extracodecs
  - Keep conflicts/replaces on older k3b versions
  - Do not install unused scalable icons to save space
  - Keep kubuntu_02_kubuntu_restricted.diff
  - Keep kubuntu_03_no_missing_mp3_warn.diff
  - Disable 111_advice_debian_libk3b3-extracodes.diff, the above two patches
    take care of this for us (without string changes, too)
  - Disable 112_dont_require_mp3.diff, it causes the package to FTBFS
  - Keep Kubuntu l10n stuff in debian/rules
* New upstream svn snapshot:
  - Depend on polkit-kde-1 or policykit-1-gnome instead of
    kdebase-workspace-bin now that K3b Setup has been ported to KAuth which
    uses Polkit-1 (LP: #459058)
  - Remove dependency on libpolkit-qt-dev for the above
  - Drop 114_fix_ftbfs_kfreebsd.diff and 113_add_kfreebsd_support.diff,
    applied upstream
  - Update .install files

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/projects/k3bdataurladdingdialog.h
44
44
        ~DataUrlAddingDialog();
45
45
 
46
46
        /**
47
 
         * shows modeless DataUrlAddingDialog and returns
 
47
         * shows DataUrlAddingDialog in non-blocking fashion
48
48
         * (doesn't wait till dialog is closed)
49
49
         */
50
50
        static void addUrls( const KUrl::List& urls, DirItem* dir,
57
57
                              QWidget* parent = 0 );
58
58
 
59
59
    private Q_SLOTS:
 
60
        void slotStartAddUrls();
 
61
        void slotStartCopyMoveItems();
60
62
        void slotAddUrls();
61
63
        void slotCopyMoveItems();
62
64
        void slotCancel();
64
66
        void updateProgress();
65
67
 
66
68
    private:
67
 
        DataUrlAddingDialog( DataDoc* doc, QWidget* parent = 0 );
68
 
        static void copyMoveItems( const QList<DataItem*>& items, DirItem* dir,
69
 
                                  QWidget* parent, bool copy );
 
69
        DataUrlAddingDialog( const KUrl::List& urls, DirItem* dir, QWidget* parent = 0 );
 
70
        DataUrlAddingDialog( const QList<DataItem*>& items, DirItem* dir, bool copy, QWidget* parent = 0 );
 
71
        void init();
70
72
        bool getNewName( const QString& oldName, DirItem* dir, QString& newName );
71
73
        bool addHiddenFiles();
72
74
        bool addSystemFiles();
82
84
        QList< QPair<DataItem*, DirItem*> > m_items;
83
85
        QList<KUrl> m_dirSizeQueue;
84
86
 
 
87
        DataDoc* m_doc;
85
88
        bool m_bExistingItemsReplaceAll;
86
89
        bool m_bExistingItemsIgnoreAll;
87
90
        bool m_bFolderLinksFollowAll;