[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: 2007-08-17 6:50:31
Message-ID: 1187333431.519931.31216.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 701054 by djarvie:
Fix crash
M +23 -18 editdlg.cpp
M +4 -3 editdlg.h
M +12 -6 editdlgtypes.cpp
--- trunk/KDE/kdepim/kalarm/editdlg.cpp #701053:701054
@@ -89,6 +89,7 @@
EditAlarmDlg* EditAlarmDlg::create(bool Template, Type type, bool newAlarm, QWidget* \
parent, GetResourceType getResource) {
+ kDebug(5950) << "EditAlarmDlg::create()";
switch (type)
{
case DISPLAY: return new EditDisplayAlarmDlg(Template, newAlarm, parent, \
getResource); @@ -119,7 +120,7 @@
* = false to edit/create an alarm.
* event != to initialise the dialogue to show the specified event's data.
*/
-EditAlarmDlg::EditAlarmDlg(bool Template, KAEvent::Action action, bool newAlarm, \
QWidget* parent, GetResourceType getResource) +EditAlarmDlg::EditAlarmDlg(bool \
Template, KAEvent::Action action, QWidget* parent, GetResourceType getResource) : \
KDialog(parent), mAlarmType(action),
mMainPageShown(false),
@@ -136,10 +137,10 @@
mReadOnly(false),
mSavedEvent(0)
{
- init(0, newAlarm, getResource);
+ init(0, getResource);
}
-EditAlarmDlg::EditAlarmDlg(bool Template, const KAEvent& event, bool newAlarm, \
QWidget* parent, +EditAlarmDlg::EditAlarmDlg(bool Template, const KAEvent& event, \
QWidget* parent, GetResourceType getResource, bool readOnly)
: KDialog(parent),
mAlarmType(event.action()),
@@ -157,24 +158,11 @@
mReadOnly(readOnly),
mSavedEvent(0)
{
- init(&event, newAlarm, getResource);
+ init(&event, getResource);
}
-void EditAlarmDlg::init(const KAEvent* event, bool newAlarm, GetResourceType \
getResource) +void EditAlarmDlg::init(const KAEvent* event, GetResourceType \
getResource) {
- setObjectName(mTemplate ? "TemplEditDlg" : "EditDlg"); // used by LikeBack
- QString caption;
- if (mReadOnly)
- caption = event->expired() ? i18nc("@title:window", "Archived Alarm [read-only]")
- : i18nc("@title:window", "View Alarm");
- else
- caption = type_caption(newAlarm);
- setCaption(caption);
- setButtons((mReadOnly ? Cancel|Try : mTemplate ? Ok|Cancel|Try : \
Ok|Cancel|Try|Default));
- setDefaultButton(mReadOnly ? Cancel : Ok);
- setButtonText(Default, i18nc("@action:button", "Load Template..."));
- connect(this, SIGNAL(tryClicked()), SLOT(slotTry()));
- connect(this, SIGNAL(defaultClicked()), SLOT(slotDefault()));
switch (getResource)
{
case RES_USE_EVENT_ID:
@@ -192,6 +180,23 @@
mResourceEventId.clear();
break;
}
+}
+
+void EditAlarmDlg::init(const KAEvent* event, bool newAlarm)
+{
+ setObjectName(mTemplate ? "TemplEditDlg" : "EditDlg"); // used by LikeBack
+ QString caption;
+ if (mReadOnly)
+ caption = event->expired() ? i18nc("@title:window", "Archived Alarm [read-only]")
+ : i18nc("@title:window", "View Alarm");
+ else
+ caption = type_caption(newAlarm);
+ setCaption(caption);
+ setButtons((mReadOnly ? Cancel|Try : mTemplate ? Ok|Cancel|Try : \
Ok|Cancel|Try|Default)); + setDefaultButton(mReadOnly ? Cancel : Ok);
+ setButtonText(Default, i18nc("@action:button", "Load Template..."));
+ connect(this, SIGNAL(tryClicked()), SLOT(slotTry()));
+ connect(this, SIGNAL(defaultClicked()), SLOT(slotDefault()));
KVBox* mainWidget = new KVBox(this);
mainWidget->setMargin(0);
setMainWidget(mainWidget);
--- trunk/KDE/kdepim/kalarm/editdlg.h #701053:701054
@@ -70,10 +70,11 @@
static QString i18n_chk_ShowInKOrganizer(); // text of 'Show in KOrganizer' \
checkbox
protected:
- EditAlarmDlg(bool Template, KAEvent::Action, bool newAlarm, QWidget* parent = 0,
+ EditAlarmDlg(bool Template, KAEvent::Action, QWidget* parent = 0,
GetResourceType = RES_PROMPT);
- EditAlarmDlg(bool Template, const KAEvent&, bool newAlarm, QWidget* parent = 0,
+ EditAlarmDlg(bool Template, const KAEvent&, QWidget* parent = 0,
GetResourceType = RES_PROMPT, bool readOnly = false);
+ void init(const KAEvent* event, bool newAlarm);
virtual void resizeEvent(QResizeEvent*);
virtual void showEvent(QShowEvent*);
virtual QString type_caption(bool newAlarm) const = 0;
@@ -112,7 +113,7 @@
void slotSetSubRepetition();
private:
- void init(const KAEvent* event, bool newAlarm, GetResourceType \
getResource); + void init(const KAEvent* event, GetResourceType \
getResource); void initValues(const KAEvent*);
void setEvent(KAEvent&, const QString& text, bool trial);
bool validate();
--- trunk/KDE/kdepim/kalarm/editdlgtypes.cpp #701053:701054
@@ -119,22 +119,24 @@
* event != to initialise the dialogue to show the specified event's data.
*/
EditDisplayAlarmDlg::EditDisplayAlarmDlg(bool Template, bool newAlarm, QWidget* \
parent, GetResourceType getResource)
- : EditAlarmDlg(Template, KAEvent::MESSAGE, newAlarm, parent, getResource),
+ : EditAlarmDlg(Template, KAEvent::MESSAGE, parent, getResource),
mSpecialActionsButton(0),
mReminderDeferral(false),
mReminderArchived(false)
{
kDebug(5950) << "EditDisplayAlarmDlg::EditDisplayAlarmDlg(new)";
+ init(0, newAlarm);
}
EditDisplayAlarmDlg::EditDisplayAlarmDlg(bool Template, const KAEvent& event, bool \
newAlarm, QWidget* parent,
GetResourceType getResource, bool readOnly)
- : EditAlarmDlg(Template, event, newAlarm, parent, getResource, readOnly),
+ : EditAlarmDlg(Template, event, parent, getResource, readOnly),
mSpecialActionsButton(0),
mReminderDeferral(false),
mReminderArchived(false)
{
kDebug(5950) << "EditDisplayAlarmDlg::EditDisplayAlarmDlg(event.id())";
+ init(&event, newAlarm);
}
/******************************************************************************
@@ -695,16 +697,18 @@
* event != to initialise the dialogue to show the specified event's data.
*/
EditCommandAlarmDlg::EditCommandAlarmDlg(bool Template, bool newAlarm, QWidget* \
parent, GetResourceType getResource)
- : EditAlarmDlg(Template, KAEvent::COMMAND, newAlarm, parent, getResource)
+ : EditAlarmDlg(Template, KAEvent::COMMAND, parent, getResource)
{
kDebug(5950) << "EditCommandAlarmDlg::EditCommandAlarmDlg(new)";
+ init(0, newAlarm);
}
EditCommandAlarmDlg::EditCommandAlarmDlg(bool Template, const KAEvent& event, bool \
newAlarm, QWidget* parent,
GetResourceType getResource, bool readOnly)
- : EditAlarmDlg(Template, event, newAlarm, parent, getResource, readOnly)
+ : EditAlarmDlg(Template, event, parent, getResource, readOnly)
{
kDebug(5950) << "EditCommandAlarmDlg::EditCommandAlarmDlg(event.id())";
+ init(&event, newAlarm);
}
/******************************************************************************
@@ -1007,18 +1011,20 @@
* event != to initialise the dialogue to show the specified event's data.
*/
EditEmailAlarmDlg::EditEmailAlarmDlg(bool Template, bool newAlarm, QWidget* parent, \
GetResourceType getResource)
- : EditAlarmDlg(Template, KAEvent::EMAIL, newAlarm, parent, getResource),
+ : EditAlarmDlg(Template, KAEvent::EMAIL, parent, getResource),
mEmailRemoveButton(0)
{
kDebug(5950) << "EditEmailAlarmDlg::EditEmailAlarmDlg(new)";
+ init(0, newAlarm);
}
EditEmailAlarmDlg::EditEmailAlarmDlg(bool Template, const KAEvent& event, bool \
newAlarm, QWidget* parent,
GetResourceType getResource, bool readOnly)
- : EditAlarmDlg(Template, event, newAlarm, parent, getResource, readOnly),
+ : EditAlarmDlg(Template, event, parent, getResource, readOnly),
mEmailRemoveButton(0)
{
kDebug(5950) << "EditEmailAlarmDlg::EditEmailAlarmDlg(event.id())";
+ init(&event, newAlarm);
}
/******************************************************************************
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic