author | sandman <sandman> | 2002-10-02 22:15:33 (UTC) |
---|---|---|
committer | sandman <sandman> | 2002-10-02 22:15:33 (UTC) |
commit | 7e864eb22b5663ad9771b562fbe901042dc68657 (patch) (unidiff) | |
tree | c7cc270012ff2aba51308088b51022b2056f9721 /core/settings/launcher/launchersettings.cpp | |
parent | c8d4ed632ac27261219e5824f988a320b96b8ae2 (diff) | |
download | opie-7e864eb22b5663ad9771b562fbe901042dc68657.zip opie-7e864eb22b5663ad9771b562fbe901042dc68657.tar.gz opie-7e864eb22b5663ad9771b562fbe901042dc68657.tar.bz2 |
Launcher settings now also supports the new menu applets interface
Diffstat (limited to 'core/settings/launcher/launchersettings.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/settings/launcher/launchersettings.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/core/settings/launcher/launchersettings.cpp b/core/settings/launcher/launchersettings.cpp index 22bf1d1..c32d998 100644 --- a/core/settings/launcher/launchersettings.cpp +++ b/core/settings/launcher/launchersettings.cpp | |||
@@ -26,13 +26,14 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | #include <qlayout.h> | 28 | #include <qlayout.h> |
29 | #include <qapplication.h> | ||
29 | 30 | ||
30 | #include <opie/otabwidget.h> | 31 | #include <opie/otabwidget.h> |
31 | 32 | ||
32 | #include "launchersettings.h" | 33 | #include "launchersettings.h" |
33 | #include "tabssettings.h" | 34 | #include "tabssettings.h" |
35 | #include "menusettings.h" | ||
34 | #include "taskbarsettings.h" | 36 | #include "taskbarsettings.h" |
35 | #include "guisettings.h" | ||
36 | 37 | ||
37 | 38 | ||
38 | LauncherSettings::LauncherSettings ( ) : QDialog ( 0, "LauncherSettings", false ) | 39 | LauncherSettings::LauncherSettings ( ) : QDialog ( 0, "LauncherSettings", false ) |
@@ -46,11 +47,11 @@ LauncherSettings::LauncherSettings ( ) : QDialog ( 0, "LauncherSettings", false | |||
46 | 47 | ||
47 | m_tabs = new TabsSettings ( tw ); | 48 | m_tabs = new TabsSettings ( tw ); |
48 | m_taskbar = new TaskbarSettings ( tw ); | 49 | m_taskbar = new TaskbarSettings ( tw ); |
49 | m_gui = new GuiSettings ( tw ); | 50 | m_menu = new MenuSettings ( tw ); |
50 | 51 | ||
51 | tw-> addTab ( m_taskbar, "launchersettings/taskbartab.png", tr( "Taskbar" )); | 52 | tw-> addTab ( m_taskbar, "launchersettings/taskbartab.png", tr( "Taskbar" )); |
53 | tw-> addTab ( m_menu, "launchersettings/menutab.png", tr( "O-Menu" )); | ||
52 | tw-> addTab ( m_tabs, "launchersettings/tabstab.png", tr( "Tabs" )); | 54 | tw-> addTab ( m_tabs, "launchersettings/tabstab.png", tr( "Tabs" )); |
53 | tw-> addTab ( m_gui, "launchersettings/guitab.png", tr( "GUI" )); | ||
54 | 55 | ||
55 | tw-> setCurrentTab ( m_taskbar ); | 56 | tw-> setCurrentTab ( m_taskbar ); |
56 | } | 57 | } |
@@ -58,8 +59,8 @@ LauncherSettings::LauncherSettings ( ) : QDialog ( 0, "LauncherSettings", false | |||
58 | void LauncherSettings::accept ( ) | 59 | void LauncherSettings::accept ( ) |
59 | { | 60 | { |
60 | m_taskbar-> accept ( ); | 61 | m_taskbar-> accept ( ); |
62 | m_menu-> accept ( ); | ||
61 | m_tabs-> accept ( ); | 63 | m_tabs-> accept ( ); |
62 | m_gui-> accept ( ); | ||
63 | 64 | ||
64 | QDialog::accept ( ); | 65 | QDialog::accept ( ); |
65 | } | 66 | } |