From 7c31102a00920834ab8e3778f0f459b96b2fb309 Mon Sep 17 00:00:00 2001 From: zautrix Date: Sat, 30 Apr 2005 07:32:03 +0000 Subject: fixes --- 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,5 +1,11 @@ Info about the changes in new versions of KDE-Pim/Pi +********** VERSION 2.1.4 ************ + +Fixed two more bugs in the KA/Pi CSV import dialog: +Made it possible to read multi-line fields and import it to the "Note" field. +Fixed a problem in mapping custom fields, whatever a custem field is... + ********** VERSION 2.1.3 ************ Changed the menu structure of the alarm applet: diff --git a/korganizer/koeditordetails.cpp b/korganizer/koeditordetails.cpp index 802261c..bdfc637 100644 --- a/korganizer/koeditordetails.cpp +++ b/korganizer/koeditordetails.cpp @@ -88,8 +88,10 @@ KOEditorDetails::KOEditorDetails (int spacing,QWidget* parent,const char* name) mListView->addColumn(i18n("Status"),100); mListView->addColumn(i18n("RSVP"),35); if ( QApplication::desktop()->width() <= 320 ) { - //mListView->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding) ); - mListView->setFixedHeight(80); + int hei = 80; + if ( QApplication::desktop()->height() <= 240 ) + hei = 60; + mListView->setFixedHeight(hei); } mListView->setAllColumnsShowFocus (true ); //mListView->setSingleClick( true ); @@ -147,46 +149,64 @@ KOEditorDetails::KOEditorDetails (int spacing,QWidget* parent,const char* name) // buttonLayout->addWidget(mAddressBookButton); connect(mAddressBookButton,SIGNAL(clicked()),SLOT(openAddressBook())); //mRoleCombo->setFixedSize( mRoleCombo->sizeHint () ); - - if (qApp->desktop()->width() < 640 ) { - if ( qApp->desktop()->width() < 300 ) - topLayout->setSpacing(1); - ;//mListView->setFixedHeight(80); - topLayout->addMultiCellWidget(mOrganizerLabel,0,0,0,3); - topLayout->addMultiCellWidget(mListView,1,1,0,3); - topLayout->addWidget(attendeeLabel,3,0); - topLayout->addMultiCellWidget(mNameEdit,3,3,1,2); - topLayout->addWidget(emailLabel,4,0); - topLayout->addMultiCellWidget(mEmailEdit,4,4,1,2); - topLayout->addWidget(attendeeRoleLabel,5,0); - topLayout->addMultiCellWidget(mRoleCombo,5,5,1,3); - topLayout->addWidget(statusLabel,6,0); - topLayout->addMultiCellWidget(mStatusCombo,6,6,1,3); - topLayout->addMultiCellWidget(mAddressBookButton,2,2,2,3); - topLayout->addMultiCellWidget(mRsvpButton,2,2,0,1); - topLayout->addMultiCellWidget(buttonBox,3,4,3,3); - topLayout->setRowStretch(1,2); - topLayout->setColStretch(0,0); - topLayout->setColStretch(1,2); - topLayout->setColStretch(2,1); - topLayout->setColStretch(3,1); - - } else { + if ( QApplication::desktop()->height() <= 240 ) { + mRoleCombo->setSizePolicy( QSizePolicy( QSizePolicy::Preferred ,QSizePolicy::Minimum ,FALSE) ); + mStatusCombo->setSizePolicy( QSizePolicy( QSizePolicy::Preferred ,QSizePolicy::Minimum ,FALSE) ); topLayout->addMultiCellWidget(mOrganizerLabel,0,0,0,5); - topLayout->addMultiCellWidget(mListView,1,1,0,5); - topLayout->addWidget(attendeeLabel,3,0); - topLayout->addMultiCellWidget(mNameEdit,3,3,1,4); - topLayout->addWidget(emailLabel,4,0); - topLayout->addMultiCellWidget(mEmailEdit,4,4,1,4); - topLayout->addWidget(attendeeRoleLabel,5,0); - topLayout->addMultiCellWidget(mRoleCombo,5,5,1,2); - topLayout->addWidget(statusLabel,5,3); - topLayout->addMultiCellWidget(mStatusCombo,5,5,4,5); - topLayout->addMultiCellWidget(mAddressBookButton,2,2,4,5); - topLayout->addMultiCellWidget(mRsvpButton,2,2,0,1); - topLayout->addMultiCellWidget(buttonBox,3,4,5,5); - topLayout->setRowStretch(1,5); - topLayout->setColStretch(0,0); + topLayout->addMultiCellWidget(mListView,1,1,0,5); + topLayout->addWidget(attendeeLabel,3,0); + topLayout->addMultiCellWidget(mNameEdit,3,3,1,4); + topLayout->addWidget(emailLabel,4,0); + topLayout->addMultiCellWidget(mEmailEdit,4,4,1,4); + topLayout->addWidget(attendeeRoleLabel,5,0); + topLayout->addMultiCellWidget(mRoleCombo,5,5,1,2); + topLayout->addWidget(statusLabel,5,3); + topLayout->addMultiCellWidget(mStatusCombo,5,5,4,5); + topLayout->addMultiCellWidget(mAddressBookButton,2,2,2,5); + topLayout->addMultiCellWidget(mRsvpButton,2,2,0,1); + topLayout->addMultiCellWidget(buttonBox,3,4,5,5); + topLayout->setRowStretch(1,5); + topLayout->setColStretch(0,0); + } else { + if (qApp->desktop()->width() < 640 ) { + if ( qApp->desktop()->width() < 300 ) + topLayout->setSpacing(1); + ;//mListView->setFixedHeight(80); + topLayout->addMultiCellWidget(mOrganizerLabel,0,0,0,3); + topLayout->addMultiCellWidget(mListView,1,1,0,3); + topLayout->addWidget(attendeeLabel,3,0); + topLayout->addMultiCellWidget(mNameEdit,3,3,1,2); + topLayout->addWidget(emailLabel,4,0); + topLayout->addMultiCellWidget(mEmailEdit,4,4,1,2); + topLayout->addWidget(attendeeRoleLabel,5,0); + topLayout->addMultiCellWidget(mRoleCombo,5,5,1,3); + topLayout->addWidget(statusLabel,6,0); + topLayout->addMultiCellWidget(mStatusCombo,6,6,1,3); + topLayout->addMultiCellWidget(mAddressBookButton,2,2,2,3); + topLayout->addMultiCellWidget(mRsvpButton,2,2,0,1); + topLayout->addMultiCellWidget(buttonBox,3,4,3,3); + topLayout->setRowStretch(1,2); + topLayout->setColStretch(0,0); + topLayout->setColStretch(1,2); + topLayout->setColStretch(2,1); + topLayout->setColStretch(3,1); + } else { + topLayout->addMultiCellWidget(mOrganizerLabel,0,0,0,5); + topLayout->addMultiCellWidget(mListView,1,1,0,5); + topLayout->addWidget(attendeeLabel,3,0); + topLayout->addMultiCellWidget(mNameEdit,3,3,1,4); + topLayout->addWidget(emailLabel,4,0); + topLayout->addMultiCellWidget(mEmailEdit,4,4,1,4); + topLayout->addWidget(attendeeRoleLabel,5,0); + topLayout->addMultiCellWidget(mRoleCombo,5,5,1,2); + topLayout->addWidget(statusLabel,5,3); + topLayout->addMultiCellWidget(mStatusCombo,5,5,4,5); + topLayout->addMultiCellWidget(mAddressBookButton,2,2,4,5); + topLayout->addMultiCellWidget(mRsvpButton,2,2,0,1); + topLayout->addMultiCellWidget(buttonBox,3,4,5,5); + topLayout->setRowStretch(1,5); + topLayout->setColStretch(0,0); + } } // #if 0 // 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 @@ -93,7 +93,10 @@ void KOEditorGeneral::initHeader(QWidget *parent,QBoxLayout *topLayout) connect ( mSummaryEdit->lineEdit(), SIGNAL ( returnPressed() ), this, SIGNAL (allAccepted () ) ); QLabel *locationLabel = new QLabel(i18n("Location:"),parent); - headerLayout->addWidget(locationLabel,2,0); + if ( QApplication::desktop()->height() < 320 ) + headerLayout->addWidget(locationLabel,1,2); + else + headerLayout->addWidget(locationLabel,2,0); mLocationEdit = new KOLocationBox(TRUE,parent,10); mLocationEdit->setSizePolicy( QSizePolicy( QSizePolicy::Preferred ,QSizePolicy::MinimumExpanding ,FALSE) ); @@ -102,8 +105,15 @@ void KOEditorGeneral::initHeader(QWidget *parent,QBoxLayout *topLayout) // mLocationEdit = new QLineEdit(parent); connect ( mLocationEdit->lineEdit(), SIGNAL ( returnPressed() ), this, SIGNAL (allAccepted () ) ); - headerLayout->addWidget(mLocationEdit,2,1); - headerLayout->setColStretch( 1, 10); + if ( QApplication::desktop()->height() < 320 ) { + headerLayout->addWidget(mLocationEdit,1,3); + headerLayout->setColStretch( 1, 10); + headerLayout->setColStretch( 3, 10); + } + else { + headerLayout->addWidget(mLocationEdit,2,1); + headerLayout->setColStretch( 1, 10); + } } void KOEditorGeneral::setFocusOn( int i ) { diff --git a/korganizer/koeventeditor.cpp b/korganizer/koeventeditor.cpp index e23e680..02d4a78 100644 --- a/korganizer/koeventeditor.cpp +++ b/korganizer/koeventeditor.cpp @@ -54,6 +54,8 @@ KOEventEditor::KOEventEditor( Calendar *calendar, QWidget *parent ) : { mEvent = 0; init(); + if ( QApplication::desktop()->height() <= 240 ) + hideButtons(); } KOEventEditor::~KOEventEditor() @@ -113,7 +115,7 @@ void KOEventEditor::setupGeneral() mGeneral->enableAlarm( false ); QBoxLayout *buttonLayout; - if ( QApplication::desktop()->width() < 500 ) + if ( QApplication::desktop()->width() < 500 && QApplication::desktop()->height() > 240 ) buttonLayout = new QVBoxLayout( topLayout ); else buttonLayout = new QHBoxLayout( topLayout ); diff --git a/korganizer/kotodoeditor.cpp b/korganizer/kotodoeditor.cpp index 5513e8b..9073bca 100644 --- a/korganizer/kotodoeditor.cpp +++ b/korganizer/kotodoeditor.cpp @@ -59,6 +59,8 @@ KOTodoEditor::KOTodoEditor( Calendar *calendar, QWidget *parent ) : mRelatedTodo = 0; findButton(User1)->hide(); init(); + if ( QApplication::desktop()->height() <= 240 ) + hideButtons(); } KOTodoEditor::~KOTodoEditor() diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp index 007d1f3..59bf1a2 100644 --- a/korganizer/searchdialog.cpp +++ b/korganizer/searchdialog.cpp @@ -114,7 +114,9 @@ SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent) // Results list view listView = new KOListView(mCalendar,topFrame); layout->addWidget(listView); - + //layout->setStretchFactor( listView, 333 ); + //listView->setSizePolicy( QSizePolicy( QSizePolicy::Preferred ,QSizePolicy::Expanding) ); + //listView->setMaximumHeight( 50 ); listView->readSettings(KOGlobals::config(),"SearchListView Layout"); 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 @@ -112,7 +112,11 @@ void Todo::saveRunningInfoToFile( QString comment ) to->setHasDueDate( true ); to->setUid( file ); if ( !comment.isEmpty() ) { - to->setDescription( comment ); + QString des = to->description(); + if ( des.isEmpty () ) + to->setDescription( "TT-Note: " + comment ); + else + to->setDescription( "TT-Note: " + comment +"\n" + des ); } cal.addIncidence( to ); ICalFormat format; diff --git a/microkde/kdatetbl.cpp b/microkde/kdatetbl.cpp index 2d97c8c..4271b55 100644 --- a/microkde/kdatetbl.cpp +++ b/microkde/kdatetbl.cpp @@ -786,8 +786,13 @@ KDateInternalWeekPicker::KDateInternalWeekPicker setHScrollBarMode(AlwaysOff); setVScrollBarMode(AlwaysOff); setFrameStyle(QFrame::NoFrame); - setNumRows(13); - setNumCols(4); + if ( QApplication::desktop()->height() > 240 ) { + setNumRows(13); + setNumCols(4); + } else { + setNumRows(4); + setNumCols(13); + } // enable to find drawing failures: // setTableFlags(Tbl_clipCellPainting); #if 0 @@ -831,8 +836,8 @@ KDateInternalWeekPicker::setupPainter(QPainter *p) void KDateInternalWeekPicker::viewportResizeEvent(QResizeEvent*) { - setCellWidth(width()/4); - setCellHeight(height()/13); + setCellWidth(width()/ numCols()); + setCellHeight(height()/ numRows()); } void @@ -841,7 +846,7 @@ KDateInternalWeekPicker::paintCell(QPainter* painter, int row, int col) int index; QString text; // ----- find the number of the cell: - index=4*row+col+1; + index=numCols()*row+col+1; text=QString::number( index ); painter->drawText(0, 0, cellWidth(), cellHeight(), AlignCenter, text); if ( activeCol == col && activeRow == row ) @@ -933,7 +938,7 @@ KDateInternalWeekPicker::contentsMouseReleaseEvent(QMouseEvent *e) { // the user clicked on the frame of the table emit(closeMe(0)); } - pos=4*row+col+1; + pos=numCols()*row+col+1; result=pos; emit(closeMe(1)); } -- cgit v0.9.0.2