summaryrefslogtreecommitdiff
authorharlekin <harlekin>2003-03-08 21:40:57 (UTC)
committer harlekin <harlekin>2003-03-08 21:40:57 (UTC)
commita6bf0a8b50265dd667f31fed18a6dcad15ef10b5 (patch) (side-by-side diff)
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,6 +1,7 @@
+
/*
               =. This file is part of the OPIE Project
             .=l. Copyright (c) 2002 Robert Griebl <sandman@handhelds.org>
           .>+-=
 _;:,     .>    :=|. This file is free software; you can
.> <`_,   >  .   <= redistribute it and/or modify it under
@@ -46,14 +47,14 @@ LauncherSettings::LauncherSettings ( ) : QDialog ( 0, "LauncherSettings", false,
lay-> addWidget ( tw );
m_tabs = new TabsSettings ( tw );
m_taskbar = new TaskbarSettings ( tw );
m_menu = new MenuSettings ( tw );
- tw-> addTab ( m_taskbar, "launchersettings/taskbartab.png", tr( "Taskbar" ));
- tw-> addTab ( m_menu, "launchersettings/menutab.png", tr( "O-Menu" ));
+ tw-> addTab ( m_taskbar, "wait", tr( "Taskbar" ));
+ tw-> addTab ( m_menu, "go", tr( "O-Menu" ));
tw-> addTab ( m_tabs, "launchersettings/tabstab.png", tr( "Tabs" ));
tw-> setCurrentTab ( m_taskbar );
}
void LauncherSettings::accept ( )
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
@@ -88,13 +88,13 @@ public:
setSelectionMode ( QIconView::NoSelection );
setBackgroundMode ( PaletteBase );
setViewMode ( TabConfig::Icon );
calculateGrid ( Bottom );
- new SampleItem ( this, tr( "Sample 1" ), Resource::loadPixmap ( "DateBook" ));
+ new SampleItem ( this, tr( "Sample 1" ), Resource::loadPixmap ( "datebook/DateBook" ));
new SampleItem ( this, tr( "Sample 2" ), Resource::loadPixmap ( "Calibrate" ));
new SampleItem ( this, tr( "Sample 3" ), Resource::loadPixmap ( "UnknownDocument" ));
setBackgroundType ( TabConfig::Ruled, QString::null );
setMaximumHeight ( firstItem ( )-> height ( ) + 16 );
@@ -270,15 +270,15 @@ TabDialog::TabDialog ( const QPixmap *tabicon, const QString &tabname, TabConfig
QVBoxLayout *lay = new QVBoxLayout ( this, 3, 3 );
OTabWidget *tw = new OTabWidget ( this, "tabwidget", OTabWidget::Global, OTabWidget::Bottom );
QWidget *bgtab;
- tw-> addTab ( bgtab = createBgTab ( tw ), "appearance/backgroundtabicon.png", tr( "Background" ));
- tw-> addTab ( createFontTab ( tw ), "appearance/fonttabicon.png", tr( "Font" ));
- tw-> addTab ( createIconTab ( tw ), "appearance/colorstabicon.png", tr( "Icons" ) );
+ tw-> addTab ( bgtab = createBgTab ( tw ), "appearance/color", tr( "Background" ));
+ tw-> addTab ( createFontTab ( tw ), "font", tr( "Font" ));
+ tw-> addTab ( createIconTab ( tw ), "pixmap", tr( "Icons" ) );
tw-> setCurrentTab ( bgtab );
QWidget *sample = new QVBox ( this );
QTabBar *tb = new QTabBar ( sample );
QString name ( tr( "Previewing %1" ). arg ( tabname ));