-rw-r--r-- | kaddressbook/kabcore.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index 3b1a0c1..3f7a7da 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp | |||
@@ -2157,103 +2157,104 @@ void KABCore::addActionsManually() | |||
2157 | #endif | 2157 | #endif |
2158 | mActionMail->plug( fileMenu ); | 2158 | mActionMail->plug( fileMenu ); |
2159 | fileMenu->insertSeparator(); | 2159 | fileMenu->insertSeparator(); |
2160 | 2160 | ||
2161 | mActionNewContact->plug( fileMenu ); | 2161 | mActionNewContact->plug( fileMenu ); |
2162 | mActionNewContact->plug( tb ); | 2162 | mActionNewContact->plug( tb ); |
2163 | 2163 | ||
2164 | mActionEditAddressee->plug( fileMenu ); | 2164 | mActionEditAddressee->plug( fileMenu ); |
2165 | // if ((KGlobal::getDesktopSize() > KGlobal::Small ) || | 2165 | // if ((KGlobal::getDesktopSize() > KGlobal::Small ) || |
2166 | // (!KABPrefs::instance()->mMultipleViewsAtOnce )) | 2166 | // (!KABPrefs::instance()->mMultipleViewsAtOnce )) |
2167 | mActionEditAddressee->plug( tb ); | 2167 | mActionEditAddressee->plug( tb ); |
2168 | 2168 | ||
2169 | fileMenu->insertSeparator(); | 2169 | fileMenu->insertSeparator(); |
2170 | mActionSave->plug( fileMenu ); | 2170 | mActionSave->plug( fileMenu ); |
2171 | fileMenu->insertItem( "&Import", ImportMenu ); | 2171 | fileMenu->insertItem( "&Import", ImportMenu ); |
2172 | fileMenu->insertItem( "&Export", ExportMenu ); | 2172 | fileMenu->insertItem( "&Export", ExportMenu ); |
2173 | fileMenu->insertItem( i18n("&Change"), changeMenu ); | 2173 | fileMenu->insertItem( i18n("&Change"), changeMenu ); |
2174 | #ifndef DESKTOP_VERSION | 2174 | #ifndef DESKTOP_VERSION |
2175 | if ( Ir::supported() ) fileMenu->insertItem( i18n("&Beam"), beamMenu ); | 2175 | if ( Ir::supported() ) fileMenu->insertItem( i18n("&Beam"), beamMenu ); |
2176 | #endif | 2176 | #endif |
2177 | #if 0 | 2177 | #if 0 |
2178 | // PENDING fix MailVCard | 2178 | // PENDING fix MailVCard |
2179 | fileMenu->insertSeparator(); | 2179 | fileMenu->insertSeparator(); |
2180 | mActionMailVCard->plug( fileMenu ); | 2180 | mActionMailVCard->plug( fileMenu ); |
2181 | #endif | 2181 | #endif |
2182 | #ifndef DESKTOP_VERSION | 2182 | #ifndef DESKTOP_VERSION |
2183 | if ( Ir::supported() ) mActionBR->plug( beamMenu ); | 2183 | if ( Ir::supported() ) mActionBR->plug( beamMenu ); |
2184 | if ( Ir::supported() ) mActionBeamVCard->plug( beamMenu ); | 2184 | if ( Ir::supported() ) mActionBeamVCard->plug( beamMenu ); |
2185 | if ( Ir::supported() ) mActionBeam->plug( beamMenu ); | 2185 | if ( Ir::supported() ) mActionBeam->plug( beamMenu ); |
2186 | #endif | 2186 | #endif |
2187 | fileMenu->insertSeparator(); | 2187 | fileMenu->insertSeparator(); |
2188 | mActionQuit->plug( fileMenu ); | 2188 | mActionQuit->plug( fileMenu ); |
2189 | #ifdef _OL_IMPORT_ | 2189 | #ifdef _OL_IMPORT_ |
2190 | mActionImportOL->plug( ImportMenu ); | 2190 | mActionImportOL->plug( ImportMenu ); |
2191 | #endif | 2191 | #endif |
2192 | // edit menu | 2192 | // edit menu |
2193 | mActionUndo->plug( editMenu ); | 2193 | mActionUndo->plug( editMenu ); |
2194 | mActionRedo->plug( editMenu ); | 2194 | mActionRedo->plug( editMenu ); |
2195 | editMenu->insertSeparator(); | 2195 | editMenu->insertSeparator(); |
2196 | mActionCut->plug( editMenu ); | 2196 | mActionCut->plug( editMenu ); |
2197 | mActionCopy->plug( editMenu ); | 2197 | mActionCopy->plug( editMenu ); |
2198 | mActionPaste->plug( editMenu ); | 2198 | mActionPaste->plug( editMenu ); |
2199 | mActionDelete->plug( editMenu ); | 2199 | mActionDelete->plug( editMenu ); |
2200 | editMenu->insertSeparator(); | 2200 | editMenu->insertSeparator(); |
2201 | mActionSelectAll->plug( editMenu ); | 2201 | mActionSelectAll->plug( editMenu ); |
2202 | 2202 | ||
2203 | mActionSetFormattedName->plug( changeMenu ); | 2203 | mActionSetFormattedName->plug( changeMenu ); |
2204 | mActionRemoveVoice->plug( changeMenu ); | 2204 | mActionRemoveVoice->plug( changeMenu ); |
2205 | // settings menu | 2205 | // settingsmings menu |
2206 | //US special menuentry to configure the addressbook resources. On KDE | 2206 | //US special menuentry to configure the addressbook resources. On KDE |
2207 | // you do that through the control center !!! | 2207 | // you do that through the control center !!! |
2208 | mActionConfigResources->plug( settingsMenu ); | 2208 | // settingsMenu->insertSeparator(); |
2209 | settingsMenu->insertSeparator(); | ||
2210 | 2209 | ||
2211 | mActionConfigKAddressbook->plug( settingsMenu ); | 2210 | mActionConfigKAddressbook->plug( settingsMenu, 0 ); |
2211 | mActionConfigResources->plug( settingsMenu,1 ); | ||
2212 | settingsMenu->insertSeparator(2); | ||
2212 | 2213 | ||
2213 | if ( mIsPart ) { | 2214 | if ( mIsPart ) { |
2214 | //US not implemented yet | 2215 | //US not implemented yet |
2215 | //mActionConfigShortcuts->plug( settingsMenu ); | 2216 | //mActionConfigShortcuts->plug( settingsMenu ); |
2216 | //mActionConfigureToolbars->plug( settingsMenu ); | 2217 | //mActionConfigureToolbars->plug( settingsMenu ); |
2217 | 2218 | ||
2218 | } else { | 2219 | } else { |
2219 | //US not implemented yet | 2220 | //US not implemented yet |
2220 | //mActionKeyBindings->plug( settingsMenu ); | 2221 | //mActionKeyBindings->plug( settingsMenu ); |
2221 | } | 2222 | } |
2222 | 2223 | ||
2223 | settingsMenu->insertSeparator(); | 2224 | settingsMenu->insertSeparator(); |
2224 | 2225 | ||
2225 | mActionJumpBar->plug( settingsMenu ); | 2226 | mActionJumpBar->plug( settingsMenu ); |
2226 | mActionDetails->plug( settingsMenu ); | 2227 | mActionDetails->plug( settingsMenu ); |
2227 | //if (!KABPrefs::instance()->mMultipleViewsAtOnce || KGlobal::getDesktopSize() == KGlobal::Desktop ) | 2228 | //if (!KABPrefs::instance()->mMultipleViewsAtOnce || KGlobal::getDesktopSize() == KGlobal::Desktop ) |
2228 | mActionDetails->plug( tb ); | 2229 | mActionDetails->plug( tb ); |
2229 | settingsMenu->insertSeparator(); | 2230 | settingsMenu->insertSeparator(); |
2230 | #ifndef DESKTOP_VERSION | 2231 | #ifndef DESKTOP_VERSION |
2231 | if ( Ir::supported() ) mActionBR->plug(settingsMenu ); | 2232 | if ( Ir::supported() ) mActionBR->plug(settingsMenu ); |
2232 | settingsMenu->insertSeparator(); | 2233 | settingsMenu->insertSeparator(); |
2233 | #endif | 2234 | #endif |
2234 | 2235 | ||
2235 | mActionWhoAmI->plug( settingsMenu ); | 2236 | mActionWhoAmI->plug( settingsMenu ); |
2236 | mActionEditCategories->plug( settingsMenu ); | 2237 | mActionEditCategories->plug( settingsMenu ); |
2237 | mActionEditCategories->plug( changeMenu ); | 2238 | mActionEditCategories->plug( changeMenu ); |
2238 | mActionCategories->plug( changeMenu ); | 2239 | mActionCategories->plug( changeMenu ); |
2239 | mActionManageCategories->plug( changeMenu ); | 2240 | mActionManageCategories->plug( changeMenu ); |
2240 | 2241 | ||
2241 | mActionCategories->plug( settingsMenu ); | 2242 | mActionCategories->plug( settingsMenu ); |
2242 | mActionManageCategories->plug( settingsMenu ); | 2243 | mActionManageCategories->plug( settingsMenu ); |
2243 | 2244 | ||
2244 | 2245 | ||
2245 | mActionWN->plug( helpMenu ); | 2246 | mActionWN->plug( helpMenu ); |
2246 | mActionSyncHowto->plug( helpMenu ); | 2247 | mActionSyncHowto->plug( helpMenu ); |
2247 | mActionKdeSyncHowto->plug( helpMenu ); | 2248 | mActionKdeSyncHowto->plug( helpMenu ); |
2248 | mActionMultiSyncHowto->plug( helpMenu ); | 2249 | mActionMultiSyncHowto->plug( helpMenu ); |
2249 | mActionFaq->plug( helpMenu ); | 2250 | mActionFaq->plug( helpMenu ); |
2250 | mActionLicence->plug( helpMenu ); | 2251 | mActionLicence->plug( helpMenu ); |
2251 | mActionAboutKAddressbook->plug( helpMenu ); | 2252 | mActionAboutKAddressbook->plug( helpMenu ); |
2252 | 2253 | ||
2253 | if (KGlobal::getDesktopSize() > KGlobal::Small ) { | 2254 | if (KGlobal::getDesktopSize() > KGlobal::Small ) { |
2254 | 2255 | ||
2255 | mActionSave->plug( tb ); | 2256 | mActionSave->plug( tb ); |
2256 | mViewManager->getFilterAction()->plug ( tb); | 2257 | mViewManager->getFilterAction()->plug ( tb); |
2257 | //LR hide filteraction on started in 480x640 | 2258 | //LR hide filteraction on started in 480x640 |
2258 | if (QApplication::desktop()->width() == 480 ) { | 2259 | if (QApplication::desktop()->width() == 480 ) { |
2259 | mViewManager->getFilterAction()->setComboWidth( 0 ); | 2260 | mViewManager->getFilterAction()->setComboWidth( 0 ); |