-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 | |||
@@ -376,4 +376,10 @@ KOAgendaView::KOAgendaView(Calendar *cal,QWidget *parent,const char *name) : | |||
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() ) ); |
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 @@ | |||
41 | #include "koeventviewerdialog.h" | 41 | #include "koeventviewerdialog.h" |
42 | 42 | #include <qstylesheet.h> | |
43 | #include "kowhatsnextview.h" | 43 | #include "kowhatsnextview.h" |
@@ -70,3 +70,13 @@ KOWhatsNextView::KOWhatsNextView(Calendar *calendar, QWidget *parent, | |||
70 | connect(mView,SIGNAL(showIncidence(const QString &)),SLOT(showIncidence(const QString &))); | 70 | connect(mView,SIGNAL(showIncidence(const QString &)),SLOT(showIncidence(const QString &))); |
71 | 71 | QStyleSheet* stsh = mView->styleSheet(); | |
72 | QStyleSheetItem * style ; | ||
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; |
@@ -146,3 +156,3 @@ void KOWhatsNextView::updateView() | |||
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>"; |
@@ -328,3 +338,3 @@ void KOWhatsNextView::updateView() | |||
328 | 338 | ||
329 | mText += "</td></tr>\n</table>\n"; | 339 | mText += "</td></tr>\n</table></qt>\n"; |
330 | 340 | ||
@@ -342,2 +352,3 @@ void KOWhatsNextView::updateView() | |||
342 | // mView->setBackgroundPixmap ( bPix ); | 352 | // mView->setBackgroundPixmap ( bPix ); |
353 | qDebug("%s ",mText.latin1()); | ||
343 | } | 354 | } |
diff --git a/libkdepim/categoryeditdialog.cpp b/libkdepim/categoryeditdialog.cpp index f719c31..a19900f 100644 --- a/libkdepim/categoryeditdialog.cpp +++ b/libkdepim/categoryeditdialog.cpp | |||
@@ -60,2 +60,4 @@ CategoryEditDialog::CategoryEditDialog( KPimPrefs *prefs, QWidget* parent, | |||
60 | resize( 300, 360 ); | 60 | resize( 300, 360 ); |
61 | else | ||
62 | showMaximized(); | ||
61 | } | 63 | } |
diff --git a/libkdepim/categoryselectdialog.cpp b/libkdepim/categoryselectdialog.cpp index 40b46cf..7df9154 100644 --- a/libkdepim/categoryselectdialog.cpp +++ b/libkdepim/categoryselectdialog.cpp | |||
@@ -48,8 +48,6 @@ CategorySelectDialog::CategorySelectDialog( KPimPrefs *prefs, QWidget* parent, | |||
48 | connect(mButtonEdit,SIGNAL(clicked()),this, SLOT(editCategoriesDialog())); | 48 | connect(mButtonEdit,SIGNAL(clicked()),this, SLOT(editCategoriesDialog())); |
49 | if ( qApp->desktop()->height() < 321 ) | ||
50 | setMaximumHeight( QApplication::desktop()->height() - 50 ); | ||
51 | else | ||
52 | setMaximumHeight( QApplication::desktop()->height() - 80 ); | ||
53 | if ( QApplication::desktop()->width() > 460 ) | 49 | if ( QApplication::desktop()->width() > 460 ) |
54 | resize( 260, 360 ); | 50 | resize( 300, 360 ); |
51 | else | ||
52 | showMaximized(); | ||
55 | } | 53 | } |