Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- update TODO list

Browse Source 
- added MSTheme importer, currently handles (best effort):
	- colors
	- screensaver (tries to map to BeOS ones)
	- background picture
	- window decor (maps to Zeta classic NT and Luna decors)


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@27781 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
François Revol 2008-09-29 15:26:02 +00:00
parent ed2fc87300
commit a6c5d5750e
7 changed files with 548 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
3rdparty/mmu_man/themes/BeThemeImporter.cpp vendored
View File

@ -43,6 +43,7 @@ BeThemeImporter::BeThemeImporter()
FENTRY;
BVolumeRoster r;
BVolume v;
// TODO: query all volumes ?
r.GetBootVolume(&v);
fQuery.Clear();
fQuery.SetVolume(&v);
@ -89,7 +90,7 @@ status_t BeThemeImporter::ImportNextTheme(BMessage **theme)
if (err < 0)
return B_ERROR;
PRINT(("BeThemeImporter: importing from '%s'\n", path.Path()));
BMessage global(Z_THEME_MESSAGE_WHAT);
BMessage info;
BMessage decor;

4
3rdparty/mmu_man/themes/Jamfile vendored
View File

@ -30,6 +30,7 @@ Application <3rdparty>Themes :
CompareMessages.cpp
DumpMessage.cpp
MakeScreenshot.cpp
MSThemeImporter.cpp
ParseMessage.cpp
TextInputAlert.cpp
ThemeAddonItem.cpp
@ -42,7 +43,8 @@ Application <3rdparty>Themes :
Utils.cpp
ViewItem.cpp
$(addonSources)
: be media translation $(TARGET_NETAPI_LIB) $(TARGET_LIBSTDC++)
: be media textencoding translation
$(TARGET_NETAPI_LIB) $(TARGET_LIBSTDC++)
: Themes.rdef
;

489
3rdparty/mmu_man/themes/MSThemeImporter.cpp vendored Normal file
View File

@ -0,0 +1,489 @@
/*
* MSThemeImporter class
*/
#include <Debug.h>
#include <Deskbar.h>
#include <Directory.h>
#include <Message.h>
#include <String.h>
#include <File.h>
#include <Path.h>
#include <UTF8.h>
#include <Volume.h>
#include <VolumeRoster.h>
#include <be_apps/Tracker/Background.h>
#include <fs_info.h>
#include <stdio.h>
#include <string.h>
#include <malloc.h>
#include "UITheme.h"
#include "Utils.h"
#include "MSThemeImporter.h"
// references:
// http://www.virtualplastic.net/html/desk_reg.html
// http://blogs.technet.com/josebda/archive/2007/08/06/personalizing-the-desktop-on-a-windows-server-2008-server-core-install.aspx
// http://msdn.microsoft.com/en-us/library/bb773190(VS.85).aspx
// color schemes:
// http://www.debbiesthemes.com/utilities/color_scheme.html
// http://www.endolith.com/wordpress/2008/08/03/wine-colors/
#define DEBUG_TI
#ifdef DEBUG_TI
#define FENTRY PRINT(("ThemeImporter[%s]::%s()\n", Name(), __FUNCTION__))
#else
#define FENTRY
#endif
static const deskbar_location kDeskbarLocationMap[] = {
//2:top 1:topright 5:bottom
B_DESKBAR_LEFT_TOP, B_DESKBAR_RIGHT_TOP, B_DESKBAR_TOP,
B_DESKBAR_LEFT_BOTTOM, B_DESKBAR_RIGHT_BOTTOM, B_DESKBAR_BOTTOM
};
static struct ui_color_map {
const char *wname;
const char *name1;
const char *name2;
} sUIColorMap[] = {
/*
{ "ActiveBorder" },
{ "ActiveTitle" },
{ "AppWorkspace", NOT B_UI_PANEL_BACKGROUND_COLOR, NULL },
{ "Background" },
{ "ButtonAlternateFace" },
{ "ButtonDkShadow" },
*/
{ "ButtonFace", B_UI_CONTROL_BACKGROUND_COLOR, B_UI_PANEL_BACKGROUND_COLOR },
{ "ButtonHilight", B_UI_CONTROL_HIGHLIGHT_COLOR, NULL },
{ "ButtonLight", B_UI_SHINE_COLOR, NULL },
{ "ButtonShadow", B_UI_SHADOW_COLOR, NULL },
{ "ButtonText", B_UI_CONTROL_TEXT_COLOR, B_UI_PANEL_TEXT_COLOR },
/*
{ "GradientActiveTitle" },
{ "GradientInactiveTitle" },
{ "GrayText" },
{ "Hilight" },
{ "HilightText" },
*/
{ "HotTrackingColor", B_UI_DOCUMENT_LINK_COLOR, NULL },
/*
{ "InactiveBorder" },
{ "InactiveTitle" },
{ "InactiveTitleText" },
*/
{ "InfoText", B_UI_TOOLTIP_TEXT_COLOR, NULL },
{ "InfoWindow", B_UI_TOOLTIP_BACKGROUND_COLOR, NULL },
{ "Menu", B_UI_MENU_BACKGROUND_COLOR, NULL },
{ "MenuBar", B_UI_MENU_BACKGROUND_COLOR, NULL },
{ "MenuHilight", B_UI_MENU_SELECTED_BACKGROUND_COLOR, NULL },
{ "MenuText", B_UI_MENU_ITEM_TEXT_COLOR, NULL },
/*
{ "Scrollbar" },
{ "TitleText" },
*/
{ "Window", B_UI_DOCUMENT_BACKGROUND_COLOR, NULL },
{ "WindowFrame", B_UI_NAVIGATION_BASE_COLOR, B_UI_CONTROL_HIGHLIGHT_COLOR },
{ "WindowText", B_UI_DOCUMENT_TEXT_COLOR, NULL },
{ NULL, NULL, NULL },
};
static struct screensaver_map {
const char *wname;
const char *name;
} sScreensaverMap[] = {
//{ "", "Blackness" }
//{ "", "BSOD" }
{ "system32\\logon.scr", "Lissart" },
{ "system32\\scrnsave.scr", "Lissart" },
{ "system32\\ss3dfo.scr", "Lissart" },
{ "system32\\ssbezier.scr", "Lissart" },
{ "system32\\ssflwbox.scr", "Lissart" },
{ "system32\\ssmarque.scr", "Message" },
{ "system32\\ssmypics.scr", "Lissart" },
{ "system32\\ssmyst.scr", "Lissart" },
{ "system32\\sspipes.scr", "Lissart" },
{ "system32\\ssstars.scr", /*"Stars"*/"Nebula" },
{ "system32\\sstext3d.scr", "Lissart" },
{ NULL, NULL }
};
MSThemeImporter::MSThemeImporter()
:ThemeImporter("MSTheme")
{
FENTRY;
}
MSThemeImporter::~MSThemeImporter()
{
FENTRY;
}
const char *MSThemeImporter::Description()
{
FENTRY;
return "Imports MSTheme themes";
}
status_t MSThemeImporter::FetchThemes()
{
FENTRY;
status_t err = ENOENT;
BVolumeRoster r;
BVolume v;
r.Rewind();
while (r.GetNextVolume(&v) == B_OK) {
fs_info info;
if (fs_stat_dev(v.Device(), &info) != B_OK)
continue;
if (strcmp(info.fsh_name, "ntfs"))
continue;
BDirectory dir;
if (v.GetRootDirectory(&dir) != B_OK)
continue;
if (dir.SetTo(&dir, "WINDOWS/Resources/Themes") == B_OK) {
if (ScanDirectory(dir))
err = B_OK;
}
#if 0
if (v.GetRootDirectory(&dir) != B_OK)
continue;
if (dir.SetTo(&dir, "Documents and Settings/revol/Mes documents") == B_OK) {
if (ScanDirectory(dir, 1))
err = B_OK;
}
#endif
#if 1
// that's slow...
if (v.GetRootDirectory(&dir) != B_OK)
continue;
if (dir.SetTo(&dir, "Documents and Settings") == B_OK) {
if (ScanDirectory(dir, 3))
err = B_OK;
}
#endif
}
return err;
}
status_t MSThemeImporter::ImportNextTheme(BMessage **theme)
{
FENTRY;
status_t err;
int i, j;
BEntry *entry = (BEntry *)fEntryList.RemoveItem(0L);
// no more
if (!entry)
return ENOENT;
BPath path;
err = entry->GetPath(&path);
delete entry;
if (err < B_OK)
return err;
BFile file;
err = file.SetTo(path.Path(), B_READ_ONLY);
if (err < B_OK)
return err;
BVolume vol;
err = file.GetVolume(&vol);
if (err < B_OK)
return err;
PRINT(("MSThemeImporter: importing from '%s'\n", path.Path()));
// get some standard folders
BDirectory rootDir;
err = vol.GetRootDirectory(&rootDir);
if (err < B_OK)
return err;
BString encodedContent;
off_t size;
char *buf;
err = file.GetSize(&size);
if (err < B_OK)
return err;
buf = encodedContent.LockBuffer((size_t)size+1);
memset(buf, 0, (size_t)size+1);
if (file.Read(buf, (size_t)size) < size)
return EIO;
encodedContent.UnlockBuffer();
int32 encodedLength = (int32)size;
BString content;
int32 contentLength = (int32)size * 2;
int32 state = 0;
buf = content.LockBuffer(contentLength+1);
memset(buf, 0, contentLength+1);
err = convert_to_utf8(B_MS_WINDOWS_CONVERSION,
encodedContent.String(), &encodedLength,
buf, &contentLength,
&state);
content.UnlockBuffer();
if (err < B_OK)
return err;
// strip DOS CR
content.RemoveSet("\r");
//printf("'%s'\n", content.String());
// is it really a theme file ?
if (content.IFindFirst("[Theme]") < 0)
return ENOENT;
BMessage global(Z_THEME_MESSAGE_WHAT);
BMessage info;
BMessage decor;
BMessage backgrounds;
BMessage deskbar;
BMessage ui_settings;
BMessage screensaver;
BString leaf(path.Leaf());
leaf.RemoveLast(".theme");
info.AddString(Z_THEME_NAME, leaf);
global.AddString(Z_THEME_LOCATION, path.Path());
BString themeScreensaver("Blackness");
BString themeWindowDecor("Win2k");
int32 themeWindowDecorR5 = R5_DECOR_WIN95;
BPath themeWallpaperPath;
bool themeWallpaperTiled = false;
int32 themeWallpaperStyle = 0;
BPoint themeWallpaperOrigin(0, 0);
BString section;
// on each line
while (content.Length()) {
BString line;
content.MoveInto(line, 0, content.FindFirst('\n'));
content.RemoveFirst("\n");
//printf(":'%s'\n", line.String());
if (line.Length() < 1)
continue;
if (line[0] == ';')
continue;
if (line[0] == '[') {
section = line;
continue;
}
BString key;
BString value;
line.MoveInto(key, 0, line.FindFirst('='));
line.RemoveFirst("=");
value = line;
if (section == "[Theme]") {
} else if (section == "[boot]") {
if (!key.ICompare("SCRNSAVE.EXE")) {
for (int i = 0; sScreensaverMap[i].wname; i++) {
if (value.IFindFirst(sScreensaverMap[i].wname) > -1) {
themeScreensaver = sScreensaverMap[i].name;
PRINT(("screensaver: %s -> %s\n", sScreensaverMap[i].wname, sScreensaverMap[i].name));
}
}
}
// My Computer
} else if (section == "[CLSID\\{20D04FE0-3AEA-1069-A2D8-08002B30309D}\\DefaultIcon]") {
//DefaultValue=%WinDir%explorer.exe,0
// My Documents
} else if (section == "[CLSID\\{450D8FBA-AD25-11D0-98A8-0800361B1103}\\DefaultIcon]") {
//DefaultValue=%WinDir%SYSTEM32\mydocs.dll,0
// My Network Places
} else if (section == "[CLSID\\{208D2C60-3AEA-1069-A2D7-08002B30309D}\\DefaultIcon]") {
//DefaultValue=%WinDir%SYSTEM32\shell32.dll,17
// Recycle Bin
} else if (section == "[CLSID\\{645FF040-5081-101B-9F08-00AA002F954E}\\DefaultIcon]") {
//full=%WinDir%SYSTEM32\shell32.dll,32
//empty=%WinDir%SYSTEM32\shell32.dll,31
} else if (section == "[Control Panel\\Colors]") {
int r, g, b;
int nColors = sscanf(value.String(), "%d %d %d", &r, &g, &b);
if (nColors < 3) {
PRINT(("nColors %d < 3\n", nColors));
continue;
}
rgb_color color = { r, g, b, 255 };
if (!key.ICompare("Background")) {
AddRGBColor(backgrounds, "be:desktop_color", color);
continue;
}
for (int i = 0; sUIColorMap[i].wname; i++) {
if (!key.ICompare(sUIColorMap[i].wname)) {
if (sUIColorMap[i].name1)
AddRGBColor(ui_settings, sUIColorMap[i].name1, color);
if (sUIColorMap[i].name2)
AddRGBColor(ui_settings, sUIColorMap[i].name2, color);
break;
}
}
} else if (section == "[Control Panel\\Desktop]") {
if (!key.ICompare("Wallpaper")) {
BPath p;
if (value.Length() < 1)
continue;
err = ParseWinPath(rootDir, value.String(), p);
if (err < B_OK)
continue;
PRINT(("Wallpaper at '%s'\n", p.Path()));
themeWallpaperPath = p;
} else if (!key.ICompare("TileWallpaper")) {
if (value != 0)
themeWallpaperTiled = true;
} else if (!key.ICompare("WallpaperStyle")) {
int v;
int n = sscanf(value.String(), "%d", &v);
if (n > 0)
themeWallpaperStyle = v;
} else if (!key.ICompare("WallpaperOriginX")) {
int v;
int n = sscanf(value.String(), "%d", &v);
if (n > 0)
themeWallpaperOrigin.x = v;
} else if (!key.ICompare("WallpaperOriginY")) {
int v;
int n = sscanf(value.String(), "%d", &v);
if (n > 0)
themeWallpaperOrigin.y = v;
} else if (!key.ICompare("Pattern")) {
;
} else if (!key.ICompare("ScreenSaveActive")) {
// force back to none
if (value == "0")
themeScreensaver = "Blackness";
}
} else if (section == "[Metrics]") {
;
} else if (section == "[VisualStyles]") {
if (!key.ICompare("Path")) {
if (value.IFindFirst("luna.msstyles") > -1) {
// map Zeta decor
themeWindowDecor = "Redmond";
} else if (value.IFindFirst("aero.msstyles") > -1) {
;
} // else use Win2k
}
if (!key.ICompare("ColorStyle")) {
// use the greyish verison
if (value == "Metallic" && themeWindowDecor == "Redmond")
themeWindowDecor = "Seattle";
}
} else {
;//PRINT(("MSThemeImporter: unknown section '%s', line '%s'\n", section.String(), line.String()));
}
}
decor.AddString("window:decor", themeWindowDecor.String());
decor.AddInt32("window:R5:decor", themeWindowDecorR5);
if (themeWallpaperPath.InitCheck() == B_OK) {
backgrounds.AddString(B_BACKGROUND_IMAGE, themeWallpaperPath.Path());
backgrounds.AddInt32(B_BACKGROUND_WORKSPACES, 0xffffffff);
int32 wallpaperMode = B_BACKGROUND_MODE_CENTERED;
switch (themeWallpaperStyle) {
case 0: // centered or tiled
if (themeWallpaperTiled)
wallpaperMode = B_BACKGROUND_MODE_TILED;
break;
case 2: // stretched
wallpaperMode = B_BACKGROUND_MODE_SCALED;
break;
case 3: // resized with correct ratio
// let's keep centered
break;
case 4: // resized and cropped with correct ratio
break;
}
backgrounds.AddInt32(B_BACKGROUND_MODE, wallpaperMode);
backgrounds.AddPoint(B_BACKGROUND_ORIGIN, themeWallpaperOrigin);
//backgrounds.AddBool(B_BACKGROUND_ERASE_TEXT, erasetext);
}
screensaver.AddString("screensaver:modulename", themeScreensaver.String());
global.AddMessage(Z_THEME_INFO_MESSAGE, &info);
global.AddMessage(Z_THEME_WINDOW_DECORATIONS, &decor);
global.AddMessage(Z_THEME_BACKGROUND_SETTINGS, &backgrounds);
global.AddMessage(Z_THEME_DESKBAR_SETTINGS, &deskbar);
global.AddMessage(Z_THEME_UI_SETTINGS, &ui_settings);
global.AddMessage(Z_THEME_SCREENSAVER_SETTINGS, &screensaver);
*theme = new BMessage(global);
//global.PrintToStream();
return B_OK;
}
status_t MSThemeImporter::EndImports()
{
FENTRY;
return B_OK;
}
bool MSThemeImporter::ScanDirectory(BDirectory &dir, int depth)
{
//FENTRY;
BEntry ent;
bool found = false;
if (depth == 0)
return false;
while (dir.GetNextEntry(&ent) == B_OK) {
if (ent.IsDirectory()) {
BDirectory subdir(&ent);
if (ScanDirectory(subdir, depth - 1))
found = true;
continue;
}
if (!ent.IsFile())
continue;
char name[B_FILE_NAME_LENGTH];
if (ent.GetName(name) != B_OK)
continue;
if (!strstr(name, ".theme"))
continue;
printf("found '%s'\n", name);
fEntryList.AddItem(new BEntry(ent));
found = true;
}
return found;
}
status_t MSThemeImporter::ParseWinPath(BDirectory &rootDir, const char *from, BPath &to)
{
//FENTRY;
//return ENOENT;
//BDirectory winDir(&rootDir, "WINDOWS");
//BDirectory resourceDir(&winDir, "Resources");
BString p(from);
p.ReplaceAll('\\', '/');
to.SetTo(&rootDir, ".");
if (p.IFindFirst("%WinDir%") == 0) {
to.Append("WINDOWS");
p.IReplaceFirst("%WinDir%", "");
}
if (p.IFindFirst("%ResourceDir%") == 0) {
to.Append("WINDOWS/Resources");
p.IReplaceFirst("%ResourceDir%", "");
}
//TODO: split and check for correct case
//TODO: %ThemeDir%
to.Append(p.String());
return B_OK;
}

45
3rdparty/mmu_man/themes/MSThemeImporter.h vendored Normal file
View File

@ -0,0 +1,45 @@
#ifndef _MS_THEME_IMPORTER_H
#define _MS_THEME_IMPORTER_H
/*
* MSTheme Importer class header
*/
#include <List.h>
#include "ThemeImporter.h"
namespace Z {
namespace ThemeManager {
class MSThemeImporter : public ThemeImporter {
public:
MSThemeImporter();
virtual ~MSThemeImporter();
/* presentation */
virtual const char *Description(); /* tooltip... */
/* Theme manipulation */
virtual status_t FetchThemes();
virtual status_t ImportNextTheme(BMessage **theme);
virtual status_t EndImports();
/* */
private:
bool ScanDirectory(BDirectory &dir, int depth=-1);
status_t ParseWinPath(BDirectory &rootDir, const char *from, BPath &to);
friend class Z::ThemeManager::ThemeManager;
BList fEntryList;
};
} // ns ThemeManager
} // ns Z
using namespace Z::ThemeManager;
#endif /* _MS_THEME_IMPORTER_H */

3
3rdparty/mmu_man/themes/TODO.txt vendored
View File

@ -1,7 +1,6 @@
TODOs for Theme manager:
* check R5 build
* style cleanup (-> Haiku style)
* enable theme comments again (tooltip on listitem ?).
* make ParseMessage more robust
* forbid quitting while themes are loading!
* implement BackupFiles() methods to add required files to a zip.
@ -15,8 +14,10 @@ TODOs for Theme manager:
- Deskbar logo (Be, leaf...)
- dircolors (cf. http://linux.die.net/man/5/dir_colors )
- icons (/etc/icons ? svg/hvif, setmime...)
- Tracker usage bar colors
- mouse cursors (needs app_server fixes ??)
- Pulse colors (-> sample code)
- BeIDE/Pe/Eddie full colors (map to singe namespace)
- Vision/BeShare full colors (map to singe namespace)
- Firefox theme ?

2
3rdparty/mmu_man/themes/ThemeManager.cpp vendored
View File

@ -26,6 +26,7 @@
#include "ThemesAddon.h"
#include "ThemeImporter.h"
#include "BeThemeImporter.h"
#include "MSThemeImporter.h"
#include "ParseMessage.h"
#include "DumpMessage.h"
@ -58,6 +59,7 @@ ThemeManager::ThemeManager()
// XXX: add more
fThemeImporters.AddItem(new BeThemeImporter());
fThemeImporters.AddItem(new MSThemeImporter());
// XXX test
/*

5
3rdparty/mmu_man/themes/UITheme.h vendored
View File

@ -83,6 +83,11 @@
#define B_UI_SETTINGS_CHANGED '_UIC'
#endif
#define R5_DECOR_BEOS 0
#define R5_DECOR_WIN95 1
#define R5_DECOR_AMIGA 2
#define R5_DECOR_MAC 3
#ifndef __HAIKU__
#ifndef B_BEOS_VERSION_DANO
// R5 compatibility