From 279fc4fd1986074acbadd3a8e86fcf3968a8dd5c Mon Sep 17 00:00:00 2001 From: drw Date: Wed, 04 May 2005 23:28:55 +0000 Subject: Resource -> OResource --- (limited to 'noncore/apps/odict') 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 @@ -18,6 +18,10 @@ #include "configdlg.h" #include "dingwidget.h" +#include + +#include + #include #include #include @@ -28,9 +32,6 @@ #include #include -#include -#include - ODict::ODict(QWidget* parent, const char* name, WFlags fl ) : QMainWindow(parent, name, fl ) { activated_name = QString::null; @@ -202,15 +203,18 @@ void ODict::setupMenus() menu = new QMenuBar( this ); settings = new QPopupMenu( menu ); - setting_a = new QAction(tr( "Configuration" ), Resource::loadPixmap( "new" ), QString::null, 0, this, 0 ); + setting_a = new QAction( tr( "Configuration" ), + Opie::Core::OResource::loadPixmap( "SettingsIcon", Opie::Core::OResource::SmallIcon ), + QString::null, 0, this, 0 ); connect( setting_a, SIGNAL( activated() ), this, SLOT( slotSettings() ) ); setting_a->addTo( settings ); - setting_b = new QAction(tr( "Searchmethods" ), Resource::loadPixmap( "edit" ), QString::null, 0, this, 0 ); + setting_b = new QAction( tr( "Search methods" ), + Opie::Core::OResource::loadPixmap( "edit", Opie::Core::OResource::SmallIcon ), + QString::null, 0, this, 0 ); parameter = new QPopupMenu( menu ); connect( parameter, SIGNAL( activated(int) ), this, SLOT( slotSetParameter(int) ) ); - parameter->insertItem( tr( "C&ase sensitive" ), 0 ,0 ); - parameter->insertSeparator(); + parameter->insertItem( tr( "Case sensitive" ), 0 ,0 ); menu->insertItem( tr( "Settings" ) , settings ); menu->insertItem( tr( "Parameter" ) , parameter ); -- cgit v0.9.0.2