From d54ee25eca9a9e8d38e342828aa21589dc523ce3 Mon Sep 17 00:00:00 2001 From: drw Date: Mon, 16 May 2005 17:49:55 +0000 Subject: Resource -> OResource --- (limited to 'noncore/apps') diff --git a/noncore/apps/dagger/configuredlg.cpp b/noncore/apps/dagger/configuredlg.cpp index 42bc6da..791eeb1 100644 --- a/noncore/apps/dagger/configuredlg.cpp +++ b/noncore/apps/dagger/configuredlg.cpp @@ -18,8 +18,7 @@ file; see the file COPYING. If not, write to the Free Software Foundation, Inc., #include "configuredlg.h" #include - -#include +#include #include #include @@ -51,9 +50,8 @@ ConfigureDlg::ConfigureDlg( QWidget *parent, const QString &swordPath, bool alwa m_swordPath = new QLineEdit( swordPath, widget ); QWhatsThis::add( m_swordPath, tr( "Enter the path where the Sword texts (Bibles, commentaries, etc.) can be found. This path should contain either the 'mods.conf' file or 'mods.d' sub-directory." ) ); grid->addWidget( m_swordPath, 1, 0 ); - QPixmap pic; - pic.convertFromImage( Resource::loadImage( "folder" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); - QPushButton *btn = new QPushButton( pic, QString::null, widget ); + QPushButton *btn = new QPushButton( Opie::Core::OResource::loadPixmap( "folder", Opie::Core::OResource::SmallIcon ), + QString::null, widget ); btn->setMaximumWidth( btn->height() ); QWhatsThis::add( btn, tr( "Tap here to select the path where the Sword texts (Bibles, commentaries, etc.) can be found. This path should contain either the 'mods.conf' file or 'mods.d' sub-directory." ) ); connect( btn, SIGNAL(clicked()), this, SLOT(slotSelectSwordPath()) ); diff --git a/noncore/apps/dagger/navbar.cpp b/noncore/apps/dagger/navbar.cpp index ac49613..b28c677 100644 --- a/noncore/apps/dagger/navbar.cpp +++ b/noncore/apps/dagger/navbar.cpp @@ -26,19 +26,19 @@ file; see the file COPYING. If not, write to the Free Software Foundation, Inc., #include #include -using Opie::Core::OResource; - NavBar::NavBar( QMainWindow *parent ) : QToolBar( QString::null, parent, QMainWindow::Top, true ) { // Initialize UI - m_actionPrevPage = new QAction( tr( "Previous page" ), OResource::loadPixmap( "fastback", OResource::SmallIcon ), + m_actionPrevPage = new QAction( tr( "Previous page" ), + Opie::Core::OResource::loadPixmap( "fastback", Opie::Core::OResource::SmallIcon ), QString::null, 0, this, 0 ); m_actionPrevPage->setWhatsThis( tr( "Tap here to scroll backward one page." ) ); m_actionPrevPage->addTo( this ); connect( m_actionPrevPage, SIGNAL(activated()), this, SIGNAL(prevPage()) ); - m_actionPrevVerse = new QAction( tr( "Previous verse" ), OResource::loadPixmap( "back", OResource::SmallIcon ), + m_actionPrevVerse = new QAction( tr( "Previous verse" ), + Opie::Core::OResource::loadPixmap( "back", Opie::Core::OResource::SmallIcon ), QString::null, 0, this, 0 ); m_actionPrevVerse->setWhatsThis( tr( "Tap here to scroll backward one verse." ) ); m_actionPrevVerse->addTo( this ); @@ -49,14 +49,16 @@ NavBar::NavBar( QMainWindow *parent ) QWhatsThis::add( m_key, tr( "Enter location to display here." ) ); connect(m_key, SIGNAL(textChanged(const QString &)), this, SIGNAL(keyChanged(const QString &)) ); - m_actionNextVerse = new QAction( tr( "Next verse" ), OResource::loadPixmap( "forward", OResource::SmallIcon ), + m_actionNextVerse = new QAction( tr( "Next verse" ), + Opie::Core::OResource::loadPixmap( "forward", Opie::Core::OResource::SmallIcon ), QString::null, 0, this, 0 ); m_actionNextVerse->setWhatsThis( tr( "Tap here to scroll forward one verse." ) ); m_actionNextVerse->addTo( this ); connect( m_actionNextVerse, SIGNAL(activated()), this, SIGNAL(nextVerse()) ); - m_actionNextPage = new QAction( tr( "Next page" ), OResource::loadPixmap( "fastforward", OResource::SmallIcon ), - QString::null, 0, this, 0 ); + m_actionNextPage = new QAction( tr( "Next page" ), + Opie::Core::OResource::loadPixmap( "fastforward", Opie::Core::OResource::SmallIcon ), + QString::null, 0, this, 0 ); m_actionNextPage->setWhatsThis( tr( "Tap here to scroll forward one page." ) ); m_actionNextPage->addTo( this ); connect( m_actionNextPage, SIGNAL(activated()), this, SIGNAL(nextPage()) ); @@ -68,7 +70,8 @@ NavBar::NavBar( QMainWindow *parent ) QWhatsThis::add( m_scrollRate, tr( "Adjust auto-scroll rate here. A larger value represents a slower scrolling rate." ) ); connect( m_scrollRate, SIGNAL(valueChanged(int)), this, SIGNAL(scrollRateChanged(int)) ); - m_actionScroll = new QAction( tr( "Auto-scroll" ), OResource::loadPixmap( "dagger/autoscroll", OResource::SmallIcon ), + m_actionScroll = new QAction( tr( "Auto-scroll" ), + Opie::Core::OResource::loadPixmap( "dagger/autoscroll", Opie::Core::OResource::SmallIcon ), QString::null, 0, this, 0 ); m_actionScroll->setToggleAction( true ); m_actionScroll->setWhatsThis( tr( "Tap here to start or stop auto-scrolling." ) ); diff --git a/noncore/apps/dagger/opentextdlg.cpp b/noncore/apps/dagger/opentextdlg.cpp index 8c94a4b..7fd5cde 100644 --- a/noncore/apps/dagger/opentextdlg.cpp +++ b/noncore/apps/dagger/opentextdlg.cpp @@ -17,7 +17,7 @@ file; see the file COPYING. If not, write to the Free Software Foundation, Inc., #include "opentextdlg.h" -#include +#include #include #include @@ -35,7 +35,7 @@ OpenTextDlg::OpenTextDlg( QWidget *parent, sword::SWMgr *swordMgr, QPixmap *bibl layout->addWidget( &m_textList ); m_textList.setRootIsDecorated( true ); - m_textList.addColumn( tr( "Icon" ),35 ); + m_textList.addColumn( tr( "Icon" ) ); m_textList.addColumn( tr( "Text" ) ); m_textList.header()->hide(); m_textList.setAllColumnsShowFocus( true ); diff --git a/noncore/apps/dagger/searchbar.cpp b/noncore/apps/dagger/searchbar.cpp index b794bfd..b195f67 100644 --- a/noncore/apps/dagger/searchbar.cpp +++ b/noncore/apps/dagger/searchbar.cpp @@ -22,7 +22,6 @@ file; see the file COPYING. If not, write to the Free Software Foundation, Inc., #include #include -#include #include #include @@ -33,8 +32,6 @@ file; see the file COPYING. If not, write to the Free Software Foundation, Inc., #include #include -using Opie::Core::OResource; - void searchCallback( char /*percent*/, void */*userData*/ ) { qApp->processEvents(); @@ -51,8 +48,9 @@ SearchBar::SearchBar( QMainWindow *parent ) connect(m_searchText, SIGNAL(textChanged(const QString &)), this, SLOT(slotTextChanged(const QString &)) ); - m_actionFind = new QAction( tr( "Find" ), OResource::loadPixmap( "find", OResource::SmallIcon ), QString::null, - 0, this, 0 ); + m_actionFind = new QAction( tr( "Find" ), + Opie::Core::OResource::loadPixmap( "find", Opie::Core::OResource::SmallIcon ), + QString::null, 0, this, 0 ); m_actionFind->setEnabled( false ); m_actionFind->addTo( this ); m_actionFind->setWhatsThis( tr( "Tap here search the current module for the text entered to the left." ) ); @@ -60,8 +58,9 @@ SearchBar::SearchBar( QMainWindow *parent ) addSeparator(); - m_actionPrev = new QAction( tr( "Previous result" ), OResource::loadPixmap( "back", OResource::SmallIcon ), - QString::null, 0, this, 0 ); + m_actionPrev = new QAction( tr( "Previous result" ), + Opie::Core::OResource::loadPixmap( "back", Opie::Core::OResource::SmallIcon ), + QString::null, 0, this, 0 ); m_actionPrev->setEnabled( false ); m_actionPrev->addTo( this ); m_actionPrev->setWhatsThis( tr( "Tap here to view the previous search result." ) ); @@ -72,8 +71,9 @@ SearchBar::SearchBar( QMainWindow *parent ) QWhatsThis::add( m_resultList, tr( "Select the desired search result here." ) ); connect( m_resultList, SIGNAL(activated(const QString &)), this, SIGNAL(sigResultClicked(const QString &)) ); - m_actionNext = new QAction( tr( "Next result" ), OResource::loadPixmap( "forward", OResource::SmallIcon ), - QString::null, 0, this, 0 ); + m_actionNext = new QAction( tr( "Next result" ), + Opie::Core::OResource::loadPixmap( "forward", Opie::Core::OResource::SmallIcon ), + QString::null, 0, this, 0 ); m_actionNext->setEnabled( false ); m_actionNext->addTo( this ); m_actionNext->setWhatsThis( tr( "Tap here to view the next search result." ) ); -- cgit v0.9.0.2