Diffstat (limited to 'noncore/tools/opie-sh/mbox.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/tools/opie-sh/mbox.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/noncore/tools/opie-sh/mbox.cpp b/noncore/tools/opie-sh/mbox.cpp index 04b397d..45145d9 100644 --- a/noncore/tools/opie-sh/mbox.cpp +++ b/noncore/tools/opie-sh/mbox.cpp | |||
@@ -11,16 +11,18 @@ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |||
11 | Public License for more details. | 11 | Public License for more details. |
12 | 12 | ||
13 | You should have received a copy of the GNU General Public License along with this program; if not, write to the Free | 13 | You should have received a copy of the GNU General Public License along with this program; if not, write to the Free |
14 | Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 14 | Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
15 | */ | 15 | */ |
16 | 16 | ||
17 | #include "mbox.h" | 17 | #include "mbox.h" |
18 | 18 | ||
19 | #include <opie2/oresource.h> | ||
20 | |||
19 | MBox::MBox(int w, int h, int type, QString title, QString message, QString *btext0, QString *btext1, QString *btext2, QWidget *parent, const char*name, bool modal, WFlags f):QDialog(parent, name, modal, f) | 21 | MBox::MBox(int w, int h, int type, QString title, QString message, QString *btext0, QString *btext1, QString *btext2, QWidget *parent, const char*name, bool modal, WFlags f):QDialog(parent, name, modal, f) |
20 | { | 22 | { |
21 | QVBoxLayout *layout = new QVBoxLayout(this); | 23 | QVBoxLayout *layout = new QVBoxLayout(this); |
22 | 24 | ||
23 | QHBoxLayout *hlayout1 = new QHBoxLayout(this); | 25 | QHBoxLayout *hlayout1 = new QHBoxLayout(this); |
24 | QHBoxLayout *hlayout2 = new QHBoxLayout(this); | 26 | QHBoxLayout *hlayout2 = new QHBoxLayout(this); |
25 | 27 | ||
26 | int x, y; | 28 | int x, y; |
@@ -31,23 +33,23 @@ MBox::MBox(int w, int h, int type, QString title, QString message, QString *btex | |||
31 | setCaption(title); | 33 | setCaption(title); |
32 | 34 | ||
33 | QLabel *image = new QLabel(this, "image"); | 35 | QLabel *image = new QLabel(this, "image"); |
34 | QLabel *text = new QLabel(message, this, "text"); | 36 | QLabel *text = new QLabel(message, this, "text"); |
35 | 37 | ||
36 | switch (type) | 38 | switch (type) |
37 | { | 39 | { |
38 | case 0: | 40 | case 0: |
39 | image->setPixmap(Resource::loadPixmap("opie-sh/info")); | 41 | image->setPixmap(Opie::Core::OResource::loadPixmap("opie-sh/info", Opie::Core::OResource::SmallIcon)); |
40 | break; | 42 | break; |
41 | case 1: | 43 | case 1: |
42 | image->setPixmap(Resource::loadPixmap("opie-sh/warning")); | 44 | image->setPixmap(Opie::Core::OResource::loadPixmap("opie-sh/warning", Opie::Core::OResource::SmallIcon)); |
43 | break; | 45 | break; |
44 | case 2: | 46 | case 2: |
45 | image->setPixmap(Resource::loadPixmap("opie-sh/error")); | 47 | image->setPixmap(Opie::Core::OResource::loadPixmap("opie-sh/error", Opie::Core::OResource::SmallIcon)); |
46 | break; | 48 | break; |
47 | } | 49 | } |
48 | 50 | ||
49 | hlayout1->addWidget(image); | 51 | hlayout1->addWidget(image); |
50 | hlayout1->addSpacing(5); | 52 | hlayout1->addSpacing(5); |
51 | hlayout1->addWidget(text); | 53 | hlayout1->addWidget(text); |
52 | 54 | ||
53 | if(!btext0->isNull()) | 55 | if(!btext0->isNull()) |