-rw-r--r-- | korganizer/calendarview.cpp | 14 | ||||
-rw-r--r-- | korganizer/koeditordetails.cpp | 7 | ||||
-rw-r--r-- | korganizer/mainwindow.cpp | 5 |
3 files changed, 18 insertions, 8 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 47cd488..543897a 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -2429,60 +2429,66 @@ void CalendarView::moveIncidence(Incidence * inc ) | |||
2429 | mDatePicker->setDate( da ); | 2429 | mDatePicker->setDate( da ); |
2430 | } | 2430 | } |
2431 | void CalendarView::showDatePicker( ) | 2431 | void CalendarView::showDatePicker( ) |
2432 | { | 2432 | { |
2433 | //qDebug("CalendarView::showDatePicker( ) "); | 2433 | //qDebug("CalendarView::showDatePicker( ) "); |
2434 | if ( mDateFrame->isVisible() ) | 2434 | if ( mDateFrame->isVisible() ) |
2435 | mDateFrame->hide(); | 2435 | mDateFrame->hide(); |
2436 | else { | 2436 | else { |
2437 | int w =mDatePicker->sizeHint().width() ; | 2437 | int w =mDatePicker->sizeHint().width() ; |
2438 | int h = mDatePicker->sizeHint().height() ; | 2438 | int h = mDatePicker->sizeHint().height() ; |
2439 | int dw = QApplication::desktop()->width(); | 2439 | int dw = QApplication::desktop()->width(); |
2440 | int dh = QApplication::desktop()->height(); | 2440 | int dh = QApplication::desktop()->height(); |
2441 | mDateFrame->setGeometry( (dw-w)/2, (dh - h )/2 ,w,h ); | 2441 | mDateFrame->setGeometry( (dw-w)/2, (dh - h )/2 ,w,h ); |
2442 | mDateFrame->show(); | 2442 | mDateFrame->show(); |
2443 | } | 2443 | } |
2444 | mDatePickerMode = 1; | 2444 | mDatePickerMode = 1; |
2445 | mDatePicker->setDate( mNavigator->selectedDates().first() ); | 2445 | mDatePicker->setDate( mNavigator->selectedDates().first() ); |
2446 | } | 2446 | } |
2447 | 2447 | ||
2448 | void CalendarView::showEventEditor() | 2448 | void CalendarView::showEventEditor() |
2449 | { | 2449 | { |
2450 | #ifdef DESKTOP_VERSION | 2450 | #ifdef DESKTOP_VERSION |
2451 | mEventEditor->show(); | 2451 | mEventEditor->show(); |
2452 | #else | 2452 | #else |
2453 | if ( mEventEditor->width() != QApplication::desktop()->width() ) | 2453 | if ( mEventEditor->width() != QApplication::desktop()->width() ) { |
2454 | mEventEditor->hide(); | 2454 | qDebug("CalendarView: recreate mEventEditor "); |
2455 | delete mEventEditor; | ||
2456 | mEventEditor = mDialogManager->getEventEditor(); | ||
2457 | } | ||
2455 | mEventEditor->showMaximized(); | 2458 | mEventEditor->showMaximized(); |
2456 | #endif | 2459 | #endif |
2457 | } | 2460 | } |
2458 | void CalendarView::showTodoEditor() | 2461 | void CalendarView::showTodoEditor() |
2459 | { | 2462 | { |
2460 | #ifdef DESKTOP_VERSION | 2463 | #ifdef DESKTOP_VERSION |
2461 | mTodoEditor->show(); | 2464 | mTodoEditor->show(); |
2462 | #else | 2465 | #else |
2463 | if ( mTodoEditor->width() != QApplication::desktop()->width() ) | 2466 | if ( mTodoEditor->width() != QApplication::desktop()->width() ) { |
2464 | mTodoEditor->hide(); | 2467 | qDebug("CalendarView: recreate mTodoEditor "); |
2468 | delete mTodoEditor; | ||
2469 | mTodoEditor = mDialogManager->getTodoEditor(); | ||
2470 | } | ||
2465 | mTodoEditor->showMaximized(); | 2471 | mTodoEditor->showMaximized(); |
2466 | #endif | 2472 | #endif |
2467 | } | 2473 | } |
2468 | 2474 | ||
2469 | void CalendarView::cloneIncidence() | 2475 | void CalendarView::cloneIncidence() |
2470 | { | 2476 | { |
2471 | Incidence *incidence = currentSelection(); | 2477 | Incidence *incidence = currentSelection(); |
2472 | if ( !incidence ) incidence = mTodoList->selectedIncidences().first(); | 2478 | if ( !incidence ) incidence = mTodoList->selectedIncidences().first(); |
2473 | if ( incidence ) { | 2479 | if ( incidence ) { |
2474 | cloneIncidence(incidence); | 2480 | cloneIncidence(incidence); |
2475 | } | 2481 | } |
2476 | } | 2482 | } |
2477 | void CalendarView::moveIncidence() | 2483 | void CalendarView::moveIncidence() |
2478 | { | 2484 | { |
2479 | Incidence *incidence = currentSelection(); | 2485 | Incidence *incidence = currentSelection(); |
2480 | if ( !incidence ) incidence = mTodoList->selectedIncidences().first(); | 2486 | if ( !incidence ) incidence = mTodoList->selectedIncidences().first(); |
2481 | if ( incidence ) { | 2487 | if ( incidence ) { |
2482 | moveIncidence(incidence); | 2488 | moveIncidence(incidence); |
2483 | } | 2489 | } |
2484 | } | 2490 | } |
2485 | void CalendarView::beamIncidence() | 2491 | void CalendarView::beamIncidence() |
2486 | { | 2492 | { |
2487 | Incidence *incidence = currentSelection(); | 2493 | Incidence *incidence = currentSelection(); |
2488 | if ( !incidence ) incidence = mTodoList->selectedIncidences().first(); | 2494 | if ( !incidence ) incidence = mTodoList->selectedIncidences().first(); |
diff --git a/korganizer/koeditordetails.cpp b/korganizer/koeditordetails.cpp index 66f6977..b73d22f 100644 --- a/korganizer/koeditordetails.cpp +++ b/korganizer/koeditordetails.cpp | |||
@@ -121,60 +121,61 @@ KOEditorDetails::KOEditorDetails (int spacing,QWidget* parent,const char* name) | |||
121 | 121 | ||
122 | mStatusCombo = new QComboBox(false,this); | 122 | mStatusCombo = new QComboBox(false,this); |
123 | mStatusCombo->insertStringList(Attendee::statusList()); | 123 | mStatusCombo->insertStringList(Attendee::statusList()); |
124 | connect(mStatusCombo,SIGNAL(activated(int)),SLOT(updateAttendeeItem())); | 124 | connect(mStatusCombo,SIGNAL(activated(int)),SLOT(updateAttendeeItem())); |
125 | 125 | ||
126 | mRsvpButton = new QCheckBox(this); | 126 | mRsvpButton = new QCheckBox(this); |
127 | mRsvpButton->setText(i18n("Request response")); | 127 | mRsvpButton->setText(i18n("Request response")); |
128 | connect(mRsvpButton,SIGNAL(clicked()),SLOT(updateAttendeeItem())); | 128 | connect(mRsvpButton,SIGNAL(clicked()),SLOT(updateAttendeeItem())); |
129 | QWidget *buttonBox = new QWidget(this); | 129 | QWidget *buttonBox = new QWidget(this); |
130 | QVBoxLayout *buttonLayout = new QVBoxLayout(buttonBox); | 130 | QVBoxLayout *buttonLayout = new QVBoxLayout(buttonBox); |
131 | 131 | ||
132 | QPushButton *newButton = new QPushButton(i18n("&New"),buttonBox); | 132 | QPushButton *newButton = new QPushButton(i18n("&New"),buttonBox); |
133 | buttonLayout->addWidget(newButton); | 133 | buttonLayout->addWidget(newButton); |
134 | connect(newButton,SIGNAL(clicked()),SLOT(addNewAttendee())); | 134 | connect(newButton,SIGNAL(clicked()),SLOT(addNewAttendee())); |
135 | 135 | ||
136 | mRemoveButton = new QPushButton(i18n("&Remove"),buttonBox); | 136 | mRemoveButton = new QPushButton(i18n("&Remove"),buttonBox); |
137 | buttonLayout->addWidget(mRemoveButton); | 137 | buttonLayout->addWidget(mRemoveButton); |
138 | connect(mRemoveButton, SIGNAL(clicked()),SLOT(removeAttendee())); | 138 | connect(mRemoveButton, SIGNAL(clicked()),SLOT(removeAttendee())); |
139 | 139 | ||
140 | mAddressBookButton = new QPushButton(i18n("Address &Book..."),this); | 140 | mAddressBookButton = new QPushButton(i18n("Address &Book..."),this); |
141 | // buttonLayout->addWidget(mAddressBookButton); | 141 | // buttonLayout->addWidget(mAddressBookButton); |
142 | connect(mAddressBookButton,SIGNAL(clicked()),SLOT(openAddressBook())); | 142 | connect(mAddressBookButton,SIGNAL(clicked()),SLOT(openAddressBook())); |
143 | //mRoleCombo->setFixedSize( mRoleCombo->sizeHint () ); | 143 | //mRoleCombo->setFixedSize( mRoleCombo->sizeHint () ); |
144 | 144 | ||
145 | if (qApp->desktop()->width() < 300 ) { | 145 | if (qApp->desktop()->width() < 640 ) { |
146 | if ( qApp->desktop()->width() < 300 ) | ||
146 | mListView->setFixedHeight(80); | 147 | mListView->setFixedHeight(80); |
147 | topLayout->addMultiCellWidget(mOrganizerLabel,0,0,0,3); | 148 | topLayout->addMultiCellWidget(mOrganizerLabel,0,0,0,3); |
148 | topLayout->addMultiCellWidget(mListView,1,1,0,3); | 149 | topLayout->addMultiCellWidget(mListView,1,1,0,3); |
149 | topLayout->addWidget(attendeeLabel,3,0); | 150 | topLayout->addWidget(attendeeLabel,3,0); |
150 | topLayout->addMultiCellWidget(mNameEdit,3,3,1,2); | 151 | topLayout->addMultiCellWidget(mNameEdit,3,3,1,2); |
151 | topLayout->addWidget(emailLabel,4,0); | 152 | topLayout->addWidget(emailLabel,4,0); |
152 | topLayout->addMultiCellWidget(mEmailEdit,4,4,1,2); | 153 | topLayout->addMultiCellWidget(mEmailEdit,4,4,1,2); |
153 | topLayout->addWidget(attendeeRoleLabel,5,0); | 154 | topLayout->addWidget(attendeeRoleLabel,5,0); |
154 | topLayout->addMultiCellWidget(mRoleCombo,5,5,1,2); | 155 | topLayout->addMultiCellWidget(mRoleCombo,5,5,1,3); |
155 | topLayout->addWidget(statusLabel,6,0); | 156 | topLayout->addWidget(statusLabel,6,0); |
156 | topLayout->addMultiCellWidget(mStatusCombo,6,6,1,2); | 157 | topLayout->addMultiCellWidget(mStatusCombo,6,6,1,3); |
157 | topLayout->addMultiCellWidget(mAddressBookButton,2,2,2,3); | 158 | topLayout->addMultiCellWidget(mAddressBookButton,2,2,2,3); |
158 | topLayout->addMultiCellWidget(mRsvpButton,2,2,0,1); | 159 | topLayout->addMultiCellWidget(mRsvpButton,2,2,0,1); |
159 | topLayout->addMultiCellWidget(buttonBox,3,4,3,3); | 160 | topLayout->addMultiCellWidget(buttonBox,3,4,3,3); |
160 | topLayout->setRowStretch(1,2); | 161 | topLayout->setRowStretch(1,2); |
161 | topLayout->setColStretch(0,0); | 162 | topLayout->setColStretch(0,0); |
162 | topLayout->setColStretch(1,2); | 163 | topLayout->setColStretch(1,2); |
163 | topLayout->setColStretch(2,1); | 164 | topLayout->setColStretch(2,1); |
164 | topLayout->setColStretch(3,1); | 165 | topLayout->setColStretch(3,1); |
165 | 166 | ||
166 | } else { | 167 | } else { |
167 | topLayout->addMultiCellWidget(mOrganizerLabel,0,0,0,5); | 168 | topLayout->addMultiCellWidget(mOrganizerLabel,0,0,0,5); |
168 | topLayout->addMultiCellWidget(mListView,1,1,0,5); | 169 | topLayout->addMultiCellWidget(mListView,1,1,0,5); |
169 | topLayout->addWidget(attendeeLabel,3,0); | 170 | topLayout->addWidget(attendeeLabel,3,0); |
170 | topLayout->addMultiCellWidget(mNameEdit,3,3,1,4); | 171 | topLayout->addMultiCellWidget(mNameEdit,3,3,1,4); |
171 | topLayout->addWidget(emailLabel,4,0); | 172 | topLayout->addWidget(emailLabel,4,0); |
172 | topLayout->addMultiCellWidget(mEmailEdit,4,4,1,4); | 173 | topLayout->addMultiCellWidget(mEmailEdit,4,4,1,4); |
173 | topLayout->addWidget(attendeeRoleLabel,5,0); | 174 | topLayout->addWidget(attendeeRoleLabel,5,0); |
174 | topLayout->addMultiCellWidget(mRoleCombo,5,5,1,2); | 175 | topLayout->addMultiCellWidget(mRoleCombo,5,5,1,2); |
175 | topLayout->addWidget(statusLabel,5,3); | 176 | topLayout->addWidget(statusLabel,5,3); |
176 | topLayout->addMultiCellWidget(mStatusCombo,5,5,4,5); | 177 | topLayout->addMultiCellWidget(mStatusCombo,5,5,4,5); |
177 | topLayout->addMultiCellWidget(mAddressBookButton,2,2,4,5); | 178 | topLayout->addMultiCellWidget(mAddressBookButton,2,2,4,5); |
178 | topLayout->addMultiCellWidget(mRsvpButton,2,2,0,1); | 179 | topLayout->addMultiCellWidget(mRsvpButton,2,2,0,1); |
179 | topLayout->addMultiCellWidget(buttonBox,3,4,5,5); | 180 | topLayout->addMultiCellWidget(buttonBox,3,4,5,5); |
180 | topLayout->setRowStretch(1,5); | 181 | topLayout->setRowStretch(1,5); |
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 65566b5..46ae6a0 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -92,49 +92,52 @@ class KOex2phonePrefs : public QDialog | |||
92 | new QLabel( i18n("Connection: "), temphb ); | 92 | new QLabel( i18n("Connection: "), temphb ); |
93 | mPhoneConnection = new QLineEdit( temphb); | 93 | mPhoneConnection = new QLineEdit( temphb); |
94 | lay->addWidget( temphb ); | 94 | lay->addWidget( temphb ); |
95 | temphb = new QHBox( this ); | 95 | temphb = new QHBox( this ); |
96 | new QLabel( i18n("Model(opt.): "), temphb ); | 96 | new QLabel( i18n("Model(opt.): "), temphb ); |
97 | mPhoneModel = new QLineEdit( temphb); | 97 | mPhoneModel = new QLineEdit( temphb); |
98 | lay->addWidget( temphb ); | 98 | lay->addWidget( temphb ); |
99 | mWriteBackFuture= new QCheckBox( i18n("Write back events in future only"), this ); | 99 | mWriteBackFuture= new QCheckBox( i18n("Write back events in future only"), this ); |
100 | mWriteBackFuture->setChecked( true ); | 100 | mWriteBackFuture->setChecked( true ); |
101 | lay->addWidget( mWriteBackFuture ); | 101 | lay->addWidget( mWriteBackFuture ); |
102 | temphb = new QHBox( this ); | 102 | temphb = new QHBox( this ); |
103 | new QLabel( i18n("Max. weeks in future: ") , temphb ); | 103 | new QLabel( i18n("Max. weeks in future: ") , temphb ); |
104 | mWriteBackFutureWeeks= new QSpinBox(1,104, 1, temphb); | 104 | mWriteBackFutureWeeks= new QSpinBox(1,104, 1, temphb); |
105 | mWriteBackFutureWeeks->setValue( 8 ); | 105 | mWriteBackFutureWeeks->setValue( 8 ); |
106 | lay->addWidget( temphb ); | 106 | lay->addWidget( temphb ); |
107 | lay->addWidget(lab = new QLabel( i18n("NOTE: This will remove all old\ntodo/calendar data on phone!"), this ) ); | 107 | lay->addWidget(lab = new QLabel( i18n("NOTE: This will remove all old\ntodo/calendar data on phone!"), this ) ); |
108 | lab->setAlignment (AlignHCenter ); | 108 | lab->setAlignment (AlignHCenter ); |
109 | QPushButton * ok = new QPushButton( i18n("Export to mobile phone!"), this ); | 109 | QPushButton * ok = new QPushButton( i18n("Export to mobile phone!"), this ); |
110 | lay->addWidget( ok ); | 110 | lay->addWidget( ok ); |
111 | QPushButton * cancel = new QPushButton( i18n("Cancel"), this ); | 111 | QPushButton * cancel = new QPushButton( i18n("Cancel"), this ); |
112 | lay->addWidget( cancel ); | 112 | lay->addWidget( cancel ); |
113 | connect ( ok,SIGNAL(clicked() ),this , SLOT ( accept() ) ); | 113 | connect ( ok,SIGNAL(clicked() ),this , SLOT ( accept() ) ); |
114 | connect (cancel, SIGNAL(clicked() ), this, SLOT ( reject()) ); | 114 | connect (cancel, SIGNAL(clicked() ), this, SLOT ( reject()) ); |
115 | resize( 220, 240 ); | 115 | resize( 220, 240 ); |
116 | 116 | qApp->processEvents(); | |
117 | int dw = QApplication::desktop()->width(); | ||
118 | int dh = QApplication::desktop()->height(); | ||
119 | move( (dw-width())/2, (dh - height() )/2 ); | ||
117 | } | 120 | } |
118 | 121 | ||
119 | public: | 122 | public: |
120 | QLineEdit* mPhoneConnection, *mPhoneDevice, *mPhoneModel; | 123 | QLineEdit* mPhoneConnection, *mPhoneDevice, *mPhoneModel; |
121 | QCheckBox* mWriteBackFuture; | 124 | QCheckBox* mWriteBackFuture; |
122 | QSpinBox* mWriteBackFutureWeeks; | 125 | QSpinBox* mWriteBackFutureWeeks; |
123 | }; | 126 | }; |
124 | 127 | ||
125 | int globalFlagBlockStartup; | 128 | int globalFlagBlockStartup; |
126 | MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) : | 129 | MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) : |
127 | QMainWindow( parent, name ) | 130 | QMainWindow( parent, name ) |
128 | { | 131 | { |
129 | 132 | ||
130 | #ifdef DESKTOP_VERSION | 133 | #ifdef DESKTOP_VERSION |
131 | setFont( QFont("Arial"), 14 ); | 134 | setFont( QFont("Arial"), 14 ); |
132 | #endif | 135 | #endif |
133 | mClosed = false; | 136 | mClosed = false; |
134 | //QString confFile = KStandardDirs::appDir() + "config/korganizerrc"; | 137 | //QString confFile = KStandardDirs::appDir() + "config/korganizerrc"; |
135 | QString confFile = locateLocal("config","korganizerrc"); | 138 | QString confFile = locateLocal("config","korganizerrc"); |
136 | QFileInfo finf ( confFile ); | 139 | QFileInfo finf ( confFile ); |
137 | bool showWarning = !finf.exists(); | 140 | bool showWarning = !finf.exists(); |
138 | setIcon(SmallIcon( "ko24" ) ); | 141 | setIcon(SmallIcon( "ko24" ) ); |
139 | mBlockAtStartup = true; | 142 | mBlockAtStartup = true; |
140 | mFlagKeyPressed = false; | 143 | mFlagKeyPressed = false; |