summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2004-10-27 00:49:03 (UTC)
committer zautrix <zautrix>2004-10-27 00:49:03 (UTC)
commitba3d660ed4f856362d2b914ed744874c235b4001 (patch) (side-by-side diff)
treed70423c6bf3a6342a6ae2277dda70f15736086a9
parent00d623c9391a9bdaeb142f443f1dd09861317608 (diff)
downloadkdepimpi-ba3d660ed4f856362d2b914ed744874c235b4001.zip
kdepimpi-ba3d660ed4f856362d2b914ed744874c235b4001.tar.gz
kdepimpi-ba3d660ed4f856362d2b914ed744874c235b4001.tar.bz2
fixed some whantsnext view kayout
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/koagendaview.cpp10
-rw-r--r--korganizer/kowhatsnextview.cpp19
-rw-r--r--libkdepim/categoryeditdialog.cpp2
-rw-r--r--libkdepim/categoryselectdialog.cpp8
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) :
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());
}
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,
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
@@ -48,8 +48,6 @@ 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();
}