summaryrefslogtreecommitdiff
authordrw <drw>2005-03-05 23:41:40 (UTC)
committer drw <drw>2005-03-05 23:41:40 (UTC)
commit0baadaef5a3da4fda08df75394475f577af58828 (patch) (unidiff)
treea8d5d8afaeafa921bc2374e4525768a809cb7f80
parenta287cf7aad0660d4c7a573ff4da8ef35c78bb712 (diff)
downloadopie-0baadaef5a3da4fda08df75394475f577af58828.zip
opie-0baadaef5a3da4fda08df75394475f577af58828.tar.gz
opie-0baadaef5a3da4fda08df75394475f577af58828.tar.bz2
Change loadIconSet to loadPixmap to prevent search for new_disabled icon (which doesn't exist
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/tools/quicklauncher/main.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/tools/quicklauncher/main.cpp b/core/tools/quicklauncher/main.cpp
index 59dd17e..72f574a 100644
--- a/core/tools/quicklauncher/main.cpp
+++ b/core/tools/quicklauncher/main.cpp
@@ -229,33 +229,33 @@ int main( int argc, char** argv )
229 else 229 else
230 argv_lth = argv0[argc-1] + strlen(argv0[argc-1]) - argv0[0]; 230 argv_lth = argv0[argc-1] + strlen(argv0[argc-1]) - argv0[0];
231#endif 231#endif
232 (void)new QuickLauncher(); 232 (void)new QuickLauncher();
233 odebug << "QuickLauncher running" << oendl; 233 odebug << "QuickLauncher running" << oendl;
234 // Pre-load default fonts 234 // Pre-load default fonts
235 QFontMetrics fm( QApplication::font() ); 235 QFontMetrics fm( QApplication::font() );
236 fm.ascent(); // causes font load. 236 fm.ascent(); // causes font load.
237 QFont f( QApplication::font() ); 237 QFont f( QApplication::font() );
238 f.setWeight( QFont::Bold ); 238 f.setWeight( QFont::Bold );
239 QFontMetrics fmb( f ); 239 QFontMetrics fmb( f );
240 fmb.ascent(); // causes font load. 240 fmb.ascent(); // causes font load.
241 241
242 // Each of the following force internal structures/internal 242 // Each of the following force internal structures/internal
243 // initialization to be performed. This may mean allocating 243 // initialization to be performed. This may mean allocating
244 // memory that is not needed by all applications. 244 // memory that is not needed by all applications.
245 Resource::loadIconSet("new"); // do internal init 245 Resource::loadPixmap("new"); // do internal init
246 246
247 /* make sure libopie gets lined in */ 247 /* make sure libopie gets lined in */
248 { 248 {
249 Opie::Ui::OWait item; 249 Opie::Ui::OWait item;
250 } 250 }
251 251
252 // Create a widget to force initialization of title bar images, etc. 252 // Create a widget to force initialization of title bar images, etc.
253 QObject::disconnect(app, SIGNAL(lastWindowClosed()), app, SLOT(hideOrQuit())); 253 QObject::disconnect(app, SIGNAL(lastWindowClosed()), app, SLOT(hideOrQuit()));
254 QWidget *w = new QWidget(0,0,Qt::WDestructiveClose|Qt::WStyle_ContextHelp|Qt::WStyle_Tool); 254 QWidget *w = new QWidget(0,0,Qt::WDestructiveClose|Qt::WStyle_ContextHelp|Qt::WStyle_Tool);
255 w->setGeometry( -100, -100, 10, 10 ); 255 w->setGeometry( -100, -100, 10, 10 );
256 w->show(); 256 w->show();
257 QTimer::singleShot( 0, w, SLOT(close()) ); 257 QTimer::singleShot( 0, w, SLOT(close()) );
258 258
259 app->enter_loop(); 259 app->enter_loop();
260 } 260 }
261 261