-rw-r--r-- | noncore/multimedia/opierec/helpwindow.cpp | 8 | ||||
-rw-r--r-- | noncore/multimedia/opierec/qtrec.cpp | 6 |
2 files changed, 8 insertions, 6 deletions
diff --git a/noncore/multimedia/opierec/helpwindow.cpp b/noncore/multimedia/opierec/helpwindow.cpp index 7f984c3..b0a8ac3 100644 --- a/noncore/multimedia/opierec/helpwindow.cpp +++ b/noncore/multimedia/opierec/helpwindow.cpp | |||
@@ -3,25 +3,25 @@ | |||
3 | ** | 3 | ** |
4 | ** Copyright (C) 1992-2000 Trolltech AS. All rights reserved. | 4 | ** Copyright (C) 1992-2000 Trolltech AS. All rights reserved. |
5 | ** | 5 | ** |
6 | ** This file is part of an example program for Qt. This example | 6 | ** This file is part of an example program for Qt. This example |
7 | ** program may be used, distributed and modified without limitation. | 7 | ** program may be used, distributed and modified without limitation. |
8 | ** | 8 | ** |
9 | *****************************************************************************/ | 9 | *****************************************************************************/ |
10 | 10 | ||
11 | #include "helpwindow.h" | 11 | #include "helpwindow.h" |
12 | 12 | ||
13 | /* OPIE */ | 13 | /* OPIE */ |
14 | #include <opie2/odebug.h> | 14 | #include <opie2/odebug.h> |
15 | #include <qpe/resource.h> | 15 | #include <opie2/oresource.h> |
16 | using namespace Opie::Core; | 16 | using namespace Opie::Core; |
17 | 17 | ||
18 | /* QT */ | 18 | /* QT */ |
19 | #include <qlayout.h> | 19 | #include <qlayout.h> |
20 | #include <qtoolbar.h> | 20 | #include <qtoolbar.h> |
21 | #include <qaction.h> | 21 | #include <qaction.h> |
22 | #include <qmenubar.h> | 22 | #include <qmenubar.h> |
23 | 23 | ||
24 | /* STD */ | 24 | /* STD */ |
25 | #include <ctype.h> | 25 | #include <ctype.h> |
26 | 26 | ||
27 | HelpWindow::HelpWindow( const QString& home_, const QString& _path, QWidget* parent, const char *name ) | 27 | HelpWindow::HelpWindow( const QString& home_, const QString& _path, QWidget* parent, const char *name ) |
@@ -34,29 +34,31 @@ HelpWindow::HelpWindow( const QString& home_, const QString& _path, QWidget* par | |||
34 | browser = new QTextBrowser( this ); | 34 | browser = new QTextBrowser( this ); |
35 | QStringList Strlist; | 35 | QStringList Strlist; |
36 | Strlist.append( home_); | 36 | Strlist.append( home_); |
37 | browser->mimeSourceFactory()->setFilePath( Strlist ); | 37 | browser->mimeSourceFactory()->setFilePath( Strlist ); |
38 | browser->setFrameStyle( QFrame::Panel | QFrame::Sunken ); | 38 | browser->setFrameStyle( QFrame::Panel | QFrame::Sunken ); |
39 | 39 | ||
40 | connect( browser, SIGNAL( textChanged() ), this, SLOT( textChanged() ) ); | 40 | connect( browser, SIGNAL( textChanged() ), this, SLOT( textChanged() ) ); |
41 | 41 | ||
42 | if ( !home_.isEmpty() ) | 42 | if ( !home_.isEmpty() ) |
43 | browser->setSource( home_ ); | 43 | browser->setSource( home_ ); |
44 | QToolBar *toolbar = new QToolBar( this ); | 44 | QToolBar *toolbar = new QToolBar( this ); |
45 | 45 | ||
46 | QAction *a = new QAction( tr( "Backward" ), Resource::loadPixmap( "back" ), QString::null, 0, this, 0 ); | 46 | QAction *a = new QAction( tr( "Backward" ), Opie::Core::OResource::loadPixmap( "back", Opie::Core::OResource::SmallIcon ), |
47 | QString::null, 0, this, 0 ); | ||
47 | connect( a, SIGNAL( activated() ), browser, SLOT( backward() ) ); | 48 | connect( a, SIGNAL( activated() ), browser, SLOT( backward() ) ); |
48 | a->addTo( toolbar ); | 49 | a->addTo( toolbar ); |
49 | 50 | ||
50 | a = new QAction( tr( "Forward" ), Resource::loadPixmap( "forward" ), QString::null, 0, this, 0 ); | 51 | a = new QAction( tr( "Forward" ), Opie::Core::OResource::loadPixmap( "forward", Opie::Core::OResource::SmallIcon ), |
52 | QString::null, 0, this, 0 ); | ||
51 | connect( a, SIGNAL( activated() ), browser, SLOT( forward() ) ); | 53 | connect( a, SIGNAL( activated() ), browser, SLOT( forward() ) ); |
52 | a->addTo( toolbar ); | 54 | a->addTo( toolbar ); |
53 | 55 | ||
54 | 56 | ||
55 | layout->addMultiCellWidget( toolbar, 0, 0, 0, 0); | 57 | layout->addMultiCellWidget( toolbar, 0, 0, 0, 0); |
56 | 58 | ||
57 | layout->addMultiCellWidget( browser, 1, 2, 0, 2); | 59 | layout->addMultiCellWidget( browser, 1, 2, 0, 2); |
58 | 60 | ||
59 | browser->setFocus(); | 61 | browser->setFocus(); |
60 | } | 62 | } |
61 | 63 | ||
62 | 64 | ||
diff --git a/noncore/multimedia/opierec/qtrec.cpp b/noncore/multimedia/opierec/qtrec.cpp index 9d3d5cf..75413be 100644 --- a/noncore/multimedia/opierec/qtrec.cpp +++ b/noncore/multimedia/opierec/qtrec.cpp | |||
@@ -5,28 +5,28 @@ | |||
5 | ****************************************************************************/ | 5 | ****************************************************************************/ |
6 | //#define DEV_VERSION | 6 | //#define DEV_VERSION |
7 | 7 | ||
8 | #include "pixmaps.h" | 8 | #include "pixmaps.h" |
9 | #include "qtrec.h" | 9 | #include "qtrec.h" |
10 | #include "waveform.h" | 10 | #include "waveform.h" |
11 | extern "C" { | 11 | extern "C" { |
12 | #include "adpcm.h" | 12 | #include "adpcm.h" |
13 | } | 13 | } |
14 | 14 | ||
15 | /* OPIE */ | 15 | /* OPIE */ |
16 | #include <opie2/odebug.h> | 16 | #include <opie2/odebug.h> |
17 | #include <opie2/oresource.h> | ||
17 | #include <qpe/config.h> | 18 | #include <qpe/config.h> |
18 | #include <qpe/qcopenvelope_qws.h> | 19 | #include <qpe/qcopenvelope_qws.h> |
19 | #include <qpe/qpeapplication.h> | 20 | #include <qpe/qpeapplication.h> |
20 | #include <qpe/resource.h> | ||
21 | #include <qpe/storage.h> | 21 | #include <qpe/storage.h> |
22 | using namespace Opie::Core; | 22 | using namespace Opie::Core; |
23 | 23 | ||
24 | /* QT */ | 24 | /* QT */ |
25 | #include <qcheckbox.h> | 25 | #include <qcheckbox.h> |
26 | #include <qcombobox.h> | 26 | #include <qcombobox.h> |
27 | #include <qdir.h> | 27 | #include <qdir.h> |
28 | #include <qgroupbox.h> | 28 | #include <qgroupbox.h> |
29 | #include <qlabel.h> | 29 | #include <qlabel.h> |
30 | #include <qlayout.h> | 30 | #include <qlayout.h> |
31 | #include <qlistview.h> | 31 | #include <qlistview.h> |
32 | #include <qmessagebox.h> | 32 | #include <qmessagebox.h> |
@@ -497,30 +497,30 @@ void QtRec::init() { | |||
497 | // playLabel2->setText(tr("Play") ); | 497 | // playLabel2->setText(tr("Play") ); |
498 | // playLabel2->setFixedHeight( 18); | 498 | // playLabel2->setFixedHeight( 18); |
499 | // layout1->addMultiCellWidget( playLabel2, 0, 0, 4, 4); | 499 | // layout1->addMultiCellWidget( playLabel2, 0, 0, 4, 4); |
500 | 500 | ||
501 | Stop_PushButton = new QPushButton( tab, "Stop_PushButton" ); | 501 | Stop_PushButton = new QPushButton( tab, "Stop_PushButton" ); |
502 | layout1->addMultiCellWidget( Stop_PushButton, 1, 1, 4, 4); | 502 | layout1->addMultiCellWidget( Stop_PushButton, 1, 1, 4, 4); |
503 | Stop_PushButton->setFixedSize( 22, 22); | 503 | Stop_PushButton->setFixedSize( 22, 22); |
504 | Stop_PushButton->setPixmap( image4 ); | 504 | Stop_PushButton->setPixmap( image4 ); |
505 | 505 | ||
506 | toBeginningButton = new QPushButton( tab, "Beginning_PushButton" ); | 506 | toBeginningButton = new QPushButton( tab, "Beginning_PushButton" ); |
507 | layout1->addMultiCellWidget(toBeginningButton, 1, 1, 5, 5); | 507 | layout1->addMultiCellWidget(toBeginningButton, 1, 1, 5, 5); |
508 | toBeginningButton->setFixedSize( 22, 22); | 508 | toBeginningButton->setFixedSize( 22, 22); |
509 | toBeginningButton->setPixmap( Resource::loadPixmap("fastback") ); | 509 | toBeginningButton->setPixmap( Opie::Core::OResource::loadPixmap("fastback", Opie::Core::OResource::SmallIcon) ); |
510 | 510 | ||
511 | toEndButton = new QPushButton( tab, "End_PushButton" ); | 511 | toEndButton = new QPushButton( tab, "End_PushButton" ); |
512 | layout1->addMultiCellWidget( toEndButton, 1, 1, 6, 6); | 512 | layout1->addMultiCellWidget( toEndButton, 1, 1, 6, 6); |
513 | toEndButton->setFixedSize( 22, 22); | 513 | toEndButton->setFixedSize( 22, 22); |
514 | toEndButton->setPixmap( Resource::loadPixmap( "fastforward" ) ); | 514 | toEndButton->setPixmap( Opie::Core::OResource::loadPixmap( "fastforward", Opie::Core::OResource::SmallIcon ) ); |
515 | 515 | ||
516 | // QLabel *recLabel2; | 516 | // QLabel *recLabel2; |
517 | // recLabel2 = new QLabel( tab, "recLabel2" ); | 517 | // recLabel2 = new QLabel( tab, "recLabel2" ); |
518 | // recLabel2->setText(tr("Rec")); | 518 | // recLabel2->setText(tr("Rec")); |
519 | // recLabel2->setFixedHeight( 18); | 519 | // recLabel2->setFixedHeight( 18); |
520 | // layout1->addMultiCellWidget( recLabel2, 0, 0, 7, 7); | 520 | // layout1->addMultiCellWidget( recLabel2, 0, 0, 7, 7); |
521 | 521 | ||
522 | Rec_PushButton = new QPushButton( tab, "Rec_PushButton" ); | 522 | Rec_PushButton = new QPushButton( tab, "Rec_PushButton" ); |
523 | layout1->addMultiCellWidget( Rec_PushButton, 1, 1, 7, 7); | 523 | layout1->addMultiCellWidget( Rec_PushButton, 1, 1, 7, 7); |
524 | Rec_PushButton->setFixedSize( 22, 22); | 524 | Rec_PushButton->setFixedSize( 22, 22); |
525 | Rec_PushButton->setPixmap( image6 ); | 525 | Rec_PushButton->setPixmap( image6 ); |
526 | 526 | ||