summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--libopie2/opiepim/ui/opimmainwindow.cpp22
1 files changed, 14 insertions, 8 deletions
diff --git a/libopie2/opiepim/ui/opimmainwindow.cpp b/libopie2/opiepim/ui/opimmainwindow.cpp
index a6d574b..efb45ca 100644
--- a/libopie2/opiepim/ui/opimmainwindow.cpp
+++ b/libopie2/opiepim/ui/opimmainwindow.cpp
@@ -9,56 +9,56 @@
:`=1 )Y*s>-.-- : the terms of the GNU Library General Public
.="- .-=="i, .._ License as published by the Free Software
- . .-<_> .<> Foundation; either version 2 of the License,
._= =} : or (at your option) any later version.
.%`+i> _;_.
.i_,=:_. -<s. This program is distributed in the hope that
+ . -:. = it will be useful, but WITHOUT ANY WARRANTY;
: .. .:, . . . without even the implied warranty of
=_ + =;=|` MERCHANTABILITY or FITNESS FOR A
_.=:. : :=>`: PARTICULAR PURPOSE. See the GNU
..}^=.= = ; Library General Public License for more
++= -. .` .: details.
: = ...= . :.=-
-. .:....=;==+<; You should have received a copy of the GNU
-_. . . )=. = Library General Public License along with
-- :-=` this library; see the file COPYING.LIB.
If not, write to the Free Software Foundation,
Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.
*/
#include "opimmainwindow.h"
/* OPIE */
-#include <opie2/opimresolver.h>
#include <opie2/odebug.h>
+#include <opie2/opimresolver.h>
+#include <opie2/oresource.h>
#include <qpe/categoryselect.h>
#include <qpe/ir.h>
#include <qpe/qcopenvelope_qws.h>
#include <qpe/qpeapplication.h>
-#include <qpe/resource.h>
#include <qpe/sound.h>
/* QT */
#include <qaction.h>
#include <qapplication.h>
#include <qcombobox.h>
#include <qcopchannel_qws.h>
#include <qdatetime.h>
#include <qmenubar.h>
#include <qobjectlist.h>
#include <qpopupmenu.h>
#include <qtoolbar.h>
#include <qwhatsthis.h>
namespace Opie {
OPimMainWindow::OPimMainWindow( const QString &serviceName, const QString &catName,
const QString &itemName, const QString &configName,
QWidget *parent, const char* name, WFlags f )
: QMainWindow( parent, name, f ), m_rtti(-1), m_service( serviceName ), m_fallBack( 0l ),
m_catGroupName( catName ), m_config( configName ), m_itemContextMenu( 0l )
{
/*
* let's generate our QCopChannel
@@ -306,86 +306,92 @@ void OPimMainWindow::initBars( const QString &itemName ) {
setToolBarsMovable( false );
// Create application menu bar
QToolBar *mbHold = new QToolBar( this );
mbHold->setHorizontalStretchable( true );
QMenuBar *menubar = new QMenuBar( mbHold );
menubar->setMargin( 0 );
// Create application menu bar
QToolBar *toolbar = new QToolBar( this );
// Create sub-menus
m_itemMenu = new QPopupMenu( this );
m_itemMenu->setCheckable( true );
menubar->insertItem( itemName, m_itemMenu );
m_viewMenu = new QPopupMenu( this );
m_viewMenu->setCheckable( true );
menubar->insertItem( tr( "View" ), m_viewMenu );
m_viewMenuAppGroup = 0l;
// Item menu
m_itemMenuGroup1 = new QActionGroup( this, QString::null, false );
- m_itemNewAction = new QAction( tr( "New" ), Resource::loadPixmap( "new" ),
+ m_itemNewAction = new QAction( tr( "New" ),
+ Opie::Core::OResource::loadPixmap( "new", Opie::Core::OResource::SmallIcon ),
QString::null, 0, m_itemMenuGroup1, 0 );
connect( m_itemNewAction, SIGNAL(activated()), this, SLOT(slotItemNew()) );
m_itemNewAction->setWhatsThis( tr( "Click here to create a new item." ) );
m_itemNewAction->addTo( toolbar );
- m_itemEditAction = new QAction( tr( "Edit" ), Resource::loadPixmap( "edit" ),
+ m_itemEditAction = new QAction( tr( "Edit" ),
+ Opie::Core::OResource::loadPixmap( "edit", Opie::Core::OResource::SmallIcon ),
QString::null, 0, m_itemMenuGroup1, 0 );
connect( m_itemEditAction, SIGNAL(activated()), this, SLOT(slotItemEdit()) );
m_itemEditAction->setWhatsThis( tr( "Click here to edit the selected item." ) );
m_itemEditAction->addTo( toolbar );
- m_itemDuplicateAction = new QAction( tr( "Duplicate" ), Resource::loadPixmap( "copy" ),
+ m_itemDuplicateAction = new QAction( tr( "Duplicate" ),
+ Opie::Core::OResource::loadPixmap( "copy", Opie::Core::OResource::SmallIcon ),
QString::null, 0, m_itemMenuGroup1, 0 );
connect( m_itemDuplicateAction, SIGNAL(activated()), this, SLOT(slotItemDuplicate()) );
m_itemDuplicateAction->setWhatsThis( tr( "Click here to duplicate the selected item." ) );
if ( Ir::supported() ) {
- m_itemBeamAction = new QAction( tr( "Beam" ), Resource::loadPixmap( "beam" ),
+ m_itemBeamAction = new QAction( tr( "Beam" ),
+ Opie::Core::OResource::loadPixmap( "beam", Opie::Core::OResource::SmallIcon ),
QString::null, 0, m_itemMenuGroup1, 0 );
connect( m_itemBeamAction, SIGNAL(activated()), this, SLOT(slotItemBeam()) );
m_itemBeamAction->setWhatsThis( tr( "Click here to transmit the selected item." ) );
m_itemBeamAction->addTo( toolbar );
}
- m_itemDeleteAction = new QAction( tr( "Delete" ), Resource::loadPixmap( "trash" ),
+ m_itemDeleteAction = new QAction( tr( "Delete" ),
+ Opie::Core::OResource::loadPixmap( "trash", Opie::Core::OResource::SmallIcon ),
QString::null, 0, m_itemMenuGroup1, 0 );
connect( m_itemDeleteAction, SIGNAL(activated()), this, SLOT(slotItemDelete()) );
m_itemDeleteAction->setWhatsThis( tr( "Click here to delete the selected item." ) );
m_itemDeleteAction->addTo( toolbar );
m_itemMenuGroup1->addTo( m_itemMenu );
m_itemMenu->insertSeparator();
m_itemMenuGroup2 = new QActionGroup( this, QString::null, false );
- m_configureAction = new QAction( tr( "Configure" ), Resource::loadPixmap( "SettingsIcon" ),
+ m_configureAction = new QAction( tr( "Configure" ),
+ Opie::Core::OResource::loadPixmap( "SettingsIcon", Opie::Core::OResource::SmallIcon ),
QString::null, 0, m_itemMenuGroup2, 0 );
connect( m_configureAction, SIGNAL(activated()), this, SLOT(slotConfigure()) );
m_configureAction->setWhatsThis( tr( "Click here to set your preferences for this application." ) );
m_itemMenuGroup2->addTo( m_itemMenu );
// View menu
// m_viewMenuGroup = new QActionGroup( this, QString::null, false );
// QAction *a = new QAction( tr( "Filter" ), QString::null, 0, m_viewMenuGroup, 0 );
// connect( a, SIGNAL(activated()), this, SLOT(slotViewFilter()) );
// a->setWhatsThis( tr( "Click here to filter the items displayed." ) );
//
// a = new QAction( tr( "Filter Settings" ), QString::null, 0, m_viewMenuGroup, 0 );
// connect( a, SIGNAL(activated()), this, SLOT(slotViewFilterSettings()) );
// a->setWhatsThis( tr( "Click here to modify the current filter settings." ) );
// Create view toolbar
toolbar = new QToolBar( this );
m_catSelect = new QComboBox( toolbar );
connect( m_catSelect, SIGNAL(activated(const QString&)), this, SIGNAL(categorySelected(const QString&)) );
QWhatsThis::add( m_catSelect, tr( "Click here to filter items by category." ) );
// Do initial load of categories