forward port Anders' fix: r493645

Save/apply mainwindow settings before/after configurint toolbars, so that configuration isn't lost.
Fixed in kwrite and kate 
CCBUG: 119303

Used KGlobal::config() instead of non-existant KateApp::self()->config()


svn path=/trunk/KDE/kdebase/apps/; revision=535355
This commit is contained in:
Dominik Haumann 2006-04-29 12:03:13 +00:00
parent ab8d329bb0
commit 585324cb53
2 changed files with 14 additions and 12 deletions

View file

@ -338,23 +338,19 @@ void KWrite::editKeys()
void KWrite::editToolbars()
{
saveMainWindowSettings( KGlobal::config(), "MainWindow" );
KEditToolbar *dlg = new KEditToolbar(guiFactory());
if (dlg->exec())
{
KParts::GUIActivateEvent ev1( false );
QApplication::sendEvent( m_view, &ev1 );
guiFactory()->removeClient( m_view );
createShellGUI( false );
createShellGUI( true );
guiFactory()->addClient( m_view );
KParts::GUIActivateEvent ev2( true );
QApplication::sendEvent( m_view, &ev2 );
}
connect( dlg, SIGNAL(newToolbarConfig()), this, SLOT(slotNewToolbarConfig()) );
dlg->exec();
delete dlg;
}
void KWrite::slotNewToolbarConfig()
{
applyMainWindowSettings( KGlobal::config(), "MainWindow" );
}
void KWrite::dragEnterEvent( QDragEnterEvent *event )
{
KUrl::List uriList = KUrl::List::fromMimeData( event->mimeData() );
@ -816,3 +812,5 @@ void KWriteEditorChooser::slotOk()
m_chooser->writeAppSetting();
slotButtonClicked(KDialog::Ok);
}
// kate: space-indent on; indent-width 2; replace-tabs on; mixed-indent off;

View file

@ -76,6 +76,9 @@ class KWrite : public KParts::MainWindow
void changeEditor();
void aboutEditor();
private Q_SLOTS:
void slotNewToolbarConfig();
public Q_SLOTS:
void slotDropEvent(QDropEvent *);
@ -159,3 +162,4 @@ class KWriteEditorChooser: public KDialog
};
#endif
// kate: space-indent on; indent-width 2; replace-tabs on; mixed-indent off;