author | zautrix <zautrix> | 2005-04-05 12:44:31 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-04-05 12:44:31 (UTC) |
commit | e1fd021493c30106d2a31449d620ab6eaf96f18f (patch) (unidiff) | |
tree | 95667bbee29f5913c7c2e70dd9ba80356432c351 | |
parent | 854e1b46d7895bf4860d914abb5f1e954dfbfe6a (diff) | |
download | kdepimpi-e1fd021493c30106d2a31449d620ab6eaf96f18f.zip kdepimpi-e1fd021493c30106d2a31449d620ab6eaf96f18f.tar.gz kdepimpi-e1fd021493c30106d2a31449d620ab6eaf96f18f.tar.bz2 |
font point fix + versionupdate
-rw-r--r-- | desktop/rpm/kdepim_rpm | 2 | ||||
-rw-r--r-- | korganizer/mainwindow.cpp | 4 | ||||
-rw-r--r-- | microkde/ofontselector.cpp | 3 | ||||
-rw-r--r-- | version | 2 |
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,15 +1,15 @@ | |||
1 | Summary: A collection of PIM programs | 1 | Summary: A collection of PIM programs |
2 | Name: KDE-Pim-Pi | 2 | Name: KDE-Pim-Pi |
3 | Version: 2.0.24 | 3 | Version: 2.0.25 |
4 | Release: SuSE_9.2 | 4 | Release: SuSE_9.2 |
5 | Copyright:GPL | 5 | Copyright:GPL |
6 | Group: Productivity/Pim | 6 | Group: Productivity/Pim |
7 | Source:http://sourceforge.net/projects/kdepimpi/ | 7 | Source:http://sourceforge.net/projects/kdepimpi/ |
8 | URL:http://sourceforge.net/projects/kdepimpi/ | 8 | URL:http://sourceforge.net/projects/kdepimpi/ |
9 | Packager: zautrix | 9 | Packager: zautrix |
10 | 10 | ||
11 | %description | 11 | %description |
12 | This package contains the platform-independent PIM programs from | 12 | This package contains the platform-independent PIM programs from |
13 | www.pi-sync.info, compiled for SuSE 9.2: | 13 | www.pi-sync.info, compiled for SuSE 9.2: |
14 | KTimeTacker/Pi | 14 | KTimeTacker/Pi |
15 | KPhone/Pi | 15 | KPhone/Pi |
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 7aa3b60..9505d06 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -2427,21 +2427,21 @@ void MainWindow::hideEvent ( QHideEvent * ) | |||
2427 | QDateTime nextA = mCalendar->nextAlarmEventDateTime(); | 2427 | QDateTime nextA = mCalendar->nextAlarmEventDateTime(); |
2428 | if ( nextA.isValid() ) { | 2428 | if ( nextA.isValid() ) { |
2429 | QString sum = mCalendar->nextSummary(); | 2429 | QString sum = mCalendar->nextSummary(); |
2430 | 2430 | ||
2431 | message = i18n("%1 %2 - %3 (next event/todo with alarm)").arg( KGlobal::locale()->formatTime(nextA.time() , false)).arg(sum ).arg( KGlobal::locale()->formatDate(nextA.date() , false)); | 2431 | message = i18n("%1 %2 - %3 (next event/todo with alarm)").arg( KGlobal::locale()->formatTime(nextA.time() , false)).arg(sum ).arg( KGlobal::locale()->formatDate(nextA.date() , false)); |
2432 | setCaption( message ); | 2432 | setCaption( message ); |
2433 | } | 2433 | } |
2434 | } | 2434 | } |
2435 | 2435 | ||
2436 | void MainWindow::resizeEvent( QResizeEvent* e) | 2436 | void 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 | } |
2445 | #endif | 2445 | #endif |
2446 | QMainWindow::resizeEvent( e); | 2446 | QMainWindow::resizeEvent( e); |
2447 | } | 2447 | } |
diff --git a/microkde/ofontselector.cpp b/microkde/ofontselector.cpp index c8471cc..05095f3 100644 --- a/microkde/ofontselector.cpp +++ b/microkde/ofontselector.cpp | |||
@@ -128,25 +128,26 @@ OFontSelector::OFontSelector ( bool withpreview, QWidget *parent, const char *na | |||
128 | d-> m_font_style_list = new QComboBox( this, "StyleListBox" ); | 128 | d-> m_font_style_list = new QComboBox( this, "StyleListBox" ); |
129 | connect( d-> m_font_style_list, SIGNAL( activated( int ) ), this, SLOT( fontStyleClicked( int ) ) ); | 129 | connect( d-> m_font_style_list, SIGNAL( activated( int ) ), this, SLOT( fontStyleClicked( int ) ) ); |
130 | gridLayout->addWidget( d-> m_font_style_list, 1, 1 ); | 130 | gridLayout->addWidget( d-> m_font_style_list, 1, 1 ); |
131 | 131 | ||
132 | label = new QLabel( tr( "Size" ), this ); | 132 | label = new QLabel( tr( "Size" ), this ); |
133 | gridLayout->addWidget( label, 2, 1 ); | 133 | gridLayout->addWidget( label, 2, 1 ); |
134 | 134 | ||
135 | d-> m_font_size_list = new QComboBox( this, "SizeListBox" ); | 135 | d-> m_font_size_list = new QComboBox( this, "SizeListBox" ); |
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 ); |
145 | d-> m_preview-> setWordWrap ( QMultiLineEdit::WidgetWidth ); | 146 | d-> m_preview-> setWordWrap ( QMultiLineEdit::WidgetWidth ); |
146 | d-> m_preview-> setMargin ( 3 ); | 147 | d-> m_preview-> setMargin ( 3 ); |
147 | d-> m_preview-> setText ( tr( "The Quick Brown Fox Jumps Over The Lazy Dog" )); | 148 | d-> m_preview-> setText ( tr( "The Quick Brown Fox Jumps Over The Lazy Dog" )); |
148 | gridLayout-> addRowSpacing ( 5, 4 ); | 149 | gridLayout-> addRowSpacing ( 5, 4 ); |
149 | gridLayout-> addMultiCellWidget ( d-> m_preview, 6, 6, 0, 1 ); | 150 | gridLayout-> addMultiCellWidget ( d-> m_preview, 6, 6, 0, 1 ); |
150 | gridLayout-> setRowStretch ( 6, 5 ); | 151 | gridLayout-> setRowStretch ( 6, 5 ); |
151 | } | 152 | } |
152 | else | 153 | else |
@@ -1 +1 @@ | |||
version = "2.0.24"; | version = "2.0.25"; | ||