summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--kaddressbook/kabcore.cpp2
-rw-r--r--korganizer/mainwindow.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index c4382d6..4c1d5da 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -1750,193 +1750,193 @@ void KABCore::initActions()
1750#ifndef DESKTOP_VERSION 1750#ifndef DESKTOP_VERSION
1751 if ( Ir::supported() ) { 1751 if ( Ir::supported() ) {
1752 mActionBeamVCard = new KAction( i18n( "Beam selected v&Card(s)" ), "beam", 0, this, 1752 mActionBeamVCard = new KAction( i18n( "Beam selected v&Card(s)" ), "beam", 0, this,
1753 SLOT( beamVCard() ), actionCollection(), 1753 SLOT( beamVCard() ), actionCollection(),
1754 "kaddressbook_beam_vcard" ); 1754 "kaddressbook_beam_vcard" );
1755 1755
1756 mActionBeam = new KAction( i18n( "&Beam personal vCard" ), "beam", 0, this, 1756 mActionBeam = new KAction( i18n( "&Beam personal vCard" ), "beam", 0, this,
1757 SLOT( beamMySelf() ), actionCollection(), 1757 SLOT( beamMySelf() ), actionCollection(),
1758 "kaddressbook_beam_myself" ); 1758 "kaddressbook_beam_myself" );
1759 } 1759 }
1760#endif 1760#endif
1761 1761
1762 mActionEditAddressee = new KAction( i18n( "&Edit Contact..." ), "edit", 0, 1762 mActionEditAddressee = new KAction( i18n( "&Edit Contact..." ), "edit", 0,
1763 this, SLOT( editContact2() ), 1763 this, SLOT( editContact2() ),
1764 actionCollection(), "file_properties" ); 1764 actionCollection(), "file_properties" );
1765 1765
1766#ifdef KAB_EMBEDDED 1766#ifdef KAB_EMBEDDED
1767 // mActionQuit = KStdAction::quit( mMainWindow, SLOT( exit() ), actionCollection() ); 1767 // mActionQuit = KStdAction::quit( mMainWindow, SLOT( exit() ), actionCollection() );
1768 mActionQuit = new KAction( i18n( "&Exit" ), "exit", 0, 1768 mActionQuit = new KAction( i18n( "&Exit" ), "exit", 0,
1769 mMainWindow, SLOT( exit() ), 1769 mMainWindow, SLOT( exit() ),
1770 actionCollection(), "quit" ); 1770 actionCollection(), "quit" );
1771#endif //KAB_EMBEDDED 1771#endif //KAB_EMBEDDED
1772 1772
1773 // edit menu 1773 // edit menu
1774 if ( mIsPart ) { 1774 if ( mIsPart ) {
1775 mActionCopy = new KAction( i18n( "&Copy" ), "editcopy", CTRL + Key_C, this, 1775 mActionCopy = new KAction( i18n( "&Copy" ), "editcopy", CTRL + Key_C, this,
1776 SLOT( copyContacts() ), actionCollection(), 1776 SLOT( copyContacts() ), actionCollection(),
1777 "kaddressbook_copy" ); 1777 "kaddressbook_copy" );
1778 mActionCut = new KAction( i18n( "Cu&t" ), "editcut", CTRL + Key_X, this, 1778 mActionCut = new KAction( i18n( "Cu&t" ), "editcut", CTRL + Key_X, this,
1779 SLOT( cutContacts() ), actionCollection(), 1779 SLOT( cutContacts() ), actionCollection(),
1780 "kaddressbook_cut" ); 1780 "kaddressbook_cut" );
1781 mActionPaste = new KAction( i18n( "&Paste" ), "editpaste", CTRL + Key_V, this, 1781 mActionPaste = new KAction( i18n( "&Paste" ), "editpaste", CTRL + Key_V, this,
1782 SLOT( pasteContacts() ), actionCollection(), 1782 SLOT( pasteContacts() ), actionCollection(),
1783 "kaddressbook_paste" ); 1783 "kaddressbook_paste" );
1784 mActionSelectAll = new KAction( i18n( "Select &All" ), CTRL + Key_A, this, 1784 mActionSelectAll = new KAction( i18n( "Select &All" ), CTRL + Key_A, this,
1785 SLOT( selectAllContacts() ), actionCollection(), 1785 SLOT( selectAllContacts() ), actionCollection(),
1786 "kaddressbook_select_all" ); 1786 "kaddressbook_select_all" );
1787 mActionUndo = new KAction( i18n( "&Undo" ), "undo", CTRL + Key_Z, this, 1787 mActionUndo = new KAction( i18n( "&Undo" ), "undo", CTRL + Key_Z, this,
1788 SLOT( undo() ), actionCollection(), 1788 SLOT( undo() ), actionCollection(),
1789 "kaddressbook_undo" ); 1789 "kaddressbook_undo" );
1790 mActionRedo = new KAction( i18n( "Re&do" ), "redo", CTRL + SHIFT + Key_Z, 1790 mActionRedo = new KAction( i18n( "Re&do" ), "redo", CTRL + SHIFT + Key_Z,
1791 this, SLOT( redo() ), actionCollection(), 1791 this, SLOT( redo() ), actionCollection(),
1792 "kaddressbook_redo" ); 1792 "kaddressbook_redo" );
1793 } else { 1793 } else {
1794 mActionCopy = KStdAction::copy( this, SLOT( copyContacts() ), actionCollection() ); 1794 mActionCopy = KStdAction::copy( this, SLOT( copyContacts() ), actionCollection() );
1795 mActionCut = KStdAction::cut( this, SLOT( cutContacts() ), actionCollection() ); 1795 mActionCut = KStdAction::cut( this, SLOT( cutContacts() ), actionCollection() );
1796 mActionPaste = KStdAction::paste( this, SLOT( pasteContacts() ), actionCollection() ); 1796 mActionPaste = KStdAction::paste( this, SLOT( pasteContacts() ), actionCollection() );
1797 mActionSelectAll = KStdAction::selectAll( this, SLOT( selectAllContacts() ), actionCollection() ); 1797 mActionSelectAll = KStdAction::selectAll( this, SLOT( selectAllContacts() ), actionCollection() );
1798 mActionUndo = KStdAction::undo( this, SLOT( undo() ), actionCollection() ); 1798 mActionUndo = KStdAction::undo( this, SLOT( undo() ), actionCollection() );
1799 mActionRedo = KStdAction::redo( this, SLOT( redo() ), actionCollection() ); 1799 mActionRedo = KStdAction::redo( this, SLOT( redo() ), actionCollection() );
1800 } 1800 }
1801 1801
1802 mActionDelete = new KAction( i18n( "&Delete Contact" ), "editdelete", 1802 mActionDelete = new KAction( i18n( "&Delete Contact" ), "editdelete",
1803 Key_Delete, this, SLOT( deleteContacts() ), 1803 Key_Delete, this, SLOT( deleteContacts() ),
1804 actionCollection(), "edit_delete" ); 1804 actionCollection(), "edit_delete" );
1805 1805
1806 mActionUndo->setEnabled( false ); 1806 mActionUndo->setEnabled( false );
1807 mActionRedo->setEnabled( false ); 1807 mActionRedo->setEnabled( false );
1808 1808
1809 // settings menu 1809 // settings menu
1810#ifdef KAB_EMBEDDED 1810#ifdef KAB_EMBEDDED
1811//US special menuentry to configure the addressbook resources. On KDE 1811//US special menuentry to configure the addressbook resources. On KDE
1812// you do that through the control center !!! 1812// you do that through the control center !!!
1813 mActionConfigResources = new KAction( i18n( "Configure &Resources..." ), "configure_resources", 0, this, 1813 mActionConfigResources = new KAction( i18n( "Configure &Resources..." ), "configure_resources", 0, this,
1814 SLOT( configureResources() ), actionCollection(), 1814 SLOT( configureResources() ), actionCollection(),
1815 "kaddressbook_configure_resources" ); 1815 "kaddressbook_configure_resources" );
1816#endif //KAB_EMBEDDED 1816#endif //KAB_EMBEDDED
1817 1817
1818 if ( mIsPart ) { 1818 if ( mIsPart ) {
1819 mActionConfigKAddressbook = new KAction( i18n( "&Configure KAddressBook..." ), "configure", 0, this, 1819 mActionConfigKAddressbook = new KAction( i18n( "&Configure KAddressBook..." ), "configure", 0, this,
1820 SLOT( openConfigDialog() ), actionCollection(), 1820 SLOT( openConfigDialog() ), actionCollection(),
1821 "kaddressbook_configure" ); 1821 "kaddressbook_configure" );
1822 1822
1823 mActionConfigShortcuts = new KAction( i18n( "Configure S&hortcuts..." ), "configure_shortcuts", 0, 1823 mActionConfigShortcuts = new KAction( i18n( "Configure S&hortcuts..." ), "configure_shortcuts", 0,
1824 this, SLOT( configureKeyBindings() ), actionCollection(), 1824 this, SLOT( configureKeyBindings() ), actionCollection(),
1825 "kaddressbook_configure_shortcuts" ); 1825 "kaddressbook_configure_shortcuts" );
1826#ifdef KAB_EMBEDDED 1826#ifdef KAB_EMBEDDED
1827 mActionConfigureToolbars = KStdAction::configureToolbars( this, SLOT( mMainWindow->configureToolbars() ), actionCollection() ); 1827 mActionConfigureToolbars = KStdAction::configureToolbars( this, SLOT( mMainWindow->configureToolbars() ), actionCollection() );
1828 mActionConfigureToolbars->setEnabled( false ); 1828 mActionConfigureToolbars->setEnabled( false );
1829#endif //KAB_EMBEDDED 1829#endif //KAB_EMBEDDED
1830 1830
1831 } else { 1831 } else {
1832 mActionConfigKAddressbook = KStdAction::preferences( this, SLOT( openConfigDialog() ), actionCollection() ); 1832 mActionConfigKAddressbook = KStdAction::preferences( this, SLOT( openConfigDialog() ), actionCollection() );
1833 1833
1834 mActionKeyBindings = KStdAction::keyBindings( this, SLOT( configureKeyBindings() ), actionCollection() ); 1834 mActionKeyBindings = KStdAction::keyBindings( this, SLOT( configureKeyBindings() ), actionCollection() );
1835 } 1835 }
1836 1836
1837 mActionJumpBar = new KToggleAction( i18n( "Show Jump Bar" ), 0, 0, 1837 mActionJumpBar = new KToggleAction( i18n( "Show Jump Bar" ), 0, 0,
1838 actionCollection(), "options_show_jump_bar" ); 1838 actionCollection(), "options_show_jump_bar" );
1839 connect( mActionJumpBar, SIGNAL( toggled( bool ) ), SLOT( setJumpButtonBarVisible( bool ) ) ); 1839 connect( mActionJumpBar, SIGNAL( toggled( bool ) ), SLOT( setJumpButtonBarVisible( bool ) ) );
1840 1840
1841 mActionDetails = new KToggleAction( i18n( "Show Details" ), "listview", 0, 1841 mActionDetails = new KToggleAction( i18n( "Show Details" ), "listview", 0,
1842 actionCollection(), "options_show_details" ); 1842 actionCollection(), "options_show_details" );
1843 connect( mActionDetails, SIGNAL( toggled( bool ) ), SLOT( setDetailsVisible( bool ) ) ); 1843 connect( mActionDetails, SIGNAL( toggled( bool ) ), SLOT( setDetailsVisible( bool ) ) );
1844 1844
1845 1845
1846 mActionBR = new KToggleAction( i18n( "Beam receice enabled" ), "beam", 0, this, 1846 mActionBR = new KToggleAction( i18n( "Beam receive enabled" ), "beam", 0, this,
1847 SLOT( toggleBeamReceive() ), actionCollection(), 1847 SLOT( toggleBeamReceive() ), actionCollection(),
1848 "kaddressbook_beam_rec" ); 1848 "kaddressbook_beam_rec" );
1849 1849
1850 1850
1851 // misc 1851 // misc
1852 // only enable LDAP lookup if we can handle the protocol 1852 // only enable LDAP lookup if we can handle the protocol
1853#ifndef KAB_EMBEDDED 1853#ifndef KAB_EMBEDDED
1854 if ( KProtocolInfo::isKnownProtocol( KURL( "ldap://localhost" ) ) ) { 1854 if ( KProtocolInfo::isKnownProtocol( KURL( "ldap://localhost" ) ) ) {
1855 new KAction( i18n( "&Lookup Addresses in Directory" ), "find", 0, 1855 new KAction( i18n( "&Lookup Addresses in Directory" ), "find", 0,
1856 this, SLOT( openLDAPDialog() ), actionCollection(), 1856 this, SLOT( openLDAPDialog() ), actionCollection(),
1857 "ldap_lookup" ); 1857 "ldap_lookup" );
1858 } 1858 }
1859#else //KAB_EMBEDDED 1859#else //KAB_EMBEDDED
1860 //qDebug("KABCore::initActions() LDAP has to be implemented"); 1860 //qDebug("KABCore::initActions() LDAP has to be implemented");
1861#endif //KAB_EMBEDDED 1861#endif //KAB_EMBEDDED
1862 1862
1863 1863
1864 mActionWhoAmI = new KAction( i18n( "Set Who Am I" ), "personal", 0, this, 1864 mActionWhoAmI = new KAction( i18n( "Set Who Am I" ), "personal", 0, this,
1865 SLOT( setWhoAmI() ), actionCollection(), 1865 SLOT( setWhoAmI() ), actionCollection(),
1866 "set_personal" ); 1866 "set_personal" );
1867 1867
1868 1868
1869 1869
1870 1870
1871 mActionCategories = new KAction( i18n( "Set Categories" ), 0, this, 1871 mActionCategories = new KAction( i18n( "Set Categories" ), 0, this,
1872 SLOT( setCategories() ), actionCollection(), 1872 SLOT( setCategories() ), actionCollection(),
1873 "edit_set_categories" ); 1873 "edit_set_categories" );
1874 1874
1875 mActionRemoveVoice = new KAction( i18n( "Remove \"voice\"..." ), 0, this, 1875 mActionRemoveVoice = new KAction( i18n( "Remove \"voice\"..." ), 0, this,
1876 SLOT( removeVoice() ), actionCollection(), 1876 SLOT( removeVoice() ), actionCollection(),
1877 "remove_voice" ); 1877 "remove_voice" );
1878 mActionImportOL = new KAction( i18n( "Import from Outlook..." ), 0, this, 1878 mActionImportOL = new KAction( i18n( "Import from Outlook..." ), 0, this,
1879 SLOT( importFromOL() ), actionCollection(), 1879 SLOT( importFromOL() ), actionCollection(),
1880 "import_OL" ); 1880 "import_OL" );
1881#ifdef KAB_EMBEDDED 1881#ifdef KAB_EMBEDDED
1882 mActionLicence = new KAction( i18n( "Licence" ), 0, 1882 mActionLicence = new KAction( i18n( "Licence" ), 0,
1883 this, SLOT( showLicence() ), actionCollection(), 1883 this, SLOT( showLicence() ), actionCollection(),
1884 "licence_about_data" ); 1884 "licence_about_data" );
1885 mActionFaq = new KAction( i18n( "Faq" ), 0, 1885 mActionFaq = new KAction( i18n( "Faq" ), 0,
1886 this, SLOT( faq() ), actionCollection(), 1886 this, SLOT( faq() ), actionCollection(),
1887 "faq_about_data" ); 1887 "faq_about_data" );
1888 mActionWN = new KAction( i18n( "What's New?" ), 0, 1888 mActionWN = new KAction( i18n( "What's New?" ), 0,
1889 this, SLOT( whatsnew() ), actionCollection(), 1889 this, SLOT( whatsnew() ), actionCollection(),
1890 "wn" ); 1890 "wn" );
1891 mActionSyncHowto = new KAction( i18n( "Sync HowTo" ), 0, 1891 mActionSyncHowto = new KAction( i18n( "Sync HowTo" ), 0,
1892 this, SLOT( synchowto() ), actionCollection(), 1892 this, SLOT( synchowto() ), actionCollection(),
1893 "sync" ); 1893 "sync" );
1894 1894
1895 mActionAboutKAddressbook = new KAction( i18n( "&About KAddressBook" ), "kaddressbook2", 0, 1895 mActionAboutKAddressbook = new KAction( i18n( "&About KAddressBook" ), "kaddressbook2", 0,
1896 this, SLOT( createAboutData() ), actionCollection(), 1896 this, SLOT( createAboutData() ), actionCollection(),
1897 "kaddressbook_about_data" ); 1897 "kaddressbook_about_data" );
1898#endif //KAB_EMBEDDED 1898#endif //KAB_EMBEDDED
1899 1899
1900 clipboardDataChanged(); 1900 clipboardDataChanged();
1901 connect( UndoStack::instance(), SIGNAL( changed() ), SLOT( updateActionMenu() ) ); 1901 connect( UndoStack::instance(), SIGNAL( changed() ), SLOT( updateActionMenu() ) );
1902 connect( RedoStack::instance(), SIGNAL( changed() ), SLOT( updateActionMenu() ) ); 1902 connect( RedoStack::instance(), SIGNAL( changed() ), SLOT( updateActionMenu() ) );
1903} 1903}
1904 1904
1905//US we need this function, to plug all actions into the correct menues. 1905//US we need this function, to plug all actions into the correct menues.
1906// KDE uses a XML format to plug the actions, but we work her without this overhead. 1906// KDE uses a XML format to plug the actions, but we work her without this overhead.
1907void KABCore::addActionsManually() 1907void KABCore::addActionsManually()
1908{ 1908{
1909//US qDebug("KABCore::initActions(): mIsPart %i", mIsPart); 1909//US qDebug("KABCore::initActions(): mIsPart %i", mIsPart);
1910 1910
1911#ifdef KAB_EMBEDDED 1911#ifdef KAB_EMBEDDED
1912 QPopupMenu *fileMenu = new QPopupMenu( this ); 1912 QPopupMenu *fileMenu = new QPopupMenu( this );
1913 QPopupMenu *editMenu = new QPopupMenu( this ); 1913 QPopupMenu *editMenu = new QPopupMenu( this );
1914 QPopupMenu *helpMenu = new QPopupMenu( this ); 1914 QPopupMenu *helpMenu = new QPopupMenu( this );
1915 1915
1916 KToolBar* tb = mMainWindow->toolBar(); 1916 KToolBar* tb = mMainWindow->toolBar();
1917 1917
1918#ifdef DESKTOP_VERSION 1918#ifdef DESKTOP_VERSION
1919 QMenuBar* mb = mMainWindow->menuBar(); 1919 QMenuBar* mb = mMainWindow->menuBar();
1920 1920
1921 //US setup menubar. 1921 //US setup menubar.
1922 //Disable the following block if you do not want to have a menubar. 1922 //Disable the following block if you do not want to have a menubar.
1923 mb->insertItem( "&File", fileMenu ); 1923 mb->insertItem( "&File", fileMenu );
1924 mb->insertItem( "&Edit", editMenu ); 1924 mb->insertItem( "&Edit", editMenu );
1925 mb->insertItem( "&View", viewMenu ); 1925 mb->insertItem( "&View", viewMenu );
1926 mb->insertItem( "&Settings", settingsMenu ); 1926 mb->insertItem( "&Settings", settingsMenu );
1927 mb->insertItem( i18n("Synchronize"), syncMenu ); 1927 mb->insertItem( i18n("Synchronize"), syncMenu );
1928 mb->insertItem( "&Change selected", changeMenu ); 1928 mb->insertItem( "&Change selected", changeMenu );
1929 mb->insertItem( "&Help", helpMenu ); 1929 mb->insertItem( "&Help", helpMenu );
1930 mIncSearchWidget = new IncSearchWidget( tb ); 1930 mIncSearchWidget = new IncSearchWidget( tb );
1931 // tb->insertWidget(-1, 0, mIncSearchWidget); 1931 // tb->insertWidget(-1, 0, mIncSearchWidget);
1932 1932
1933#else 1933#else
1934 //US setup toolbar 1934 //US setup toolbar
1935 QPEMenuBar *menuBarTB = new QPEMenuBar( tb ); 1935 QPEMenuBar *menuBarTB = new QPEMenuBar( tb );
1936 QPopupMenu *popupBarTB = new QPopupMenu( this ); 1936 QPopupMenu *popupBarTB = new QPopupMenu( this );
1937 menuBarTB->insertItem( "ME", popupBarTB); 1937 menuBarTB->insertItem( "ME", popupBarTB);
1938 tb->insertWidget(-1, 0, menuBarTB); 1938 tb->insertWidget(-1, 0, menuBarTB);
1939 mIncSearchWidget = new IncSearchWidget( tb ); 1939 mIncSearchWidget = new IncSearchWidget( tb );
1940 1940
1941 tb->enableMoving(false); 1941 tb->enableMoving(false);
1942 popupBarTB->insertItem( "&File", fileMenu ); 1942 popupBarTB->insertItem( "&File", fileMenu );
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index e3dad94..fbfcd20 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -715,193 +715,193 @@ void MainWindow::initActions()
715 mBeamAction = new QAction( "Beam_incidence", i18n("Beam..."), 0, this ); 715 mBeamAction = new QAction( "Beam_incidence", i18n("Beam..."), 0, this );
716 mBeamAction->addTo( actionMenu ); 716 mBeamAction->addTo( actionMenu );
717 connect( mBeamAction, SIGNAL( activated() ), 717 connect( mBeamAction, SIGNAL( activated() ),
718 mView, SLOT( beamIncidence() ) ); 718 mView, SLOT( beamIncidence() ) );
719 mCancelAction = new QAction( "Cancel_incidence", i18n("Toggle Cancel"), 0, this ); 719 mCancelAction = new QAction( "Cancel_incidence", i18n("Toggle Cancel"), 0, this );
720 mCancelAction->addTo( actionMenu ); 720 mCancelAction->addTo( actionMenu );
721 connect( mCancelAction, SIGNAL( activated() ), 721 connect( mCancelAction, SIGNAL( activated() ),
722 mView, SLOT( toggleCancelIncidence() ) ); 722 mView, SLOT( toggleCancelIncidence() ) );
723 723
724 actionMenu->insertSeparator(); 724 actionMenu->insertSeparator();
725 725
726 action = new QAction( "purge_completed", i18n("Purge Completed"), 0, 726 action = new QAction( "purge_completed", i18n("Purge Completed"), 0,
727 this ); 727 this );
728 action->addTo( actionMenu ); 728 action->addTo( actionMenu );
729 connect( action, SIGNAL( activated() ), mView, SLOT( purgeCompleted() ) ); 729 connect( action, SIGNAL( activated() ), mView, SLOT( purgeCompleted() ) );
730 730
731 icon = loadPixmap( pathString + "search" ); 731 icon = loadPixmap( pathString + "search" );
732 QAction* search_action = new QAction( i18n("Search"), icon, i18n("Search..."), 0, this ); 732 QAction* search_action = new QAction( i18n("Search"), icon, i18n("Search..."), 0, this );
733 configureToolBarMenu->insertItem(icon, i18n("Search"), 120 , 4); 733 configureToolBarMenu->insertItem(icon, i18n("Search"), 120 , 4);
734 search_action->addTo( actionMenu ); 734 search_action->addTo( actionMenu );
735 connect( search_action, SIGNAL( activated() ), 735 connect( search_action, SIGNAL( activated() ),
736 mView->dialogManager(), SLOT( showSearchDialog() ) ); 736 mView->dialogManager(), SLOT( showSearchDialog() ) );
737 737
738 icon = loadPixmap( pathString + "today" ); 738 icon = loadPixmap( pathString + "today" );
739 configureToolBarMenu->insertItem(icon, i18n("Go to Today"), 130); 739 configureToolBarMenu->insertItem(icon, i18n("Go to Today"), 130);
740 QAction* today_action = new QAction( i18n("Go to Today"), icon, i18n("Go to Today"), 0, this ); 740 QAction* today_action = new QAction( i18n("Go to Today"), icon, i18n("Go to Today"), 0, this );
741 today_action->addTo( actionMenu ); 741 today_action->addTo( actionMenu );
742 connect( today_action, SIGNAL( activated() ), 742 connect( today_action, SIGNAL( activated() ),
743 mView, SLOT( goToday() ) ); 743 mView, SLOT( goToday() ) );
744 744
745 if ( KOPrefs::instance()->mShowFullMenu ) { 745 if ( KOPrefs::instance()->mShowFullMenu ) {
746 actionMenu->insertSeparator(); 746 actionMenu->insertSeparator();
747 actionMenu->insertItem( i18n("Configure Toolbar"),configureToolBarMenu ); 747 actionMenu->insertItem( i18n("Configure Toolbar"),configureToolBarMenu );
748 748
749 } 749 }
750 // actionMenu->insertSeparator(); 750 // actionMenu->insertSeparator();
751 action = new QAction( "import_qtopia", i18n("Import (*.ics/*.vcs) file"), 0, 751 action = new QAction( "import_qtopia", i18n("Import (*.ics/*.vcs) file"), 0,
752 this ); 752 this );
753 action->addTo( importMenu ); 753 action->addTo( importMenu );
754 connect( action, SIGNAL( activated() ), SLOT( importIcal() ) ); 754 connect( action, SIGNAL( activated() ), SLOT( importIcal() ) );
755 action = new QAction( "import_quick", i18n("Import last file"), 0, 755 action = new QAction( "import_quick", i18n("Import last file"), 0,
756 this ); 756 this );
757 action->addTo( importMenu ); 757 action->addTo( importMenu );
758 connect( action, SIGNAL( activated() ), SLOT( quickImportIcal() ) ); 758 connect( action, SIGNAL( activated() ), SLOT( quickImportIcal() ) );
759 importMenu->insertSeparator(); 759 importMenu->insertSeparator();
760 action = new QAction( "import_bday", i18n("Import Birthdays (KA/Pi)"), 0, 760 action = new QAction( "import_bday", i18n("Import Birthdays (KA/Pi)"), 0,
761 this ); 761 this );
762 action->addTo( importMenu ); 762 action->addTo( importMenu );
763 connect( action, SIGNAL( activated() ), SLOT( importBday() ) ); 763 connect( action, SIGNAL( activated() ), SLOT( importBday() ) );
764#ifndef DESKTOP_VERSION 764#ifndef DESKTOP_VERSION
765 importMenu->insertSeparator(); 765 importMenu->insertSeparator();
766 action = new QAction( "import_qtopia", i18n("Import Opie/Qtopia Cal."), 0, 766 action = new QAction( "import_qtopia", i18n("Import Opie/Qtopia Cal."), 0,
767 this ); 767 this );
768 action->addTo( importMenu ); 768 action->addTo( importMenu );
769 connect( action, SIGNAL( activated() ), SLOT( importQtopia() ) ); 769 connect( action, SIGNAL( activated() ), SLOT( importQtopia() ) );
770#else 770#else
771#ifdef _WIN32_ 771#ifdef _WIN32_
772 importMenu->insertSeparator(); 772 importMenu->insertSeparator();
773 action = new QAction( "import_ol", i18n("Import from OL"), 0, 773 action = new QAction( "import_ol", i18n("Import from OL"), 0,
774 this ); 774 this );
775 action->addTo( importMenu ); 775 action->addTo( importMenu );
776 connect( action, SIGNAL( activated() ), SLOT( importOL() ) ); 776 connect( action, SIGNAL( activated() ), SLOT( importOL() ) );
777#endif 777#endif
778#endif 778#endif
779 779
780 importMenu->insertSeparator(); 780 importMenu->insertSeparator();
781 action = new QAction( "load_cal", i18n("Load Calendar Backup"), 0, 781 action = new QAction( "load_cal", i18n("Load Calendar Backup"), 0,
782 this ); 782 this );
783 action->addTo( importMenu ); 783 action->addTo( importMenu );
784 connect( action, SIGNAL( activated() ), SLOT( loadCalendar() ) ); 784 connect( action, SIGNAL( activated() ), SLOT( loadCalendar() ) );
785 785
786 action = new QAction( "save_cal", i18n("Save Calendar Backup"), 0, 786 action = new QAction( "save_cal", i18n("Save Calendar Backup"), 0,
787 this ); 787 this );
788 action->addTo( importMenu ); 788 action->addTo( importMenu );
789 connect( action, SIGNAL( activated() ), SLOT( saveCalendar() ) ); 789 connect( action, SIGNAL( activated() ), SLOT( saveCalendar() ) );
790 790
791 importMenu->insertSeparator(); 791 importMenu->insertSeparator();
792 action = new QAction( "import_qtopia", i18n("Export VCalendar"), 0, 792 action = new QAction( "import_qtopia", i18n("Export VCalendar"), 0,
793 this ); 793 this );
794 action->addTo( importMenu ); connect( action, SIGNAL( activated() ), SLOT( exportVCalendar() ) ); 794 action->addTo( importMenu ); connect( action, SIGNAL( activated() ), SLOT( exportVCalendar() ) );
795 795
796 796
797 //LR 797 //LR
798 QPopupMenu *ex2phone = new QPopupMenu( this ); 798 QPopupMenu *ex2phone = new QPopupMenu( this );
799 ex2phone->insertItem(i18n("Complete calendar..."), 1 ); 799 ex2phone->insertItem(i18n("Complete calendar..."), 1 );
800 ex2phone->insertItem(i18n("Filtered calendar..."), 2 ); 800 ex2phone->insertItem(i18n("Filtered calendar..."), 2 );
801 connect( ex2phone, SIGNAL( activated(int) ), this, SLOT( exportToPhone( int)) ); 801 connect( ex2phone, SIGNAL( activated(int) ), this, SLOT( exportToPhone( int)) );
802 importMenu->insertItem( i18n("Export to phone"), ex2phone ); 802 importMenu->insertItem( i18n("Export to phone"), ex2phone );
803 803
804 importMenu->insertSeparator(); 804 importMenu->insertSeparator();
805 action = new QAction( "manage cat", i18n("Manage new categories..."), 0, 805 action = new QAction( "manage cat", i18n("Manage new categories..."), 0,
806 this ); 806 this );
807 action->addTo( importMenu ); 807 action->addTo( importMenu );
808 connect( action, SIGNAL( activated() ), mView, SLOT( manageCategories() ) ); 808 connect( action, SIGNAL( activated() ), mView, SLOT( manageCategories() ) );
809#ifndef DESKTOP_VERSION 809#ifndef DESKTOP_VERSION
810 importMenu->insertSeparator(); 810 importMenu->insertSeparator();
811 brAction = new QAction( "beam toggle", i18n("Beam receice enabled"), 0, 811 brAction = new QAction( "beam toggle", i18n("Beam receive enabled"), 0,
812 this ); 812 this );
813 brAction->addTo( importMenu ); 813 brAction->addTo( importMenu );
814 brAction->setToggleAction (true ) ; 814 brAction->setToggleAction (true ) ;
815 connect( brAction, SIGNAL( activated() ), this, SLOT( toggleBeamReceive() ) ); 815 connect( brAction, SIGNAL( activated() ), this, SLOT( toggleBeamReceive() ) );
816 816
817 action = new QAction( "beam all", i18n("Beam complete calendar..."), 0, 817 action = new QAction( "beam all", i18n("Beam complete calendar..."), 0,
818 this ); 818 this );
819 action->addTo( importMenu ); 819 action->addTo( importMenu );
820 connect( action, SIGNAL( activated() ), mView, SLOT( beamCalendar() ) ); 820 connect( action, SIGNAL( activated() ), mView, SLOT( beamCalendar() ) );
821 821
822 action = new QAction( "beam all", i18n("Beam filtered calendar..."), 0, 822 action = new QAction( "beam all", i18n("Beam filtered calendar..."), 0,
823 this ); 823 this );
824 action->addTo( importMenu ); 824 action->addTo( importMenu );
825 connect( action, SIGNAL( activated() ), mView, SLOT( beamFilteredCalendar()) ); 825 connect( action, SIGNAL( activated() ), mView, SLOT( beamFilteredCalendar()) );
826#else 826#else
827 importMenu->insertSeparator(); 827 importMenu->insertSeparator();
828 icon = loadPixmap( pathString + "print" ); 828 icon = loadPixmap( pathString + "print" );
829 action = new QAction( i18n("Print calendar..."),icon,i18n("Print calendar..."), 0, this ); 829 action = new QAction( i18n("Print calendar..."),icon,i18n("Print calendar..."), 0, this );
830 action->addTo( importMenu ); 830 action->addTo( importMenu );
831 connect( action, SIGNAL( activated() ), 831 connect( action, SIGNAL( activated() ),
832 this, SLOT( printCal() ) ); 832 this, SLOT( printCal() ) );
833 833
834 icon = loadPixmap( pathString + "print" ); 834 icon = loadPixmap( pathString + "print" );
835 action = new QAction( i18n("Print agenda selection..."),icon,i18n("Print agenda selection..."), 0, this ); 835 action = new QAction( i18n("Print agenda selection..."),icon,i18n("Print agenda selection..."), 0, this );
836 action->addTo( importMenu ); 836 action->addTo( importMenu );
837 connect( action, SIGNAL( activated() ), 837 connect( action, SIGNAL( activated() ),
838 this, SLOT( printSel() ) ); 838 this, SLOT( printSel() ) );
839#endif 839#endif
840 importMenu->insertSeparator(); 840 importMenu->insertSeparator();
841 action = new QAction( "beam all", i18n("Save"), 0, 841 action = new QAction( "beam all", i18n("Save"), 0,
842 this ); 842 this );
843 action->addTo( importMenu ); 843 action->addTo( importMenu );
844 connect( action, SIGNAL( activated() ), this, SLOT( save() ) ); 844 connect( action, SIGNAL( activated() ), this, SLOT( save() ) );
845 action = new QAction( "beam all", i18n("Exit (+save)"), 0, 845 action = new QAction( "beam all", i18n("Exit (+save)"), 0,
846 this ); 846 this );
847 action->addTo( importMenu ); 847 action->addTo( importMenu );
848 connect( action, SIGNAL( activated() ), this, SLOT( close() ) ); 848 connect( action, SIGNAL( activated() ), this, SLOT( close() ) );
849 849
850 //menuBar->insertItem( "Configure",configureMenu ); 850 //menuBar->insertItem( "Configure",configureMenu );
851 //configureMenu->insertItem( "Toolbar",configureToolBarMenu ); 851 //configureMenu->insertItem( "Toolbar",configureToolBarMenu );
852 icon = loadPixmap( "korganizer/korganizer" ); 852 icon = loadPixmap( "korganizer/korganizer" );
853 action = new QAction( "Keys + Colors", i18n("Keys + Colors..."), 0, this ); 853 action = new QAction( "Keys + Colors", i18n("Keys + Colors..."), 0, this );
854 action->addTo( helpMenu ); 854 action->addTo( helpMenu );
855 connect( action, SIGNAL( activated() ), 855 connect( action, SIGNAL( activated() ),
856 SLOT( keyBindings() ) ); 856 SLOT( keyBindings() ) );
857 action = new QAction( "featureHowto", i18n("Features + hints..."), 0,this ); 857 action = new QAction( "featureHowto", i18n("Features + hints..."), 0,this );
858 action->addTo( helpMenu ); 858 action->addTo( helpMenu );
859 connect( action, SIGNAL( activated() ), 859 connect( action, SIGNAL( activated() ),
860 SLOT( features() ) ); 860 SLOT( features() ) );
861 action = new QAction( "Auto saving", i18n("Auto saving..."), 0, this ); 861 action = new QAction( "Auto saving", i18n("Auto saving..."), 0, this );
862 action->addTo( helpMenu ); 862 action->addTo( helpMenu );
863 connect( action, SIGNAL( activated() ), 863 connect( action, SIGNAL( activated() ),
864 SLOT( aboutAutoSaving() ) ); 864 SLOT( aboutAutoSaving() ) );
865 action = new QAction( "Problemd", i18n("Known Problems..."), 0,this ); 865 action = new QAction( "Problemd", i18n("Known Problems..."), 0,this );
866 action->addTo( helpMenu ); 866 action->addTo( helpMenu );
867 connect( action, SIGNAL( activated() ), 867 connect( action, SIGNAL( activated() ),
868 SLOT( aboutKnownBugs() ) ); 868 SLOT( aboutKnownBugs() ) );
869 action = new QAction( "Translate Howto", i18n("User translation..."), 0,this ); 869 action = new QAction( "Translate Howto", i18n("User translation..."), 0,this );
870 action->addTo( helpMenu ); 870 action->addTo( helpMenu );
871 connect( action, SIGNAL( activated() ), 871 connect( action, SIGNAL( activated() ),
872 SLOT( usertrans() ) ); 872 SLOT( usertrans() ) );
873 action = new QAction( "Sync Howto", i18n("Sync HowTo..."), 0,this ); 873 action = new QAction( "Sync Howto", i18n("Sync HowTo..."), 0,this );
874 action->addTo( helpMenu ); 874 action->addTo( helpMenu );
875 connect( action, SIGNAL( activated() ), 875 connect( action, SIGNAL( activated() ),
876 SLOT( synchowto() ) ); 876 SLOT( synchowto() ) );
877 action = new QAction( "Whats New", i18n("What's new?"), 0,this ); 877 action = new QAction( "Whats New", i18n("What's new?"), 0,this );
878 action->addTo( helpMenu ); 878 action->addTo( helpMenu );
879 connect( action, SIGNAL( activated() ), 879 connect( action, SIGNAL( activated() ),
880 SLOT( whatsNew() ) ); 880 SLOT( whatsNew() ) );
881 action = new QAction( "Frequently asked questions", i18n("FAQ..."), 0,this ); 881 action = new QAction( "Frequently asked questions", i18n("FAQ..."), 0,this );
882 action->addTo( helpMenu ); 882 action->addTo( helpMenu );
883 connect( action, SIGNAL( activated() ), 883 connect( action, SIGNAL( activated() ),
884 SLOT( faq() ) ); 884 SLOT( faq() ) );
885 885
886 886
887 action = new QAction( "about", i18n("About..."), 0, this ); 887 action = new QAction( "about", i18n("About..."), 0, this );
888 action->addTo( helpMenu ); 888 action->addTo( helpMenu );
889 connect( action, SIGNAL( activated() ), 889 connect( action, SIGNAL( activated() ),
890 SLOT( about() ) ); 890 SLOT( about() ) );
891 action = new QAction( "licence", i18n("Licence..."), 0, this ); 891 action = new QAction( "licence", i18n("Licence..."), 0, this );
892 action->addTo( helpMenu ); 892 action->addTo( helpMenu );
893 connect( action, SIGNAL( activated() ), 893 connect( action, SIGNAL( activated() ),
894 SLOT( licence() ) ); 894 SLOT( licence() ) );
895 //menuBar->insertSeparator(); 895 //menuBar->insertSeparator();
896 896
897 // ****************************************************** 897 // ******************************************************
898 // menubar icons 898 // menubar icons
899 899
900 900
901 iconToolBar->setHorizontalStretchable (true ); 901 iconToolBar->setHorizontalStretchable (true );
902 //menuBar->insertItem( iconToolBar ); 902 //menuBar->insertItem( iconToolBar );
903 //xdays_action 903 //xdays_action
904 if (p-> mShowIconNewEvent) 904 if (p-> mShowIconNewEvent)
905 ne_action->addTo( iconToolBar ); 905 ne_action->addTo( iconToolBar );
906 if (p->mShowIconNewTodo ) 906 if (p->mShowIconNewTodo )
907 nt_action->addTo( iconToolBar ); 907 nt_action->addTo( iconToolBar );