summaryrefslogtreecommitdiff
authordrw <drw>2005-05-04 23:28:55 (UTC)
committer drw <drw>2005-05-04 23:28:55 (UTC)
commit279fc4fd1986074acbadd3a8e86fcf3968a8dd5c (patch) (unidiff)
treec2b98b5c0c342f2fe81a6ffa5f62a534087d2836
parent11833e51efabe194db59640c2d0ccea0a33c11ce (diff)
downloadopie-279fc4fd1986074acbadd3a8e86fcf3968a8dd5c.zip
opie-279fc4fd1986074acbadd3a8e86fcf3968a8dd5c.tar.gz
opie-279fc4fd1986074acbadd3a8e86fcf3968a8dd5c.tar.bz2
Resource -> OResource
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/odict/odict.cpp18
1 files changed, 11 insertions, 7 deletions
diff --git a/noncore/apps/odict/odict.cpp b/noncore/apps/odict/odict.cpp
index 497de36..96ba3ae 100644
--- a/noncore/apps/odict/odict.cpp
+++ b/noncore/apps/odict/odict.cpp
@@ -17,8 +17,12 @@
17#include "odict.h" 17#include "odict.h"
18#include "configdlg.h" 18#include "configdlg.h"
19#include "dingwidget.h" 19#include "dingwidget.h"
20 20
21#include <opie2/oresource.h>
22
23#include <qpe/config.h>
24
21#include <qmenubar.h> 25#include <qmenubar.h>
22#include <qmessagebox.h> 26#include <qmessagebox.h>
23#include <qvbox.h> 27#include <qvbox.h>
24#include <qlabel.h> 28#include <qlabel.h>
@@ -27,11 +31,8 @@
27#include <qaction.h> 31#include <qaction.h>
28#include <qtextbrowser.h> 32#include <qtextbrowser.h>
29#include <qcombobox.h> 33#include <qcombobox.h>
30 34
31#include <qpe/resource.h>
32#include <qpe/config.h>
33
34ODict::ODict(QWidget* parent, const char* name, WFlags fl ) : QMainWindow(parent, name, fl ) 35ODict::ODict(QWidget* parent, const char* name, WFlags fl ) : QMainWindow(parent, name, fl )
35{ 36{
36 activated_name = QString::null; 37 activated_name = QString::null;
37 38
@@ -201,17 +202,20 @@ void ODict::setupMenus()
201{ 202{
202 menu = new QMenuBar( this ); 203 menu = new QMenuBar( this );
203 204
204 settings = new QPopupMenu( menu ); 205 settings = new QPopupMenu( menu );
205 setting_a = new QAction(tr( "Configuration" ), Resource::loadPixmap( "new" ), QString::null, 0, this, 0 ); 206 setting_a = new QAction( tr( "Configuration" ),
207 Opie::Core::OResource::loadPixmap( "SettingsIcon", Opie::Core::OResource::SmallIcon ),
208 QString::null, 0, this, 0 );
206 connect( setting_a, SIGNAL( activated() ), this, SLOT( slotSettings() ) ); 209 connect( setting_a, SIGNAL( activated() ), this, SLOT( slotSettings() ) );
207 setting_a->addTo( settings ); 210 setting_a->addTo( settings );
208 setting_b = new QAction(tr( "Searchmethods" ), Resource::loadPixmap( "edit" ), QString::null, 0, this, 0 ); 211 setting_b = new QAction( tr( "Search methods" ),
212 Opie::Core::OResource::loadPixmap( "edit", Opie::Core::OResource::SmallIcon ),
213 QString::null, 0, this, 0 );
209 214
210 parameter = new QPopupMenu( menu ); 215 parameter = new QPopupMenu( menu );
211 connect( parameter, SIGNAL( activated(int) ), this, SLOT( slotSetParameter(int) ) ); 216 connect( parameter, SIGNAL( activated(int) ), this, SLOT( slotSetParameter(int) ) );
212 parameter->insertItem( tr( "C&ase sensitive" ), 0 ,0 ); 217 parameter->insertItem( tr( "Case sensitive" ), 0 ,0 );
213 parameter->insertSeparator();
214 218
215 menu->insertItem( tr( "Settings" ) , settings ); 219 menu->insertItem( tr( "Settings" ) , settings );
216 menu->insertItem( tr( "Parameter" ) , parameter ); 220 menu->insertItem( tr( "Parameter" ) , parameter );
217} 221}