summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--bin/kdepim/kaddressbook/germantranslation.txt2
-rw-r--r--bin/kdepim/kopiemail/germantranslation.txt2
-rw-r--r--bin/kdepim/pwmanager/germantranslation.txt2
-rw-r--r--kaddressbook/kabcore.cpp6
-rw-r--r--kmicromail/koprefsdialog.cpp7
-rw-r--r--kmicromail/koprefsdialog.h1
-rw-r--r--kmicromail/mainwindow.cpp15
-rw-r--r--kmicromail/mainwindow.h1
-rw-r--r--kmicromail/opiemail.cpp5
-rw-r--r--kmicromail/opiemail.h1
-rw-r--r--microkde/kdialogbase.cpp5
-rw-r--r--microkde/kdialogbase.h4
-rw-r--r--pwmanager/pwmanager/kcmconfigs/kcmpwmconfig.h1
-rw-r--r--pwmanager/pwmanager/pwm.cpp45
-rw-r--r--pwmanager/pwmanager/pwm.h1
15 files changed, 76 insertions, 22 deletions
diff --git a/bin/kdepim/kaddressbook/germantranslation.txt b/bin/kdepim/kaddressbook/germantranslation.txt
index e076e1e..d6bf118 100644
--- a/bin/kdepim/kaddressbook/germantranslation.txt
+++ b/bin/kdepim/kaddressbook/germantranslation.txt
@@ -773,4 +773,6 @@
{ "<b>The backup copy command failed!</b>","<b>Das Backup Kopierkommando is fehlgeschlagen!</b>" },
{ "Choose action","Wähle Aktion" },
+{ "&Configure KA/Pi...","Konfiguriere KA/Pi..." },
+{ "Global Settings...","Globale Einstellungen..." },
{ "","" },
{ "","" },
diff --git a/bin/kdepim/kopiemail/germantranslation.txt b/bin/kdepim/kopiemail/germantranslation.txt
index 75fdd11..14e5c0b 100644
--- a/bin/kdepim/kopiemail/germantranslation.txt
+++ b/bin/kdepim/kopiemail/germantranslation.txt
@@ -276,4 +276,6 @@
{ "Colors","Farben" },
{ "Alternating background of list views","Abwechselnder Hintergrund für Listen" },
+{ "Configure OM/Pi...","Konfiguriere OM/Pi..." },
+{ "Global Settings...","Globale Einstellungen..." },
{ "","" },
{ "","" },
diff --git a/bin/kdepim/pwmanager/germantranslation.txt b/bin/kdepim/pwmanager/germantranslation.txt
index 06fa727..255f2eb 100644
--- a/bin/kdepim/pwmanager/germantranslation.txt
+++ b/bin/kdepim/pwmanager/germantranslation.txt
@@ -368,4 +368,6 @@
{ "<b>The backup copy command failed!</b>","<b>Das Backup Kopierkommando is fehlgeschlagen!</b>" },
{ "Choose action","Wähle Aktion" },
+{ "&Configure PwM/Pi...","Konfiguriere PwM/Pi..." },
+{ "Global Settings...","Globale Einstellungen..." },
{ "","" },
{ "","" },
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index cd833cf..b107e2d 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -1628,7 +1628,7 @@ void KABCore::openConfigDialog()
connect( ConfigureDialog, SIGNAL( applyClicked() ),
kabcfg, SLOT( save() ) );
- connect( ConfigureDialog, SIGNAL( okClicked() ),
+ connect( ConfigureDialog, SIGNAL( acceptClicked() ),
this, SLOT( configurationChanged() ) );
- connect( ConfigureDialog, SIGNAL( okClicked() ),
+ connect( ConfigureDialog, SIGNAL( acceptClicked() ),
kabcfg, SLOT( save() ) );
connect( ConfigureDialog, SIGNAL( defaultClicked() ),
@@ -3431,4 +3431,4 @@ void KABCore::setCaptionBack()
{
mMessageTimer->stop();
- topLevelWidget()->setCaption( i18n("KAddressbook/Pi") );
+ topLevelWidget()->setCaption( i18n("KA/Pi") );
}
diff --git a/kmicromail/koprefsdialog.cpp b/kmicromail/koprefsdialog.cpp
index 7de7064..017f1f7 100644
--- a/kmicromail/koprefsdialog.cpp
+++ b/kmicromail/koprefsdialog.cpp
@@ -106,8 +106,5 @@ KOPrefsDialog::~KOPrefsDialog()
void KOPrefsDialog::setupGlobalTab()
{
- QFrame *topFrame = addPage(i18n("Global"),0,0);
- kdelibcfg = new KDEPIMConfigWidget( KPimGlobalPrefs::instance(), topFrame, "KCMKdeLibConfig" );
- QVBoxLayout *topLayout = new QVBoxLayout(topFrame);
- topLayout->addWidget( kdelibcfg );
+
@@ -229,5 +226,4 @@ void KOPrefsDialog::usrReadConfig()
mEmailEdit->setText(KOPrefs::instance()->mEmail);
//mCodecEdit->setText(KOPrefs::instance()->mSendCodec);
- kdelibcfg->readConfig();
}
void KOPrefsDialog::usrWriteConfig()
@@ -236,5 +232,4 @@ void KOPrefsDialog::usrWriteConfig()
KOPrefs::instance()->mEmail = mEmailEdit->text();
//KOPrefs::instance()->mSendCodec = mCodecEdit->text();
- kdelibcfg->writeConfig();
diff --git a/kmicromail/koprefsdialog.h b/kmicromail/koprefsdialog.h
index a0416ae..7fa9261 100644
--- a/kmicromail/koprefsdialog.h
+++ b/kmicromail/koprefsdialog.h
@@ -62,5 +62,4 @@ protected:
void setupFontsTab();
private:
- KDEPIMConfigWidget* kdelibcfg;
QLineEdit *mNameEdit;
QLineEdit *mCodecEdit;
diff --git a/kmicromail/mainwindow.cpp b/kmicromail/mainwindow.cpp
index 9a52d1b..e3c5ec3 100644
--- a/kmicromail/mainwindow.cpp
+++ b/kmicromail/mainwindow.cpp
@@ -96,9 +96,19 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
SLOT( slotDeleteAllMail() ) );
- editSettings = new QAction( i18n( "Edit settings" ), SmallIcon("SettingsIcon") ,
+ editSettings = new QAction( i18n( "Configure OM/Pi..." ), SmallIcon("SettingsIcon") ,
0, 0, this );
editSettings->addTo( settingsMenu );
connect( editSettings, SIGNAL( activated() ),
SLOT( slotEditSettings() ) );
+
+
+ QAction * editSettings2 = new QAction( i18n( "Global Settings..." ), SmallIcon("SettingsIcon") ,
+ 0, 0, this );
+ editSettings2->addTo( settingsMenu );
+ connect( editSettings2, SIGNAL( activated() ),
+ SLOT( slotEditGlobalSettings() ) );
+
+
+
editAccounts = new QAction( i18n( "Configure accounts" ), SmallIcon("editaccounts") ,
0, 0, this );
@@ -370,4 +380,7 @@ void MainWindow::slotEditSettings()
{
}
+void MainWindow::slotEditGlobalSettings()
+{
+}
void MainWindow::slotShowFolders( bool )
diff --git a/kmicromail/mainwindow.h b/kmicromail/mainwindow.h
index ddb3fca..6894039 100644
--- a/kmicromail/mainwindow.h
+++ b/kmicromail/mainwindow.h
@@ -53,4 +53,5 @@ protected slots:
virtual void slotAdjustLayout();
virtual void slotEditSettings();
+ virtual void slotEditGlobalSettings();
virtual void mailLeftClicked( QListViewItem * );
void showLicence();
diff --git a/kmicromail/opiemail.cpp b/kmicromail/opiemail.cpp
index 4436ad6..8ac3451 100644
--- a/kmicromail/opiemail.cpp
+++ b/kmicromail/opiemail.cpp
@@ -245,4 +245,9 @@ void OpieMail::slotSearchMails()
qDebug("OpieMail::slotSearchMails():not implemented ");
}
+void OpieMail::slotEditGlobalSettings()
+{
+ KPimPrefsGlobalDialog gc ( this );
+ gc.exec();
+}
void OpieMail::slotEditSettings()
diff --git a/kmicromail/opiemail.h b/kmicromail/opiemail.h
index 4f75b3f..48c5dda 100644
--- a/kmicromail/opiemail.h
+++ b/kmicromail/opiemail.h
@@ -36,4 +36,5 @@ protected slots:
virtual void slotSearchMails();
virtual void slotEditSettings();
+ virtual void slotEditGlobalSettings();
virtual void slotEditAccounts();
virtual void displayMail();
diff --git a/microkde/kdialogbase.cpp b/microkde/kdialogbase.cpp
index 11635e1..d5c7e61 100644
--- a/microkde/kdialogbase.cpp
+++ b/microkde/kdialogbase.cpp
@@ -287,4 +287,9 @@ void KDialogBase::slotClose()
}
+void KDialogBase::accept ()
+{
+ emit acceptClicked();
+ KDialog::accept();
+}
void KDialogBase::slotUser1()
{
diff --git a/microkde/kdialogbase.h b/microkde/kdialogbase.h
index a2fc2dc..17c186b 100644
--- a/microkde/kdialogbase.h
+++ b/microkde/kdialogbase.h
@@ -108,4 +108,6 @@ class KDialogBase : public KDialog
void defaultClicked();
+ void acceptClicked();
+
protected slots:
virtual void slotOk();
@@ -115,5 +117,5 @@ class KDialogBase : public KDialog
virtual void slotUser1();
virtual void slotUser2();
-
+ virtual void accept ();
protected:
QPushButton *findButton( ButtonCode );
diff --git a/pwmanager/pwmanager/kcmconfigs/kcmpwmconfig.h b/pwmanager/pwmanager/kcmconfigs/kcmpwmconfig.h
index b9ea6b8..2d19680 100644
--- a/pwmanager/pwmanager/kcmconfigs/kcmpwmconfig.h
+++ b/pwmanager/pwmanager/kcmconfigs/kcmpwmconfig.h
@@ -37,4 +37,5 @@ class KCMPwmConfig : public KCModule
KCMPwmConfig(QWidget *parent = 0, const char *name = 0 );
+ public slots:
virtual void load();
virtual void save();
diff --git a/pwmanager/pwmanager/pwm.cpp b/pwmanager/pwmanager/pwm.cpp
index 9c8d12d..e12dc49 100644
--- a/pwmanager/pwmanager/pwm.cpp
+++ b/pwmanager/pwmanager/pwm.cpp
@@ -38,4 +38,5 @@
#include <pwmprefs.h>
#include <kpimglobalprefs.h>
+#include <kprefsdialog.h>
#include <kcmconfigs/kcmpwmconfig.h>
#include <kcmconfigs/kcmkdepimconfig.h>
@@ -75,5 +76,4 @@
#endif
-
#define DEFAULT_SIZE (QSize(700, 400))
@@ -118,5 +118,6 @@ enum {
// Button IDs for "options" popup menu
enum {
- BUTTON_POPUP_OPTIONS_CONFIG = 0
+ BUTTON_POPUP_OPTIONS_CONFIG = 0,
+ BUTTON_POPUP_OPTIONS_GLOBAL_CONFIG
#ifdef PWM_EMBEDDED
,BUTTON_POPUP_OPTIONS_CATEGORY
@@ -360,7 +361,11 @@ void PwM::initMenubar()
// "options" popup menu
optionsPopup->insertItem(QIconSet(picons->loadIcon("configure", KIcon::Small)),
- i18n("&Configure..."), this,
+ i18n("&Configure PwM/Pi..."), this,
SLOT(config_slot()),0,
BUTTON_POPUP_OPTIONS_CONFIG);
+ optionsPopup->insertItem(QIconSet(picons->loadIcon("configure", KIcon::Small)),
+ i18n("Global Settings..."), this,
+ SLOT(config_global_slot()),0,
+ BUTTON_POPUP_OPTIONS_GLOBAL_CONFIG);
if ( QApplication::desktop()->width() <= 240 ) {
managePopup->insertSeparator();
@@ -852,9 +857,14 @@ void PwM::unlockWnd_slot()
curDoc()->lockAll(false);
}
-
+void PwM::config_global_slot()
+{
+ KPimPrefsGlobalDialog gc ( this );
+ gc.exec();
+}
void PwM::config_slot()
{
int oldStyle = conf()->confWndMainViewStyle();
-#ifdef PWM_EMBEDDED
+
+#if 0
KCMultiDialog* ConfigureDialog = new KCMultiDialog( "PIM", this ,"pwmconfigdialog", true );
@@ -864,17 +874,32 @@ void PwM::config_slot()
KCMKdePimConfig* kdelibcfg = new KCMKdePimConfig( ConfigureDialog->getNewVBoxPage(i18n( "Global")) , "KCMKdeLibConfig" );
ConfigureDialog->addModule(kdelibcfg );
+#endif
+
+
+ KDialogBase * ConfigureDialog = new KDialogBase ( KDialogBase::Plain , i18n("Configure KA/Pi"), KDialogBase::Default |KDialogBase::Cancel | KDialogBase::Apply | KDialogBase::Ok, KDialogBase::Ok,0, "name", true, true);
+
+ KCMPwmConfig* kabcfg = new KCMPwmConfig( ConfigureDialog , "KCMpwmConfig" );
+ ConfigureDialog->setMainWidget( kabcfg );
+ connect( ConfigureDialog, SIGNAL( applyClicked() ),
+ kabcfg, SLOT( save() ) );
+ connect( ConfigureDialog, SIGNAL( acceptClicked() ),
+ kabcfg, SLOT( save() ) );
+ connect( ConfigureDialog, SIGNAL( defaultClicked() ),
+ kabcfg, SLOT( defaults() ) );
+ //saveSettings();
+ kabcfg->load();
#ifndef DESKTOP_VERSION
+ if ( QApplication::desktop()->height() <= 480 )
+ ;// ConfigureDialog->hideButtons();
ConfigureDialog->showMaximized();
#endif
+
+
if ( ConfigureDialog->exec() )
KMessageBox::information( this, i18n("Some changes are only\neffective after a restart!\n") );
delete ConfigureDialog;
-#else //PWM_EMBEDDED
- // display the configuration window (modal mode)
- if (!conf()->showConfWnd(this))
- return;
-#endif
+
int newStyle = conf()->confWndMainViewStyle();
diff --git a/pwmanager/pwmanager/pwm.h b/pwmanager/pwmanager/pwm.h
index 9fa9edc..2d1b854 100644
--- a/pwmanager/pwmanager/pwm.h
+++ b/pwmanager/pwmanager/pwm.h
@@ -166,4 +166,5 @@ public slots:
/** configure clicked */
void config_slot();
+ void config_global_slot();
/** (de)activate the "change master pw" button in the menu-bar */
void activateMpButton(bool activate = true);