-rw-r--r-- | bin/kdepim/WhatsNew.txt | 6 | ||||
-rw-r--r-- | korganizer/koeditordetails.cpp | 28 | ||||
-rw-r--r-- | korganizer/koeditorgeneral.cpp | 10 | ||||
-rw-r--r-- | korganizer/koeventeditor.cpp | 4 | ||||
-rw-r--r-- | korganizer/kotodoeditor.cpp | 2 | ||||
-rw-r--r-- | korganizer/searchdialog.cpp | 4 | ||||
-rw-r--r-- | libkcal/todo.cpp | 6 | ||||
-rw-r--r-- | microkde/kdatetbl.cpp | 13 |
8 files changed, 62 insertions, 11 deletions
diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt index 41b2a81..e3c4e0a 100644 --- a/bin/kdepim/WhatsNew.txt +++ b/bin/kdepim/WhatsNew.txt | |||
@@ -1,4 +1,10 @@ | |||
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.1.4 ************ | ||
4 | |||
5 | Fixed two more bugs in the KA/Pi CSV import dialog: | ||
6 | Made it possible to read multi-line fields and import it to the "Note" field. | ||
7 | Fixed a problem in mapping custom fields, whatever a custem field is... | ||
8 | |||
3 | ********** VERSION 2.1.3 ************ | 9 | ********** VERSION 2.1.3 ************ |
4 | 10 | ||
diff --git a/korganizer/koeditordetails.cpp b/korganizer/koeditordetails.cpp index 802261c..bdfc637 100644 --- a/korganizer/koeditordetails.cpp +++ b/korganizer/koeditordetails.cpp | |||
@@ -89,6 +89,8 @@ KOEditorDetails::KOEditorDetails (int spacing,QWidget* parent,const char* name) | |||
89 | mListView->addColumn(i18n("RSVP"),35); | 89 | mListView->addColumn(i18n("RSVP"),35); |
90 | if ( QApplication::desktop()->width() <= 320 ) { | 90 | if ( QApplication::desktop()->width() <= 320 ) { |
91 | //mListView->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding) ); | 91 | int hei = 80; |
92 | mListView->setFixedHeight(80); | 92 | if ( QApplication::desktop()->height() <= 240 ) |
93 | hei = 60; | ||
94 | mListView->setFixedHeight(hei); | ||
93 | } | 95 | } |
94 | mListView->setAllColumnsShowFocus (true ); | 96 | mListView->setAllColumnsShowFocus (true ); |
@@ -148,5 +150,23 @@ KOEditorDetails::KOEditorDetails (int spacing,QWidget* parent,const char* name) | |||
148 | connect(mAddressBookButton,SIGNAL(clicked()),SLOT(openAddressBook())); | 150 | connect(mAddressBookButton,SIGNAL(clicked()),SLOT(openAddressBook())); |
149 | //mRoleCombo->setFixedSize( mRoleCombo->sizeHint () ); | 151 | //mRoleCombo->setFixedSize( mRoleCombo->sizeHint () ); |
150 | 152 | if ( QApplication::desktop()->height() <= 240 ) { | |
153 | mRoleCombo->setSizePolicy( QSizePolicy( QSizePolicy::Preferred ,QSizePolicy::Minimum ,FALSE) ); | ||
154 | mStatusCombo->setSizePolicy( QSizePolicy( QSizePolicy::Preferred ,QSizePolicy::Minimum ,FALSE) ); | ||
155 | topLayout->addMultiCellWidget(mOrganizerLabel,0,0,0,5); | ||
156 | topLayout->addMultiCellWidget(mListView,1,1,0,5); | ||
157 | topLayout->addWidget(attendeeLabel,3,0); | ||
158 | topLayout->addMultiCellWidget(mNameEdit,3,3,1,4); | ||
159 | topLayout->addWidget(emailLabel,4,0); | ||
160 | topLayout->addMultiCellWidget(mEmailEdit,4,4,1,4); | ||
161 | topLayout->addWidget(attendeeRoleLabel,5,0); | ||
162 | topLayout->addMultiCellWidget(mRoleCombo,5,5,1,2); | ||
163 | topLayout->addWidget(statusLabel,5,3); | ||
164 | topLayout->addMultiCellWidget(mStatusCombo,5,5,4,5); | ||
165 | topLayout->addMultiCellWidget(mAddressBookButton,2,2,2,5); | ||
166 | topLayout->addMultiCellWidget(mRsvpButton,2,2,0,1); | ||
167 | topLayout->addMultiCellWidget(buttonBox,3,4,5,5); | ||
168 | topLayout->setRowStretch(1,5); | ||
169 | topLayout->setColStretch(0,0); | ||
170 | } else { | ||
151 | if (qApp->desktop()->width() < 640 ) { | 171 | if (qApp->desktop()->width() < 640 ) { |
152 | if ( qApp->desktop()->width() < 300 ) | 172 | if ( qApp->desktop()->width() < 300 ) |
@@ -171,5 +191,4 @@ KOEditorDetails::KOEditorDetails (int spacing,QWidget* parent,const char* name) | |||
171 | topLayout->setColStretch(2,1); | 191 | topLayout->setColStretch(2,1); |
172 | topLayout->setColStretch(3,1); | 192 | topLayout->setColStretch(3,1); |
173 | |||
174 | } else { | 193 | } else { |
175 | topLayout->addMultiCellWidget(mOrganizerLabel,0,0,0,5); | 194 | topLayout->addMultiCellWidget(mOrganizerLabel,0,0,0,5); |
@@ -189,4 +208,5 @@ KOEditorDetails::KOEditorDetails (int spacing,QWidget* parent,const char* name) | |||
189 | topLayout->setColStretch(0,0); | 208 | topLayout->setColStretch(0,0); |
190 | } | 209 | } |
210 | } | ||
191 | // #if 0 | 211 | // #if 0 |
192 | // topLayout->setColStretch(2,1); | 212 | // topLayout->setColStretch(2,1); |
diff --git a/korganizer/koeditorgeneral.cpp b/korganizer/koeditorgeneral.cpp index 0045b7f..bfe0aec 100644 --- a/korganizer/koeditorgeneral.cpp +++ b/korganizer/koeditorgeneral.cpp | |||
@@ -94,4 +94,7 @@ void KOEditorGeneral::initHeader(QWidget *parent,QBoxLayout *topLayout) | |||
94 | 94 | ||
95 | QLabel *locationLabel = new QLabel(i18n("Location:"),parent); | 95 | QLabel *locationLabel = new QLabel(i18n("Location:"),parent); |
96 | if ( QApplication::desktop()->height() < 320 ) | ||
97 | headerLayout->addWidget(locationLabel,1,2); | ||
98 | else | ||
96 | headerLayout->addWidget(locationLabel,2,0); | 99 | headerLayout->addWidget(locationLabel,2,0); |
97 | 100 | ||
@@ -103,7 +106,14 @@ void KOEditorGeneral::initHeader(QWidget *parent,QBoxLayout *topLayout) | |||
103 | // mLocationEdit = new QLineEdit(parent); | 106 | // mLocationEdit = new QLineEdit(parent); |
104 | connect ( mLocationEdit->lineEdit(), SIGNAL ( returnPressed() ), this, SIGNAL (allAccepted () ) ); | 107 | connect ( mLocationEdit->lineEdit(), SIGNAL ( returnPressed() ), this, SIGNAL (allAccepted () ) ); |
108 | if ( QApplication::desktop()->height() < 320 ) { | ||
109 | headerLayout->addWidget(mLocationEdit,1,3); | ||
110 | headerLayout->setColStretch( 1, 10); | ||
111 | headerLayout->setColStretch( 3, 10); | ||
112 | } | ||
113 | else { | ||
105 | headerLayout->addWidget(mLocationEdit,2,1); | 114 | headerLayout->addWidget(mLocationEdit,2,1); |
106 | headerLayout->setColStretch( 1, 10); | 115 | headerLayout->setColStretch( 1, 10); |
107 | } | 116 | } |
117 | } | ||
108 | void KOEditorGeneral::setFocusOn( int i ) | 118 | void KOEditorGeneral::setFocusOn( int i ) |
109 | { | 119 | { |
diff --git a/korganizer/koeventeditor.cpp b/korganizer/koeventeditor.cpp index e23e680..02d4a78 100644 --- a/korganizer/koeventeditor.cpp +++ b/korganizer/koeventeditor.cpp | |||
@@ -55,4 +55,6 @@ KOEventEditor::KOEventEditor( Calendar *calendar, QWidget *parent ) : | |||
55 | mEvent = 0; | 55 | mEvent = 0; |
56 | init(); | 56 | init(); |
57 | if ( QApplication::desktop()->height() <= 240 ) | ||
58 | hideButtons(); | ||
57 | } | 59 | } |
58 | 60 | ||
@@ -114,5 +116,5 @@ void KOEventEditor::setupGeneral() | |||
114 | 116 | ||
115 | QBoxLayout *buttonLayout; | 117 | QBoxLayout *buttonLayout; |
116 | if ( QApplication::desktop()->width() < 500 ) | 118 | if ( QApplication::desktop()->width() < 500 && QApplication::desktop()->height() > 240 ) |
117 | buttonLayout = new QVBoxLayout( topLayout ); | 119 | buttonLayout = new QVBoxLayout( topLayout ); |
118 | else | 120 | else |
diff --git a/korganizer/kotodoeditor.cpp b/korganizer/kotodoeditor.cpp index 5513e8b..9073bca 100644 --- a/korganizer/kotodoeditor.cpp +++ b/korganizer/kotodoeditor.cpp | |||
@@ -60,4 +60,6 @@ KOTodoEditor::KOTodoEditor( Calendar *calendar, QWidget *parent ) : | |||
60 | findButton(User1)->hide(); | 60 | findButton(User1)->hide(); |
61 | init(); | 61 | init(); |
62 | if ( QApplication::desktop()->height() <= 240 ) | ||
63 | hideButtons(); | ||
62 | } | 64 | } |
63 | 65 | ||
diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp index 007d1f3..59bf1a2 100644 --- a/korganizer/searchdialog.cpp +++ b/korganizer/searchdialog.cpp | |||
@@ -115,5 +115,7 @@ SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent) | |||
115 | listView = new KOListView(mCalendar,topFrame); | 115 | listView = new KOListView(mCalendar,topFrame); |
116 | layout->addWidget(listView); | 116 | layout->addWidget(listView); |
117 | 117 | //layout->setStretchFactor( listView, 333 ); | |
118 | //listView->setSizePolicy( QSizePolicy( QSizePolicy::Preferred ,QSizePolicy::Expanding) ); | ||
119 | //listView->setMaximumHeight( 50 ); | ||
118 | listView->readSettings(KOGlobals::config(),"SearchListView Layout"); | 120 | listView->readSettings(KOGlobals::config(),"SearchListView Layout"); |
119 | connect(searchEdit,SIGNAL(scrollDOWN()),SLOT(setFocusToList())); | 121 | connect(searchEdit,SIGNAL(scrollDOWN()),SLOT(setFocusToList())); |
diff --git a/libkcal/todo.cpp b/libkcal/todo.cpp index f7e38a7..d7431c7 100644 --- a/libkcal/todo.cpp +++ b/libkcal/todo.cpp | |||
@@ -113,5 +113,9 @@ void Todo::saveRunningInfoToFile( QString comment ) | |||
113 | to->setUid( file ); | 113 | to->setUid( file ); |
114 | if ( !comment.isEmpty() ) { | 114 | if ( !comment.isEmpty() ) { |
115 | to->setDescription( comment ); | 115 | QString des = to->description(); |
116 | if ( des.isEmpty () ) | ||
117 | to->setDescription( "TT-Note: " + comment ); | ||
118 | else | ||
119 | to->setDescription( "TT-Note: " + comment +"\n" + des ); | ||
116 | } | 120 | } |
117 | cal.addIncidence( to ); | 121 | cal.addIncidence( to ); |
diff --git a/microkde/kdatetbl.cpp b/microkde/kdatetbl.cpp index 2d97c8c..4271b55 100644 --- a/microkde/kdatetbl.cpp +++ b/microkde/kdatetbl.cpp | |||
@@ -787,6 +787,11 @@ KDateInternalWeekPicker::KDateInternalWeekPicker | |||
787 | setVScrollBarMode(AlwaysOff); | 787 | setVScrollBarMode(AlwaysOff); |
788 | setFrameStyle(QFrame::NoFrame); | 788 | setFrameStyle(QFrame::NoFrame); |
789 | if ( QApplication::desktop()->height() > 240 ) { | ||
789 | setNumRows(13); | 790 | setNumRows(13); |
790 | setNumCols(4); | 791 | setNumCols(4); |
792 | } else { | ||
793 | setNumRows(4); | ||
794 | setNumCols(13); | ||
795 | } | ||
791 | // enable to find drawing failures: | 796 | // enable to find drawing failures: |
792 | // setTableFlags(Tbl_clipCellPainting); | 797 | // setTableFlags(Tbl_clipCellPainting); |
@@ -832,6 +837,6 @@ void | |||
832 | KDateInternalWeekPicker::viewportResizeEvent(QResizeEvent*) | 837 | KDateInternalWeekPicker::viewportResizeEvent(QResizeEvent*) |
833 | { | 838 | { |
834 | setCellWidth(width()/4); | 839 | setCellWidth(width()/ numCols()); |
835 | setCellHeight(height()/13); | 840 | setCellHeight(height()/ numRows()); |
836 | } | 841 | } |
837 | 842 | ||
@@ -842,5 +847,5 @@ KDateInternalWeekPicker::paintCell(QPainter* painter, int row, int col) | |||
842 | QString text; | 847 | QString text; |
843 | // ----- find the number of the cell: | 848 | // ----- find the number of the cell: |
844 | index=4*row+col+1; | 849 | index=numCols()*row+col+1; |
845 | text=QString::number( index ); | 850 | text=QString::number( index ); |
846 | painter->drawText(0, 0, cellWidth(), cellHeight(), AlignCenter, text); | 851 | painter->drawText(0, 0, cellWidth(), cellHeight(), AlignCenter, text); |
@@ -934,5 +939,5 @@ KDateInternalWeekPicker::contentsMouseReleaseEvent(QMouseEvent *e) | |||
934 | emit(closeMe(0)); | 939 | emit(closeMe(0)); |
935 | } | 940 | } |
936 | pos=4*row+col+1; | 941 | pos=numCols()*row+col+1; |
937 | result=pos; | 942 | result=pos; |
938 | emit(closeMe(1)); | 943 | emit(closeMe(1)); |