-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,84 +1,84 @@ | |||
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 |
16 | KAddressbook/Pi | 16 | KAddressbook/Pi |
17 | KOrganizer/Pi | 17 | KOrganizer/Pi |
18 | PasswordManager/Pi | 18 | PasswordManager/Pi |
19 | KOPieMail/Pi | 19 | KOPieMail/Pi |
20 | 20 | ||
21 | These applications do not need anything from the KDE-desktop | 21 | These applications do not need anything from the KDE-desktop |
22 | at all to run on Linux. However, there is a dependency from | 22 | at all to run on Linux. However, there is a dependency from |
23 | two KDE libs, because a small command line program is included | 23 | two KDE libs, because a small command line program is included |
24 | to make it possible to sync with the KDE-desktop applications. | 24 | to make it possible to sync with the KDE-desktop applications. |
25 | 25 | ||
26 | These applications are independent from the KDE-desktop | 26 | These applications are independent from the KDE-desktop |
27 | environment. That means, nothing of your existing | 27 | environment. That means, nothing of your existing |
28 | KDE-desktop setup will be changed, or any data | 28 | KDE-desktop setup will be changed, or any data |
29 | (calendar-addressbook) used by the KDE-desktop | 29 | (calendar-addressbook) used by the KDE-desktop |
30 | applications will be changed or accessed. | 30 | applications will be changed or accessed. |
31 | These applications stores their data and config in | 31 | These applications stores their data and config in |
32 | $HOME/kdepim/ | 32 | $HOME/kdepim/ |
33 | However, because the same file format is used, | 33 | However, because the same file format is used, |
34 | an easy exchange of data with the KDE-desktop | 34 | an easy exchange of data with the KDE-desktop |
35 | is possible. | 35 | is possible. |
36 | A small command line program is included | 36 | A small command line program is included |
37 | to make it possible to sync with the KDE-desktop applications. | 37 | to make it possible to sync with the KDE-desktop applications. |
38 | You do not need to call this program from the commandline, | 38 | You do not need to call this program from the commandline, |
39 | it is called from the KDE-Pim/Pi apps when you choose there: | 39 | it is called from the KDE-Pim/Pi apps when you choose there: |
40 | Sync with KDE_Desktop. | 40 | Sync with KDE_Desktop. |
41 | If something is going wrong, please start the | 41 | If something is going wrong, please start the |
42 | KDE-Pim/Pi program itself from the console to get detailed output. | 42 | KDE-Pim/Pi program itself from the console to get detailed output. |
43 | 43 | ||
44 | After installation, you should have a | 44 | After installation, you should have a |
45 | PIM-pi | 45 | PIM-pi |
46 | folder in your KDE start menu, where you can | 46 | folder in your KDE start menu, where you can |
47 | start the applications from. | 47 | start the applications from. |
48 | 48 | ||
49 | These programs makes it possible to sync your Zaurus easily | 49 | These programs makes it possible to sync your Zaurus easily |
50 | (with the KDE-Pim/Pi programs running on the Zaurus) | 50 | (with the KDE-Pim/Pi programs running on the Zaurus) |
51 | with the KDE-desktop calendar/addressbook data. | 51 | with the KDE-desktop calendar/addressbook data. |
52 | If you want to use that, you have to update your | 52 | If you want to use that, you have to update your |
53 | KDE-desktop to version 3.3.0 or higher. | 53 | KDE-desktop to version 3.3.0 or higher. |
54 | SuSE 9.2 contains KDE 3.3.0 such that no update is needed. | 54 | SuSE 9.2 contains KDE 3.3.0 such that no update is needed. |
55 | Actually - after the (non difficult) configuration is set up - | 55 | Actually - after the (non difficult) configuration is set up - |
56 | with two mouseklicks on the Zaurus, | 56 | with two mouseklicks on the Zaurus, |
57 | the Zaurus syncs with the corresponding KDE-Pim/Pi | 57 | the Zaurus syncs with the corresponding KDE-Pim/Pi |
58 | program on the Linux Desktop which syncs automatically | 58 | program on the Linux Desktop which syncs automatically |
59 | with the KDE-desktop data. | 59 | with the KDE-desktop data. |
60 | 60 | ||
61 | If you want to use the KDE-desktop calendar/addressbook applications, | 61 | If you want to use the KDE-desktop calendar/addressbook applications, |
62 | just install these apps in this package and use them as a syncing tool for the | 62 | just install these apps in this package and use them as a syncing tool for the |
63 | Zaurus <-> KDE-desktop sync. | 63 | Zaurus <-> KDE-desktop sync. |
64 | The sync requires a network connection from your Zaurus to | 64 | The sync requires a network connection from your Zaurus to |
65 | the PC. A detailed Sync HowTo is available in the | 65 | the PC. A detailed Sync HowTo is available in the |
66 | Help menu of the applications. | 66 | Help menu of the applications. |
67 | 67 | ||
68 | These applications makes it also possible, that you can sync | 68 | These applications makes it also possible, that you can sync |
69 | (or just export the data to) your mobile phone with your | 69 | (or just export the data to) your mobile phone with your |
70 | data of the KDE-desktop calendar/addressbook applications. | 70 | data of the KDE-desktop calendar/addressbook applications. |
71 | This is tested and working for Nokia mobile phones, | 71 | This is tested and working for Nokia mobile phones, |
72 | it may work with others as well. | 72 | it may work with others as well. |
73 | (More info about that: -> Sync HowTo) | 73 | (More info about that: -> Sync HowTo) |
74 | 74 | ||
75 | NOTE: | 75 | NOTE: |
76 | When using SuSE 9.1 you have to update your KDE to 3.3.x | 76 | When using SuSE 9.1 you have to update your KDE to 3.3.x |
77 | and you have to make an online update in SuSE 9.1 to make it | 77 | and you have to make an online update in SuSE 9.1 to make it |
78 | possible to get the infrared connection working, such that | 78 | possible to get the infrared connection working, such that |
79 | you can sync your (Nokia) mobile phone via infrared. | 79 | you can sync your (Nokia) mobile phone via infrared. |
80 | 80 | ||
81 | %files | 81 | %files |
82 | /opt/kde3/share/applnk/PIM-pi/ | 82 | /opt/kde3/share/applnk/PIM-pi/ |
83 | /opt/kdepimpi/ | 83 | /opt/kdepimpi/ |
84 | /usr/lib/libmicro* | 84 | /usr/lib/libmicro* |
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 7aa3b60..9505d06 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -2343,105 +2343,105 @@ QString MainWindow::sentSyncFile() | |||
2343 | return QString( "/tmp/copysynccal.ics" ); | 2343 | return QString( "/tmp/copysynccal.ics" ); |
2344 | #endif | 2344 | #endif |
2345 | } | 2345 | } |
2346 | 2346 | ||
2347 | void MainWindow::syncFileRequest() | 2347 | void MainWindow::syncFileRequest() |
2348 | { | 2348 | { |
2349 | if ( KOPrefs::instance()->mPassiveSyncWithDesktop ) { | 2349 | if ( KOPrefs::instance()->mPassiveSyncWithDesktop ) { |
2350 | mSyncManager->slotSyncMenu( 999 ); | 2350 | mSyncManager->slotSyncMenu( 999 ); |
2351 | } | 2351 | } |
2352 | 2352 | ||
2353 | setCaption(i18n("Saving Data to temp file ..." )); | 2353 | setCaption(i18n("Saving Data to temp file ..." )); |
2354 | mView->saveCalendar( sentSyncFile() ); | 2354 | mView->saveCalendar( sentSyncFile() ); |
2355 | setCaption(i18n("Data saved to temp file!" )); | 2355 | setCaption(i18n("Data saved to temp file!" )); |
2356 | 2356 | ||
2357 | } | 2357 | } |
2358 | void MainWindow::getFile( bool success ) | 2358 | void MainWindow::getFile( bool success ) |
2359 | { | 2359 | { |
2360 | if ( ! success ) { | 2360 | if ( ! success ) { |
2361 | setCaption( i18n("Error receiving file. Nothing changed!") ); | 2361 | setCaption( i18n("Error receiving file. Nothing changed!") ); |
2362 | return; | 2362 | return; |
2363 | } | 2363 | } |
2364 | mView->openCalendar( sentSyncFile() ); | 2364 | mView->openCalendar( sentSyncFile() ); |
2365 | if ( KOPrefs::instance()->mPassiveSyncWithDesktop ) { | 2365 | if ( KOPrefs::instance()->mPassiveSyncWithDesktop ) { |
2366 | mSyncManager->slotSyncMenu( 999 ); | 2366 | mSyncManager->slotSyncMenu( 999 ); |
2367 | } | 2367 | } |
2368 | setCaption( i18n("Pi-Sync successful!") ); | 2368 | setCaption( i18n("Pi-Sync successful!") ); |
2369 | } | 2369 | } |
2370 | 2370 | ||
2371 | void MainWindow::printSel( ) | 2371 | void MainWindow::printSel( ) |
2372 | { | 2372 | { |
2373 | mView->viewManager()->agendaView()->agenda()->printSelection(); | 2373 | mView->viewManager()->agendaView()->agenda()->printSelection(); |
2374 | } | 2374 | } |
2375 | 2375 | ||
2376 | void MainWindow::printCal() | 2376 | void MainWindow::printCal() |
2377 | { | 2377 | { |
2378 | mView->print();//mCp->showDialog(); | 2378 | mView->print();//mCp->showDialog(); |
2379 | } | 2379 | } |
2380 | 2380 | ||
2381 | 2381 | ||
2382 | #include "libkdepim/kdatepicker.h" | 2382 | #include "libkdepim/kdatepicker.h" |
2383 | #include <kdatetbl.h> | 2383 | #include <kdatetbl.h> |
2384 | 2384 | ||
2385 | void MainWindow::weekAction() | 2385 | void MainWindow::weekAction() |
2386 | { | 2386 | { |
2387 | int month; | 2387 | int month; |
2388 | KPopupFrame* popup = new KPopupFrame(this); | 2388 | KPopupFrame* popup = new KPopupFrame(this); |
2389 | KDateInternalWeekPicker* picker = new KDateInternalWeekPicker(popup); | 2389 | KDateInternalWeekPicker* picker = new KDateInternalWeekPicker(popup); |
2390 | // ----- | 2390 | // ----- |
2391 | picker->resize(picker->sizeHint()); | 2391 | picker->resize(picker->sizeHint()); |
2392 | popup->setMainWidget(picker); | 2392 | popup->setMainWidget(picker); |
2393 | picker->setFocus(); | 2393 | picker->setFocus(); |
2394 | connect(picker, SIGNAL(closeMe(int)), popup, SLOT(close(int))); | 2394 | connect(picker, SIGNAL(closeMe(int)), popup, SLOT(close(int))); |
2395 | int x = 0; | 2395 | int x = 0; |
2396 | int y = iconToolBar->height(); | 2396 | int y = iconToolBar->height(); |
2397 | int dX = 0; | 2397 | int dX = 0; |
2398 | int dY = 0; | 2398 | int dY = 0; |
2399 | if ( iconToolBar->orientation () == Qt:: Horizontal ) { | 2399 | if ( iconToolBar->orientation () == Qt:: Horizontal ) { |
2400 | if ( iconToolBar->y() > height()/2 ) { | 2400 | if ( iconToolBar->y() > height()/2 ) { |
2401 | dY = picker->sizeHint().height()+8; | 2401 | dY = picker->sizeHint().height()+8; |
2402 | y = 0; | 2402 | y = 0; |
2403 | } | 2403 | } |
2404 | } else { | 2404 | } else { |
2405 | if ( iconToolBar->x() > width()/2 ) { // right side | 2405 | if ( iconToolBar->x() > width()/2 ) { // right side |
2406 | x=0; | 2406 | x=0; |
2407 | dX= picker->sizeHint().width()+8; | 2407 | dX= picker->sizeHint().width()+8; |
2408 | y = 0; | 2408 | y = 0; |
2409 | } else { | 2409 | } else { |
2410 | x= iconToolBar->width(); | 2410 | x= iconToolBar->width(); |
2411 | y = 0; | 2411 | y = 0; |
2412 | } | 2412 | } |
2413 | } | 2413 | } |
2414 | //qDebug("dax %d dy %d %d %d ", dX, dY, iconToolBar->x(), iconToolBar->y() ); | 2414 | //qDebug("dax %d dy %d %d %d ", dX, dY, iconToolBar->x(), iconToolBar->y() ); |
2415 | if(popup->exec(iconToolBar->mapToGlobal(QPoint(x,y)-QPoint( dX,dY)))) | 2415 | if(popup->exec(iconToolBar->mapToGlobal(QPoint(x,y)-QPoint( dX,dY)))) |
2416 | { | 2416 | { |
2417 | month = picker->getResult(); | 2417 | month = picker->getResult(); |
2418 | emit selectWeek ( month ); | 2418 | emit selectWeek ( month ); |
2419 | //qDebug("weekSelected %d ", month); | 2419 | //qDebug("weekSelected %d ", month); |
2420 | } | 2420 | } |
2421 | delete popup; | 2421 | delete popup; |
2422 | } | 2422 | } |
2423 | 2423 | ||
2424 | void MainWindow::hideEvent ( QHideEvent * ) | 2424 | void MainWindow::hideEvent ( QHideEvent * ) |
2425 | { | 2425 | { |
2426 | QString message; | 2426 | QString message; |
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 | |||
@@ -44,193 +44,194 @@ public: | |||
44 | QComboBox * m_font_size_list; | 44 | QComboBox * m_font_size_list; |
45 | QMultiLineEdit *m_preview; | 45 | QMultiLineEdit *m_preview; |
46 | 46 | ||
47 | bool m_pointbug : 1; | 47 | bool m_pointbug : 1; |
48 | 48 | ||
49 | FontDatabase m_fdb; | 49 | FontDatabase m_fdb; |
50 | }; | 50 | }; |
51 | 51 | ||
52 | namespace { | 52 | namespace { |
53 | 53 | ||
54 | class FontListItem : public QListBoxText { | 54 | class FontListItem : public QListBoxText { |
55 | public: | 55 | public: |
56 | FontListItem ( const QString &t, const QStringList &styles, const QValueList<int> &sizes ) : QListBoxText ( ) | 56 | FontListItem ( const QString &t, const QStringList &styles, const QValueList<int> &sizes ) : QListBoxText ( ) |
57 | { | 57 | { |
58 | m_name = t; | 58 | m_name = t; |
59 | m_styles = styles; | 59 | m_styles = styles; |
60 | m_sizes = sizes; | 60 | m_sizes = sizes; |
61 | 61 | ||
62 | QString str = t; | 62 | QString str = t; |
63 | str [0] = str [0]. upper ( ); | 63 | str [0] = str [0]. upper ( ); |
64 | setText ( str ); | 64 | setText ( str ); |
65 | } | 65 | } |
66 | 66 | ||
67 | QString family ( ) const | 67 | QString family ( ) const |
68 | { | 68 | { |
69 | return m_name; | 69 | return m_name; |
70 | } | 70 | } |
71 | 71 | ||
72 | const QStringList &styles ( ) const | 72 | const QStringList &styles ( ) const |
73 | { | 73 | { |
74 | return m_styles; | 74 | return m_styles; |
75 | } | 75 | } |
76 | 76 | ||
77 | const QValueList<int> &sizes ( ) const | 77 | const QValueList<int> &sizes ( ) const |
78 | { | 78 | { |
79 | return m_sizes; | 79 | return m_sizes; |
80 | } | 80 | } |
81 | 81 | ||
82 | private: | 82 | private: |
83 | QStringList m_styles; | 83 | QStringList m_styles; |
84 | QValueList<int> m_sizes; | 84 | QValueList<int> m_sizes; |
85 | QString m_name; | 85 | QString m_name; |
86 | }; | 86 | }; |
87 | 87 | ||
88 | 88 | ||
89 | static int findItemCB ( QComboBox *box, const QString &str ) | 89 | static int findItemCB ( QComboBox *box, const QString &str ) |
90 | { | 90 | { |
91 | for ( int i = 0; i < box-> count ( ); i++ ) { | 91 | for ( int i = 0; i < box-> count ( ); i++ ) { |
92 | if ( box-> text ( i ) == str ) | 92 | if ( box-> text ( i ) == str ) |
93 | return i; | 93 | return i; |
94 | } | 94 | } |
95 | return -1; | 95 | return -1; |
96 | } | 96 | } |
97 | 97 | ||
98 | } | 98 | } |
99 | /* static same as anon. namespace */ | 99 | /* static same as anon. namespace */ |
100 | static int qt_version ( ) | 100 | static int qt_version ( ) |
101 | { | 101 | { |
102 | const char *qver = qVersion ( ); | 102 | const char *qver = qVersion ( ); |
103 | 103 | ||
104 | return ( qver [0] - '0' ) * 100 + ( qver [2] - '0' ) * 10 + ( qver [4] - '0' ); | 104 | return ( qver [0] - '0' ) * 100 + ( qver [2] - '0' ) * 10 + ( qver [4] - '0' ); |
105 | } | 105 | } |
106 | 106 | ||
107 | /** | 107 | /** |
108 | * Constructs the Selector object | 108 | * Constructs the Selector object |
109 | * @param withpreview If a font preview should be given | 109 | * @param withpreview If a font preview should be given |
110 | * @param parent The parent of the Font Selector | 110 | * @param parent The parent of the Font Selector |
111 | * @param name The name of the object | 111 | * @param name The name of the object |
112 | * @param fl WidgetFlags | 112 | * @param fl WidgetFlags |
113 | */ | 113 | */ |
114 | OFontSelector::OFontSelector ( bool withpreview, QWidget *parent, const char *name, WFlags fl ) : QWidget ( parent, name, fl ) | 114 | OFontSelector::OFontSelector ( bool withpreview, QWidget *parent, const char *name, WFlags fl ) : QWidget ( parent, name, fl ) |
115 | { | 115 | { |
116 | d = new OFontSelectorPrivate ( ); | 116 | d = new OFontSelectorPrivate ( ); |
117 | 117 | ||
118 | QGridLayout *gridLayout = new QGridLayout ( this, 0, 0, 4, 4 ); | 118 | QGridLayout *gridLayout = new QGridLayout ( this, 0, 0, 4, 4 ); |
119 | gridLayout->setRowStretch ( 4, 10 ); | 119 | gridLayout->setRowStretch ( 4, 10 ); |
120 | 120 | ||
121 | d-> m_font_family_list = new QListBox( this, "FontListBox" ); | 121 | d-> m_font_family_list = new QListBox( this, "FontListBox" ); |
122 | gridLayout->addMultiCellWidget( d-> m_font_family_list, 0, 4, 0, 0 ); | 122 | gridLayout->addMultiCellWidget( d-> m_font_family_list, 0, 4, 0, 0 ); |
123 | connect( d-> m_font_family_list, SIGNAL( highlighted( int ) ), this, SLOT( fontFamilyClicked( int ) ) ); | 123 | connect( d-> m_font_family_list, SIGNAL( highlighted( int ) ), this, SLOT( fontFamilyClicked( int ) ) ); |
124 | 124 | ||
125 | QLabel *label = new QLabel( tr( "Style" ), this ); | 125 | QLabel *label = new QLabel( tr( "Style" ), this ); |
126 | gridLayout->addWidget( label, 0, 1 ); | 126 | gridLayout->addWidget( label, 0, 1 ); |
127 | 127 | ||
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 |
153 | d-> m_preview = 0; | 154 | d-> m_preview = 0; |
154 | 155 | ||
155 | loadFonts ( d-> m_font_family_list ); | 156 | loadFonts ( d-> m_font_family_list ); |
156 | } | 157 | } |
157 | 158 | ||
158 | OFontSelector::~OFontSelector ( ) | 159 | OFontSelector::~OFontSelector ( ) |
159 | { | 160 | { |
160 | delete d; | 161 | delete d; |
161 | } | 162 | } |
162 | 163 | ||
163 | /** | 164 | /** |
164 | * This methods tries to set the font | 165 | * This methods tries to set the font |
165 | * @param f The wishes font | 166 | * @param f The wishes font |
166 | * @return success or failure | 167 | * @return success or failure |
167 | */ | 168 | */ |
168 | bool OFontSelector::setSelectedFont ( const QFont &f ) | 169 | bool OFontSelector::setSelectedFont ( const QFont &f ) |
169 | { | 170 | { |
170 | return setSelectedFont ( f. family ( ), d-> m_fdb. styleString ( f ), f. pointSize ( ), QFont::encodingName ( f. charSet ( ))); | 171 | return setSelectedFont ( f. family ( ), d-> m_fdb. styleString ( f ), f. pointSize ( ), QFont::encodingName ( f. charSet ( ))); |
171 | } | 172 | } |
172 | 173 | ||
173 | 174 | ||
174 | /** | 175 | /** |
175 | * This is an overloaded method @see setSelectedFont | 176 | * This is an overloaded method @see setSelectedFont |
176 | * @param familyStr The family of the font | 177 | * @param familyStr The family of the font |
177 | * @param styleStr The style of the font | 178 | * @param styleStr The style of the font |
178 | * @param sizeVal The size of font | 179 | * @param sizeVal The size of font |
179 | * @param charset The charset to be used. Will be deprecated by QT3 | 180 | * @param charset The charset to be used. Will be deprecated by QT3 |
180 | */ | 181 | */ |
181 | bool OFontSelector::setSelectedFont ( const QString &familyStr, const QString &styleStr, int sizeVal, const QString & charset ) | 182 | bool OFontSelector::setSelectedFont ( const QString &familyStr, const QString &styleStr, int sizeVal, const QString & charset ) |
182 | { | 183 | { |
183 | QString sizeStr = QString::number ( sizeVal ); | 184 | QString sizeStr = QString::number ( sizeVal ); |
184 | 185 | ||
185 | QListBoxItem *family = d-> m_font_family_list-> findItem ( familyStr ); | 186 | QListBoxItem *family = d-> m_font_family_list-> findItem ( familyStr ); |
186 | if ( !family ) | 187 | if ( !family ) |
187 | family = d-> m_font_family_list-> findItem ( "Helvetica" ); | 188 | family = d-> m_font_family_list-> findItem ( "Helvetica" ); |
188 | if ( !family ) | 189 | if ( !family ) |
189 | family = d-> m_font_family_list-> firstItem ( ); | 190 | family = d-> m_font_family_list-> firstItem ( ); |
190 | d-> m_font_family_list-> setCurrentItem ( family ); | 191 | d-> m_font_family_list-> setCurrentItem ( family ); |
191 | fontFamilyClicked ( d-> m_font_family_list-> index ( family )); | 192 | fontFamilyClicked ( d-> m_font_family_list-> index ( family )); |
192 | 193 | ||
193 | int style = findItemCB ( d-> m_font_style_list, styleStr ); | 194 | int style = findItemCB ( d-> m_font_style_list, styleStr ); |
194 | if ( style < 0 ) | 195 | if ( style < 0 ) |
195 | style = findItemCB ( d-> m_font_style_list, "Regular" ); | 196 | style = findItemCB ( d-> m_font_style_list, "Regular" ); |
196 | if ( style < 0 && d-> m_font_style_list-> count ( ) > 0 ) | 197 | if ( style < 0 && d-> m_font_style_list-> count ( ) > 0 ) |
197 | style = 0; | 198 | style = 0; |
198 | d-> m_font_style_list-> setCurrentItem ( style ); | 199 | d-> m_font_style_list-> setCurrentItem ( style ); |
199 | fontStyleClicked ( style ); | 200 | fontStyleClicked ( style ); |
200 | 201 | ||
201 | int size = findItemCB ( d-> m_font_size_list, sizeStr ); | 202 | int size = findItemCB ( d-> m_font_size_list, sizeStr ); |
202 | if ( size < 0 ) | 203 | if ( size < 0 ) |
203 | size = findItemCB ( d-> m_font_size_list, "10" ); | 204 | size = findItemCB ( d-> m_font_size_list, "10" ); |
204 | if ( size < 0 && d-> m_font_size_list-> count ( ) > 0 ) | 205 | if ( size < 0 && d-> m_font_size_list-> count ( ) > 0 ) |
205 | size = 0; | 206 | size = 0; |
206 | d-> m_font_size_list-> setCurrentItem ( size ); | 207 | d-> m_font_size_list-> setCurrentItem ( size ); |
207 | fontSizeClicked ( size ); | 208 | fontSizeClicked ( size ); |
208 | 209 | ||
209 | return (( family ) && ( style >= 0 ) && ( size >= 0 )); | 210 | return (( family ) && ( style >= 0 ) && ( size >= 0 )); |
210 | } | 211 | } |
211 | 212 | ||
212 | /** | 213 | /** |
213 | * This method returns the name, style and size of the currently selected | 214 | * This method returns the name, style and size of the currently selected |
214 | * font or false if no font is selected | 215 | * font or false if no font is selected |
215 | * @param family The font family will be written there | 216 | * @param family The font family will be written there |
216 | * @param style The style will be written there | 217 | * @param style The style will be written there |
217 | * @param size The size will be written there | 218 | * @param size The size will be written there |
218 | * @return success or failure | 219 | * @return success or failure |
219 | */ | 220 | */ |
220 | bool OFontSelector::selectedFont ( QString &family, QString &style, int &size ) | 221 | bool OFontSelector::selectedFont ( QString &family, QString &style, int &size ) |
221 | { | 222 | { |
222 | QString dummy; | 223 | QString dummy; |
223 | return selectedFont ( family, style, size, dummy ); | 224 | return selectedFont ( family, style, size, dummy ); |
224 | } | 225 | } |
225 | 226 | ||
226 | 227 | ||
227 | /** | 228 | /** |
228 | * This method does return the font family or QString::null if there is | 229 | * This method does return the font family or QString::null if there is |
229 | * no font item selected | 230 | * no font item selected |
230 | * @return the font family | 231 | * @return the font family |
231 | */ | 232 | */ |
232 | QString OFontSelector::fontFamily ( ) const | 233 | QString OFontSelector::fontFamily ( ) const |
233 | { | 234 | { |
234 | FontListItem *fli = (FontListItem *) d-> m_font_family_list-> item ( d-> m_font_family_list-> currentItem ( )); | 235 | FontListItem *fli = (FontListItem *) d-> m_font_family_list-> item ( d-> m_font_family_list-> currentItem ( )); |
235 | 236 | ||
236 | return fli ? fli-> family ( ) : QString::null; | 237 | return fli ? fli-> family ( ) : QString::null; |
@@ -1 +1 @@ | |||
version = "2.0.24"; | version = "2.0.25"; | ||