CVS commit by mueller: remove setupGUI stuff, this doesn't exist in this branch yet M +11 -2 kfax.cpp 1.90.2.2 --- kdegraphics/kfax/kfax.cpp #1.90.2.1:1.90.2.2 @@ -200,8 +200,10 @@ TopLevel::TopLevel (QWidget *, const cha setupMenuBar(); setupStatusBar(); + setStandardToolBarMenuEnabled( true ); + updateActions(); resize(550,400); - setupGUI(); + createGUI(); readSettings(); @@ -248,4 +250,6 @@ void TopLevel::setupMenuBar() actPrint = KStdAction::print( this, SLOT( print() ), actionCollection() ); KStdAction::quit( this, SLOT( close() ), actionCollection() ); + KStdAction::keyBindings(guiFactory(), SLOT(configureShortcuts()), +actionCollection()); actAdd = new KAction( i18n( "&Add..." ), "filenew", KShortcut(), this, SLOT( faxAdd() ), actionCollection(), "file_add_fax" ); @@ -276,4 +280,9 @@ void TopLevel::setupMenuBar() // Settings menu + createStandardStatusBarAction(); + setStandardToolBarMenuEnabled(true); + + + createStandardStatusBarAction(); KStdAction::preferences( this, SLOT( faxoptions() ), actionCollection() ); }