author | eilers <eilers> | 2003-03-27 11:56:44 (UTC) |
---|---|---|
committer | eilers <eilers> | 2003-03-27 11:56:44 (UTC) |
commit | ff43585778968407bb08473e45ddd1d942f8d8c8 (patch) (side-by-side diff) | |
tree | 7f9b364543337ee14c93175b7a0d02d9a61d8608 /core/pim/addressbook/addressbook.cpp | |
parent | 7a7370388ef30efd303c3ffb4f84b8e8f6830db9 (diff) | |
download | opie-ff43585778968407bb08473e45ddd1d942f8d8c8.zip opie-ff43585778968407bb08473e45ddd1d942f8d8c8.tar.gz opie-ff43585778968407bb08473e45ddd1d942f8d8c8.tar.bz2 |
Bugfix: If menu-button is pressed, the mainmenu will now open as expected
To have the same look and feel as the other pim applications,
the moveable toolbar is disabled. This behaviour is changeable in the configuration.
Diffstat (limited to 'core/pim/addressbook/addressbook.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | core/pim/addressbook/addressbook.cpp | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/core/pim/addressbook/addressbook.cpp b/core/pim/addressbook/addressbook.cpp index 14e5b3f..a5bf19b 100644 --- a/core/pim/addressbook/addressbook.cpp +++ b/core/pim/addressbook/addressbook.cpp @@ -87,21 +87,30 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name, setIcon( Resource::loadPixmap( "AddressBook" ) ); // Settings for Main Menu - setToolBarsMovable( true ); + // setToolBarsMovable( false ); + setToolBarsMovable( !m_config.fixedBars() ); setRightJustification( true ); - // Create Toolbar - listTools = new QPEToolBar( this, "list operations" ); - listTools->setHorizontalStretchable( true ); - addToolBar( listTools ); - moveToolBar( listTools, m_config.getToolBarPos() ); + QPEToolBar *bar = new QPEToolBar( this ); + bar->setHorizontalStretchable( TRUE ); - QPEMenuBar *mbList = new QPEMenuBar( this ); + QPEMenuBar *mbList = new QPEMenuBar( bar ); mbList->setMargin( 0 ); QPopupMenu *edit = new QPopupMenu( mbList ); mbList->insertItem( tr( "Contact" ), edit ); + // Category Menu + catMenu = new QPopupMenu( this ); + catMenu->setCheckable( TRUE ); + connect( catMenu, SIGNAL(activated(int)), this, SLOT(slotSetCategory(int)) ); + mbList->insertItem( tr("View"), catMenu ); + + // Create Toolbar + listTools = new QPEToolBar( this, "list operations" ); + listTools->setHorizontalStretchable( true ); + addToolBar( listTools ); + moveToolBar( listTools, m_config.getToolBarPos() ); // View Icons m_tableViewButton = new QAction( tr( "List" ), Resource::loadPixmap( "addressbook/weeklst" ), @@ -243,13 +252,10 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name, vb->addWidget( pLabel ); - // Category Menu - catMenu = new QPopupMenu( this ); - catMenu->setCheckable( TRUE ); - connect( catMenu, SIGNAL(activated(int)), this, SLOT(slotSetCategory(int)) ); + // All Categories into view-menu.. populateCategories(); - mbList->insertItem( tr("View"), catMenu ); + // Fontsize defaultFont = new QFont( m_abView->font() ); slotSetFont(m_config.fontSize()); m_curFontSize = m_config.fontSize(); |