5 files changed, 21 insertions, 12 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 214b829..d0de233 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -2597,3 +2597,5 @@ void CalendarView::updateView(const QDate &start, const QDate &end)
 #ifdef DESKTOP_VERSION
+    mDateScrollBar->blockSignals( true );
     mDateScrollBar->setValue( start.dayOfYear()-1);
+    mDateScrollBar->blockSignals( false );
 #endif
diff --git a/korganizer/journalentry.cpp b/korganizer/journalentry.cpp
index ca8d5f7..3c38f34 100644
--- a/korganizer/journalentry.cpp
+++ b/korganizer/journalentry.cpp
@@ -59,3 +59,9 @@ JournalEntry::JournalEntry(Calendar *calendar,QWidget *parent) :
 {
-    heiHint = QApplication::desktop()->height() / 5 ;
+
+    int fac = 5;
+    heiHint = QApplication::desktop()->height();
+    if ( heiHint > 800 )
+        fac += 2;
+    heiHint = heiHint / fac;
+
     showOnlyMode = false;
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp
index 067c34c..ec1154a 100644
--- a/korganizer/kodaymatrix.cpp
+++ b/korganizer/kodaymatrix.cpp
@@ -1199,3 +1199,3 @@ void KODayMatrix::paintEvent(QPaintEvent * pevent)
 
-void KODayMatrix::resizeEvent(QResizeEvent *)
+void KODayMatrix::resizeEvent(QResizeEvent * e)
 {
@@ -1204,2 +1204,3 @@ void KODayMatrix::resizeEvent(QResizeEvent *)
   daysize.setWidth(sz.width() / 7);
+  QFrame::resizeEvent( e );
 }
diff --git a/korganizer/koeditorgeneral.cpp b/korganizer/koeditorgeneral.cpp
index 2fbcd42..e07bc53 100644
--- a/korganizer/koeditorgeneral.cpp
+++ b/korganizer/koeditorgeneral.cpp
@@ -186,9 +186,9 @@ void KOEditorGeneral::initCategories(QWidget *parent, QBoxLayout *topLayout)
     mCategoriesButton = new QPushButton(parent);
-    mCategoriesButton->setText(i18n("Categories"));
+    mCategoriesButton->setText(i18n("Categories..."));
+    connect(mCategoriesButton,SIGNAL(clicked()),this, SLOT(editCategories() ));
     //connect(mCategoriesButton,SIGNAL(clicked()),this, SLOT(editCategories() ));
     categoriesLayout->addWidget(mCategoriesButton);
-    mCategoriesButton->setPopup( mCatPopup );
     mCategoriesLabel = new QPushButton(parent);//new QLabel(parent);
     mCategoriesLabel->setSizePolicy( QSizePolicy(  QSizePolicy::Preferred  ,QSizePolicy::MinimumExpanding  ,FALSE) );
-    connect(mCategoriesLabel,SIGNAL(clicked()),this, SLOT(editCategories() ));
+    mCategoriesLabel->setPopup( mCatPopup );
     //mCategoriesLabel->setFrameStyle(QFrame::Panel|QFrame::Sunken);
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp
index 9db2040..02d7aae 100644
--- a/korganizer/koprefs.cpp
+++ b/korganizer/koprefs.cpp
@@ -393,10 +393,10 @@ QStringList KOPrefs::getDefaultList()
     QStringList retval ;
-    retval << i18n("Anniversary") << i18n("Appointment") << i18n("Birthday") << i18n("Business")  << i18n("Cinema")  << i18n("Customer")
+    retval << i18n("Anniversary") << i18n("Appointment") << i18n("Birthday") << i18n("Business")  << i18n("Customer")
            << i18n("Break")
-           << i18n("Family")  << i18n("Favorites") << i18n("Fishing")<< i18n("Flight") << i18n("Gifts")  
-           << i18n("Holiday") << i18n("Holiday Cards")<< i18n("Hot Contacts")  << i18n("Key Customer") 
+           << i18n("Family")  << i18n("Favorites") << i18n("Fishing") << i18n("Gifts")  
+           << i18n("Holiday") << i18n("Holiday Cards")<< i18n("Hot Contacts")  
                      << i18n("Meeting") << i18n("Miscellaneous") << i18n("Partner") << i18n("Personal") 
-           << i18n("PHB") << i18n("Phone Calls")  << i18n("School") << i18n("Shopping")
-            << i18n("Sports") << i18n("Talk") << i18n("Travel") << i18n("TV")<< i18n("University")
-           << i18n("Vacation") << i18n("VIP") << i18n("SyncEvent")  ;
+           << i18n("PHB") << i18n("Phone Calls")   << i18n("Shopping")
+            << i18n("Sports") << i18n("Talk") << i18n("Travel") << i18n("TV") 
+           << i18n("Vacation")  ;
     retval.sort();
@@ -405,3 +405,3 @@ QStringList KOPrefs::getDefaultList()
 }
-// << i18n("Business Travel") << i18n("Education") << i18n("Hiking") << i18n("Hunting")  << i18n("Recurring") << i18n("Personal Travel")  << i18n("Speach")   << i18n("Festival") << i18n("Competition")<< i18n("Party")<< i18n("Projects")<< i18n("Kids") << i18n("Special Occasion")<< i18n("Breakfast")<<  i18n("Dinner") << i18n("Lunch")
+// << i18n("Business Travel") << i18n("Education") << i18n("Hiking") << i18n("Hunting")  << i18n("Recurring") << i18n("Personal Travel")  << i18n("Speach")   << i18n("Festival") << i18n("Competition")<< i18n("Party")<< i18n("Projects")<< i18n("Kids") << i18n("Special Occasion")<< i18n("Breakfast")<<  i18n("Dinner") << i18n("Lunch")<< i18n("University")<< i18n("School")<< i18n("Flight")<< i18n("Key Customer") << i18n("VIP") << i18n("SyncEvent")  << i18n("Cinema") 
 void KOPrefs::usrReadConfig()