summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/apps/opie-gutenbrowser/gutenbrowserData.cpp19
1 files changed, 9 insertions, 10 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
@@ -9,16 +9,17 @@
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
***************************************************************************/
//#include "gutenbrowserData.h"
#include "gutenbrowser.h"
+#include "multiline_ex.h"
/* OPIE */
#include <opie2/odebug.h>
#include <qpe/config.h>
#include <qpe/fontdatabase.h>
#include <qpe/menubutton.h>
#include <qpe/resource.h>
#include <qpe/qpeapplication.h>
@@ -56,17 +57,17 @@ void Gutenbrowser::initConfig() {
// pixdir.mkdir(local_library+"pix", TRUE);
// QString msg;
// msg = "chmod 755 " + local_library+"pix";
// system(msg);
// }
// #endif
}
- // odebug << "init file is " << iniFile << "" << oendl;
+ qDebug("init file is " + iniFile );;
#ifdef Q_WS_QWS
useSplitter=FALSE;
Config config("Gutenbrowser");
config.setGroup( "General" );
//useWordWrap_CheckBox
useIcons=TRUE;
@@ -146,31 +147,31 @@ void Gutenbrowser::initConfig() {
QString copying;
copying="";
config.setGroup("General");
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");
// QString tmpTitle=config.readEntry(file_name,"");
}// end initConfig()
void Gutenbrowser::initMenuBar()
{
-// odebug << "Starting menu init." << oendl;
+ qDebug("Starting menu init.");
// menuBar entry fileMenu
menubar = new QPEMenuBar(this);
fileMenu=new QPopupMenu();
fileMenu->insertItem(Resource::loadPixmap("gutenbrowser/openbook"),
"Open Local Library...", this, SLOT( OpenBtn()) );
// fileMenu->insertItem("Download FTPSite", this, SLOT( downloadFtpList()) );
fileMenu->insertItem( Resource::loadPixmap("home"),
@@ -206,21 +207,20 @@ void Gutenbrowser::initMenuBar()
menu->addWidget( menubar,0);
topLayout->addLayout( menu, 0);
}
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" );
BackButton->setFocusPolicy( QWidget::TabFocus );
BackButton->setAutoRepeat(TRUE);
ForwardButton = new QPushButton( this, "ForwardButton" );
@@ -240,69 +240,67 @@ void Gutenbrowser::initButtonBar()
bookmarksMenu->insertItem("Last Set", this, SLOT(Bookmark( int) ));
lastBmkButton->setPopup(bookmarksMenu);
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);
buttons2->addWidget(OpenButton, 0, AlignCenter);
buttons2->addWidget(LibraryButton, 0, AlignCenter);
buttons2->addWidget(BackButton, 0, AlignCenter);
buttons2->addWidget(ForwardButton, 0, AlignCenter);
buttons2->addWidget(SearchButton, 0, AlignCenter);
buttons2->addWidget(setBookmarkButton, 0, AlignCenter);
buttons2->addWidget(lastBmkButton, 0, AlignCenter);
buttons2->addWidget(dictionaryButton, 0, AlignCenter);
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);
// #endif
}
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();
QFontInfo fontInfo(defaultFont);
QString family = cfg.readEntry("Family", fontInfo.family());
QString style = cfg.readEntry("Style", fdb.styleString(defaultFont));
int i_size = cfg.readNumEntry("Size", fontInfo.pointSize()/10);
QString charSet = cfg.readEntry("CharSet", QFont::encodingName( fontInfo.charSet()) );
defaultFont = fdb.font(family,style,i_size,charSet);
QString italic=cfg.readEntry("Italic","FALSE");
if(italic=="TRUE") {
- odebug << "Set Italic font" << oendl;
+ qDebug("Set Italic font");;
defaultFont = fdb.font(family,"Regular",i_size,charSet); //workaround
defaultFont.setItalic(TRUE);
}
Lview->setFont( defaultFont);
update();
cfg.setGroup("General");
@@ -324,9 +322,10 @@ void Gutenbrowser::initView()
edits->addWidget(mainList);
if(!showMainList) {
Lview->setText( "\nThis is gutenbrowser for the Sharp Zaurus.\nMake your self at home, sit back, relax and read something great. ");
} else
Lview->hide();
topLayout->addLayout( edits, 0);
+ qDebug("end initView");
}