summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--desktop/rpm/kdepim_rpm2
-rw-r--r--korganizer/mainwindow.cpp4
-rw-r--r--microkde/ofontselector.cpp3
-rw-r--r--version2
4 files changed, 6 insertions, 5 deletions
diff --git a/desktop/rpm/kdepim_rpm b/desktop/rpm/kdepim_rpm
index 5e7783b..af64b99 100644
--- a/desktop/rpm/kdepim_rpm
+++ b/desktop/rpm/kdepim_rpm
@@ -1,7 +1,7 @@
1Summary: A collection of PIM programs 1Summary: A collection of PIM programs
2Name: KDE-Pim-Pi 2Name: KDE-Pim-Pi
3Version: 2.0.24 3Version: 2.0.25
4Release: SuSE_9.2 4Release: SuSE_9.2
5Copyright:GPL 5Copyright:GPL
6Group: Productivity/Pim 6Group: Productivity/Pim
7Source:http://sourceforge.net/projects/kdepimpi/ 7Source:http://sourceforge.net/projects/kdepimpi/
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 7aa3b60..9505d06 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -2435,10 +2435,10 @@ void MainWindow::hideEvent ( QHideEvent * )
2435 2435
2436void MainWindow::resizeEvent( QResizeEvent* e) 2436void MainWindow::resizeEvent( QResizeEvent* e)
2437{ 2437{
2438#ifndef DESKTOP_VERSION 2438#ifndef DESKTOP_VERSION
2439 if ( !KOPrefs::instance()->mShowIconFilter && !KOPrefs::instance()->mShowIconOnetoolbar ) { 2439 if ( !KOPrefs::instance()->mShowIconFilter && !KOPrefs::instance()->mShowIconOnetoolbar && QApplication::desktop()->width() > 320) {
2440 if (QApplication::desktop()->width() > QApplication::desktop()->height() ) 2440 if (QApplication::desktop()->width() > QApplication::desktop()->height() )
2441 filterToolBar->hide(); 2441 filterToolBar->hide();
2442 else 2442 else
2443 filterToolBar->show(); 2443 filterToolBar->show();
2444 } 2444 }
diff --git a/microkde/ofontselector.cpp b/microkde/ofontselector.cpp
index c8471cc..05095f3 100644
--- a/microkde/ofontselector.cpp
+++ b/microkde/ofontselector.cpp
@@ -136,9 +136,10 @@ OFontSelector::OFontSelector ( bool withpreview, QWidget *parent, const char *na
136 connect( d-> m_font_size_list, SIGNAL( activated( int ) ), 136 connect( d-> m_font_size_list, SIGNAL( activated( int ) ),
137 this, SLOT( fontSizeClicked( int ) ) ); 137 this, SLOT( fontSizeClicked( int ) ) );
138 gridLayout->addWidget( d-> m_font_size_list, 3, 1 ); 138 gridLayout->addWidget( d-> m_font_size_list, 3, 1 );
139 139
140 d-> m_pointbug = ( qt_version ( ) <= 233 ); 140 //d-> m_pointbug = ( qt_version ( ) <= 233 );
141 d->m_pointbug = ( qt_version() == 232 || qt_version() == 233 ); // SharpROM uses 2.3.2
141 142
142 if ( withpreview ) { 143 if ( withpreview ) {
143 d-> m_preview = new QMultiLineEdit ( this, "Preview" ); 144 d-> m_preview = new QMultiLineEdit ( this, "Preview" );
144 d-> m_preview-> setAlignment ( AlignCenter ); 145 d-> m_preview-> setAlignment ( AlignCenter );
diff --git a/version b/version
index f601af0..1065c0d 100644
--- a/version
+++ b/version
@@ -1 +1 @@
version = "2.0.24"; version = "2.0.25";