summaryrefslogtreecommitdiff
authordrw <drw>2005-05-04 23:28:55 (UTC)
committer drw <drw>2005-05-04 23:28:55 (UTC)
commit279fc4fd1986074acbadd3a8e86fcf3968a8dd5c (patch) (side-by-side diff)
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
@@ -1,57 +1,58 @@
/***************************************************************************
application: : ODict
begin : December 2002
copyright : ( C ) 2002, 2003 by Carsten Niehaus
email : cniehaus@handhelds.org
**************************************************************************/
/***************************************************************************
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* ( at your option ) any later version. *
* *
**************************************************************************/
#include "odict.h"
#include "configdlg.h"
#include "dingwidget.h"
+#include <opie2/oresource.h>
+
+#include <qpe/config.h>
+
#include <qmenubar.h>
#include <qmessagebox.h>
#include <qvbox.h>
#include <qlabel.h>
#include <qpushbutton.h>
#include <qlineedit.h>
#include <qaction.h>
#include <qtextbrowser.h>
#include <qcombobox.h>
-#include <qpe/resource.h>
-#include <qpe/config.h>
-
ODict::ODict(QWidget* parent, const char* name, WFlags fl ) : QMainWindow(parent, name, fl )
{
activated_name = QString::null;
vbox = new QVBox( this );
setCaption( tr( "Opie-Dictionary" ) );
setupMenus();
QHBox *hbox = new QHBox( vbox );
QLabel* query_label = new QLabel( tr( "Query:" ) , hbox );
query_label->show();
query_le = new QLineEdit( hbox );
query_co = new QComboBox( hbox );
connect( query_co , SIGNAL( activated(const QString&) ), this, SLOT( slotMethodChanged(const QString&) ) );
ok_button = new QPushButton( tr( "&Ok" ), hbox );
connect( ok_button, SIGNAL( released() ), this, SLOT( slotStartQuery() ) );
top_name = new QLabel( vbox );
top_name->setAlignment( AlignHCenter );
browser_top = new QTextBrowser( vbox );
bottom_name = new QLabel( vbox );
bottom_name->setAlignment( AlignHCenter );
browser_bottom = new QTextBrowser( vbox );
@@ -181,37 +182,40 @@ void ODict::slotSetParameter( int count )
}
saveConfig();
}
void ODict::slotMethodChanged( const QString& methodnumber )
{
activated_name = methodnumber;
if ( activated_name != ding->loadedDict() )
{
ding->loadDict(activated_name);
lookupLanguageNames( activated_name );
top_name->setText( top_name_content );
bottom_name->setText( bottom_name_content );
}
}
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 );
}