-rw-r--r-- | noncore/apps/opie-gutenbrowser/gutenbrowserData.cpp | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/noncore/apps/opie-gutenbrowser/gutenbrowserData.cpp b/noncore/apps/opie-gutenbrowser/gutenbrowserData.cpp index a226258..9473ba9 100644 --- a/noncore/apps/opie-gutenbrowser/gutenbrowserData.cpp +++ b/noncore/apps/opie-gutenbrowser/gutenbrowserData.cpp | |||
@@ -14,6 +14,7 @@ | |||
14 | 14 | ||
15 | //#include "gutenbrowserData.h" | 15 | //#include "gutenbrowserData.h" |
16 | #include "gutenbrowser.h" | 16 | #include "gutenbrowser.h" |
17 | #include "multiline_ex.h" | ||
17 | 18 | ||
18 | /* OPIE */ | 19 | /* OPIE */ |
19 | #include <opie2/odebug.h> | 20 | #include <opie2/odebug.h> |
@@ -61,7 +62,7 @@ void Gutenbrowser::initConfig() { | |||
61 | // #endif | 62 | // #endif |
62 | 63 | ||
63 | } | 64 | } |
64 | // odebug << "init file is " << iniFile << "" << oendl; | 65 | qDebug("init file is " + iniFile );; |
65 | 66 | ||
66 | #ifdef Q_WS_QWS | 67 | #ifdef Q_WS_QWS |
67 | useSplitter=FALSE; | 68 | useSplitter=FALSE; |
@@ -151,9 +152,9 @@ void Gutenbrowser::initConfig() { | |||
151 | qExit=config.readEntry("queryExit","TRUE"); | 152 | qExit=config.readEntry("queryExit","TRUE"); |
152 | if(qExit=="TRUE") { | 153 | if(qExit=="TRUE") { |
153 | b_queryExit=TRUE; | 154 | b_queryExit=TRUE; |
154 | // odebug << "Please query before leaving the library." << oendl; | 155 | qDebug("lease query before leaving the library.");; |
155 | } else { | 156 | } else { |
156 | // odebug << "Please DO NOT query before leaving the library." << oendl; | 157 | qDebug("Please DO NOT query before leaving the library."); |
157 | b_queryExit=FALSE; | 158 | b_queryExit=FALSE; |
158 | } | 159 | } |
159 | // bookmarks | 160 | // bookmarks |
@@ -165,7 +166,7 @@ void Gutenbrowser::initConfig() { | |||
165 | 166 | ||
166 | void Gutenbrowser::initMenuBar() | 167 | void Gutenbrowser::initMenuBar() |
167 | { | 168 | { |
168 | // odebug << "Starting menu init." << oendl; | 169 | qDebug("Starting menu init."); |
169 | // menuBar entry fileMenu | 170 | // menuBar entry fileMenu |
170 | menubar = new QPEMenuBar(this); | 171 | menubar = new QPEMenuBar(this); |
171 | 172 | ||
@@ -211,11 +212,10 @@ void Gutenbrowser::initMenuBar() | |||
211 | 212 | ||
212 | void Gutenbrowser::initButtonBar() | 213 | void Gutenbrowser::initButtonBar() |
213 | { | 214 | { |
214 | //odebug << "Starting buttonbar init." << oendl; | 215 | qDebug("Starting buttonbar init."); |
215 | 216 | ||
216 | OpenButton = new QPushButton( this, "OpenButton" ); | 217 | OpenButton = new QPushButton( this, "OpenButton" ); |
217 | OpenButton->setFocusPolicy( QWidget::TabFocus ); | 218 | OpenButton->setFocusPolicy( QWidget::TabFocus ); |
218 | |||
219 | LibraryButton = new QPushButton( this, "LibraryButton" ); | 219 | LibraryButton = new QPushButton( this, "LibraryButton" ); |
220 | LibraryButton->setFocusPolicy( QWidget::TabFocus ); | 220 | LibraryButton->setFocusPolicy( QWidget::TabFocus ); |
221 | 221 | ||
@@ -245,7 +245,6 @@ void Gutenbrowser::initButtonBar() | |||
245 | dictionaryButton->setFocusPolicy( QWidget::TabFocus ); | 245 | dictionaryButton->setFocusPolicy( QWidget::TabFocus ); |
246 | 246 | ||
247 | InfoBar = new QPushButton( this, "Info_Bar" ); | 247 | InfoBar = new QPushButton( this, "Info_Bar" ); |
248 | // odebug << "Infobar" << oendl; | ||
249 | // if(!useSplitter) { | 248 | // if(!useSplitter) { |
250 | 249 | ||
251 | buttonsHidden=FALSE; | 250 | buttonsHidden=FALSE; |
@@ -262,12 +261,12 @@ void Gutenbrowser::initButtonBar() | |||
262 | 261 | ||
263 | topLayout->setSpacing(0); | 262 | topLayout->setSpacing(0); |
264 | topLayout->addLayout( buttons2,0); | 263 | topLayout->addLayout( buttons2,0); |
265 | |||
266 | } | 264 | } |
267 | 265 | ||
268 | /* STATUSBAR*/ | 266 | /* STATUSBAR*/ |
269 | void Gutenbrowser::initStatusBar() | 267 | void Gutenbrowser::initStatusBar() |
270 | { | 268 | { |
269 | qDebug("statusbar"); | ||
271 | // #ifndef Q_WS_QWS | 270 | // #ifndef Q_WS_QWS |
272 | 271 | ||
273 | // statusBar = new QStatusBar( this, "Status Bar"); | 272 | // statusBar = new QStatusBar( this, "Status Bar"); |
@@ -280,12 +279,11 @@ void Gutenbrowser::initView() | |||
280 | // set the main widget here | 279 | // set the main widget here |
281 | // QFont defaultFont( "charter", 10, 50, 0 ); | 280 | // QFont defaultFont( "charter", 10, 50, 0 ); |
282 | Lview = new MultiLine_Ex(this); | 281 | Lview = new MultiLine_Ex(this); |
283 | |||
284 | Config cfg("Gutenbrowser"); | 282 | Config cfg("Gutenbrowser"); |
285 | cfg.setGroup("Font"); | 283 | cfg.setGroup("Font"); |
286 | 284 | ||
287 | FontDatabase fdb; | 285 | FontDatabase fdb; |
288 | QFont defaultFont=Lview->font(); | 286 | QFont defaultFont = Lview->font(); |
289 | QFontInfo fontInfo(defaultFont); | 287 | QFontInfo fontInfo(defaultFont); |
290 | 288 | ||
291 | QString family = cfg.readEntry("Family", fontInfo.family()); | 289 | QString family = cfg.readEntry("Family", fontInfo.family()); |
@@ -295,10 +293,10 @@ void Gutenbrowser::initView() | |||
295 | 293 | ||
296 | defaultFont = fdb.font(family,style,i_size,charSet); | 294 | defaultFont = fdb.font(family,style,i_size,charSet); |
297 | 295 | ||
298 | QString italic=cfg.readEntry("Italic","FALSE"); | 296 | QString italic = cfg.readEntry("Italic","FALSE"); |
299 | if(italic=="TRUE") { | 297 | if(italic=="TRUE") { |
300 | odebug << "Set Italic font" << oendl; | 298 | qDebug("Set Italic font");; |
301 | defaultFont = fdb.font(family,"Regular",i_size,charSet); //workaround | 299 | defaultFont = fdb.font( family, "Regular", i_size,charSet); //workaround |
302 | defaultFont.setItalic(TRUE); | 300 | defaultFont.setItalic(TRUE); |
303 | } | 301 | } |
304 | 302 | ||
@@ -312,7 +310,7 @@ void Gutenbrowser::initView() | |||
312 | useWrap=true; | 310 | useWrap=true; |
313 | } else { | 311 | } else { |
314 | Lview->setWordWrap(QMultiLineEdit::NoWrap); | 312 | Lview->setWordWrap(QMultiLineEdit::NoWrap); |
315 | useWrap=false; | 313 | useWrap = false; |
316 | } | 314 | } |
317 | mainList = new QListBox(this,"mainlist"); | 315 | mainList = new QListBox(this,"mainlist"); |
318 | 316 | ||
@@ -329,4 +327,5 @@ void Gutenbrowser::initView() | |||
329 | Lview->hide(); | 327 | Lview->hide(); |
330 | 328 | ||
331 | topLayout->addLayout( edits, 0); | 329 | topLayout->addLayout( edits, 0); |
330 | qDebug("end initView"); | ||
332 | } | 331 | } |