| -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 |
5 files changed, 42 insertions, 6 deletions
diff --git a/korganizer/koeditordetails.cpp b/korganizer/koeditordetails.cpp index 802261c..bdfc637 100644 --- a/korganizer/koeditordetails.cpp +++ b/korganizer/koeditordetails.cpp @@ -90,4 +90,6 @@ KOEditorDetails::KOEditorDetails (int spacing,QWidget* parent,const char* name) 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); } @@ -149,3 +151,21 @@ KOEditorDetails::KOEditorDetails (int spacing,QWidget* parent,const char* name) //mRoleCombo->setFixedSize( mRoleCombo->sizeHint () ); - + 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,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 ) { @@ -172,3 +192,2 @@ KOEditorDetails::KOEditorDetails (int spacing,QWidget* parent,const char* name) topLayout->setColStretch(3,1); - } else { @@ -190,2 +209,3 @@ KOEditorDetails::KOEditorDetails (int spacing,QWidget* parent,const char* name) } + } // #if 0 diff --git a/korganizer/koeditorgeneral.cpp b/korganizer/koeditorgeneral.cpp index 0045b7f..bfe0aec 100644 --- a/korganizer/koeditorgeneral.cpp +++ b/korganizer/koeditorgeneral.cpp @@ -95,2 +95,5 @@ void KOEditorGeneral::initHeader(QWidget *parent,QBoxLayout *topLayout) QLabel *locationLabel = new QLabel(i18n("Location:"),parent); + if ( QApplication::desktop()->height() < 320 ) + headerLayout->addWidget(locationLabel,1,2); + else headerLayout->addWidget(locationLabel,2,0); @@ -104,2 +107,8 @@ void KOEditorGeneral::initHeader(QWidget *parent,QBoxLayout *topLayout) connect ( mLocationEdit->lineEdit(), SIGNAL ( returnPressed() ), this, SIGNAL (allAccepted () ) ); + if ( QApplication::desktop()->height() < 320 ) { + headerLayout->addWidget(mLocationEdit,1,3); + headerLayout->setColStretch( 1, 10); + headerLayout->setColStretch( 3, 10); + } + else { headerLayout->addWidget(mLocationEdit,2,1); @@ -107,2 +116,3 @@ void KOEditorGeneral::initHeader(QWidget *parent,QBoxLayout *topLayout) } +} 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 @@ -56,2 +56,4 @@ KOEventEditor::KOEventEditor( Calendar *calendar, QWidget *parent ) : init(); + if ( QApplication::desktop()->height() <= 240 ) + hideButtons(); } @@ -115,3 +117,3 @@ void KOEventEditor::setupGeneral() QBoxLayout *buttonLayout; - if ( QApplication::desktop()->width() < 500 ) + if ( QApplication::desktop()->width() < 500 && QApplication::desktop()->height() > 240 ) buttonLayout = new QVBoxLayout( topLayout ); diff --git a/korganizer/kotodoeditor.cpp b/korganizer/kotodoeditor.cpp index 5513e8b..9073bca 100644 --- a/korganizer/kotodoeditor.cpp +++ b/korganizer/kotodoeditor.cpp @@ -61,2 +61,4 @@ KOTodoEditor::KOTodoEditor( Calendar *calendar, QWidget *parent ) : init(); + if ( QApplication::desktop()->height() <= 240 ) + hideButtons(); } diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp index 007d1f3..59bf1a2 100644 --- a/korganizer/searchdialog.cpp +++ b/korganizer/searchdialog.cpp @@ -116,3 +116,5 @@ SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent) layout->addWidget(listView); - + //layout->setStretchFactor( listView, 333 ); + //listView->setSizePolicy( QSizePolicy( QSizePolicy::Preferred ,QSizePolicy::Expanding) ); + //listView->setMaximumHeight( 50 ); listView->readSettings(KOGlobals::config(),"SearchListView Layout"); |