Diffstat (limited to 'noncore/apps/opie-gutenbrowser/gutenbrowserData.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/apps/opie-gutenbrowser/gutenbrowserData.cpp | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/noncore/apps/opie-gutenbrowser/gutenbrowserData.cpp b/noncore/apps/opie-gutenbrowser/gutenbrowserData.cpp index c93dbc5..d384c09 100644 --- a/noncore/apps/opie-gutenbrowser/gutenbrowserData.cpp +++ b/noncore/apps/opie-gutenbrowser/gutenbrowserData.cpp | |||
@@ -9,24 +9,26 @@ | |||
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 | ||
15 | //#include "gutenbrowserData.h" | 15 | //#include "gutenbrowserData.h" |
16 | #include "gutenbrowser.h" | 16 | #include "gutenbrowser.h" |
17 | #include "multiline_ex.h" | 17 | #include "multiline_ex.h" |
18 | 18 | ||
19 | /* OPIE */ | 19 | /* OPIE */ |
20 | #include <opie2/odebug.h> | 20 | #include <opie2/odebug.h> |
21 | #include <opie2/oresource.h> | ||
22 | |||
21 | #include <qpe/config.h> | 23 | #include <qpe/config.h> |
22 | #include <qpe/fontdatabase.h> | 24 | #include <qpe/fontdatabase.h> |
23 | #include <qpe/menubutton.h> | 25 | #include <qpe/menubutton.h> |
24 | #include <qpe/resource.h> | 26 | #include <qpe/resource.h> |
25 | #include <qpe/qpeapplication.h> | 27 | #include <qpe/qpeapplication.h> |
26 | 28 | ||
27 | /* QT */ | 29 | /* QT */ |
28 | #include <qfontinfo.h> | 30 | #include <qfontinfo.h> |
29 | #include <qtoolbutton.h> | 31 | #include <qtoolbutton.h> |
30 | 32 | ||
31 | void Gutenbrowser::initSlots() { | 33 | void Gutenbrowser::initSlots() { |
32 | 34 | ||
@@ -162,51 +164,51 @@ qDebug("lease query before leaving the library.");; | |||
162 | // QString tmpTitle=config.readEntry(file_name,""); | 164 | // QString tmpTitle=config.readEntry(file_name,""); |
163 | 165 | ||
164 | 166 | ||
165 | }// end initConfig() | 167 | }// end initConfig() |
166 | 168 | ||
167 | void Gutenbrowser::initMenuBar() | 169 | void Gutenbrowser::initMenuBar() |
168 | { | 170 | { |
169 | qDebug("Starting menu init."); | 171 | qDebug("Starting menu init."); |
170 | // menuBar entry fileMenu | 172 | // menuBar entry fileMenu |
171 | menubar = new QPEMenuBar(this); | 173 | menubar = new QPEMenuBar(this); |
172 | 174 | ||
173 | fileMenu=new QPopupMenu(); | 175 | fileMenu=new QPopupMenu(); |
174 | fileMenu->insertItem(Resource::loadPixmap("gutenbrowser/openbook"), | 176 | fileMenu->insertItem( Opie::Core::OResource::loadPixmap("gutenbrowser/openbook", Opie::Core::OResource::SmallIcon ), |
175 | "Open Local Library...", this, SLOT( OpenBtn()) ); | 177 | "Open Local Library...", this, SLOT( OpenBtn()) ); |
176 | // fileMenu->insertItem("Download FTPSite", this, SLOT( downloadFtpList()) ); | 178 | // fileMenu->insertItem("Download FTPSite", this, SLOT( downloadFtpList()) ); |
177 | fileMenu->insertItem( Resource::loadPixmap("home"), | 179 | fileMenu->insertItem( Opie::Core::OResource::loadPixmap("home", Opie::Core::OResource::SmallIcon ), |
178 | "Download Library Index", this, SLOT( downloadLibIndex()) ); | 180 | "Download Library Index", this, SLOT( downloadLibIndex()) ); |
179 | fileMenu->insertItem( Resource::loadPixmap("quit"), | 181 | fileMenu->insertItem( Opie::Core::OResource::loadPixmap("quit", Opie::Core::OResource::SmallIcon ), |
180 | "Quit Gutenbrowser...", this, SLOT( ByeBye()) ); | 182 | "Quit Gutenbrowser...", this, SLOT( ByeBye()) ); |
181 | // menuBar entry editMenu | 183 | // menuBar entry editMenu |
182 | 184 | ||
183 | editMenu=new QPopupMenu(); | 185 | editMenu=new QPopupMenu(); |
184 | 186 | ||
185 | editMenu->insertItem(Resource::loadPixmap("up"), "Top", | 187 | editMenu->insertItem( Opie::Core::OResource::loadPixmap("up", Opie::Core::OResource::SmallIcon ), "Top", |
186 | this, SLOT(TopBtn()) ); | 188 | this, SLOT(TopBtn()) ); |
187 | editMenu->insertItem( Resource::loadPixmap("back"), "Beginning", | 189 | editMenu->insertItem( Opie::Core::OResource::loadPixmap("back", Opie::Core::OResource::SmallIcon ), "Beginning", |
188 | this, SLOT(doBeginBtn()) ); | 190 | this, SLOT(doBeginBtn()) ); |
189 | editMenu->insertItem( Resource::loadPixmap("gutenbrowser/search"), "Search", | 191 | editMenu->insertItem( Opie::Core::OResource::loadPixmap("gutenbrowser/search", Opie::Core::OResource::SmallIcon ), "Search", |
190 | this, SLOT(SearchBtn()) ); | 192 | this, SLOT(SearchBtn()) ); |
191 | 193 | ||
192 | editMenu->insertItem("Clear", this, SLOT(ClearEdit()) ); | 194 | editMenu->insertItem("Clear", this, SLOT(ClearEdit()) ); |
193 | 195 | ||
194 | optionsMenu= new QPopupMenu(); | 196 | optionsMenu= new QPopupMenu(); |
195 | optionsMenu->insertItem( Resource::loadPixmap("gutenbrowser/configure"), | 197 | optionsMenu->insertItem( Opie::Core::OResource::loadPixmap("gutenbrowser/configure", Opie::Core::OResource::SmallIcon ), |
196 | "Configure", this, SLOT(doOptions()) ); | 198 | "Configure", this, SLOT(doOptions()) ); |
197 | 199 | ||
198 | donateMenu = new QPopupMenu(); | 200 | donateMenu = new QPopupMenu(); |
199 | // donateMenu->insertItem("Gutenberg", this, SLOT(donateGutenberg()) ); | 201 | // donateMenu->insertItem("Gutenberg", this, SLOT(donateGutenberg()) ); |
200 | donateMenu->insertItem( Resource::loadPixmap("gutenbrowser/gutenbrowser_sm"), | 202 | donateMenu->insertItem( Opie::Core::OResource::loadPixmap("gutenbrowser/gutenbrowser_sm", Opie::Core::OResource::SmallIcon ), |
201 | "Gutenbrowser Developer", this, SLOT(infoGutenbrowser()) ); | 203 | "Gutenbrowser Developer", this, SLOT(infoGutenbrowser()) ); |
202 | 204 | ||
203 | menubar->insertItem("File", fileMenu); | 205 | menubar->insertItem("File", fileMenu); |
204 | menubar->insertItem("Page", editMenu); | 206 | menubar->insertItem("Page", editMenu); |
205 | menubar->insertItem("Options", optionsMenu); | 207 | menubar->insertItem("Options", optionsMenu); |
206 | // menubar->insertItem("More Info", donateMenu); | 208 | // menubar->insertItem("More Info", donateMenu); |
207 | 209 | ||
208 | menu->addWidget( menubar,0); | 210 | menu->addWidget( menubar,0); |
209 | 211 | ||
210 | topLayout->addLayout( menu, 0); | 212 | topLayout->addLayout( menu, 0); |
211 | } | 213 | } |
212 | 214 | ||