fixed some whantsnext view kayout

2 files changed, 23 insertions, 6 deletions

diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index 3aae076..749204b 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -376,4 +376,10 @@ KOAgendaView::KOAgendaView(Calendar *cal,QWidget *parent,const char *name) :
     mExpandButton->setPixmap( mNotExpandedPixmap );
-    mExpandButton->setSizePolicy( QSizePolicy( QSizePolicy::Fixed,
-                                               QSizePolicy::Fixed ) );
+    int widebut = mExpandButton->sizeHint().width();
+    if (   QApplication::desktop()->width() < 480  )
+        widebut = widebut*2;
+    else
+        widebut = (widebut*3) / 2;
+    //mExpandButton->setSizePolicy( QSizePolicy( QSizePolicy::Fixed,
+    //                                         QSizePolicy::Fixed ) );
+    mExpandButton->setFixedSize( widebut, widebut);
     connect( mExpandButton, SIGNAL( clicked() ), SIGNAL( toggleExpand() ) );
diff --git a/korganizer/kowhatsnextview.cpp b/korganizer/kowhatsnextview.cpp
index 0fea9be..59b864c 100644
--- a/korganizer/kowhatsnextview.cpp
+++ b/korganizer/kowhatsnextview.cpp
@@ -41,3 +41,3 @@
 #include "koeventviewerdialog.h"
-
+#include <qstylesheet.h> 
 #include "kowhatsnextview.h"
@@ -70,3 +70,13 @@ KOWhatsNextView::KOWhatsNextView(Calendar *calendar, QWidget *parent,
     connect(mView,SIGNAL(showIncidence(const QString &)),SLOT(showIncidence(const QString &)));
- 
+    QStyleSheet* stsh = mView->styleSheet();
+    QStyleSheetItem * style ;
+   
+    style   = stsh->item ("h2" );
+    if ( style ) {
+        style->setMargin(QStyleSheetItem::MarginAll,0);  
+    }
+    style   = stsh->item ("table" );
+    if ( style ) {
+        style->setMargin(QStyleSheetItem::MarginAll,0);  
+    }
     mEventViewer = 0;
@@ -146,3 +156,3 @@ void KOWhatsNextView::updateView()
     //<big><big><strong>" + date + "</strong></big></big>\n";
-    mText = "<table width=\"100%\">\n";
+    mText = "<qt><table width=\"100%\">\n";
     //mText += "<tr bgcolor=\"#3679AD\"><td><h2>"; 
@@ -328,3 +338,3 @@ void KOWhatsNextView::updateView()
 
-    mText += "</td></tr>\n</table>\n";
+    mText += "</td></tr>\n</table></qt>\n";
 
@@ -342,2 +352,3 @@ void KOWhatsNextView::updateView()
     //   mView->setBackgroundPixmap ( bPix );
+    qDebug("%s ",mText.latin1());
 }