From d2f00fc2034450bc9a3cd1d2c3510bef1758d3bc Mon Sep 17 00:00:00 2001 From: zautrix Date: Fri, 10 Jun 2005 11:53:12 +0000 Subject: config dialog changes --- 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 @@ -772,6 +772,8 @@ { "Backup directory does not exist: ","Backup Verzeichnis existiert nicht: " }, { "The backup copy command failed!","Das Backup Kopierkommando is fehlgeschlagen!" }, { "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 @@ -275,6 +275,8 @@ { "Error sending queued mail.\nBreaking.","Fehler beim Mailversand.\nAbbruch." }, { "Colors","Farben" }, { "Alternating background of list views","Abwechselnder Hintergrund für Listen" }, +{ "Configure OM/Pi...","Konfiguriere OM/Pi..." }, +{ "Global Settings...","Globale Einstellungen..." }, { "","" }, { "","" }, { "","" }, \ No newline at end of file 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 @@ -367,6 +367,8 @@ { "Backup directory does not exist: ","Backup Verzeichnis existiert nicht: " }, { "The backup copy command failed!","Das Backup Kopierkommando is fehlgeschlagen!" }, { "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 @@ -1627,9 +1627,9 @@ void KABCore::openConfigDialog() this, SLOT( configurationChanged() ) ); 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() ), kabcfg, SLOT( defaults() ) ); @@ -3430,5 +3430,5 @@ QString KABCore::sentSyncFile() 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 @@ -105,10 +105,7 @@ 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 ); + } @@ -228,14 +225,12 @@ void KOPrefsDialog::usrReadConfig() mNameEdit->setText(KOPrefs::instance()->mName); mEmailEdit->setText(KOPrefs::instance()->mEmail); //mCodecEdit->setText(KOPrefs::instance()->mSendCodec); - kdelibcfg->readConfig(); } void KOPrefsDialog::usrWriteConfig() { KOPrefs::instance()->mName = mNameEdit->text(); 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 @@ -61,7 +61,6 @@ protected: void setupMailTab(); void setupFontsTab(); private: - KDEPIMConfigWidget* kdelibcfg; QLineEdit *mNameEdit; QLineEdit *mCodecEdit; QLineEdit *mEmailEdit; diff --git a/kmicromail/mainwindow.cpp b/kmicromail/mainwindow.cpp index 9a52d1b..e3c5ec3 100644 --- a/kmicromail/mainwindow.cpp +++ b/kmicromail/mainwindow.cpp @@ -95,11 +95,21 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) connect( deleteMails, SIGNAL( activated() ), 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 ); editAccounts->addTo( settingsMenu ); @@ -369,6 +379,9 @@ void MainWindow::slotAdjustColumns() 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 @@ -52,6 +52,7 @@ protected slots: virtual void mailHold(int, QListViewItem *,const QPoint&,int); virtual void slotAdjustLayout(); virtual void slotEditSettings(); + virtual void slotEditGlobalSettings(); virtual void mailLeftClicked( QListViewItem * ); void showLicence(); void showAbout(); diff --git a/kmicromail/opiemail.cpp b/kmicromail/opiemail.cpp index 4436ad6..8ac3451 100644 --- a/kmicromail/opiemail.cpp +++ b/kmicromail/opiemail.cpp @@ -244,6 +244,11 @@ 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 @@ -35,6 +35,7 @@ protected slots: virtual void slotSendQueued(); virtual void slotSearchMails(); virtual void slotEditSettings(); + virtual void slotEditGlobalSettings(); virtual void slotEditAccounts(); virtual void displayMail(); virtual void replyMail(); diff --git a/microkde/kdialogbase.cpp b/microkde/kdialogbase.cpp index 11635e1..d5c7e61 100644 --- a/microkde/kdialogbase.cpp +++ b/microkde/kdialogbase.cpp @@ -286,6 +286,11 @@ void KDialogBase::slotClose() reject(); } +void KDialogBase::accept () +{ + emit acceptClicked(); + KDialog::accept(); +} void KDialogBase::slotUser1() { emit user1Clicked(); diff --git a/microkde/kdialogbase.h b/microkde/kdialogbase.h index a2fc2dc..17c186b 100644 --- a/microkde/kdialogbase.h +++ b/microkde/kdialogbase.h @@ -107,6 +107,8 @@ class KDialogBase : public KDialog void closeClicked(); void defaultClicked(); + void acceptClicked(); + protected slots: virtual void slotOk(); virtual void slotApply(); @@ -114,7 +116,7 @@ class KDialogBase : public KDialog virtual void slotClose(); virtual void slotUser1(); virtual void slotUser2(); - + virtual void accept (); protected: QPushButton *findButton( ButtonCode ); QTabWidget *tabWidget(); 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 @@ -36,6 +36,7 @@ class KCMPwmConfig : public KCModule public: KCMPwmConfig(QWidget *parent = 0, const char *name = 0 ); + public slots: virtual void load(); virtual void save(); virtual void defaults(); 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 @@ -37,6 +37,7 @@ #include #include #include +#include #include #include #include @@ -74,7 +75,6 @@ # include "pwmkeycard.h" #endif - #define DEFAULT_SIZE (QSize(700, 400)) // Button IDs for "file" popup menu @@ -117,7 +117,8 @@ 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 #endif @@ -359,9 +360,13 @@ void PwM::initMenubar() menuBar()->insertItem(i18n("&View"), viewPopup); // "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(); managePopup->insertItem(i18n("&Options"), optionsPopup); @@ -851,11 +856,16 @@ void PwM::unlockWnd_slot() PWM_ASSERT(curDoc()); 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 ); KCMPwmConfig* pwmcfg = new KCMPwmConfig( ConfigureDialog->getNewVBoxPage(i18n( "PwManager")) , "KCMPwmConfig" ); @@ -863,19 +873,34 @@ 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(); // reinitialize tray 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 @@ -165,6 +165,7 @@ public slots: void find_slot(); /** 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); /** generate a new chipcard */ -- cgit v0.9.0.2