summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-07-29 14:38:22 (UTC)
committer zautrix <zautrix>2005-07-29 14:38:22 (UTC)
commit50b0d4463cf13ae27e45e54b48b2911a3ceb5f9f (patch) (unidiff)
tree66e4544dd5528d342871b955f000ec4bd0de79b5
parent43a46672f4212c9617c753e0aa591f781d2e5240 (diff)
downloadkdepimpi-50b0d4463cf13ae27e45e54b48b2911a3ceb5f9f.zip
kdepimpi-50b0d4463cf13ae27e45e54b48b2911a3ceb5f9f.tar.gz
kdepimpi-50b0d4463cf13ae27e45e54b48b2911a3ceb5f9f.tar.bz2
layout fix
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/journalentry.cpp7
-rw-r--r--korganizer/koeditorgeneral.cpp7
2 files changed, 10 insertions, 4 deletions
diff --git a/korganizer/journalentry.cpp b/korganizer/journalentry.cpp
index 739949d..5fc3f2f 100644
--- a/korganizer/journalentry.cpp
+++ b/korganizer/journalentry.cpp
@@ -74,14 +74,12 @@ JournalEntry::JournalEntry(Calendar *calendar,QWidget *parent) :
74 QPixmap iconp; 74 QPixmap iconp;
75 vb->setMargin ( KDialog::marginHint()-1 ); 75 vb->setMargin ( KDialog::marginHint()-1 );
76 QPushButton * toggleJournal = new QPushButton( vb ); 76 QPushButton * toggleJournal = new QPushButton( vb );
77 iconp = SmallIcon("1updownarrow"); 77 iconp = SmallIcon("1updownarrow");
78 toggleJournal->setPixmap (iconp ) ; 78 toggleJournal->setPixmap (iconp ) ;
79 QLabel* textLabel = new QLabel(" "+i18n("Title: "),vb); 79 QLabel* textLabel = new QLabel(" "+i18n("Title: "),vb);
80 vb->setStretchFactor (textLabel,1);
81 vb->setStretchFactor( toggleJournal, 1 );
82 mTitle = new KOLocationBox(TRUE, vb, 30); 80 mTitle = new KOLocationBox(TRUE, vb, 30);
83 mTitle->setSizePolicy( QSizePolicy( QSizePolicy::Preferred ,QSizePolicy::Fixed ,FALSE) ); 81 mTitle->setSizePolicy( QSizePolicy( QSizePolicy::Preferred ,QSizePolicy::Fixed ,FALSE) );
84 mCalendarBox = new QComboBox(vb); 82 mCalendarBox = new QComboBox(vb);
85 mCalendarBox->setSizePolicy( QSizePolicy( QSizePolicy::Preferred ,QSizePolicy::Fixed ,FALSE) ); 83 mCalendarBox->setSizePolicy( QSizePolicy( QSizePolicy::Preferred ,QSizePolicy::Fixed ,FALSE) );
86#ifndef DESKTOP_VERSION 84#ifndef DESKTOP_VERSION
87 mTitle->setSizeLimit( 8 ); 85 mTitle->setSizeLimit( 8 );
@@ -106,13 +104,16 @@ JournalEntry::JournalEntry(Calendar *calendar,QWidget *parent) :
106 iconp = SmallIcon("fileimport16"); 104 iconp = SmallIcon("fileimport16");
107 else 105 else
108 iconp = SmallIcon("fileimport"); 106 iconp = SmallIcon("fileimport");
109 loadTemplate->setPixmap (iconp ) ; 107 loadTemplate->setPixmap (iconp ) ;
110 loadTemplate->setFixedSize( size, size ); 108 loadTemplate->setFixedSize( size, size );
111 saveTemplate->setFixedSize( size, size ); 109 saveTemplate->setFixedSize( size, size );
112 toggleJournal->setFixedSize( size , size ); 110 int widwid = size;
111 if ( QApplication::desktop()->width() < 320 )
112 widwid = size/2+1;
113 toggleJournal->setFixedSize( widwid , size );
113 mTitle->setFixedHeight( size+4); 114 mTitle->setFixedHeight( size+4);
114 mCalendarBox->setFixedHeight( size+4); 115 mCalendarBox->setFixedHeight( size+4);
115 mEditor = new KTextEdit(this); 116 mEditor = new KTextEdit(this);
116#ifndef DESKTOP_VERSION 117#ifndef DESKTOP_VERSION
117 QPEApplication::setStylusOperation( mEditor, QPEApplication::RightOnHold ); 118 QPEApplication::setStylusOperation( mEditor, QPEApplication::RightOnHold );
118#endif 119#endif
diff --git a/korganizer/koeditorgeneral.cpp b/korganizer/koeditorgeneral.cpp
index aa55d82..e601eef 100644
--- a/korganizer/koeditorgeneral.cpp
+++ b/korganizer/koeditorgeneral.cpp
@@ -122,13 +122,18 @@ void KOEditorGeneral::initHeader(QWidget *parent,QBoxLayout *topLayout)
122 headerLayout->setColStretch( 3, 10); 122 headerLayout->setColStretch( 3, 10);
123 mCalendarBox->setMaximumWidth( 64 ); 123 mCalendarBox->setMaximumWidth( 64 );
124 } 124 }
125 else { 125 else {
126 headerLayout->addWidget(mLocationEdit,1,1); 126 headerLayout->addWidget(mLocationEdit,1,1);
127 headerLayout->addWidget(mCalendarBox,1,2); 127 headerLayout->addWidget(mCalendarBox,1,2);
128 headerLayout->setColStretch( 1, 3); 128 int str = 3;
129 if ( QApplication::desktop()->width() < 320 ) {
130 --str;
131 --str;
132 }
133 headerLayout->setColStretch( 1, str);
129 headerLayout->setColStretch( 2, 1); 134 headerLayout->setColStretch( 2, 1);
130 } 135 }
131 136
132} 137}
133void KOEditorGeneral::setFocusOn( int i ) 138void KOEditorGeneral::setFocusOn( int i )
134{ 139{