summaryrefslogtreecommitdiff
path: root/libopie2
Unidiff
Diffstat (limited to 'libopie2') (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opieui/ofontselector.cpp2
-rw-r--r--libopie2/opieui/opieui.pro2
2 files changed, 2 insertions, 2 deletions
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
@@ -91,129 +91,129 @@ public:
91private: 91private:
92 QStringList m_styles; 92 QStringList m_styles;
93 QValueList<int> m_sizes; 93 QValueList<int> m_sizes;
94 QString m_name; 94 QString m_name;
95}; 95};
96} 96}
97} 97}
98} 98}
99 99
100 100
101using namespace Opie::Ui; 101using namespace Opie::Ui;
102using namespace Opie::Ui::Internal; 102using namespace Opie::Ui::Internal;
103 103
104static int findItemCB( QComboBox *box, const QString &str ) 104static int findItemCB( QComboBox *box, const QString &str )
105{ 105{
106 for ( int i = 0; i < box->count(); i++ ) 106 for ( int i = 0; i < box->count(); i++ )
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 */
115static int qt_version() 115static 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 */
129OFontSelector::OFontSelector( bool withpreview, QWidget *parent, const char *name, WFlags fl ) : QWidget ( parent, name, fl ) 129OFontSelector::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
174OFontSelector::~OFontSelector() 174OFontSelector::~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 */
184bool OFontSelector::setSelectedFont ( const QFont &f ) 184bool 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 */
197bool OFontSelector::setSelectedFont( const QString &familyStr, const QString &styleStr, int sizeVal, const QString & charset ) 197bool 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 )
204 family = d->m_font_family_list->findItem ( "Helvetica" ); 204 family = d->m_font_family_list->findItem ( "Helvetica" );
205 if ( !family ) 205 if ( !family )
206 family = d->m_font_family_list->firstItem(); 206 family = d->m_font_family_list->firstItem();
207 d->m_font_family_list->setCurrentItem ( family ); 207 d->m_font_family_list->setCurrentItem ( family );
208 fontFamilyClicked ( d->m_font_family_list->index ( family )); 208 fontFamilyClicked ( d->m_font_family_list->index ( family ));
209 209
210 int style = findItemCB ( d->m_font_style_list, styleStr ); 210 int style = findItemCB ( d->m_font_style_list, styleStr );
211 if ( style < 0 ) 211 if ( style < 0 )
212 style = findItemCB ( d->m_font_style_list, "Regular" ); 212 style = findItemCB ( d->m_font_style_list, "Regular" );
213 if ( style < 0 && d->m_font_style_list->count() > 0 ) 213 if ( style < 0 && d->m_font_style_list->count() > 0 )
214 style = 0; 214 style = 0;
215 d->m_font_style_list->setCurrentItem ( style ); 215 d->m_font_style_list->setCurrentItem ( style );
216 fontStyleClicked ( style ); 216 fontStyleClicked ( style );
217 217
218 int size = findItemCB ( d->m_font_size_list, sizeStr ); 218 int size = findItemCB ( d->m_font_size_list, sizeStr );
219 if ( size < 0 ) 219 if ( size < 0 )
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
@@ -1,65 +1,65 @@
1TEMPLATE = lib 1TEMPLATE = lib
2CONFIG += qt warn_on 2CONFIG += qt warn_on
3DESTDIR = $(OPIEDIR)/lib 3DESTDIR = $(OPIEDIR)/lib
4HEADERS = oclickablelabel.h \ 4HEADERS = 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
25SOURCES = oclickablelabel.cpp \ 25SOURCES = 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
45include( big-screen/big-screen.pro ) 45include( big-screen/big-screen.pro )
46include( fileselector/fileselector.pro ) 46include( fileselector/fileselector.pro )
47 47
48INTERFACES = otimepickerbase.ui 48INTERFACES = otimepickerbase.ui
49 49
50TARGET = opieui2 50TARGET = opieui2
51VERSION = 1.9.0 51VERSION = 1.9.1
52 52
53INCLUDEPATH += $(OPIEDIR)/include 53INCLUDEPATH += $(OPIEDIR)/include
54DEPENDPATH += $(OPIEDIR)/include 54DEPENDPATH += $(OPIEDIR)/include
55 55
56LIBS += -lopiecore2 56LIBS += -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
62contains( platform, x11 ) { 62contains( platform, x11 ) {
63 LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib 63 LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib
64} 64}
65 65