summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/journalentry.cpp7
-rw-r--r--korganizer/kojournalview.cpp2
2 files changed, 4 insertions, 5 deletions
diff --git a/korganizer/journalentry.cpp b/korganizer/journalentry.cpp
index 232ea58..58863fe 100644
--- a/korganizer/journalentry.cpp
+++ b/korganizer/journalentry.cpp
@@ -69,8 +69,6 @@ JournalEntry::JournalEntry(Calendar *calendar,QWidget *parent) :
69 QPushButton * toggleJournal = new QPushButton( vb ); 69 QPushButton * toggleJournal = new QPushButton( vb );
70 icon = SmallIcon("1updownarrow"); 70 icon = SmallIcon("1updownarrow");
71 toggleJournal->setIconSet (icon ) ; 71 toggleJournal->setIconSet (icon ) ;
72 int size = toggleJournal->sizeHint().height();
73 toggleJournal->setFixedSize( size * 2 /3 , size );
74 new QLabel(i18n(" Title: "),vb); 72 new QLabel(i18n(" Title: "),vb);
75 mTitle = new KLineEdit ( vb ); 73 mTitle = new KLineEdit ( vb );
76 mTitleLabel = new QLabel(i18n("Title"),vb); 74 mTitleLabel = new QLabel(i18n("Title"),vb);
@@ -83,14 +81,15 @@ JournalEntry::JournalEntry(Calendar *calendar,QWidget *parent) :
83 else 81 else
84 icon = SmallIcon("fileexport"); 82 icon = SmallIcon("fileexport");
85 saveTemplate->setIconSet (icon ) ; 83 saveTemplate->setIconSet (icon ) ;
86 //size = saveTemplate->sizeHint().height(); 84 int size = saveTemplate->sizeHint().height();
87 saveTemplate->setFixedSize( size, size );
88 if ( QApplication::desktop()->width() < 321 ) 85 if ( QApplication::desktop()->width() < 321 )
89 icon = SmallIcon("fileimport16"); 86 icon = SmallIcon("fileimport16");
90 else 87 else
91 icon = SmallIcon("fileimport"); 88 icon = SmallIcon("fileimport");
92 loadTemplate->setIconSet (icon ) ; 89 loadTemplate->setIconSet (icon ) ;
93 loadTemplate->setFixedSize( size, size ); 90 loadTemplate->setFixedSize( size, size );
91 saveTemplate->setFixedSize( size, size );
92 toggleJournal->setFixedSize( size , size );
94 mEditor = new KTextEdit(this); 93 mEditor = new KTextEdit(this);
95 connect(mEditor,SIGNAL(textChanged()),SLOT(setDirty())); 94 connect(mEditor,SIGNAL(textChanged()),SLOT(setDirty()));
96#ifndef DESKTOP_VERSION 95#ifndef DESKTOP_VERSION
diff --git a/korganizer/kojournalview.cpp b/korganizer/kojournalview.cpp
index 4fc9013..ff87ef4 100644
--- a/korganizer/kojournalview.cpp
+++ b/korganizer/kojournalview.cpp
@@ -69,7 +69,7 @@ KOJournalView::KOJournalView(Calendar *calendar, QWidget *parent,
69 newJournal->setFixedSize( size, size ); 69 newJournal->setFixedSize( size, size );
70 mDateLabel = new QLabel ( vb ); 70 mDateLabel = new QLabel ( vb );
71 mTopLayout->addWidget( vb ); 71 mTopLayout->addWidget( vb );
72 mDateLabel->setMargin(2); 72 mDateLabel->setMargin(1);
73 mDateLabel->setAlignment(AlignCenter); 73 mDateLabel->setAlignment(AlignCenter);
74 connect( newJournal, SIGNAL( clicked() ), this , SLOT( newJournal() ) ); 74 connect( newJournal, SIGNAL( clicked() ), this , SLOT( newJournal() ) );
75 getNewEntry(); 75 getNewEntry();