author | zautrix <zautrix> | 2004-10-27 00:49:03 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-10-27 00:49:03 (UTC) |
commit | ba3d660ed4f856362d2b914ed744874c235b4001 (patch) (unidiff) | |
tree | d70423c6bf3a6342a6ae2277dda70f15736086a9 /korganizer | |
parent | 00d623c9391a9bdaeb142f443f1dd09861317608 (diff) | |
download | kdepimpi-ba3d660ed4f856362d2b914ed744874c235b4001.zip kdepimpi-ba3d660ed4f856362d2b914ed744874c235b4001.tar.gz kdepimpi-ba3d660ed4f856362d2b914ed744874c235b4001.tar.bz2 |
fixed some whantsnext view kayout
-rw-r--r-- | korganizer/koagendaview.cpp | 10 | ||||
-rw-r--r-- | korganizer/kowhatsnextview.cpp | 17 |
2 files changed, 22 insertions, 5 deletions
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp index 3aae076..749204b 100644 --- a/korganizer/koagendaview.cpp +++ b/korganizer/koagendaview.cpp | |||
@@ -375,6 +375,12 @@ KOAgendaView::KOAgendaView(Calendar *cal,QWidget *parent,const char *name) : | |||
375 | mExpandButton = new QPushButton(mDummyAllDayLeft); | 375 | mExpandButton = new QPushButton(mDummyAllDayLeft); |
376 | mExpandButton->setPixmap( mNotExpandedPixmap ); | 376 | mExpandButton->setPixmap( mNotExpandedPixmap ); |
377 | mExpandButton->setSizePolicy( QSizePolicy( QSizePolicy::Fixed, | 377 | int widebut = mExpandButton->sizeHint().width(); |
378 | QSizePolicy::Fixed ) ); | 378 | if ( QApplication::desktop()->width() < 480 ) |
379 | widebut = widebut*2; | ||
380 | else | ||
381 | widebut = (widebut*3) / 2; | ||
382 | //mExpandButton->setSizePolicy( QSizePolicy( QSizePolicy::Fixed, | ||
383 | // QSizePolicy::Fixed ) ); | ||
384 | mExpandButton->setFixedSize( widebut, widebut); | ||
379 | connect( mExpandButton, SIGNAL( clicked() ), SIGNAL( toggleExpand() ) ); | 385 | connect( mExpandButton, SIGNAL( clicked() ), SIGNAL( toggleExpand() ) ); |
380 | mExpandButton->setFocusPolicy(NoFocus); | 386 | mExpandButton->setFocusPolicy(NoFocus); |
diff --git a/korganizer/kowhatsnextview.cpp b/korganizer/kowhatsnextview.cpp index 0fea9be..59b864c 100644 --- a/korganizer/kowhatsnextview.cpp +++ b/korganizer/kowhatsnextview.cpp | |||
@@ -40,5 +40,5 @@ | |||
40 | #include "koprefs.h" | 40 | #include "koprefs.h" |
41 | #include "koeventviewerdialog.h" | 41 | #include "koeventviewerdialog.h" |
42 | 42 | #include <qstylesheet.h> | |
43 | #include "kowhatsnextview.h" | 43 | #include "kowhatsnextview.h" |
44 | using namespace KOrg; | 44 | using namespace KOrg; |
@@ -69,5 +69,15 @@ KOWhatsNextView::KOWhatsNextView(Calendar *calendar, QWidget *parent, | |||
69 | mView = new WhatsNextTextBrowser(this); | 69 | mView = new WhatsNextTextBrowser(this); |
70 | connect(mView,SIGNAL(showIncidence(const QString &)),SLOT(showIncidence(const QString &))); | 70 | connect(mView,SIGNAL(showIncidence(const QString &)),SLOT(showIncidence(const QString &))); |
71 | QStyleSheet* stsh = mView->styleSheet(); | ||
72 | QStyleSheetItem * style ; | ||
71 | 73 | ||
74 | style = stsh->item ("h2" ); | ||
75 | if ( style ) { | ||
76 | style->setMargin(QStyleSheetItem::MarginAll,0); | ||
77 | } | ||
78 | style = stsh->item ("table" ); | ||
79 | if ( style ) { | ||
80 | style->setMargin(QStyleSheetItem::MarginAll,0); | ||
81 | } | ||
72 | mEventViewer = 0; | 82 | mEventViewer = 0; |
73 | 83 | ||
@@ -145,5 +155,5 @@ void KOWhatsNextView::updateView() | |||
145 | // kil.loadIcon("korganizer",KIcon::NoGroup,32,KIcon::DefaultState,&ipath); | 155 | // kil.loadIcon("korganizer",KIcon::NoGroup,32,KIcon::DefaultState,&ipath); |
146 | //<big><big><strong>" + date + "</strong></big></big>\n"; | 156 | //<big><big><strong>" + date + "</strong></big></big>\n"; |
147 | mText = "<table width=\"100%\">\n"; | 157 | mText = "<qt><table width=\"100%\">\n"; |
148 | //mText += "<tr bgcolor=\"#3679AD\"><td><h2>"; | 158 | //mText += "<tr bgcolor=\"#3679AD\"><td><h2>"; |
149 | #ifdef DESKTOP_VERSION | 159 | #ifdef DESKTOP_VERSION |
@@ -327,5 +337,5 @@ void KOWhatsNextView::updateView() | |||
327 | 337 | ||
328 | 338 | ||
329 | mText += "</td></tr>\n</table>\n"; | 339 | mText += "</td></tr>\n</table></qt>\n"; |
330 | 340 | ||
331 | mView->setText(mText); | 341 | mView->setText(mText); |
@@ -341,4 +351,5 @@ void KOWhatsNextView::updateView() | |||
341 | // mView->setBackgroundMode(FixedPixmap ); | 351 | // mView->setBackgroundMode(FixedPixmap ); |
342 | // mView->setBackgroundPixmap ( bPix ); | 352 | // mView->setBackgroundPixmap ( bPix ); |
353 | qDebug("%s ",mText.latin1()); | ||
343 | } | 354 | } |
344 | 355 | ||