author | zautrix <zautrix> | 2005-03-30 17:55:57 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-03-30 17:55:57 (UTC) |
commit | 0d8be3961052dc4396aa7db1c5f50db3ec1ac194 (patch) (unidiff) | |
tree | f823a8b81413f16f861c9c91ef753d3627577cb2 | |
parent | 95ec57b2f9df64dc40067c3a2278438029517f4c (diff) | |
download | kdepimpi-0d8be3961052dc4396aa7db1c5f50db3ec1ac194.zip kdepimpi-0d8be3961052dc4396aa7db1c5f50db3ec1ac194.tar.gz kdepimpi-0d8be3961052dc4396aa7db1c5f50db3ec1ac194.tar.bz2 |
MENU CLEANUP
-rw-r--r-- | kaddressbook/extensionmanager.cpp | 4 | ||||
-rw-r--r-- | kaddressbook/kabcore.cpp | 28 | ||||
-rw-r--r-- | kaddressbook/viewmanager.cpp | 2 |
3 files changed, 17 insertions, 17 deletions
diff --git a/kaddressbook/extensionmanager.cpp b/kaddressbook/extensionmanager.cpp index efbdf17..46defa1 100644 --- a/kaddressbook/extensionmanager.cpp +++ b/kaddressbook/extensionmanager.cpp | |||
@@ -33,40 +33,40 @@ | |||
33 | #include <features/mergewidget.h> | 33 | #include <features/mergewidget.h> |
34 | #include <features/distributionlistwidget.h> | 34 | #include <features/distributionlistwidget.h> |
35 | #endif //KAB_EMBEDDED | 35 | #endif //KAB_EMBEDDED |
36 | 36 | ||
37 | #include "addresseeeditorwidget.h" | 37 | #include "addresseeeditorwidget.h" |
38 | #include "kabcore.h" | 38 | #include "kabcore.h" |
39 | #include "kabprefs.h" | 39 | #include "kabprefs.h" |
40 | 40 | ||
41 | #include "extensionmanager.h" | 41 | #include "extensionmanager.h" |
42 | 42 | ||
43 | ExtensionManager::ExtensionManager( KABCore *core, QWidget *parent, | 43 | ExtensionManager::ExtensionManager( KABCore *core, QWidget *parent, |
44 | const char *name ) | 44 | const char *name ) |
45 | : QScrollView( parent, name ), mCore( core ), mCurrentExtensionWidget( 0 ) | 45 | : QScrollView( parent, name ), mCore( core ), mCurrentExtensionWidget( 0 ) |
46 | { | 46 | { |
47 | #ifdef KAB_EMBEDDED | 47 | #ifdef KAB_EMBEDDED |
48 | //US QPopupMenu *settingsmenu = (QPopupMenu*)mCore->getSettingsMenu(); | 48 | //US QPopupMenu *settingsmenu = (QPopupMenu*)mCore->getSettingsMenu(); |
49 | QWidget *settingsmenu = (QWidget*)mCore->getSettingsMenu(); | 49 | QWidget *settingsmenu = (QWidget*)mCore->getViewMenu(); |
50 | #endif //KAB_EMBEDDED | 50 | #endif //KAB_EMBEDDED |
51 | 51 | ||
52 | mActionExtensions = new KSelectAction( i18n( "Show Extension Bar" ), 0, | 52 | mActionExtensions = new KSelectAction( i18n( "Show Extension Bar" ), 0, |
53 | mCore->actionCollection(), | 53 | mCore->actionCollection(), |
54 | "options_show_extensions" ); | 54 | "options_show_extensions" ); |
55 | 55 | ||
56 | mActionExtensions->plug( settingsmenu ); | 56 | mActionExtensions->plug( settingsmenu ,0); |
57 | 57 | ||
58 | connect( mActionExtensions, SIGNAL( activated( int ) ), | 58 | connect( mActionExtensions, SIGNAL( activated( int ) ), |
59 | SLOT( setActiveExtension( int ) ) ); | 59 | SLOT( setActiveExtension( int ) ) ); |
60 | mWidgetBox = new QWidget( viewport() ); | 60 | mWidgetBox = new QWidget( viewport() ); |
61 | new QHBoxLayout (mWidgetBox ); | 61 | new QHBoxLayout (mWidgetBox ); |
62 | addChild( mWidgetBox ); | 62 | addChild( mWidgetBox ); |
63 | setResizePolicy(AutoOneFit); | 63 | setResizePolicy(AutoOneFit); |
64 | createExtensionWidgets(); | 64 | createExtensionWidgets(); |
65 | hide(); | 65 | hide(); |
66 | } | 66 | } |
67 | 67 | ||
68 | ExtensionManager::~ExtensionManager() | 68 | ExtensionManager::~ExtensionManager() |
69 | { | 69 | { |
70 | } | 70 | } |
71 | 71 | ||
72 | void ExtensionManager::restoreSettings() | 72 | void ExtensionManager::restoreSettings() |
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index 1433568..5ef61b1 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp | |||
@@ -2117,33 +2117,33 @@ void KABCore::initActions() | |||
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 |
@@ -2173,45 +2173,47 @@ void KABCore::addActionsManually() | |||
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_ |
@@ -2236,52 +2238,50 @@ void KABCore::addActionsManually() | |||
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 ) { |
diff --git a/kaddressbook/viewmanager.cpp b/kaddressbook/viewmanager.cpp index c2b1bb0..86f0f3d 100644 --- a/kaddressbook/viewmanager.cpp +++ b/kaddressbook/viewmanager.cpp | |||
@@ -707,31 +707,31 @@ void ViewManager::initActions() | |||
707 | viewmenu->insertSeparator(); | 707 | viewmenu->insertSeparator(); |
708 | #endif //KAB_EMBEDDED | 708 | #endif //KAB_EMBEDDED |
709 | 709 | ||
710 | action = new KAction( i18n( "Edit &Filters..." ), "filter", 0, this, | 710 | action = new KAction( i18n( "Edit &Filters..." ), "filter", 0, this, |
711 | SLOT( configureFilters() ), mCore->actionCollection(), | 711 | SLOT( configureFilters() ), mCore->actionCollection(), |
712 | "options_edit_filters" ); | 712 | "options_edit_filters" ); |
713 | 713 | ||
714 | mActionSelectFilter = new KSelectAction( i18n( "Select Filter" ), "filter", mCore->actionCollection(), "select_filter" ); | 714 | mActionSelectFilter = new KSelectAction( i18n( "Select Filter" ), "filter", mCore->actionCollection(), "select_filter" ); |
715 | #if KDE_VERSION >= 309 | 715 | #if KDE_VERSION >= 309 |
716 | mActionSelectFilter->setMenuAccelsEnabled( false ); | 716 | mActionSelectFilter->setMenuAccelsEnabled( false ); |
717 | #endif | 717 | #endif |
718 | connect( mActionSelectFilter, SIGNAL( activated( int ) ), | 718 | connect( mActionSelectFilter, SIGNAL( activated( int ) ), |
719 | SLOT( setActiveFilter( int ) ) ); | 719 | SLOT( setActiveFilter( int ) ) ); |
720 | 720 | ||
721 | #ifdef KAB_EMBEDDED | 721 | #ifdef KAB_EMBEDDED |
722 | action->plug(settingsmenu); | 722 | action->plug(settingsmenu); |
723 | mActionSelectFilter->plug(viewmenu); | 723 | mActionSelectFilter->plug(viewmenu,0); |
724 | #endif //KAB_EMBEDDED | 724 | #endif //KAB_EMBEDDED |
725 | 725 | ||
726 | } | 726 | } |
727 | 727 | ||
728 | void ViewManager::initGUI() | 728 | void ViewManager::initGUI() |
729 | { | 729 | { |
730 | QHBoxLayout *layout = new QHBoxLayout( this, 0, 0 ); | 730 | QHBoxLayout *layout = new QHBoxLayout( this, 0, 0 ); |
731 | mViewWidgetStack = new QWidgetStack( this ); | 731 | mViewWidgetStack = new QWidgetStack( this ); |
732 | layout->addWidget( mViewWidgetStack ); | 732 | layout->addWidget( mViewWidgetStack ); |
733 | } | 733 | } |
734 | 734 | ||
735 | #ifndef KAB_EMBEDDED | 735 | #ifndef KAB_EMBEDDED |
736 | #include "viewmanager.moc" | 736 | #include "viewmanager.moc" |
737 | #endif //KAB_EMBEDDED | 737 | #endif //KAB_EMBEDDED |