Summary: | After configuring toolbar, the toolbar does not change | ||
---|---|---|---|
Product: | [Applications] kpilot | Reporter: | Michael Lachmann <dirk> |
Component: | General | Assignee: | groot |
Status: | RESOLVED FIXED | ||
Severity: | normal | ||
Priority: | NOR | ||
Version: | unspecified | ||
Target Milestone: | --- | ||
Platform: | unspecified | ||
OS: | Linux | ||
Latest Commit: | Version Fixed In: |
Description
Michael Lachmann
2003-07-01 15:35:46 UTC
Subject: kdepim/kpilot/kpilot CVS commit by kainhofe: Fixed the toolbar configuration. CCMAIL: 60583-done@bugs.kde.org M +6 -6 kpilot.cc 1.110 M +1 -3 kpilot.h 1.47 --- kdepim/kpilot/kpilot/kpilot.h #1.46:1.47 @@ -161,6 +161,4 @@ protected: private: - KMenuBar* fMenuBar; - KToolBar* fToolBar; bool fQuitAfterCopyComplete; // Used for GUI-less interface KJanusWidget *fManagingWidget; --- kdepim/kpilot/kpilot/kpilot.cc #1.109:1.110 @@ -105,6 +105,4 @@ KPilotInstaller::KPilotInstaller() : "KPilotDaemonIface")), fP(new KPilotPrivate), - fMenuBar(0L), - fToolBar(0L), fQuitAfterCopyComplete(false), fManagingWidget(0L), @@ -582,5 +580,5 @@ void KPilotInstaller::initMenu() (void) KStdAction::keyBindings(this, SLOT(optionsConfigureKeys()), actionCollection()); - (void) KStdAction::configureToolbars(this, SLOT(optionsConfigureKeys()), + (void) KStdAction::configureToolbars(this, SLOT(optionsConfigureToolbars()), actionCollection()); (void) KStdAction::preferences(this, SLOT(slotConfigureKPilot()), @@ -728,5 +726,5 @@ void KPilotInstaller::optionsConfigureTo #endif KEditToolbar dlg(actionCollection()); - connect(&dlg, SIGNAL(newToolbarConfig()), this, SLOT(newToolbarConfig())); + connect(&dlg, SIGNAL(newToolbarConfig()), this, SLOT(slotNewToolbarConfig())); dlg.exec(); } @@ -734,7 +733,8 @@ void KPilotInstaller::optionsConfigureTo void KPilotInstaller::slotNewToolbarConfig() { + FUNCTIONSETUP; // recreate our GUI createGUI(); -#if KDE_VERSION >= 0x030180 +#if KDE_VERSION >= 0x030100 applyMainWindowSettings( KGlobal::config(), autoSaveGroup() ); #endif |