summaryrefslogtreecommitdiff
Unidiff
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
@@ -3,24 +3,25 @@
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)
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
@@ -143,25 +143,25 @@ OFontSelector::OFontSelector( bool withpreview, QWidget *parent, const char *nam
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 }
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
@@ -39,25 +39,25 @@ SOURCES = oclickablelabel.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