Diffstat (limited to 'noncore/apps/opie-gutenbrowser/gutenbrowserData.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/apps/opie-gutenbrowser/gutenbrowserData.cpp | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/noncore/apps/opie-gutenbrowser/gutenbrowserData.cpp b/noncore/apps/opie-gutenbrowser/gutenbrowserData.cpp index c9149ac..a226258 100644 --- a/noncore/apps/opie-gutenbrowser/gutenbrowserData.cpp +++ b/noncore/apps/opie-gutenbrowser/gutenbrowserData.cpp | |||
@@ -8,21 +8,25 @@ | |||
8 | /*************************************************************************** | 8 | /*************************************************************************** |
9 | * This program is free software; you can redistribute it and/or modify * | 9 | * This program is free software; you can redistribute it and/or modify * |
10 | * it under the terms of the GNU General Public License as published by * | 10 | * it under the terms of the GNU General Public License as published by * |
11 | * the Free Software Foundation; either version 2 of the License, or * | 11 | * the Free Software Foundation; either version 2 of the License, or * |
12 | * (at your option) any later version. * | 12 | * (at your option) any later version. * |
13 | ***************************************************************************/ | 13 | ***************************************************************************/ |
14 | |||
14 | //#include "gutenbrowserData.h" | 15 | //#include "gutenbrowserData.h" |
15 | #include "gutenbrowser.h" | 16 | #include "gutenbrowser.h" |
16 | 17 | ||
18 | /* OPIE */ | ||
19 | #include <opie2/odebug.h> | ||
17 | #include <qpe/config.h> | 20 | #include <qpe/config.h> |
18 | #include <qpe/fontdatabase.h> | 21 | #include <qpe/fontdatabase.h> |
19 | #include <qpe/menubutton.h> | 22 | #include <qpe/menubutton.h> |
20 | #include <qpe/resource.h> | 23 | #include <qpe/resource.h> |
21 | #include <qpe/qpeapplication.h> | 24 | #include <qpe/qpeapplication.h> |
22 | 25 | ||
26 | /* QT */ | ||
23 | #include <qfontinfo.h> | 27 | #include <qfontinfo.h> |
24 | #include <qtoolbutton.h> | 28 | #include <qtoolbutton.h> |
25 | 29 | ||
26 | void Gutenbrowser::initSlots() { | 30 | void Gutenbrowser::initSlots() { |
27 | 31 | ||
28 | connect(LibraryButton,SIGNAL(released()),SLOT(LibraryBtn())); | 32 | connect(LibraryButton,SIGNAL(released()),SLOT(LibraryBtn())); |
@@ -36,13 +40,13 @@ void Gutenbrowser::initSlots() { | |||
36 | connect(qApp,SIGNAL(aboutToQuit()),SLOT(cleanUp())); | 40 | connect(qApp,SIGNAL(aboutToQuit()),SLOT(cleanUp())); |
37 | connect(mainList,SIGNAL(clicked(QListBoxItem *)),SLOT(listClickedSlot(QListBoxItem *))); | 41 | connect(mainList,SIGNAL(clicked(QListBoxItem *)),SLOT(listClickedSlot(QListBoxItem *))); |
38 | connect(bookmarksMenu,SIGNAL(activated(int)),SLOT(Bookmark(int))); | 42 | connect(bookmarksMenu,SIGNAL(activated(int)),SLOT(Bookmark(int))); |
39 | } | 43 | } |
40 | 44 | ||
41 | void Gutenbrowser::initConfig() { | 45 | void Gutenbrowser::initConfig() { |
42 | //qDebug("Starting configuration."); | 46 | //odebug << "Starting configuration." << oendl; |
43 | QDir library(local_library); | 47 | QDir library(local_library); |
44 | if ( !library.exists()) { | 48 | if ( !library.exists()) { |
45 | library.mkdir(local_library, TRUE); | 49 | library.mkdir(local_library, TRUE); |
46 | QString msg; | 50 | QString msg; |
47 | // #ifndef Q_WS_WIN | 51 | // #ifndef Q_WS_WIN |
48 | msg = "chmod 755 " + local_library; | 52 | msg = "chmod 755 " + local_library; |
@@ -54,13 +58,13 @@ void Gutenbrowser::initConfig() { | |||
54 | // msg = "chmod 755 " + local_library+"pix"; | 58 | // msg = "chmod 755 " + local_library+"pix"; |
55 | // system(msg); | 59 | // system(msg); |
56 | // } | 60 | // } |
57 | // #endif | 61 | // #endif |
58 | 62 | ||
59 | } | 63 | } |
60 | // qDebug( "init file is %s",iniFile.latin1()); | 64 | // odebug << "init file is " << iniFile << "" << oendl; |
61 | 65 | ||
62 | #ifdef Q_WS_QWS | 66 | #ifdef Q_WS_QWS |
63 | useSplitter=FALSE; | 67 | useSplitter=FALSE; |
64 | Config config("Gutenbrowser"); | 68 | Config config("Gutenbrowser"); |
65 | 69 | ||
66 | config.setGroup( "General" ); | 70 | config.setGroup( "General" ); |
@@ -144,27 +148,27 @@ void Gutenbrowser::initConfig() { | |||
144 | 148 | ||
145 | config.setGroup("General"); | 149 | config.setGroup("General"); |
146 | QString qExit; | 150 | QString qExit; |
147 | qExit=config.readEntry("queryExit","TRUE"); | 151 | qExit=config.readEntry("queryExit","TRUE"); |
148 | if(qExit=="TRUE") { | 152 | if(qExit=="TRUE") { |
149 | b_queryExit=TRUE; | 153 | b_queryExit=TRUE; |
150 | // qDebug("Please query before leaving the library."); | 154 | // odebug << "Please query before leaving the library." << oendl; |
151 | } else { | 155 | } else { |
152 | // qDebug("Please DO NOT query before leaving the library."); | 156 | // odebug << "Please DO NOT query before leaving the library." << oendl; |
153 | b_queryExit=FALSE; | 157 | b_queryExit=FALSE; |
154 | } | 158 | } |
155 | // bookmarks | 159 | // bookmarks |
156 | // config.setGroup("Titles"); | 160 | // config.setGroup("Titles"); |
157 | // QString tmpTitle=config.readEntry(file_name,""); | 161 | // QString tmpTitle=config.readEntry(file_name,""); |
158 | 162 | ||
159 | 163 | ||
160 | }// end initConfig() | 164 | }// end initConfig() |
161 | 165 | ||
162 | void Gutenbrowser::initMenuBar() | 166 | void Gutenbrowser::initMenuBar() |
163 | { | 167 | { |
164 | // qDebug("Starting menu init."); | 168 | // odebug << "Starting menu init." << oendl; |
165 | // menuBar entry fileMenu | 169 | // menuBar entry fileMenu |
166 | menubar = new QPEMenuBar(this); | 170 | menubar = new QPEMenuBar(this); |
167 | 171 | ||
168 | fileMenu=new QPopupMenu(); | 172 | fileMenu=new QPopupMenu(); |
169 | fileMenu->insertItem(Resource::loadPixmap("gutenbrowser/openbook"), | 173 | fileMenu->insertItem(Resource::loadPixmap("gutenbrowser/openbook"), |
170 | "Open Local Library...", this, SLOT( OpenBtn()) ); | 174 | "Open Local Library...", this, SLOT( OpenBtn()) ); |
@@ -204,13 +208,13 @@ void Gutenbrowser::initMenuBar() | |||
204 | 208 | ||
205 | topLayout->addLayout( menu, 0); | 209 | topLayout->addLayout( menu, 0); |
206 | } | 210 | } |
207 | 211 | ||
208 | void Gutenbrowser::initButtonBar() | 212 | void Gutenbrowser::initButtonBar() |
209 | { | 213 | { |
210 | //qDebug("Starting buttonbar init."); | 214 | //odebug << "Starting buttonbar init." << oendl; |
211 | 215 | ||
212 | OpenButton = new QPushButton( this, "OpenButton" ); | 216 | OpenButton = new QPushButton( this, "OpenButton" ); |
213 | OpenButton->setFocusPolicy( QWidget::TabFocus ); | 217 | OpenButton->setFocusPolicy( QWidget::TabFocus ); |
214 | 218 | ||
215 | LibraryButton = new QPushButton( this, "LibraryButton" ); | 219 | LibraryButton = new QPushButton( this, "LibraryButton" ); |
216 | LibraryButton->setFocusPolicy( QWidget::TabFocus ); | 220 | LibraryButton->setFocusPolicy( QWidget::TabFocus ); |
@@ -238,13 +242,13 @@ void Gutenbrowser::initButtonBar() | |||
238 | lastBmkButton->setPopup(bookmarksMenu); | 242 | lastBmkButton->setPopup(bookmarksMenu); |
239 | 243 | ||
240 | dictionaryButton = new QPushButton( this, "dictionaryButton" ); | 244 | dictionaryButton = new QPushButton( this, "dictionaryButton" ); |
241 | dictionaryButton->setFocusPolicy( QWidget::TabFocus ); | 245 | dictionaryButton->setFocusPolicy( QWidget::TabFocus ); |
242 | 246 | ||
243 | InfoBar = new QPushButton( this, "Info_Bar" ); | 247 | InfoBar = new QPushButton( this, "Info_Bar" ); |
244 | // qDebug("Infobar"); | 248 | // odebug << "Infobar" << oendl; |
245 | // if(!useSplitter) { | 249 | // if(!useSplitter) { |
246 | 250 | ||
247 | buttonsHidden=FALSE; | 251 | buttonsHidden=FALSE; |
248 | buttons2->setSpacing(2); | 252 | buttons2->setSpacing(2); |
249 | buttons2->addWidget(OpenButton, 0, AlignCenter); | 253 | buttons2->addWidget(OpenButton, 0, AlignCenter); |
250 | buttons2->addWidget(LibraryButton, 0, AlignCenter); | 254 | buttons2->addWidget(LibraryButton, 0, AlignCenter); |
@@ -290,13 +294,13 @@ void Gutenbrowser::initView() | |||
290 | QString charSet = cfg.readEntry("CharSet", QFont::encodingName( fontInfo.charSet()) ); | 294 | QString charSet = cfg.readEntry("CharSet", QFont::encodingName( fontInfo.charSet()) ); |
291 | 295 | ||
292 | defaultFont = fdb.font(family,style,i_size,charSet); | 296 | defaultFont = fdb.font(family,style,i_size,charSet); |
293 | 297 | ||
294 | QString italic=cfg.readEntry("Italic","FALSE"); | 298 | QString italic=cfg.readEntry("Italic","FALSE"); |
295 | if(italic=="TRUE") { | 299 | if(italic=="TRUE") { |
296 | qDebug("Set Italic font"); | 300 | odebug << "Set Italic font" << oendl; |
297 | defaultFont = fdb.font(family,"Regular",i_size,charSet); //workaround | 301 | defaultFont = fdb.font(family,"Regular",i_size,charSet); //workaround |
298 | defaultFont.setItalic(TRUE); | 302 | defaultFont.setItalic(TRUE); |
299 | } | 303 | } |
300 | 304 | ||
301 | Lview->setFont( defaultFont); | 305 | Lview->setFont( defaultFont); |
302 | update(); | 306 | update(); |