author | zautrix <zautrix> | 2005-02-25 11:29:28 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-02-25 11:29:28 (UTC) |
commit | ff810f8f74f6928e664bf52f8e8d128edb8ac5ad (patch) (unidiff) | |
tree | d5473801c69b42d90879104fc4d05a5ad9b69e87 | |
parent | ff8a2f593fae5ffe82f889ab70d32bf02a45f4fb (diff) | |
download | kdepimpi-ff810f8f74f6928e664bf52f8e8d128edb8ac5ad.zip kdepimpi-ff810f8f74f6928e664bf52f8e8d128edb8ac5ad.tar.gz kdepimpi-ff810f8f74f6928e664bf52f8e8d128edb8ac5ad.tar.bz2 |
many small fixes
-rw-r--r-- | bin/kdepim/WhatsNew.txt | 6 | ||||
-rw-r--r-- | desktop/rpm/kdepim_rpm | 2 | ||||
-rw-r--r-- | kabc/addresseedialog.cpp | 38 | ||||
-rw-r--r-- | korganizer/koeventviewerdialog.cpp | 6 | ||||
-rw-r--r-- | korganizer/kolistview.cpp | 2 | ||||
-rw-r--r-- | korganizer/searchdialog.cpp | 9 | ||||
-rw-r--r-- | korganizer/searchdialog.h | 4 | ||||
-rw-r--r-- | microkde/kdialogbase.cpp | 6 | ||||
-rw-r--r-- | version | 2 |
9 files changed, 57 insertions, 18 deletions
diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt index 86ac9b5..dc22fc6 100644 --- a/bin/kdepim/WhatsNew.txt +++ b/bin/kdepim/WhatsNew.txt | |||
@@ -1,26 +1,32 @@ | |||
1 | Info about the changes in new versions of KDE-Pim/Pi | 1 | Info about the changes in new versions of KDE-Pim/Pi |
2 | 2 | ||
3 | ********** VERSION 2.0.13 ************ | ||
4 | |||
5 | Fixed a problem in the addressee select dialog and made it more user friendly by adding a minimize splitter. | ||
6 | |||
7 | In the search dialog you can switch now the focus from search line edit to the list view by pressing key "arrow down". | ||
8 | |||
3 | ********** VERSION 2.0.12 ************ | 9 | ********** VERSION 2.0.12 ************ |
4 | 10 | ||
5 | KO/Pi: | 11 | KO/Pi: |
6 | Fixed a bug in todo start/due date handling for non recurring todos with a start and due date. | 12 | Fixed a bug in todo start/due date handling for non recurring todos with a start and due date. |
7 | Fixed some layout problems in the KO/Pi agenda view when there were many conflicting itmes. | 13 | Fixed some layout problems in the KO/Pi agenda view when there were many conflicting itmes. |
8 | Fixed several problems of the keyboard focus in the desktop versions when opening the search dialog/event viewer. | 14 | Fixed several problems of the keyboard focus in the desktop versions when opening the search dialog/event viewer. |
9 | 15 | ||
10 | Fixed problem in pi-sync mode when wrong password was sent. | 16 | Fixed problem in pi-sync mode when wrong password was sent. |
11 | 17 | ||
12 | OM/Pi: | 18 | OM/Pi: |
13 | Fixed a crash when displaying mails with "Show mail as html" was checked in the config. | 19 | Fixed a crash when displaying mails with "Show mail as html" was checked in the config. |
14 | Added a check before displaying the mail if the mail is in html format, if "Show mail as html" is enabled. | 20 | Added a check before displaying the mail if the mail is in html format, if "Show mail as html" is enabled. |
15 | 21 | ||
16 | ********** VERSION 2.0.11 ************ | 22 | ********** VERSION 2.0.11 ************ |
17 | 23 | ||
18 | Fixed some problems in pi-sync mode | 24 | Fixed some problems in pi-sync mode |
19 | (e.g. details of events were not synced properly) | 25 | (e.g. details of events were not synced properly) |
20 | 26 | ||
21 | ********** VERSION 2.0.10 ************ | 27 | ********** VERSION 2.0.10 ************ |
22 | 28 | ||
23 | KO/Pi: | 29 | KO/Pi: |
24 | In the desktop versions the context menu in the search dialog was broken after introducing the What'sThis info for the list view. | 30 | In the desktop versions the context menu in the search dialog was broken after introducing the What'sThis info for the list view. |
25 | This is fixed. | 31 | This is fixed. |
26 | Changed the search dialog a bit to make it more user friendly. | 32 | Changed the search dialog a bit to make it more user friendly. |
diff --git a/desktop/rpm/kdepim_rpm b/desktop/rpm/kdepim_rpm index 0d4c9d6..ff9f2dc 100644 --- a/desktop/rpm/kdepim_rpm +++ b/desktop/rpm/kdepim_rpm | |||
@@ -1,27 +1,27 @@ | |||
1 | Summary: A collection of PIM programs | 1 | Summary: A collection of PIM programs |
2 | Name: KDE-Pim-Pi | 2 | Name: KDE-Pim-Pi |
3 | Version: 2.0.12 | 3 | Version: 2.0.13 |
4 | Release: SuSE_9.2 | 4 | Release: SuSE_9.2 |
5 | Copyright:GPL | 5 | Copyright:GPL |
6 | Group: Productivity/Pim | 6 | Group: Productivity/Pim |
7 | Source:http://sourceforge.net/projects/kdepimpi/ | 7 | Source:http://sourceforge.net/projects/kdepimpi/ |
8 | URL:http://sourceforge.net/projects/kdepimpi/ | 8 | URL:http://sourceforge.net/projects/kdepimpi/ |
9 | Packager: zautrix | 9 | Packager: zautrix |
10 | 10 | ||
11 | %description | 11 | %description |
12 | This package contains the platform-independent PIM programs from | 12 | This package contains the platform-independent PIM programs from |
13 | www.pi-sync.net, compiled for SuSE 9.2: | 13 | www.pi-sync.net, compiled for SuSE 9.2: |
14 | KTimeTacker/Pi | 14 | KTimeTacker/Pi |
15 | KPhone/Pi | 15 | KPhone/Pi |
16 | KAddressbook/Pi | 16 | KAddressbook/Pi |
17 | KOrganizer/Pi | 17 | KOrganizer/Pi |
18 | PasswordManager/Pi | 18 | PasswordManager/Pi |
19 | KOPieMail/Pi | 19 | KOPieMail/Pi |
20 | 20 | ||
21 | These applications do not need anything from the KDE-desktop | 21 | These applications do not need anything from the KDE-desktop |
22 | at all to run on Linux. However, there is a dependency from | 22 | at all to run on Linux. However, there is a dependency from |
23 | two KDE libs, because a small command line program is included | 23 | two KDE libs, because a small command line program is included |
24 | to make it possible to sync with the KDE-desktop applications. | 24 | to make it possible to sync with the KDE-desktop applications. |
25 | 25 | ||
26 | These applications are independent from the KDE-desktop | 26 | These applications are independent from the KDE-desktop |
27 | environment. That means, nothing of your existing | 27 | environment. That means, nothing of your existing |
diff --git a/kabc/addresseedialog.cpp b/kabc/addresseedialog.cpp index 34f4160..b3429e3 100644 --- a/kabc/addresseedialog.cpp +++ b/kabc/addresseedialog.cpp | |||
@@ -2,142 +2,158 @@ | |||
2 | This file is part of libkabc. | 2 | This file is part of libkabc. |
3 | Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org> | 3 | Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org> |
4 | 4 | ||
5 | This library is free software; you can redistribute it and/or | 5 | This library is free software; you can redistribute it and/or |
6 | modify it under the terms of the GNU Library General Public | 6 | modify it under the terms of the GNU Library General Public |
7 | License as published by the Free Software Foundation; either | 7 | License as published by the Free Software Foundation; either |
8 | version 2 of the License, or (at your option) any later version. | 8 | version 2 of the License, or (at your option) any later version. |
9 | 9 | ||
10 | This library is distributed in the hope that it will be useful, | 10 | This library is distributed in the hope that it will be useful, |
11 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
13 | Library General Public License for more details. | 13 | Library General Public License for more details. |
14 | 14 | ||
15 | You should have received a copy of the GNU Library General Public License | 15 | You should have received a copy of the GNU Library General Public License |
16 | along with this library; see the file COPYING.LIB. If not, write to | 16 | along with this library; see the file COPYING.LIB. If not, write to |
17 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | 17 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
18 | Boston, MA 02111-1307, USA. | 18 | Boston, MA 02111-1307, USA. |
19 | */ | 19 | */ |
20 | 20 | ||
21 | #include <qlayout.h> | 21 | #include <qlayout.h> |
22 | #include <qpushbutton.h> | 22 | #include <qpushbutton.h> |
23 | #include <qgroupbox.h> | 23 | #include <qgroupbox.h> |
24 | #include <qapplication.h> | 24 | #include <qapplication.h> |
25 | #include <qregexp.h> | 25 | #include <qregexp.h> |
26 | #include <qvbox.h> | ||
27 | #include <qlabel.h> | ||
26 | 28 | ||
27 | #include <klocale.h> | 29 | #include <klocale.h> |
28 | #include <kdebug.h> | 30 | #include <kdebug.h> |
29 | #include <kglobalsettings.h> | 31 | #include <kglobalsettings.h> |
30 | 32 | ||
31 | #include "stdaddressbook.h" | 33 | #include "stdaddressbook.h" |
32 | 34 | ||
33 | #include "addresseedialog.h" | 35 | #include "addresseedialog.h" |
36 | #include "KDGanttMinimizeSplitter.h" | ||
34 | //#include "addresseedialog.moc" | 37 | //#include "addresseedialog.moc" |
35 | 38 | ||
36 | using namespace KABC; | 39 | using namespace KABC; |
37 | 40 | ||
38 | AddresseeItem::AddresseeItem( QListView *parent, const Addressee &addressee ) : | 41 | AddresseeItem::AddresseeItem( QListView *parent, const Addressee &addressee ) : |
39 | QListViewItem( parent ), | 42 | QListViewItem( parent ), |
40 | mAddressee( addressee ) | 43 | mAddressee( addressee ) |
41 | { | 44 | { |
42 | QString name = addressee.familyName()+", "+ addressee.givenName(); | 45 | QString name = addressee.familyName()+", "+ addressee.givenName(); |
43 | if ( name.length() == 2 ) | 46 | if ( name.length() == 2 ) |
44 | name = addressee.organization(); | 47 | name = addressee.organization(); |
45 | setText( Name,name); | 48 | setText( Name,name); |
46 | setText( Email, addressee.preferredEmail() ); | 49 | setText( Email, addressee.preferredEmail() ); |
47 | } | 50 | } |
48 | 51 | ||
49 | QString AddresseeItem::key( int column, bool ) const | 52 | QString AddresseeItem::key( int column, bool ) const |
50 | { | 53 | { |
51 | 54 | ||
52 | if (column == Email) { | 55 | if (column == Email) { |
53 | QString value = text(Email); | 56 | QString value = text(Email); |
54 | int val = value.findRev("@"); | 57 | int val = value.findRev("@"); |
55 | return value.mid( val) + value.left( val ); | 58 | return value.mid( val) + value.left( val ); |
56 | } | 59 | } |
57 | return text(column).lower(); | 60 | return text(column).lower(); |
58 | } | 61 | } |
59 | 62 | ||
60 | AddresseeDialog::AddresseeDialog( QWidget *parent, bool multiple ) : | 63 | AddresseeDialog::AddresseeDialog( QWidget *parent, bool multiple ) : |
61 | KDialogBase( KDialogBase::Plain, i18n("Select Addressee"), | 64 | KDialogBase( KDialogBase::Plain, i18n("Select Addressee"), |
62 | Ok|Cancel, Ok, parent ), mMultiple( multiple ) | 65 | Ok|Cancel, No, parent ), mMultiple( multiple ) |
63 | { | 66 | { |
64 | QWidget *topWidget = plainPage(); | 67 | QWidget *topWidget = plainPage(); |
65 | 68 | ||
66 | QBoxLayout *topLayout = new QHBoxLayout( topWidget ); | 69 | QBoxLayout *topLayout = new QHBoxLayout( topWidget ); |
67 | QBoxLayout *listLayout = new QVBoxLayout; | ||
68 | topLayout->addLayout( listLayout ); | ||
69 | 70 | ||
70 | mAddresseeList = new KListView( topWidget ); | 71 | |
72 | KDGanttMinimizeSplitter* mMiniSplitter = new KDGanttMinimizeSplitter( Qt::Horizontal, topWidget); | ||
73 | mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Right ); | ||
74 | |||
75 | topLayout->addWidget(mMiniSplitter ); | ||
76 | |||
77 | QWidget *listWidget = new QWidget( mMiniSplitter ); | ||
78 | |||
79 | QBoxLayout *listLayout = new QVBoxLayout (listWidget) ; | ||
80 | //topLayout->addLayout( listLayout ); | ||
81 | |||
82 | mAddresseeList = new KListView( listWidget ); | ||
71 | mAddresseeList->addColumn( i18n("Name") ); | 83 | mAddresseeList->addColumn( i18n("Name") ); |
72 | mAddresseeList->addColumn( i18n("Email") ); | 84 | mAddresseeList->addColumn( i18n("Email") ); |
73 | mAddresseeList->setAllColumnsShowFocus( true ); | 85 | mAddresseeList->setAllColumnsShowFocus( true ); |
74 | mAddresseeList->setFullWidth( true ); | 86 | mAddresseeList->setFullWidth( true ); |
75 | listLayout->addWidget( mAddresseeList ); | 87 | listLayout->addWidget( mAddresseeList ); |
76 | connect( mAddresseeList, SIGNAL( doubleClicked( QListViewItem * ) ), | 88 | connect( mAddresseeList, SIGNAL( doubleClicked( QListViewItem * ) ), |
77 | SLOT( slotOk() ) ); | 89 | SLOT( slotOk() ) ); |
78 | 90 | ||
79 | mAddresseeEdit = new QLineEdit( topWidget ); | 91 | mAddresseeEdit = new QLineEdit( listWidget ); |
80 | connect( mAddresseeEdit, SIGNAL( returnPressed() ), | 92 | connect( mAddresseeEdit, SIGNAL( returnPressed() ), |
81 | SLOT( loadAddressBook() ) ); | 93 | SLOT( loadAddressBook() ) ); |
82 | mAddresseeEdit->setFocus(); | 94 | mAddresseeEdit->setFocus(); |
83 | 95 | ||
84 | listLayout->addWidget( mAddresseeEdit ); | 96 | listLayout->addWidget( mAddresseeEdit ); |
85 | 97 | ||
86 | if ( mMultiple ) { | 98 | if ( mMultiple ) { |
87 | QBoxLayout *selectedLayout = new QVBoxLayout; | 99 | //QBoxLayout *selectedLayout = new QVBoxLayout; |
88 | topLayout->addLayout( selectedLayout ); | 100 | //topLayout->addLayout( selectedLayout ); |
89 | topLayout->setSpacing( spacingHint() ); | 101 | //topLayout->setSpacing( spacingHint() ); |
90 | 102 | ||
91 | QGroupBox *selectedGroup = new QGroupBox( 1, Horizontal, i18n("Selected"), | 103 | QVBox *selectedGroup = new QVBox( mMiniSplitter ); |
92 | topWidget ); | 104 | new QLabel ( i18n("Selected:"), selectedGroup ); |
93 | selectedLayout->addWidget( selectedGroup ); | 105 | //selectedLayout->addWidget( selectedGroup ); |
94 | 106 | ||
95 | mSelectedList = new KListView( selectedGroup ); | 107 | mSelectedList = new KListView( selectedGroup ); |
96 | mSelectedList->addColumn( i18n("Name") ); | 108 | mSelectedList->addColumn( i18n("Name") ); |
97 | mSelectedList->addColumn( i18n("Email") ); | 109 | mSelectedList->addColumn( i18n("Email") ); |
98 | mSelectedList->setAllColumnsShowFocus( true ); | 110 | mSelectedList->setAllColumnsShowFocus( true ); |
99 | mSelectedList->setFullWidth( true ); | 111 | mSelectedList->setFullWidth( true ); |
100 | connect( mSelectedList, SIGNAL( doubleClicked( QListViewItem * ) ), | 112 | connect( mSelectedList, SIGNAL( doubleClicked( QListViewItem * ) ), |
101 | SLOT( removeSelected() ) ); | 113 | SLOT( removeSelected() ) ); |
102 | 114 | ||
103 | QPushButton *unselectButton = new QPushButton( i18n("Unselect"), selectedGroup ); | 115 | QPushButton *unselectButton = new QPushButton( i18n("Unselect"), selectedGroup ); |
104 | connect ( unselectButton, SIGNAL( clicked() ), SLOT( removeSelected() ) ); | 116 | connect ( unselectButton, SIGNAL( clicked() ), SLOT( removeSelected() ) ); |
105 | 117 | ||
106 | connect( mAddresseeList, SIGNAL( clicked( QListViewItem * ) ), | 118 | connect( mAddresseeList, SIGNAL( clicked( QListViewItem * ) ), |
107 | SLOT( addSelected( QListViewItem * ) ) ); | 119 | SLOT( addSelected( QListViewItem * ) ) ); |
108 | connect( mAddresseeList, SIGNAL( returnPressed( QListViewItem * ) ), | 120 | connect( mAddresseeList, SIGNAL( returnPressed( QListViewItem * ) ), |
109 | SLOT( selectNextItem( QListViewItem * ) ) ); | 121 | SLOT( selectNextItem( QListViewItem * ) ) ); |
110 | 122 | ||
111 | } | 123 | } |
112 | 124 | ||
113 | mAddressBook = StdAddressBook::self( true ); | 125 | mAddressBook = StdAddressBook::self( true ); |
114 | connect( mAddressBook, SIGNAL( addressBookChanged( AddressBook* ) ), | 126 | connect( mAddressBook, SIGNAL( addressBookChanged( AddressBook* ) ), |
115 | SLOT( addressBookChanged() ) ); | 127 | SLOT( addressBookChanged() ) ); |
116 | connect( mAddressBook, SIGNAL( loadingFinished( Resource* ) ), | 128 | connect( mAddressBook, SIGNAL( loadingFinished( Resource* ) ), |
117 | SLOT( addressBookChanged() ) ); | 129 | SLOT( addressBookChanged() ) ); |
118 | 130 | ||
119 | loadAddressBook(); | 131 | loadAddressBook(); |
132 | QValueList<int> splitterSize; | ||
133 | splitterSize.append( ( width() / 5 ) * 3 ); | ||
134 | splitterSize.append( ( width() / 5 ) *2 ); | ||
135 | mMiniSplitter->setSizes( splitterSize ); | ||
120 | } | 136 | } |
121 | 137 | ||
122 | AddresseeDialog::~AddresseeDialog() | 138 | AddresseeDialog::~AddresseeDialog() |
123 | { | 139 | { |
124 | } | 140 | } |
125 | 141 | ||
126 | void AddresseeDialog::loadAddressBook() | 142 | void AddresseeDialog::loadAddressBook() |
127 | { | 143 | { |
128 | mAddresseeList->clear(); | 144 | mAddresseeList->clear(); |
129 | mItemDict.clear(); | 145 | mItemDict.clear(); |
130 | if ( mAddresseeEdit->text().isEmpty() ) { | 146 | if ( mAddresseeEdit->text().isEmpty() ) { |
131 | AddressBook::Iterator it; | 147 | AddressBook::Iterator it; |
132 | for( it = mAddressBook->begin(); it != mAddressBook->end(); ++it ) { | 148 | for( it = mAddressBook->begin(); it != mAddressBook->end(); ++it ) { |
133 | if ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") ) | 149 | if ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") ) |
134 | continue; | 150 | continue; |
135 | new AddresseeItem( mAddresseeList, (*it) ); | 151 | new AddresseeItem( mAddresseeList, (*it) ); |
136 | } | 152 | } |
137 | return; | 153 | return; |
138 | } | 154 | } |
139 | //mAddresseeEdit->completionObject()->clear(); | 155 | //mAddresseeEdit->completionObject()->clear(); |
140 | QRegExp re; | 156 | QRegExp re; |
141 | re.setWildcard(true); // most people understand these better. | 157 | re.setWildcard(true); // most people understand these better. |
142 | re.setCaseSensitive(false); | 158 | re.setCaseSensitive(false); |
143 | re.setPattern( "*"+ mAddresseeEdit->text() + "*"); | 159 | re.setPattern( "*"+ mAddresseeEdit->text() + "*"); |
diff --git a/korganizer/koeventviewerdialog.cpp b/korganizer/koeventviewerdialog.cpp index e2c8e6e..f606124 100644 --- a/korganizer/koeventviewerdialog.cpp +++ b/korganizer/koeventviewerdialog.cpp | |||
@@ -241,52 +241,58 @@ void KOEventViewerDialog::showIncidence() | |||
241 | return; | 241 | return; |
242 | 242 | ||
243 | } else | 243 | } else |
244 | date = mIncidence->dtStart().date(); | 244 | date = mIncidence->dtStart().date(); |
245 | globalFlagBlockAgenda = 1; | 245 | globalFlagBlockAgenda = 1; |
246 | emit showAgendaView( false ); | 246 | emit showAgendaView( false ); |
247 | globalFlagBlockAgenda = 2; | 247 | globalFlagBlockAgenda = 2; |
248 | emit jumpToTime( date ); | 248 | emit jumpToTime( date ); |
249 | } | 249 | } |
250 | } | 250 | } |
251 | void KOEventViewerDialog::keyPressEvent ( QKeyEvent * e ) | 251 | void KOEventViewerDialog::keyPressEvent ( QKeyEvent * e ) |
252 | { | 252 | { |
253 | switch ( e->key() ) { | 253 | switch ( e->key() ) { |
254 | 254 | ||
255 | case Qt::Key_A : | 255 | case Qt::Key_A : |
256 | case Qt::Key_L : | 256 | case Qt::Key_L : |
257 | showIncidence(); | 257 | showIncidence(); |
258 | break; | 258 | break; |
259 | case Qt::Key_E : | 259 | case Qt::Key_E : |
260 | case Qt::Key_R : | 260 | case Qt::Key_R : |
261 | editIncidence(); | 261 | editIncidence(); |
262 | break; | 262 | break; |
263 | case Qt::Key_C: | 263 | case Qt::Key_C: |
264 | case Qt::Key_Escape: | 264 | case Qt::Key_Escape: |
265 | sendSignalViewerClosed = true; | ||
265 | close(); | 266 | close(); |
266 | break; | 267 | break; |
267 | case Qt::Key_I: | 268 | case Qt::Key_I: |
269 | #ifndef DESKTOP_VERSION | ||
270 | sendSignalViewerClosed = true; | ||
271 | close(); | ||
272 | #else | ||
268 | sendSignalViewerClosed = true; | 273 | sendSignalViewerClosed = true; |
269 | slotViewerClosed(); | 274 | slotViewerClosed(); |
270 | //accept(); | 275 | //accept(); |
276 | #endif | ||
271 | break; | 277 | break; |
272 | default: | 278 | default: |
273 | KDialogBase::keyPressEvent ( e ); | 279 | KDialogBase::keyPressEvent ( e ); |
274 | break; | 280 | break; |
275 | } | 281 | } |
276 | 282 | ||
277 | } | 283 | } |
278 | void KOEventViewerDialog::hideEvent ( QHideEvent * e ) | 284 | void KOEventViewerDialog::hideEvent ( QHideEvent * e ) |
279 | { | 285 | { |
280 | KDialogBase::hideEvent ( e ); | 286 | KDialogBase::hideEvent ( e ); |
281 | QTimer::singleShot( 1, this, SLOT (slotViewerClosed() ) ); | 287 | QTimer::singleShot( 1, this, SLOT (slotViewerClosed() ) ); |
282 | } | 288 | } |
283 | 289 | ||
284 | void KOEventViewerDialog::slotViewerClosed() | 290 | void KOEventViewerDialog::slotViewerClosed() |
285 | { | 291 | { |
286 | if ( sendSignalViewerClosed ) { | 292 | if ( sendSignalViewerClosed ) { |
287 | //qDebug("KOEventViewerDialog::hideEvent "); | 293 | //qDebug("KOEventViewerDialog::hideEvent "); |
288 | emit signalViewerClosed(); | 294 | emit signalViewerClosed(); |
289 | } | 295 | } |
290 | sendSignalViewerClosed = true; | 296 | sendSignalViewerClosed = true; |
291 | } | 297 | } |
292 | 298 | ||
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp index 6acee75..710a9f9 100644 --- a/korganizer/kolistview.cpp +++ b/korganizer/kolistview.cpp | |||
@@ -1062,50 +1062,50 @@ void KOListViewListView::keyPressEvent ( QKeyEvent *e) | |||
1062 | return; | 1062 | return; |
1063 | if ( jump == 0 ) | 1063 | if ( jump == 0 ) |
1064 | jump = 1; | 1064 | jump = 1; |
1065 | while ( jump && cn->itemAbove ()) { | 1065 | while ( jump && cn->itemAbove ()) { |
1066 | cn = cn->itemAbove (); | 1066 | cn = cn->itemAbove (); |
1067 | --jump; | 1067 | --jump; |
1068 | } | 1068 | } |
1069 | setCurrentItem ( cn ); | 1069 | setCurrentItem ( cn ); |
1070 | ensureItemVisible ( cn ); | 1070 | ensureItemVisible ( cn ); |
1071 | } else | 1071 | } else |
1072 | QListView::keyPressEvent ( e ) ; | 1072 | QListView::keyPressEvent ( e ) ; |
1073 | e->accept(); | 1073 | e->accept(); |
1074 | break; | 1074 | break; |
1075 | case Qt::Key_I: { | 1075 | case Qt::Key_I: { |
1076 | QListViewItem* cn; | 1076 | QListViewItem* cn; |
1077 | cn = currentItem(); | 1077 | cn = currentItem(); |
1078 | if ( cn ) { | 1078 | if ( cn ) { |
1079 | KOListViewItem* ci = (KOListViewItem*)( cn ); | 1079 | KOListViewItem* ci = (KOListViewItem*)( cn ); |
1080 | if ( ci ){ | 1080 | if ( ci ){ |
1081 | //emit showIncidence( ci->data()); | 1081 | //emit showIncidence( ci->data()); |
1082 | cn = cn->nextSibling(); | 1082 | cn = cn->nextSibling(); |
1083 | if ( cn ) { | 1083 | if ( cn ) { |
1084 | setCurrentItem ( cn ); | 1084 | setCurrentItem ( cn ); |
1085 | ensureItemVisible ( cn ); | 1085 | ensureItemVisible ( cn ); |
1086 | emit showIncidence( ci->data()); | ||
1087 | } | 1086 | } |
1087 | emit showIncidence( ci->data()); | ||
1088 | } | 1088 | } |
1089 | } | 1089 | } |
1090 | e->accept(); | 1090 | e->accept(); |
1091 | } | 1091 | } |
1092 | break; | 1092 | break; |
1093 | case Qt::Key_Return: | 1093 | case Qt::Key_Return: |
1094 | case Qt::Key_Enter: | 1094 | case Qt::Key_Enter: |
1095 | { | 1095 | { |
1096 | QListViewItem* cn; | 1096 | QListViewItem* cn; |
1097 | cn = currentItem(); | 1097 | cn = currentItem(); |
1098 | if ( cn ) { | 1098 | if ( cn ) { |
1099 | KOListViewItem* ci = (KOListViewItem*)( cn ); | 1099 | KOListViewItem* ci = (KOListViewItem*)( cn ); |
1100 | if ( ci ){ | 1100 | if ( ci ){ |
1101 | if ( e->state() == ShiftButton ) | 1101 | if ( e->state() == ShiftButton ) |
1102 | ci->setSelected( false ); | 1102 | ci->setSelected( false ); |
1103 | else | 1103 | else |
1104 | ci->setSelected( true ); | 1104 | ci->setSelected( true ); |
1105 | cn = cn->nextSibling(); | 1105 | cn = cn->nextSibling(); |
1106 | if ( cn ) { | 1106 | if ( cn ) { |
1107 | setCurrentItem ( cn ); | 1107 | setCurrentItem ( cn ); |
1108 | ensureItemVisible ( cn ); | 1108 | ensureItemVisible ( cn ); |
1109 | } | 1109 | } |
1110 | } | 1110 | } |
1111 | } | 1111 | } |
diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp index cef59a2..678e1bd 100644 --- a/korganizer/searchdialog.cpp +++ b/korganizer/searchdialog.cpp | |||
@@ -5,80 +5,82 @@ | |||
5 | 5 | ||
6 | This program is free software; you can redistribute it and/or modify | 6 | This program is free software; you can redistribute it and/or modify |
7 | it under the terms of the GNU General Public License as published by | 7 | it under the terms of the GNU General Public License as published by |
8 | the Free Software Foundation; either version 2 of the License, or | 8 | the Free Software Foundation; either version 2 of the License, or |
9 | (at your option) any later version. | 9 | (at your option) any later version. |
10 | 10 | ||
11 | This program is distributed in the hope that it will be useful, | 11 | This program is distributed in the hope that it will be useful, |
12 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 12 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
13 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 13 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
14 | GNU General Public License for more details. | 14 | GNU General Public License for more details. |
15 | 15 | ||
16 | You should have received a copy of the GNU General Public License | 16 | You should have received a copy of the GNU General Public License |
17 | along with this program; if not, write to the Free Software | 17 | along with this program; if not, write to the Free Software |
18 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | 18 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
19 | 19 | ||
20 | As a special exception, permission is given to link this program | 20 | As a special exception, permission is given to link this program |
21 | with any edition of Qt, and distribute the resulting executable, | 21 | with any edition of Qt, and distribute the resulting executable, |
22 | without including the source code for Qt in the source distribution. | 22 | without including the source code for Qt in the source distribution. |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include <qlayout.h> | 25 | #include <qlayout.h> |
26 | #include <qcheckbox.h> | 26 | #include <qcheckbox.h> |
27 | #include <qgroupbox.h> | 27 | #include <qgroupbox.h> |
28 | #include <qlabel.h> | 28 | #include <qlabel.h> |
29 | #include <qlistview.h> | ||
29 | #include <qwhatsthis.h> | 30 | #include <qwhatsthis.h> |
30 | #include <qlineedit.h> | 31 | #include <qlineedit.h> |
31 | #include <qpushbutton.h> | 32 | #include <qpushbutton.h> |
32 | 33 | ||
33 | #include <klocale.h> | 34 | #include <klocale.h> |
34 | #include <kmessagebox.h> | 35 | #include <kmessagebox.h> |
35 | 36 | ||
36 | #include <libkdepim/kdateedit.h> | 37 | #include <libkdepim/kdateedit.h> |
37 | 38 | ||
38 | #include "koglobals.h" | 39 | #include "koglobals.h" |
39 | #include "koprefs.h" | 40 | #include "koprefs.h" |
41 | #include "klineedit.h" | ||
40 | 42 | ||
41 | #include "calendarview.h" | 43 | #include "calendarview.h" |
42 | #include "koviewmanager.h" | 44 | #include "koviewmanager.h" |
43 | #include "searchdialog.h" | 45 | #include "searchdialog.h" |
44 | 46 | ||
45 | SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent) | 47 | SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent) |
46 | : QVBox( 0 ) | 48 | : QVBox( 0 ) |
47 | 49 | ||
48 | { | 50 | { |
49 | mCalendar = calendar; | 51 | mCalendar = calendar; |
50 | QFrame *topFrame = new QFrame( this ) ;//plainPage(); | 52 | QFrame *topFrame = new QFrame( this ) ;//plainPage(); |
51 | QVBoxLayout *layout = new QVBoxLayout(topFrame,KDialog::marginHint(),KDialog::spacingHint()); | 53 | QVBoxLayout *layout = new QVBoxLayout(topFrame,KDialog::marginHint(),KDialog::spacingHint()); |
52 | 54 | ||
53 | // Search expression | 55 | // Search expression |
54 | QHBoxLayout *subLayout = new QHBoxLayout(); | 56 | QHBoxLayout *subLayout = new QHBoxLayout(); |
55 | layout->addLayout(subLayout); | 57 | layout->addLayout(subLayout); |
56 | searchLabel = new QLabel(topFrame); | 58 | searchLabel = new QLabel(topFrame); |
57 | searchLabel->setText(i18n("Search for:")); | 59 | searchLabel->setText(i18n("Search for:")); |
58 | subLayout->addWidget(searchLabel); | 60 | subLayout->addWidget(searchLabel); |
59 | 61 | ||
60 | searchEdit = new QLineEdit(topFrame); | 62 | searchEdit = new KLineEdit(topFrame); |
61 | subLayout->addWidget(searchEdit); | 63 | subLayout->addWidget(searchEdit); |
62 | QPushButton *OkButton = new QPushButton( i18n("&Find"), topFrame ); | 64 | QPushButton *OkButton = new QPushButton( i18n("&Find"), topFrame ); |
63 | //OkButton->setDefault( true ); | 65 | //OkButton->setDefault( true ); |
64 | connect(OkButton,SIGNAL(clicked()),SLOT(doSearch())); | 66 | connect(OkButton,SIGNAL(clicked()),SLOT(doSearch())); |
65 | subLayout->addWidget(OkButton); | 67 | subLayout->addWidget(OkButton); |
66 | searchEdit->setText("*"); // Find all events by default | 68 | searchEdit->setText("*"); // Find all events by default |
67 | searchEdit->setFocus(); | 69 | searchEdit->setFocus(); |
68 | connect(searchEdit, SIGNAL(textChanged ( const QString & )),this,SLOT(searchTextChanged( const QString & ))); | 70 | connect(searchEdit, SIGNAL(textChanged ( const QString & )),this,SLOT(searchTextChanged( const QString & ))); |
69 | connect(searchEdit, SIGNAL( returnPressed () ),this,SLOT(doSearch())); | 71 | connect(searchEdit, SIGNAL( returnPressed () ),this,SLOT(doSearch())); |
70 | // Subjects to search | 72 | // Subjects to search |
71 | // QGroupBox *subjectGroup = new QGroupBox(1,Vertical,i18n("Search In"), | 73 | // QGroupBox *subjectGroup = new QGroupBox(1,Vertical,i18n("Search In"), |
72 | // topFrame); | 74 | // topFrame); |
73 | 75 | ||
74 | QHBox *incidenceGroup = new QHBox( topFrame ); | 76 | QHBox *incidenceGroup = new QHBox( topFrame ); |
75 | layout->addWidget(incidenceGroup); | 77 | layout->addWidget(incidenceGroup); |
76 | 78 | ||
77 | mSearchEvent = new QCheckBox(i18n("Events"),incidenceGroup); | 79 | mSearchEvent = new QCheckBox(i18n("Events"),incidenceGroup); |
78 | mSearchEvent->setChecked(true); | 80 | mSearchEvent->setChecked(true); |
79 | mSearchTodo = new QCheckBox(i18n("Todos"),incidenceGroup); | 81 | mSearchTodo = new QCheckBox(i18n("Todos"),incidenceGroup); |
80 | mSearchJournal = new QCheckBox(i18n("Journals"),incidenceGroup); | 82 | mSearchJournal = new QCheckBox(i18n("Journals"),incidenceGroup); |
81 | 83 | ||
82 | QHBox *subjectGroup = new QHBox( topFrame ); | 84 | QHBox *subjectGroup = new QHBox( topFrame ); |
83 | layout->addWidget(subjectGroup); | 85 | layout->addWidget(subjectGroup); |
84 | 86 | ||
@@ -93,60 +95,65 @@ SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent) | |||
93 | mSearchAName = new QCheckBox(i18n("Name"),attendeeGroup ); | 95 | mSearchAName = new QCheckBox(i18n("Name"),attendeeGroup ); |
94 | mSearchAEmail = new QCheckBox(i18n("Email"), attendeeGroup ); | 96 | mSearchAEmail = new QCheckBox(i18n("Email"), attendeeGroup ); |
95 | // Date range | 97 | // Date range |
96 | // QGroupBox *rangeGroup = new QGroupBox(1,Horizontal,i18n("Date Range"), | 98 | // QGroupBox *rangeGroup = new QGroupBox(1,Horizontal,i18n("Date Range"), |
97 | // topFrame); | 99 | // topFrame); |
98 | // layout->addWidget(rangeGroup); | 100 | // layout->addWidget(rangeGroup); |
99 | 101 | ||
100 | QWidget *rangeWidget = new QWidget(topFrame); | 102 | QWidget *rangeWidget = new QWidget(topFrame); |
101 | QHBoxLayout *rangeLayout = new QHBoxLayout(rangeWidget,0,KDialog::spacingHint()); | 103 | QHBoxLayout *rangeLayout = new QHBoxLayout(rangeWidget,0,KDialog::spacingHint()); |
102 | rangeLayout->addWidget(new QLabel(i18n("From:"),rangeWidget)); | 104 | rangeLayout->addWidget(new QLabel(i18n("From:"),rangeWidget)); |
103 | mStartDate = new KDateEdit(rangeWidget); | 105 | mStartDate = new KDateEdit(rangeWidget); |
104 | rangeLayout->addWidget(mStartDate); | 106 | rangeLayout->addWidget(mStartDate); |
105 | rangeLayout->addWidget(new QLabel(i18n("To:"),rangeWidget)); | 107 | rangeLayout->addWidget(new QLabel(i18n("To:"),rangeWidget)); |
106 | mEndDate = new KDateEdit(rangeWidget); | 108 | mEndDate = new KDateEdit(rangeWidget); |
107 | mEndDate->setDate(QDate::currentDate().addDays(365)); | 109 | mEndDate->setDate(QDate::currentDate().addDays(365)); |
108 | rangeLayout->addWidget(mEndDate); | 110 | rangeLayout->addWidget(mEndDate); |
109 | QToolButton *wt = QWhatsThis::whatsThisButton ( rangeWidget ); | 111 | QToolButton *wt = QWhatsThis::whatsThisButton ( rangeWidget ); |
110 | rangeLayout->addWidget( (QWidget*)wt ); | 112 | rangeLayout->addWidget( (QWidget*)wt ); |
111 | layout->addWidget(rangeWidget); | 113 | layout->addWidget(rangeWidget); |
112 | // Results list view | 114 | // Results list view |
113 | listView = new KOListView(mCalendar,topFrame); | 115 | listView = new KOListView(mCalendar,topFrame); |
114 | layout->addWidget(listView); | 116 | layout->addWidget(listView); |
115 | 117 | ||
116 | listView->readSettings(KOGlobals::config(),"SearchListView Layout"); | 118 | listView->readSettings(KOGlobals::config(),"SearchListView Layout"); |
119 | connect(searchEdit,SIGNAL(scrollDOWN()),SLOT(setFocusToList())); | ||
117 | 120 | ||
118 | setCaption( i18n("KO/Pi Find: ")); | 121 | setCaption( i18n("KO/Pi Find: ")); |
119 | #ifdef DESKTOP_VERSION | 122 | #ifdef DESKTOP_VERSION |
120 | OkButton = new QPushButton( i18n("Close"), this ); | 123 | OkButton = new QPushButton( i18n("Close"), this ); |
121 | connect(OkButton,SIGNAL(clicked()),SLOT(hide())); | 124 | connect(OkButton,SIGNAL(clicked()),SLOT(hide())); |
122 | #endif | 125 | #endif |
123 | } | 126 | } |
124 | 127 | ||
125 | SearchDialog::~SearchDialog() | 128 | SearchDialog::~SearchDialog() |
126 | { | 129 | { |
127 | 130 | ||
128 | } | 131 | } |
132 | void SearchDialog::setFocusToList() | ||
133 | { | ||
134 | listView->resetFocus(); | ||
135 | } | ||
129 | void SearchDialog::accept() | 136 | void SearchDialog::accept() |
130 | { | 137 | { |
131 | doSearch(); | 138 | doSearch(); |
132 | } | 139 | } |
133 | void SearchDialog::updateList() | 140 | void SearchDialog::updateList() |
134 | { | 141 | { |
135 | //listView->updateList(); | 142 | //listView->updateList(); |
136 | if ( isVisible() ) { | 143 | if ( isVisible() ) { |
137 | updateView(); | 144 | updateView(); |
138 | //qDebug("SearchDialog::updated "); | 145 | //qDebug("SearchDialog::updated "); |
139 | } | 146 | } |
140 | else { | 147 | else { |
141 | listView->clear(); | 148 | listView->clear(); |
142 | //qDebug("SearchDialog::cleared "); | 149 | //qDebug("SearchDialog::cleared "); |
143 | 150 | ||
144 | } | 151 | } |
145 | } | 152 | } |
146 | void SearchDialog::searchTextChanged( const QString &_text ) | 153 | void SearchDialog::searchTextChanged( const QString &_text ) |
147 | { | 154 | { |
148 | #if 0 | 155 | #if 0 |
149 | enableButton( KDialogBase::User1, !_text.isEmpty() ); | 156 | enableButton( KDialogBase::User1, !_text.isEmpty() ); |
150 | #endif | 157 | #endif |
151 | } | 158 | } |
152 | 159 | ||
diff --git a/korganizer/searchdialog.h b/korganizer/searchdialog.h index f4aad9e..b730ed5 100644 --- a/korganizer/searchdialog.h +++ b/korganizer/searchdialog.h | |||
@@ -15,78 +15,80 @@ | |||
15 | 15 | ||
16 | You should have received a copy of the GNU General Public License | 16 | You should have received a copy of the GNU General Public License |
17 | along with this program; if not, write to the Free Software | 17 | along with this program; if not, write to the Free Software |
18 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | 18 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
19 | 19 | ||
20 | As a special exception, permission is given to link this program | 20 | As a special exception, permission is given to link this program |
21 | with any edition of Qt, and distribute the resulting executable, | 21 | with any edition of Qt, and distribute the resulting executable, |
22 | without including the source code for Qt in the source distribution. | 22 | without including the source code for Qt in the source distribution. |
23 | */ | 23 | */ |
24 | #ifndef SEARCHDIALOG_H | 24 | #ifndef SEARCHDIALOG_H |
25 | #define SEARCHDIALOG_H | 25 | #define SEARCHDIALOG_H |
26 | 26 | ||
27 | #include <qregexp.h> | 27 | #include <qregexp.h> |
28 | 28 | ||
29 | #include <kdialogbase.h> | 29 | #include <kdialogbase.h> |
30 | #include <qvbox.h> | 30 | #include <qvbox.h> |
31 | 31 | ||
32 | #include <libkcal/calendar.h> | 32 | #include <libkcal/calendar.h> |
33 | 33 | ||
34 | #include "kolistview.h" | 34 | #include "kolistview.h" |
35 | 35 | ||
36 | class KDateEdit; | 36 | class KDateEdit; |
37 | class QCheckBox; | 37 | class QCheckBox; |
38 | class QLineEdit; | 38 | class QLineEdit; |
39 | class KLineEdit; | ||
39 | class QLabel; | 40 | class QLabel; |
40 | class CalendarView; | 41 | class CalendarView; |
41 | 42 | ||
42 | using namespace KCal; | 43 | using namespace KCal; |
43 | class SearchDialog : public QVBox | 44 | class SearchDialog : public QVBox |
44 | { | 45 | { |
45 | Q_OBJECT | 46 | Q_OBJECT |
46 | public: | 47 | public: |
47 | SearchDialog(Calendar *calendar,CalendarView *parent=0); | 48 | SearchDialog(Calendar *calendar,CalendarView *parent=0); |
48 | virtual ~SearchDialog(); | 49 | virtual ~SearchDialog(); |
49 | KOListView *listview(){ return listView;} | 50 | KOListView *listview(){ return listView;} |
50 | void updateView(); | 51 | void updateView(); |
51 | 52 | ||
52 | public slots: | 53 | public slots: |
53 | void changeEventDisplay(Event *, int) { updateView(); } | 54 | void changeEventDisplay(Event *, int) { updateView(); } |
54 | void updateConfig(); | 55 | void updateConfig(); |
55 | void updateList(); | 56 | void updateList(); |
56 | protected slots: | 57 | protected slots: |
58 | void setFocusToList(); | ||
57 | void accept(); | 59 | void accept(); |
58 | void doSearch(); | 60 | void doSearch(); |
59 | void searchTextChanged( const QString &_text ); | 61 | void searchTextChanged( const QString &_text ); |
60 | 62 | ||
61 | signals: | 63 | signals: |
62 | void showEventSignal(Event *); | 64 | void showEventSignal(Event *); |
63 | void editEventSignal(Event *); | 65 | void editEventSignal(Event *); |
64 | void deleteEventSignal(Event *); | 66 | void deleteEventSignal(Event *); |
65 | 67 | ||
66 | private: | 68 | private: |
67 | void search(const QRegExp &); | 69 | void search(const QRegExp &); |
68 | 70 | ||
69 | Calendar *mCalendar; | 71 | Calendar *mCalendar; |
70 | 72 | ||
71 | QPtrList<Event> mMatchedEvents; | 73 | QPtrList<Event> mMatchedEvents; |
72 | QPtrList<Todo> mMatchedTodos; | 74 | QPtrList<Todo> mMatchedTodos; |
73 | QPtrList<Journal> mMatchedJournals; | 75 | QPtrList<Journal> mMatchedJournals; |
74 | 76 | ||
75 | QLabel *searchLabel; | 77 | QLabel *searchLabel; |
76 | QLineEdit *searchEdit; | 78 | KLineEdit *searchEdit; |
77 | KOListView *listView; | 79 | KOListView *listView; |
78 | 80 | ||
79 | KDateEdit *mStartDate; | 81 | KDateEdit *mStartDate; |
80 | KDateEdit *mEndDate; | 82 | KDateEdit *mEndDate; |
81 | QCheckBox *mSummaryCheck; | 83 | QCheckBox *mSummaryCheck; |
82 | QCheckBox *mDescriptionCheck; | 84 | QCheckBox *mDescriptionCheck; |
83 | QCheckBox *mCategoryCheck; | 85 | QCheckBox *mCategoryCheck; |
84 | QCheckBox *mSearchEvent; | 86 | QCheckBox *mSearchEvent; |
85 | QCheckBox *mSearchTodo; | 87 | QCheckBox *mSearchTodo; |
86 | QCheckBox *mSearchJournal; | 88 | QCheckBox *mSearchJournal; |
87 | QCheckBox *mSearchAName; | 89 | QCheckBox *mSearchAName; |
88 | QCheckBox *mSearchAEmail; | 90 | QCheckBox *mSearchAEmail; |
89 | void keyPressEvent ( QKeyEvent *e) ; | 91 | void keyPressEvent ( QKeyEvent *e) ; |
90 | }; | 92 | }; |
91 | 93 | ||
92 | #endif | 94 | #endif |
diff --git a/microkde/kdialogbase.cpp b/microkde/kdialogbase.cpp index 801094a..f453331 100644 --- a/microkde/kdialogbase.cpp +++ b/microkde/kdialogbase.cpp | |||
@@ -19,85 +19,87 @@ KDialogBase::KDialogBase( QWidget *parent, const char *name, bool modal, | |||
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 ); | 28 | (findButton( defaultButton ) )->setDefault( true ); |
29 | } | 29 | } |
30 | 30 | ||
31 | } | 31 | } |
32 | 32 | ||
33 | KDialogBase::KDialogBase( int dialogFace, const QString &caption, | 33 | KDialogBase::KDialogBase( int dialogFace, const QString &caption, |
34 | int buttonMask, ButtonCode defaultButton, | 34 | int buttonMask, ButtonCode defaultButton, |
35 | QWidget *parent, const char *name, bool modal, | 35 | QWidget *parent, const char *name, bool modal, |
36 | bool separator, | 36 | bool separator, |
37 | const QString &user1, | 37 | const QString &user1, |
38 | const QString &user2, | 38 | const QString &user2, |
39 | const QString &user3) : | 39 | const QString &user3) : |
40 | KDialog( parent, name, modal ) | 40 | KDialog( parent, name, modal ) |
41 | { | 41 | { |
42 | init( caption, buttonMask, user1, user2 ); | 42 | init( caption, buttonMask, user1, user2 ); |
43 | if (findButton( defaultButton ) ) | 43 | if (findButton( defaultButton ) ) { |
44 | (findButton( defaultButton ) )->setFocus(); | 44 | (findButton( defaultButton ) )->setFocus(); |
45 | (findButton( defaultButton ) )->setDefault( true ); | ||
46 | } | ||
45 | 47 | ||
46 | } | 48 | } |
47 | 49 | ||
48 | KDialogBase::~KDialogBase() | 50 | KDialogBase::~KDialogBase() |
49 | { | 51 | { |
50 | } | 52 | } |
51 | 53 | ||
52 | void KDialogBase::init( const QString &caption, int buttonMask, | 54 | void KDialogBase::init( const QString &caption, int buttonMask, |
53 | const QString &user1 ,const QString &user2 ) | 55 | const QString &user1 ,const QString &user2 ) |
54 | { | 56 | { |
55 | mMainWidget = 0; | 57 | mMainWidget = 0; |
56 | mTabWidget = 0; | 58 | mTabWidget = 0; |
57 | mPlainPage = 0; | 59 | mPlainPage = 0; |
58 | mTopLayout = 0; | 60 | mTopLayout = 0; |
59 | if ( !caption.isEmpty() ) { | 61 | if ( !caption.isEmpty() ) { |
60 | setCaption( caption ); | 62 | setCaption( caption ); |
61 | } | 63 | } |
62 | 64 | ||
63 | if ( buttonMask & User1 ) { | 65 | if ( buttonMask & User1 ) { |
64 | mUser1Button = new QPushButton( user1, this ); | 66 | mUser1Button = new QPushButton( user1, this ); |
65 | connect( mUser1Button, SIGNAL( clicked() ), SLOT( slotUser1() ) ); | 67 | connect( mUser1Button, SIGNAL( clicked() ), SLOT( slotUser1() ) ); |
66 | } else { | 68 | } else { |
67 | mUser1Button = 0; | 69 | mUser1Button = 0; |
68 | } | 70 | } |
69 | if ( buttonMask & User2 ) { | 71 | if ( buttonMask & User2 ) { |
70 | mUser2Button = new QPushButton( user2, this ); | 72 | mUser2Button = new QPushButton( user2, this ); |
71 | connect( mUser2Button, SIGNAL( clicked() ), SLOT( slotUser2() ) ); | 73 | connect( mUser2Button, SIGNAL( clicked() ), SLOT( slotUser2() ) ); |
72 | } else { | 74 | } else { |
73 | mUser2Button = 0; | 75 | mUser2Button = 0; |
74 | } | 76 | } |
75 | 77 | ||
76 | if ( buttonMask & Ok ) { | 78 | if ( buttonMask & Ok ) { |
77 | mOkButton = new QPushButton( i18n("Ok"), this ); | 79 | mOkButton = new QPushButton( i18n("Ok"), this ); |
78 | connect( mOkButton, SIGNAL( clicked() ), SLOT( slotOk() ) ); | 80 | connect( mOkButton, SIGNAL( clicked() ), SLOT( slotOk() ) ); |
79 | mOkButton->setDefault( true ); | 81 | //mOkButton->setDefault( true ); |
80 | } else { | 82 | } else { |
81 | mOkButton = 0; | 83 | mOkButton = 0; |
82 | } | 84 | } |
83 | if ( buttonMask & Default ) { | 85 | if ( buttonMask & Default ) { |
84 | mDefaultButton = new QPushButton( i18n("Default"), this ); | 86 | mDefaultButton = new QPushButton( i18n("Default"), this ); |
85 | connect( mDefaultButton, SIGNAL( clicked() ), SIGNAL( defaultClicked() ) ); | 87 | connect( mDefaultButton, SIGNAL( clicked() ), SIGNAL( defaultClicked() ) ); |
86 | } else { | 88 | } else { |
87 | mDefaultButton = 0; | 89 | mDefaultButton = 0; |
88 | } | 90 | } |
89 | 91 | ||
90 | if ( buttonMask & Apply ) { | 92 | if ( buttonMask & Apply ) { |
91 | mApplyButton = new QPushButton( i18n("Apply"), this ); | 93 | mApplyButton = new QPushButton( i18n("Apply"), this ); |
92 | connect( mApplyButton, SIGNAL( clicked() ), SLOT( slotApply() ) ); | 94 | connect( mApplyButton, SIGNAL( clicked() ), SLOT( slotApply() ) ); |
93 | } else { | 95 | } else { |
94 | mApplyButton = 0; | 96 | mApplyButton = 0; |
95 | } | 97 | } |
96 | 98 | ||
97 | if ( buttonMask & Cancel ) { | 99 | if ( buttonMask & Cancel ) { |
98 | mCancelButton = new QPushButton( i18n("Cancel"), this ); | 100 | mCancelButton = new QPushButton( i18n("Cancel"), this ); |
99 | connect( mCancelButton, SIGNAL( clicked() ), SLOT( slotCancel() ) ); | 101 | connect( mCancelButton, SIGNAL( clicked() ), SLOT( slotCancel() ) ); |
100 | } else { | 102 | } else { |
101 | mCancelButton = 0; | 103 | mCancelButton = 0; |
102 | } | 104 | } |
103 | 105 | ||
@@ -1 +1 @@ | |||
version = "2.0.12"; | version = "2.0.13"; | ||