-rw-r--r-- | korganizer/journalentry.cpp | 7 | ||||
-rw-r--r-- | korganizer/kojournalview.cpp | 2 |
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 | |||
@@ -56,54 +56,53 @@ | |||
56 | #endif | 56 | #endif |
57 | JournalEntry::JournalEntry(Calendar *calendar,QWidget *parent) : | 57 | JournalEntry::JournalEntry(Calendar *calendar,QWidget *parent) : |
58 | QFrame(parent) | 58 | QFrame(parent) |
59 | { | 59 | { |
60 | heiHint = QApplication::desktop()->height() / 5 ; | 60 | heiHint = QApplication::desktop()->height() / 5 ; |
61 | showOnlyMode = false; | 61 | showOnlyMode = false; |
62 | mCalendar = calendar; | 62 | mCalendar = calendar; |
63 | mJournal = 0; | 63 | mJournal = 0; |
64 | mDirty = false; | 64 | mDirty = false; |
65 | 65 | ||
66 | QHBox * vb = new QHBox ( this ); | 66 | QHBox * vb = new QHBox ( this ); |
67 | QIconSet icon; | 67 | QIconSet icon; |
68 | 68 | ||
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); |
77 | mTitleLabel->setMargin(0); | 75 | mTitleLabel->setMargin(0); |
78 | mTitleLabel->setAlignment(AlignCenter); | 76 | mTitleLabel->setAlignment(AlignCenter); |
79 | QPushButton * loadTemplate = new QPushButton( vb ); | 77 | QPushButton * loadTemplate = new QPushButton( vb ); |
80 | QPushButton * saveTemplate = new QPushButton( vb ); | 78 | QPushButton * saveTemplate = new QPushButton( vb ); |
81 | if ( QApplication::desktop()->width() < 321 ) | 79 | if ( QApplication::desktop()->width() < 321 ) |
82 | icon = SmallIcon("fileexport16"); | 80 | icon = SmallIcon("fileexport16"); |
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 |
97 | QPEApplication::setStylusOperation( mEditor, QPEApplication::RightOnHold ); | 96 | QPEApplication::setStylusOperation( mEditor, QPEApplication::RightOnHold ); |
98 | #endif | 97 | #endif |
99 | mEditor->setWordWrap( KTextEdit::WidgetWidth ); | 98 | mEditor->setWordWrap( KTextEdit::WidgetWidth ); |
100 | QBoxLayout *topLayout = new QVBoxLayout(this); | 99 | QBoxLayout *topLayout = new QVBoxLayout(this); |
101 | topLayout->addWidget(vb); | 100 | topLayout->addWidget(vb); |
102 | topLayout->addWidget(mEditor); | 101 | topLayout->addWidget(mEditor); |
103 | mEditor->installEventFilter(this); | 102 | mEditor->installEventFilter(this); |
104 | connect( saveTemplate, SIGNAL( clicked() ), this , SLOT( slotSaveTemplate() ) ); | 103 | connect( saveTemplate, SIGNAL( clicked() ), this , SLOT( slotSaveTemplate() ) ); |
105 | connect( mTitle, SIGNAL( textChanged ( const QString & ) ), this , SLOT( setDirty() ) ); | 104 | connect( mTitle, SIGNAL( textChanged ( const QString & ) ), this , SLOT( setDirty() ) ); |
106 | connect( loadTemplate, SIGNAL( clicked() ), this , SLOT( slotLoadTemplate() ) ); | 105 | connect( loadTemplate, SIGNAL( clicked() ), this , SLOT( slotLoadTemplate() ) ); |
107 | connect( toggleJournal, SIGNAL( clicked() ), this , SLOT( toggleShowJournal() ) ); | 106 | connect( toggleJournal, SIGNAL( clicked() ), this , SLOT( toggleShowJournal() ) ); |
108 | } | 107 | } |
109 | 108 | ||
diff --git a/korganizer/kojournalview.cpp b/korganizer/kojournalview.cpp index 4fc9013..ff87ef4 100644 --- a/korganizer/kojournalview.cpp +++ b/korganizer/kojournalview.cpp | |||
@@ -56,33 +56,33 @@ KOJournalView::KOJournalView(Calendar *calendar, QWidget *parent, | |||
56 | parWid = new QWidget( sv->viewport() ); | 56 | parWid = new QWidget( sv->viewport() ); |
57 | sv->addChild(parWid); | 57 | sv->addChild(parWid); |
58 | sv->setResizePolicy( QScrollView:: AutoOneFit ); | 58 | sv->setResizePolicy( QScrollView:: AutoOneFit ); |
59 | mTopLayout = new QVBoxLayout(parWid); | 59 | mTopLayout = new QVBoxLayout(parWid); |
60 | QHBox * vb = new QHBox ( parWid ); | 60 | QHBox * vb = new QHBox ( parWid ); |
61 | QPushButton * newJournal = new QPushButton( vb ); | 61 | QPushButton * newJournal = new QPushButton( vb ); |
62 | QIconSet icon; | 62 | QIconSet icon; |
63 | if ( QApplication::desktop()->width() < 321 ) | 63 | if ( QApplication::desktop()->width() < 321 ) |
64 | icon = SmallIcon("ko16old"); | 64 | icon = SmallIcon("ko16old"); |
65 | else | 65 | else |
66 | icon = SmallIcon("ko24old"); | 66 | icon = SmallIcon("ko24old"); |
67 | newJournal->setIconSet (icon ) ; | 67 | newJournal->setIconSet (icon ) ; |
68 | int size = newJournal->sizeHint().height(); | 68 | int size = newJournal->sizeHint().height(); |
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(); |
76 | } | 76 | } |
77 | 77 | ||
78 | KOJournalView::~KOJournalView() | 78 | KOJournalView::~KOJournalView() |
79 | { | 79 | { |
80 | } | 80 | } |
81 | 81 | ||
82 | int KOJournalView::currentDateCount() | 82 | int KOJournalView::currentDateCount() |
83 | { | 83 | { |
84 | return 0; | 84 | return 0; |
85 | } | 85 | } |
86 | JournalEntry* KOJournalView::getNewEntry() | 86 | JournalEntry* KOJournalView::getNewEntry() |
87 | { | 87 | { |
88 | JournalEntry* Entry = new JournalEntry(mCalendar,parWid); | 88 | JournalEntry* Entry = new JournalEntry(mCalendar,parWid); |