summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/opie-gutenbrowser/gutenbrowserData.cpp27
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
@@ -13,8 +13,9 @@
***************************************************************************/
//#include "gutenbrowserData.h"
#include "gutenbrowser.h"
+#include "multiline_ex.h"
/* OPIE */
#include <opie2/odebug.h>
#include <qpe/config.h>
@@ -60,9 +61,9 @@ void Gutenbrowser::initConfig() {
// }
// #endif
}
- // odebug << "init file is " << iniFile << "" << oendl;
+ qDebug("init file is " + iniFile );;
#ifdef Q_WS_QWS
useSplitter=FALSE;
Config config("Gutenbrowser");
@@ -150,11 +151,11 @@ void Gutenbrowser::initConfig() {
QString qExit;
qExit=config.readEntry("queryExit","TRUE");
if(qExit=="TRUE") {
b_queryExit=TRUE;
-// odebug << "Please query before leaving the library." << oendl;
+qDebug("lease query before leaving the library.");;
} else {
-// odebug << "Please DO NOT query before leaving the library." << oendl;
+ qDebug("Please DO NOT query before leaving the library.");
b_queryExit=FALSE;
}
// bookmarks
// config.setGroup("Titles");
@@ -164,9 +165,9 @@ void Gutenbrowser::initConfig() {
}// end initConfig()
void Gutenbrowser::initMenuBar()
{
-// odebug << "Starting menu init." << oendl;
+ qDebug("Starting menu init.");
// menuBar entry fileMenu
menubar = new QPEMenuBar(this);
fileMenu=new QPopupMenu();
@@ -210,13 +211,12 @@ void Gutenbrowser::initMenuBar()
}
void Gutenbrowser::initButtonBar()
{
-//odebug << "Starting buttonbar init." << oendl;
+ qDebug("Starting buttonbar init.");
OpenButton = new QPushButton( this, "OpenButton" );
OpenButton->setFocusPolicy( QWidget::TabFocus );
-
LibraryButton = new QPushButton( this, "LibraryButton" );
LibraryButton->setFocusPolicy( QWidget::TabFocus );
BackButton = new QPushButton( this, "BackButton" );
@@ -244,9 +244,8 @@ void Gutenbrowser::initButtonBar()
dictionaryButton = new QPushButton( this, "dictionaryButton" );
dictionaryButton->setFocusPolicy( QWidget::TabFocus );
InfoBar = new QPushButton( this, "Info_Bar" );
-// odebug << "Infobar" << oendl;
// if(!useSplitter) {
buttonsHidden=FALSE;
buttons2->setSpacing(2);
@@ -261,14 +260,14 @@ void Gutenbrowser::initButtonBar()
buttons2->addWidget(InfoBar, 0, AlignCenter);
topLayout->setSpacing(0);
topLayout->addLayout( buttons2,0);
-
}
/* STATUSBAR*/
void Gutenbrowser::initStatusBar()
{
+ qDebug("statusbar");
// #ifndef Q_WS_QWS
// statusBar = new QStatusBar( this, "Status Bar");
// statusBar->message(IDS_STATUS_DEFAULT, 2000);
@@ -279,14 +278,13 @@ void Gutenbrowser::initView()
{
// set the main widget here
// QFont defaultFont( "charter", 10, 50, 0 );
Lview = new MultiLine_Ex(this);
-
Config cfg("Gutenbrowser");
cfg.setGroup("Font");
FontDatabase fdb;
- QFont defaultFont=Lview->font();
+ QFont defaultFont = Lview->font();
QFontInfo fontInfo(defaultFont);
QString family = cfg.readEntry("Family", fontInfo.family());
QString style = cfg.readEntry("Style", fdb.styleString(defaultFont));
@@ -294,12 +292,12 @@ void Gutenbrowser::initView()
QString charSet = cfg.readEntry("CharSet", QFont::encodingName( fontInfo.charSet()) );
defaultFont = fdb.font(family,style,i_size,charSet);
- QString italic=cfg.readEntry("Italic","FALSE");
+ QString italic = cfg.readEntry("Italic","FALSE");
if(italic=="TRUE") {
- odebug << "Set Italic font" << oendl;
- defaultFont = fdb.font(family,"Regular",i_size,charSet); //workaround
+ qDebug("Set Italic font");;
+ defaultFont = fdb.font( family, "Regular", i_size,charSet); //workaround
defaultFont.setItalic(TRUE);
}
Lview->setFont( defaultFont);
@@ -311,9 +309,9 @@ void Gutenbrowser::initView()
Lview->setWordWrap(QMultiLineEdit::WidgetWidth);
useWrap=true;
} else {
Lview->setWordWrap(QMultiLineEdit::NoWrap);
- useWrap=false;
+ useWrap = false;
}
mainList = new QListBox(this,"mainlist");
// QPEApplication::setStylusOperation( mainList->viewport(),QPEApplication::RightOnHold);
@@ -328,5 +326,6 @@ void Gutenbrowser::initView()
} else
Lview->hide();
topLayout->addLayout( edits, 0);
+ qDebug("end initView");
}