summaryrefslogtreecommitdiff
authorharlekin <harlekin>2003-03-08 21:40:57 (UTC)
committer harlekin <harlekin>2003-03-08 21:40:57 (UTC)
commita6bf0a8b50265dd667f31fed18a6dcad15ef10b5 (patch) (unidiff)
treeb960cf65353e5b67992c86a8bfa5349c73034e06
parent006850e5841fe3d509845a10bb8a6391c556c1c0 (diff)
downloadopie-a6bf0a8b50265dd667f31fed18a6dcad15ef10b5.zip
opie-a6bf0a8b50265dd667f31fed18a6dcad15ef10b5.tar.gz
opie-a6bf0a8b50265dd667f31fed18a6dcad15ef10b5.tar.bz2
icon changes
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/settings/launcher/launchersettings.cpp5
-rw-r--r--core/settings/launcher/tabdialog.cpp8
2 files changed, 7 insertions, 6 deletions
diff --git a/core/settings/launcher/launchersettings.cpp b/core/settings/launcher/launchersettings.cpp
index 7b85602..cb6e98a 100644
--- a/core/settings/launcher/launchersettings.cpp
+++ b/core/settings/launcher/launchersettings.cpp
@@ -1,3 +1,4 @@
1
1/* 2/*
2               =. This file is part of the OPIE Project 3               =. This file is part of the OPIE Project
3             .=l. Copyright (c) 2002 Robert Griebl <sandman@handhelds.org> 4             .=l. Copyright (c) 2002 Robert Griebl <sandman@handhelds.org>
@@ -49,8 +50,8 @@ LauncherSettings::LauncherSettings ( ) : QDialog ( 0, "LauncherSettings", false,
49 m_taskbar = new TaskbarSettings ( tw ); 50 m_taskbar = new TaskbarSettings ( tw );
50 m_menu = new MenuSettings ( tw ); 51 m_menu = new MenuSettings ( tw );
51 52
52 tw-> addTab ( m_taskbar, "launchersettings/taskbartab.png", tr( "Taskbar" )); 53 tw-> addTab ( m_taskbar, "wait", tr( "Taskbar" ));
53 tw-> addTab ( m_menu, "launchersettings/menutab.png", tr( "O-Menu" )); 54 tw-> addTab ( m_menu, "go", tr( "O-Menu" ));
54 tw-> addTab ( m_tabs, "launchersettings/tabstab.png", tr( "Tabs" )); 55 tw-> addTab ( m_tabs, "launchersettings/tabstab.png", tr( "Tabs" ));
55 56
56 tw-> setCurrentTab ( m_taskbar ); 57 tw-> setCurrentTab ( m_taskbar );
diff --git a/core/settings/launcher/tabdialog.cpp b/core/settings/launcher/tabdialog.cpp
index 4c9942f..5f68010 100644
--- a/core/settings/launcher/tabdialog.cpp
+++ b/core/settings/launcher/tabdialog.cpp
@@ -91,7 +91,7 @@ public:
91 calculateGrid ( Bottom ); 91 calculateGrid ( Bottom );
92 92
93 93
94 new SampleItem ( this, tr( "Sample 1" ), Resource::loadPixmap ( "DateBook" )); 94 new SampleItem ( this, tr( "Sample 1" ), Resource::loadPixmap ( "datebook/DateBook" ));
95 new SampleItem ( this, tr( "Sample 2" ), Resource::loadPixmap ( "Calibrate" )); 95 new SampleItem ( this, tr( "Sample 2" ), Resource::loadPixmap ( "Calibrate" ));
96 new SampleItem ( this, tr( "Sample 3" ), Resource::loadPixmap ( "UnknownDocument" )); 96 new SampleItem ( this, tr( "Sample 3" ), Resource::loadPixmap ( "UnknownDocument" ));
97 97
@@ -273,9 +273,9 @@ TabDialog::TabDialog ( const QPixmap *tabicon, const QString &tabname, TabConfig
273 OTabWidget *tw = new OTabWidget ( this, "tabwidget", OTabWidget::Global, OTabWidget::Bottom ); 273 OTabWidget *tw = new OTabWidget ( this, "tabwidget", OTabWidget::Global, OTabWidget::Bottom );
274 QWidget *bgtab; 274 QWidget *bgtab;
275 275
276 tw-> addTab ( bgtab = createBgTab ( tw ), "appearance/backgroundtabicon.png", tr( "Background" )); 276 tw-> addTab ( bgtab = createBgTab ( tw ), "appearance/color", tr( "Background" ));
277 tw-> addTab ( createFontTab ( tw ), "appearance/fonttabicon.png", tr( "Font" )); 277 tw-> addTab ( createFontTab ( tw ), "font", tr( "Font" ));
278 tw-> addTab ( createIconTab ( tw ), "appearance/colorstabicon.png", tr( "Icons" ) ); 278 tw-> addTab ( createIconTab ( tw ), "pixmap", tr( "Icons" ) );
279 279
280 tw-> setCurrentTab ( bgtab ); 280 tw-> setCurrentTab ( bgtab );
281 281