Diffstat (limited to 'libopie2/opieui/ofontselector.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | libopie2/opieui/ofontselector.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libopie2/opieui/ofontselector.cpp b/libopie2/opieui/ofontselector.cpp index 6763ee6..4870cd9 100644 --- a/libopie2/opieui/ofontselector.cpp +++ b/libopie2/opieui/ofontselector.cpp | |||
@@ -172,48 +172,49 @@ OFontSelector::~OFontSelector() | |||
172 | { | 172 | { |
173 | delete d; | 173 | delete d; |
174 | } | 174 | } |
175 | 175 | ||
176 | /** | 176 | /** |
177 | * This methods tries to set the font | 177 | * This methods tries to set the font |
178 | * @param f The wishes font | 178 | * @param f The wishes font |
179 | * @return success or failure | 179 | * @return success or failure |
180 | */ | 180 | */ |
181 | bool OFontSelector::setSelectedFont ( const QFont &f ) | 181 | bool OFontSelector::setSelectedFont ( const QFont &f ) |
182 | { | 182 | { |
183 | return setSelectedFont ( f. family(), d->m_fdb. styleString ( f ), f. pointSize(), QFont::encodingName ( f. charSet())); | 183 | return setSelectedFont ( f. family(), d->m_fdb. styleString ( f ), f. pointSize(), QFont::encodingName ( f. charSet())); |
184 | } | 184 | } |
185 | 185 | ||
186 | 186 | ||
187 | /** | 187 | /** |
188 | * This is an overloaded method @see setSelectedFont | 188 | * This is an overloaded method @see setSelectedFont |
189 | * @param familyStr The family of the font | 189 | * @param familyStr The family of the font |
190 | * @param styleStr The style of the font | 190 | * @param styleStr The style of the font |
191 | * @param sizeVal The size of font | 191 | * @param sizeVal The size of font |
192 | * @param charset The charset to be used. Will be deprecated by QT3 | 192 | * @param charset The charset to be used. Will be deprecated by QT3 |
193 | */ | 193 | */ |
194 | bool OFontSelector::setSelectedFont( const QString &familyStr, const QString &styleStr, int sizeVal, const QString & charset ) | 194 | bool OFontSelector::setSelectedFont( const QString &familyStr, const QString &styleStr, int sizeVal, const QString & charset ) |
195 | { | 195 | { |
196 | Q_CONST_UNUSED( charset ) | ||
196 | QString sizeStr = QString::number ( sizeVal ); | 197 | QString sizeStr = QString::number ( sizeVal ); |
197 | 198 | ||
198 | QListBoxItem *family = d->m_font_family_list->findItem ( familyStr ); | 199 | QListBoxItem *family = d->m_font_family_list->findItem ( familyStr ); |
199 | if ( !family ) | 200 | if ( !family ) |
200 | family = d->m_font_family_list->findItem ( "Helvetica" ); | 201 | family = d->m_font_family_list->findItem ( "Helvetica" ); |
201 | if ( !family ) | 202 | if ( !family ) |
202 | family = d->m_font_family_list->firstItem(); | 203 | family = d->m_font_family_list->firstItem(); |
203 | d->m_font_family_list->setCurrentItem ( family ); | 204 | d->m_font_family_list->setCurrentItem ( family ); |
204 | fontFamilyClicked ( d->m_font_family_list->index ( family )); | 205 | fontFamilyClicked ( d->m_font_family_list->index ( family )); |
205 | 206 | ||
206 | int style = findItemCB ( d->m_font_style_list, styleStr ); | 207 | int style = findItemCB ( d->m_font_style_list, styleStr ); |
207 | if ( style < 0 ) | 208 | if ( style < 0 ) |
208 | style = findItemCB ( d->m_font_style_list, "Regular" ); | 209 | style = findItemCB ( d->m_font_style_list, "Regular" ); |
209 | if ( style < 0 && d->m_font_style_list->count() > 0 ) | 210 | if ( style < 0 && d->m_font_style_list->count() > 0 ) |
210 | style = 0; | 211 | style = 0; |
211 | d->m_font_style_list->setCurrentItem ( style ); | 212 | d->m_font_style_list->setCurrentItem ( style ); |
212 | fontStyleClicked ( style ); | 213 | fontStyleClicked ( style ); |
213 | 214 | ||
214 | int size = findItemCB ( d->m_font_size_list, sizeStr ); | 215 | int size = findItemCB ( d->m_font_size_list, sizeStr ); |
215 | if ( size < 0 ) | 216 | if ( size < 0 ) |
216 | size = findItemCB ( d->m_font_size_list, "10" ); | 217 | size = findItemCB ( d->m_font_size_list, "10" ); |
217 | if ( size < 0 && d->m_font_size_list->count() > 0 ) | 218 | if ( size < 0 && d->m_font_size_list->count() > 0 ) |
218 | size = 0; | 219 | size = 0; |
219 | d->m_font_size_list->setCurrentItem ( size ); | 220 | d->m_font_size_list->setCurrentItem ( size ); |