kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-10-28 03:21:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

revert last commit, it leads to the uncommon behavior that the last state of the settings dialog is remembered (grmpf - I should do more testing... ;-))

Browse source 
svn path=/trunk/KDE/kdebase/apps/; revision=661511
This commit is contained in:
Peter Penz 2007-05-05 21:02:04 +00:00
parent d00a895131
commit 5f87a8130e
3 changed files with 15 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/dolphinmainwindow.cpp
View file

@ -950,7 +950,8 @@ void DolphinMainWindow::compareFiles()
void DolphinMainWindow::editSettings()
{
DolphinSettingsDialog::instance(this).exec();
DolphinSettingsDialog dialog(this);
dialog.exec();
}
void DolphinMainWindow::init()

33
src/dolphinsettingsdialog.cpp
View file

@ -26,27 +26,6 @@
#include "dolphinapplication.h"
#include "dolphinmainwindow.h"
DolphinSettingsDialog& DolphinSettingsDialog::instance(DolphinMainWindow* mainWindow)
{
static DolphinSettingsDialog* instance = 0;
if (instance == 0) {
instance = new DolphinSettingsDialog(mainWindow);
}
return *instance;
}
DolphinSettingsDialog::~DolphinSettingsDialog()
{
}
void DolphinSettingsDialog::slotButtonClicked(int button)
{
if (button == Ok || button == Apply) {
applySettings();
}
KPageDialog::slotButtonClicked(button);
}
DolphinSettingsDialog::DolphinSettingsDialog(DolphinMainWindow* mainWindow) :
KPageDialog(),
m_mainWindow(mainWindow)
@ -68,6 +47,18 @@ DolphinSettingsDialog::DolphinSettingsDialog(DolphinMainWindow* mainWindow) :
viewSettingsFrame->setIcon(KIcon("view-choose"));
}
DolphinSettingsDialog::~DolphinSettingsDialog()
{
}
void DolphinSettingsDialog::slotButtonClicked(int button)
{
if (button == Ok || button == Apply) {
applySettings();
}
KPageDialog::slotButtonClicked(button);
}
void DolphinSettingsDialog::applySettings()
{
m_generalSettingsPage->applySettings();

3
src/dolphinsettingsdialog.h
View file

@ -39,14 +39,13 @@ class DolphinSettingsDialog : public KPageDialog
Q_OBJECT
public:
static DolphinSettingsDialog& instance(DolphinMainWindow* mainWindow);
explicit DolphinSettingsDialog(DolphinMainWindow* mainWindow);
virtual ~DolphinSettingsDialog();
protected slots:
virtual void slotButtonClicked(int button);
private:
DolphinSettingsDialog(DolphinMainWindow* mainWindow);
void applySettings();
private: