-rw-r--r-- | ChangeLog | 1 | ||||
-rw-r--r-- | libopie2/opieui/ofontselector.cpp | 2 | ||||
-rw-r--r-- | libopie2/opieui/opieui.pro | 2 |
3 files changed, 3 insertions, 2 deletions
@@ -1,62 +1,63 @@ | |||
1 | 2005-??-??Opie 1.2.0 | 1 | 2005-??-??Opie 1.2.0 |
2 | 2 | ||
3 | New Features | 3 | New Features |
4 | ------------ | 4 | ------------ |
5 | 5 | ||
6 | Fixed Bugs | 6 | Fixed Bugs |
7 | ---------- | 7 | ---------- |
8 | * #1236 - VCards contained empty home and work address entries causing Palms to crash (eilers) | 8 | * #1236 - VCards contained empty home and work address entries causing Palms to crash (eilers) |
9 | * #1536 - Autosave of custom locations in opie backup (ar) | 9 | * #1536 - Autosave of custom locations in opie backup (ar) |
10 | * #1539 - Fixed displaying too long path in the delete dialog in opie-eye (zecke) | 10 | * #1539 - Fixed displaying too long path in the delete dialog in opie-eye (zecke) |
11 | * #1540 - Implemented deletion of DocLnks in opie-eye | 11 | * #1540 - Implemented deletion of DocLnks in opie-eye |
12 | 12 | ||
13 | Internal | 13 | Internal |
14 | -------- | 14 | -------- |
15 | * Work around bug in Qt/Embedded 2.3.10: qt_version() returns 231 (mickeyl) | ||
15 | 16 | ||
16 | 2005-02-03Opie 1.1.9 | 17 | 2005-02-03Opie 1.1.9 |
17 | 18 | ||
18 | New Features | 19 | New Features |
19 | ------------ | 20 | ------------ |
20 | * Number of icon columns in Launcher is customizable through Launcher.conf (hrw,zecke,mickeyl) | 21 | * Number of icon columns in Launcher is customizable through Launcher.conf (hrw,zecke,mickeyl) |
21 | * Number of icon columns in Launcher is customizable through LauncherSettings (mickeyl) | 22 | * Number of icon columns in Launcher is customizable through LauncherSettings (mickeyl) |
22 | * Usability enhancements in OpieIRC (skyhusker) | 23 | * Usability enhancements in OpieIRC (skyhusker) |
23 | 24 | ||
24 | Fixed Bugs | 25 | Fixed Bugs |
25 | ---------- | 26 | ---------- |
26 | * #1501 - Fixed bug in todo sql backend (eilers) | 27 | * #1501 - Fixed bug in todo sql backend (eilers) |
27 | * #1505 - Added more Swap sizes in memoryapplet (mickeyl) | 28 | * #1505 - Added more Swap sizes in memoryapplet (mickeyl) |
28 | * #1525 - Hopefully fixed double alarms and not removing alarms set with the Clock application (zecke) | 29 | * #1525 - Hopefully fixed double alarms and not removing alarms set with the Clock application (zecke) |
29 | * #1533 - Security Owner Dialog (shown in case of unsuccessfull authentiacation) wasn't able to display information in non latin1 encoding (zecke) | 30 | * #1533 - Security Owner Dialog (shown in case of unsuccessfull authentiacation) wasn't able to display information in non latin1 encoding (zecke) |
30 | * n.a. - Removed hard coded font sizes in a couple of inputmethods (mickeyl) | 31 | * n.a. - Removed hard coded font sizes in a couple of inputmethods (mickeyl) |
31 | * n.a. - Removed MediumDlg appearing prior to FirstUsage wizard (i.e. calibration) (mickeyl) | 32 | * n.a. - Removed MediumDlg appearing prior to FirstUsage wizard (i.e. calibration) (mickeyl) |
32 | * n.a. - Fixed numerous buglets in OpieIRC (skyhusker) | 33 | * n.a. - Fixed numerous buglets in OpieIRC (skyhusker) |
33 | 34 | ||
34 | Internal | 35 | Internal |
35 | -------- | 36 | -------- |
36 | * Added the Qtopia 1.7 SDK macros for quick-apps to easa compilation of 3rd party apps against our headers (mickeyl) | 37 | * Added the Qtopia 1.7 SDK macros for quick-apps to easa compilation of 3rd party apps against our headers (mickeyl) |
37 | * You can now use the Opie build system in combination with a OpenEmbedded staging area which makes a nice cross development environment (mickeyl) | 38 | * You can now use the Opie build system in combination with a OpenEmbedded staging area which makes a nice cross development environment (mickeyl) |
38 | * Made Opie compilable with Qt/Embedded 2.3.10 (ar) | 39 | * Made Opie compilable with Qt/Embedded 2.3.10 (ar) |
39 | * Changed Launcher to get default orientation from ODevice w/ QWS_DISPLAY overriding (mickeyl) | 40 | * Changed Launcher to get default orientation from ODevice w/ QWS_DISPLAY overriding (mickeyl) |
40 | * Build tree cleanups (mickeyl) | 41 | * Build tree cleanups (mickeyl) |
41 | 42 | ||
42 | 2004-11-26Opie 1.1.8 | 43 | 2004-11-26Opie 1.1.8 |
43 | 44 | ||
44 | New Features | 45 | New Features |
45 | ------------ | 46 | ------------ |
46 | * PackageManager supports installation of local ipkg files (drw) | 47 | * PackageManager supports installation of local ipkg files (drw) |
47 | * PackageManager supports linking of applications to root (drw) | 48 | * PackageManager supports linking of applications to root (drw) |
48 | * PackageManager supports src/gz feeds (drw,wimpie) | 49 | * PackageManager supports src/gz feeds (drw,wimpie) |
49 | * Added a syslog information tab to sysinfo (mickeyl) | 50 | * Added a syslog information tab to sysinfo (mickeyl) |
50 | * Added new, more consistent, PIM icons + a GIMP teplate (ar) | 51 | * Added new, more consistent, PIM icons + a GIMP teplate (ar) |
51 | 52 | ||
52 | Fixed Bugs | 53 | Fixed Bugs |
53 | ---------- | 54 | ---------- |
54 | * #1017 - Tetrix doesn't display correctly for high resolution screens (drw) | 55 | * #1017 - Tetrix doesn't display correctly for high resolution screens (drw) |
55 | * #1269 - VCards were imported into personal area if it was activated (eilers) | 56 | * #1269 - VCards were imported into personal area if it was activated (eilers) |
56 | * #1464 - Packagemanager dont set active filter after install a package (drw) | 57 | * #1464 - Packagemanager dont set active filter after install a package (drw) |
57 | * #1479 - Improved VCard-Parser to import VCards created by Evolution 2 and Apple Addressbook (eilers) | 58 | * #1479 - Improved VCard-Parser to import VCards created by Evolution 2 and Apple Addressbook (eilers) |
58 | * #1493 - Fixed one column layout bug of the launcher (hrw) | 59 | * #1493 - Fixed one column layout bug of the launcher (hrw) |
59 | * n.a. - PackageManager - (Minor UI tweak) in filter dialog, when option is enabled, set focus to widget that corresponds to that option (drw) | 60 | * n.a. - PackageManager - (Minor UI tweak) in filter dialog, when option is enabled, set focus to widget that corresponds to that option (drw) |
60 | * n.a. - PackageManager - (Minor UI tweak) fix double entry in source feed configuration when adding a new feed (drw) | 61 | * n.a. - PackageManager - (Minor UI tweak) fix double entry in source feed configuration when adding a new feed (drw) |
61 | * n.a. - Battery Applet - fix sizing of battery info popup (drw,mickeyl) | 62 | * n.a. - Battery Applet - fix sizing of battery info popup (drw,mickeyl) |
62 | 63 | ||
diff --git a/libopie2/opieui/ofontselector.cpp b/libopie2/opieui/ofontselector.cpp index 6c24f14..8b679c8 100644 --- a/libopie2/opieui/ofontselector.cpp +++ b/libopie2/opieui/ofontselector.cpp | |||
@@ -107,97 +107,97 @@ static int findItemCB( QComboBox *box, const QString &str ) | |||
107 | { | 107 | { |
108 | if ( box->text ( i ) == str ) | 108 | if ( box->text ( i ) == str ) |
109 | return i; | 109 | return i; |
110 | } | 110 | } |
111 | return -1; | 111 | return -1; |
112 | } | 112 | } |
113 | 113 | ||
114 | /* static same as anon. namespace */ | 114 | /* static same as anon. namespace */ |
115 | static int qt_version() | 115 | static int qt_version() |
116 | { | 116 | { |
117 | const char *qver = qVersion(); | 117 | const char *qver = qVersion(); |
118 | 118 | ||
119 | return ( qver [0] - '0' ) * 100 + ( qver [2] - '0' ) * 10 + ( qver [4] - '0' ); | 119 | return ( qver [0] - '0' ) * 100 + ( qver [2] - '0' ) * 10 + ( qver [4] - '0' ); |
120 | } | 120 | } |
121 | 121 | ||
122 | /** | 122 | /** |
123 | * Constructs the Selector object | 123 | * Constructs the Selector object |
124 | * @param withpreview If a font preview should be given | 124 | * @param withpreview If a font preview should be given |
125 | * @param parent The parent of the Font Selector | 125 | * @param parent The parent of the Font Selector |
126 | * @param name The name of the object | 126 | * @param name The name of the object |
127 | * @param fl WidgetFlags | 127 | * @param fl WidgetFlags |
128 | */ | 128 | */ |
129 | OFontSelector::OFontSelector( bool withpreview, QWidget *parent, const char *name, WFlags fl ) : QWidget ( parent, name, fl ) | 129 | OFontSelector::OFontSelector( bool withpreview, QWidget *parent, const char *name, WFlags fl ) : QWidget ( parent, name, fl ) |
130 | { | 130 | { |
131 | d = new OFontSelectorPrivate(); | 131 | d = new OFontSelectorPrivate(); |
132 | 132 | ||
133 | QGridLayout *gridLayout = new QGridLayout( this, 0, 0, 4, 4 ); | 133 | QGridLayout *gridLayout = new QGridLayout( this, 0, 0, 4, 4 ); |
134 | gridLayout->setRowStretch( 4, 10 ); | 134 | gridLayout->setRowStretch( 4, 10 ); |
135 | 135 | ||
136 | d->m_font_family_list = new QListBox( this, "FontListBox" ); | 136 | d->m_font_family_list = new QListBox( this, "FontListBox" ); |
137 | gridLayout->addMultiCellWidget( d->m_font_family_list, 0, 4, 0, 0 ); | 137 | gridLayout->addMultiCellWidget( d->m_font_family_list, 0, 4, 0, 0 ); |
138 | connect( d->m_font_family_list, SIGNAL( highlighted(int) ), this, SLOT( fontFamilyClicked(int) ) ); | 138 | connect( d->m_font_family_list, SIGNAL( highlighted(int) ), this, SLOT( fontFamilyClicked(int) ) ); |
139 | 139 | ||
140 | QLabel *label = new QLabel( tr( "Style" ), this ); | 140 | QLabel *label = new QLabel( tr( "Style" ), this ); |
141 | gridLayout->addWidget( label, 0, 1 ); | 141 | gridLayout->addWidget( label, 0, 1 ); |
142 | 142 | ||
143 | d->m_font_style_list = new QComboBox( this, "StyleListBox" ); | 143 | d->m_font_style_list = new QComboBox( this, "StyleListBox" ); |
144 | connect( d->m_font_style_list, SIGNAL( activated(int) ), this, SLOT( fontStyleClicked(int) ) ); | 144 | connect( d->m_font_style_list, SIGNAL( activated(int) ), this, SLOT( fontStyleClicked(int) ) ); |
145 | gridLayout->addWidget( d->m_font_style_list, 1, 1 ); | 145 | gridLayout->addWidget( d->m_font_style_list, 1, 1 ); |
146 | 146 | ||
147 | label = new QLabel( tr( "Size" ), this ); | 147 | label = new QLabel( tr( "Size" ), this ); |
148 | gridLayout->addWidget( label, 2, 1 ); | 148 | gridLayout->addWidget( label, 2, 1 ); |
149 | 149 | ||
150 | d->m_font_size_list = new QComboBox( this, "SizeListBox" ); | 150 | d->m_font_size_list = new QComboBox( this, "SizeListBox" ); |
151 | connect( d->m_font_size_list, SIGNAL( activated(int) ), | 151 | connect( d->m_font_size_list, SIGNAL( activated(int) ), |
152 | this, SLOT( fontSizeClicked(int) ) ); | 152 | this, SLOT( fontSizeClicked(int) ) ); |
153 | gridLayout->addWidget( d->m_font_size_list, 3, 1 ); | 153 | gridLayout->addWidget( d->m_font_size_list, 3, 1 ); |
154 | 154 | ||
155 | d->m_pointbug = ( qt_version() <= 233 ); | 155 | d->m_pointbug = ( qt_version() == 232 || qt_version() == 233 ); // SharpROM uses 2.3.2 |
156 | 156 | ||
157 | if ( withpreview ) | 157 | if ( withpreview ) |
158 | { | 158 | { |
159 | d->m_preview = new QMultiLineEdit ( this, "Preview" ); | 159 | d->m_preview = new QMultiLineEdit ( this, "Preview" ); |
160 | d->m_preview->setAlignment ( AlignCenter ); | 160 | d->m_preview->setAlignment ( AlignCenter ); |
161 | d->m_preview->setWordWrap ( QMultiLineEdit::WidgetWidth ); | 161 | d->m_preview->setWordWrap ( QMultiLineEdit::WidgetWidth ); |
162 | d->m_preview->setMargin ( 3 ); | 162 | d->m_preview->setMargin ( 3 ); |
163 | d->m_preview->setText ( tr( "The Quick Brown Fox Jumps Over The Lazy Dog" )); | 163 | d->m_preview->setText ( tr( "The Quick Brown Fox Jumps Over The Lazy Dog" )); |
164 | gridLayout->addRowSpacing ( 5, 4 ); | 164 | gridLayout->addRowSpacing ( 5, 4 ); |
165 | gridLayout->addMultiCellWidget ( d->m_preview, 6, 6, 0, 1 ); | 165 | gridLayout->addMultiCellWidget ( d->m_preview, 6, 6, 0, 1 ); |
166 | gridLayout->setRowStretch ( 6, 5 ); | 166 | gridLayout->setRowStretch ( 6, 5 ); |
167 | } | 167 | } |
168 | else | 168 | else |
169 | d->m_preview = 0; | 169 | d->m_preview = 0; |
170 | 170 | ||
171 | loadFonts ( d->m_font_family_list ); | 171 | loadFonts ( d->m_font_family_list ); |
172 | } | 172 | } |
173 | 173 | ||
174 | OFontSelector::~OFontSelector() | 174 | OFontSelector::~OFontSelector() |
175 | { | 175 | { |
176 | delete d; | 176 | delete d; |
177 | } | 177 | } |
178 | 178 | ||
179 | /** | 179 | /** |
180 | * This methods tries to set the font | 180 | * This methods tries to set the font |
181 | * @param f The wishes font | 181 | * @param f The wishes font |
182 | * @return success or failure | 182 | * @return success or failure |
183 | */ | 183 | */ |
184 | bool OFontSelector::setSelectedFont ( const QFont &f ) | 184 | bool OFontSelector::setSelectedFont ( const QFont &f ) |
185 | { | 185 | { |
186 | return setSelectedFont ( f. family(), d->m_fdb. styleString ( f ), f. pointSize(), QFont::encodingName ( f. charSet())); | 186 | return setSelectedFont ( f. family(), d->m_fdb. styleString ( f ), f. pointSize(), QFont::encodingName ( f. charSet())); |
187 | } | 187 | } |
188 | 188 | ||
189 | 189 | ||
190 | /** | 190 | /** |
191 | * This is an overloaded method @see setSelectedFont | 191 | * This is an overloaded method @see setSelectedFont |
192 | * @param familyStr The family of the font | 192 | * @param familyStr The family of the font |
193 | * @param styleStr The style of the font | 193 | * @param styleStr The style of the font |
194 | * @param sizeVal The size of font | 194 | * @param sizeVal The size of font |
195 | * @param charset The charset to be used. Will be deprecated by QT3 | 195 | * @param charset The charset to be used. Will be deprecated by QT3 |
196 | */ | 196 | */ |
197 | bool OFontSelector::setSelectedFont( const QString &familyStr, const QString &styleStr, int sizeVal, const QString & charset ) | 197 | bool OFontSelector::setSelectedFont( const QString &familyStr, const QString &styleStr, int sizeVal, const QString & charset ) |
198 | { | 198 | { |
199 | Q_CONST_UNUSED( charset ) | 199 | Q_CONST_UNUSED( charset ) |
200 | QString sizeStr = QString::number ( sizeVal ); | 200 | QString sizeStr = QString::number ( sizeVal ); |
201 | 201 | ||
202 | QListBoxItem *family = d->m_font_family_list->findItem ( familyStr ); | 202 | QListBoxItem *family = d->m_font_family_list->findItem ( familyStr ); |
203 | if ( !family ) | 203 | if ( !family ) |
diff --git a/libopie2/opieui/opieui.pro b/libopie2/opieui/opieui.pro index ffa8b83..5525ea2 100644 --- a/libopie2/opieui/opieui.pro +++ b/libopie2/opieui/opieui.pro | |||
@@ -3,63 +3,63 @@ CONFIG += qt warn_on | |||
3 | DESTDIR = $(OPIEDIR)/lib | 3 | DESTDIR = $(OPIEDIR)/lib |
4 | HEADERS = oclickablelabel.h \ | 4 | HEADERS = oclickablelabel.h \ |
5 | odialog.h \ | 5 | odialog.h \ |
6 | ofontselector.h \ | 6 | ofontselector.h \ |
7 | oimageeffect.h \ | 7 | oimageeffect.h \ |
8 | okeyconfigwidget.h \ | 8 | okeyconfigwidget.h \ |
9 | oledbox.h \ | 9 | oledbox.h \ |
10 | olistview.h \ | 10 | olistview.h \ |
11 | opixmapeffect.h \ | 11 | opixmapeffect.h \ |
12 | opopupmenu.h \ | 12 | opopupmenu.h \ |
13 | opixmapprovider.h \ | 13 | opixmapprovider.h \ |
14 | oselector.h \ | 14 | oselector.h \ |
15 | oseparator.h \ | 15 | oseparator.h \ |
16 | otabinfo.h \ | 16 | otabinfo.h \ |
17 | otabbar.h \ | 17 | otabbar.h \ |
18 | otabwidget.h \ | 18 | otabwidget.h \ |
19 | otaskbarapplet.h \ | 19 | otaskbarapplet.h \ |
20 | otimepicker.h \ | 20 | otimepicker.h \ |
21 | oversatileview.h \ | 21 | oversatileview.h \ |
22 | oversatileviewitem.h \ | 22 | oversatileviewitem.h \ |
23 | owait.h | 23 | owait.h |
24 | 24 | ||
25 | SOURCES = oclickablelabel.cpp \ | 25 | SOURCES = oclickablelabel.cpp \ |
26 | odialog.cpp \ | 26 | odialog.cpp \ |
27 | ofontselector.cpp \ | 27 | ofontselector.cpp \ |
28 | oimageeffect.cpp \ | 28 | oimageeffect.cpp \ |
29 | okeyconfigwidget.cpp \ | 29 | okeyconfigwidget.cpp \ |
30 | oledbox.cpp \ | 30 | oledbox.cpp \ |
31 | olistview.cpp \ | 31 | olistview.cpp \ |
32 | opixmapeffect.cpp \ | 32 | opixmapeffect.cpp \ |
33 | opopupmenu.cpp \ | 33 | opopupmenu.cpp \ |
34 | opixmapprovider.cpp \ | 34 | opixmapprovider.cpp \ |
35 | oselector.cpp \ | 35 | oselector.cpp \ |
36 | oseparator.cpp \ | 36 | oseparator.cpp \ |
37 | otabbar.cpp \ | 37 | otabbar.cpp \ |
38 | otabwidget.cpp \ | 38 | otabwidget.cpp \ |
39 | otaskbarapplet.cpp \ | 39 | otaskbarapplet.cpp \ |
40 | otimepicker.cpp \ | 40 | otimepicker.cpp \ |
41 | oversatileview.cpp \ | 41 | oversatileview.cpp \ |
42 | oversatileviewitem.cpp \ | 42 | oversatileviewitem.cpp \ |
43 | owait.cpp | 43 | owait.cpp |
44 | 44 | ||
45 | include( big-screen/big-screen.pro ) | 45 | include( big-screen/big-screen.pro ) |
46 | include( fileselector/fileselector.pro ) | 46 | include( fileselector/fileselector.pro ) |
47 | 47 | ||
48 | INTERFACES = otimepickerbase.ui | 48 | INTERFACES = otimepickerbase.ui |
49 | 49 | ||
50 | TARGET = opieui2 | 50 | TARGET = opieui2 |
51 | VERSION = 1.9.0 | 51 | VERSION = 1.9.1 |
52 | 52 | ||
53 | INCLUDEPATH += $(OPIEDIR)/include | 53 | INCLUDEPATH += $(OPIEDIR)/include |
54 | DEPENDPATH += $(OPIEDIR)/include | 54 | DEPENDPATH += $(OPIEDIR)/include |
55 | 55 | ||
56 | LIBS += -lopiecore2 | 56 | LIBS += -lopiecore2 |
57 | 57 | ||
58 | !contains( platform, x11 ) { | 58 | !contains( platform, x11 ) { |
59 | include( $(OPIEDIR)/include.pro ) | 59 | include( $(OPIEDIR)/include.pro ) |
60 | } | 60 | } |
61 | 61 | ||
62 | contains( platform, x11 ) { | 62 | contains( platform, x11 ) { |
63 | LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib | 63 | LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib |
64 | } | 64 | } |
65 | 65 | ||