summaryrefslogtreecommitdiff
authordrw <drw>2005-04-24 19:29:20 (UTC)
committer drw <drw>2005-04-24 19:29:20 (UTC)
commit9f4dd8e0d2cbe83d23c5405394d5e076dd6c2c6b (patch) (unidiff)
treeef243e01fd5347d74d06e7d90e9c3fc19d990534
parentd1ca2bbae79743f9f8a2c5ac1d702cc1c789fd27 (diff)
downloadopie-9f4dd8e0d2cbe83d23c5405394d5e076dd6c2c6b.zip
opie-9f4dd8e0d2cbe83d23c5405394d5e076dd6c2c6b.tar.gz
opie-9f4dd8e0d2cbe83d23c5405394d5e076dd6c2c6b.tar.bz2
Resource -> OResource
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/dagger/mainwindow.cpp31
-rw-r--r--noncore/apps/dagger/navbar.cpp14
-rw-r--r--noncore/apps/dagger/searchbar.cpp9
3 files changed, 35 insertions, 19 deletions
diff --git a/noncore/apps/dagger/mainwindow.cpp b/noncore/apps/dagger/mainwindow.cpp
index 3dd9eff..1f2d521 100644
--- a/noncore/apps/dagger/mainwindow.cpp
+++ b/noncore/apps/dagger/mainwindow.cpp
@@ -20,16 +20,16 @@ file; see the file COPYING. If not, write to the Free Software Foundation, Inc.,
20#include "searchbar.h" 20#include "searchbar.h"
21#include "opentextdlg.h" 21#include "opentextdlg.h"
22#include "configuredlg.h" 22#include "configuredlg.h"
23#include "textwidget.h" 23#include "textwidget.h"
24 24
25#include <opie2/odebug.h> 25#include <opie2/odebug.h>
26#include <opie2/oresource.h>
26 27
27#include <qpe/qcopenvelope_qws.h> 28#include <qpe/qcopenvelope_qws.h>
28#include <qpe/qpeapplication.h> 29#include <qpe/qpeapplication.h>
29#include <qpe/resource.h>
30 30
31#include <qaction.h> 31#include <qaction.h>
32#include <qclipboard.h> 32#include <qclipboard.h>
33#include <qmenubar.h> 33#include <qmenubar.h>
34#include <qmessagebox.h> 34#include <qmessagebox.h>
35#include <qobjectlist.h> 35#include <qobjectlist.h>
@@ -61,15 +61,15 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags /*fl*/ )
61 setCaption( tr( "Dagger" ) ); 61 setCaption( tr( "Dagger" ) );
62 initUI(); 62 initUI();
63 63
64 connect( &m_tabs, SIGNAL(currentChanged(QWidget *)), this, SLOT( slotTextDisplayed(QWidget *)) ); 64 connect( &m_tabs, SIGNAL(currentChanged(QWidget *)), this, SLOT( slotTextDisplayed(QWidget *)) );
65 connect( &m_autoScrollTimer, SIGNAL(timeout()), this, SLOT(slotNavNextVerse()) ); 65 connect( &m_autoScrollTimer, SIGNAL(timeout()), this, SLOT(slotNavNextVerse()) );
66 66
67 m_bibleIcon = new QPixmap( Resource::loadPixmap( "dagger/bibletext" ) ); 67 m_bibleIcon = new QPixmap( Opie::Core::OResource::loadPixmap( "dagger/bibletext", Opie::Core::OResource::SmallIcon ) );
68 m_commentaryIcon = new QPixmap( Resource::loadPixmap( "dagger/commentary" ) ); 68 m_commentaryIcon = new QPixmap( Opie::Core::OResource::loadPixmap( "dagger/commentary", Opie::Core::OResource::SmallIcon ) );
69 m_lexiconIcon = new QPixmap( Resource::loadPixmap( "dagger/lexicon" ) ); 69 m_lexiconIcon = new QPixmap( Opie::Core::OResource::loadPixmap( "dagger/lexicon", Opie::Core::OResource::SmallIcon ) );
70 70
71 // Load initial configuration 71 // Load initial configuration
72 QTimer::singleShot( 100, this, SLOT( initConfig() ) ); 72 QTimer::singleShot( 100, this, SLOT( initConfig() ) );
73} 73}
74 74
75MainWindow::~MainWindow() 75MainWindow::~MainWindow()
@@ -184,53 +184,62 @@ void MainWindow::initUI()
184 m_searchToolbar = new SearchBar( this ); 184 m_searchToolbar = new SearchBar( this );
185 connect( m_searchToolbar, SIGNAL(sigResultClicked(const QString &)), this, SLOT(slotSearchResultClicked(const QString &)) ); 185 connect( m_searchToolbar, SIGNAL(sigResultClicked(const QString &)), this, SLOT(slotSearchResultClicked(const QString &)) );
186 186
187 // Text menu 187 // Text menu
188 QPopupMenu *popup = new QPopupMenu( this ); 188 QPopupMenu *popup = new QPopupMenu( this );
189 189
190 QAction *a = new QAction( tr( "Open..." ), Resource::loadPixmap( "fileopen" ), QString::null, 0, this, 0 ); 190 QAction *a = new QAction( tr( "Open..." ), Opie::Core::OResource::loadPixmap( "fileopen", Opie::Core::OResource::SmallIcon ),
191 QString::null, 0, this, 0 );
191 connect( a, SIGNAL(activated()), this, SLOT(slotTextOpen()) ); 192 connect( a, SIGNAL(activated()), this, SLOT(slotTextOpen()) );
192 a->addTo( popup ); 193 a->addTo( popup );
193 194
194 m_actionTextClose = new QAction( tr( "Close" ), Resource::loadPixmap( "close" ), QString::null, 0, this, 0 ); 195 m_actionTextClose = new QAction( tr( "Close" ), Opie::Core::OResource::loadPixmap( "close", Opie::Core::OResource::SmallIcon ),
196 QString::null, 0, this, 0 );
195 connect( m_actionTextClose, SIGNAL(activated()), this, SLOT(slotTextClose()) ); 197 connect( m_actionTextClose, SIGNAL(activated()), this, SLOT(slotTextClose()) );
196 m_actionTextClose->addTo( popup ); 198 m_actionTextClose->addTo( popup );
197 199
198 popup->insertSeparator(); 200 popup->insertSeparator();
199 201
200 // TODO - need to implent 202 // TODO - need to implent
201 a = new QAction( tr( "Install..." ), Resource::loadPixmap( "install" ), QString::null, 0, this, 0 ); 203 a = new QAction( tr( "Install" ), Opie::Core::OResource::loadPixmap( "install", Opie::Core::OResource::SmallIcon ),
204 QString::null, 0, this, 0 );
202 a->setEnabled( false ); 205 a->setEnabled( false );
203 connect( a, SIGNAL(activated()), this, SLOT(slotTextInstall()) ); 206 connect( a, SIGNAL(activated()), this, SLOT(slotTextInstall()) );
204 a->addTo( popup ); 207 a->addTo( popup );
205 208
206 m_menuBar->insertItem( tr( "Text" ), popup ); 209 m_menuBar->insertItem( tr( "Text" ), popup );
207 210
208 // Edit menu 211 // Edit menu
209 popup = new QPopupMenu( this ); 212 popup = new QPopupMenu( this );
210 213
211 m_actionEditCopy = new QAction( tr( "Copy" ), Resource::loadPixmap( "copy" ), QString::null, 0, this, 0 ); 214 m_actionEditCopy = new QAction( tr( "Copy" ), Opie::Core::OResource::loadPixmap( "copy", Opie::Core::OResource::SmallIcon ),
215 QString::null, 0, this, 0 );
212 connect( m_actionEditCopy, SIGNAL(activated()), this, SLOT(slotEditCopy()) ); 216 connect( m_actionEditCopy, SIGNAL(activated()), this, SLOT(slotEditCopy()) );
213 m_actionEditCopy->addTo( popup ); 217 m_actionEditCopy->addTo( popup );
214 218
215 popup->insertSeparator(); 219 popup->insertSeparator();
216 220
217 a = new QAction( tr( "Configure..." ), Resource::loadPixmap( "SettingsIcon" ), QString::null, 0, this, 0 ); 221 a = new QAction( tr( "Configure" ), Opie::Core::OResource::loadPixmap( "SettingsIcon", Opie::Core::OResource::SmallIcon ),
222 QString::null, 0, this, 0 );
218 connect( a, SIGNAL(activated()), this, SLOT(slotEditConfigure()) ); 223 connect( a, SIGNAL(activated()), this, SLOT(slotEditConfigure()) );
219 a->addTo( popup ); 224 a->addTo( popup );
220 225
221 m_menuBar->insertItem( tr( "Edit" ), popup ); 226 m_menuBar->insertItem( tr( "Edit" ), popup );
222 227
223 // Bookmark menu 228 // Bookmark menu
224 m_bookmarkMenu = new QPopupMenu( this ); 229 m_bookmarkMenu = new QPopupMenu( this );
225 230
226 m_actionBookmarkAdd = new QAction( tr( "Add" ), Resource::loadPixmap( "dagger/bookmarkadd" ), QString::null, 0, this, 0 ); 231 m_actionBookmarkAdd = new QAction( tr( "Add" ),
232 Opie::Core::OResource::loadPixmap( "dagger/bookmarkadd", Opie::Core::OResource::SmallIcon ),
233 QString::null, 0, this, 0 );
227 connect( m_actionBookmarkAdd, SIGNAL(activated()), this, SLOT(slotBookmarkAdd()) ); 234 connect( m_actionBookmarkAdd, SIGNAL(activated()), this, SLOT(slotBookmarkAdd()) );
228 m_actionBookmarkAdd->addTo( m_bookmarkMenu ); 235 m_actionBookmarkAdd->addTo( m_bookmarkMenu );
229 236
230 m_actionBookmarkRemove = new QAction( tr( "Remove" ), Resource::loadPixmap( "dagger/bookmarkremove" ), QString::null, 0, this, 0 ); 237 m_actionBookmarkRemove = new QAction( tr( "Remove" ),
238 Opie::Core::OResource::loadPixmap( "dagger/bookmarkremove", Opie::Core::OResource::SmallIcon ),
239 QString::null, 0, this, 0 );
231 connect( m_actionBookmarkRemove, SIGNAL(activated()), this, SLOT(slotBookmarkRemove()) ); 240 connect( m_actionBookmarkRemove, SIGNAL(activated()), this, SLOT(slotBookmarkRemove()) );
232 m_actionBookmarkRemove->addTo( m_bookmarkMenu ); 241 m_actionBookmarkRemove->addTo( m_bookmarkMenu );
233 242
234 m_bookmarkMenu->insertSeparator(); 243 m_bookmarkMenu->insertSeparator();
235 244
236 m_menuBar->insertItem( tr( "Bookmark" ), m_bookmarkMenu ); 245 m_menuBar->insertItem( tr( "Bookmark" ), m_bookmarkMenu );
diff --git a/noncore/apps/dagger/navbar.cpp b/noncore/apps/dagger/navbar.cpp
index 97761f7..ac49613 100644
--- a/noncore/apps/dagger/navbar.cpp
+++ b/noncore/apps/dagger/navbar.cpp
@@ -14,60 +14,64 @@ You should have received a copy of the GNU General Public License along with thi
14file; see the file COPYING. If not, write to the Free Software Foundation, Inc., 14file; see the file COPYING. If not, write to the Free Software Foundation, Inc.,
1559 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 1559 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
16*/ 16*/
17 17
18#include "navbar.h" 18#include "navbar.h"
19 19
20#include <opie2/oresource.h>
21
20#include <qpe/config.h> 22#include <qpe/config.h>
21#include <qpe/resource.h> 23#include <qpe/resource.h>
22 24
23#include <qaction.h> 25#include <qaction.h>
24#include <qlineedit.h> 26#include <qlineedit.h>
25#include <qwhatsthis.h> 27#include <qwhatsthis.h>
26 28
29using Opie::Core::OResource;
30
27NavBar::NavBar( QMainWindow *parent ) 31NavBar::NavBar( QMainWindow *parent )
28 : QToolBar( QString::null, parent, QMainWindow::Top, true ) 32 : QToolBar( QString::null, parent, QMainWindow::Top, true )
29{ 33{
30 // Initialize UI 34 // Initialize UI
31 m_actionPrevPage = new QAction( tr( "Previous page" ), Resource::loadPixmap( "fastback" ), 35 m_actionPrevPage = new QAction( tr( "Previous page" ), OResource::loadPixmap( "fastback", OResource::SmallIcon ),
32 QString::null, 0, this, 0 ); 36 QString::null, 0, this, 0 );
33 m_actionPrevPage->setWhatsThis( tr( "Tap here to scroll backward one page." ) ); 37 m_actionPrevPage->setWhatsThis( tr( "Tap here to scroll backward one page." ) );
34 m_actionPrevPage->addTo( this ); 38 m_actionPrevPage->addTo( this );
35 connect( m_actionPrevPage, SIGNAL(activated()), this, SIGNAL(prevPage()) ); 39 connect( m_actionPrevPage, SIGNAL(activated()), this, SIGNAL(prevPage()) );
36 40
37 m_actionPrevVerse = new QAction( tr( "Previous verse" ), Resource::loadPixmap( "back" ), 41 m_actionPrevVerse = new QAction( tr( "Previous verse" ), OResource::loadPixmap( "back", OResource::SmallIcon ),
38 QString::null, 0, this, 0 ); 42 QString::null, 0, this, 0 );
39 m_actionPrevVerse->setWhatsThis( tr( "Tap here to scroll backward one verse." ) ); 43 m_actionPrevVerse->setWhatsThis( tr( "Tap here to scroll backward one verse." ) );
40 m_actionPrevVerse->addTo( this ); 44 m_actionPrevVerse->addTo( this );
41 connect( m_actionPrevVerse, SIGNAL(activated()), this, SIGNAL(prevVerse()) ); 45 connect( m_actionPrevVerse, SIGNAL(activated()), this, SIGNAL(prevVerse()) );
42 46
43 m_key = new QLineEdit( this ); 47 m_key = new QLineEdit( this );
44 setStretchableWidget( m_key ); 48 setStretchableWidget( m_key );
45 QWhatsThis::add( m_key, tr( "Enter location to display here." ) ); 49 QWhatsThis::add( m_key, tr( "Enter location to display here." ) );
46 connect(m_key, SIGNAL(textChanged(const QString &)), this, SIGNAL(keyChanged(const QString &)) ); 50 connect(m_key, SIGNAL(textChanged(const QString &)), this, SIGNAL(keyChanged(const QString &)) );
47 51
48 m_actionNextVerse = new QAction( tr( "Next verse" ), Resource::loadPixmap( "forward" ), 52 m_actionNextVerse = new QAction( tr( "Next verse" ), OResource::loadPixmap( "forward", OResource::SmallIcon ),
49 QString::null, 0, this, 0 ); 53 QString::null, 0, this, 0 );
50 m_actionNextVerse->setWhatsThis( tr( "Tap here to scroll forward one verse." ) ); 54 m_actionNextVerse->setWhatsThis( tr( "Tap here to scroll forward one verse." ) );
51 m_actionNextVerse->addTo( this ); 55 m_actionNextVerse->addTo( this );
52 connect( m_actionNextVerse, SIGNAL(activated()), this, SIGNAL(nextVerse()) ); 56 connect( m_actionNextVerse, SIGNAL(activated()), this, SIGNAL(nextVerse()) );
53 57
54 m_actionNextPage = new QAction( tr( "Next page" ), Resource::loadPixmap( "fastforward" ), 58 m_actionNextPage = new QAction( tr( "Next page" ), OResource::loadPixmap( "fastforward", OResource::SmallIcon ),
55 QString::null, 0, this, 0 ); 59 QString::null, 0, this, 0 );
56 m_actionNextPage->setWhatsThis( tr( "Tap here to scroll forward one page." ) ); 60 m_actionNextPage->setWhatsThis( tr( "Tap here to scroll forward one page." ) );
57 m_actionNextPage->addTo( this ); 61 m_actionNextPage->addTo( this );
58 connect( m_actionNextPage, SIGNAL(activated()), this, SIGNAL(nextPage()) ); 62 connect( m_actionNextPage, SIGNAL(activated()), this, SIGNAL(nextPage()) );
59 63
60 addSeparator(); 64 addSeparator();
61 65
62 m_scrollRate = new QSpinBox( 1, 100, 1, this ); 66 m_scrollRate = new QSpinBox( 1, 100, 1, this );
63 m_scrollRate->setMinimumWidth( 35 ); 67 m_scrollRate->setMinimumWidth( 35 );
64 QWhatsThis::add( m_scrollRate, tr( "Adjust auto-scroll rate here. A larger value represents a slower scrolling rate." ) ); 68 QWhatsThis::add( m_scrollRate, tr( "Adjust auto-scroll rate here. A larger value represents a slower scrolling rate." ) );
65 connect( m_scrollRate, SIGNAL(valueChanged(int)), this, SIGNAL(scrollRateChanged(int)) ); 69 connect( m_scrollRate, SIGNAL(valueChanged(int)), this, SIGNAL(scrollRateChanged(int)) );
66 70
67 m_actionScroll = new QAction( tr( "Auto-scroll" ), Resource::loadPixmap( "dagger/autoscroll" ), 71 m_actionScroll = new QAction( tr( "Auto-scroll" ), OResource::loadPixmap( "dagger/autoscroll", OResource::SmallIcon ),
68 QString::null, 0, this, 0 ); 72 QString::null, 0, this, 0 );
69 m_actionScroll->setToggleAction( true ); 73 m_actionScroll->setToggleAction( true );
70 m_actionScroll->setWhatsThis( tr( "Tap here to start or stop auto-scrolling." ) ); 74 m_actionScroll->setWhatsThis( tr( "Tap here to start or stop auto-scrolling." ) );
71 connect( m_actionScroll, SIGNAL(toggled(bool)), this, SIGNAL(autoScroll(bool)) ); 75 connect( m_actionScroll, SIGNAL(toggled(bool)), this, SIGNAL(autoScroll(bool)) );
72 m_actionScroll->addTo( this ); 76 m_actionScroll->addTo( this );
73 77
diff --git a/noncore/apps/dagger/searchbar.cpp b/noncore/apps/dagger/searchbar.cpp
index 9953e8f..b794bfd 100644
--- a/noncore/apps/dagger/searchbar.cpp
+++ b/noncore/apps/dagger/searchbar.cpp
@@ -15,12 +15,13 @@ file; see the file COPYING. If not, write to the Free Software Foundation, Inc.,
1559 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 1559 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
16*/ 16*/
17 17
18#include "searchbar.h" 18#include "searchbar.h"
19#include "textwidget.h" 19#include "textwidget.h"
20 20
21#include <opie2/oresource.h>
21#include <opie2/owait.h> 22#include <opie2/owait.h>
22 23
23#include <qpe/qpeapplication.h> 24#include <qpe/qpeapplication.h>
24#include <qpe/resource.h> 25#include <qpe/resource.h>
25 26
26#include <qaction.h> 27#include <qaction.h>
@@ -29,12 +30,14 @@ file; see the file COPYING. If not, write to the Free Software Foundation, Inc.,
29#include <qwhatsthis.h> 30#include <qwhatsthis.h>
30 31
31#include <listkey.h> 32#include <listkey.h>
32#include <regex.h> 33#include <regex.h>
33#include <versekey.h> 34#include <versekey.h>
34 35
36using Opie::Core::OResource;
37
35void searchCallback( char /*percent*/, void */*userData*/ ) 38void searchCallback( char /*percent*/, void */*userData*/ )
36{ 39{
37 qApp->processEvents(); 40 qApp->processEvents();
38} 41}
39 42
40SearchBar::SearchBar( QMainWindow *parent ) 43SearchBar::SearchBar( QMainWindow *parent )
@@ -45,34 +48,34 @@ SearchBar::SearchBar( QMainWindow *parent )
45 m_searchText = new QLineEdit( this ); 48 m_searchText = new QLineEdit( this );
46 setStretchableWidget( m_searchText ); 49 setStretchableWidget( m_searchText );
47 QWhatsThis::add( m_searchText, tr( "Enter text to search for here." ) ); 50 QWhatsThis::add( m_searchText, tr( "Enter text to search for here." ) );
48 connect(m_searchText, SIGNAL(textChanged(const QString &)), 51 connect(m_searchText, SIGNAL(textChanged(const QString &)),
49 this, SLOT(slotTextChanged(const QString &)) ); 52 this, SLOT(slotTextChanged(const QString &)) );
50 53
51 m_actionFind = new QAction( tr( "Find" ), Resource::loadPixmap( "find" ), QString::null, 54 m_actionFind = new QAction( tr( "Find" ), OResource::loadPixmap( "find", OResource::SmallIcon ), QString::null,
52 0, this, 0 ); 55 0, this, 0 );
53 m_actionFind->setEnabled( false ); 56 m_actionFind->setEnabled( false );
54 m_actionFind->addTo( this ); 57 m_actionFind->addTo( this );
55 m_actionFind->setWhatsThis( tr( "Tap here search the current module for the text entered to the left." ) ); 58 m_actionFind->setWhatsThis( tr( "Tap here search the current module for the text entered to the left." ) );
56 connect( m_actionFind, SIGNAL(activated()), this, SLOT(slotFind()) ); 59 connect( m_actionFind, SIGNAL(activated()), this, SLOT(slotFind()) );
57 60
58 addSeparator(); 61 addSeparator();
59 62
60 m_actionPrev = new QAction( tr( "Previous result" ), Resource::loadPixmap( "back" ), 63 m_actionPrev = new QAction( tr( "Previous result" ), OResource::loadPixmap( "back", OResource::SmallIcon ),
61 QString::null, 0, this, 0 ); 64 QString::null, 0, this, 0 );
62 m_actionPrev->setEnabled( false ); 65 m_actionPrev->setEnabled( false );
63 m_actionPrev->addTo( this ); 66 m_actionPrev->addTo( this );
64 m_actionPrev->setWhatsThis( tr( "Tap here to view the previous search result." ) ); 67 m_actionPrev->setWhatsThis( tr( "Tap here to view the previous search result." ) );
65 connect( m_actionPrev, SIGNAL(activated()), this, SLOT(slotPrev()) ); 68 connect( m_actionPrev, SIGNAL(activated()), this, SLOT(slotPrev()) );
66 69
67 m_resultList = new QComboBox( this ); 70 m_resultList = new QComboBox( this );
68 m_resultList->setEnabled( false ); 71 m_resultList->setEnabled( false );
69 QWhatsThis::add( m_resultList, tr( "Select the desired search result here." ) ); 72 QWhatsThis::add( m_resultList, tr( "Select the desired search result here." ) );
70 connect( m_resultList, SIGNAL(activated(const QString &)), this, SIGNAL(sigResultClicked(const QString &)) ); 73 connect( m_resultList, SIGNAL(activated(const QString &)), this, SIGNAL(sigResultClicked(const QString &)) );
71 74
72 m_actionNext = new QAction( tr( "Next result" ), Resource::loadPixmap( "forward" ), 75 m_actionNext = new QAction( tr( "Next result" ), OResource::loadPixmap( "forward", OResource::SmallIcon ),
73 QString::null, 0, this, 0 ); 76 QString::null, 0, this, 0 );
74 m_actionNext->setEnabled( false ); 77 m_actionNext->setEnabled( false );
75 m_actionNext->addTo( this ); 78 m_actionNext->addTo( this );
76 m_actionNext->setWhatsThis( tr( "Tap here to view the next search result." ) ); 79 m_actionNext->setWhatsThis( tr( "Tap here to view the next search result." ) );
77 connect( m_actionNext, SIGNAL(activated()), this, SLOT(slotNext()) ); 80 connect( m_actionNext, SIGNAL(activated()), this, SLOT(slotNext()) );
78 81