-rw-r--r-- | korganizer/journalentry.cpp | 7 | ||||
-rw-r--r-- | korganizer/journalentry.h | 2 | ||||
-rw-r--r-- | korganizer/kojournalview.cpp | 11 | ||||
-rw-r--r-- | korganizer/kojournalview.h | 1 |
4 files changed, 18 insertions, 3 deletions
diff --git a/korganizer/journalentry.cpp b/korganizer/journalentry.cpp index 7274849..0b923ad 100644 --- a/korganizer/journalentry.cpp +++ b/korganizer/journalentry.cpp | |||
@@ -58,2 +58,3 @@ JournalEntry::JournalEntry(Calendar *calendar,QWidget *parent) : | |||
58 | { | 58 | { |
59 | heiHint = QApplication::desktop()->height() / 5 ; | ||
59 | showOnlyMode = false; | 60 | showOnlyMode = false; |
@@ -119,4 +120,8 @@ JournalEntry::~JournalEntry() | |||
119 | { | 120 | { |
121 | qDebug("JournalEntry::~JournalEntry() "); | ||
122 | } | ||
123 | QSize JournalEntry::sizeHint() const | ||
124 | { | ||
125 | return QSize ( 240, heiHint ); | ||
120 | } | 126 | } |
121 | |||
122 | void JournalEntry::slotSaveTemplate() | 127 | void JournalEntry::slotSaveTemplate() |
diff --git a/korganizer/journalentry.h b/korganizer/journalentry.h index 85ad5df..b0e9cc7 100644 --- a/korganizer/journalentry.h +++ b/korganizer/journalentry.h | |||
@@ -51,2 +51,3 @@ class JournalEntry : public QFrame { | |||
51 | void setShowOnly() {showOnlyMode = true;} | 51 | void setShowOnly() {showOnlyMode = true;} |
52 | QSize sizeHint() const; | ||
52 | 53 | ||
@@ -75,2 +76,3 @@ class JournalEntry : public QFrame { | |||
75 | KTextEdit *mEditor; | 76 | KTextEdit *mEditor; |
77 | int heiHint; | ||
76 | 78 | ||
diff --git a/korganizer/kojournalview.cpp b/korganizer/kojournalview.cpp index fae59d6..9e354d3 100644 --- a/korganizer/kojournalview.cpp +++ b/korganizer/kojournalview.cpp | |||
@@ -27,2 +27,3 @@ | |||
27 | #include <qlayout.h> | 27 | #include <qlayout.h> |
28 | #include <qscrollview.h> | ||
28 | #include <qpopupmenu.h> | 29 | #include <qpopupmenu.h> |
@@ -45,3 +46,9 @@ KOJournalView::KOJournalView(Calendar *calendar, QWidget *parent, | |||
45 | mCalendar = calendar; | 46 | mCalendar = calendar; |
46 | mTopLayout = new QVBoxLayout(this); | 47 | QScrollView * sv = new QScrollView( this ); |
48 | QHBoxLayout * hbl = new QHBoxLayout( this ); | ||
49 | hbl->addWidget( sv ); | ||
50 | parWid = new QWidget( sv->viewport() ); | ||
51 | sv->addChild(parWid); | ||
52 | sv->setResizePolicy( QScrollView:: AutoOneFit ); | ||
53 | mTopLayout = new QVBoxLayout(parWid); | ||
47 | getNewEntry(); | 54 | getNewEntry(); |
@@ -59,3 +66,3 @@ JournalEntry* KOJournalView::getNewEntry() | |||
59 | { | 66 | { |
60 | JournalEntry* Entry = new JournalEntry(mCalendar,this); | 67 | JournalEntry* Entry = new JournalEntry(mCalendar,parWid); |
61 | jEntries.append( Entry ); | 68 | jEntries.append( Entry ); |
diff --git a/korganizer/kojournalview.h b/korganizer/kojournalview.h index aabf11c..0437d95 100644 --- a/korganizer/kojournalview.h +++ b/korganizer/kojournalview.h | |||
@@ -71,2 +71,3 @@ class KOJournalView : public KOrg::BaseView | |||
71 | QBoxLayout *mTopLayout; | 71 | QBoxLayout *mTopLayout; |
72 | QWidget *parWid; | ||
72 | QDate mDate; | 73 | QDate mDate; |