-rw-r--r-- | kaddressbook/kabcore.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index f0a49f8..013e243 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp | |||
@@ -1754,97 +1754,97 @@ void KABCore::addActionsManually() | |||
1754 | mb->insertItem( "&Edit", editMenu ); | 1754 | mb->insertItem( "&Edit", editMenu ); |
1755 | mb->insertItem( "&View", viewMenu ); | 1755 | mb->insertItem( "&View", viewMenu ); |
1756 | mb->insertItem( "&Settings", settingsMenu ); | 1756 | mb->insertItem( "&Settings", settingsMenu ); |
1757 | mb->insertItem( "&Change selected", changeMenu ); | 1757 | mb->insertItem( "&Change selected", changeMenu ); |
1758 | mb->insertItem( "&Help", helpMenu ); | 1758 | mb->insertItem( "&Help", helpMenu ); |
1759 | mIncSearchWidget = new IncSearchWidget( tb ); | 1759 | mIncSearchWidget = new IncSearchWidget( tb ); |
1760 | // tb->insertWidget(-1, 0, mIncSearchWidget); | 1760 | // tb->insertWidget(-1, 0, mIncSearchWidget); |
1761 | 1761 | ||
1762 | #else | 1762 | #else |
1763 | //US setup toolbar | 1763 | //US setup toolbar |
1764 | QPEMenuBar *menuBarTB = new QPEMenuBar( tb ); | 1764 | QPEMenuBar *menuBarTB = new QPEMenuBar( tb ); |
1765 | QPopupMenu *popupBarTB = new QPopupMenu( this ); | 1765 | QPopupMenu *popupBarTB = new QPopupMenu( this ); |
1766 | menuBarTB->insertItem( "ME", popupBarTB); | 1766 | menuBarTB->insertItem( "ME", popupBarTB); |
1767 | tb->insertWidget(-1, 0, menuBarTB); | 1767 | tb->insertWidget(-1, 0, menuBarTB); |
1768 | mIncSearchWidget = new IncSearchWidget( tb ); | 1768 | mIncSearchWidget = new IncSearchWidget( tb ); |
1769 | 1769 | ||
1770 | tb->enableMoving(false); | 1770 | tb->enableMoving(false); |
1771 | popupBarTB->insertItem( "&File", fileMenu ); | 1771 | popupBarTB->insertItem( "&File", fileMenu ); |
1772 | popupBarTB->insertItem( "&Edit", editMenu ); | 1772 | popupBarTB->insertItem( "&Edit", editMenu ); |
1773 | popupBarTB->insertItem( "&View", viewMenu ); | 1773 | popupBarTB->insertItem( "&View", viewMenu ); |
1774 | popupBarTB->insertItem( "&Settings", settingsMenu ); | 1774 | popupBarTB->insertItem( "&Settings", settingsMenu ); |
1775 | mViewManager->getFilterAction()->plug ( popupBarTB); | 1775 | mViewManager->getFilterAction()->plug ( popupBarTB); |
1776 | popupBarTB->insertItem( "&Change selected", changeMenu ); | 1776 | popupBarTB->insertItem( "&Change selected", changeMenu ); |
1777 | popupBarTB->insertItem( "&Help", helpMenu ); | 1777 | popupBarTB->insertItem( "&Help", helpMenu ); |
1778 | if (QApplication::desktop()->width() > 320 ) { | 1778 | if (QApplication::desktop()->width() > 320 ) { |
1779 | // mViewManager->getFilterAction()->plug ( tb); | 1779 | // mViewManager->getFilterAction()->plug ( tb); |
1780 | } | 1780 | } |
1781 | #endif | 1781 | #endif |
1782 | // mActionQuit->plug ( mMainWindow->toolBar()); | 1782 | // mActionQuit->plug ( mMainWindow->toolBar()); |
1783 | 1783 | ||
1784 | 1784 | ||
1785 | 1785 | ||
1786 | //US Now connect the actions with the menue entries. | 1786 | //US Now connect the actions with the menue entries. |
1787 | mActionPrint->plug( fileMenu ); | 1787 | mActionPrint->plug( fileMenu ); |
1788 | mActionMail->plug( fileMenu ); | 1788 | mActionMail->plug( fileMenu ); |
1789 | fileMenu->insertSeparator(); | 1789 | fileMenu->insertSeparator(); |
1790 | 1790 | ||
1791 | mActionNewContact->plug( fileMenu ); | 1791 | mActionNewContact->plug( fileMenu ); |
1792 | mActionNewContact->plug( tb ); | 1792 | mActionNewContact->plug( tb ); |
1793 | 1793 | ||
1794 | mActionEditAddressee->plug( fileMenu ); | 1794 | mActionEditAddressee->plug( fileMenu ); |
1795 | if ((KGlobal::getDesktopSize() > KGlobal::Small ) || | 1795 | if ((KGlobal::getDesktopSize() > KGlobal::Small ) || |
1796 | (!KABPrefs::instance()->mMultipleViewsAtOnce )) | 1796 | (!KABPrefs::instance()->mMultipleViewsAtOnce )) |
1797 | mActionEditAddressee->plug( tb ); | 1797 | mActionEditAddressee->plug( tb ); |
1798 | 1798 | ||
1799 | fileMenu->insertSeparator(); | 1799 | fileMenu->insertSeparator(); |
1800 | mActionSave->plug( fileMenu ); | 1800 | mActionSave->plug( fileMenu ); |
1801 | fileMenu->insertItem( "&Import", ImportMenu ); | 1801 | fileMenu->insertItem( "&Import", ImportMenu ); |
1802 | fileMenu->insertItem( "&Emport", ExportMenu ); | 1802 | fileMenu->insertItem( "&Export", ExportMenu ); |
1803 | fileMenu->insertSeparator(); | 1803 | fileMenu->insertSeparator(); |
1804 | mActionMailVCard->plug( fileMenu ); | 1804 | mActionMailVCard->plug( fileMenu ); |
1805 | #ifndef DESKTOP_VERSION | 1805 | #ifndef DESKTOP_VERSION |
1806 | if ( Ir::supported() ) mActionBeamVCard->plug( fileMenu ); | 1806 | if ( Ir::supported() ) mActionBeamVCard->plug( fileMenu ); |
1807 | if ( Ir::supported() ) mActionBeam->plug(fileMenu ); | 1807 | if ( Ir::supported() ) mActionBeam->plug(fileMenu ); |
1808 | #endif | 1808 | #endif |
1809 | fileMenu->insertSeparator(); | 1809 | fileMenu->insertSeparator(); |
1810 | mActionQuit->plug( fileMenu ); | 1810 | mActionQuit->plug( fileMenu ); |
1811 | #ifdef _WIN32_ | 1811 | #ifdef _WIN32_ |
1812 | mActionImportOL->plug( ImportMenu ); | 1812 | mActionImportOL->plug( ImportMenu ); |
1813 | #endif | 1813 | #endif |
1814 | // edit menu | 1814 | // edit menu |
1815 | mActionUndo->plug( editMenu ); | 1815 | mActionUndo->plug( editMenu ); |
1816 | mActionRedo->plug( editMenu ); | 1816 | mActionRedo->plug( editMenu ); |
1817 | editMenu->insertSeparator(); | 1817 | editMenu->insertSeparator(); |
1818 | mActionCut->plug( editMenu ); | 1818 | mActionCut->plug( editMenu ); |
1819 | mActionCopy->plug( editMenu ); | 1819 | mActionCopy->plug( editMenu ); |
1820 | mActionPaste->plug( editMenu ); | 1820 | mActionPaste->plug( editMenu ); |
1821 | mActionDelete->plug( editMenu ); | 1821 | mActionDelete->plug( editMenu ); |
1822 | editMenu->insertSeparator(); | 1822 | editMenu->insertSeparator(); |
1823 | mActionSelectAll->plug( editMenu ); | 1823 | mActionSelectAll->plug( editMenu ); |
1824 | 1824 | ||
1825 | mActionRemoveVoice->plug( changeMenu ); | 1825 | mActionRemoveVoice->plug( changeMenu ); |
1826 | // settings menu | 1826 | // settings menu |
1827 | //US special menuentry to configure the addressbook resources. On KDE | 1827 | //US special menuentry to configure the addressbook resources. On KDE |
1828 | // you do that through the control center !!! | 1828 | // you do that through the control center !!! |
1829 | mActionConfigResources->plug( settingsMenu ); | 1829 | mActionConfigResources->plug( settingsMenu ); |
1830 | settingsMenu->insertSeparator(); | 1830 | settingsMenu->insertSeparator(); |
1831 | 1831 | ||
1832 | mActionConfigKAddressbook->plug( settingsMenu ); | 1832 | mActionConfigKAddressbook->plug( settingsMenu ); |
1833 | 1833 | ||
1834 | if ( mIsPart ) { | 1834 | if ( mIsPart ) { |
1835 | mActionConfigShortcuts->plug( settingsMenu ); | 1835 | mActionConfigShortcuts->plug( settingsMenu ); |
1836 | mActionConfigureToolbars->plug( settingsMenu ); | 1836 | mActionConfigureToolbars->plug( settingsMenu ); |
1837 | 1837 | ||
1838 | } else { | 1838 | } else { |
1839 | mActionKeyBindings->plug( settingsMenu ); | 1839 | mActionKeyBindings->plug( settingsMenu ); |
1840 | } | 1840 | } |
1841 | 1841 | ||
1842 | settingsMenu->insertSeparator(); | 1842 | settingsMenu->insertSeparator(); |
1843 | 1843 | ||
1844 | mActionJumpBar->plug( settingsMenu ); | 1844 | mActionJumpBar->plug( settingsMenu ); |
1845 | mActionDetails->plug( settingsMenu ); | 1845 | mActionDetails->plug( settingsMenu ); |
1846 | if (!KABPrefs::instance()->mMultipleViewsAtOnce || KGlobal::getDesktopSize() == KGlobal::Desktop ) | 1846 | if (!KABPrefs::instance()->mMultipleViewsAtOnce || KGlobal::getDesktopSize() == KGlobal::Desktop ) |
1847 | mActionDetails->plug( tb ); | 1847 | mActionDetails->plug( tb ); |
1848 | settingsMenu->insertSeparator(); | 1848 | settingsMenu->insertSeparator(); |
1849 | 1849 | ||
1850 | mActionWhoAmI->plug( settingsMenu ); | 1850 | mActionWhoAmI->plug( settingsMenu ); |