Magellan Linux

Contents of /trunk/virtualbox/patches/virtualbox-3.2.4-magellan-branding.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1050 - (show annotations) (download)
Wed Jun 9 23:09:39 2010 UTC (13 years, 10 months ago) by niro
File size: 11726 byte(s)
-re-diffed for 3.2.4

1 diff -Naur VirtualBox-3.2.4_OSE/include/VBox/ostypes.h VirtualBox-3.2.4_OSE-magellan/include/VBox/ostypes.h
2 --- VirtualBox-3.2.4_OSE/include/VBox/ostypes.h 2010-06-08 14:20:32.000000000 +0200
3 +++ VirtualBox-3.2.4_OSE-magellan/include/VBox/ostypes.h 2010-06-10 00:56:38.000000000 +0200
4 @@ -96,6 +96,8 @@
5 VBOXOSTYPE_Xandros_x64 = 0x5D100,
6 VBOXOSTYPE_Oracle = 0x5E000,
7 VBOXOSTYPE_Oracle_x64 = 0x5E100,
8 + VBOXOSTYPE_Magellan = 0x5F000,
9 + VBOXOSTYPE_Magellan_x64 = 0x5F100,
10 VBOXOSTYPE_FreeBSD = 0x60000,
11 VBOXOSTYPE_FreeBSD_x64 = 0x60100,
12 VBOXOSTYPE_OpenBSD = 0x61000,
13 diff -Naur VirtualBox-3.2.4_OSE/src/VBox/Frontends/VirtualBox/images/os_magellan_64.png VirtualBox-3.2.4_OSE-magellan/src/VBox/Frontends/VirtualBox/images/os_magellan_64.png
14 --- VirtualBox-3.2.4_OSE/src/VBox/Frontends/VirtualBox/images/os_magellan_64.png 1970-01-01 01:00:00.000000000 +0100
15 +++ VirtualBox-3.2.4_OSE-magellan/src/VBox/Frontends/VirtualBox/images/os_magellan_64.png 2010-06-10 00:54:49.000000000 +0200
16 @@ -0,0 +1,12 @@
17 +PNG
18 +
19 + IHDR szzsRGBbKGD pHYs  tIME4 iIDATXŗMhTW2惀q 1!Tm$(dLl/\
20 +!
21 +ΕP!duD)Քh4#q2u潙q>3w?Ͻ3b_lqq#w~͹ƹsԬh8/\V(#O:-mH$™3g?~̥K+T-UyR*T[W6f9I$yf<Hee%477@GGMJ* Bk5 00 s֏H-<gF4PWWGyy9ܼy~RA\
22 +4:JQ4=OC* !MvXXXٳx^v,###;wX,F H<D&yJJJ!Ο?Oee%W&L"9˼.^, -Q@YYPOii)HC4Gw)QJqmj0o+Mk׮o>\.gӦMA顪CkuB `qq={:nn566h Vh4b``W/Ota?Eј=,H'lS/(L盯sv~ESSGeÆ $ <yo/|]ꢣr~:Xԟ9}H)TN_SNQWW,x۷s10p8TTTpp\aRTK6n܈ӧ:t'OZ[ZmPJq:ƍuԋ(B
23 +D"099ĉ|,Ϟ=3i)|dp8L__ݻ;w033upժU3f]d A~gbb1
24 +ЬD%||>3@>6zCCCɷ5lF93`B 000v'W%
25 +FI?~ܞo߂bK# #ˉ5FuJ+̉Aղm8
26 +5MC)E__P0/~@䵱]YRM)iܽ{Xt n
27 +m42kFs,޽{D#s&@Jl"$$K@HeeB<}޲+Kv}d"DdtL G)-+͝
28 +}$wWd[z>wid~拧c1IENDB`
29 \ Kein Zeilenumbruch am Dateiende.
30 diff -Naur VirtualBox-3.2.4_OSE/src/VBox/Frontends/VirtualBox/images/os_magellan.png VirtualBox-3.2.4_OSE-magellan/src/VBox/Frontends/VirtualBox/images/os_magellan.png
31 --- VirtualBox-3.2.4_OSE/src/VBox/Frontends/VirtualBox/images/os_magellan.png 1970-01-01 01:00:00.000000000 +0100
32 +++ VirtualBox-3.2.4_OSE-magellan/src/VBox/Frontends/VirtualBox/images/os_magellan.png 2010-06-10 00:54:49.000000000 +0200
33 @@ -0,0 +1,5 @@
34 +PNG
35 +
36 + IHDR szzsRGBbKGD pHYs  tIME13[ 0IDATXŗoG?3T
37 +FIHP!BJ]U (nJVCz.=sD"9sJ ڪ*4J+.q{5'=yoވ}z0oܝ|??79M8x.ĶaL!`p7{W_~ӽ $bW,D^"G:R4a5hZ8QZ#P4Rmz uwFBjxtw_\%vlI… XU7&D)GYז0K݀ P˲, ue˻X,
38 +x<ܹs+mdhhB@PX,V )sXR)LӤ;ju4mnۿ@G@=^/ MѲR?xIGqGl%8|"ڵk=zBG ^1 FFFgϞq-/ G"Hrً.&&&˗yΞ=At^D"A{{;W^Diu t1~?\rq<3PJqM.q۷o8uTDpwRv]OdYX]]266F__|X,5KKKwF 5+MLH$BOO/^`zzR{@-Yh(xÇL&mnUj r90i*"XX,f$ 8F|p=>|X:[$!N<~'5sdCZ#I8.y%\{eFGG+W~R$x<ksVx|d3IR,dW)3$hb@3#a"I'k mC)Θ2)0 rM($B6hKoX,ٔmTܺ,-|>˞=*8Q>-)oWeؙNdxKPɮ,#2vTf]ʷ PlW>]/aɅw'p'+,<;)?Z9T"IENDB`
39 \ Kein Zeilenumbruch am Dateiende.
40 diff -Naur VirtualBox-3.2.4_OSE/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp VirtualBox-3.2.4_OSE-magellan/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp
41 --- VirtualBox-3.2.4_OSE/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp 2010-06-08 14:22:16.000000000 +0200
42 +++ VirtualBox-3.2.4_OSE-magellan/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp 2010-06-10 00:57:24.000000000 +0200
43 @@ -5041,6 +5041,8 @@
44 {"Fedora_64", ":/os_fedora_64.png"},
45 {"Gentoo", ":/os_gentoo.png"},
46 {"Gentoo_64", ":/os_gentoo_64.png"},
47 + {"Magellan", ":/os_magellan.png"},
48 + {"Magellan_64", ":/os_magellan_64.png"},
49 {"Mandriva", ":/os_mandriva.png"},
50 {"Mandriva_64", ":/os_mandriva_64.png"},
51 {"RedHat", ":/os_redhat.png"},
52 diff -Naur VirtualBox-3.2.4_OSE/src/VBox/Frontends/VirtualBox/src/widgets/VBoxOSTypeSelectorWidget.cpp VirtualBox-3.2.4_OSE-magellan/src/VBox/Frontends/VirtualBox/src/widgets/VBoxOSTypeSelectorWidget.cpp
53 --- VirtualBox-3.2.4_OSE/src/VBox/Frontends/VirtualBox/src/widgets/VBoxOSTypeSelectorWidget.cpp 2010-06-08 14:22:18.000000000 +0200
54 +++ VirtualBox-3.2.4_OSE-magellan/src/VBox/Frontends/VirtualBox/src/widgets/VBoxOSTypeSelectorWidget.cpp 2010-06-10 00:58:16.000000000 +0200
55 @@ -199,10 +199,10 @@
56 if (xpIndex != -1)
57 mCbType->setCurrentIndex (xpIndex);
58 }
59 - /* Or select Ubuntu item for Linux family as default */
60 + /* Or select Magellan item for Linux family as default */
61 else if (familyId == "Linux")
62 {
63 - int ubIndex = mCbType->findData ("Ubuntu", RoleTypeID);
64 + int ubIndex = mCbType->findData ("Magellan", RoleTypeID);
65 if (ubIndex != -1)
66 mCbType->setCurrentIndex (ubIndex);
67 }
68 diff -Naur VirtualBox-3.2.4_OSE/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UINewVMWzd.cpp VirtualBox-3.2.4_OSE-magellan/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UINewVMWzd.cpp
69 --- VirtualBox-3.2.4_OSE/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UINewVMWzd.cpp 2010-06-08 14:22:18.000000000 +0200
70 +++ VirtualBox-3.2.4_OSE-magellan/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UINewVMWzd.cpp 2010-06-10 01:07:37.000000000 +0200
71 @@ -90,6 +90,8 @@
72 { QRegExp("Fe", Qt::CaseInsensitive), "Fedora" },
73 { QRegExp("((Gen)|(Sab)).*64", Qt::CaseInsensitive), "Gentoo_64" },
74 { QRegExp("(Gen)|(Sab)", Qt::CaseInsensitive), "Gentoo" },
75 + { QRegExp("Mage.*64", Qt::CaseInsensitive), "Magellan_64" },
76 + { QRegExp("Mage", Qt::CaseInsensitive), "Magellan" },
77 { QRegExp("Man.*64", Qt::CaseInsensitive), "Mandriva_64" },
78 { QRegExp("Man", Qt::CaseInsensitive), "Mandriva" },
79 { QRegExp("((Red)|(rhel)|(cen)).*64", Qt::CaseInsensitive), "RedHat_64" },
80 diff -Naur VirtualBox-3.2.4_OSE/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc VirtualBox-3.2.4_OSE-magellan/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc
81 --- VirtualBox-3.2.4_OSE/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc 2010-06-08 14:22:13.000000000 +0200
82 +++ VirtualBox-3.2.4_OSE-magellan/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc 2010-06-10 00:58:48.000000000 +0200
83 @@ -18,6 +18,8 @@
84 <file alias="os_linux24_64.png">images/os_linux24_64.png</file>
85 <file alias="os_linux26.png">images/os_linux26.png</file>
86 <file alias="os_linux26_64.png">images/os_linux26_64.png</file>
87 + <file alias="os_magellan.png">images/os_magellan.png</file>
88 + <file alias="os_magellan_64.png">images/os_magellan_64.png</file>
89 <file alias="os_mandriva.png">images/os_mandriva.png</file>
90 <file alias="os_mandriva_64.png">images/os_mandriva_64.png</file>
91 <file alias="os_netbsd.png">images/os_netbsd.png</file>
92 diff -Naur VirtualBox-3.2.4_OSE/src/VBox/Main/Global.cpp VirtualBox-3.2.4_OSE-magellan/src/VBox/Main/Global.cpp
93 --- VirtualBox-3.2.4_OSE/src/VBox/Main/Global.cpp 2010-06-08 14:22:23.000000000 +0200
94 +++ VirtualBox-3.2.4_OSE-magellan/src/VBox/Main/Global.cpp 2010-06-10 01:02:53.000000000 +0200
95 @@ -163,6 +163,14 @@
96 VBOXOSTYPE_Gentoo_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
97 256, 12, 8 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
98 StorageControllerType_IntelAhci, StorageBus_SATA },
99 + { "Linux", "Linux", SchemaDefs_OSTypeId_Magellan, "Magellan Linux",
100 + VBOXOSTYPE_Magellan, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
101 + 256, 12, 8 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
102 + StorageControllerType_IntelAhci, StorageBus_SATA },
103 + { "Linux", "Linux", SchemaDefs_OSTypeId_Magellan_64, "Magellan Linux (64 bit)",
104 + VBOXOSTYPE_Magellan_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
105 + 256, 12, 8 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
106 + StorageControllerType_IntelAhci, StorageBus_SATA },
107 { "Linux", "Linux", SchemaDefs_OSTypeId_Mandriva, "Mandriva",
108 VBOXOSTYPE_Mandriva, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
109 512, 12, 8 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
110 diff -Naur VirtualBox-3.2.4_OSE/src/VBox/Main/xml/SettingsConverter.xsl VirtualBox-3.2.4_OSE-magellan/src/VBox/Main/xml/SettingsConverter.xsl
111 --- VirtualBox-3.2.4_OSE/src/VBox/Main/xml/SettingsConverter.xsl 2010-06-08 14:22:27.000000000 +0200
112 +++ VirtualBox-3.2.4_OSE-magellan/src/VBox/Main/xml/SettingsConverter.xsl 2010-06-10 01:03:23.000000000 +0200
113 @@ -752,6 +752,7 @@
114 <xsl:when test="@OSType='opensuse'">OpenSUSE</xsl:when>
115 <xsl:when test="@OSType='fedoracore'">Fedora</xsl:when>
116 <xsl:when test="@OSType='gentoo'">Gentoo</xsl:when>
117 + <xsl:when test="@OSType='magellan'">Magellan</xsl:when>
118 <xsl:when test="@OSType='mandriva'">Mandriva</xsl:when>
119 <xsl:when test="@OSType='redhat'">RedHat</xsl:when>
120 <xsl:when test="@OSType='ubuntu'">Ubuntu</xsl:when>
121 diff -Naur VirtualBox-3.2.4_OSE/src/VBox/Main/xml/Settings.cpp VirtualBox-3.2.4_OSE-magellan/src/VBox/Main/xml/Settings.cpp
122 --- VirtualBox-3.2.4_OSE/src/VBox/Main/xml/Settings.cpp 2010-06-08 14:22:27.000000000 +0200
123 +++ VirtualBox-3.2.4_OSE-magellan/src/VBox/Main/xml/Settings.cpp 2010-06-10 01:04:22.000000000 +0200
124 @@ -2919,6 +2919,7 @@
125 { "opensuse", "OpenSUSE" },
126 { "fedoracore", "Fedora" },
127 { "gentoo", "Gentoo" },
128 + { "magellan", "Magellan" },
129 { "mandriva", "Mandriva" },
130 { "redhat", "RedHat" },
131 { "ubuntu", "Ubuntu" },
132 diff -Naur VirtualBox-3.2.4_OSE/src/VBox/Main/xml/VirtualBox-settings-common.xsd VirtualBox-3.2.4_OSE-magellan/src/VBox/Main/xml/VirtualBox-settings-common.xsd
133 --- VirtualBox-3.2.4_OSE/src/VBox/Main/xml/VirtualBox-settings-common.xsd 2010-06-08 14:22:27.000000000 +0200
134 +++ VirtualBox-3.2.4_OSE-magellan/src/VBox/Main/xml/VirtualBox-settings-common.xsd 2010-06-10 01:04:49.000000000 +0200
135 @@ -177,6 +177,8 @@
136 <xsd:enumeration value="Fedora_64"/>
137 <xsd:enumeration value="Gentoo"/>
138 <xsd:enumeration value="Gentoo_64"/>
139 + <xsd:enumeration value="Magellan"/>
140 + <xsd:enumeration value="Magellan_64"/>
141 <xsd:enumeration value="Mandriva"/>
142 <xsd:enumeration value="Mandriva_64"/>
143 <xsd:enumeration value="RedHat"/>