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

Turns out Fredrik was right and the icon type is an officially registered MIME type.

Browse Source 
Changed the ICOTranslator accordingly.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@17465 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2006-05-15 18:19:35 +00:00
parent f5c9c0d066
commit ce3b920126
4 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/add-ons/translators/ico/ConfigView.cpp
View File

@ -44,7 +44,7 @@ ConfigView::ConfigView(const BRect &frame, uint32 resize, uint32 flags)
height = fontHeight.descent + fontHeight.ascent + fontHeight.leading;
rect.OffsetBy(0, height + 5);
stringView = new BStringView(rect, "copyright", B_UTF8_COPYRIGHT "2005 Haiku Inc.");
stringView = new BStringView(rect, "copyright", B_UTF8_COPYRIGHT "2005-2006 Haiku Inc.");
stringView->ResizeToPreferred();
AddChild(stringView);

4
src/add-ons/translators/ico/ICOTranslator.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright 2005, Axel Dörfler, axeld@pinc-software.de. All rights reserved.
* Copyright 2005-2006, Axel Dörfler, axeld@pinc-software.de. All rights reserved.
* Distributed under the terms of the MIT License.
*/
@ -16,7 +16,7 @@
const char *kDocumentCount = "/documentCount";
const char *kDocumentIndex = "/documentIndex";
#define kICOMimeType "image/x-icon"
#define kICOMimeType "image/vnd.microsoft.icon"
// I'm lazy - structure initializers don't like const variables...

7
src/add-ons/translators/ico/main.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright 2005, Axel Dörfler, axeld@pinc-software.de. All rights reserved.
* Copyright 2005-2006, Axel Dörfler, axeld@pinc-software.de. All rights reserved.
* Distributed under the terms of the MIT License.
*/
@ -9,12 +9,7 @@
#include "TranslatorWindow.h"
#include <Application.h>
/*
#include <TranslatorRoster.h>
#include <stdio.h>
#include <string.h>
*/
int
main(int /*argc*/, char **/*argv*/)

4
src/data/beos_mime/image/x-icon → src/data/beos_mime/image/vnd.microsoft.icon
View File

@ -1,7 +1,7 @@
resource(0, "BEOS:TYPE") #'MIMS' "application/x-vnd.Be-meta-mime";
resource(1, "META:TYPE") "image/x-icon";
resource(1, "META:TYPE") "image/vnd.microsoft.icon";
resource(2, "META:SNIFF_RULE") "0.50 (\"\\000\\000\\001\\000\" | \"\\000\\000\\002\\000\")";
@ -9,5 +9,5 @@ resource(3, "META:S:DESC") #'MSDC' "Windows Icon";
resource(4, "META:EXTENS") message(234) {
"extensions" = "ico",
"type" = "image/x-icon"
"type" = "image/vnd.microsoft.icon"
};