author | drw <drw> | 2005-05-04 22:20:27 (UTC) |
---|---|---|
committer | drw <drw> | 2005-05-04 22:20:27 (UTC) |
commit | 5db2256e7e342f290e17096cf70b8b318bfcd987 (patch) (unidiff) | |
tree | 771eae383e635aa9117944984b1ec6a4d96973be /core | |
parent | 4d719fdcf636f855cb2def7c715a13420ce8a1b6 (diff) | |
download | opie-5db2256e7e342f290e17096cf70b8b318bfcd987.zip opie-5db2256e7e342f290e17096cf70b8b318bfcd987.tar.gz opie-5db2256e7e342f290e17096cf70b8b318bfcd987.tar.bz2 |
Resource -> OResource
-rw-r--r-- | core/settings/launcher/tabdialog.cpp | 61 | ||||
-rw-r--r-- | core/settings/launcher/tabssettings.cpp | 50 |
2 files changed, 56 insertions, 55 deletions
diff --git a/core/settings/launcher/tabdialog.cpp b/core/settings/launcher/tabdialog.cpp index 555e64e..c6bdf8f 100644 --- a/core/settings/launcher/tabdialog.cpp +++ b/core/settings/launcher/tabdialog.cpp | |||
@@ -1,26 +1,26 @@ | |||
1 | /* | 1 | /* |
2 | =. This file is part of the OPIE Project | 2 | =. This file is part of the OPIE Project |
3 | .=l. Copyright (c) 2002 Robert Griebl <sandman@handhelds.org> | 3 | .=l. Copyright (c) 2002 Robert Griebl <sandman@handhelds.org> |
4 | .>+-= | 4 | .>+-= |
5 | _;:, .> :=|. This file is free software; you can | 5 | _;:, .> :=|. This file is free software; you can |
6 | .> <`_, > . <= redistribute it and/or modify it under | 6 | .> <`_, > . <= redistribute it and/or modify it under |
7 | :`=1 )Y*s>-.-- : the terms of the GNU General Public | 7 | :`=1 )Y*s>-.-- : the terms of the GNU General Public |
8 | .="- .-=="i, .._ License as published by the Free Software | 8 | .="- .-=="i, .._ License as published by the Free Software |
9 | - . .-<_> .<> Foundation; either version 2 of the License, | 9 | - . .-<_> .<> Foundation; either version 2 of the License, |
10 | ._= =} : or (at your option) any later version. | 10 | ._= =} : or (at your option) any later version. |
11 | .%`+i> _;_. | 11 | .%`+i> _;_. |
12 | .i_,=:_. -<s. This file is distributed in the hope that | 12 | .i_,=:_. -<s. This file is distributed in the hope that |
13 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 13 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; |
14 | : .. .:, . . . without even the implied warranty of | 14 | : .. .:, . . . without even the implied warranty of |
15 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | 15 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A |
16 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU General | 16 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU General |
17 | ..}^=.= = ; Public License for more details. | 17 | ..}^=.= = ; Public License for more details. |
18 | ++= -. .` .: | 18 | ++= -. .` .: |
19 | : = ...= . :.=- You should have received a copy of the GNU | 19 | : = ...= . :.=- You should have received a copy of the GNU |
20 | -. .:....=;==+<; General Public License along with this file; | 20 | -. .:....=;==+<; General Public License along with this file; |
21 | -_. . . )=. = see the file COPYING. If not, write to the | 21 | -_. . . )=. = see the file COPYING. If not, write to the |
22 | -- :-=` Free Software Foundation, Inc., | 22 | -- :-=` Free Software Foundation, Inc., |
23 | 59 Temple Place - Suite 330, | 23 | 59 Temple Place - Suite 330, |
24 | Boston, MA 02111-1307, USA. | 24 | Boston, MA 02111-1307, USA. |
25 | 25 | ||
26 | */ | 26 | */ |
@@ -28,16 +28,16 @@ | |||
28 | #include "tabdialog.h" | 28 | #include "tabdialog.h" |
29 | 29 | ||
30 | /* OPIE */ | 30 | /* OPIE */ |
31 | 31 | ||
32 | #include <opie2/ofontselector.h> | ||
33 | #include <opie2/otabwidget.h> | ||
34 | #include <opie2/ocolorbutton.h> | 32 | #include <opie2/ocolorbutton.h> |
35 | #include <opie2/ofiledialog.h> | ||
36 | #include <opie2/odebug.h> | 33 | #include <opie2/odebug.h> |
34 | #include <opie2/ofiledialog.h> | ||
35 | #include <opie2/ofontselector.h> | ||
36 | #include <opie2/oresource.h> | ||
37 | #include <opie2/otabwidget.h> | ||
37 | 38 | ||
38 | /* QPE */ | 39 | /* QPE */ |
39 | #include <qpe/resource.h> | ||
40 | #include <qpe/qpeapplication.h> | 40 | #include <qpe/qpeapplication.h> |
41 | 41 | ||
42 | /* QT */ | 42 | /* QT */ |
43 | #include <qlayout.h> | 43 | #include <qlayout.h> |
@@ -98,11 +98,14 @@ public: | |||
98 | setViewMode ( TabConfig::Icon ); | 98 | setViewMode ( TabConfig::Icon ); |
99 | calculateGrid ( Bottom ); | 99 | calculateGrid ( Bottom ); |
100 | 100 | ||
101 | 101 | ||
102 | new SampleItem ( this, QObject::tr( "Sample 1" ), Resource::loadPixmap ( "datebook/DateBook" )); | 102 | new SampleItem ( this, QObject::tr( "Sample 1" ), |
103 | new SampleItem ( this, QObject::tr( "Sample 2" ), Resource::loadPixmap ( "Calibrate" )); | 103 | Opie::Core::OResource::loadPixmap ( "datebook/DateBook", Opie::Core::OResource::BigIcon )); |
104 | new SampleItem ( this, QObject::tr( "Sample 3" ), Resource::loadPixmap ( "UnknownDocument" )); | 104 | new SampleItem ( this, QObject::tr( "Sample 2" ), |
105 | Opie::Core::OResource::loadPixmap ( "Calibrate", Opie::Core::OResource::BigIcon )); | ||
106 | new SampleItem ( this, QObject::tr( "Sample 3" ), | ||
107 | Opie::Core::OResource::loadPixmap ( "UnknownDocument", Opie::Core::OResource::BigIcon )); | ||
105 | 108 | ||
106 | setBackgroundType ( TabConfig::Ruled, QString::null ); | 109 | setBackgroundType ( TabConfig::Ruled, QString::null ); |
107 | 110 | ||
108 | setMaximumHeight ( firstItem ( )-> height ( ) + 16 ); | 111 | setMaximumHeight ( firstItem ( )-> height ( ) + 16 ); |
@@ -158,9 +161,9 @@ public: | |||
158 | } | 161 | } |
159 | 162 | ||
160 | case TabConfig::Image: { | 163 | case TabConfig::Image: { |
161 | odebug << "Loading image: " << val << "" << oendl; | 164 | odebug << "Loading image: " << val << "" << oendl; |
162 | QPixmap bg = Resource::loadPixmap ( val ); | 165 | QPixmap bg = Opie::Core::OResource::loadPixmap ( val ); |
163 | if ( bg. isNull () ) | 166 | if ( bg. isNull () ) |
164 | bg = QPixmap( val ); | 167 | bg = QPixmap( val ); |
165 | setBackgroundPixmap ( bg ); | 168 | setBackgroundPixmap ( bg ); |
166 | break; | 169 | break; |
diff --git a/core/settings/launcher/tabssettings.cpp b/core/settings/launcher/tabssettings.cpp index fca6b20..e7660ef 100644 --- a/core/settings/launcher/tabssettings.cpp +++ b/core/settings/launcher/tabssettings.cpp | |||
@@ -1,34 +1,35 @@ | |||
1 | /* | 1 | /* |
2 | =. This file is part of the OPIE Project | 2 | =. This file is part of the OPIE Project |
3 | .=l. Copyright (c) 2002 Robert Griebl <sandman@handhelds.org> | 3 | .=l. Copyright (c) 2002 Robert Griebl <sandman@handhelds.org> |
4 | .>+-= | 4 | .>+-= |
5 | _;:, .> :=|. This file is free software; you can | 5 | _;:, .> :=|. This file is free software; you can |
6 | .> <`_, > . <= redistribute it and/or modify it under | 6 | .> <`_, > . <= redistribute it and/or modify it under |
7 | :`=1 )Y*s>-.-- : the terms of the GNU General Public | 7 | :`=1 )Y*s>-.-- : the terms of the GNU General Public |
8 | .="- .-=="i, .._ License as published by the Free Software | 8 | .="- .-=="i, .._ License as published by the Free Software |
9 | - . .-<_> .<> Foundation; either version 2 of the License, | 9 | - . .-<_> .<> Foundation; either version 2 of the License, |
10 | ._= =} : or (at your option) any later version. | 10 | ._= =} : or (at your option) any later version. |
11 | .%`+i> _;_. | 11 | .%`+i> _;_. |
12 | .i_,=:_. -<s. This file is distributed in the hope that | 12 | .i_,=:_. -<s. This file is distributed in the hope that |
13 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 13 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; |
14 | : .. .:, . . . without even the implied warranty of | 14 | : .. .:, . . . without even the implied warranty of |
15 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | 15 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A |
16 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU General | 16 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU General |
17 | ..}^=.= = ; Public License for more details. | 17 | ..}^=.= = ; Public License for more details. |
18 | ++= -. .` .: | 18 | ++= -. .` .: |
19 | : = ...= . :.=- You should have received a copy of the GNU | 19 | : = ...= . :.=- You should have received a copy of the GNU |
20 | -. .:....=;==+<; General Public License along with this file; | 20 | -. .:....=;==+<; General Public License along with this file; |
21 | -_. . . )=. = see the file COPYING. If not, write to the | 21 | -_. . . )=. = see the file COPYING. If not, write to the |
22 | -- :-=` Free Software Foundation, Inc., | 22 | -- :-=` Free Software Foundation, Inc., |
23 | 59 Temple Place - Suite 330, | 23 | 59 Temple Place - Suite 330, |
24 | Boston, MA 02111-1307, USA. | 24 | Boston, MA 02111-1307, USA. |
25 | 25 | ||
26 | */ | 26 | */ |
27 | 27 | ||
28 | #include "tabssettings.h" | 28 | #include "tabssettings.h" |
29 | 29 | ||
30 | #include <qpe/resource.h> | 30 | #include <opie2/oresource.h> |
31 | |||
31 | #include <qpe/applnk.h> | 32 | #include <qpe/applnk.h> |
32 | #include <qpe/mimetype.h> | 33 | #include <qpe/mimetype.h> |
33 | #include <qpe/qcopenvelope_qws.h> | 34 | #include <qpe/qcopenvelope_qws.h> |
34 | #include <qpe/config.h> | 35 | #include <qpe/config.h> |
@@ -112,12 +113,9 @@ void TabsSettings::init ( ) | |||
112 | for ( QStringList::Iterator it = types. begin ( ); it != types. end ( ); ++it ) { | 113 | for ( QStringList::Iterator it = types. begin ( ); it != types. end ( ); ++it ) { |
113 | m_list-> insertItem ( rootFolder. typePixmap ( *it ), rootFolder. typeName ( *it )); | 114 | m_list-> insertItem ( rootFolder. typePixmap ( *it ), rootFolder. typeName ( *it )); |
114 | m_ids << *it; | 115 | m_ids << *it; |
115 | } | 116 | } |
116 | QImage img ( Resource::loadImage ( "DocsIcon" )); | 117 | m_list-> insertItem ( Opie::Core::OResource::loadPixmap( "DocsIcon", Opie::Core::OResource::SmallIcon ), tr( "Documents" ) ); |
117 | QPixmap pix; | ||
118 | pix = img. smoothScale ( AppLnk::smallIconSize ( ), AppLnk::smallIconSize ( )); | ||
119 | m_list-> insertItem ( pix, tr( "Documents" )); | ||
120 | m_ids += "Documents"; // No tr | 118 | m_ids += "Documents"; // No tr |
121 | 119 | ||
122 | Config cfg ( "Launcher" ); | 120 | Config cfg ( "Launcher" ); |
123 | 121 | ||