fixi

1 files changed, 21 insertions, 1 deletions

diff --git a/korganizer/journalentry.cpp b/korganizer/journalentry.cpp
index b8a4cf2..f0e0f86 100644
--- a/korganizer/journalentry.cpp
+++ b/korganizer/journalentry.cpp
@@ -67,25 +67,26 @@ JournalEntry::JournalEntry(Calendar *calendar,QWidget *parent) :
     heiHint = heiHint / fac;
 
     showOnlyMode = false;
   mCalendar = calendar;
   mJournal = 0;
   visibleMode = true;
   QHBox * vb = new QHBox ( this );
   QPixmap iconp;
   vb->setMargin ( KDialog::marginHint()-1 );
   QPushButton * toggleJournal = new QPushButton( vb );
   iconp = SmallIcon("1updownarrow");
   toggleJournal->setPixmap (iconp ) ;
-  vb->setStretchFactor (new QLabel(" "+i18n("Title: "),vb),1);
+  QLabel* textLabel = new QLabel(" "+i18n("Title: "),vb);
+  vb->setStretchFactor (textLabel,1);
   vb->setStretchFactor( toggleJournal, 1 );
   mTitle = new KOLocationBox(TRUE, vb, 30);
   mTitle->setSizePolicy( QSizePolicy(  QSizePolicy::MinimumExpanding ,QSizePolicy::Fixed  ,FALSE) );
   mCalendarBox = new QComboBox(vb);
   mCalendarBox->setSizePolicy( QSizePolicy(  QSizePolicy::MinimumExpanding ,QSizePolicy::Fixed  ,FALSE) );
 #ifndef DESKTOP_VERSION
   mTitle->setSizeLimit( 8 );
   mCalendarBox->setSizeLimit( 8 );
 #endif
   vb->setStretchFactor ( mTitle, 8 );
   vb->setStretchFactor ( mCalendarBox, 3 ); 
   //mTitleLabel->setMargin(0);
@@ -103,40 +104,59 @@ JournalEntry::JournalEntry(Calendar *calendar,QWidget *parent) :
   else
       iconp = SmallIcon("fileimport");
   loadTemplate->setPixmap (iconp ) ;
   loadTemplate->setFixedSize(  size, size );
   saveTemplate->setFixedSize(  size, size );
   toggleJournal->setFixedSize( size  , size );
   mTitle->setFixedHeight( size+4);
   mCalendarBox->setFixedHeight( size+4);
   mEditor = new KTextEdit(this);
 #ifndef DESKTOP_VERSION
   QPEApplication::setStylusOperation( mEditor, QPEApplication::RightOnHold );
 #endif
+  mMaxWidDiff = 3*size - 2*frameWidth() - textLabel->sizeHint().width();
+  mDeskWid = QApplication::desktop()->width();
+  int maxwid = mDeskWid - mMaxWidDiff;
+  mTitle->setMaximumWidth( maxwid/2 +20 );
+  mCalendarBox->setMaximumWidth( maxwid/2 -20 );
   mEditor->setWordWrap( KTextEdit::WidgetWidth );
   QBoxLayout *topLayout = new QVBoxLayout(this);
   topLayout->addWidget(vb);
   topLayout->addWidget(mEditor);
   mEditor->installEventFilter(this);
   connect( saveTemplate, SIGNAL( clicked() ), this , SLOT( slotSaveTemplate() ) );
   connect( loadTemplate, SIGNAL( clicked() ), this , SLOT( slotLoadTemplate() ) );
   connect( toggleJournal, SIGNAL( clicked() ), this , SLOT( toggleShowJournal() ) );
   mTitle->load( KOLocationBox::SUMMARYJOURNAL );
   mTitle->lineEdit ()->setText("");
 }
 
 JournalEntry::~JournalEntry()
 {
     //qDebug("JournalEntry::~JournalEntry() ");
 }
+void JournalEntry::resizeEvent(QResizeEvent* e ) 
+{
+#ifndef DESKTOP_VERSION
+    if ( mDeskWid != QApplication::desktop()->width() ) {
+        mDeskWid == QApplication::desktop()->width();
+        int maxwid = mDeskWid - mMaxWidDiff;
+        mTitle->setMaximumWidth( maxwid/2 +20 );
+        mCalendarBox->setMaximumWidth( maxwid/2 -20 );
+    }
+    setMaximumWidth( QApplication::desktop()->width() );
+    qDebug("MAXXX %d ", QApplication::desktop()->width());
+#endif
+    QFrame::resizeEvent( e ); 
+}
 QSize JournalEntry::sizeHint() const
 {
     return QSize ( 240, heiHint );
 }
 void JournalEntry::slotSaveTemplate()
 {
     QString fileName =locateLocal( "templates", "journals" ); 
     QDir t_dir;
     if ( !t_dir.exists(fileName) )
         t_dir.mkdir ( fileName );
     fileName += "/journal";
     fileName = KFileDialog::getSaveFileName(  fileName , i18n("Save as Journal template"), this );