author | zautrix <zautrix> | 2004-07-05 14:16:54 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-07-05 14:16:54 (UTC) |
commit | 9a90061115ee2cac8adc5b2d21e607b6c5c9b890 (patch) (unidiff) | |
tree | 87efb03b00559f3a7fbb5c693d6d7b734f0d1eb7 | |
parent | af75333f69c6b7284a7fbe7ab63c08e10ae4541b (diff) | |
download | kdepimpi-9a90061115ee2cac8adc5b2d21e607b6c5c9b890.zip kdepimpi-9a90061115ee2cac8adc5b2d21e607b6c5c9b890.tar.gz kdepimpi-9a90061115ee2cac8adc5b2d21e607b6c5c9b890.tar.bz2 |
Improved pasting of many items
-rw-r--r-- | kaddressbook/addresseeeditordialog.cpp | 2 | ||||
-rw-r--r-- | kaddressbook/undocmds.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/kaddressbook/addresseeeditordialog.cpp b/kaddressbook/addresseeeditordialog.cpp index 790f148..6bc4129 100644 --- a/kaddressbook/addresseeeditordialog.cpp +++ b/kaddressbook/addresseeeditordialog.cpp | |||
@@ -37,49 +37,49 @@ AddresseeEditorDialog::AddresseeEditorDialog( KABCore *core, QWidget *parent, | |||
37 | const char *name ) | 37 | const char *name ) |
38 | : KDialogBase( KDialogBase::Plain, i18n( "Edit Contact" ), | 38 | : KDialogBase( KDialogBase::Plain, i18n( "Edit Contact" ), |
39 | KDialogBase::Ok | KDialogBase::Cancel | KDialogBase::Apply, | 39 | KDialogBase::Ok | KDialogBase::Cancel | KDialogBase::Apply, |
40 | KDialogBase::Ok, parent, name, true ) | 40 | KDialogBase::Ok, parent, name, true ) |
41 | { | 41 | { |
42 | 42 | ||
43 | 43 | ||
44 | QWidget *page = plainPage(); | 44 | QWidget *page = plainPage(); |
45 | 45 | ||
46 | QVBoxLayout *layout = new QVBoxLayout( page ); | 46 | QVBoxLayout *layout = new QVBoxLayout( page ); |
47 | 47 | ||
48 | mEditorWidget = new AddresseeEditorWidget( core, false, page ); | 48 | mEditorWidget = new AddresseeEditorWidget( core, false, page ); |
49 | connect( mEditorWidget, SIGNAL( modified( const KABC::Addressee::List& ) ), | 49 | connect( mEditorWidget, SIGNAL( modified( const KABC::Addressee::List& ) ), |
50 | SLOT( widgetModified() ) ); | 50 | SLOT( widgetModified() ) ); |
51 | layout->addWidget( mEditorWidget ); | 51 | layout->addWidget( mEditorWidget ); |
52 | 52 | ||
53 | enableButton( KDialogBase::Apply, false ); | 53 | enableButton( KDialogBase::Apply, false ); |
54 | if ( QApplication::desktop()->width() < 480 ) { | 54 | if ( QApplication::desktop()->width() < 480 ) { |
55 | hideButtons(); | 55 | hideButtons(); |
56 | } | 56 | } |
57 | } | 57 | } |
58 | 58 | ||
59 | AddresseeEditorDialog::~AddresseeEditorDialog() | 59 | AddresseeEditorDialog::~AddresseeEditorDialog() |
60 | { | 60 | { |
61 | qDebug("----------------------------------------------- "); | 61 | qDebug("AddresseeEditorDialog::~AddresseeEditorDialog()"); |
62 | //emit editorDestroyed( mEditorWidget->addressee().uid() ); | 62 | //emit editorDestroyed( mEditorWidget->addressee().uid() ); |
63 | } | 63 | } |
64 | 64 | ||
65 | void AddresseeEditorDialog::setAddressee( const KABC::Addressee &addr ) | 65 | void AddresseeEditorDialog::setAddressee( const KABC::Addressee &addr ) |
66 | { | 66 | { |
67 | enableButton( KDialogBase::Apply, false ); | 67 | enableButton( KDialogBase::Apply, false ); |
68 | 68 | ||
69 | mEditorWidget->setAddressee( addr ); | 69 | mEditorWidget->setAddressee( addr ); |
70 | } | 70 | } |
71 | 71 | ||
72 | KABC::Addressee AddresseeEditorDialog::addressee() | 72 | KABC::Addressee AddresseeEditorDialog::addressee() |
73 | { | 73 | { |
74 | return mEditorWidget->addressee(); | 74 | return mEditorWidget->addressee(); |
75 | } | 75 | } |
76 | 76 | ||
77 | bool AddresseeEditorDialog::dirty() | 77 | bool AddresseeEditorDialog::dirty() |
78 | { | 78 | { |
79 | return mEditorWidget->dirty(); | 79 | return mEditorWidget->dirty(); |
80 | } | 80 | } |
81 | 81 | ||
82 | void AddresseeEditorDialog::slotApply() | 82 | void AddresseeEditorDialog::slotApply() |
83 | { | 83 | { |
84 | if ( mEditorWidget->dirty() ) { | 84 | if ( mEditorWidget->dirty() ) { |
85 | mEditorWidget->save(); | 85 | mEditorWidget->save(); |
diff --git a/kaddressbook/undocmds.cpp b/kaddressbook/undocmds.cpp index db773be..5fbeec3 100644 --- a/kaddressbook/undocmds.cpp +++ b/kaddressbook/undocmds.cpp | |||
@@ -95,53 +95,54 @@ PwPasteCommand::PwPasteCommand( KABCore *core, const KABC::Addressee::List &list | |||
95 | QString PwPasteCommand::name() | 95 | QString PwPasteCommand::name() |
96 | { | 96 | { |
97 | return i18n( "Paste" ); | 97 | return i18n( "Paste" ); |
98 | } | 98 | } |
99 | 99 | ||
100 | void PwPasteCommand::undo() | 100 | void PwPasteCommand::undo() |
101 | { | 101 | { |
102 | KABC::Addressee::List::Iterator it; | 102 | KABC::Addressee::List::Iterator it; |
103 | for ( it = mAddresseeList.begin(); it != mAddresseeList.end(); ++it ) | 103 | for ( it = mAddresseeList.begin(); it != mAddresseeList.end(); ++it ) |
104 | mCore->addressBook()->removeAddressee( *it ); | 104 | mCore->addressBook()->removeAddressee( *it ); |
105 | } | 105 | } |
106 | 106 | ||
107 | void PwPasteCommand::redo() | 107 | void PwPasteCommand::redo() |
108 | { | 108 | { |
109 | QStringList uids; | 109 | QStringList uids; |
110 | KABC::Addressee::List::Iterator it; | 110 | KABC::Addressee::List::Iterator it; |
111 | for ( it = mAddresseeList.begin(); it != mAddresseeList.end(); ++it ) { | 111 | for ( it = mAddresseeList.begin(); it != mAddresseeList.end(); ++it ) { |
112 | /* we have to set a new uid for the contact, otherwise insertAddressee() | 112 | /* we have to set a new uid for the contact, otherwise insertAddressee() |
113 | ignore it. | 113 | ignore it. |
114 | */ | 114 | */ |
115 | (*it).setUid( KApplication::randomString( 10 ) ); | 115 | (*it).setUid( KApplication::randomString( 10 ) ); |
116 | uids.append( (*it).uid() ); | 116 | uids.append( (*it).uid() ); |
117 | mCore->addressBook()->insertAddressee( *it ); | 117 | mCore->addressBook()->insertAddressee( *it ); |
118 | } | 118 | } |
119 | 119 | if ( uids.count() < 4 ) { | |
120 | QStringList::Iterator uidIt; | 120 | QStringList::Iterator uidIt; |
121 | for ( uidIt = uids.begin(); uidIt != uids.end(); ++uidIt ) | 121 | for ( uidIt = uids.begin(); uidIt != uids.end(); ++uidIt ) |
122 | mCore->editContact( *uidIt ); | 122 | mCore->editContact( *uidIt ); |
123 | } | 123 | } |
124 | } | ||
124 | 125 | ||
125 | ///////////////////////////////// | 126 | ///////////////////////////////// |
126 | // PwNew Methods | 127 | // PwNew Methods |
127 | 128 | ||
128 | PwNewCommand::PwNewCommand( KABC::AddressBook *doc, const KABC::Addressee &a ) | 129 | PwNewCommand::PwNewCommand( KABC::AddressBook *doc, const KABC::Addressee &a ) |
129 | : Command(), mDocument( doc ), mA( a ) | 130 | : Command(), mDocument( doc ), mA( a ) |
130 | { | 131 | { |
131 | mDocument->insertAddressee(mA); | 132 | mDocument->insertAddressee(mA); |
132 | } | 133 | } |
133 | 134 | ||
134 | PwNewCommand::~PwNewCommand() | 135 | PwNewCommand::~PwNewCommand() |
135 | { | 136 | { |
136 | } | 137 | } |
137 | 138 | ||
138 | QString PwNewCommand::name() | 139 | QString PwNewCommand::name() |
139 | { | 140 | { |
140 | return i18n( "New Contact" ); | 141 | return i18n( "New Contact" ); |
141 | } | 142 | } |
142 | 143 | ||
143 | void PwNewCommand::undo() | 144 | void PwNewCommand::undo() |
144 | { | 145 | { |
145 | mDocument->removeAddressee( mA ); | 146 | mDocument->removeAddressee( mA ); |
146 | } | 147 | } |
147 | 148 | ||