summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--kaddressbook/extensionmanager.cpp4
-rw-r--r--kaddressbook/kabcore.cpp28
-rw-r--r--kaddressbook/viewmanager.cpp2
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
@@ -43,20 +43,20 @@
43ExtensionManager::ExtensionManager( KABCore *core, QWidget *parent, 43ExtensionManager::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 );
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 1433568..5ef61b1 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -2127,13 +2127,13 @@ void KABCore::addActionsManually()
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.
@@ -2183,25 +2183,27 @@ void KABCore::addActionsManually()
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();
@@ -2246,32 +2248,30 @@ void KABCore::addActionsManually()
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 );
diff --git a/kaddressbook/viewmanager.cpp b/kaddressbook/viewmanager.cpp
index c2b1bb0..86f0f3d 100644
--- a/kaddressbook/viewmanager.cpp
+++ b/kaddressbook/viewmanager.cpp
@@ -717,13 +717,13 @@ void ViewManager::initActions()
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
728void ViewManager::initGUI() 728void ViewManager::initGUI()
729{ 729{