summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2005-02-07 15:00:36 (UTC)
committer mickeyl <mickeyl>2005-02-07 15:00:36 (UTC)
commit0bc169b13ad563819b6483beef775be26016832b (patch) (unidiff)
tree004ef63126b46ce1b9a18bf5403fe9ce9c256465
parent896d2e77ebafd09ee58d6148e31365f47a3668b4 (diff)
downloadopie-0bc169b13ad563819b6483beef775be26016832b.zip
opie-0bc169b13ad563819b6483beef775be26016832b.tar.gz
opie-0bc169b13ad563819b6483beef775be26016832b.tar.bz2
work around qt_version() bug in Qt/Embedded 2.3.10
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--ChangeLog1
-rw-r--r--libopie2/opieui/ofontselector.cpp2
-rw-r--r--libopie2/opieui/opieui.pro2
3 files changed, 3 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 824e749..a2d3011 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,38 +1,39 @@
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)
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
@@ -131,49 +131,49 @@ OFontSelector::OFontSelector( bool withpreview, QWidget *parent, const char *nam
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/**
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
@@ -27,39 +27,39 @@ SOURCES = oclickablelabel.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