From a10cf76ef5b9e8c726ebc47183abd6943023cf8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Fri, 24 Jun 2005 15:57:12 +0000 Subject: [PATCH] Renamed src/prefs to "preferences", as the directory is usually called in BeOS. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@13263 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/Jamfile | 2 +- src/add-ons/kernel/bus_managers/pci/Jamfile | 2 +- src/preferences/Jamfile | 25 + .../appearance/APRMain.cpp | 0 .../appearance/APRMain.h | 0 .../appearance/APRView.cpp | 0 .../appearance/APRView.h | 0 .../appearance/APRWindow.cpp | 0 .../appearance/APRWindow.h | 0 .../appearance/Appearance.rdef | 0 .../appearance/ColorWell.cpp | 0 .../appearance/ColorWell.h | 0 .../appearance/ColorWhichItem.cpp | 0 .../appearance/ColorWhichItem.h | 0 .../appearance/CurView.cpp | 0 .../appearance/CurView.h | 0 .../appearance/CursorWhichItem.cpp | 0 .../appearance/CursorWhichItem.h | 0 .../appearance/DecView.cpp | 0 .../appearance/DecView.h | 0 .../appearance/FontMenu.cpp | 0 .../appearance/FontMenu.h | 0 src/{prefs => preferences}/appearance/Jamfile | 2 +- .../appearance/MenuView.cpp | 0 .../appearance/MenuView.h | 0 .../appearance/SysCursorAPI.cpp | 0 .../appearance/SysCursorAPI.h | 0 src/{prefs => preferences}/appearance/defs.h | 0 .../backgrounds/BGMain.cpp | 0 .../backgrounds/BGMain.h | 0 .../backgrounds/BGView.cpp | 0 .../backgrounds/BGView.h | 0 .../backgrounds/BGWindow.cpp | 0 .../backgrounds/BGWindow.h | 0 .../backgrounds/BackgroundImage.cpp | 0 .../backgrounds/BackgroundImage.h | 0 .../backgrounds/Backgrounds.rdef | 0 .../backgrounds/Jamfile | 2 +- .../datatranslations/DataTranslations.cpp | 0 .../datatranslations/DataTranslations.h | 0 .../datatranslations/DataTranslations.rdef | 0 .../DataTranslationsMessages.h | 0 .../DataTranslationsSettings.cpp | 0 .../DataTranslationsSettings.h | 0 .../datatranslations/DataTranslationsView.cpp | 0 .../datatranslations/DataTranslationsView.h | 0 .../DataTranslationsWindow.cpp | 0 .../datatranslations/DataTranslationsWindow.h | 0 .../datatranslations/IconView.cpp | 0 .../datatranslations/IconView.h | 0 .../datatranslations/Jamfile | 2 +- .../devices/ConfigurationWindow.cpp | 0 .../devices/Devices.cpp | 0 .../devices/Devices.rdef | 0 .../devices/DevicesInfo.cpp | 0 .../devices/DevicesInfo.h | 0 .../devices/DevicesWindow.cpp | 1042 ++++++++--------- .../devices/DevicesWindows.h | 218 ++-- src/{prefs => preferences}/devices/Jamfile | 2 +- .../devices/ModemWindow.cpp | 0 .../devices/ResourceUsageWindow.cpp | 0 .../devices/cm_wrapper.c | 0 .../devices/cm_wrapper.h | 0 .../devices/config_driver.h | 0 .../devices/devlist2h.awk | 0 .../devices/isapnp_devids.txt | 0 src/{prefs => preferences}/devices/pcihdr.h | 0 .../devices/usb_devlist2h.awk | 0 src/{prefs => preferences}/devices/usbdevs | 0 .../drivesetup/DriveSetup.rdef | 0 src/{prefs => preferences}/drivesetup/Jamfile | 2 +- .../drivesetup/MainWindow.cpp | 0 .../drivesetup/MainWindow.h | 0 .../drivesetup/PosSettings.cpp | 0 .../drivesetup/PosSettings.h | 0 .../drivesetup/main.cpp | 0 src/{prefs => preferences}/drivesetup/main.h | 0 .../drivesetup/structs.h | 0 src/{prefs => preferences}/dun/DUN.cpp | 0 src/{prefs => preferences}/dun/DUN.h | 0 src/{prefs => preferences}/dun/DUN.rdef | 0 src/{prefs => preferences}/dun/DUNView.cpp | 0 src/{prefs => preferences}/dun/DUNView.h | 0 src/{prefs => preferences}/dun/DUNWindow.cpp | 0 src/{prefs => preferences}/dun/DUNWindow.h | 0 .../dun/DetailsView.cpp | 0 src/{prefs => preferences}/dun/DetailsView.h | 0 src/{prefs => preferences}/dun/Jamfile | 2 +- .../dun/LocationView.cpp | 0 src/{prefs => preferences}/dun/LocationView.h | 0 .../dun/ModemWindow.cpp | 0 src/{prefs => preferences}/dun/ModemWindow.h | 0 .../dun/NewConnectionWindow.cpp | 0 .../dun/NewConnectionWindow.h | 0 src/{prefs => preferences}/dun/README | 0 .../dun/SettingsWindow.cpp | 0 .../dun/SettingsWindow.h | 0 src/{prefs => preferences}/dun/TreeView.cpp | 0 src/{prefs => preferences}/dun/TreeView.h | 0 src/{prefs => preferences}/dun/makefile | 0 .../filetypes/FileTypes.icons.rdef | 0 .../filetypes/FileTypes.rdef | 0 .../filetypes/FileTypes.version.rdef | 0 .../filetypes/FileTypesApp.cpp | 0 .../filetypes/FileTypesApp.h | 0 .../filetypes/FileTypesConstants.h | 0 .../filetypes/FileTypesView.cpp | 0 .../filetypes/FileTypesView.h | 0 .../filetypes/FileTypesWindow.cpp | 0 .../filetypes/FileTypesWindow.h | 0 src/{prefs => preferences}/filetypes/Jamfile | 2 +- src/{prefs => preferences}/filetypes/main.cpp | 0 .../fonts/.doxygen-conf | 0 .../fonts/ButtonView.cpp | 0 src/{prefs => preferences}/fonts/ButtonView.h | 0 .../fonts/CacheView.cpp | 0 src/{prefs => preferences}/fonts/CacheView.h | 0 .../fonts/FontSelectionView.cpp | 0 .../fonts/FontSelectionView.h | 0 src/{prefs => preferences}/fonts/FontView.cpp | 0 src/{prefs => preferences}/fonts/FontView.h | 0 src/{prefs => preferences}/fonts/Fonts.rdef | 0 .../fonts/FontsSettings.cpp | 0 .../fonts/FontsSettings.h | 0 src/{prefs => preferences}/fonts/Jamfile | 2 +- .../fonts/MainWindow.cpp | 0 src/{prefs => preferences}/fonts/MainWindow.h | 0 .../fonts/Pref_Utils.cpp | 0 src/{prefs => preferences}/fonts/Pref_Utils.h | 0 src/{prefs => preferences}/fonts/main.cpp | 0 src/{prefs => preferences}/fonts/main.h | 0 src/{prefs => preferences}/keyboard/Jamfile | 2 +- .../keyboard/Keyboard.cpp | 0 .../keyboard/Keyboard.h | 0 .../keyboard/Keyboard.rdef | 0 .../keyboard/KeyboardMessages.h | 0 .../keyboard/KeyboardSettings.cpp | 0 .../keyboard/KeyboardSettings.h | 0 .../keyboard/KeyboardView.cpp | 0 .../keyboard/KeyboardView.h | 0 .../keyboard/KeyboardWindow.cpp | 0 .../keyboard/KeyboardWindow.h | 0 src/{prefs => preferences}/keymap/Jamfile | 2 +- src/{prefs => preferences}/keymap/Keymap.cpp | 0 src/{prefs => preferences}/keymap/Keymap.h | 0 src/{prefs => preferences}/keymap/Keymap.rdef | 0 .../keymap/KeymapApplication.cpp | 0 .../keymap/KeymapApplication.h | 0 .../keymap/KeymapListItem.cpp | 0 .../keymap/KeymapListItem.h | 0 .../keymap/KeymapTextView.cpp | 0 .../keymap/KeymapTextView.h | 0 .../keymap/KeymapWindow.cpp | 0 .../keymap/KeymapWindow.h | 0 src/{prefs => preferences}/mail/Account.cpp | 0 src/{prefs => preferences}/mail/Account.h | 0 .../mail/CenterContainer.cpp | 0 .../mail/CenterContainer.h | 0 .../mail/ConfigViews.cpp | 0 src/{prefs => preferences}/mail/ConfigViews.h | 0 .../mail/ConfigWindow.cpp | 0 .../mail/ConfigWindow.h | 0 src/{prefs => preferences}/mail/Jamfile | 2 +- src/{prefs => preferences}/mail/e-mail.rdef | 0 src/{prefs => preferences}/mail/main.cpp | 0 src/{prefs => preferences}/media/Jamfile | 2 +- src/{prefs => preferences}/media/Media.cpp | 0 src/{prefs => preferences}/media/Media.h | 0 .../media/MediaAlert.cpp | 0 src/{prefs => preferences}/media/MediaAlert.h | 0 .../media/MediaListItem.cpp | 0 .../media/MediaListItem.h | 0 .../media/MediaViews.cpp | 0 src/{prefs => preferences}/media/MediaViews.h | 0 .../media/MediaWindow.cpp | 0 .../media/MediaWindow.h | 0 src/{prefs => preferences}/media/iconfile.h | 0 src/{prefs => preferences}/media/media.rdef | 0 .../menu/BitmapMenuItem.cpp | 0 .../menu/BitmapMenuItem.h | 0 .../menu/ColorPicker.cpp | 0 .../menu/ColorWindow.cpp | 0 src/{prefs => preferences}/menu/FontMenu.cpp | 0 .../menu/FontSizeMenu.cpp | 0 src/{prefs => preferences}/menu/Jamfile | 2 +- src/{prefs => preferences}/menu/Menu.rdef | 0 src/{prefs => preferences}/menu/MenuApp.cpp | 0 src/{prefs => preferences}/menu/MenuApp.h | 0 src/{prefs => preferences}/menu/MenuBar.cpp | 0 .../menu/MenuWindow.cpp | 0 src/{prefs => preferences}/menu/msg.h | 0 src/{prefs => preferences}/mouse/Jamfile | 2 +- src/{prefs => preferences}/mouse/Mouse.cpp | 0 src/{prefs => preferences}/mouse/Mouse.h | 0 src/{prefs => preferences}/mouse/Mouse.rdef | 0 .../mouse/MouseBitmap.h | 0 .../mouse/MouseConstants.h | 0 .../mouse/MouseSettings.cpp | 0 .../mouse/MouseSettings.h | 0 .../mouse/MouseView.cpp | 0 src/{prefs => preferences}/mouse/MouseView.h | 0 .../mouse/MouseWindow.cpp | 0 .../mouse/MouseWindow.h | 0 .../mouse/SettingsView.cpp | 0 .../mouse/SettingsView.h | 0 src/{prefs => preferences}/network/Jamfile | 2 +- .../network/Network.cpp | 0 src/{prefs => preferences}/network/Network.h | 0 .../network/Network.rdef | 0 src/{prefs => preferences}/network/funcs.cpp | 0 .../print/AddPrinterDialog.cpp | 0 .../print/AddPrinterDialog.h | 0 src/{prefs => preferences}/print/Globals.cpp | 0 src/{prefs => preferences}/print/Globals.h | 0 src/{prefs => preferences}/print/Jamfile | 2 +- .../print/JobListView.cpp | 0 .../print/JobListView.h | 0 src/{prefs => preferences}/print/Messages.h | 0 .../print/PrinterListView.cpp | 0 .../print/PrinterListView.h | 0 .../print/Printers.FileTypes.rdef | 0 src/{prefs => preferences}/print/Printers.cpp | 0 src/{prefs => preferences}/print/Printers.h | 0 .../print/PrintersWindow.cpp | 0 .../print/PrintersWindow.h | 0 .../print/SpoolFolder.cpp | 0 .../print/SpoolFolder.h | 0 src/{prefs => preferences}/print/doxygen.cfg | 0 .../screen/AlertView.cpp | 0 src/{prefs => preferences}/screen/AlertView.h | 0 .../screen/AlertWindow.cpp | 0 .../screen/AlertWindow.h | 0 src/{prefs => preferences}/screen/Constants.h | 0 src/{prefs => preferences}/screen/Jamfile | 2 +- .../screen/MonitorView.cpp | 0 .../screen/MonitorView.h | 0 .../screen/RefreshSlider.cpp | 0 .../screen/RefreshSlider.h | 0 .../screen/RefreshView.cpp | 0 .../screen/RefreshView.h | 0 .../screen/RefreshWindow.cpp | 0 .../screen/RefreshWindow.h | 0 src/{prefs => preferences}/screen/Screen.rdef | 0 .../screen/ScreenApplication.cpp | 0 .../screen/ScreenApplication.h | 0 .../screen/ScreenMode.cpp | 0 .../screen/ScreenMode.h | 0 .../screen/ScreenSettings.cpp | 0 .../screen/ScreenSettings.h | 0 .../screen/ScreenWindow.cpp | 0 .../screen/ScreenWindow.h | 0 src/{prefs => preferences}/screen/Utility.cpp | 0 src/{prefs => preferences}/screen/Utility.h | 0 .../screen/multimon.cpp | 0 .../screensaver/Constants.cpp | 0 .../screensaver/Constants.h | 0 .../screensaver/Jamfile | 2 +- .../screensaver/MouseAreaView.cpp | 0 .../screensaver/MouseAreaView.h | 0 .../OBOSScreenSaverPreferences.cpp | 0 .../screensaver/OBOSScreenSaverPreferences.h | 0 .../screensaver/PreviewView.cpp | 0 .../screensaver/PreviewView.h | 0 .../screensaver/ScreenSaver.rdef | 0 .../screensaver/ScreenSaverPrefsApp.cpp | 0 .../screensaver/ScreenSaverPrefsApp.h | 0 .../screensaver/ScreenSaverWindow.cpp | 0 .../screensaver/ScreenSaverWindow.h | 0 .../screensaver/passwordWindow.cpp | 0 .../screensaver/passwordWindow.h | 0 .../screensaver/pwWindow.cpp | 0 .../screensaver/pwWindow.h | 0 src/{prefs => preferences}/scrollbar/Jamfile | 2 +- .../scrollbar/ScrollBar.rdef | 0 .../scrollbar/ScrollBarApp.cpp | 0 .../scrollbar/ScrollBarApp.h | 0 .../scrollbar/ScrollBarView.cpp | 0 .../scrollbar/ScrollBarView.h | 0 .../scrollbar/ScrollBarWindow.cpp | 0 .../scrollbar/ScrollBarWindow.h | 0 .../scrollbar/fakescrollbar.cpp | 0 .../scrollbar/fakescrollbar.h | 0 .../scrollbar/knobsizeadjuster.cpp | 0 .../scrollbar/knobsizeadjuster.h | 0 .../scrollbar/messages.h | 0 src/{prefs => preferences}/sounds/HApp.cpp | 0 src/{prefs => preferences}/sounds/HApp.h | 0 .../sounds/HEventItem.cpp | 0 .../sounds/HEventItem.h | 0 .../sounds/HEventList.cpp | 0 .../sounds/HEventList.h | 0 src/{prefs => preferences}/sounds/HWindow.cpp | 0 src/{prefs => preferences}/sounds/HWindow.h | 0 src/{prefs => preferences}/sounds/Jamfile | 2 +- src/{prefs => preferences}/sounds/Sounds.rdef | 0 .../time/AnalogClock.cpp | 0 src/{prefs => preferences}/time/AnalogClock.h | 0 src/{prefs => preferences}/time/BaseView.cpp | 0 src/{prefs => preferences}/time/BaseView.h | 0 src/{prefs => preferences}/time/Bitmaps.cpp | 0 src/{prefs => preferences}/time/Bitmaps.h | 0 .../time/CalendarView.cpp | 0 .../time/CalendarView.h | 0 .../time/DateTimeEdit.cpp | 0 .../time/DateTimeEdit.h | 0 src/{prefs => preferences}/time/DateUtils.cpp | 0 src/{prefs => preferences}/time/DateUtils.h | 0 src/{prefs => preferences}/time/Jamfile | 2 +- .../time/SectionEdit.cpp | 0 src/{prefs => preferences}/time/SectionEdit.h | 0 .../time/SettingsView.cpp | 0 .../time/SettingsView.h | 0 src/{prefs => preferences}/time/TZDisplay.cpp | 0 src/{prefs => preferences}/time/TZDisplay.h | 0 src/{prefs => preferences}/time/Time.cpp | 0 src/{prefs => preferences}/time/Time.h | 0 src/{prefs => preferences}/time/Time.rdef | 0 .../time/TimeMessages.h | 0 .../time/TimeSettings.cpp | 0 .../time/TimeSettings.h | 0 src/{prefs => preferences}/time/TimeView.cpp | 0 src/{prefs => preferences}/time/TimeView.h | 0 .../time/TimeWindow.cpp | 0 src/{prefs => preferences}/time/TimeWindow.h | 0 src/{prefs => preferences}/time/ZoneView.cpp | 0 src/{prefs => preferences}/time/ZoneView.h | 0 src/{prefs => preferences}/time/hierarchy | 0 .../virtualmemory/.doxygen-conf | 0 .../virtualmemory/Jamfile | 2 +- .../virtualmemory/MainWindow.cpp | 0 .../virtualmemory/MainWindow.h | 0 .../virtualmemory/Pref_Utils.cpp | 0 .../virtualmemory/Pref_Utils.h | 0 .../virtualmemory/VMSettings.cpp | 0 .../virtualmemory/VMSettings.h | 0 .../virtualmemory/VirtualMemory.rdef | 0 .../virtualmemory/main.cpp | 0 .../virtualmemory/main.h | 0 src/{prefs => preferences}/workspaces/Jamfile | 2 +- .../workspaces/Workspaces.cpp | 0 .../workspaces/Workspaces.rdef | 0 src/prefs/Jamfile | 25 - 342 files changed, 680 insertions(+), 680 deletions(-) create mode 100644 src/preferences/Jamfile rename src/{prefs => preferences}/appearance/APRMain.cpp (100%) rename src/{prefs => preferences}/appearance/APRMain.h (100%) rename src/{prefs => preferences}/appearance/APRView.cpp (100%) rename src/{prefs => preferences}/appearance/APRView.h (100%) rename src/{prefs => preferences}/appearance/APRWindow.cpp (100%) rename src/{prefs => preferences}/appearance/APRWindow.h (100%) rename src/{prefs => preferences}/appearance/Appearance.rdef (100%) rename src/{prefs => preferences}/appearance/ColorWell.cpp (100%) rename src/{prefs => preferences}/appearance/ColorWell.h (100%) rename src/{prefs => preferences}/appearance/ColorWhichItem.cpp (100%) rename src/{prefs => preferences}/appearance/ColorWhichItem.h (100%) rename src/{prefs => preferences}/appearance/CurView.cpp (100%) rename src/{prefs => preferences}/appearance/CurView.h (100%) rename src/{prefs => preferences}/appearance/CursorWhichItem.cpp (100%) rename src/{prefs => preferences}/appearance/CursorWhichItem.h (100%) rename src/{prefs => preferences}/appearance/DecView.cpp (100%) rename src/{prefs => preferences}/appearance/DecView.h (100%) rename src/{prefs => preferences}/appearance/FontMenu.cpp (100%) rename src/{prefs => preferences}/appearance/FontMenu.h (100%) rename src/{prefs => preferences}/appearance/Jamfile (91%) rename src/{prefs => preferences}/appearance/MenuView.cpp (100%) rename src/{prefs => preferences}/appearance/MenuView.h (100%) rename src/{prefs => preferences}/appearance/SysCursorAPI.cpp (100%) rename src/{prefs => preferences}/appearance/SysCursorAPI.h (100%) rename src/{prefs => preferences}/appearance/defs.h (100%) rename src/{prefs => preferences}/backgrounds/BGMain.cpp (100%) rename src/{prefs => preferences}/backgrounds/BGMain.h (100%) rename src/{prefs => preferences}/backgrounds/BGView.cpp (100%) rename src/{prefs => preferences}/backgrounds/BGView.h (100%) rename src/{prefs => preferences}/backgrounds/BGWindow.cpp (100%) rename src/{prefs => preferences}/backgrounds/BGWindow.h (100%) rename src/{prefs => preferences}/backgrounds/BackgroundImage.cpp (100%) rename src/{prefs => preferences}/backgrounds/BackgroundImage.h (100%) rename src/{prefs => preferences}/backgrounds/Backgrounds.rdef (100%) rename src/{prefs => preferences}/backgrounds/Jamfile (80%) rename src/{prefs => preferences}/datatranslations/DataTranslations.cpp (100%) rename src/{prefs => preferences}/datatranslations/DataTranslations.h (100%) rename src/{prefs => preferences}/datatranslations/DataTranslations.rdef (100%) rename src/{prefs => preferences}/datatranslations/DataTranslationsMessages.h (100%) rename src/{prefs => preferences}/datatranslations/DataTranslationsSettings.cpp (100%) rename src/{prefs => preferences}/datatranslations/DataTranslationsSettings.h (100%) rename src/{prefs => preferences}/datatranslations/DataTranslationsView.cpp (100%) rename src/{prefs => preferences}/datatranslations/DataTranslationsView.h (100%) rename src/{prefs => preferences}/datatranslations/DataTranslationsWindow.cpp (100%) rename src/{prefs => preferences}/datatranslations/DataTranslationsWindow.h (100%) rename src/{prefs => preferences}/datatranslations/IconView.cpp (100%) rename src/{prefs => preferences}/datatranslations/IconView.h (100%) rename src/{prefs => preferences}/datatranslations/Jamfile (80%) rename src/{prefs => preferences}/devices/ConfigurationWindow.cpp (100%) rename src/{prefs => preferences}/devices/Devices.cpp (100%) rename src/{prefs => preferences}/devices/Devices.rdef (100%) rename src/{prefs => preferences}/devices/DevicesInfo.cpp (100%) rename src/{prefs => preferences}/devices/DevicesInfo.h (100%) rename src/{prefs => preferences}/devices/DevicesWindow.cpp (96%) rename src/{prefs => preferences}/devices/DevicesWindows.h (95%) rename src/{prefs => preferences}/devices/Jamfile (96%) rename src/{prefs => preferences}/devices/ModemWindow.cpp (100%) rename src/{prefs => preferences}/devices/ResourceUsageWindow.cpp (100%) rename src/{prefs => preferences}/devices/cm_wrapper.c (100%) rename src/{prefs => preferences}/devices/cm_wrapper.h (100%) rename src/{prefs => preferences}/devices/config_driver.h (100%) rename src/{prefs => preferences}/devices/devlist2h.awk (100%) rename src/{prefs => preferences}/devices/isapnp_devids.txt (100%) rename src/{prefs => preferences}/devices/pcihdr.h (100%) rename src/{prefs => preferences}/devices/usb_devlist2h.awk (100%) rename src/{prefs => preferences}/devices/usbdevs (100%) rename src/{prefs => preferences}/drivesetup/DriveSetup.rdef (100%) rename src/{prefs => preferences}/drivesetup/Jamfile (76%) rename src/{prefs => preferences}/drivesetup/MainWindow.cpp (100%) rename src/{prefs => preferences}/drivesetup/MainWindow.h (100%) rename src/{prefs => preferences}/drivesetup/PosSettings.cpp (100%) rename src/{prefs => preferences}/drivesetup/PosSettings.h (100%) rename src/{prefs => preferences}/drivesetup/main.cpp (100%) rename src/{prefs => preferences}/drivesetup/main.h (100%) rename src/{prefs => preferences}/drivesetup/structs.h (100%) rename src/{prefs => preferences}/dun/DUN.cpp (100%) rename src/{prefs => preferences}/dun/DUN.h (100%) rename src/{prefs => preferences}/dun/DUN.rdef (100%) rename src/{prefs => preferences}/dun/DUNView.cpp (100%) rename src/{prefs => preferences}/dun/DUNView.h (100%) rename src/{prefs => preferences}/dun/DUNWindow.cpp (100%) rename src/{prefs => preferences}/dun/DUNWindow.h (100%) rename src/{prefs => preferences}/dun/DetailsView.cpp (100%) rename src/{prefs => preferences}/dun/DetailsView.h (100%) rename src/{prefs => preferences}/dun/Jamfile (70%) rename src/{prefs => preferences}/dun/LocationView.cpp (100%) rename src/{prefs => preferences}/dun/LocationView.h (100%) rename src/{prefs => preferences}/dun/ModemWindow.cpp (100%) rename src/{prefs => preferences}/dun/ModemWindow.h (100%) rename src/{prefs => preferences}/dun/NewConnectionWindow.cpp (100%) rename src/{prefs => preferences}/dun/NewConnectionWindow.h (100%) rename src/{prefs => preferences}/dun/README (100%) rename src/{prefs => preferences}/dun/SettingsWindow.cpp (100%) rename src/{prefs => preferences}/dun/SettingsWindow.h (100%) rename src/{prefs => preferences}/dun/TreeView.cpp (100%) rename src/{prefs => preferences}/dun/TreeView.h (100%) rename src/{prefs => preferences}/dun/makefile (100%) rename src/{prefs => preferences}/filetypes/FileTypes.icons.rdef (100%) rename src/{prefs => preferences}/filetypes/FileTypes.rdef (100%) rename src/{prefs => preferences}/filetypes/FileTypes.version.rdef (100%) rename src/{prefs => preferences}/filetypes/FileTypesApp.cpp (100%) rename src/{prefs => preferences}/filetypes/FileTypesApp.h (100%) rename src/{prefs => preferences}/filetypes/FileTypesConstants.h (100%) rename src/{prefs => preferences}/filetypes/FileTypesView.cpp (100%) rename src/{prefs => preferences}/filetypes/FileTypesView.h (100%) rename src/{prefs => preferences}/filetypes/FileTypesWindow.cpp (100%) rename src/{prefs => preferences}/filetypes/FileTypesWindow.h (100%) rename src/{prefs => preferences}/filetypes/Jamfile (80%) rename src/{prefs => preferences}/filetypes/main.cpp (100%) rename src/{prefs => preferences}/fonts/.doxygen-conf (100%) rename src/{prefs => preferences}/fonts/ButtonView.cpp (100%) rename src/{prefs => preferences}/fonts/ButtonView.h (100%) rename src/{prefs => preferences}/fonts/CacheView.cpp (100%) rename src/{prefs => preferences}/fonts/CacheView.h (100%) rename src/{prefs => preferences}/fonts/FontSelectionView.cpp (100%) rename src/{prefs => preferences}/fonts/FontSelectionView.h (100%) rename src/{prefs => preferences}/fonts/FontView.cpp (100%) rename src/{prefs => preferences}/fonts/FontView.h (100%) rename src/{prefs => preferences}/fonts/Fonts.rdef (100%) rename src/{prefs => preferences}/fonts/FontsSettings.cpp (100%) rename src/{prefs => preferences}/fonts/FontsSettings.h (100%) rename src/{prefs => preferences}/fonts/Jamfile (81%) rename src/{prefs => preferences}/fonts/MainWindow.cpp (100%) rename src/{prefs => preferences}/fonts/MainWindow.h (100%) rename src/{prefs => preferences}/fonts/Pref_Utils.cpp (100%) rename src/{prefs => preferences}/fonts/Pref_Utils.h (100%) rename src/{prefs => preferences}/fonts/main.cpp (100%) rename src/{prefs => preferences}/fonts/main.h (100%) rename src/{prefs => preferences}/keyboard/Jamfile (87%) rename src/{prefs => preferences}/keyboard/Keyboard.cpp (100%) rename src/{prefs => preferences}/keyboard/Keyboard.h (100%) rename src/{prefs => preferences}/keyboard/Keyboard.rdef (100%) rename src/{prefs => preferences}/keyboard/KeyboardMessages.h (100%) rename src/{prefs => preferences}/keyboard/KeyboardSettings.cpp (100%) rename src/{prefs => preferences}/keyboard/KeyboardSettings.h (100%) rename src/{prefs => preferences}/keyboard/KeyboardView.cpp (100%) rename src/{prefs => preferences}/keyboard/KeyboardView.h (100%) rename src/{prefs => preferences}/keyboard/KeyboardWindow.cpp (100%) rename src/{prefs => preferences}/keyboard/KeyboardWindow.h (100%) rename src/{prefs => preferences}/keymap/Jamfile (82%) rename src/{prefs => preferences}/keymap/Keymap.cpp (100%) rename src/{prefs => preferences}/keymap/Keymap.h (100%) rename src/{prefs => preferences}/keymap/Keymap.rdef (100%) rename src/{prefs => preferences}/keymap/KeymapApplication.cpp (100%) rename src/{prefs => preferences}/keymap/KeymapApplication.h (100%) rename src/{prefs => preferences}/keymap/KeymapListItem.cpp (100%) rename src/{prefs => preferences}/keymap/KeymapListItem.h (100%) rename src/{prefs => preferences}/keymap/KeymapTextView.cpp (100%) rename src/{prefs => preferences}/keymap/KeymapTextView.h (100%) rename src/{prefs => preferences}/keymap/KeymapWindow.cpp (100%) rename src/{prefs => preferences}/keymap/KeymapWindow.h (100%) rename src/{prefs => preferences}/mail/Account.cpp (100%) rename src/{prefs => preferences}/mail/Account.h (100%) rename src/{prefs => preferences}/mail/CenterContainer.cpp (100%) rename src/{prefs => preferences}/mail/CenterContainer.h (100%) rename src/{prefs => preferences}/mail/ConfigViews.cpp (100%) rename src/{prefs => preferences}/mail/ConfigViews.h (100%) rename src/{prefs => preferences}/mail/ConfigWindow.cpp (100%) rename src/{prefs => preferences}/mail/ConfigWindow.h (100%) rename src/{prefs => preferences}/mail/Jamfile (88%) rename src/{prefs => preferences}/mail/e-mail.rdef (100%) rename src/{prefs => preferences}/mail/main.cpp (100%) rename src/{prefs => preferences}/media/Jamfile (85%) rename src/{prefs => preferences}/media/Media.cpp (100%) rename src/{prefs => preferences}/media/Media.h (100%) rename src/{prefs => preferences}/media/MediaAlert.cpp (100%) rename src/{prefs => preferences}/media/MediaAlert.h (100%) rename src/{prefs => preferences}/media/MediaListItem.cpp (100%) rename src/{prefs => preferences}/media/MediaListItem.h (100%) rename src/{prefs => preferences}/media/MediaViews.cpp (100%) rename src/{prefs => preferences}/media/MediaViews.h (100%) rename src/{prefs => preferences}/media/MediaWindow.cpp (100%) rename src/{prefs => preferences}/media/MediaWindow.h (100%) rename src/{prefs => preferences}/media/iconfile.h (100%) rename src/{prefs => preferences}/media/media.rdef (100%) rename src/{prefs => preferences}/menu/BitmapMenuItem.cpp (100%) rename src/{prefs => preferences}/menu/BitmapMenuItem.h (100%) rename src/{prefs => preferences}/menu/ColorPicker.cpp (100%) rename src/{prefs => preferences}/menu/ColorWindow.cpp (100%) rename src/{prefs => preferences}/menu/FontMenu.cpp (100%) rename src/{prefs => preferences}/menu/FontSizeMenu.cpp (100%) rename src/{prefs => preferences}/menu/Jamfile (83%) rename src/{prefs => preferences}/menu/Menu.rdef (100%) rename src/{prefs => preferences}/menu/MenuApp.cpp (100%) rename src/{prefs => preferences}/menu/MenuApp.h (100%) rename src/{prefs => preferences}/menu/MenuBar.cpp (100%) rename src/{prefs => preferences}/menu/MenuWindow.cpp (100%) rename src/{prefs => preferences}/menu/msg.h (100%) rename src/{prefs => preferences}/mouse/Jamfile (88%) rename src/{prefs => preferences}/mouse/Mouse.cpp (100%) rename src/{prefs => preferences}/mouse/Mouse.h (100%) rename src/{prefs => preferences}/mouse/Mouse.rdef (100%) rename src/{prefs => preferences}/mouse/MouseBitmap.h (100%) rename src/{prefs => preferences}/mouse/MouseConstants.h (100%) rename src/{prefs => preferences}/mouse/MouseSettings.cpp (100%) rename src/{prefs => preferences}/mouse/MouseSettings.h (100%) rename src/{prefs => preferences}/mouse/MouseView.cpp (100%) rename src/{prefs => preferences}/mouse/MouseView.h (100%) rename src/{prefs => preferences}/mouse/MouseWindow.cpp (100%) rename src/{prefs => preferences}/mouse/MouseWindow.h (100%) rename src/{prefs => preferences}/mouse/SettingsView.cpp (100%) rename src/{prefs => preferences}/mouse/SettingsView.h (100%) rename src/{prefs => preferences}/network/Jamfile (84%) rename src/{prefs => preferences}/network/Network.cpp (100%) rename src/{prefs => preferences}/network/Network.h (100%) rename src/{prefs => preferences}/network/Network.rdef (100%) rename src/{prefs => preferences}/network/funcs.cpp (100%) rename src/{prefs => preferences}/print/AddPrinterDialog.cpp (100%) rename src/{prefs => preferences}/print/AddPrinterDialog.h (100%) rename src/{prefs => preferences}/print/Globals.cpp (100%) rename src/{prefs => preferences}/print/Globals.h (100%) rename src/{prefs => preferences}/print/Jamfile (91%) rename src/{prefs => preferences}/print/JobListView.cpp (100%) rename src/{prefs => preferences}/print/JobListView.h (100%) rename src/{prefs => preferences}/print/Messages.h (100%) rename src/{prefs => preferences}/print/PrinterListView.cpp (100%) rename src/{prefs => preferences}/print/PrinterListView.h (100%) rename src/{prefs => preferences}/print/Printers.FileTypes.rdef (100%) rename src/{prefs => preferences}/print/Printers.cpp (100%) rename src/{prefs => preferences}/print/Printers.h (100%) rename src/{prefs => preferences}/print/PrintersWindow.cpp (100%) rename src/{prefs => preferences}/print/PrintersWindow.h (100%) rename src/{prefs => preferences}/print/SpoolFolder.cpp (100%) rename src/{prefs => preferences}/print/SpoolFolder.h (100%) rename src/{prefs => preferences}/print/doxygen.cfg (100%) rename src/{prefs => preferences}/screen/AlertView.cpp (100%) rename src/{prefs => preferences}/screen/AlertView.h (100%) rename src/{prefs => preferences}/screen/AlertWindow.cpp (100%) rename src/{prefs => preferences}/screen/AlertWindow.h (100%) rename src/{prefs => preferences}/screen/Constants.h (100%) rename src/{prefs => preferences}/screen/Jamfile (88%) rename src/{prefs => preferences}/screen/MonitorView.cpp (100%) rename src/{prefs => preferences}/screen/MonitorView.h (100%) rename src/{prefs => preferences}/screen/RefreshSlider.cpp (100%) rename src/{prefs => preferences}/screen/RefreshSlider.h (100%) rename src/{prefs => preferences}/screen/RefreshView.cpp (100%) rename src/{prefs => preferences}/screen/RefreshView.h (100%) rename src/{prefs => preferences}/screen/RefreshWindow.cpp (100%) rename src/{prefs => preferences}/screen/RefreshWindow.h (100%) rename src/{prefs => preferences}/screen/Screen.rdef (100%) rename src/{prefs => preferences}/screen/ScreenApplication.cpp (100%) rename src/{prefs => preferences}/screen/ScreenApplication.h (100%) rename src/{prefs => preferences}/screen/ScreenMode.cpp (100%) rename src/{prefs => preferences}/screen/ScreenMode.h (100%) rename src/{prefs => preferences}/screen/ScreenSettings.cpp (100%) rename src/{prefs => preferences}/screen/ScreenSettings.h (100%) rename src/{prefs => preferences}/screen/ScreenWindow.cpp (100%) rename src/{prefs => preferences}/screen/ScreenWindow.h (100%) rename src/{prefs => preferences}/screen/Utility.cpp (100%) rename src/{prefs => preferences}/screen/Utility.h (100%) rename src/{prefs => preferences}/screen/multimon.cpp (100%) rename src/{prefs => preferences}/screensaver/Constants.cpp (100%) rename src/{prefs => preferences}/screensaver/Constants.h (100%) rename src/{prefs => preferences}/screensaver/Jamfile (84%) rename src/{prefs => preferences}/screensaver/MouseAreaView.cpp (100%) rename src/{prefs => preferences}/screensaver/MouseAreaView.h (100%) rename src/{prefs => preferences}/screensaver/OBOSScreenSaverPreferences.cpp (100%) rename src/{prefs => preferences}/screensaver/OBOSScreenSaverPreferences.h (100%) rename src/{prefs => preferences}/screensaver/PreviewView.cpp (100%) rename src/{prefs => preferences}/screensaver/PreviewView.h (100%) rename src/{prefs => preferences}/screensaver/ScreenSaver.rdef (100%) rename src/{prefs => preferences}/screensaver/ScreenSaverPrefsApp.cpp (100%) rename src/{prefs => preferences}/screensaver/ScreenSaverPrefsApp.h (100%) rename src/{prefs => preferences}/screensaver/ScreenSaverWindow.cpp (100%) rename src/{prefs => preferences}/screensaver/ScreenSaverWindow.h (100%) rename src/{prefs => preferences}/screensaver/passwordWindow.cpp (100%) rename src/{prefs => preferences}/screensaver/passwordWindow.h (100%) rename src/{prefs => preferences}/screensaver/pwWindow.cpp (100%) rename src/{prefs => preferences}/screensaver/pwWindow.h (100%) rename src/{prefs => preferences}/scrollbar/Jamfile (78%) rename src/{prefs => preferences}/scrollbar/ScrollBar.rdef (100%) rename src/{prefs => preferences}/scrollbar/ScrollBarApp.cpp (100%) rename src/{prefs => preferences}/scrollbar/ScrollBarApp.h (100%) rename src/{prefs => preferences}/scrollbar/ScrollBarView.cpp (100%) rename src/{prefs => preferences}/scrollbar/ScrollBarView.h (100%) rename src/{prefs => preferences}/scrollbar/ScrollBarWindow.cpp (100%) rename src/{prefs => preferences}/scrollbar/ScrollBarWindow.h (100%) rename src/{prefs => preferences}/scrollbar/fakescrollbar.cpp (100%) rename src/{prefs => preferences}/scrollbar/fakescrollbar.h (100%) rename src/{prefs => preferences}/scrollbar/knobsizeadjuster.cpp (100%) rename src/{prefs => preferences}/scrollbar/knobsizeadjuster.h (100%) rename src/{prefs => preferences}/scrollbar/messages.h (100%) rename src/{prefs => preferences}/sounds/HApp.cpp (100%) rename src/{prefs => preferences}/sounds/HApp.h (100%) rename src/{prefs => preferences}/sounds/HEventItem.cpp (100%) rename src/{prefs => preferences}/sounds/HEventItem.h (100%) rename src/{prefs => preferences}/sounds/HEventList.cpp (100%) rename src/{prefs => preferences}/sounds/HEventList.h (100%) rename src/{prefs => preferences}/sounds/HWindow.cpp (100%) rename src/{prefs => preferences}/sounds/HWindow.h (100%) rename src/{prefs => preferences}/sounds/Jamfile (85%) rename src/{prefs => preferences}/sounds/Sounds.rdef (100%) rename src/{prefs => preferences}/time/AnalogClock.cpp (100%) rename src/{prefs => preferences}/time/AnalogClock.h (100%) rename src/{prefs => preferences}/time/BaseView.cpp (100%) rename src/{prefs => preferences}/time/BaseView.h (100%) rename src/{prefs => preferences}/time/Bitmaps.cpp (100%) rename src/{prefs => preferences}/time/Bitmaps.h (100%) rename src/{prefs => preferences}/time/CalendarView.cpp (100%) rename src/{prefs => preferences}/time/CalendarView.h (100%) rename src/{prefs => preferences}/time/DateTimeEdit.cpp (100%) rename src/{prefs => preferences}/time/DateTimeEdit.h (100%) rename src/{prefs => preferences}/time/DateUtils.cpp (100%) rename src/{prefs => preferences}/time/DateUtils.h (100%) rename src/{prefs => preferences}/time/Jamfile (87%) rename src/{prefs => preferences}/time/SectionEdit.cpp (100%) rename src/{prefs => preferences}/time/SectionEdit.h (100%) rename src/{prefs => preferences}/time/SettingsView.cpp (100%) rename src/{prefs => preferences}/time/SettingsView.h (100%) rename src/{prefs => preferences}/time/TZDisplay.cpp (100%) rename src/{prefs => preferences}/time/TZDisplay.h (100%) rename src/{prefs => preferences}/time/Time.cpp (100%) rename src/{prefs => preferences}/time/Time.h (100%) rename src/{prefs => preferences}/time/Time.rdef (100%) rename src/{prefs => preferences}/time/TimeMessages.h (100%) rename src/{prefs => preferences}/time/TimeSettings.cpp (100%) rename src/{prefs => preferences}/time/TimeSettings.h (100%) rename src/{prefs => preferences}/time/TimeView.cpp (100%) rename src/{prefs => preferences}/time/TimeView.h (100%) rename src/{prefs => preferences}/time/TimeWindow.cpp (100%) rename src/{prefs => preferences}/time/TimeWindow.h (100%) rename src/{prefs => preferences}/time/ZoneView.cpp (100%) rename src/{prefs => preferences}/time/ZoneView.h (100%) rename src/{prefs => preferences}/time/hierarchy (100%) rename src/{prefs => preferences}/virtualmemory/.doxygen-conf (100%) rename src/{prefs => preferences}/virtualmemory/Jamfile (75%) rename src/{prefs => preferences}/virtualmemory/MainWindow.cpp (100%) rename src/{prefs => preferences}/virtualmemory/MainWindow.h (100%) rename src/{prefs => preferences}/virtualmemory/Pref_Utils.cpp (100%) rename src/{prefs => preferences}/virtualmemory/Pref_Utils.h (100%) rename src/{prefs => preferences}/virtualmemory/VMSettings.cpp (100%) rename src/{prefs => preferences}/virtualmemory/VMSettings.h (100%) rename src/{prefs => preferences}/virtualmemory/VirtualMemory.rdef (100%) rename src/{prefs => preferences}/virtualmemory/main.cpp (100%) rename src/{prefs => preferences}/virtualmemory/main.h (100%) rename src/{prefs => preferences}/workspaces/Jamfile (64%) rename src/{prefs => preferences}/workspaces/Workspaces.cpp (100%) rename src/{prefs => preferences}/workspaces/Workspaces.rdef (100%) delete mode 100644 src/prefs/Jamfile diff --git a/src/Jamfile b/src/Jamfile index ff58008bfe..6b6e5629cc 100644 --- a/src/Jamfile +++ b/src/Jamfile @@ -7,7 +7,7 @@ SubInclude OBOS_TOP src data ; SubInclude OBOS_TOP src documentation ; SubInclude OBOS_TOP src kits ; SubInclude OBOS_TOP src libs ; -SubInclude OBOS_TOP src prefs ; +SubInclude OBOS_TOP src preferences ; SubInclude OBOS_TOP src servers ; SubInclude OBOS_TOP src system ; SubInclude OBOS_TOP src tests ; diff --git a/src/add-ons/kernel/bus_managers/pci/Jamfile b/src/add-ons/kernel/bus_managers/pci/Jamfile index 1f90c7fc04..10326076f3 100644 --- a/src/add-ons/kernel/bus_managers/pci/Jamfile +++ b/src/add-ons/kernel/bus_managers/pci/Jamfile @@ -18,6 +18,6 @@ SEARCH on [ FGristFiles # pci_info.cpp currently needs pcihdr.h so we make its path available ObjectHdrs [ FGristFiles pci_info$(SUFOBJ) ] - : [ FDirName $(OBOS_TOP) src prefs devices ] ; + : [ FDirName $(OBOS_TOP) src preferences devices ] ; SubInclude OBOS_TOP src add-ons kernel bus_managers pci arch $(OBOS_ARCH) ; diff --git a/src/preferences/Jamfile b/src/preferences/Jamfile new file mode 100644 index 0000000000..bddc86614d --- /dev/null +++ b/src/preferences/Jamfile @@ -0,0 +1,25 @@ +SubDir OBOS_TOP src preferences ; + +SubInclude OBOS_TOP src preferences appearance ; +SubInclude OBOS_TOP src preferences backgrounds ; +SubInclude OBOS_TOP src preferences datatranslations ; +SubInclude OBOS_TOP src preferences devices ; +SubInclude OBOS_TOP src preferences drivesetup ; +SubInclude OBOS_TOP src preferences dun ; +SubInclude OBOS_TOP src preferences filetypes ; +SubInclude OBOS_TOP src preferences fonts ; +SubInclude OBOS_TOP src preferences keyboard ; +SubInclude OBOS_TOP src preferences keymap ; +SubInclude OBOS_TOP src preferences mail ; +SubInclude OBOS_TOP src preferences media ; +SubInclude OBOS_TOP src preferences menu ; +SubInclude OBOS_TOP src preferences mouse ; +SubInclude OBOS_TOP src preferences network ; +SubInclude OBOS_TOP src preferences print ; +SubInclude OBOS_TOP src preferences screen ; +SubInclude OBOS_TOP src preferences screensaver ; +SubInclude OBOS_TOP src preferences scrollbar ; +SubInclude OBOS_TOP src preferences sounds ; +SubInclude OBOS_TOP src preferences time ; +SubInclude OBOS_TOP src preferences virtualmemory ; +SubInclude OBOS_TOP src preferences workspaces ; diff --git a/src/prefs/appearance/APRMain.cpp b/src/preferences/appearance/APRMain.cpp similarity index 100% rename from src/prefs/appearance/APRMain.cpp rename to src/preferences/appearance/APRMain.cpp diff --git a/src/prefs/appearance/APRMain.h b/src/preferences/appearance/APRMain.h similarity index 100% rename from src/prefs/appearance/APRMain.h rename to src/preferences/appearance/APRMain.h diff --git a/src/prefs/appearance/APRView.cpp b/src/preferences/appearance/APRView.cpp similarity index 100% rename from src/prefs/appearance/APRView.cpp rename to src/preferences/appearance/APRView.cpp diff --git a/src/prefs/appearance/APRView.h b/src/preferences/appearance/APRView.h similarity index 100% rename from src/prefs/appearance/APRView.h rename to src/preferences/appearance/APRView.h diff --git a/src/prefs/appearance/APRWindow.cpp b/src/preferences/appearance/APRWindow.cpp similarity index 100% rename from src/prefs/appearance/APRWindow.cpp rename to src/preferences/appearance/APRWindow.cpp diff --git a/src/prefs/appearance/APRWindow.h b/src/preferences/appearance/APRWindow.h similarity index 100% rename from src/prefs/appearance/APRWindow.h rename to src/preferences/appearance/APRWindow.h diff --git a/src/prefs/appearance/Appearance.rdef b/src/preferences/appearance/Appearance.rdef similarity index 100% rename from src/prefs/appearance/Appearance.rdef rename to src/preferences/appearance/Appearance.rdef diff --git a/src/prefs/appearance/ColorWell.cpp b/src/preferences/appearance/ColorWell.cpp similarity index 100% rename from src/prefs/appearance/ColorWell.cpp rename to src/preferences/appearance/ColorWell.cpp diff --git a/src/prefs/appearance/ColorWell.h b/src/preferences/appearance/ColorWell.h similarity index 100% rename from src/prefs/appearance/ColorWell.h rename to src/preferences/appearance/ColorWell.h diff --git a/src/prefs/appearance/ColorWhichItem.cpp b/src/preferences/appearance/ColorWhichItem.cpp similarity index 100% rename from src/prefs/appearance/ColorWhichItem.cpp rename to src/preferences/appearance/ColorWhichItem.cpp diff --git a/src/prefs/appearance/ColorWhichItem.h b/src/preferences/appearance/ColorWhichItem.h similarity index 100% rename from src/prefs/appearance/ColorWhichItem.h rename to src/preferences/appearance/ColorWhichItem.h diff --git a/src/prefs/appearance/CurView.cpp b/src/preferences/appearance/CurView.cpp similarity index 100% rename from src/prefs/appearance/CurView.cpp rename to src/preferences/appearance/CurView.cpp diff --git a/src/prefs/appearance/CurView.h b/src/preferences/appearance/CurView.h similarity index 100% rename from src/prefs/appearance/CurView.h rename to src/preferences/appearance/CurView.h diff --git a/src/prefs/appearance/CursorWhichItem.cpp b/src/preferences/appearance/CursorWhichItem.cpp similarity index 100% rename from src/prefs/appearance/CursorWhichItem.cpp rename to src/preferences/appearance/CursorWhichItem.cpp diff --git a/src/prefs/appearance/CursorWhichItem.h b/src/preferences/appearance/CursorWhichItem.h similarity index 100% rename from src/prefs/appearance/CursorWhichItem.h rename to src/preferences/appearance/CursorWhichItem.h diff --git a/src/prefs/appearance/DecView.cpp b/src/preferences/appearance/DecView.cpp similarity index 100% rename from src/prefs/appearance/DecView.cpp rename to src/preferences/appearance/DecView.cpp diff --git a/src/prefs/appearance/DecView.h b/src/preferences/appearance/DecView.h similarity index 100% rename from src/prefs/appearance/DecView.h rename to src/preferences/appearance/DecView.h diff --git a/src/prefs/appearance/FontMenu.cpp b/src/preferences/appearance/FontMenu.cpp similarity index 100% rename from src/prefs/appearance/FontMenu.cpp rename to src/preferences/appearance/FontMenu.cpp diff --git a/src/prefs/appearance/FontMenu.h b/src/preferences/appearance/FontMenu.h similarity index 100% rename from src/prefs/appearance/FontMenu.h rename to src/preferences/appearance/FontMenu.h diff --git a/src/prefs/appearance/Jamfile b/src/preferences/appearance/Jamfile similarity index 91% rename from src/prefs/appearance/Jamfile rename to src/preferences/appearance/Jamfile index 608506f851..93338f0176 100644 --- a/src/prefs/appearance/Jamfile +++ b/src/preferences/appearance/Jamfile @@ -1,4 +1,4 @@ -SubDir OBOS_TOP src prefs appearance ; +SubDir OBOS_TOP src preferences appearance ; UsePrivateHeaders app [ FDirName servers app ] ; diff --git a/src/prefs/appearance/MenuView.cpp b/src/preferences/appearance/MenuView.cpp similarity index 100% rename from src/prefs/appearance/MenuView.cpp rename to src/preferences/appearance/MenuView.cpp diff --git a/src/prefs/appearance/MenuView.h b/src/preferences/appearance/MenuView.h similarity index 100% rename from src/prefs/appearance/MenuView.h rename to src/preferences/appearance/MenuView.h diff --git a/src/prefs/appearance/SysCursorAPI.cpp b/src/preferences/appearance/SysCursorAPI.cpp similarity index 100% rename from src/prefs/appearance/SysCursorAPI.cpp rename to src/preferences/appearance/SysCursorAPI.cpp diff --git a/src/prefs/appearance/SysCursorAPI.h b/src/preferences/appearance/SysCursorAPI.h similarity index 100% rename from src/prefs/appearance/SysCursorAPI.h rename to src/preferences/appearance/SysCursorAPI.h diff --git a/src/prefs/appearance/defs.h b/src/preferences/appearance/defs.h similarity index 100% rename from src/prefs/appearance/defs.h rename to src/preferences/appearance/defs.h diff --git a/src/prefs/backgrounds/BGMain.cpp b/src/preferences/backgrounds/BGMain.cpp similarity index 100% rename from src/prefs/backgrounds/BGMain.cpp rename to src/preferences/backgrounds/BGMain.cpp diff --git a/src/prefs/backgrounds/BGMain.h b/src/preferences/backgrounds/BGMain.h similarity index 100% rename from src/prefs/backgrounds/BGMain.h rename to src/preferences/backgrounds/BGMain.h diff --git a/src/prefs/backgrounds/BGView.cpp b/src/preferences/backgrounds/BGView.cpp similarity index 100% rename from src/prefs/backgrounds/BGView.cpp rename to src/preferences/backgrounds/BGView.cpp diff --git a/src/prefs/backgrounds/BGView.h b/src/preferences/backgrounds/BGView.h similarity index 100% rename from src/prefs/backgrounds/BGView.h rename to src/preferences/backgrounds/BGView.h diff --git a/src/prefs/backgrounds/BGWindow.cpp b/src/preferences/backgrounds/BGWindow.cpp similarity index 100% rename from src/prefs/backgrounds/BGWindow.cpp rename to src/preferences/backgrounds/BGWindow.cpp diff --git a/src/prefs/backgrounds/BGWindow.h b/src/preferences/backgrounds/BGWindow.h similarity index 100% rename from src/prefs/backgrounds/BGWindow.h rename to src/preferences/backgrounds/BGWindow.h diff --git a/src/prefs/backgrounds/BackgroundImage.cpp b/src/preferences/backgrounds/BackgroundImage.cpp similarity index 100% rename from src/prefs/backgrounds/BackgroundImage.cpp rename to src/preferences/backgrounds/BackgroundImage.cpp diff --git a/src/prefs/backgrounds/BackgroundImage.h b/src/preferences/backgrounds/BackgroundImage.h similarity index 100% rename from src/prefs/backgrounds/BackgroundImage.h rename to src/preferences/backgrounds/BackgroundImage.h diff --git a/src/prefs/backgrounds/Backgrounds.rdef b/src/preferences/backgrounds/Backgrounds.rdef similarity index 100% rename from src/prefs/backgrounds/Backgrounds.rdef rename to src/preferences/backgrounds/Backgrounds.rdef diff --git a/src/prefs/backgrounds/Jamfile b/src/preferences/backgrounds/Jamfile similarity index 80% rename from src/prefs/backgrounds/Jamfile rename to src/preferences/backgrounds/Jamfile index 7d69f66173..5e82bf90f8 100644 --- a/src/prefs/backgrounds/Jamfile +++ b/src/preferences/backgrounds/Jamfile @@ -1,4 +1,4 @@ -SubDir OBOS_TOP src prefs backgrounds ; +SubDir OBOS_TOP src preferences backgrounds ; UsePrivateHeaders shared ; diff --git a/src/prefs/datatranslations/DataTranslations.cpp b/src/preferences/datatranslations/DataTranslations.cpp similarity index 100% rename from src/prefs/datatranslations/DataTranslations.cpp rename to src/preferences/datatranslations/DataTranslations.cpp diff --git a/src/prefs/datatranslations/DataTranslations.h b/src/preferences/datatranslations/DataTranslations.h similarity index 100% rename from src/prefs/datatranslations/DataTranslations.h rename to src/preferences/datatranslations/DataTranslations.h diff --git a/src/prefs/datatranslations/DataTranslations.rdef b/src/preferences/datatranslations/DataTranslations.rdef similarity index 100% rename from src/prefs/datatranslations/DataTranslations.rdef rename to src/preferences/datatranslations/DataTranslations.rdef diff --git a/src/prefs/datatranslations/DataTranslationsMessages.h b/src/preferences/datatranslations/DataTranslationsMessages.h similarity index 100% rename from src/prefs/datatranslations/DataTranslationsMessages.h rename to src/preferences/datatranslations/DataTranslationsMessages.h diff --git a/src/prefs/datatranslations/DataTranslationsSettings.cpp b/src/preferences/datatranslations/DataTranslationsSettings.cpp similarity index 100% rename from src/prefs/datatranslations/DataTranslationsSettings.cpp rename to src/preferences/datatranslations/DataTranslationsSettings.cpp diff --git a/src/prefs/datatranslations/DataTranslationsSettings.h b/src/preferences/datatranslations/DataTranslationsSettings.h similarity index 100% rename from src/prefs/datatranslations/DataTranslationsSettings.h rename to src/preferences/datatranslations/DataTranslationsSettings.h diff --git a/src/prefs/datatranslations/DataTranslationsView.cpp b/src/preferences/datatranslations/DataTranslationsView.cpp similarity index 100% rename from src/prefs/datatranslations/DataTranslationsView.cpp rename to src/preferences/datatranslations/DataTranslationsView.cpp diff --git a/src/prefs/datatranslations/DataTranslationsView.h b/src/preferences/datatranslations/DataTranslationsView.h similarity index 100% rename from src/prefs/datatranslations/DataTranslationsView.h rename to src/preferences/datatranslations/DataTranslationsView.h diff --git a/src/prefs/datatranslations/DataTranslationsWindow.cpp b/src/preferences/datatranslations/DataTranslationsWindow.cpp similarity index 100% rename from src/prefs/datatranslations/DataTranslationsWindow.cpp rename to src/preferences/datatranslations/DataTranslationsWindow.cpp diff --git a/src/prefs/datatranslations/DataTranslationsWindow.h b/src/preferences/datatranslations/DataTranslationsWindow.h similarity index 100% rename from src/prefs/datatranslations/DataTranslationsWindow.h rename to src/preferences/datatranslations/DataTranslationsWindow.h diff --git a/src/prefs/datatranslations/IconView.cpp b/src/preferences/datatranslations/IconView.cpp similarity index 100% rename from src/prefs/datatranslations/IconView.cpp rename to src/preferences/datatranslations/IconView.cpp diff --git a/src/prefs/datatranslations/IconView.h b/src/preferences/datatranslations/IconView.h similarity index 100% rename from src/prefs/datatranslations/IconView.h rename to src/preferences/datatranslations/IconView.h diff --git a/src/prefs/datatranslations/Jamfile b/src/preferences/datatranslations/Jamfile similarity index 80% rename from src/prefs/datatranslations/Jamfile rename to src/preferences/datatranslations/Jamfile index 5c8655051f..69a31abfe6 100644 --- a/src/prefs/datatranslations/Jamfile +++ b/src/preferences/datatranslations/Jamfile @@ -1,4 +1,4 @@ -SubDir OBOS_TOP src prefs datatranslations ; +SubDir OBOS_TOP src preferences datatranslations ; Preference DataTranslations : DataTranslations.cpp diff --git a/src/prefs/devices/ConfigurationWindow.cpp b/src/preferences/devices/ConfigurationWindow.cpp similarity index 100% rename from src/prefs/devices/ConfigurationWindow.cpp rename to src/preferences/devices/ConfigurationWindow.cpp diff --git a/src/prefs/devices/Devices.cpp b/src/preferences/devices/Devices.cpp similarity index 100% rename from src/prefs/devices/Devices.cpp rename to src/preferences/devices/Devices.cpp diff --git a/src/prefs/devices/Devices.rdef b/src/preferences/devices/Devices.rdef similarity index 100% rename from src/prefs/devices/Devices.rdef rename to src/preferences/devices/Devices.rdef diff --git a/src/prefs/devices/DevicesInfo.cpp b/src/preferences/devices/DevicesInfo.cpp similarity index 100% rename from src/prefs/devices/DevicesInfo.cpp rename to src/preferences/devices/DevicesInfo.cpp diff --git a/src/prefs/devices/DevicesInfo.h b/src/preferences/devices/DevicesInfo.h similarity index 100% rename from src/prefs/devices/DevicesInfo.h rename to src/preferences/devices/DevicesInfo.h diff --git a/src/prefs/devices/DevicesWindow.cpp b/src/preferences/devices/DevicesWindow.cpp similarity index 96% rename from src/prefs/devices/DevicesWindow.cpp rename to src/preferences/devices/DevicesWindow.cpp index 8f319f8e39..6d635eee24 100644 --- a/src/prefs/devices/DevicesWindow.cpp +++ b/src/preferences/devices/DevicesWindow.cpp @@ -1,521 +1,521 @@ -// ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ -// -// Copyright (c) 2003-2004, OpenBeOS -// -// This software is part of the OpenBeOS distribution and is covered -// by the OpenBeOS license. -// -// -// File: DevicesWindow.cpp -// Author: Sikosis, Jérôme Duval -// Description: Devices Preferences -// Created : March 04, 2003 -// -// ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ - -// Includes -------------------------------------------------------------------------------------------------- // -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "DevicesWindows.h" -#include "DevicesInfo.h" - -const uint32 MENU_FILE_ABOUT_DEVICES = 'mfad'; -const uint32 MENU_FILE_QUIT = 'mfqt'; -const uint32 MENU_DEVICES_REMOVE_JUMPERED_DEVICE = 'mdrj'; -const uint32 MENU_DEVICES_NEW_JUMPERED_DEVICE = 'mdnj'; -const uint32 MENU_DEVICES_NEW_JUMPERED_DEVICE_CUSTOM = 'mdcj'; -const uint32 MENU_DEVICES_NEW_JUMPERED_DEVICE_MODEM = 'mdcm'; -const uint32 MENU_DEVICES_RESOURCE_USAGE = 'mdru'; -const uint32 BTN_CONFIGURE = 'bcfg'; -const uint32 SELECTION_CHANGED = 'slch'; - - -// CenterWindowOnScreen -- Centers the BWindow to the Current Screen -void CenterWindowOnScreen(BWindow* w) -{ - BRect screenFrame = (BScreen(B_MAIN_SCREEN_ID).Frame()); - BPoint pt; - pt.x = screenFrame.Width()/2 - w->Bounds().Width()/2; - pt.y = screenFrame.Height()/2 - w->Bounds().Height()/2; - - if (screenFrame.Contains(pt)) - w->MoveTo(pt); -} -// ---------------------------------------------------------------------------------------------------------- // - - -// DevicesWindow - Constructor -DevicesWindow::DevicesWindow(BRect frame) : BWindow (frame, "Devices", B_TITLED_WINDOW, B_NORMAL_WINDOW_FEEL , 0) -{ - InitWindow(); - CenterWindowOnScreen(this); - - // Load User Settings - BPath path; - find_directory(B_USER_SETTINGS_DIRECTORY,&path); - path.Append("Devices_Settings",true); - BFile file(path.Path(),B_READ_ONLY); - BMessage msg; - msg.Unflatten(&file); - LoadSettings (&msg); - - status_t error; - - if ((error = init_cm_wrapper()) < 0) { - printf("Error initializing configuration manager (%s)\n", strerror(error)); - exit(1); - } - - InitDevices(B_ISA_BUS); - InitDevices(B_PCI_BUS); - - for (int32 i=fList.CountItems()-1; i>=0; i--) { - DevicesInfo *deviceInfo = (DevicesInfo *) fList.ItemAt(i); - struct device_info *info = deviceInfo->GetInfo(); - BListItem *item = systemMenu; - if (info->bus == B_ISA_BUS) { - uint32 id = info->id[0]; - if ((id >> 24 == 'P') - && (((id >> 16) & 0xff) == 'n') - && (((id >> 8) & 0xff) == 'P')) { - item = isaMenu; - } else { - item = systemMenu; - } - } else if (info->bus == B_PCI_BUS) - item = pciMenu; - - outline->AddUnder(new DeviceItem(deviceInfo, deviceInfo->GetCardName()), item); - } - - if (outline->CountItemsUnder(jumperedMenu, true)==0) - outline->AddUnder(new BStringItem(""), jumperedMenu); - if (outline->CountItemsUnder(pciMenu, true)==0) - outline->AddUnder(new BStringItem(""), pciMenu); - if (outline->CountItemsUnder(isaMenu, true)==0) - outline->AddUnder(new BStringItem(""), isaMenu); - if (outline->CountItemsUnder(systemMenu, true)==0) - outline->AddUnder(new BStringItem(""), systemMenu); - - Show(); -} -// ---------------------------------------------------------------------------------------------------------- // - - -// DevicesWindow - Destructor -DevicesWindow::~DevicesWindow() -{ - void *item; - while ((item = fList.RemoveItem((int32)0))) - delete (DevicesInfo*)item; - uninit_cm_wrapper(); -} -// ---------------------------------------------------------------------------------------------------------- // - - -// DevicesWindow::InitWindow -- Initialization Commands here -void DevicesWindow::InitWindow(void) -{ - BRect r; - r = Bounds(); // the whole view - - BMenuItem *mniRemoveJumperedDevice; - - // Add the menu bar - menubar = new BMenuBar(r, "menu_bar"); - - // Add File menu to menu bar - BMenu *menu = new BMenu("File"); - menu->AddItem(new BMenuItem("About Devices" B_UTF8_ELLIPSIS, new BMessage(MENU_FILE_ABOUT_DEVICES), 0)); - menu->AddSeparatorItem(); - menu->AddItem(new BMenuItem("Quit", new BMessage(MENU_FILE_QUIT), 'Q')); - menubar->AddItem(menu); - - menu = new BMenu("Devices"); - menubar->AddItem(menu); - - BMenu *jumperedDevicesMenu = new BMenu("New Jumpered Device"); - jumperedDevicesMenu->AddItem(new BMenuItem("Custom ...", new BMessage(MENU_DEVICES_NEW_JUMPERED_DEVICE_CUSTOM), 0)); - jumperedDevicesMenu->AddItem(new BMenuItem("Modem ...", new BMessage(MENU_DEVICES_NEW_JUMPERED_DEVICE_MODEM), 0)); - - //DevicesMenu->AddItem(new BMenuItem("New Jumpered Device", new BMessage(MENU_DEVICES_NEW_JUMPERED_DEVICE), NULL)); - menu->AddItem(jumperedDevicesMenu); - - menu->AddItem(mniRemoveJumperedDevice = new BMenuItem("Remove Jumpered Device", new BMessage(MENU_DEVICES_REMOVE_JUMPERED_DEVICE), 'R')); - menu->AddSeparatorItem(); - menu->AddItem(new BMenuItem("Resource Usage", new BMessage(MENU_DEVICES_RESOURCE_USAGE), 'U')); - - mniRemoveJumperedDevice->SetEnabled(false); - - // Create the StringViews - stvDeviceName = new BStringView(BRect(16, 16, 150, 40), "DeviceName", "Device Name"); - stvCurrentState = new BStringView(BRect(248, 16, r.right-10, 40), "CurrentState", "Current State"); - - float fCurrentHeight = 279; - float fCurrentGap = 15; - stvIRQ = new BStringView(BRect(r.left+22,r.top+fCurrentHeight,r.right-13,r.top+fCurrentHeight+20),"IRQ","IRQs:", B_FOLLOW_LEFT | B_FOLLOW_BOTTOM); - fCurrentHeight = fCurrentHeight + fCurrentGap; - stvDMA = new BStringView(BRect(r.left+22,r.top+fCurrentHeight,r.right-13,r.top+fCurrentHeight+20),"DMA","DMAs:", B_FOLLOW_LEFT | B_FOLLOW_BOTTOM); - fCurrentHeight = fCurrentHeight + fCurrentGap; - stvIORanges = new BStringView(BRect(r.left+22,r.top+fCurrentHeight,r.right-13,r.top+fCurrentHeight+20),"IORanges","IO Ranges:", B_FOLLOW_LEFT | B_FOLLOW_BOTTOM); - fCurrentHeight = fCurrentHeight + fCurrentGap; - stvMemoryRanges = new BStringView(BRect(r.left+22,r.top+fCurrentHeight,r.right-13,r.top+fCurrentHeight+20),"MemoryRanges","Memory Ranges:", B_FOLLOW_LEFT | B_FOLLOW_BOTTOM); - fCurrentHeight = fCurrentHeight + fCurrentGap; - - // Create the OutlineView - BRect outlinerect(r.left+14,r.top+45,r.right-28,r.top+262); - BScrollView *outlinesv; - - outline = new BOutlineListView(outlinerect,"devices_list", B_SINGLE_SELECTION_LIST, B_FOLLOW_LEFT_RIGHT|B_FOLLOW_TOP_BOTTOM); - outline->AddItem(systemMenu = new DeviceItem(NULL, "System Devices")); - outline->AddItem(isaMenu = new DeviceItem(NULL, "ISA/Plug and Play Devices")); - outline->AddItem(pciMenu = new DeviceItem(NULL, "PCI Devices")); - outline->AddItem(jumperedMenu = new DeviceItem(NULL, "Jumpered Devices")); - - outline->SetSelectionMessage(new BMessage(SELECTION_CHANGED)); - outline->SetInvocationMessage(new BMessage(BTN_CONFIGURE)); - - // Add ScrollView to Devices Window - outlinesv = new BScrollView("scroll_devices", outline, B_FOLLOW_LEFT_RIGHT|B_FOLLOW_TOP_BOTTOM, 0, false, true, B_FANCY_BORDER); - - // Setup the OutlineView - outline->AllAttached(); - outlinesv->SetBorderHighlighted(true); - - // Back and Fore ground Colours - outline->SetHighColor(0,0,0,0); - outline->SetLowColor(255,255,255,0); - - // Font Settings - BFont OutlineFont; - OutlineFont.SetSpacing(B_CHAR_SPACING); - OutlineFont.SetSize(12); - outline->SetFont(&OutlineFont,B_FONT_SHEAR | B_FONT_SPACING); - - // Create BBox (or Frame) - BBox *BottomFrame; - BRect BottomFrameRect(r.left+11,r.bottom-124,r.right-12,r.bottom-12); - BottomFrame = new BBox(BottomFrameRect, "BottomFrame", B_FOLLOW_LEFT_RIGHT | B_FOLLOW_BOTTOM, B_WILL_DRAW, B_FANCY_BORDER); - BRect bottomFrameBounds = BottomFrame->Bounds(); - - // Create BButton - Configure - BRect ConfigureButtonRect(bottomFrameBounds.left+290, bottomFrameBounds.bottom-37, - bottomFrameBounds.right-13, bottomFrameBounds.bottom-13); - btnConfigure = new BButton(ConfigureButtonRect,"btnConfigure","Configure", new BMessage(BTN_CONFIGURE), B_FOLLOW_RIGHT | B_FOLLOW_BOTTOM, B_WILL_DRAW | B_NAVIGABLE); - btnConfigure->MakeDefault(true); - btnConfigure->SetEnabled(false); - - // Create a basic View - BBox *background = new BBox(Bounds(), "background", B_FOLLOW_ALL_SIDES, B_WILL_DRAW, B_PLAIN_BORDER); - AddChild(background); - - // Add Child(ren) - in reverse order to avoid one control overwriting another - background->AddChild(BottomFrame); - BottomFrame->AddChild(btnConfigure); - background->AddChild(outlinesv); - background->AddChild(stvMemoryRanges); - background->AddChild(stvIORanges); - background->AddChild(stvDMA); - background->AddChild(stvIRQ); - background->AddChild(stvDeviceName); - background->AddChild(stvCurrentState); - background->AddChild(menubar); - - // Set Window Limits - float xsize = 396 + (be_plain_font->Size()-10)*40; - if (xsize > 443) - xsize = 443; - SetSizeLimits(xsize,xsize,400,BScreen().Frame().Height()); -} -// ---------------------------------------------------------------------------------------------------------- // - - -// DevicesWindow::QuitRequested -- Post a message to the app to quit -bool DevicesWindow::QuitRequested() -{ - SaveSettings(); - be_app->PostMessage(B_QUIT_REQUESTED); - return true; -} -// ---------------------------------------------------------------------------------------------------------- // - - -// DevicesWindow::LoadSettings -- Loads your current settings -void DevicesWindow::LoadSettings(BMessage *msg) -{ - BRect frame; - - if (B_OK == msg->FindRect("windowframe",&frame)) { - MoveTo(frame.left,frame.top); - ResizeTo(frame.right-frame.left,frame.bottom-frame.top); - } -} -// -------------------------------------------------------------------------------------------------------------- // - - -// DevicesWindow::SaveSettings -- Saves the Users settings -void DevicesWindow::SaveSettings(void) -{ - BMessage msg; - msg.AddRect("windowframe",Frame()); - - BPath path; - status_t result = find_directory(B_USER_SETTINGS_DIRECTORY,&path); - if (result == B_OK) - { - path.Append("Devices_Settings",true); - BFile file(path.Path(),B_READ_WRITE | B_CREATE_FILE | B_ERASE_FILE); - msg.Flatten(&file); - } -} -// ------------------------------------------------------------------------------- // - - -// DevicesWindow::MessageReceived -- receives messages -void -DevicesWindow::MessageReceived (BMessage *message) -{ - switch(message->what) - { - case MENU_FILE_ABOUT_DEVICES: - { - (new BAlert("", "Devices\n\n\t'Just write a simple app to add a jumpered\n\tdevice to the system', he said.\n\n\tAnd many years later another he said\n\t'recreate it' ;)", "OK"))->Go(); - } - break; - case MENU_FILE_QUIT: - { - QuitRequested(); - } - break; - case MENU_DEVICES_NEW_JUMPERED_DEVICE_MODEM: - { - ptrModemWindow = new ModemWindow(BRect(0,0,200,194), BMessenger(this)); - } - break; - case MENU_DEVICES_RESOURCE_USAGE: - { - ptrResourceUsageWindow = new ResourceUsageWindow(BRect(0,0,430,350), fList); - } - break; - case SELECTION_CHANGED: - { - UpdateDeviceInfo(); - } - break; - case MODEM_ADDED: - { - - } - break; - case BTN_CONFIGURE: - { - DeviceItem *devItem = dynamic_cast(outline->ItemAt(outline->CurrentSelection())); - if (devItem && devItem->GetInfo()) { - if (devItem->GetWindow()!=NULL) - devItem->GetWindow()->Activate(); - else - new ConfigurationWindow(BRect(150,150,562,602), devItem); - } - } - break; - default: - BWindow::MessageReceived(message); - break; - } - UpdateIfNeeded(); -} -// ---------------------------------------------------------------------------------------------------------- // - -void -DevicesWindow::InitDevices(bus_type bus) -{ - status_t size; - uint64 cookie; - struct device_info dummy, *info; - struct device_configuration *current; - struct possible_device_configurations *possible; - - cookie = 0; - while (get_next_device_info(bus, &cookie, &dummy, sizeof(dummy)) == B_OK) { - info = (struct device_info *)malloc(dummy.size); - if (!info) { - printf("Out of core\n"); - break; - } - - if (get_device_info_for(cookie, info, dummy.size) != B_OK) { - printf("Error getting device information\n"); - break; - } - - size = get_size_of_current_configuration_for(cookie); - if (size < B_OK) { - printf("Error getting the size of the current configuration\n"); - break; - } - current = (struct device_configuration *)malloc(size); - if (!current) { - printf("Out of core\n"); - break; - } - - if (get_current_configuration_for(cookie, current, size) != B_OK) { - printf("Error getting the current configuration\n"); - break; - } - - size = get_size_of_possible_configurations_for(cookie); - if (size < B_OK) { - printf("Error getting the size of the possible configurations\n"); - break; - } - possible = (struct possible_device_configurations *)malloc(size); - if (!possible) { - printf("Out of core\n"); - break; - } - - if (get_possible_configurations_for(cookie, possible, size) != B_OK) { - printf("Error getting the possible configurations\n"); - break; - } - - fList.AddItem(new DevicesInfo(info, current, possible)); - } - -} - -void -DevicesWindow::UpdateDeviceInfo() -{ - DeviceItem *item = dynamic_cast(outline->ItemAt(outline->CurrentSelection())); - if (item) { - DevicesInfo *deviceInfo = item->GetInfo(); - if (deviceInfo) { - struct device_configuration *current = deviceInfo->GetCurrent(); - resource_descriptor r; - - { - BString text = "IRQs: "; - bool first = true; - int32 num = count_resource_descriptors_of_type(current, B_IRQ_RESOURCE); - - for (int32 i=0;i>=1,i++) - if (mask & 1) { - char value[50]; - sprintf(value, "%s%d", first ? "" : ", ", i); - text += value; - first = false; - } - } - stvIRQ->SetText(text.String()); - } - - { - BString text = "DMAs: "; - bool first = true; - int32 num = count_resource_descriptors_of_type(current, B_DMA_RESOURCE); - - for (int32 i=0;i>=1,i++) - if (mask & 1) { - char value[50]; - sprintf(value, "%s%d", first ? "" : ", ", i); - text += value; - first = false; - } - } - stvDMA->SetText(text.String()); - } - - { - BString text = "IO Ranges: "; - bool first = true; - int32 num = count_resource_descriptors_of_type(current, B_IO_PORT_RESOURCE); - - for (int32 i=0;i70) { - text.Truncate(70); - text += "..."; - } - stvIORanges->SetText(text.String()); - } - - { - BString text = "Memory Ranges: "; - bool first = true; - int32 num = count_resource_descriptors_of_type(current, B_MEMORY_RESOURCE); - - for (int32 i=0;i70) { - text.Truncate(70); - text += "..."; - } - stvMemoryRanges->SetText(text.String()); - } - - btnConfigure->SetEnabled(true); - } else { - BlankDeviceInfoBox(); - } - } else { - BlankDeviceInfoBox(); - } -} - -void -DevicesWindow::BlankDeviceInfoBox() -{ - stvIRQ->SetText("IRQs: "); - stvDMA->SetText("DMAs: "); - stvIORanges->SetText("IO Ranges: "); - stvMemoryRanges->SetText("Memory Ranges: "); - btnConfigure->SetEnabled(false); -} +// ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ +// +// Copyright (c) 2003-2004, OpenBeOS +// +// This software is part of the OpenBeOS distribution and is covered +// by the OpenBeOS license. +// +// +// File: DevicesWindow.cpp +// Author: Sikosis, Jérôme Duval +// Description: Devices Preferences +// Created : March 04, 2003 +// +// ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ + +// Includes -------------------------------------------------------------------------------------------------- // +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "DevicesWindows.h" +#include "DevicesInfo.h" + +const uint32 MENU_FILE_ABOUT_DEVICES = 'mfad'; +const uint32 MENU_FILE_QUIT = 'mfqt'; +const uint32 MENU_DEVICES_REMOVE_JUMPERED_DEVICE = 'mdrj'; +const uint32 MENU_DEVICES_NEW_JUMPERED_DEVICE = 'mdnj'; +const uint32 MENU_DEVICES_NEW_JUMPERED_DEVICE_CUSTOM = 'mdcj'; +const uint32 MENU_DEVICES_NEW_JUMPERED_DEVICE_MODEM = 'mdcm'; +const uint32 MENU_DEVICES_RESOURCE_USAGE = 'mdru'; +const uint32 BTN_CONFIGURE = 'bcfg'; +const uint32 SELECTION_CHANGED = 'slch'; + + +// CenterWindowOnScreen -- Centers the BWindow to the Current Screen +void CenterWindowOnScreen(BWindow* w) +{ + BRect screenFrame = (BScreen(B_MAIN_SCREEN_ID).Frame()); + BPoint pt; + pt.x = screenFrame.Width()/2 - w->Bounds().Width()/2; + pt.y = screenFrame.Height()/2 - w->Bounds().Height()/2; + + if (screenFrame.Contains(pt)) + w->MoveTo(pt); +} +// ---------------------------------------------------------------------------------------------------------- // + + +// DevicesWindow - Constructor +DevicesWindow::DevicesWindow(BRect frame) : BWindow (frame, "Devices", B_TITLED_WINDOW, B_NORMAL_WINDOW_FEEL , 0) +{ + InitWindow(); + CenterWindowOnScreen(this); + + // Load User Settings + BPath path; + find_directory(B_USER_SETTINGS_DIRECTORY,&path); + path.Append("Devices_Settings",true); + BFile file(path.Path(),B_READ_ONLY); + BMessage msg; + msg.Unflatten(&file); + LoadSettings (&msg); + + status_t error; + + if ((error = init_cm_wrapper()) < 0) { + printf("Error initializing configuration manager (%s)\n", strerror(error)); + exit(1); + } + + InitDevices(B_ISA_BUS); + InitDevices(B_PCI_BUS); + + for (int32 i=fList.CountItems()-1; i>=0; i--) { + DevicesInfo *deviceInfo = (DevicesInfo *) fList.ItemAt(i); + struct device_info *info = deviceInfo->GetInfo(); + BListItem *item = systemMenu; + if (info->bus == B_ISA_BUS) { + uint32 id = info->id[0]; + if ((id >> 24 == 'P') + && (((id >> 16) & 0xff) == 'n') + && (((id >> 8) & 0xff) == 'P')) { + item = isaMenu; + } else { + item = systemMenu; + } + } else if (info->bus == B_PCI_BUS) + item = pciMenu; + + outline->AddUnder(new DeviceItem(deviceInfo, deviceInfo->GetCardName()), item); + } + + if (outline->CountItemsUnder(jumperedMenu, true)==0) + outline->AddUnder(new BStringItem(""), jumperedMenu); + if (outline->CountItemsUnder(pciMenu, true)==0) + outline->AddUnder(new BStringItem(""), pciMenu); + if (outline->CountItemsUnder(isaMenu, true)==0) + outline->AddUnder(new BStringItem(""), isaMenu); + if (outline->CountItemsUnder(systemMenu, true)==0) + outline->AddUnder(new BStringItem(""), systemMenu); + + Show(); +} +// ---------------------------------------------------------------------------------------------------------- // + + +// DevicesWindow - Destructor +DevicesWindow::~DevicesWindow() +{ + void *item; + while ((item = fList.RemoveItem((int32)0))) + delete (DevicesInfo*)item; + uninit_cm_wrapper(); +} +// ---------------------------------------------------------------------------------------------------------- // + + +// DevicesWindow::InitWindow -- Initialization Commands here +void DevicesWindow::InitWindow(void) +{ + BRect r; + r = Bounds(); // the whole view + + BMenuItem *mniRemoveJumperedDevice; + + // Add the menu bar + menubar = new BMenuBar(r, "menu_bar"); + + // Add File menu to menu bar + BMenu *menu = new BMenu("File"); + menu->AddItem(new BMenuItem("About Devices" B_UTF8_ELLIPSIS, new BMessage(MENU_FILE_ABOUT_DEVICES), 0)); + menu->AddSeparatorItem(); + menu->AddItem(new BMenuItem("Quit", new BMessage(MENU_FILE_QUIT), 'Q')); + menubar->AddItem(menu); + + menu = new BMenu("Devices"); + menubar->AddItem(menu); + + BMenu *jumperedDevicesMenu = new BMenu("New Jumpered Device"); + jumperedDevicesMenu->AddItem(new BMenuItem("Custom ...", new BMessage(MENU_DEVICES_NEW_JUMPERED_DEVICE_CUSTOM), 0)); + jumperedDevicesMenu->AddItem(new BMenuItem("Modem ...", new BMessage(MENU_DEVICES_NEW_JUMPERED_DEVICE_MODEM), 0)); + + //DevicesMenu->AddItem(new BMenuItem("New Jumpered Device", new BMessage(MENU_DEVICES_NEW_JUMPERED_DEVICE), NULL)); + menu->AddItem(jumperedDevicesMenu); + + menu->AddItem(mniRemoveJumperedDevice = new BMenuItem("Remove Jumpered Device", new BMessage(MENU_DEVICES_REMOVE_JUMPERED_DEVICE), 'R')); + menu->AddSeparatorItem(); + menu->AddItem(new BMenuItem("Resource Usage", new BMessage(MENU_DEVICES_RESOURCE_USAGE), 'U')); + + mniRemoveJumperedDevice->SetEnabled(false); + + // Create the StringViews + stvDeviceName = new BStringView(BRect(16, 16, 150, 40), "DeviceName", "Device Name"); + stvCurrentState = new BStringView(BRect(248, 16, r.right-10, 40), "CurrentState", "Current State"); + + float fCurrentHeight = 279; + float fCurrentGap = 15; + stvIRQ = new BStringView(BRect(r.left+22,r.top+fCurrentHeight,r.right-13,r.top+fCurrentHeight+20),"IRQ","IRQs:", B_FOLLOW_LEFT | B_FOLLOW_BOTTOM); + fCurrentHeight = fCurrentHeight + fCurrentGap; + stvDMA = new BStringView(BRect(r.left+22,r.top+fCurrentHeight,r.right-13,r.top+fCurrentHeight+20),"DMA","DMAs:", B_FOLLOW_LEFT | B_FOLLOW_BOTTOM); + fCurrentHeight = fCurrentHeight + fCurrentGap; + stvIORanges = new BStringView(BRect(r.left+22,r.top+fCurrentHeight,r.right-13,r.top+fCurrentHeight+20),"IORanges","IO Ranges:", B_FOLLOW_LEFT | B_FOLLOW_BOTTOM); + fCurrentHeight = fCurrentHeight + fCurrentGap; + stvMemoryRanges = new BStringView(BRect(r.left+22,r.top+fCurrentHeight,r.right-13,r.top+fCurrentHeight+20),"MemoryRanges","Memory Ranges:", B_FOLLOW_LEFT | B_FOLLOW_BOTTOM); + fCurrentHeight = fCurrentHeight + fCurrentGap; + + // Create the OutlineView + BRect outlinerect(r.left+14,r.top+45,r.right-28,r.top+262); + BScrollView *outlinesv; + + outline = new BOutlineListView(outlinerect,"devices_list", B_SINGLE_SELECTION_LIST, B_FOLLOW_LEFT_RIGHT|B_FOLLOW_TOP_BOTTOM); + outline->AddItem(systemMenu = new DeviceItem(NULL, "System Devices")); + outline->AddItem(isaMenu = new DeviceItem(NULL, "ISA/Plug and Play Devices")); + outline->AddItem(pciMenu = new DeviceItem(NULL, "PCI Devices")); + outline->AddItem(jumperedMenu = new DeviceItem(NULL, "Jumpered Devices")); + + outline->SetSelectionMessage(new BMessage(SELECTION_CHANGED)); + outline->SetInvocationMessage(new BMessage(BTN_CONFIGURE)); + + // Add ScrollView to Devices Window + outlinesv = new BScrollView("scroll_devices", outline, B_FOLLOW_LEFT_RIGHT|B_FOLLOW_TOP_BOTTOM, 0, false, true, B_FANCY_BORDER); + + // Setup the OutlineView + outline->AllAttached(); + outlinesv->SetBorderHighlighted(true); + + // Back and Fore ground Colours + outline->SetHighColor(0,0,0,0); + outline->SetLowColor(255,255,255,0); + + // Font Settings + BFont OutlineFont; + OutlineFont.SetSpacing(B_CHAR_SPACING); + OutlineFont.SetSize(12); + outline->SetFont(&OutlineFont,B_FONT_SHEAR | B_FONT_SPACING); + + // Create BBox (or Frame) + BBox *BottomFrame; + BRect BottomFrameRect(r.left+11,r.bottom-124,r.right-12,r.bottom-12); + BottomFrame = new BBox(BottomFrameRect, "BottomFrame", B_FOLLOW_LEFT_RIGHT | B_FOLLOW_BOTTOM, B_WILL_DRAW, B_FANCY_BORDER); + BRect bottomFrameBounds = BottomFrame->Bounds(); + + // Create BButton - Configure + BRect ConfigureButtonRect(bottomFrameBounds.left+290, bottomFrameBounds.bottom-37, + bottomFrameBounds.right-13, bottomFrameBounds.bottom-13); + btnConfigure = new BButton(ConfigureButtonRect,"btnConfigure","Configure", new BMessage(BTN_CONFIGURE), B_FOLLOW_RIGHT | B_FOLLOW_BOTTOM, B_WILL_DRAW | B_NAVIGABLE); + btnConfigure->MakeDefault(true); + btnConfigure->SetEnabled(false); + + // Create a basic View + BBox *background = new BBox(Bounds(), "background", B_FOLLOW_ALL_SIDES, B_WILL_DRAW, B_PLAIN_BORDER); + AddChild(background); + + // Add Child(ren) - in reverse order to avoid one control overwriting another + background->AddChild(BottomFrame); + BottomFrame->AddChild(btnConfigure); + background->AddChild(outlinesv); + background->AddChild(stvMemoryRanges); + background->AddChild(stvIORanges); + background->AddChild(stvDMA); + background->AddChild(stvIRQ); + background->AddChild(stvDeviceName); + background->AddChild(stvCurrentState); + background->AddChild(menubar); + + // Set Window Limits + float xsize = 396 + (be_plain_font->Size()-10)*40; + if (xsize > 443) + xsize = 443; + SetSizeLimits(xsize,xsize,400,BScreen().Frame().Height()); +} +// ---------------------------------------------------------------------------------------------------------- // + + +// DevicesWindow::QuitRequested -- Post a message to the app to quit +bool DevicesWindow::QuitRequested() +{ + SaveSettings(); + be_app->PostMessage(B_QUIT_REQUESTED); + return true; +} +// ---------------------------------------------------------------------------------------------------------- // + + +// DevicesWindow::LoadSettings -- Loads your current settings +void DevicesWindow::LoadSettings(BMessage *msg) +{ + BRect frame; + + if (B_OK == msg->FindRect("windowframe",&frame)) { + MoveTo(frame.left,frame.top); + ResizeTo(frame.right-frame.left,frame.bottom-frame.top); + } +} +// -------------------------------------------------------------------------------------------------------------- // + + +// DevicesWindow::SaveSettings -- Saves the Users settings +void DevicesWindow::SaveSettings(void) +{ + BMessage msg; + msg.AddRect("windowframe",Frame()); + + BPath path; + status_t result = find_directory(B_USER_SETTINGS_DIRECTORY,&path); + if (result == B_OK) + { + path.Append("Devices_Settings",true); + BFile file(path.Path(),B_READ_WRITE | B_CREATE_FILE | B_ERASE_FILE); + msg.Flatten(&file); + } +} +// ------------------------------------------------------------------------------- // + + +// DevicesWindow::MessageReceived -- receives messages +void +DevicesWindow::MessageReceived (BMessage *message) +{ + switch(message->what) + { + case MENU_FILE_ABOUT_DEVICES: + { + (new BAlert("", "Devices\n\n\t'Just write a simple app to add a jumpered\n\tdevice to the system', he said.\n\n\tAnd many years later another he said\n\t'recreate it' ;)", "OK"))->Go(); + } + break; + case MENU_FILE_QUIT: + { + QuitRequested(); + } + break; + case MENU_DEVICES_NEW_JUMPERED_DEVICE_MODEM: + { + ptrModemWindow = new ModemWindow(BRect(0,0,200,194), BMessenger(this)); + } + break; + case MENU_DEVICES_RESOURCE_USAGE: + { + ptrResourceUsageWindow = new ResourceUsageWindow(BRect(0,0,430,350), fList); + } + break; + case SELECTION_CHANGED: + { + UpdateDeviceInfo(); + } + break; + case MODEM_ADDED: + { + + } + break; + case BTN_CONFIGURE: + { + DeviceItem *devItem = dynamic_cast(outline->ItemAt(outline->CurrentSelection())); + if (devItem && devItem->GetInfo()) { + if (devItem->GetWindow()!=NULL) + devItem->GetWindow()->Activate(); + else + new ConfigurationWindow(BRect(150,150,562,602), devItem); + } + } + break; + default: + BWindow::MessageReceived(message); + break; + } + UpdateIfNeeded(); +} +// ---------------------------------------------------------------------------------------------------------- // + +void +DevicesWindow::InitDevices(bus_type bus) +{ + status_t size; + uint64 cookie; + struct device_info dummy, *info; + struct device_configuration *current; + struct possible_device_configurations *possible; + + cookie = 0; + while (get_next_device_info(bus, &cookie, &dummy, sizeof(dummy)) == B_OK) { + info = (struct device_info *)malloc(dummy.size); + if (!info) { + printf("Out of core\n"); + break; + } + + if (get_device_info_for(cookie, info, dummy.size) != B_OK) { + printf("Error getting device information\n"); + break; + } + + size = get_size_of_current_configuration_for(cookie); + if (size < B_OK) { + printf("Error getting the size of the current configuration\n"); + break; + } + current = (struct device_configuration *)malloc(size); + if (!current) { + printf("Out of core\n"); + break; + } + + if (get_current_configuration_for(cookie, current, size) != B_OK) { + printf("Error getting the current configuration\n"); + break; + } + + size = get_size_of_possible_configurations_for(cookie); + if (size < B_OK) { + printf("Error getting the size of the possible configurations\n"); + break; + } + possible = (struct possible_device_configurations *)malloc(size); + if (!possible) { + printf("Out of core\n"); + break; + } + + if (get_possible_configurations_for(cookie, possible, size) != B_OK) { + printf("Error getting the possible configurations\n"); + break; + } + + fList.AddItem(new DevicesInfo(info, current, possible)); + } + +} + +void +DevicesWindow::UpdateDeviceInfo() +{ + DeviceItem *item = dynamic_cast(outline->ItemAt(outline->CurrentSelection())); + if (item) { + DevicesInfo *deviceInfo = item->GetInfo(); + if (deviceInfo) { + struct device_configuration *current = deviceInfo->GetCurrent(); + resource_descriptor r; + + { + BString text = "IRQs: "; + bool first = true; + int32 num = count_resource_descriptors_of_type(current, B_IRQ_RESOURCE); + + for (int32 i=0;i>=1,i++) + if (mask & 1) { + char value[50]; + sprintf(value, "%s%d", first ? "" : ", ", i); + text += value; + first = false; + } + } + stvIRQ->SetText(text.String()); + } + + { + BString text = "DMAs: "; + bool first = true; + int32 num = count_resource_descriptors_of_type(current, B_DMA_RESOURCE); + + for (int32 i=0;i>=1,i++) + if (mask & 1) { + char value[50]; + sprintf(value, "%s%d", first ? "" : ", ", i); + text += value; + first = false; + } + } + stvDMA->SetText(text.String()); + } + + { + BString text = "IO Ranges: "; + bool first = true; + int32 num = count_resource_descriptors_of_type(current, B_IO_PORT_RESOURCE); + + for (int32 i=0;i70) { + text.Truncate(70); + text += "..."; + } + stvIORanges->SetText(text.String()); + } + + { + BString text = "Memory Ranges: "; + bool first = true; + int32 num = count_resource_descriptors_of_type(current, B_MEMORY_RESOURCE); + + for (int32 i=0;i70) { + text.Truncate(70); + text += "..."; + } + stvMemoryRanges->SetText(text.String()); + } + + btnConfigure->SetEnabled(true); + } else { + BlankDeviceInfoBox(); + } + } else { + BlankDeviceInfoBox(); + } +} + +void +DevicesWindow::BlankDeviceInfoBox() +{ + stvIRQ->SetText("IRQs: "); + stvDMA->SetText("DMAs: "); + stvIORanges->SetText("IO Ranges: "); + stvMemoryRanges->SetText("Memory Ranges: "); + btnConfigure->SetEnabled(false); +} diff --git a/src/prefs/devices/DevicesWindows.h b/src/preferences/devices/DevicesWindows.h similarity index 95% rename from src/prefs/devices/DevicesWindows.h rename to src/preferences/devices/DevicesWindows.h index 396ccdd8dd..7b714e5e98 100644 --- a/src/prefs/devices/DevicesWindows.h +++ b/src/preferences/devices/DevicesWindows.h @@ -1,109 +1,109 @@ -// ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ -// -// Copyright (c) 2003-2004, OpenBeOS -// -// This software is part of the OpenBeOS distribution and is covered -// by the OpenBeOS license. -// -// -// File: DevicesWindows.h -// Author: Sikosis, Jérôme Duval -// Description: Devices Preferences -// Created : March 04, 2003 -// -// ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ - - -#ifndef __DEVICESWINDOWS_H__ -#define __DEVICESWINDOWS_H__ - -#include -#include -#include -#include - -#include "DevicesInfo.h" - -#include "cm_wrapper.h" - -#define MODEM_ADDED 'moad' - -void CenterWindowOnScreen(BWindow* w); - -class ResourceUsageWindow : public BWindow -{ - public: - ResourceUsageWindow(BRect frame, BList &); - ~ResourceUsageWindow(); - virtual void MessageReceived(BMessage *message); - - private: - void InitWindow(BList &); -}; - - -class ModemWindow : public BWindow -{ - public: - ModemWindow(BRect frame, BMessenger); - ~ModemWindow(); - virtual void MessageReceived(BMessage *message); - private: - void InitWindow(void); - BMessenger fMessenger; -}; - -class ConfigurationWindow : public BWindow -{ - public: - ConfigurationWindow(BRect frame, DeviceItem *item); - ~ConfigurationWindow(); - virtual bool QuitRequested(); - virtual void MessageReceived(BMessage *message); - private: - void InitWindow(void); - DeviceItem *fItem; - BMenu *fConfigurationMenu; - BPopUpMenu *fIRQMenu[3]; - BMenuField *fIRQField[3]; - BPopUpMenu *fDMAMenu[3]; - BMenuField *fDMAField[3]; - BListView *ioListView, *memoryListView; -}; - - -class DevicesWindow : public BWindow -{ - public: - DevicesWindow(BRect frame); - ~DevicesWindow(); - virtual bool QuitRequested(); - virtual void MessageReceived(BMessage *message); - private: - void InitWindow(void); - void InitDevices(bus_type bus); - void LoadSettings(BMessage *msg); - void SaveSettings(void); - void UpdateDeviceInfo(); - void BlankDeviceInfoBox(); - - ResourceUsageWindow* ptrResourceUsageWindow; - ModemWindow* ptrModemWindow; - - BStringView *stvDeviceName; - BStringView *stvCurrentState; - BMenuBar *menubar; - - BList fList; - - BListItem *systemMenu, *isaMenu, *pciMenu, *jumperedMenu; - BOutlineListView *outline; - BStringView *stvIRQ; - BStringView *stvDMA; - BStringView *stvIORanges; - BStringView *stvMemoryRanges; - BButton *btnConfigure; -}; - -#endif - +// ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ +// +// Copyright (c) 2003-2004, OpenBeOS +// +// This software is part of the OpenBeOS distribution and is covered +// by the OpenBeOS license. +// +// +// File: DevicesWindows.h +// Author: Sikosis, Jérôme Duval +// Description: Devices Preferences +// Created : March 04, 2003 +// +// ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ + + +#ifndef __DEVICESWINDOWS_H__ +#define __DEVICESWINDOWS_H__ + +#include +#include +#include +#include + +#include "DevicesInfo.h" + +#include "cm_wrapper.h" + +#define MODEM_ADDED 'moad' + +void CenterWindowOnScreen(BWindow* w); + +class ResourceUsageWindow : public BWindow +{ + public: + ResourceUsageWindow(BRect frame, BList &); + ~ResourceUsageWindow(); + virtual void MessageReceived(BMessage *message); + + private: + void InitWindow(BList &); +}; + + +class ModemWindow : public BWindow +{ + public: + ModemWindow(BRect frame, BMessenger); + ~ModemWindow(); + virtual void MessageReceived(BMessage *message); + private: + void InitWindow(void); + BMessenger fMessenger; +}; + +class ConfigurationWindow : public BWindow +{ + public: + ConfigurationWindow(BRect frame, DeviceItem *item); + ~ConfigurationWindow(); + virtual bool QuitRequested(); + virtual void MessageReceived(BMessage *message); + private: + void InitWindow(void); + DeviceItem *fItem; + BMenu *fConfigurationMenu; + BPopUpMenu *fIRQMenu[3]; + BMenuField *fIRQField[3]; + BPopUpMenu *fDMAMenu[3]; + BMenuField *fDMAField[3]; + BListView *ioListView, *memoryListView; +}; + + +class DevicesWindow : public BWindow +{ + public: + DevicesWindow(BRect frame); + ~DevicesWindow(); + virtual bool QuitRequested(); + virtual void MessageReceived(BMessage *message); + private: + void InitWindow(void); + void InitDevices(bus_type bus); + void LoadSettings(BMessage *msg); + void SaveSettings(void); + void UpdateDeviceInfo(); + void BlankDeviceInfoBox(); + + ResourceUsageWindow* ptrResourceUsageWindow; + ModemWindow* ptrModemWindow; + + BStringView *stvDeviceName; + BStringView *stvCurrentState; + BMenuBar *menubar; + + BList fList; + + BListItem *systemMenu, *isaMenu, *pciMenu, *jumperedMenu; + BOutlineListView *outline; + BStringView *stvIRQ; + BStringView *stvDMA; + BStringView *stvIORanges; + BStringView *stvMemoryRanges; + BButton *btnConfigure; +}; + +#endif + diff --git a/src/prefs/devices/Jamfile b/src/preferences/devices/Jamfile similarity index 96% rename from src/prefs/devices/Jamfile rename to src/preferences/devices/Jamfile index 21dbe9f11f..11b52c4440 100644 --- a/src/prefs/devices/Jamfile +++ b/src/preferences/devices/Jamfile @@ -1,4 +1,4 @@ -SubDir OBOS_TOP src prefs devices ; +SubDir OBOS_TOP src preferences devices ; rule ISAPnPHeaderGen { diff --git a/src/prefs/devices/ModemWindow.cpp b/src/preferences/devices/ModemWindow.cpp similarity index 100% rename from src/prefs/devices/ModemWindow.cpp rename to src/preferences/devices/ModemWindow.cpp diff --git a/src/prefs/devices/ResourceUsageWindow.cpp b/src/preferences/devices/ResourceUsageWindow.cpp similarity index 100% rename from src/prefs/devices/ResourceUsageWindow.cpp rename to src/preferences/devices/ResourceUsageWindow.cpp diff --git a/src/prefs/devices/cm_wrapper.c b/src/preferences/devices/cm_wrapper.c similarity index 100% rename from src/prefs/devices/cm_wrapper.c rename to src/preferences/devices/cm_wrapper.c diff --git a/src/prefs/devices/cm_wrapper.h b/src/preferences/devices/cm_wrapper.h similarity index 100% rename from src/prefs/devices/cm_wrapper.h rename to src/preferences/devices/cm_wrapper.h diff --git a/src/prefs/devices/config_driver.h b/src/preferences/devices/config_driver.h similarity index 100% rename from src/prefs/devices/config_driver.h rename to src/preferences/devices/config_driver.h diff --git a/src/prefs/devices/devlist2h.awk b/src/preferences/devices/devlist2h.awk similarity index 100% rename from src/prefs/devices/devlist2h.awk rename to src/preferences/devices/devlist2h.awk diff --git a/src/prefs/devices/isapnp_devids.txt b/src/preferences/devices/isapnp_devids.txt similarity index 100% rename from src/prefs/devices/isapnp_devids.txt rename to src/preferences/devices/isapnp_devids.txt diff --git a/src/prefs/devices/pcihdr.h b/src/preferences/devices/pcihdr.h similarity index 100% rename from src/prefs/devices/pcihdr.h rename to src/preferences/devices/pcihdr.h diff --git a/src/prefs/devices/usb_devlist2h.awk b/src/preferences/devices/usb_devlist2h.awk similarity index 100% rename from src/prefs/devices/usb_devlist2h.awk rename to src/preferences/devices/usb_devlist2h.awk diff --git a/src/prefs/devices/usbdevs b/src/preferences/devices/usbdevs similarity index 100% rename from src/prefs/devices/usbdevs rename to src/preferences/devices/usbdevs diff --git a/src/prefs/drivesetup/DriveSetup.rdef b/src/preferences/drivesetup/DriveSetup.rdef similarity index 100% rename from src/prefs/drivesetup/DriveSetup.rdef rename to src/preferences/drivesetup/DriveSetup.rdef diff --git a/src/prefs/drivesetup/Jamfile b/src/preferences/drivesetup/Jamfile similarity index 76% rename from src/prefs/drivesetup/Jamfile rename to src/preferences/drivesetup/Jamfile index 62200eeb55..eec6834fa3 100644 --- a/src/prefs/drivesetup/Jamfile +++ b/src/preferences/drivesetup/Jamfile @@ -1,4 +1,4 @@ -SubDir OBOS_TOP src prefs drivesetup ; +SubDir OBOS_TOP src preferences drivesetup ; AddResources DriveSetup : DriveSetup.rdef ; diff --git a/src/prefs/drivesetup/MainWindow.cpp b/src/preferences/drivesetup/MainWindow.cpp similarity index 100% rename from src/prefs/drivesetup/MainWindow.cpp rename to src/preferences/drivesetup/MainWindow.cpp diff --git a/src/prefs/drivesetup/MainWindow.h b/src/preferences/drivesetup/MainWindow.h similarity index 100% rename from src/prefs/drivesetup/MainWindow.h rename to src/preferences/drivesetup/MainWindow.h diff --git a/src/prefs/drivesetup/PosSettings.cpp b/src/preferences/drivesetup/PosSettings.cpp similarity index 100% rename from src/prefs/drivesetup/PosSettings.cpp rename to src/preferences/drivesetup/PosSettings.cpp diff --git a/src/prefs/drivesetup/PosSettings.h b/src/preferences/drivesetup/PosSettings.h similarity index 100% rename from src/prefs/drivesetup/PosSettings.h rename to src/preferences/drivesetup/PosSettings.h diff --git a/src/prefs/drivesetup/main.cpp b/src/preferences/drivesetup/main.cpp similarity index 100% rename from src/prefs/drivesetup/main.cpp rename to src/preferences/drivesetup/main.cpp diff --git a/src/prefs/drivesetup/main.h b/src/preferences/drivesetup/main.h similarity index 100% rename from src/prefs/drivesetup/main.h rename to src/preferences/drivesetup/main.h diff --git a/src/prefs/drivesetup/structs.h b/src/preferences/drivesetup/structs.h similarity index 100% rename from src/prefs/drivesetup/structs.h rename to src/preferences/drivesetup/structs.h diff --git a/src/prefs/dun/DUN.cpp b/src/preferences/dun/DUN.cpp similarity index 100% rename from src/prefs/dun/DUN.cpp rename to src/preferences/dun/DUN.cpp diff --git a/src/prefs/dun/DUN.h b/src/preferences/dun/DUN.h similarity index 100% rename from src/prefs/dun/DUN.h rename to src/preferences/dun/DUN.h diff --git a/src/prefs/dun/DUN.rdef b/src/preferences/dun/DUN.rdef similarity index 100% rename from src/prefs/dun/DUN.rdef rename to src/preferences/dun/DUN.rdef diff --git a/src/prefs/dun/DUNView.cpp b/src/preferences/dun/DUNView.cpp similarity index 100% rename from src/prefs/dun/DUNView.cpp rename to src/preferences/dun/DUNView.cpp diff --git a/src/prefs/dun/DUNView.h b/src/preferences/dun/DUNView.h similarity index 100% rename from src/prefs/dun/DUNView.h rename to src/preferences/dun/DUNView.h diff --git a/src/prefs/dun/DUNWindow.cpp b/src/preferences/dun/DUNWindow.cpp similarity index 100% rename from src/prefs/dun/DUNWindow.cpp rename to src/preferences/dun/DUNWindow.cpp diff --git a/src/prefs/dun/DUNWindow.h b/src/preferences/dun/DUNWindow.h similarity index 100% rename from src/prefs/dun/DUNWindow.h rename to src/preferences/dun/DUNWindow.h diff --git a/src/prefs/dun/DetailsView.cpp b/src/preferences/dun/DetailsView.cpp similarity index 100% rename from src/prefs/dun/DetailsView.cpp rename to src/preferences/dun/DetailsView.cpp diff --git a/src/prefs/dun/DetailsView.h b/src/preferences/dun/DetailsView.h similarity index 100% rename from src/prefs/dun/DetailsView.h rename to src/preferences/dun/DetailsView.h diff --git a/src/prefs/dun/Jamfile b/src/preferences/dun/Jamfile similarity index 70% rename from src/prefs/dun/Jamfile rename to src/preferences/dun/Jamfile index 2230d95ab3..b252a7dad0 100644 --- a/src/prefs/dun/Jamfile +++ b/src/preferences/dun/Jamfile @@ -1,4 +1,4 @@ -SubDir OBOS_TOP src prefs dun ; +SubDir OBOS_TOP src preferences dun ; AddResources DialUpNetworking : DUN.rdef ; diff --git a/src/prefs/dun/LocationView.cpp b/src/preferences/dun/LocationView.cpp similarity index 100% rename from src/prefs/dun/LocationView.cpp rename to src/preferences/dun/LocationView.cpp diff --git a/src/prefs/dun/LocationView.h b/src/preferences/dun/LocationView.h similarity index 100% rename from src/prefs/dun/LocationView.h rename to src/preferences/dun/LocationView.h diff --git a/src/prefs/dun/ModemWindow.cpp b/src/preferences/dun/ModemWindow.cpp similarity index 100% rename from src/prefs/dun/ModemWindow.cpp rename to src/preferences/dun/ModemWindow.cpp diff --git a/src/prefs/dun/ModemWindow.h b/src/preferences/dun/ModemWindow.h similarity index 100% rename from src/prefs/dun/ModemWindow.h rename to src/preferences/dun/ModemWindow.h diff --git a/src/prefs/dun/NewConnectionWindow.cpp b/src/preferences/dun/NewConnectionWindow.cpp similarity index 100% rename from src/prefs/dun/NewConnectionWindow.cpp rename to src/preferences/dun/NewConnectionWindow.cpp diff --git a/src/prefs/dun/NewConnectionWindow.h b/src/preferences/dun/NewConnectionWindow.h similarity index 100% rename from src/prefs/dun/NewConnectionWindow.h rename to src/preferences/dun/NewConnectionWindow.h diff --git a/src/prefs/dun/README b/src/preferences/dun/README similarity index 100% rename from src/prefs/dun/README rename to src/preferences/dun/README diff --git a/src/prefs/dun/SettingsWindow.cpp b/src/preferences/dun/SettingsWindow.cpp similarity index 100% rename from src/prefs/dun/SettingsWindow.cpp rename to src/preferences/dun/SettingsWindow.cpp diff --git a/src/prefs/dun/SettingsWindow.h b/src/preferences/dun/SettingsWindow.h similarity index 100% rename from src/prefs/dun/SettingsWindow.h rename to src/preferences/dun/SettingsWindow.h diff --git a/src/prefs/dun/TreeView.cpp b/src/preferences/dun/TreeView.cpp similarity index 100% rename from src/prefs/dun/TreeView.cpp rename to src/preferences/dun/TreeView.cpp diff --git a/src/prefs/dun/TreeView.h b/src/preferences/dun/TreeView.h similarity index 100% rename from src/prefs/dun/TreeView.h rename to src/preferences/dun/TreeView.h diff --git a/src/prefs/dun/makefile b/src/preferences/dun/makefile similarity index 100% rename from src/prefs/dun/makefile rename to src/preferences/dun/makefile diff --git a/src/prefs/filetypes/FileTypes.icons.rdef b/src/preferences/filetypes/FileTypes.icons.rdef similarity index 100% rename from src/prefs/filetypes/FileTypes.icons.rdef rename to src/preferences/filetypes/FileTypes.icons.rdef diff --git a/src/prefs/filetypes/FileTypes.rdef b/src/preferences/filetypes/FileTypes.rdef similarity index 100% rename from src/prefs/filetypes/FileTypes.rdef rename to src/preferences/filetypes/FileTypes.rdef diff --git a/src/prefs/filetypes/FileTypes.version.rdef b/src/preferences/filetypes/FileTypes.version.rdef similarity index 100% rename from src/prefs/filetypes/FileTypes.version.rdef rename to src/preferences/filetypes/FileTypes.version.rdef diff --git a/src/prefs/filetypes/FileTypesApp.cpp b/src/preferences/filetypes/FileTypesApp.cpp similarity index 100% rename from src/prefs/filetypes/FileTypesApp.cpp rename to src/preferences/filetypes/FileTypesApp.cpp diff --git a/src/prefs/filetypes/FileTypesApp.h b/src/preferences/filetypes/FileTypesApp.h similarity index 100% rename from src/prefs/filetypes/FileTypesApp.h rename to src/preferences/filetypes/FileTypesApp.h diff --git a/src/prefs/filetypes/FileTypesConstants.h b/src/preferences/filetypes/FileTypesConstants.h similarity index 100% rename from src/prefs/filetypes/FileTypesConstants.h rename to src/preferences/filetypes/FileTypesConstants.h diff --git a/src/prefs/filetypes/FileTypesView.cpp b/src/preferences/filetypes/FileTypesView.cpp similarity index 100% rename from src/prefs/filetypes/FileTypesView.cpp rename to src/preferences/filetypes/FileTypesView.cpp diff --git a/src/prefs/filetypes/FileTypesView.h b/src/preferences/filetypes/FileTypesView.h similarity index 100% rename from src/prefs/filetypes/FileTypesView.h rename to src/preferences/filetypes/FileTypesView.h diff --git a/src/prefs/filetypes/FileTypesWindow.cpp b/src/preferences/filetypes/FileTypesWindow.cpp similarity index 100% rename from src/prefs/filetypes/FileTypesWindow.cpp rename to src/preferences/filetypes/FileTypesWindow.cpp diff --git a/src/prefs/filetypes/FileTypesWindow.h b/src/preferences/filetypes/FileTypesWindow.h similarity index 100% rename from src/prefs/filetypes/FileTypesWindow.h rename to src/preferences/filetypes/FileTypesWindow.h diff --git a/src/prefs/filetypes/Jamfile b/src/preferences/filetypes/Jamfile similarity index 80% rename from src/prefs/filetypes/Jamfile rename to src/preferences/filetypes/Jamfile index b654c13bea..67ab70a3fc 100644 --- a/src/prefs/filetypes/Jamfile +++ b/src/preferences/filetypes/Jamfile @@ -1,4 +1,4 @@ -SubDir OBOS_TOP src prefs filetypes ; +SubDir OBOS_TOP src preferences filetypes ; Preference FileTypes : main.cpp diff --git a/src/prefs/filetypes/main.cpp b/src/preferences/filetypes/main.cpp similarity index 100% rename from src/prefs/filetypes/main.cpp rename to src/preferences/filetypes/main.cpp diff --git a/src/prefs/fonts/.doxygen-conf b/src/preferences/fonts/.doxygen-conf similarity index 100% rename from src/prefs/fonts/.doxygen-conf rename to src/preferences/fonts/.doxygen-conf diff --git a/src/prefs/fonts/ButtonView.cpp b/src/preferences/fonts/ButtonView.cpp similarity index 100% rename from src/prefs/fonts/ButtonView.cpp rename to src/preferences/fonts/ButtonView.cpp diff --git a/src/prefs/fonts/ButtonView.h b/src/preferences/fonts/ButtonView.h similarity index 100% rename from src/prefs/fonts/ButtonView.h rename to src/preferences/fonts/ButtonView.h diff --git a/src/prefs/fonts/CacheView.cpp b/src/preferences/fonts/CacheView.cpp similarity index 100% rename from src/prefs/fonts/CacheView.cpp rename to src/preferences/fonts/CacheView.cpp diff --git a/src/prefs/fonts/CacheView.h b/src/preferences/fonts/CacheView.h similarity index 100% rename from src/prefs/fonts/CacheView.h rename to src/preferences/fonts/CacheView.h diff --git a/src/prefs/fonts/FontSelectionView.cpp b/src/preferences/fonts/FontSelectionView.cpp similarity index 100% rename from src/prefs/fonts/FontSelectionView.cpp rename to src/preferences/fonts/FontSelectionView.cpp diff --git a/src/prefs/fonts/FontSelectionView.h b/src/preferences/fonts/FontSelectionView.h similarity index 100% rename from src/prefs/fonts/FontSelectionView.h rename to src/preferences/fonts/FontSelectionView.h diff --git a/src/prefs/fonts/FontView.cpp b/src/preferences/fonts/FontView.cpp similarity index 100% rename from src/prefs/fonts/FontView.cpp rename to src/preferences/fonts/FontView.cpp diff --git a/src/prefs/fonts/FontView.h b/src/preferences/fonts/FontView.h similarity index 100% rename from src/prefs/fonts/FontView.h rename to src/preferences/fonts/FontView.h diff --git a/src/prefs/fonts/Fonts.rdef b/src/preferences/fonts/Fonts.rdef similarity index 100% rename from src/prefs/fonts/Fonts.rdef rename to src/preferences/fonts/Fonts.rdef diff --git a/src/prefs/fonts/FontsSettings.cpp b/src/preferences/fonts/FontsSettings.cpp similarity index 100% rename from src/prefs/fonts/FontsSettings.cpp rename to src/preferences/fonts/FontsSettings.cpp diff --git a/src/prefs/fonts/FontsSettings.h b/src/preferences/fonts/FontsSettings.h similarity index 100% rename from src/prefs/fonts/FontsSettings.h rename to src/preferences/fonts/FontsSettings.h diff --git a/src/prefs/fonts/Jamfile b/src/preferences/fonts/Jamfile similarity index 81% rename from src/prefs/fonts/Jamfile rename to src/preferences/fonts/Jamfile index 128408de52..4d7845f69e 100644 --- a/src/prefs/fonts/Jamfile +++ b/src/preferences/fonts/Jamfile @@ -1,4 +1,4 @@ -SubDir OBOS_TOP src prefs fonts ; +SubDir OBOS_TOP src preferences fonts ; Preference Fonts : ButtonView.cpp diff --git a/src/prefs/fonts/MainWindow.cpp b/src/preferences/fonts/MainWindow.cpp similarity index 100% rename from src/prefs/fonts/MainWindow.cpp rename to src/preferences/fonts/MainWindow.cpp diff --git a/src/prefs/fonts/MainWindow.h b/src/preferences/fonts/MainWindow.h similarity index 100% rename from src/prefs/fonts/MainWindow.h rename to src/preferences/fonts/MainWindow.h diff --git a/src/prefs/fonts/Pref_Utils.cpp b/src/preferences/fonts/Pref_Utils.cpp similarity index 100% rename from src/prefs/fonts/Pref_Utils.cpp rename to src/preferences/fonts/Pref_Utils.cpp diff --git a/src/prefs/fonts/Pref_Utils.h b/src/preferences/fonts/Pref_Utils.h similarity index 100% rename from src/prefs/fonts/Pref_Utils.h rename to src/preferences/fonts/Pref_Utils.h diff --git a/src/prefs/fonts/main.cpp b/src/preferences/fonts/main.cpp similarity index 100% rename from src/prefs/fonts/main.cpp rename to src/preferences/fonts/main.cpp diff --git a/src/prefs/fonts/main.h b/src/preferences/fonts/main.h similarity index 100% rename from src/prefs/fonts/main.h rename to src/preferences/fonts/main.h diff --git a/src/prefs/keyboard/Jamfile b/src/preferences/keyboard/Jamfile similarity index 87% rename from src/prefs/keyboard/Jamfile rename to src/preferences/keyboard/Jamfile index b3a97f5231..662651c8ed 100644 --- a/src/prefs/keyboard/Jamfile +++ b/src/preferences/keyboard/Jamfile @@ -1,4 +1,4 @@ -SubDir OBOS_TOP src prefs keyboard ; +SubDir OBOS_TOP src preferences keyboard ; if $(TARGET_PLATFORM) != haiku { SubDirC++Flags -DCOMPILE_FOR_R5 ; diff --git a/src/prefs/keyboard/Keyboard.cpp b/src/preferences/keyboard/Keyboard.cpp similarity index 100% rename from src/prefs/keyboard/Keyboard.cpp rename to src/preferences/keyboard/Keyboard.cpp diff --git a/src/prefs/keyboard/Keyboard.h b/src/preferences/keyboard/Keyboard.h similarity index 100% rename from src/prefs/keyboard/Keyboard.h rename to src/preferences/keyboard/Keyboard.h diff --git a/src/prefs/keyboard/Keyboard.rdef b/src/preferences/keyboard/Keyboard.rdef similarity index 100% rename from src/prefs/keyboard/Keyboard.rdef rename to src/preferences/keyboard/Keyboard.rdef diff --git a/src/prefs/keyboard/KeyboardMessages.h b/src/preferences/keyboard/KeyboardMessages.h similarity index 100% rename from src/prefs/keyboard/KeyboardMessages.h rename to src/preferences/keyboard/KeyboardMessages.h diff --git a/src/prefs/keyboard/KeyboardSettings.cpp b/src/preferences/keyboard/KeyboardSettings.cpp similarity index 100% rename from src/prefs/keyboard/KeyboardSettings.cpp rename to src/preferences/keyboard/KeyboardSettings.cpp diff --git a/src/prefs/keyboard/KeyboardSettings.h b/src/preferences/keyboard/KeyboardSettings.h similarity index 100% rename from src/prefs/keyboard/KeyboardSettings.h rename to src/preferences/keyboard/KeyboardSettings.h diff --git a/src/prefs/keyboard/KeyboardView.cpp b/src/preferences/keyboard/KeyboardView.cpp similarity index 100% rename from src/prefs/keyboard/KeyboardView.cpp rename to src/preferences/keyboard/KeyboardView.cpp diff --git a/src/prefs/keyboard/KeyboardView.h b/src/preferences/keyboard/KeyboardView.h similarity index 100% rename from src/prefs/keyboard/KeyboardView.h rename to src/preferences/keyboard/KeyboardView.h diff --git a/src/prefs/keyboard/KeyboardWindow.cpp b/src/preferences/keyboard/KeyboardWindow.cpp similarity index 100% rename from src/prefs/keyboard/KeyboardWindow.cpp rename to src/preferences/keyboard/KeyboardWindow.cpp diff --git a/src/prefs/keyboard/KeyboardWindow.h b/src/preferences/keyboard/KeyboardWindow.h similarity index 100% rename from src/prefs/keyboard/KeyboardWindow.h rename to src/preferences/keyboard/KeyboardWindow.h diff --git a/src/prefs/keymap/Jamfile b/src/preferences/keymap/Jamfile similarity index 82% rename from src/prefs/keymap/Jamfile rename to src/preferences/keymap/Jamfile index 696578856e..ef22cef917 100644 --- a/src/prefs/keymap/Jamfile +++ b/src/preferences/keymap/Jamfile @@ -1,4 +1,4 @@ -SubDir OBOS_TOP src prefs keymap ; +SubDir OBOS_TOP src preferences keymap ; UsePrivateHeaders interface ; diff --git a/src/prefs/keymap/Keymap.cpp b/src/preferences/keymap/Keymap.cpp similarity index 100% rename from src/prefs/keymap/Keymap.cpp rename to src/preferences/keymap/Keymap.cpp diff --git a/src/prefs/keymap/Keymap.h b/src/preferences/keymap/Keymap.h similarity index 100% rename from src/prefs/keymap/Keymap.h rename to src/preferences/keymap/Keymap.h diff --git a/src/prefs/keymap/Keymap.rdef b/src/preferences/keymap/Keymap.rdef similarity index 100% rename from src/prefs/keymap/Keymap.rdef rename to src/preferences/keymap/Keymap.rdef diff --git a/src/prefs/keymap/KeymapApplication.cpp b/src/preferences/keymap/KeymapApplication.cpp similarity index 100% rename from src/prefs/keymap/KeymapApplication.cpp rename to src/preferences/keymap/KeymapApplication.cpp diff --git a/src/prefs/keymap/KeymapApplication.h b/src/preferences/keymap/KeymapApplication.h similarity index 100% rename from src/prefs/keymap/KeymapApplication.h rename to src/preferences/keymap/KeymapApplication.h diff --git a/src/prefs/keymap/KeymapListItem.cpp b/src/preferences/keymap/KeymapListItem.cpp similarity index 100% rename from src/prefs/keymap/KeymapListItem.cpp rename to src/preferences/keymap/KeymapListItem.cpp diff --git a/src/prefs/keymap/KeymapListItem.h b/src/preferences/keymap/KeymapListItem.h similarity index 100% rename from src/prefs/keymap/KeymapListItem.h rename to src/preferences/keymap/KeymapListItem.h diff --git a/src/prefs/keymap/KeymapTextView.cpp b/src/preferences/keymap/KeymapTextView.cpp similarity index 100% rename from src/prefs/keymap/KeymapTextView.cpp rename to src/preferences/keymap/KeymapTextView.cpp diff --git a/src/prefs/keymap/KeymapTextView.h b/src/preferences/keymap/KeymapTextView.h similarity index 100% rename from src/prefs/keymap/KeymapTextView.h rename to src/preferences/keymap/KeymapTextView.h diff --git a/src/prefs/keymap/KeymapWindow.cpp b/src/preferences/keymap/KeymapWindow.cpp similarity index 100% rename from src/prefs/keymap/KeymapWindow.cpp rename to src/preferences/keymap/KeymapWindow.cpp diff --git a/src/prefs/keymap/KeymapWindow.h b/src/preferences/keymap/KeymapWindow.h similarity index 100% rename from src/prefs/keymap/KeymapWindow.h rename to src/preferences/keymap/KeymapWindow.h diff --git a/src/prefs/mail/Account.cpp b/src/preferences/mail/Account.cpp similarity index 100% rename from src/prefs/mail/Account.cpp rename to src/preferences/mail/Account.cpp diff --git a/src/prefs/mail/Account.h b/src/preferences/mail/Account.h similarity index 100% rename from src/prefs/mail/Account.h rename to src/preferences/mail/Account.h diff --git a/src/prefs/mail/CenterContainer.cpp b/src/preferences/mail/CenterContainer.cpp similarity index 100% rename from src/prefs/mail/CenterContainer.cpp rename to src/preferences/mail/CenterContainer.cpp diff --git a/src/prefs/mail/CenterContainer.h b/src/preferences/mail/CenterContainer.h similarity index 100% rename from src/prefs/mail/CenterContainer.h rename to src/preferences/mail/CenterContainer.h diff --git a/src/prefs/mail/ConfigViews.cpp b/src/preferences/mail/ConfigViews.cpp similarity index 100% rename from src/prefs/mail/ConfigViews.cpp rename to src/preferences/mail/ConfigViews.cpp diff --git a/src/prefs/mail/ConfigViews.h b/src/preferences/mail/ConfigViews.h similarity index 100% rename from src/prefs/mail/ConfigViews.h rename to src/preferences/mail/ConfigViews.h diff --git a/src/prefs/mail/ConfigWindow.cpp b/src/preferences/mail/ConfigWindow.cpp similarity index 100% rename from src/prefs/mail/ConfigWindow.cpp rename to src/preferences/mail/ConfigWindow.cpp diff --git a/src/prefs/mail/ConfigWindow.h b/src/preferences/mail/ConfigWindow.h similarity index 100% rename from src/prefs/mail/ConfigWindow.h rename to src/preferences/mail/ConfigWindow.h diff --git a/src/prefs/mail/Jamfile b/src/preferences/mail/Jamfile similarity index 88% rename from src/prefs/mail/Jamfile rename to src/preferences/mail/Jamfile index 3feb34968b..14247893f6 100644 --- a/src/prefs/mail/Jamfile +++ b/src/preferences/mail/Jamfile @@ -1,4 +1,4 @@ -SubDir OBOS_TOP src prefs mail ; +SubDir OBOS_TOP src preferences mail ; UsePrivateHeaders mail ; SubDirHdrs [ FDirName $(OBOS_TOP) headers os add-ons mail_daemon ] ; diff --git a/src/prefs/mail/e-mail.rdef b/src/preferences/mail/e-mail.rdef similarity index 100% rename from src/prefs/mail/e-mail.rdef rename to src/preferences/mail/e-mail.rdef diff --git a/src/prefs/mail/main.cpp b/src/preferences/mail/main.cpp similarity index 100% rename from src/prefs/mail/main.cpp rename to src/preferences/mail/main.cpp diff --git a/src/prefs/media/Jamfile b/src/preferences/media/Jamfile similarity index 85% rename from src/prefs/media/Jamfile rename to src/preferences/media/Jamfile index fc5f7743de..e88533d896 100644 --- a/src/prefs/media/Jamfile +++ b/src/preferences/media/Jamfile @@ -1,4 +1,4 @@ -SubDir OBOS_TOP src prefs media ; +SubDir OBOS_TOP src preferences media ; if $(TARGET_PLATFORM) != haiku { SubDirC++Flags -fmultiple-symbol-spaces ; diff --git a/src/prefs/media/Media.cpp b/src/preferences/media/Media.cpp similarity index 100% rename from src/prefs/media/Media.cpp rename to src/preferences/media/Media.cpp diff --git a/src/prefs/media/Media.h b/src/preferences/media/Media.h similarity index 100% rename from src/prefs/media/Media.h rename to src/preferences/media/Media.h diff --git a/src/prefs/media/MediaAlert.cpp b/src/preferences/media/MediaAlert.cpp similarity index 100% rename from src/prefs/media/MediaAlert.cpp rename to src/preferences/media/MediaAlert.cpp diff --git a/src/prefs/media/MediaAlert.h b/src/preferences/media/MediaAlert.h similarity index 100% rename from src/prefs/media/MediaAlert.h rename to src/preferences/media/MediaAlert.h diff --git a/src/prefs/media/MediaListItem.cpp b/src/preferences/media/MediaListItem.cpp similarity index 100% rename from src/prefs/media/MediaListItem.cpp rename to src/preferences/media/MediaListItem.cpp diff --git a/src/prefs/media/MediaListItem.h b/src/preferences/media/MediaListItem.h similarity index 100% rename from src/prefs/media/MediaListItem.h rename to src/preferences/media/MediaListItem.h diff --git a/src/prefs/media/MediaViews.cpp b/src/preferences/media/MediaViews.cpp similarity index 100% rename from src/prefs/media/MediaViews.cpp rename to src/preferences/media/MediaViews.cpp diff --git a/src/prefs/media/MediaViews.h b/src/preferences/media/MediaViews.h similarity index 100% rename from src/prefs/media/MediaViews.h rename to src/preferences/media/MediaViews.h diff --git a/src/prefs/media/MediaWindow.cpp b/src/preferences/media/MediaWindow.cpp similarity index 100% rename from src/prefs/media/MediaWindow.cpp rename to src/preferences/media/MediaWindow.cpp diff --git a/src/prefs/media/MediaWindow.h b/src/preferences/media/MediaWindow.h similarity index 100% rename from src/prefs/media/MediaWindow.h rename to src/preferences/media/MediaWindow.h diff --git a/src/prefs/media/iconfile.h b/src/preferences/media/iconfile.h similarity index 100% rename from src/prefs/media/iconfile.h rename to src/preferences/media/iconfile.h diff --git a/src/prefs/media/media.rdef b/src/preferences/media/media.rdef similarity index 100% rename from src/prefs/media/media.rdef rename to src/preferences/media/media.rdef diff --git a/src/prefs/menu/BitmapMenuItem.cpp b/src/preferences/menu/BitmapMenuItem.cpp similarity index 100% rename from src/prefs/menu/BitmapMenuItem.cpp rename to src/preferences/menu/BitmapMenuItem.cpp diff --git a/src/prefs/menu/BitmapMenuItem.h b/src/preferences/menu/BitmapMenuItem.h similarity index 100% rename from src/prefs/menu/BitmapMenuItem.h rename to src/preferences/menu/BitmapMenuItem.h diff --git a/src/prefs/menu/ColorPicker.cpp b/src/preferences/menu/ColorPicker.cpp similarity index 100% rename from src/prefs/menu/ColorPicker.cpp rename to src/preferences/menu/ColorPicker.cpp diff --git a/src/prefs/menu/ColorWindow.cpp b/src/preferences/menu/ColorWindow.cpp similarity index 100% rename from src/prefs/menu/ColorWindow.cpp rename to src/preferences/menu/ColorWindow.cpp diff --git a/src/prefs/menu/FontMenu.cpp b/src/preferences/menu/FontMenu.cpp similarity index 100% rename from src/prefs/menu/FontMenu.cpp rename to src/preferences/menu/FontMenu.cpp diff --git a/src/prefs/menu/FontSizeMenu.cpp b/src/preferences/menu/FontSizeMenu.cpp similarity index 100% rename from src/prefs/menu/FontSizeMenu.cpp rename to src/preferences/menu/FontSizeMenu.cpp diff --git a/src/prefs/menu/Jamfile b/src/preferences/menu/Jamfile similarity index 83% rename from src/prefs/menu/Jamfile rename to src/preferences/menu/Jamfile index c71f861e9e..7d54bde220 100644 --- a/src/prefs/menu/Jamfile +++ b/src/preferences/menu/Jamfile @@ -1,4 +1,4 @@ -SubDir OBOS_TOP src prefs menu ; +SubDir OBOS_TOP src preferences menu ; Preference Menu : BitmapMenuItem.cpp diff --git a/src/prefs/menu/Menu.rdef b/src/preferences/menu/Menu.rdef similarity index 100% rename from src/prefs/menu/Menu.rdef rename to src/preferences/menu/Menu.rdef diff --git a/src/prefs/menu/MenuApp.cpp b/src/preferences/menu/MenuApp.cpp similarity index 100% rename from src/prefs/menu/MenuApp.cpp rename to src/preferences/menu/MenuApp.cpp diff --git a/src/prefs/menu/MenuApp.h b/src/preferences/menu/MenuApp.h similarity index 100% rename from src/prefs/menu/MenuApp.h rename to src/preferences/menu/MenuApp.h diff --git a/src/prefs/menu/MenuBar.cpp b/src/preferences/menu/MenuBar.cpp similarity index 100% rename from src/prefs/menu/MenuBar.cpp rename to src/preferences/menu/MenuBar.cpp diff --git a/src/prefs/menu/MenuWindow.cpp b/src/preferences/menu/MenuWindow.cpp similarity index 100% rename from src/prefs/menu/MenuWindow.cpp rename to src/preferences/menu/MenuWindow.cpp diff --git a/src/prefs/menu/msg.h b/src/preferences/menu/msg.h similarity index 100% rename from src/prefs/menu/msg.h rename to src/preferences/menu/msg.h diff --git a/src/prefs/mouse/Jamfile b/src/preferences/mouse/Jamfile similarity index 88% rename from src/prefs/mouse/Jamfile rename to src/preferences/mouse/Jamfile index 7743498ae1..4e68859f4c 100644 --- a/src/prefs/mouse/Jamfile +++ b/src/preferences/mouse/Jamfile @@ -1,4 +1,4 @@ -SubDir OBOS_TOP src prefs mouse ; +SubDir OBOS_TOP src preferences mouse ; if $(TARGET_PLATFORM) != haiku { SubDirC++Flags -DCOMPILE_FOR_R5 ; diff --git a/src/prefs/mouse/Mouse.cpp b/src/preferences/mouse/Mouse.cpp similarity index 100% rename from src/prefs/mouse/Mouse.cpp rename to src/preferences/mouse/Mouse.cpp diff --git a/src/prefs/mouse/Mouse.h b/src/preferences/mouse/Mouse.h similarity index 100% rename from src/prefs/mouse/Mouse.h rename to src/preferences/mouse/Mouse.h diff --git a/src/prefs/mouse/Mouse.rdef b/src/preferences/mouse/Mouse.rdef similarity index 100% rename from src/prefs/mouse/Mouse.rdef rename to src/preferences/mouse/Mouse.rdef diff --git a/src/prefs/mouse/MouseBitmap.h b/src/preferences/mouse/MouseBitmap.h similarity index 100% rename from src/prefs/mouse/MouseBitmap.h rename to src/preferences/mouse/MouseBitmap.h diff --git a/src/prefs/mouse/MouseConstants.h b/src/preferences/mouse/MouseConstants.h similarity index 100% rename from src/prefs/mouse/MouseConstants.h rename to src/preferences/mouse/MouseConstants.h diff --git a/src/prefs/mouse/MouseSettings.cpp b/src/preferences/mouse/MouseSettings.cpp similarity index 100% rename from src/prefs/mouse/MouseSettings.cpp rename to src/preferences/mouse/MouseSettings.cpp diff --git a/src/prefs/mouse/MouseSettings.h b/src/preferences/mouse/MouseSettings.h similarity index 100% rename from src/prefs/mouse/MouseSettings.h rename to src/preferences/mouse/MouseSettings.h diff --git a/src/prefs/mouse/MouseView.cpp b/src/preferences/mouse/MouseView.cpp similarity index 100% rename from src/prefs/mouse/MouseView.cpp rename to src/preferences/mouse/MouseView.cpp diff --git a/src/prefs/mouse/MouseView.h b/src/preferences/mouse/MouseView.h similarity index 100% rename from src/prefs/mouse/MouseView.h rename to src/preferences/mouse/MouseView.h diff --git a/src/prefs/mouse/MouseWindow.cpp b/src/preferences/mouse/MouseWindow.cpp similarity index 100% rename from src/prefs/mouse/MouseWindow.cpp rename to src/preferences/mouse/MouseWindow.cpp diff --git a/src/prefs/mouse/MouseWindow.h b/src/preferences/mouse/MouseWindow.h similarity index 100% rename from src/prefs/mouse/MouseWindow.h rename to src/preferences/mouse/MouseWindow.h diff --git a/src/prefs/mouse/SettingsView.cpp b/src/preferences/mouse/SettingsView.cpp similarity index 100% rename from src/prefs/mouse/SettingsView.cpp rename to src/preferences/mouse/SettingsView.cpp diff --git a/src/prefs/mouse/SettingsView.h b/src/preferences/mouse/SettingsView.h similarity index 100% rename from src/prefs/mouse/SettingsView.h rename to src/preferences/mouse/SettingsView.h diff --git a/src/prefs/network/Jamfile b/src/preferences/network/Jamfile similarity index 84% rename from src/prefs/network/Jamfile rename to src/preferences/network/Jamfile index 3f835c4781..15f740cd67 100644 --- a/src/prefs/network/Jamfile +++ b/src/preferences/network/Jamfile @@ -1,4 +1,4 @@ -SubDir OBOS_TOP src prefs network ; +SubDir OBOS_TOP src preferences network ; AddResources Network : Network.rdef ; diff --git a/src/prefs/network/Network.cpp b/src/preferences/network/Network.cpp similarity index 100% rename from src/prefs/network/Network.cpp rename to src/preferences/network/Network.cpp diff --git a/src/prefs/network/Network.h b/src/preferences/network/Network.h similarity index 100% rename from src/prefs/network/Network.h rename to src/preferences/network/Network.h diff --git a/src/prefs/network/Network.rdef b/src/preferences/network/Network.rdef similarity index 100% rename from src/prefs/network/Network.rdef rename to src/preferences/network/Network.rdef diff --git a/src/prefs/network/funcs.cpp b/src/preferences/network/funcs.cpp similarity index 100% rename from src/prefs/network/funcs.cpp rename to src/preferences/network/funcs.cpp diff --git a/src/prefs/print/AddPrinterDialog.cpp b/src/preferences/print/AddPrinterDialog.cpp similarity index 100% rename from src/prefs/print/AddPrinterDialog.cpp rename to src/preferences/print/AddPrinterDialog.cpp diff --git a/src/prefs/print/AddPrinterDialog.h b/src/preferences/print/AddPrinterDialog.h similarity index 100% rename from src/prefs/print/AddPrinterDialog.h rename to src/preferences/print/AddPrinterDialog.h diff --git a/src/prefs/print/Globals.cpp b/src/preferences/print/Globals.cpp similarity index 100% rename from src/prefs/print/Globals.cpp rename to src/preferences/print/Globals.cpp diff --git a/src/prefs/print/Globals.h b/src/preferences/print/Globals.h similarity index 100% rename from src/prefs/print/Globals.h rename to src/preferences/print/Globals.h diff --git a/src/prefs/print/Jamfile b/src/preferences/print/Jamfile similarity index 91% rename from src/prefs/print/Jamfile rename to src/preferences/print/Jamfile index a8905a5523..ea1dccdcb5 100644 --- a/src/prefs/print/Jamfile +++ b/src/preferences/print/Jamfile @@ -1,4 +1,4 @@ -SubDir OBOS_TOP src prefs print ; +SubDir OBOS_TOP src preferences print ; UsePrivateHeaders interface shared print ; diff --git a/src/prefs/print/JobListView.cpp b/src/preferences/print/JobListView.cpp similarity index 100% rename from src/prefs/print/JobListView.cpp rename to src/preferences/print/JobListView.cpp diff --git a/src/prefs/print/JobListView.h b/src/preferences/print/JobListView.h similarity index 100% rename from src/prefs/print/JobListView.h rename to src/preferences/print/JobListView.h diff --git a/src/prefs/print/Messages.h b/src/preferences/print/Messages.h similarity index 100% rename from src/prefs/print/Messages.h rename to src/preferences/print/Messages.h diff --git a/src/prefs/print/PrinterListView.cpp b/src/preferences/print/PrinterListView.cpp similarity index 100% rename from src/prefs/print/PrinterListView.cpp rename to src/preferences/print/PrinterListView.cpp diff --git a/src/prefs/print/PrinterListView.h b/src/preferences/print/PrinterListView.h similarity index 100% rename from src/prefs/print/PrinterListView.h rename to src/preferences/print/PrinterListView.h diff --git a/src/prefs/print/Printers.FileTypes.rdef b/src/preferences/print/Printers.FileTypes.rdef similarity index 100% rename from src/prefs/print/Printers.FileTypes.rdef rename to src/preferences/print/Printers.FileTypes.rdef diff --git a/src/prefs/print/Printers.cpp b/src/preferences/print/Printers.cpp similarity index 100% rename from src/prefs/print/Printers.cpp rename to src/preferences/print/Printers.cpp diff --git a/src/prefs/print/Printers.h b/src/preferences/print/Printers.h similarity index 100% rename from src/prefs/print/Printers.h rename to src/preferences/print/Printers.h diff --git a/src/prefs/print/PrintersWindow.cpp b/src/preferences/print/PrintersWindow.cpp similarity index 100% rename from src/prefs/print/PrintersWindow.cpp rename to src/preferences/print/PrintersWindow.cpp diff --git a/src/prefs/print/PrintersWindow.h b/src/preferences/print/PrintersWindow.h similarity index 100% rename from src/prefs/print/PrintersWindow.h rename to src/preferences/print/PrintersWindow.h diff --git a/src/prefs/print/SpoolFolder.cpp b/src/preferences/print/SpoolFolder.cpp similarity index 100% rename from src/prefs/print/SpoolFolder.cpp rename to src/preferences/print/SpoolFolder.cpp diff --git a/src/prefs/print/SpoolFolder.h b/src/preferences/print/SpoolFolder.h similarity index 100% rename from src/prefs/print/SpoolFolder.h rename to src/preferences/print/SpoolFolder.h diff --git a/src/prefs/print/doxygen.cfg b/src/preferences/print/doxygen.cfg similarity index 100% rename from src/prefs/print/doxygen.cfg rename to src/preferences/print/doxygen.cfg diff --git a/src/prefs/screen/AlertView.cpp b/src/preferences/screen/AlertView.cpp similarity index 100% rename from src/prefs/screen/AlertView.cpp rename to src/preferences/screen/AlertView.cpp diff --git a/src/prefs/screen/AlertView.h b/src/preferences/screen/AlertView.h similarity index 100% rename from src/prefs/screen/AlertView.h rename to src/preferences/screen/AlertView.h diff --git a/src/prefs/screen/AlertWindow.cpp b/src/preferences/screen/AlertWindow.cpp similarity index 100% rename from src/prefs/screen/AlertWindow.cpp rename to src/preferences/screen/AlertWindow.cpp diff --git a/src/prefs/screen/AlertWindow.h b/src/preferences/screen/AlertWindow.h similarity index 100% rename from src/prefs/screen/AlertWindow.h rename to src/preferences/screen/AlertWindow.h diff --git a/src/prefs/screen/Constants.h b/src/preferences/screen/Constants.h similarity index 100% rename from src/prefs/screen/Constants.h rename to src/preferences/screen/Constants.h diff --git a/src/prefs/screen/Jamfile b/src/preferences/screen/Jamfile similarity index 88% rename from src/prefs/screen/Jamfile rename to src/preferences/screen/Jamfile index 331bd86665..fc74a00813 100644 --- a/src/prefs/screen/Jamfile +++ b/src/preferences/screen/Jamfile @@ -1,4 +1,4 @@ -SubDir OBOS_TOP src prefs screen ; +SubDir OBOS_TOP src preferences screen ; UsePrivateHeaders [ FDirName graphics radeon ] ; diff --git a/src/prefs/screen/MonitorView.cpp b/src/preferences/screen/MonitorView.cpp similarity index 100% rename from src/prefs/screen/MonitorView.cpp rename to src/preferences/screen/MonitorView.cpp diff --git a/src/prefs/screen/MonitorView.h b/src/preferences/screen/MonitorView.h similarity index 100% rename from src/prefs/screen/MonitorView.h rename to src/preferences/screen/MonitorView.h diff --git a/src/prefs/screen/RefreshSlider.cpp b/src/preferences/screen/RefreshSlider.cpp similarity index 100% rename from src/prefs/screen/RefreshSlider.cpp rename to src/preferences/screen/RefreshSlider.cpp diff --git a/src/prefs/screen/RefreshSlider.h b/src/preferences/screen/RefreshSlider.h similarity index 100% rename from src/prefs/screen/RefreshSlider.h rename to src/preferences/screen/RefreshSlider.h diff --git a/src/prefs/screen/RefreshView.cpp b/src/preferences/screen/RefreshView.cpp similarity index 100% rename from src/prefs/screen/RefreshView.cpp rename to src/preferences/screen/RefreshView.cpp diff --git a/src/prefs/screen/RefreshView.h b/src/preferences/screen/RefreshView.h similarity index 100% rename from src/prefs/screen/RefreshView.h rename to src/preferences/screen/RefreshView.h diff --git a/src/prefs/screen/RefreshWindow.cpp b/src/preferences/screen/RefreshWindow.cpp similarity index 100% rename from src/prefs/screen/RefreshWindow.cpp rename to src/preferences/screen/RefreshWindow.cpp diff --git a/src/prefs/screen/RefreshWindow.h b/src/preferences/screen/RefreshWindow.h similarity index 100% rename from src/prefs/screen/RefreshWindow.h rename to src/preferences/screen/RefreshWindow.h diff --git a/src/prefs/screen/Screen.rdef b/src/preferences/screen/Screen.rdef similarity index 100% rename from src/prefs/screen/Screen.rdef rename to src/preferences/screen/Screen.rdef diff --git a/src/prefs/screen/ScreenApplication.cpp b/src/preferences/screen/ScreenApplication.cpp similarity index 100% rename from src/prefs/screen/ScreenApplication.cpp rename to src/preferences/screen/ScreenApplication.cpp diff --git a/src/prefs/screen/ScreenApplication.h b/src/preferences/screen/ScreenApplication.h similarity index 100% rename from src/prefs/screen/ScreenApplication.h rename to src/preferences/screen/ScreenApplication.h diff --git a/src/prefs/screen/ScreenMode.cpp b/src/preferences/screen/ScreenMode.cpp similarity index 100% rename from src/prefs/screen/ScreenMode.cpp rename to src/preferences/screen/ScreenMode.cpp diff --git a/src/prefs/screen/ScreenMode.h b/src/preferences/screen/ScreenMode.h similarity index 100% rename from src/prefs/screen/ScreenMode.h rename to src/preferences/screen/ScreenMode.h diff --git a/src/prefs/screen/ScreenSettings.cpp b/src/preferences/screen/ScreenSettings.cpp similarity index 100% rename from src/prefs/screen/ScreenSettings.cpp rename to src/preferences/screen/ScreenSettings.cpp diff --git a/src/prefs/screen/ScreenSettings.h b/src/preferences/screen/ScreenSettings.h similarity index 100% rename from src/prefs/screen/ScreenSettings.h rename to src/preferences/screen/ScreenSettings.h diff --git a/src/prefs/screen/ScreenWindow.cpp b/src/preferences/screen/ScreenWindow.cpp similarity index 100% rename from src/prefs/screen/ScreenWindow.cpp rename to src/preferences/screen/ScreenWindow.cpp diff --git a/src/prefs/screen/ScreenWindow.h b/src/preferences/screen/ScreenWindow.h similarity index 100% rename from src/prefs/screen/ScreenWindow.h rename to src/preferences/screen/ScreenWindow.h diff --git a/src/prefs/screen/Utility.cpp b/src/preferences/screen/Utility.cpp similarity index 100% rename from src/prefs/screen/Utility.cpp rename to src/preferences/screen/Utility.cpp diff --git a/src/prefs/screen/Utility.h b/src/preferences/screen/Utility.h similarity index 100% rename from src/prefs/screen/Utility.h rename to src/preferences/screen/Utility.h diff --git a/src/prefs/screen/multimon.cpp b/src/preferences/screen/multimon.cpp similarity index 100% rename from src/prefs/screen/multimon.cpp rename to src/preferences/screen/multimon.cpp diff --git a/src/prefs/screensaver/Constants.cpp b/src/preferences/screensaver/Constants.cpp similarity index 100% rename from src/prefs/screensaver/Constants.cpp rename to src/preferences/screensaver/Constants.cpp diff --git a/src/prefs/screensaver/Constants.h b/src/preferences/screensaver/Constants.h similarity index 100% rename from src/prefs/screensaver/Constants.h rename to src/preferences/screensaver/Constants.h diff --git a/src/prefs/screensaver/Jamfile b/src/preferences/screensaver/Jamfile similarity index 84% rename from src/prefs/screensaver/Jamfile rename to src/preferences/screensaver/Jamfile index 44b9f8fb82..ad37c3990a 100644 --- a/src/prefs/screensaver/Jamfile +++ b/src/preferences/screensaver/Jamfile @@ -1,4 +1,4 @@ -SubDir OBOS_TOP src prefs screensaver ; +SubDir OBOS_TOP src preferences screensaver ; UsePrivateHeaders screen_saver ; diff --git a/src/prefs/screensaver/MouseAreaView.cpp b/src/preferences/screensaver/MouseAreaView.cpp similarity index 100% rename from src/prefs/screensaver/MouseAreaView.cpp rename to src/preferences/screensaver/MouseAreaView.cpp diff --git a/src/prefs/screensaver/MouseAreaView.h b/src/preferences/screensaver/MouseAreaView.h similarity index 100% rename from src/prefs/screensaver/MouseAreaView.h rename to src/preferences/screensaver/MouseAreaView.h diff --git a/src/prefs/screensaver/OBOSScreenSaverPreferences.cpp b/src/preferences/screensaver/OBOSScreenSaverPreferences.cpp similarity index 100% rename from src/prefs/screensaver/OBOSScreenSaverPreferences.cpp rename to src/preferences/screensaver/OBOSScreenSaverPreferences.cpp diff --git a/src/prefs/screensaver/OBOSScreenSaverPreferences.h b/src/preferences/screensaver/OBOSScreenSaverPreferences.h similarity index 100% rename from src/prefs/screensaver/OBOSScreenSaverPreferences.h rename to src/preferences/screensaver/OBOSScreenSaverPreferences.h diff --git a/src/prefs/screensaver/PreviewView.cpp b/src/preferences/screensaver/PreviewView.cpp similarity index 100% rename from src/prefs/screensaver/PreviewView.cpp rename to src/preferences/screensaver/PreviewView.cpp diff --git a/src/prefs/screensaver/PreviewView.h b/src/preferences/screensaver/PreviewView.h similarity index 100% rename from src/prefs/screensaver/PreviewView.h rename to src/preferences/screensaver/PreviewView.h diff --git a/src/prefs/screensaver/ScreenSaver.rdef b/src/preferences/screensaver/ScreenSaver.rdef similarity index 100% rename from src/prefs/screensaver/ScreenSaver.rdef rename to src/preferences/screensaver/ScreenSaver.rdef diff --git a/src/prefs/screensaver/ScreenSaverPrefsApp.cpp b/src/preferences/screensaver/ScreenSaverPrefsApp.cpp similarity index 100% rename from src/prefs/screensaver/ScreenSaverPrefsApp.cpp rename to src/preferences/screensaver/ScreenSaverPrefsApp.cpp diff --git a/src/prefs/screensaver/ScreenSaverPrefsApp.h b/src/preferences/screensaver/ScreenSaverPrefsApp.h similarity index 100% rename from src/prefs/screensaver/ScreenSaverPrefsApp.h rename to src/preferences/screensaver/ScreenSaverPrefsApp.h diff --git a/src/prefs/screensaver/ScreenSaverWindow.cpp b/src/preferences/screensaver/ScreenSaverWindow.cpp similarity index 100% rename from src/prefs/screensaver/ScreenSaverWindow.cpp rename to src/preferences/screensaver/ScreenSaverWindow.cpp diff --git a/src/prefs/screensaver/ScreenSaverWindow.h b/src/preferences/screensaver/ScreenSaverWindow.h similarity index 100% rename from src/prefs/screensaver/ScreenSaverWindow.h rename to src/preferences/screensaver/ScreenSaverWindow.h diff --git a/src/prefs/screensaver/passwordWindow.cpp b/src/preferences/screensaver/passwordWindow.cpp similarity index 100% rename from src/prefs/screensaver/passwordWindow.cpp rename to src/preferences/screensaver/passwordWindow.cpp diff --git a/src/prefs/screensaver/passwordWindow.h b/src/preferences/screensaver/passwordWindow.h similarity index 100% rename from src/prefs/screensaver/passwordWindow.h rename to src/preferences/screensaver/passwordWindow.h diff --git a/src/prefs/screensaver/pwWindow.cpp b/src/preferences/screensaver/pwWindow.cpp similarity index 100% rename from src/prefs/screensaver/pwWindow.cpp rename to src/preferences/screensaver/pwWindow.cpp diff --git a/src/prefs/screensaver/pwWindow.h b/src/preferences/screensaver/pwWindow.h similarity index 100% rename from src/prefs/screensaver/pwWindow.h rename to src/preferences/screensaver/pwWindow.h diff --git a/src/prefs/scrollbar/Jamfile b/src/preferences/scrollbar/Jamfile similarity index 78% rename from src/prefs/scrollbar/Jamfile rename to src/preferences/scrollbar/Jamfile index 4f57aaf615..fbb47b5788 100644 --- a/src/prefs/scrollbar/Jamfile +++ b/src/preferences/scrollbar/Jamfile @@ -1,4 +1,4 @@ -SubDir OBOS_TOP src prefs scrollbar ; +SubDir OBOS_TOP src preferences scrollbar ; Preference ScrollBar : ScrollBarApp.cpp diff --git a/src/prefs/scrollbar/ScrollBar.rdef b/src/preferences/scrollbar/ScrollBar.rdef similarity index 100% rename from src/prefs/scrollbar/ScrollBar.rdef rename to src/preferences/scrollbar/ScrollBar.rdef diff --git a/src/prefs/scrollbar/ScrollBarApp.cpp b/src/preferences/scrollbar/ScrollBarApp.cpp similarity index 100% rename from src/prefs/scrollbar/ScrollBarApp.cpp rename to src/preferences/scrollbar/ScrollBarApp.cpp diff --git a/src/prefs/scrollbar/ScrollBarApp.h b/src/preferences/scrollbar/ScrollBarApp.h similarity index 100% rename from src/prefs/scrollbar/ScrollBarApp.h rename to src/preferences/scrollbar/ScrollBarApp.h diff --git a/src/prefs/scrollbar/ScrollBarView.cpp b/src/preferences/scrollbar/ScrollBarView.cpp similarity index 100% rename from src/prefs/scrollbar/ScrollBarView.cpp rename to src/preferences/scrollbar/ScrollBarView.cpp diff --git a/src/prefs/scrollbar/ScrollBarView.h b/src/preferences/scrollbar/ScrollBarView.h similarity index 100% rename from src/prefs/scrollbar/ScrollBarView.h rename to src/preferences/scrollbar/ScrollBarView.h diff --git a/src/prefs/scrollbar/ScrollBarWindow.cpp b/src/preferences/scrollbar/ScrollBarWindow.cpp similarity index 100% rename from src/prefs/scrollbar/ScrollBarWindow.cpp rename to src/preferences/scrollbar/ScrollBarWindow.cpp diff --git a/src/prefs/scrollbar/ScrollBarWindow.h b/src/preferences/scrollbar/ScrollBarWindow.h similarity index 100% rename from src/prefs/scrollbar/ScrollBarWindow.h rename to src/preferences/scrollbar/ScrollBarWindow.h diff --git a/src/prefs/scrollbar/fakescrollbar.cpp b/src/preferences/scrollbar/fakescrollbar.cpp similarity index 100% rename from src/prefs/scrollbar/fakescrollbar.cpp rename to src/preferences/scrollbar/fakescrollbar.cpp diff --git a/src/prefs/scrollbar/fakescrollbar.h b/src/preferences/scrollbar/fakescrollbar.h similarity index 100% rename from src/prefs/scrollbar/fakescrollbar.h rename to src/preferences/scrollbar/fakescrollbar.h diff --git a/src/prefs/scrollbar/knobsizeadjuster.cpp b/src/preferences/scrollbar/knobsizeadjuster.cpp similarity index 100% rename from src/prefs/scrollbar/knobsizeadjuster.cpp rename to src/preferences/scrollbar/knobsizeadjuster.cpp diff --git a/src/prefs/scrollbar/knobsizeadjuster.h b/src/preferences/scrollbar/knobsizeadjuster.h similarity index 100% rename from src/prefs/scrollbar/knobsizeadjuster.h rename to src/preferences/scrollbar/knobsizeadjuster.h diff --git a/src/prefs/scrollbar/messages.h b/src/preferences/scrollbar/messages.h similarity index 100% rename from src/prefs/scrollbar/messages.h rename to src/preferences/scrollbar/messages.h diff --git a/src/prefs/sounds/HApp.cpp b/src/preferences/sounds/HApp.cpp similarity index 100% rename from src/prefs/sounds/HApp.cpp rename to src/preferences/sounds/HApp.cpp diff --git a/src/prefs/sounds/HApp.h b/src/preferences/sounds/HApp.h similarity index 100% rename from src/prefs/sounds/HApp.h rename to src/preferences/sounds/HApp.h diff --git a/src/prefs/sounds/HEventItem.cpp b/src/preferences/sounds/HEventItem.cpp similarity index 100% rename from src/prefs/sounds/HEventItem.cpp rename to src/preferences/sounds/HEventItem.cpp diff --git a/src/prefs/sounds/HEventItem.h b/src/preferences/sounds/HEventItem.h similarity index 100% rename from src/prefs/sounds/HEventItem.h rename to src/preferences/sounds/HEventItem.h diff --git a/src/prefs/sounds/HEventList.cpp b/src/preferences/sounds/HEventList.cpp similarity index 100% rename from src/prefs/sounds/HEventList.cpp rename to src/preferences/sounds/HEventList.cpp diff --git a/src/prefs/sounds/HEventList.h b/src/preferences/sounds/HEventList.h similarity index 100% rename from src/prefs/sounds/HEventList.h rename to src/preferences/sounds/HEventList.h diff --git a/src/prefs/sounds/HWindow.cpp b/src/preferences/sounds/HWindow.cpp similarity index 100% rename from src/prefs/sounds/HWindow.cpp rename to src/preferences/sounds/HWindow.cpp diff --git a/src/prefs/sounds/HWindow.h b/src/preferences/sounds/HWindow.h similarity index 100% rename from src/prefs/sounds/HWindow.h rename to src/preferences/sounds/HWindow.h diff --git a/src/prefs/sounds/Jamfile b/src/preferences/sounds/Jamfile similarity index 85% rename from src/prefs/sounds/Jamfile rename to src/preferences/sounds/Jamfile index cd3ebbd22b..c4c9f6f3e2 100644 --- a/src/prefs/sounds/Jamfile +++ b/src/preferences/sounds/Jamfile @@ -1,4 +1,4 @@ -SubDir OBOS_TOP src prefs sounds ; +SubDir OBOS_TOP src preferences sounds ; if $(TARGET_PLATFORM) != haiku { SubDirC++Flags -fmultiple-symbol-spaces ; diff --git a/src/prefs/sounds/Sounds.rdef b/src/preferences/sounds/Sounds.rdef similarity index 100% rename from src/prefs/sounds/Sounds.rdef rename to src/preferences/sounds/Sounds.rdef diff --git a/src/prefs/time/AnalogClock.cpp b/src/preferences/time/AnalogClock.cpp similarity index 100% rename from src/prefs/time/AnalogClock.cpp rename to src/preferences/time/AnalogClock.cpp diff --git a/src/prefs/time/AnalogClock.h b/src/preferences/time/AnalogClock.h similarity index 100% rename from src/prefs/time/AnalogClock.h rename to src/preferences/time/AnalogClock.h diff --git a/src/prefs/time/BaseView.cpp b/src/preferences/time/BaseView.cpp similarity index 100% rename from src/prefs/time/BaseView.cpp rename to src/preferences/time/BaseView.cpp diff --git a/src/prefs/time/BaseView.h b/src/preferences/time/BaseView.h similarity index 100% rename from src/prefs/time/BaseView.h rename to src/preferences/time/BaseView.h diff --git a/src/prefs/time/Bitmaps.cpp b/src/preferences/time/Bitmaps.cpp similarity index 100% rename from src/prefs/time/Bitmaps.cpp rename to src/preferences/time/Bitmaps.cpp diff --git a/src/prefs/time/Bitmaps.h b/src/preferences/time/Bitmaps.h similarity index 100% rename from src/prefs/time/Bitmaps.h rename to src/preferences/time/Bitmaps.h diff --git a/src/prefs/time/CalendarView.cpp b/src/preferences/time/CalendarView.cpp similarity index 100% rename from src/prefs/time/CalendarView.cpp rename to src/preferences/time/CalendarView.cpp diff --git a/src/prefs/time/CalendarView.h b/src/preferences/time/CalendarView.h similarity index 100% rename from src/prefs/time/CalendarView.h rename to src/preferences/time/CalendarView.h diff --git a/src/prefs/time/DateTimeEdit.cpp b/src/preferences/time/DateTimeEdit.cpp similarity index 100% rename from src/prefs/time/DateTimeEdit.cpp rename to src/preferences/time/DateTimeEdit.cpp diff --git a/src/prefs/time/DateTimeEdit.h b/src/preferences/time/DateTimeEdit.h similarity index 100% rename from src/prefs/time/DateTimeEdit.h rename to src/preferences/time/DateTimeEdit.h diff --git a/src/prefs/time/DateUtils.cpp b/src/preferences/time/DateUtils.cpp similarity index 100% rename from src/prefs/time/DateUtils.cpp rename to src/preferences/time/DateUtils.cpp diff --git a/src/prefs/time/DateUtils.h b/src/preferences/time/DateUtils.h similarity index 100% rename from src/prefs/time/DateUtils.h rename to src/preferences/time/DateUtils.h diff --git a/src/prefs/time/Jamfile b/src/preferences/time/Jamfile similarity index 87% rename from src/prefs/time/Jamfile rename to src/preferences/time/Jamfile index ac990ca43f..4dbe0e0ba1 100644 --- a/src/prefs/time/Jamfile +++ b/src/preferences/time/Jamfile @@ -1,4 +1,4 @@ -SubDir OBOS_TOP src prefs time ; +SubDir OBOS_TOP src preferences time ; Preference Time : AnalogClock.cpp diff --git a/src/prefs/time/SectionEdit.cpp b/src/preferences/time/SectionEdit.cpp similarity index 100% rename from src/prefs/time/SectionEdit.cpp rename to src/preferences/time/SectionEdit.cpp diff --git a/src/prefs/time/SectionEdit.h b/src/preferences/time/SectionEdit.h similarity index 100% rename from src/prefs/time/SectionEdit.h rename to src/preferences/time/SectionEdit.h diff --git a/src/prefs/time/SettingsView.cpp b/src/preferences/time/SettingsView.cpp similarity index 100% rename from src/prefs/time/SettingsView.cpp rename to src/preferences/time/SettingsView.cpp diff --git a/src/prefs/time/SettingsView.h b/src/preferences/time/SettingsView.h similarity index 100% rename from src/prefs/time/SettingsView.h rename to src/preferences/time/SettingsView.h diff --git a/src/prefs/time/TZDisplay.cpp b/src/preferences/time/TZDisplay.cpp similarity index 100% rename from src/prefs/time/TZDisplay.cpp rename to src/preferences/time/TZDisplay.cpp diff --git a/src/prefs/time/TZDisplay.h b/src/preferences/time/TZDisplay.h similarity index 100% rename from src/prefs/time/TZDisplay.h rename to src/preferences/time/TZDisplay.h diff --git a/src/prefs/time/Time.cpp b/src/preferences/time/Time.cpp similarity index 100% rename from src/prefs/time/Time.cpp rename to src/preferences/time/Time.cpp diff --git a/src/prefs/time/Time.h b/src/preferences/time/Time.h similarity index 100% rename from src/prefs/time/Time.h rename to src/preferences/time/Time.h diff --git a/src/prefs/time/Time.rdef b/src/preferences/time/Time.rdef similarity index 100% rename from src/prefs/time/Time.rdef rename to src/preferences/time/Time.rdef diff --git a/src/prefs/time/TimeMessages.h b/src/preferences/time/TimeMessages.h similarity index 100% rename from src/prefs/time/TimeMessages.h rename to src/preferences/time/TimeMessages.h diff --git a/src/prefs/time/TimeSettings.cpp b/src/preferences/time/TimeSettings.cpp similarity index 100% rename from src/prefs/time/TimeSettings.cpp rename to src/preferences/time/TimeSettings.cpp diff --git a/src/prefs/time/TimeSettings.h b/src/preferences/time/TimeSettings.h similarity index 100% rename from src/prefs/time/TimeSettings.h rename to src/preferences/time/TimeSettings.h diff --git a/src/prefs/time/TimeView.cpp b/src/preferences/time/TimeView.cpp similarity index 100% rename from src/prefs/time/TimeView.cpp rename to src/preferences/time/TimeView.cpp diff --git a/src/prefs/time/TimeView.h b/src/preferences/time/TimeView.h similarity index 100% rename from src/prefs/time/TimeView.h rename to src/preferences/time/TimeView.h diff --git a/src/prefs/time/TimeWindow.cpp b/src/preferences/time/TimeWindow.cpp similarity index 100% rename from src/prefs/time/TimeWindow.cpp rename to src/preferences/time/TimeWindow.cpp diff --git a/src/prefs/time/TimeWindow.h b/src/preferences/time/TimeWindow.h similarity index 100% rename from src/prefs/time/TimeWindow.h rename to src/preferences/time/TimeWindow.h diff --git a/src/prefs/time/ZoneView.cpp b/src/preferences/time/ZoneView.cpp similarity index 100% rename from src/prefs/time/ZoneView.cpp rename to src/preferences/time/ZoneView.cpp diff --git a/src/prefs/time/ZoneView.h b/src/preferences/time/ZoneView.h similarity index 100% rename from src/prefs/time/ZoneView.h rename to src/preferences/time/ZoneView.h diff --git a/src/prefs/time/hierarchy b/src/preferences/time/hierarchy similarity index 100% rename from src/prefs/time/hierarchy rename to src/preferences/time/hierarchy diff --git a/src/prefs/virtualmemory/.doxygen-conf b/src/preferences/virtualmemory/.doxygen-conf similarity index 100% rename from src/prefs/virtualmemory/.doxygen-conf rename to src/preferences/virtualmemory/.doxygen-conf diff --git a/src/prefs/virtualmemory/Jamfile b/src/preferences/virtualmemory/Jamfile similarity index 75% rename from src/prefs/virtualmemory/Jamfile rename to src/preferences/virtualmemory/Jamfile index c688a1059f..deea0ea12b 100644 --- a/src/prefs/virtualmemory/Jamfile +++ b/src/preferences/virtualmemory/Jamfile @@ -1,4 +1,4 @@ -SubDir OBOS_TOP src prefs virtualmemory ; +SubDir OBOS_TOP src preferences virtualmemory ; Preference VirtualMemory : main.cpp diff --git a/src/prefs/virtualmemory/MainWindow.cpp b/src/preferences/virtualmemory/MainWindow.cpp similarity index 100% rename from src/prefs/virtualmemory/MainWindow.cpp rename to src/preferences/virtualmemory/MainWindow.cpp diff --git a/src/prefs/virtualmemory/MainWindow.h b/src/preferences/virtualmemory/MainWindow.h similarity index 100% rename from src/prefs/virtualmemory/MainWindow.h rename to src/preferences/virtualmemory/MainWindow.h diff --git a/src/prefs/virtualmemory/Pref_Utils.cpp b/src/preferences/virtualmemory/Pref_Utils.cpp similarity index 100% rename from src/prefs/virtualmemory/Pref_Utils.cpp rename to src/preferences/virtualmemory/Pref_Utils.cpp diff --git a/src/prefs/virtualmemory/Pref_Utils.h b/src/preferences/virtualmemory/Pref_Utils.h similarity index 100% rename from src/prefs/virtualmemory/Pref_Utils.h rename to src/preferences/virtualmemory/Pref_Utils.h diff --git a/src/prefs/virtualmemory/VMSettings.cpp b/src/preferences/virtualmemory/VMSettings.cpp similarity index 100% rename from src/prefs/virtualmemory/VMSettings.cpp rename to src/preferences/virtualmemory/VMSettings.cpp diff --git a/src/prefs/virtualmemory/VMSettings.h b/src/preferences/virtualmemory/VMSettings.h similarity index 100% rename from src/prefs/virtualmemory/VMSettings.h rename to src/preferences/virtualmemory/VMSettings.h diff --git a/src/prefs/virtualmemory/VirtualMemory.rdef b/src/preferences/virtualmemory/VirtualMemory.rdef similarity index 100% rename from src/prefs/virtualmemory/VirtualMemory.rdef rename to src/preferences/virtualmemory/VirtualMemory.rdef diff --git a/src/prefs/virtualmemory/main.cpp b/src/preferences/virtualmemory/main.cpp similarity index 100% rename from src/prefs/virtualmemory/main.cpp rename to src/preferences/virtualmemory/main.cpp diff --git a/src/prefs/virtualmemory/main.h b/src/preferences/virtualmemory/main.h similarity index 100% rename from src/prefs/virtualmemory/main.h rename to src/preferences/virtualmemory/main.h diff --git a/src/prefs/workspaces/Jamfile b/src/preferences/workspaces/Jamfile similarity index 64% rename from src/prefs/workspaces/Jamfile rename to src/preferences/workspaces/Jamfile index 0e8ba6288a..3fd05f96b3 100644 --- a/src/prefs/workspaces/Jamfile +++ b/src/preferences/workspaces/Jamfile @@ -1,4 +1,4 @@ -SubDir OBOS_TOP src prefs workspaces ; +SubDir OBOS_TOP src preferences workspaces ; Preference Workspaces : Workspaces.cpp diff --git a/src/prefs/workspaces/Workspaces.cpp b/src/preferences/workspaces/Workspaces.cpp similarity index 100% rename from src/prefs/workspaces/Workspaces.cpp rename to src/preferences/workspaces/Workspaces.cpp diff --git a/src/prefs/workspaces/Workspaces.rdef b/src/preferences/workspaces/Workspaces.rdef similarity index 100% rename from src/prefs/workspaces/Workspaces.rdef rename to src/preferences/workspaces/Workspaces.rdef diff --git a/src/prefs/Jamfile b/src/prefs/Jamfile deleted file mode 100644 index 196a63267e..0000000000 --- a/src/prefs/Jamfile +++ /dev/null @@ -1,25 +0,0 @@ -SubDir OBOS_TOP src prefs ; - -SubInclude OBOS_TOP src prefs appearance ; -SubInclude OBOS_TOP src prefs backgrounds ; -SubInclude OBOS_TOP src prefs datatranslations ; -SubInclude OBOS_TOP src prefs devices ; -SubInclude OBOS_TOP src prefs drivesetup ; -SubInclude OBOS_TOP src prefs dun ; -SubInclude OBOS_TOP src prefs filetypes ; -SubInclude OBOS_TOP src prefs fonts ; -SubInclude OBOS_TOP src prefs keyboard ; -SubInclude OBOS_TOP src prefs keymap ; -SubInclude OBOS_TOP src prefs mail ; -SubInclude OBOS_TOP src prefs media ; -SubInclude OBOS_TOP src prefs menu ; -SubInclude OBOS_TOP src prefs mouse ; -SubInclude OBOS_TOP src prefs network ; -SubInclude OBOS_TOP src prefs print ; -SubInclude OBOS_TOP src prefs screen ; -SubInclude OBOS_TOP src prefs screensaver ; -SubInclude OBOS_TOP src prefs scrollbar ; -SubInclude OBOS_TOP src prefs sounds ; -SubInclude OBOS_TOP src prefs time ; -SubInclude OBOS_TOP src prefs virtualmemory ; -SubInclude OBOS_TOP src prefs workspaces ;