[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdepim/kalarm
From:       David Jarvie <software () astrojar ! org ! uk>
Date:       2006-12-09 0:06:10
Message-ID: 1165622770.326353.29711.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 611624 by djarvie:

Fix crash on activation

 M  +9 -15     editdlg.cpp  


--- trunk/KDE/kdepim/kalarm/editdlg.cpp #611623:611624
@@ -187,7 +187,11 @@
 	setObjectName(mTemplate ? "TemplEditDlg" : "EditDlg");    // used by LikeBack
 	setCaption(caption);
 	setButtons((readOnly ? Cancel|Try : Template ? Ok|Cancel|Try : Ok|Cancel|Try|Default));
-	setDefaultButton(Cancel);
+	setDefaultButton(readOnly ? Cancel : Ok);
+	setButtonText(Default, i18n("Load Template..."));
+	connect(this, SIGNAL(okClicked()), SLOT(slotOk()));
+	connect(this, SIGNAL(tryClicked()), SLOT(slotTry()));
+	connect(this, SIGNAL(defaultClicked()), SLOT(slotDefault()));
 	switch (getResource)
 	{
 		case RES_USE_EVENT_ID:
@@ -205,8 +209,6 @@
 			mResourceEventId.clear();
 			break;
 	}
-	setDefaultButton(readOnly ? Cancel : Ok);
-	setButtonText(Default, i18n("Load Template..."));
 	KVBox* mainWidget = new KVBox(this);
 	mainWidget->setMargin(0);
 	setMainWidget(mainWidget);
@@ -226,7 +228,7 @@
 	mTabs = new QTabWidget(mainWidget);
 //	mTabs->setMargin(marginHint());
 
-	KVBox* mainPageBox = new KVBox(0/*mTabs*/);
+	KVBox* mainPageBox = new KVBox;
 	mainPageBox->setMargin(marginHint());
 	mTabs->addTab(mainPageBox, i18n("&Alarm"));
 	mMainPageIndex = 0;
@@ -237,7 +239,7 @@
 	topLayout->setSpacing(spacingHint());
 
 	// Recurrence tab
-	KVBox* recurTab = new KVBox(0/*mTabs*/);
+	KVBox* recurTab = new KVBox;
 	recurTab->setMargin(marginHint());
 	mTabs->addTab(recurTab, i18n("&Recurrence"));
 	mRecurPageIndex = 1;
@@ -1395,7 +1397,7 @@
 		resize(s);
 	}
 	KWin::setOnDesktop(winId(), mDesktop);    // ensure it displays on the desktop expected by the user
-	showEvent(se);
+	KDialog::showEvent(se);
 }
 
 /******************************************************************************
@@ -1411,7 +1413,7 @@
 		s.setHeight(s.height() - (mDeferGroup->isHidden() ? 0 : mDeferGroupHeight));
 		KAlarm::writeConfigWindowSize(EDIT_DIALOG_NAME, s);
 	}
-	resizeEvent(re);
+	KDialog::resizeEvent(re);
 }
 
 /******************************************************************************
@@ -1626,14 +1628,6 @@
 }
 
 /******************************************************************************
-*  Called when the Cancel button is clicked.
-*/
-void EditAlarmDlg::slotCancel()
-{
-	reject();
-}
-
-/******************************************************************************
 *  Called when the Load Template button is clicked.
 *  Prompt to select a template and initialise the dialogue with its contents.
 */
[prev in list] [next in list] [prev in thread] [next in thread]