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 | |
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,55 +1,55 @@ | |||
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 "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> |
44 | #include <qvbox.h> | 44 | #include <qvbox.h> |
45 | #include <qtabbar.h> | 45 | #include <qtabbar.h> |
46 | #include <qiconview.h> | 46 | #include <qiconview.h> |
47 | #include <qapplication.h> | 47 | #include <qapplication.h> |
48 | #include <qlabel.h> | 48 | #include <qlabel.h> |
49 | #include <qfileinfo.h> | 49 | #include <qfileinfo.h> |
50 | #include <qradiobutton.h> | 50 | #include <qradiobutton.h> |
51 | #include <qbuttongroup.h> | 51 | #include <qbuttongroup.h> |
52 | #include <qwhatsthis.h> | 52 | #include <qwhatsthis.h> |
53 | #include <qcheckbox.h> | 53 | #include <qcheckbox.h> |
54 | #include <qspinbox.h> | 54 | #include <qspinbox.h> |
55 | 55 | ||
@@ -86,35 +86,38 @@ private: | |||
86 | class SampleView : public QIconView { | 86 | class SampleView : public QIconView { |
87 | public: | 87 | public: |
88 | SampleView ( QWidget *parent = 0, const char *name = 0 ) : QIconView ( parent, name ) | 88 | SampleView ( QWidget *parent = 0, const char *name = 0 ) : QIconView ( parent, name ) |
89 | { | 89 | { |
90 | setItemsMovable ( false ); | 90 | setItemsMovable ( false ); |
91 | setAutoArrange ( true ); | 91 | setAutoArrange ( true ); |
92 | setSorting ( true ); | 92 | setSorting ( true ); |
93 | setFrameStyle ( QFrame::NoFrame ); | 93 | setFrameStyle ( QFrame::NoFrame ); |
94 | setSpacing ( 4 ); | 94 | setSpacing ( 4 ); |
95 | setMargin ( 0 ); | 95 | setMargin ( 0 ); |
96 | setSelectionMode ( QIconView::NoSelection ); | 96 | setSelectionMode ( QIconView::NoSelection ); |
97 | setBackgroundMode ( PaletteBase ); | 97 | setBackgroundMode ( PaletteBase ); |
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 ); |
109 | } | 112 | } |
110 | 113 | ||
111 | void setViewMode ( TabConfig::ViewMode m ) | 114 | void setViewMode ( TabConfig::ViewMode m ) |
112 | { | 115 | { |
113 | viewport ( )-> setUpdatesEnabled ( false ); | 116 | viewport ( )-> setUpdatesEnabled ( false ); |
114 | 117 | ||
115 | switch ( m ) { | 118 | switch ( m ) { |
116 | case TabConfig::List: | 119 | case TabConfig::List: |
117 | setItemTextPos( QIconView::Right ); | 120 | setItemTextPos( QIconView::Right ); |
118 | break; | 121 | break; |
119 | case TabConfig::Icon: | 122 | case TabConfig::Icon: |
120 | setItemTextPos( QIconView::Bottom ); | 123 | setItemTextPos( QIconView::Bottom ); |
@@ -146,33 +149,33 @@ public: | |||
146 | painter.end ( ); | 149 | painter.end ( ); |
147 | setBackgroundPixmap ( bg ); | 150 | setBackgroundPixmap ( bg ); |
148 | break; | 151 | break; |
149 | } | 152 | } |
150 | 153 | ||
151 | case TabConfig::SolidColor: { | 154 | case TabConfig::SolidColor: { |
152 | setBackgroundPixmap ( QPixmap ( )); | 155 | setBackgroundPixmap ( QPixmap ( )); |
153 | if ( val. isEmpty ( )) | 156 | if ( val. isEmpty ( )) |
154 | setBackgroundColor ( colorGroup ( ). base ( )); | 157 | setBackgroundColor ( colorGroup ( ). base ( )); |
155 | else | 158 | else |
156 | setBackgroundColor ( val ); | 159 | setBackgroundColor ( val ); |
157 | break; | 160 | break; |
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; |
167 | } | 170 | } |
168 | } | 171 | } |
169 | m_bgtype = t; | 172 | m_bgtype = t; |
170 | viewport ( )-> update ( ); | 173 | viewport ( )-> update ( ); |
171 | } | 174 | } |
172 | 175 | ||
173 | void setTextColor ( const QColor &tc ) | 176 | void setTextColor ( const QColor &tc ) |
174 | { | 177 | { |
175 | m_textcolor = tc; | 178 | m_textcolor = tc; |
176 | QColorGroup cg = colorGroup ( ); | 179 | QColorGroup cg = colorGroup ( ); |
177 | cg. setColor ( QColorGroup::Text, tc ); | 180 | cg. setColor ( QColorGroup::Text, tc ); |
178 | setPalette ( QPalette ( cg, cg, cg )); | 181 | setPalette ( QPalette ( cg, cg, cg )); |
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,46 +1,47 @@ | |||
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> |
35 | #include <qpe/qpeapplication.h> | 36 | #include <qpe/qpeapplication.h> |
36 | 37 | ||
37 | #include <qlistbox.h> | 38 | #include <qlistbox.h> |
38 | #include <qpushbutton.h> | 39 | #include <qpushbutton.h> |
39 | #include <qlayout.h> | 40 | #include <qlayout.h> |
40 | #include <qlabel.h> | 41 | #include <qlabel.h> |
41 | #include <qwhatsthis.h> | 42 | #include <qwhatsthis.h> |
42 | #include <qcheckbox.h> | 43 | #include <qcheckbox.h> |
43 | 44 | ||
44 | #include "tabdialog.h" | 45 | #include "tabdialog.h" |
45 | 46 | ||
46 | #include <stdlib.h> | 47 | #include <stdlib.h> |
@@ -100,36 +101,33 @@ TabsSettings::TabsSettings ( QWidget *parent, const char *name ) | |||
100 | QWhatsThis::add ( m_busyani, tr( "Activate this, if you want an animatedbusy indicator for starting applications in the Launcher." )); | 101 | QWhatsThis::add ( m_busyani, tr( "Activate this, if you want an animatedbusy indicator for starting applications in the Launcher." )); |
101 | QWhatsThis::add ( m_staticbackground, tr( "Activate this, if you want the background pixmap not to scroll with the icons." )); | 102 | QWhatsThis::add ( m_staticbackground, tr( "Activate this, if you want the background pixmap not to scroll with the icons." )); |
102 | } | 103 | } |
103 | 104 | ||
104 | void TabsSettings::init ( ) | 105 | void TabsSettings::init ( ) |
105 | { | 106 | { |
106 | AppLnkSet rootFolder( MimeType::appsFolderName ( )); | 107 | AppLnkSet rootFolder( MimeType::appsFolderName ( )); |
107 | QStringList types = rootFolder. types ( ); | 108 | QStringList types = rootFolder. types ( ); |
108 | 109 | ||
109 | m_list-> insertItem ( tr( "All Tabs" )); | 110 | m_list-> insertItem ( tr( "All Tabs" )); |
110 | m_ids << GLOBALID; | 111 | m_ids << GLOBALID; |
111 | 112 | ||
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 | ||
124 | readTabSettings ( cfg ); | 122 | readTabSettings ( cfg ); |
125 | 123 | ||
126 | cfg. setGroup ( "GUI" ); | 124 | cfg. setGroup ( "GUI" ); |
127 | m_busyani-> setChecked ( cfg. readEntry ( "BusyType" ). lower ( ) == "animated" ); | 125 | m_busyani-> setChecked ( cfg. readEntry ( "BusyType" ). lower ( ) == "animated" ); |
128 | m_bigbusy->setChecked( cfg. readBoolEntry ( "BigBusy" ) ); | 126 | m_bigbusy->setChecked( cfg. readBoolEntry ( "BigBusy" ) ); |
129 | m_staticbackground->setChecked( cfg.readBoolEntry( "StaticBackground", true ) ); | 127 | m_staticbackground->setChecked( cfg.readBoolEntry( "StaticBackground", true ) ); |
130 | } | 128 | } |
131 | 129 | ||
132 | 130 | ||
133 | void TabsSettings::readTabSettings ( Config &cfg ) | 131 | void TabsSettings::readTabSettings ( Config &cfg ) |
134 | { | 132 | { |
135 | QString grp ( "Tab %1" ); // No tr | 133 | QString grp ( "Tab %1" ); // No tr |