summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--kaddressbook/kabcore.cpp10
-rw-r--r--kaddressbook/kabcore.h2
2 files changed, 10 insertions, 2 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 25891a0..2494aa2 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -1632,13 +1632,15 @@ void KABCore::initActions()
1632 SLOT( removeVoice() ), actionCollection(), 1632 SLOT( removeVoice() ), actionCollection(),
1633 "remove_voice" ); 1633 "remove_voice" );
1634 mActionImportOL = new KAction( i18n( "Import from OL..." ), 0, this, 1634 mActionImportOL = new KAction( i18n( "Import from OL..." ), 0, this,
1635 SLOT( importFromOL() ), actionCollection(), 1635 SLOT( importFromOL() ), actionCollection(),
1636 "import_OL" ); 1636 "import_OL" );
1637#ifdef KAB_EMBEDDED 1637#ifdef KAB_EMBEDDED
1638 1638 mActionLicence = new KAction( i18n( "Licence" ), "licence", 0,
1639 this, SLOT( showLicence() ), actionCollection(),
1640 "licence_about_data" );
1639 mActionAboutKAddressbook = new KAction( i18n( "&About KAddressBook" ), "kaddressbook2", 0, 1641 mActionAboutKAddressbook = new KAction( i18n( "&About KAddressBook" ), "kaddressbook2", 0,
1640 this, SLOT( createAboutData() ), actionCollection(), 1642 this, SLOT( createAboutData() ), actionCollection(),
1641 "kaddressbook_about_data" ); 1643 "kaddressbook_about_data" );
1642#endif //KAB_EMBEDDED 1644#endif //KAB_EMBEDDED
1643 1645
1644 clipboardDataChanged(); 1646 clipboardDataChanged();
@@ -1756,13 +1758,13 @@ void KABCore::addActionsManually()
1756 settingsMenu->insertSeparator(); 1758 settingsMenu->insertSeparator();
1757 1759
1758 mActionWhoAmI->plug( settingsMenu ); 1760 mActionWhoAmI->plug( settingsMenu );
1759 mActionCategories->plug( settingsMenu ); 1761 mActionCategories->plug( settingsMenu );
1760 1762
1761 mActionAboutKAddressbook->plug( helpMenu ); 1763 mActionAboutKAddressbook->plug( helpMenu );
1762 1764 mActionLicence->plug( helpMenu );
1763 1765
1764 if (QApplication::desktop()->width() > 320 ) { 1766 if (QApplication::desktop()->width() > 320 ) {
1765 1767
1766 mActionEditAddressee->plug( tb ); 1768 mActionEditAddressee->plug( tb );
1767 mActionSave->plug( tb ); 1769 mActionSave->plug( tb );
1768 mViewManager->getFilterAction()->plug ( tb); 1770 mViewManager->getFilterAction()->plug ( tb);
@@ -1789,12 +1791,16 @@ void KABCore::addActionsManually()
1789//US topLayout->addWidget( mJumpButtonBar ); 1791//US topLayout->addWidget( mJumpButtonBar );
1790 this->layout()->add( mJumpButtonBar ); 1792 this->layout()->add( mJumpButtonBar );
1791*/ 1793*/
1792 1794
1793#endif //KAB_EMBEDDED 1795#endif //KAB_EMBEDDED
1794} 1796}
1797void KABCore::showLicence()
1798{
1799 KApplication::showLicence();
1800}
1795void KABCore::removeVoice() 1801void KABCore::removeVoice()
1796{ 1802{
1797 if ( KMessageBox::questionYesNo( this, i18n("After importing, phone numbers\nmay have two or more types.\n(E.g. work+voice)\nThese numbers are shown as \"other\".\nClick Yes to remove the voice type\nfrom numbers with more than one type.\n\nRemove voice type?") ) == KMessageBox::No ) 1803 if ( KMessageBox::questionYesNo( this, i18n("After importing, phone numbers\nmay have two or more types.\n(E.g. work+voice)\nThese numbers are shown as \"other\".\nClick Yes to remove the voice type\nfrom numbers with more than one type.\n\nRemove voice type?") ) == KMessageBox::No )
1798 return; 1804 return;
1799 KABC::Addressee::List list = mViewManager->selectedAddressees(); 1805 KABC::Addressee::List list = mViewManager->selectedAddressees();
1800 KABC::Addressee::List::Iterator it; 1806 KABC::Addressee::List::Iterator it;
diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h
index be39148..6bbdfd4 100644
--- a/kaddressbook/kabcore.h
+++ b/kaddressbook/kabcore.h
@@ -139,12 +139,13 @@ class KABCore : public QWidget
139 public slots: 139 public slots:
140#ifdef KAB_EMBEDDED 140#ifdef KAB_EMBEDDED
141 void createAboutData(); 141 void createAboutData();
142#endif //KAB_EMBEDDED 142#endif //KAB_EMBEDDED
143 143
144 void statusMessage(QString, int time = 0 ); 144 void statusMessage(QString, int time = 0 );
145 void showLicence();
145 /** 146 /**
146 Is called whenever a contact is selected in the view. 147 Is called whenever a contact is selected in the view.
147 */ 148 */
148 void setContactSelected( const QString &uid ); 149 void setContactSelected( const QString &uid );
149 150
150 /** 151 /**
@@ -404,12 +405,13 @@ class KABCore : public QWidget
404 KAction *mActionKeyBindings; 405 KAction *mActionKeyBindings;
405 KToggleAction *mActionJumpBar; 406 KToggleAction *mActionJumpBar;
406 KToggleAction *mActionDetails; 407 KToggleAction *mActionDetails;
407 KAction *mActionWhoAmI; 408 KAction *mActionWhoAmI;
408 KAction *mActionCategories; 409 KAction *mActionCategories;
409 KAction *mActionAboutKAddressbook; 410 KAction *mActionAboutKAddressbook;
411 KAction *mActionLicence;
410 412
411 KAction *mActionDeleteView; 413 KAction *mActionDeleteView;
412 414
413 QPopupMenu *viewMenu; 415 QPopupMenu *viewMenu;
414 QPopupMenu *filterMenu; 416 QPopupMenu *filterMenu;
415 QPopupMenu *settingsMenu; 417 QPopupMenu *settingsMenu;