| -rw-r--r-- | korganizer/koagendaview.cpp | 10 | ||||
| -rw-r--r-- | korganizer/kowhatsnextview.cpp | 19 | ||||
| -rw-r--r-- | libkdepim/categoryeditdialog.cpp | 2 | ||||
| -rw-r--r-- | libkdepim/categoryselectdialog.cpp | 8 |
4 files changed, 28 insertions, 11 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) : mExpandButton = new QPushButton(mDummyAllDayLeft); 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() ) ); 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 @@ #include "koprefs.h" #include "koeventviewerdialog.h" - +#include <qstylesheet.h> #include "kowhatsnextview.h" using namespace KOrg; @@ -69,5 +69,15 @@ KOWhatsNextView::KOWhatsNextView(Calendar *calendar, QWidget *parent, mView = new WhatsNextTextBrowser(this); 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; @@ -145,5 +155,5 @@ void KOWhatsNextView::updateView() // kil.loadIcon("korganizer",KIcon::NoGroup,32,KIcon::DefaultState,&ipath); //<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>"; #ifdef DESKTOP_VERSION @@ -327,5 +337,5 @@ void KOWhatsNextView::updateView() - mText += "</td></tr>\n</table>\n"; + mText += "</td></tr>\n</table></qt>\n"; mView->setText(mText); @@ -341,4 +351,5 @@ void KOWhatsNextView::updateView() // mView->setBackgroundMode(FixedPixmap ); // mView->setBackgroundPixmap ( bPix ); + qDebug("%s ",mText.latin1()); } diff --git a/libkdepim/categoryeditdialog.cpp b/libkdepim/categoryeditdialog.cpp index f719c31..a19900f 100644 --- a/libkdepim/categoryeditdialog.cpp +++ b/libkdepim/categoryeditdialog.cpp @@ -59,4 +59,6 @@ CategoryEditDialog::CategoryEditDialog( KPimPrefs *prefs, QWidget* parent, if ( QApplication::desktop()->width() > 460 ) resize( 300, 360 ); + else + showMaximized(); } diff --git a/libkdepim/categoryselectdialog.cpp b/libkdepim/categoryselectdialog.cpp index 40b46cf..7df9154 100644 --- a/libkdepim/categoryselectdialog.cpp +++ b/libkdepim/categoryselectdialog.cpp @@ -47,10 +47,8 @@ CategorySelectDialog::CategorySelectDialog( KPimPrefs *prefs, QWidget* parent, connect(mButtonEdit,SIGNAL(clicked()),this, SLOT(editCategoriesDialog())); - if ( qApp->desktop()->height() < 321 ) - setMaximumHeight( QApplication::desktop()->height() - 50 ); - else - setMaximumHeight( QApplication::desktop()->height() - 80 ); if ( QApplication::desktop()->width() > 460 ) - resize( 260, 360 ); + resize( 300, 360 ); + else + showMaximized(); } void CategorySelectDialog::editCategoriesDialog() |