-rw-r--r-- | libkdepim/kdateedit.cpp | 1 | ||||
-rw-r--r-- | microkde/kdialogbase.cpp | 7 |
2 files changed, 6 insertions, 2 deletions
diff --git a/libkdepim/kdateedit.cpp b/libkdepim/kdateedit.cpp index 946fc0d..3d9e690 100644 --- a/libkdepim/kdateedit.cpp +++ b/libkdepim/kdateedit.cpp | |||
@@ -70,32 +70,33 @@ KDateEdit::KDateEdit(QWidget *parent, const char *name, bool withoutDP ) | |||
70 | mDateButton->setPixmap(pixmap); | 70 | mDateButton->setPixmap(pixmap); |
71 | 71 | ||
72 | mDateFrame = new QVBox(0,0,WType_Popup); | 72 | mDateFrame = new QVBox(0,0,WType_Popup); |
73 | // mDateFrame->setFrameStyle(QFrame::PopupPanel | QFrame::Raised); | 73 | // mDateFrame->setFrameStyle(QFrame::PopupPanel | QFrame::Raised); |
74 | mDateFrame->setFrameStyle( QFrame::WinPanel |QFrame::Raised ); | 74 | mDateFrame->setFrameStyle( QFrame::WinPanel |QFrame::Raised ); |
75 | mDateFrame->setLineWidth(3); | 75 | mDateFrame->setLineWidth(3); |
76 | mDateFrame->hide(); | 76 | mDateFrame->hide(); |
77 | 77 | ||
78 | mDatePicker = new KDatePicker(mDateFrame,QDate::currentDate()); | 78 | mDatePicker = new KDatePicker(mDateFrame,QDate::currentDate()); |
79 | connect(mDatePicker,SIGNAL(dateEntered(QDate)),SLOT(setDate(QDate))); | 79 | connect(mDatePicker,SIGNAL(dateEntered(QDate)),SLOT(setDate(QDate))); |
80 | connect(mDatePicker,SIGNAL(dateEntered(QDate)),SIGNAL(dateChanged(QDate))); | 80 | connect(mDatePicker,SIGNAL(dateEntered(QDate)),SIGNAL(dateChanged(QDate))); |
81 | connect(mDatePicker,SIGNAL(dateSelected(QDate)),SLOT(setDate(QDate))); | 81 | connect(mDatePicker,SIGNAL(dateSelected(QDate)),SLOT(setDate(QDate))); |
82 | connect(mDatePicker,SIGNAL(dateSelected(QDate)),SIGNAL(dateChanged(QDate))); | 82 | connect(mDatePicker,SIGNAL(dateSelected(QDate)),SIGNAL(dateChanged(QDate))); |
83 | connect(mDatePicker,SIGNAL(dateSelected(QDate)),mDateFrame,SLOT(hide())); | 83 | connect(mDatePicker,SIGNAL(dateSelected(QDate)),mDateFrame,SLOT(hide())); |
84 | connect(mDateButton,SIGNAL(clicked()),SLOT(toggleDatePicker())); | 84 | connect(mDateButton,SIGNAL(clicked()),SLOT(toggleDatePicker())); |
85 | mDateButton->setFocusPolicy( QWidget::NoFocus ); | 85 | mDateButton->setFocusPolicy( QWidget::NoFocus ); |
86 | mDateButton->setAutoDefault( false ); | ||
86 | //mDateFrame->resize( 400, 300 ); | 87 | //mDateFrame->resize( 400, 300 ); |
87 | 88 | ||
88 | } | 89 | } |
89 | connect(mDateEdit,SIGNAL(returnPressed()),SLOT(lineEnterPressed())); | 90 | connect(mDateEdit,SIGNAL(returnPressed()),SLOT(lineEnterPressed())); |
90 | connect(mDateEdit,SIGNAL(textChanged(const QString &)), | 91 | connect(mDateEdit,SIGNAL(textChanged(const QString &)), |
91 | SLOT(textChanged(const QString &))); | 92 | SLOT(textChanged(const QString &))); |
92 | 93 | ||
93 | // Create the keyword list. This will be used to match against when the user | 94 | // Create the keyword list. This will be used to match against when the user |
94 | // enters information. | 95 | // enters information. |
95 | mKeywordMap[i18n("tomorrow")] = 1; | 96 | mKeywordMap[i18n("tomorrow")] = 1; |
96 | mKeywordMap[i18n("today")] = 0; | 97 | mKeywordMap[i18n("today")] = 0; |
97 | mKeywordMap[i18n("yesterday")] = -1; | 98 | mKeywordMap[i18n("yesterday")] = -1; |
98 | 99 | ||
99 | /* | 100 | /* |
100 | * This loop uses some math tricks to figure out the offset in days | 101 | * This loop uses some math tricks to figure out the offset in days |
101 | * to the next date the given day of the week occurs. There | 102 | * to the next date the given day of the week occurs. There |
diff --git a/microkde/kdialogbase.cpp b/microkde/kdialogbase.cpp index d1f7630..801094a 100644 --- a/microkde/kdialogbase.cpp +++ b/microkde/kdialogbase.cpp | |||
@@ -10,34 +10,36 @@ | |||
10 | #include "kdialogbase.h" | 10 | #include "kdialogbase.h" |
11 | 11 | ||
12 | KDialogBase::KDialogBase() | 12 | KDialogBase::KDialogBase() |
13 | { | 13 | { |
14 | } | 14 | } |
15 | 15 | ||
16 | KDialogBase::KDialogBase( QWidget *parent, const char *name, bool modal, | 16 | KDialogBase::KDialogBase( QWidget *parent, const char *name, bool modal, |
17 | const QString &caption, | 17 | const QString &caption, |
18 | int buttonMask, ButtonCode defaultButton, | 18 | int buttonMask, ButtonCode defaultButton, |
19 | bool separator, | 19 | bool separator, |
20 | const QString &user1, | 20 | const QString &user1, |
21 | const QString &user2, | 21 | const QString &user2, |
22 | const QString &user3) : | 22 | const QString &user3) : |
23 | KDialog( parent, name, modal ) | 23 | KDialog( parent, name, modal ) |
24 | { | 24 | { |
25 | init( caption, buttonMask, user1, user2 ); | 25 | init( caption, buttonMask, user1, user2 ); |
26 | if (findButton( defaultButton ) ) | 26 | if (findButton( defaultButton ) ) { |
27 | (findButton( defaultButton ) )->setFocus(); | 27 | (findButton( defaultButton ) )->setFocus(); |
28 | (findButton( defaultButton ) )->setDefault( true ); | ||
29 | } | ||
28 | 30 | ||
29 | } | 31 | } |
30 | 32 | ||
31 | KDialogBase::KDialogBase( int dialogFace, const QString &caption, | 33 | KDialogBase::KDialogBase( int dialogFace, const QString &caption, |
32 | int buttonMask, ButtonCode defaultButton, | 34 | int buttonMask, ButtonCode defaultButton, |
33 | QWidget *parent, const char *name, bool modal, | 35 | QWidget *parent, const char *name, bool modal, |
34 | bool separator, | 36 | bool separator, |
35 | const QString &user1, | 37 | const QString &user1, |
36 | const QString &user2, | 38 | const QString &user2, |
37 | const QString &user3) : | 39 | const QString &user3) : |
38 | KDialog( parent, name, modal ) | 40 | KDialog( parent, name, modal ) |
39 | { | 41 | { |
40 | init( caption, buttonMask, user1, user2 ); | 42 | init( caption, buttonMask, user1, user2 ); |
41 | if (findButton( defaultButton ) ) | 43 | if (findButton( defaultButton ) ) |
42 | (findButton( defaultButton ) )->setFocus(); | 44 | (findButton( defaultButton ) )->setFocus(); |
43 | 45 | ||
@@ -61,32 +63,33 @@ void KDialogBase::init( const QString &caption, int buttonMask, | |||
61 | if ( buttonMask & User1 ) { | 63 | if ( buttonMask & User1 ) { |
62 | mUser1Button = new QPushButton( user1, this ); | 64 | mUser1Button = new QPushButton( user1, this ); |
63 | connect( mUser1Button, SIGNAL( clicked() ), SLOT( slotUser1() ) ); | 65 | connect( mUser1Button, SIGNAL( clicked() ), SLOT( slotUser1() ) ); |
64 | } else { | 66 | } else { |
65 | mUser1Button = 0; | 67 | mUser1Button = 0; |
66 | } | 68 | } |
67 | if ( buttonMask & User2 ) { | 69 | if ( buttonMask & User2 ) { |
68 | mUser2Button = new QPushButton( user2, this ); | 70 | mUser2Button = new QPushButton( user2, this ); |
69 | connect( mUser2Button, SIGNAL( clicked() ), SLOT( slotUser2() ) ); | 71 | connect( mUser2Button, SIGNAL( clicked() ), SLOT( slotUser2() ) ); |
70 | } else { | 72 | } else { |
71 | mUser2Button = 0; | 73 | mUser2Button = 0; |
72 | } | 74 | } |
73 | 75 | ||
74 | if ( buttonMask & Ok ) { | 76 | if ( buttonMask & Ok ) { |
75 | mOkButton = new QPushButton( i18n("Ok"), this ); | 77 | mOkButton = new QPushButton( i18n("Ok"), this ); |
76 | connect( mOkButton, SIGNAL( clicked() ), SLOT( slotOk() ) ); | 78 | connect( mOkButton, SIGNAL( clicked() ), SLOT( slotOk() ) ); |
79 | mOkButton->setDefault( true ); | ||
77 | } else { | 80 | } else { |
78 | mOkButton = 0; | 81 | mOkButton = 0; |
79 | } | 82 | } |
80 | if ( buttonMask & Default ) { | 83 | if ( buttonMask & Default ) { |
81 | mDefaultButton = new QPushButton( i18n("Default"), this ); | 84 | mDefaultButton = new QPushButton( i18n("Default"), this ); |
82 | connect( mDefaultButton, SIGNAL( clicked() ), SIGNAL( defaultClicked() ) ); | 85 | connect( mDefaultButton, SIGNAL( clicked() ), SIGNAL( defaultClicked() ) ); |
83 | } else { | 86 | } else { |
84 | mDefaultButton = 0; | 87 | mDefaultButton = 0; |
85 | } | 88 | } |
86 | 89 | ||
87 | if ( buttonMask & Apply ) { | 90 | if ( buttonMask & Apply ) { |
88 | mApplyButton = new QPushButton( i18n("Apply"), this ); | 91 | mApplyButton = new QPushButton( i18n("Apply"), this ); |
89 | connect( mApplyButton, SIGNAL( clicked() ), SLOT( slotApply() ) ); | 92 | connect( mApplyButton, SIGNAL( clicked() ), SLOT( slotApply() ) ); |
90 | } else { | 93 | } else { |
91 | mApplyButton = 0; | 94 | mApplyButton = 0; |
92 | } | 95 | } |