-rw-r--r-- | kaddressbook/kabcore.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index 1433568..5ef61b1 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp | |||
@@ -2109,49 +2109,49 @@ void KABCore::initActions() | |||
2109 | "multisync" ); | 2109 | "multisync" ); |
2110 | 2110 | ||
2111 | mActionAboutKAddressbook = new KAction( i18n( "&About KAddressBook" ), "kaddressbook2", 0, | 2111 | mActionAboutKAddressbook = new KAction( i18n( "&About KAddressBook" ), "kaddressbook2", 0, |
2112 | this, SLOT( createAboutData() ), actionCollection(), | 2112 | this, SLOT( createAboutData() ), actionCollection(), |
2113 | "kaddressbook_about_data" ); | 2113 | "kaddressbook_about_data" ); |
2114 | #endif //KAB_EMBEDDED | 2114 | #endif //KAB_EMBEDDED |
2115 | 2115 | ||
2116 | clipboardDataChanged(); | 2116 | clipboardDataChanged(); |
2117 | connect( UndoStack::instance(), SIGNAL( changed() ), SLOT( updateActionMenu() ) ); | 2117 | connect( UndoStack::instance(), SIGNAL( changed() ), SLOT( updateActionMenu() ) ); |
2118 | connect( RedoStack::instance(), SIGNAL( changed() ), SLOT( updateActionMenu() ) ); | 2118 | connect( RedoStack::instance(), SIGNAL( changed() ), SLOT( updateActionMenu() ) ); |
2119 | } | 2119 | } |
2120 | 2120 | ||
2121 | //US we need this function, to plug all actions into the correct menues. | 2121 | //US we need this function, to plug all actions into the correct menues. |
2122 | // KDE uses a XML format to plug the actions, but we work her without this overhead. | 2122 | // KDE uses a XML format to plug the actions, but we work her without this overhead. |
2123 | void KABCore::addActionsManually() | 2123 | void KABCore::addActionsManually() |
2124 | { | 2124 | { |
2125 | //US qDebug("KABCore::initActions(): mIsPart %i", mIsPart); | 2125 | //US qDebug("KABCore::initActions(): mIsPart %i", mIsPart); |
2126 | 2126 | ||
2127 | #ifdef KAB_EMBEDDED | 2127 | #ifdef KAB_EMBEDDED |
2128 | QPopupMenu *fileMenu = new QPopupMenu( this ); | 2128 | QPopupMenu *fileMenu = new QPopupMenu( this ); |
2129 | QPopupMenu *editMenu = new QPopupMenu( this ); | 2129 | QPopupMenu *editMenu = new QPopupMenu( this ); |
2130 | QPopupMenu *helpMenu = new QPopupMenu( this ); | 2130 | QPopupMenu *helpMenu = new QPopupMenu( this ); |
2131 | 2131 | ||
2132 | KToolBar* tb = mMainWindow->toolBar(); | 2132 | KToolBar* tb = mMainWindow->toolBar(); |
2133 | 2133 | mMainWindow->setToolBarsMovable (false ); | |
2134 | #ifndef DESKTOP_VERSION | 2134 | #ifndef DESKTOP_VERSION |
2135 | if ( KABPrefs::instance()->mFullMenuBarVisible ) { | 2135 | if ( KABPrefs::instance()->mFullMenuBarVisible ) { |
2136 | #endif | 2136 | #endif |
2137 | QMenuBar* mb = mMainWindow->menuBar(); | 2137 | QMenuBar* mb = mMainWindow->menuBar(); |
2138 | 2138 | ||
2139 | //US setup menubar. | 2139 | //US setup menubar. |
2140 | //Disable the following block if you do not want to have a menubar. | 2140 | //Disable the following block if you do not want to have a menubar. |
2141 | mb->insertItem( i18n("&File"), fileMenu ); | 2141 | mb->insertItem( i18n("&File"), fileMenu ); |
2142 | mb->insertItem( i18n("&Edit"), editMenu ); | 2142 | mb->insertItem( i18n("&Edit"), editMenu ); |
2143 | mb->insertItem( i18n("&View"), viewMenu ); | 2143 | mb->insertItem( i18n("&View"), viewMenu ); |
2144 | mb->insertItem( i18n("&Settings"), settingsMenu ); | 2144 | mb->insertItem( i18n("&Settings"), settingsMenu ); |
2145 | #ifdef DESKTOP_VERSION | 2145 | #ifdef DESKTOP_VERSION |
2146 | mb->insertItem( i18n("Synchronize"), syncMenu ); | 2146 | mb->insertItem( i18n("Synchronize"), syncMenu ); |
2147 | #else | 2147 | #else |
2148 | mb->insertItem( i18n("Sync"), syncMenu ); | 2148 | mb->insertItem( i18n("Sync"), syncMenu ); |
2149 | #endif | 2149 | #endif |
2150 | //mb->insertItem( i18n("&Change"), changeMenu ); | 2150 | //mb->insertItem( i18n("&Change"), changeMenu ); |
2151 | mb->insertItem( i18n("&Help"), helpMenu ); | 2151 | mb->insertItem( i18n("&Help"), helpMenu ); |
2152 | mIncSearchWidget = new IncSearchWidget( tb ); | 2152 | mIncSearchWidget = new IncSearchWidget( tb ); |
2153 | // tb->insertWidget(-1, 0, mIncSearchWidget); | 2153 | // tb->insertWidget(-1, 0, mIncSearchWidget); |
2154 | #ifndef DESKTOP_VERSION | 2154 | #ifndef DESKTOP_VERSION |
2155 | } else { | 2155 | } else { |
2156 | //US setup toolbar | 2156 | //US setup toolbar |
2157 | QPEMenuBar *menuBarTB = new QPEMenuBar( tb ); | 2157 | QPEMenuBar *menuBarTB = new QPEMenuBar( tb ); |
@@ -2165,61 +2165,63 @@ void KABCore::addActionsManually() | |||
2165 | popupBarTB->insertItem( i18n("&View"), viewMenu ); | 2165 | popupBarTB->insertItem( i18n("&View"), viewMenu ); |
2166 | popupBarTB->insertItem( i18n("&Settings"), settingsMenu ); | 2166 | popupBarTB->insertItem( i18n("&Settings"), settingsMenu ); |
2167 | popupBarTB->insertItem( i18n("Synchronize"), syncMenu ); | 2167 | popupBarTB->insertItem( i18n("Synchronize"), syncMenu ); |
2168 | mViewManager->getFilterAction()->plug ( popupBarTB); | 2168 | mViewManager->getFilterAction()->plug ( popupBarTB); |
2169 | //popupBarTB->insertItem( i18n("&Change selected"), changeMenu ); | 2169 | //popupBarTB->insertItem( i18n("&Change selected"), changeMenu ); |
2170 | popupBarTB->insertItem( i18n("&Help"), helpMenu ); | 2170 | popupBarTB->insertItem( i18n("&Help"), helpMenu ); |
2171 | if (QApplication::desktop()->width() > 320 ) { | 2171 | if (QApplication::desktop()->width() > 320 ) { |
2172 | // mViewManager->getFilterAction()->plug ( tb); | 2172 | // mViewManager->getFilterAction()->plug ( tb); |
2173 | } | 2173 | } |
2174 | } | 2174 | } |
2175 | #endif | 2175 | #endif |
2176 | // mActionQuit->plug ( mMainWindow->toolBar()); | 2176 | // mActionQuit->plug ( mMainWindow->toolBar()); |
2177 | 2177 | ||
2178 | 2178 | ||
2179 | 2179 | ||
2180 | //US Now connect the actions with the menue entries. | 2180 | //US Now connect the actions with the menue entries. |
2181 | #ifdef DESKTOP_VERSION | 2181 | #ifdef DESKTOP_VERSION |
2182 | mActionPrint->plug( fileMenu ); | 2182 | mActionPrint->plug( fileMenu ); |
2183 | mActionPrintDetails->plug( fileMenu ); | 2183 | mActionPrintDetails->plug( fileMenu ); |
2184 | fileMenu->insertSeparator(); | 2184 | fileMenu->insertSeparator(); |
2185 | #endif | 2185 | #endif |
2186 | mActionMail->plug( fileMenu ); | 2186 | mActionMail->plug( fileMenu ); |
2187 | fileMenu->insertSeparator(); | 2187 | fileMenu->insertSeparator(); |
2188 | 2188 | ||
2189 | mActionNewContact->plug( fileMenu ); | 2189 | mActionNewContact->plug( editMenu ); |
2190 | mActionNewContact->plug( tb ); | 2190 | mActionNewContact->plug( tb ); |
2191 | 2191 | ||
2192 | mActionEditAddressee->plug( fileMenu ); | 2192 | mActionEditAddressee->plug( editMenu ); |
2193 | editMenu->insertSeparator(); | ||
2193 | // if ((KGlobal::getDesktopSize() > KGlobal::Small ) || | 2194 | // if ((KGlobal::getDesktopSize() > KGlobal::Small ) || |
2194 | // (!KABPrefs::instance()->mMultipleViewsAtOnce )) | 2195 | // (!KABPrefs::instance()->mMultipleViewsAtOnce )) |
2195 | mActionEditAddressee->plug( tb ); | 2196 | mActionEditAddressee->plug( tb ); |
2196 | 2197 | ||
2197 | fileMenu->insertSeparator(); | 2198 | // fileMenu->insertSeparator(); |
2198 | mActionSave->plug( fileMenu ); | 2199 | mActionSave->plug( fileMenu ); |
2199 | fileMenu->insertItem( "&Import", ImportMenu ); | 2200 | fileMenu->insertItem( "&Import", ImportMenu ); |
2200 | fileMenu->insertItem( "&Export", ExportMenu ); | 2201 | fileMenu->insertItem( "&Export", ExportMenu ); |
2201 | fileMenu->insertItem( i18n("&Change"), changeMenu ); | 2202 | editMenu->insertItem( i18n("&Change"), changeMenu ); |
2203 | editMenu->insertSeparator(); | ||
2202 | #ifndef DESKTOP_VERSION | 2204 | #ifndef DESKTOP_VERSION |
2203 | if ( Ir::supported() ) fileMenu->insertItem( i18n("&Beam"), beamMenu ); | 2205 | if ( Ir::supported() ) fileMenu->insertItem( i18n("&Beam"), beamMenu ); |
2204 | #endif | 2206 | #endif |
2205 | #if 0 | 2207 | #if 0 |
2206 | // PENDING fix MailVCard | 2208 | // PENDING fix MailVCard |
2207 | fileMenu->insertSeparator(); | 2209 | fileMenu->insertSeparator(); |
2208 | mActionMailVCard->plug( fileMenu ); | 2210 | mActionMailVCard->plug( fileMenu ); |
2209 | #endif | 2211 | #endif |
2210 | #ifndef DESKTOP_VERSION | 2212 | #ifndef DESKTOP_VERSION |
2211 | if ( Ir::supported() ) mActionBR->plug( beamMenu ); | 2213 | if ( Ir::supported() ) mActionBR->plug( beamMenu ); |
2212 | if ( Ir::supported() ) mActionBeamVCard->plug( beamMenu ); | 2214 | if ( Ir::supported() ) mActionBeamVCard->plug( beamMenu ); |
2213 | if ( Ir::supported() ) mActionBeam->plug( beamMenu ); | 2215 | if ( Ir::supported() ) mActionBeam->plug( beamMenu ); |
2214 | #endif | 2216 | #endif |
2215 | fileMenu->insertSeparator(); | 2217 | fileMenu->insertSeparator(); |
2216 | mActionQuit->plug( fileMenu ); | 2218 | mActionQuit->plug( fileMenu ); |
2217 | #ifdef _OL_IMPORT_ | 2219 | #ifdef _OL_IMPORT_ |
2218 | mActionImportOL->plug( ImportMenu ); | 2220 | mActionImportOL->plug( ImportMenu ); |
2219 | #endif | 2221 | #endif |
2220 | // edit menu | 2222 | // edit menu |
2221 | mActionUndo->plug( editMenu ); | 2223 | mActionUndo->plug( editMenu ); |
2222 | mActionRedo->plug( editMenu ); | 2224 | mActionRedo->plug( editMenu ); |
2223 | editMenu->insertSeparator(); | 2225 | editMenu->insertSeparator(); |
2224 | mActionCut->plug( editMenu ); | 2226 | mActionCut->plug( editMenu ); |
2225 | mActionCopy->plug( editMenu ); | 2227 | mActionCopy->plug( editMenu ); |
@@ -2228,68 +2230,66 @@ void KABCore::addActionsManually() | |||
2228 | editMenu->insertSeparator(); | 2230 | editMenu->insertSeparator(); |
2229 | mActionSelectAll->plug( editMenu ); | 2231 | mActionSelectAll->plug( editMenu ); |
2230 | 2232 | ||
2231 | mActionSetFormattedName->plug( changeMenu ); | 2233 | mActionSetFormattedName->plug( changeMenu ); |
2232 | mActionRemoveVoice->plug( changeMenu ); | 2234 | mActionRemoveVoice->plug( changeMenu ); |
2233 | // settingsmings menu | 2235 | // settingsmings menu |
2234 | //US special menuentry to configure the addressbook resources. On KDE | 2236 | //US special menuentry to configure the addressbook resources. On KDE |
2235 | // you do that through the control center !!! | 2237 | // you do that through the control center !!! |
2236 | // settingsMenu->insertSeparator(); | 2238 | // settingsMenu->insertSeparator(); |
2237 | 2239 | ||
2238 | mActionConfigKAddressbook->plug( settingsMenu, 0 ); | 2240 | mActionConfigKAddressbook->plug( settingsMenu, 0 ); |
2239 | mActionConfigResources->plug( settingsMenu,1 ); | 2241 | mActionConfigResources->plug( settingsMenu,1 ); |
2240 | settingsMenu->insertSeparator(2); | 2242 | settingsMenu->insertSeparator(2); |
2241 | 2243 | ||
2242 | if ( mIsPart ) { | 2244 | if ( mIsPart ) { |
2243 | //US not implemented yet | 2245 | //US not implemented yet |
2244 | //mActionConfigShortcuts->plug( settingsMenu ); | 2246 | //mActionConfigShortcuts->plug( settingsMenu ); |
2245 | //mActionConfigureToolbars->plug( settingsMenu ); | 2247 | //mActionConfigureToolbars->plug( settingsMenu ); |
2246 | 2248 | ||
2247 | } else { | 2249 | } else { |
2248 | //US not implemented yet | 2250 | //US not implemented yet |
2249 | //mActionKeyBindings->plug( settingsMenu ); | 2251 | //mActionKeyBindings->plug( settingsMenu ); |
2250 | } | 2252 | } |
2251 | 2253 | ||
2252 | settingsMenu->insertSeparator(); | 2254 | mActionEditCategories->plug( settingsMenu ); |
2253 | 2255 | mActionManageCategories->plug( settingsMenu ); | |
2254 | mActionJumpBar->plug( settingsMenu ); | 2256 | mActionJumpBar->plug( viewMenu,0 ); |
2255 | mActionDetails->plug( settingsMenu ); | 2257 | mActionDetails->plug( viewMenu,0 ); |
2256 | //if (!KABPrefs::instance()->mMultipleViewsAtOnce || KGlobal::getDesktopSize() == KGlobal::Desktop ) | 2258 | //if (!KABPrefs::instance()->mMultipleViewsAtOnce || KGlobal::getDesktopSize() == KGlobal::Desktop ) |
2257 | mActionDetails->plug( tb ); | 2259 | mActionDetails->plug( tb ); |
2258 | settingsMenu->insertSeparator(); | 2260 | settingsMenu->insertSeparator(); |
2259 | #ifndef DESKTOP_VERSION | 2261 | #ifndef DESKTOP_VERSION |
2260 | if ( Ir::supported() ) mActionBR->plug(settingsMenu ); | 2262 | if ( Ir::supported() ) mActionBR->plug(settingsMenu ); |
2261 | settingsMenu->insertSeparator(); | 2263 | settingsMenu->insertSeparator(); |
2262 | #endif | 2264 | #endif |
2263 | 2265 | ||
2264 | mActionWhoAmI->plug( settingsMenu ); | 2266 | mActionWhoAmI->plug( settingsMenu ); |
2265 | mActionEditCategories->plug( settingsMenu ); | 2267 | //mActionEditCategories->plug( changeMenu ); |
2266 | mActionEditCategories->plug( changeMenu ); | ||
2267 | mActionCategories->plug( changeMenu ); | 2268 | mActionCategories->plug( changeMenu ); |
2268 | mActionManageCategories->plug( changeMenu ); | 2269 | //mActionManageCategories->plug( changeMenu ); |
2269 | 2270 | ||
2270 | mActionCategories->plug( settingsMenu ); | 2271 | //mActionCategories->plug( settingsMenu ); |
2271 | mActionManageCategories->plug( settingsMenu ); | ||
2272 | 2272 | ||
2273 | 2273 | ||
2274 | mActionWN->plug( helpMenu ); | 2274 | mActionWN->plug( helpMenu ); |
2275 | mActionSyncHowto->plug( helpMenu ); | 2275 | mActionSyncHowto->plug( helpMenu ); |
2276 | mActionKdeSyncHowto->plug( helpMenu ); | 2276 | mActionKdeSyncHowto->plug( helpMenu ); |
2277 | mActionMultiSyncHowto->plug( helpMenu ); | 2277 | mActionMultiSyncHowto->plug( helpMenu ); |
2278 | mActionFaq->plug( helpMenu ); | 2278 | mActionFaq->plug( helpMenu ); |
2279 | mActionLicence->plug( helpMenu ); | 2279 | mActionLicence->plug( helpMenu ); |
2280 | mActionAboutKAddressbook->plug( helpMenu ); | 2280 | mActionAboutKAddressbook->plug( helpMenu ); |
2281 | 2281 | ||
2282 | if (KGlobal::getDesktopSize() > KGlobal::Small ) { | 2282 | if (KGlobal::getDesktopSize() > KGlobal::Small ) { |
2283 | 2283 | ||
2284 | mActionSave->plug( tb ); | 2284 | mActionSave->plug( tb ); |
2285 | mViewManager->getFilterAction()->plug ( tb); | 2285 | mViewManager->getFilterAction()->plug ( tb); |
2286 | //LR hide filteraction on started in 480x640 | 2286 | //LR hide filteraction on started in 480x640 |
2287 | if (QApplication::desktop()->width() == 480 ) { | 2287 | if (QApplication::desktop()->width() == 480 ) { |
2288 | mViewManager->getFilterAction()->setComboWidth( 0 ); | 2288 | mViewManager->getFilterAction()->setComboWidth( 0 ); |
2289 | } | 2289 | } |
2290 | mActionUndo->plug( tb ); | 2290 | mActionUndo->plug( tb ); |
2291 | mActionDelete->plug( tb ); | 2291 | mActionDelete->plug( tb ); |
2292 | mActionRedo->plug( tb ); | 2292 | mActionRedo->plug( tb ); |
2293 | } else { | 2293 | } else { |
2294 | mActionSave->plug( tb ); | 2294 | mActionSave->plug( tb ); |
2295 | tb->enableMoving(false); | 2295 | tb->enableMoving(false); |