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
@@ -1626,25 +1626,27 @@ void KABCore::initActions()
1626 1626
1627 mActionCategories = new KAction( i18n( "Set Categories" ), 0, this, 1627 mActionCategories = new KAction( i18n( "Set Categories" ), 0, this,
1628 SLOT( setCategories() ), actionCollection(), 1628 SLOT( setCategories() ), actionCollection(),
1629 "edit_set_categories" ); 1629 "edit_set_categories" );
1630 1630
1631 mActionRemoveVoice = new KAction( i18n( "Remove \"voice\"..." ), 0, this, 1631 mActionRemoveVoice = new KAction( i18n( "Remove \"voice\"..." ), 0, this,
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();
1645 connect( UndoStack::instance(), SIGNAL( changed() ), SLOT( updateActionMenu() ) ); 1647 connect( UndoStack::instance(), SIGNAL( changed() ), SLOT( updateActionMenu() ) );
1646 connect( RedoStack::instance(), SIGNAL( changed() ), SLOT( updateActionMenu() ) ); 1648 connect( RedoStack::instance(), SIGNAL( changed() ), SLOT( updateActionMenu() ) );
1647} 1649}
1648 1650
1649//US we need this function, to plug all actions into the correct menues. 1651//US we need this function, to plug all actions into the correct menues.
1650// KDE uses a XML format to plug the actions, but we work her without this overhead. 1652// KDE uses a XML format to plug the actions, but we work her without this overhead.
@@ -1750,25 +1752,25 @@ void KABCore::addActionsManually()
1750 } 1752 }
1751 1753
1752 settingsMenu->insertSeparator(); 1754 settingsMenu->insertSeparator();
1753 1755
1754 mActionJumpBar->plug( settingsMenu ); 1756 mActionJumpBar->plug( settingsMenu );
1755 mActionDetails->plug( settingsMenu ); 1757 mActionDetails->plug( settingsMenu );
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);
1769 if (QApplication::desktop()->width() > 480 ) { 1771 if (QApplication::desktop()->width() > 480 ) {
1770 mActionUndo->plug( tb ); 1772 mActionUndo->plug( tb );
1771 mActionDelete->plug( tb ); 1773 mActionDelete->plug( tb );
1772 mActionRedo->plug( tb ); 1774 mActionRedo->plug( tb );
1773 } 1775 }
1774 } 1776 }
@@ -1783,24 +1785,28 @@ void KABCore::addActionsManually()
1783 mIncSearchWidget = new IncSearchWidget( tb ); 1785 mIncSearchWidget = new IncSearchWidget( tb );
1784 connect( mIncSearchWidget, SIGNAL( doSearch( const QString& ) ), 1786 connect( mIncSearchWidget, SIGNAL( doSearch( const QString& ) ),
1785 SLOT( incrementalSearch( const QString& ) ) ); 1787 SLOT( incrementalSearch( const QString& ) ) );
1786 1788
1787 mJumpButtonBar = new JumpButtonBar( this, this ); 1789 mJumpButtonBar = new JumpButtonBar( this, this );
1788 1790
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;
1801 for ( it = list.begin(); it != list.end(); ++it ) { 1807 for ( it = list.begin(); it != list.end(); ++it ) {
1802 PhoneNumber::List phoneNumbers = (*it).phoneNumbers(); 1808 PhoneNumber::List phoneNumbers = (*it).phoneNumbers();
1803 PhoneNumber::List::Iterator phoneIt; 1809 PhoneNumber::List::Iterator phoneIt;
1804 bool found = false; 1810 bool found = false;
1805 for ( phoneIt = phoneNumbers.begin(); phoneIt != phoneNumbers.end(); ++phoneIt ) { 1811 for ( phoneIt = phoneNumbers.begin(); phoneIt != phoneNumbers.end(); ++phoneIt ) {
1806 if ( (*phoneIt).type() & PhoneNumber::Voice) { // voice found 1812 if ( (*phoneIt).type() & PhoneNumber::Voice) { // voice found
diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h
index be39148..6bbdfd4 100644
--- a/kaddressbook/kabcore.h
+++ b/kaddressbook/kabcore.h
@@ -133,24 +133,25 @@ class KABCore : public QWidget
133 133
134#ifdef KAB_EMBEDDED 134#ifdef KAB_EMBEDDED
135 inline QPopupMenu* getImportMenu() { return ImportMenu;} 135 inline QPopupMenu* getImportMenu() { return ImportMenu;}
136 inline QPopupMenu* getExportMenu() { return ExportMenu;} 136 inline QPopupMenu* getExportMenu() { return ExportMenu;}
137#endif //KAB_EMBEDDED 137#endif //KAB_EMBEDDED
138 138
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 /**
151 Opens the preferred mail composer with all selected contacts as 152 Opens the preferred mail composer with all selected contacts as
152 arguments. 153 arguments.
153 */ 154 */
154 void sendMail(); 155 void sendMail();
155 156
156 /** 157 /**
@@ -398,24 +399,25 @@ class KABCore : public QWidget
398 399
399 //US settings menu 400 //US settings menu
400 KAction *mActionConfigResources; 401 KAction *mActionConfigResources;
401 KAction *mActionConfigKAddressbook; 402 KAction *mActionConfigKAddressbook;
402 KAction *mActionConfigShortcuts; 403 KAction *mActionConfigShortcuts;
403 KAction *mActionConfigureToolbars; 404 KAction *mActionConfigureToolbars;
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;
416 QPopupMenu *changeMenu; 418 QPopupMenu *changeMenu;
417 419
418//US QAction *mActionSave; 420//US QAction *mActionSave;
419 QPopupMenu *ImportMenu; 421 QPopupMenu *ImportMenu;
420 QPopupMenu *ExportMenu; 422 QPopupMenu *ExportMenu;
421 //LR additional methods 423 //LR additional methods