Ros-diffs November 2022

ros-diffs@reactos.org

26 participants
175 discussions

[reactos] 01/01: [DISKPART] Fix help for multi-word command crashing. (#4873)
by Marcin Jabłoński 12 Nov '22

12 Nov '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6a3a79bb721f9e3496769… commit 6a3a79bb721f9e34967693f3f8dfc8a4b26ec95c Author: Marcin Jabłoński <24442148+TheNNX(a)users.noreply.github.com> AuthorDate: Sat Nov 12 13:02:33 2022 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Nov 12 13:02:33 2022 +0100 [DISKPART] Fix help for multi-word command crashing. (#4873) * [DISKPART] Fix help for multi-word command crashing. When the HELP command is executed for a multi-word command, for example "HELP CREATE PARTITION PRIMARY", diskpart crashes. This happens because before the desired form of the command is encountered, its single word form is found - since the first word of the command matches the one HELP is looking for, it tries to compare the second word of the input command with the second (nonexistent) word of the encountered single word command, which is NULL. This results in diskpart crashing. The fix makes HELP check if the to-be-compared word is not NULL, before calling wcsicmp. --- base/system/diskpart/help.c | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/base/system/diskpart/help.c b/base/system/diskpart/help.c index 2caf271e5f2..0e20175e10c 100644 --- a/base/system/diskpart/help.c +++ b/base/system/diskpart/help.c @@ -60,7 +60,7 @@ HelpCommand( { if (pCommand->cmd1 != NULL && pCommand->cmd2 == NULL && pCommand->cmd3 == NULL) { - if ((wcsicmp(pCommand->cmd1, cmdptr->cmd1) == 0) && + if ((cmdptr->cmd1 != NULL && wcsicmp(pCommand->cmd1, cmdptr->cmd1) == 0) && (cmdptr->cmd2 != NULL) && (cmdptr->cmd3 == NULL) && (cmdptr->help != IDS_NONE)) @@ -72,8 +72,8 @@ HelpCommand( } else if (pCommand->cmd1 != NULL && pCommand->cmd2 != NULL && pCommand->cmd3 == NULL) { - if ((wcsicmp(pCommand->cmd1, cmdptr->cmd1) == 0) && - (wcsicmp(pCommand->cmd2, cmdptr->cmd2) == 0) && + if ((cmdptr->cmd1 != NULL && wcsicmp(pCommand->cmd1, cmdptr->cmd1) == 0) && + (cmdptr->cmd2 != NULL && wcsicmp(pCommand->cmd2, cmdptr->cmd2) == 0) && (cmdptr->cmd3 != NULL) && (cmdptr->help != IDS_NONE)) { @@ -84,9 +84,9 @@ HelpCommand( } else if (pCommand->cmd1 != NULL && pCommand->cmd2 != NULL && pCommand->cmd3 != NULL) { - if ((wcsicmp(pCommand->cmd1, cmdptr->cmd1) == 0) && - (wcsicmp(pCommand->cmd2, cmdptr->cmd2) == 0) && - (wcsicmp(pCommand->cmd3, cmdptr->cmd3) == 0) && + if ((cmdptr->cmd1 != NULL && wcsicmp(pCommand->cmd1, cmdptr->cmd1) == 0) && + (cmdptr->cmd2 != NULL && wcsicmp(pCommand->cmd2, cmdptr->cmd2) == 0) && + (cmdptr->cmd3 != NULL && wcsicmp(pCommand->cmd3, cmdptr->cmd3) == 0) && (cmdptr->help_detail != MSG_NONE)) { ConMsgPuts(StdOut, @@ -134,21 +134,27 @@ BOOL help_main(INT argc, LPWSTR *argv) for (cmdptr = cmds; cmdptr->cmd1; cmdptr++) { if ((cmdptr1 == NULL) && - (wcsicmp(argv[1], cmdptr->cmd1) == 0)) + (cmdptr->cmd1 != NULL && wcsicmp(argv[1], cmdptr->cmd1) == 0)) + { cmdptr1 = cmdptr; + } if ((cmdptr2 == NULL) && (argc >= 3) && - (wcsicmp(argv[1], cmdptr->cmd1) == 0) && - (wcsicmp(argv[2], cmdptr->cmd2) == 0)) + (cmdptr->cmd1 != NULL && wcsicmp(argv[1], cmdptr->cmd1) == 0) && + (cmdptr->cmd2 != NULL && wcsicmp(argv[2], cmdptr->cmd2) == 0)) + { cmdptr2 = cmdptr; - + } + if ((cmdptr3 == NULL) && (argc >= 4) && - (wcsicmp(argv[1], cmdptr->cmd1) == 0) && - (wcsicmp(argv[2], cmdptr->cmd2) == 0) && - (wcsicmp(argv[3], cmdptr->cmd3) == 0)) + (cmdptr->cmd1 != NULL && wcsicmp(argv[1], cmdptr->cmd1) == 0) && + (cmdptr->cmd2 != NULL && wcsicmp(argv[2], cmdptr->cmd2) == 0) && + (cmdptr->cmd3 != NULL && wcsicmp(argv[3], cmdptr->cmd3) == 0)) + { cmdptr3 = cmdptr; + } } if (cmdptr3 != NULL)

1 0

[reactos] 01/01: [SETUP][INF][MEDIA] Get rid of the last Ubuntu references CORE-18607 (#4871)
by Joachim Henze 12 Nov '22

12 Nov '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c47758b102e1866f8d4be… commit c47758b102e1866f8d4bed71071f91c50b7e3e89 Author: Joachim Henze <joachim.henze(a)reactos.org> AuthorDate: Sat Nov 12 12:44:54 2022 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Nov 12 12:44:54 2022 +0100 [SETUP][INF][MEDIA] Get rid of the last Ubuntu references CORE-18607 (#4871) An addendum to 0.4.14-dev-20-g 2f4fb903b46207ab380365908401ded63752a108 because since then we don't have the Ubuntu font anymore. The substitutes are also not needed any longer. We can use Tahoma here without causing any change in the current rendering, because for all languages the former Ubuntu substitutions did point either to Tahoma, or to the same thing, that Tahoma atm points to (for those language that do require additional glyphs). This way we do not only get the substitutions closer to 2k3sp2, but will also simplify our maintenance and testing, because the same font is guaranteed to be used then for all themes: Classic, Blackshade and Lautus: The font which has the needed glyphs for that specific language. E.g. "FreeSans" for Hindi, "Tahoma" for most Western languages, and "Droid Sans Fallback" for Chinese and Japanese language. Things are cleaner and simpler this way. --- base/setup/lib/muifonts.h | 5 -- media/inf/font.inf | 2 - .../textfiles/LargeFontsNormal.INI | 68 +++++++++++----------- .../blackshade.msstyles/textfiles/NormalNormal.INI | 58 +++++++++--------- .../lautus.msstyles/textfiles/LargeFontsNormal.INI | 68 +++++++++++----------- .../lautus.msstyles/textfiles/NormalNormal.INI | 58 +++++++++--------- .../textfiles/Dark/ExtraLargeDark.INI | 60 +++++++++---------- .../textfiles/Dark/LargeFontsDark.INI | 60 +++++++++---------- .../modern.msstyles/textfiles/Dark/RegularDark.INI | 60 +++++++++---------- .../textfiles/Light/ExtraLargeLight.INI | 60 +++++++++---------- .../textfiles/Light/LargeFontsLight.INI | 60 +++++++++---------- .../textfiles/Light/RegularLight.INI | 60 +++++++++---------- 12 files changed, 306 insertions(+), 313 deletions(-) diff --git a/base/setup/lib/muifonts.h b/base/setup/lib/muifonts.h index 1ab29e86bd7..f928653e168 100644 --- a/base/setup/lib/muifonts.h +++ b/base/setup/lib/muifonts.h @@ -122,7 +122,6 @@ MUI_SUBFONT HebrewFonts[] = { L"Times New Roman Greek,161", L"Times New Roman,161" }, { L"Times New Roman TUR,162", L"Times New Roman,162" }, { L"Tms Rmn", L"Times New Roman" }, - { L"Ubuntu", L"Tahoma" }, { NULL, NULL } }; @@ -169,7 +168,6 @@ MUI_SUBFONT ChineseSimplifiedFonts[] = { L"Times New Roman TUR,162", L"Times New Roman,162" }, { L"Tms Rmn", L"Times New Roman" }, { L"Trebuchet MS", L"Droid Sans Fallback" }, - { L"Ubuntu", L"Droid Sans Fallback" }, /* localized names */ { CSF_LocalName0, L"Droid Sans Fallback" }, { CSF_LocalName1, L"Droid Sans Fallback" }, @@ -222,7 +220,6 @@ MUI_SUBFONT ChineseTraditionalFonts[] = { L"Times New Roman TUR,162", L"Times New Roman,162" }, { L"Tms Rmn", L"Times New Roman" }, { L"Trebuchet MS", L"Droid Sans Fallback" }, - { L"Ubuntu", L"Droid Sans Fallback" }, /* localized names */ { CTF_LocalName0, L"Droid Sans Fallback" }, { CTF_LocalName1, L"Droid Sans Fallback" }, @@ -273,7 +270,6 @@ MUI_SUBFONT JapaneseFonts[] = { L"Times New Roman TUR,162", L"Times New Roman,162" }, { L"Tms Rmn", L"Times New Roman" }, { L"Trebuchet MS", L"Droid Sans Fallback" }, - { L"Ubuntu", L"Droid Sans Fallback" }, /* localized names */ { JF_LocalName0, L"Droid Sans Fallback" }, { JF_LocalName1, L"Droid Sans Fallback" }, @@ -328,7 +324,6 @@ MUI_SUBFONT KoreanFonts[] = { L"Times New Roman TUR,162", L"Times New Roman,162" }, { L"Tms Rmn", L"Times New Roman" }, { L"Trebuchet MS", L"Droid Sans Fallback" }, - { L"Ubuntu", L"Droid Sans Fallback" }, /* localized names */ { KF_LocalName0, L"Droid Sans Fallback" }, { KF_LocalName1, L"Droid Sans Fallback" }, diff --git a/media/inf/font.inf b/media/inf/font.inf index e49bbccd3fb..f14707f1835 100644 --- a/media/inf/font.inf +++ b/media/inf/font.inf @@ -70,7 +70,6 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dl HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Terminal",0x00000000,"Courier New" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Times",0x00000000,"Times New Roman" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Tms Rmn",0x00000000,"Times New Roman" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Ubuntu",0x00000000,"Tahoma" [Font.CJK.Reg] HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Courier",0x00000000,"Courier New" @@ -89,7 +88,6 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Terminal",0 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Times",0x00000000,"Times New Roman" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Tms Rmn",0x00000000,"Times New Roman" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Trebuchet MS",0x00000000,"Droid Sans Fallback" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Ubuntu",0x00000000,"Droid Sans Fallback" [Font.Unicode.Reg] HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Courier",0x00000000,"Courier New" diff --git a/media/themes/Blackshade/blackshade.msstyles/textfiles/LargeFontsNormal.INI b/media/themes/Blackshade/blackshade.msstyles/textfiles/LargeFontsNormal.INI index 36b5181fab8..9d72583e432 100644 --- a/media/themes/Blackshade/blackshade.msstyles/textfiles/LargeFontsNormal.INI +++ b/media/themes/Blackshade/blackshade.msstyles/textfiles/LargeFontsNormal.INI @@ -13,7 +13,7 @@ Btnface = 239 238 243 BtnHighlight = 255 255 255 BtnShadow = 162 162 162 CaptionBarHeight = 24 -CaptionFont = Ubuntu, 9, Bold +CaptionFont = Tahoma, 9, Bold CaptionText = 255 255 255 CssName = cpwebvw.css DkShadow3d = 162 162 162 @@ -24,23 +24,23 @@ GrayText = 172 168 153 Highlight = 75 75 75 HighlightText = 255 255 255 HotTracking = 0 0 128 -IconTitleFont = Ubuntu, 9 +IconTitleFont = Tahoma, 9 InactiveCaption = 65 65 65 InactiveCaptionText = 180 180 180 Light3d = 241 239 226 Menu = 255 255 255 MenuBar = 239 238 243 -MenuFont = Ubuntu, 9 +MenuFont = Tahoma, 9 MenuHilight = 100 100 100 MenuText = 75 75 75 MinColorDepth = 15 -MsgBoxFont = Ubuntu, 9 +MsgBoxFont = Tahoma, 9 ScrollbarHeight = 15 ScrollbarWidth = 15 -SmallCaptionFont = Ubuntu, 9, Bold +SmallCaptionFont = Tahoma, 9, Bold SMCaptionBarHeight = 19 SMCaptionBarWidth = 21 -StatusFont = Ubuntu, 9 +StatusFont = Tahoma, 9 Window = 255 255 255 XmlName = default.xml @@ -101,7 +101,7 @@ SizingType = Stretch TextColor = 112 112 112 TRANSPARENT = true TRANSPARENTCOLOR = 255 0 255 -FONT = Ubuntu, 9 +FONT = Tahoma, 9 TEXTSHADOWOFFSET = 1,1 TEXTSHADOWTYPE = Single TEXTSHADOWCOLOR = 221 221 221 @@ -206,7 +206,7 @@ GradientRatio2 = 255 BgType = ImageFile ContentMargins = 8, 8, 7, 7 FillColorHint = 94 135 217 -Font = Ubuntu, 9, Bold +Font = Tahoma, 9, Bold ImageFile = Normal\ExplorerBarHeaderBackground.bmp SizingMargins = 17, 1, 0, 0 SizingType = Stretch @@ -252,7 +252,7 @@ BgType = ImageFile BorderColor = 255 255 255 ContentMargins = 8, 8, 7, 7 FillColor = 214 223 247 -Font = Ubuntu, 9 +Font = Tahoma, 9 ImageFile = Normal\NormalGroupBackground.bmp SizingMargins = 3, 3, 3, 3 SizingType = Stretch @@ -286,7 +286,7 @@ Transparent = true BgType = ImageFile ContentMargins = 8, 8, 7, 7 FillColorHint = 240 243 251 -Font = Ubuntu, 9, Bold +Font = Tahoma, 9, Bold ImageFile = Normal\NormalGroupHead.bmp SizingMargins = 3, 15, 3, 1 SizingType = Stretch @@ -297,7 +297,7 @@ Transparent = true BgType = ImageFile ContentMargins = 8, 8, 7, 7 FillColorHint = 239 243 255 -Font = Ubuntu, 9 +Font = Tahoma, 9 ImageFile = Normal\SpecialGroupBackground.bmp SizingMargins = 3, 3, 3, 3 SizingType = Stretch @@ -331,7 +331,7 @@ Transparent = true BgType = ImageFile ContentMargins = 8, 8, 7, 7 FillColor = 2 72 178 -Font = Ubuntu, 9, Bold +Font = Tahoma, 9, Bold ImageFile = Normal\SpecialGroupHead.bmp SizingMargins = 3, 6, 5, 16 SizingType = Stretch @@ -416,7 +416,7 @@ SizingType = Stretch [Rebar] Bgtype = imagefile FillColorHint = 241 243 239 -Font = Ubuntu, 9 +Font = Tahoma, 9 ImageFile = Normal\ToolbarBackground.bmp Sizingmargins = 1, 1, 1, 2 Sizingtype = stretch @@ -683,7 +683,7 @@ TRANSPARENTCOLOR = 255 0 255 BgType = ImageFile ContentMargins = 11, 2, 0, 5 DefaultPaneSize = 0, 0, 178, 30 -Font = Ubuntu, 9, Bold +Font = Tahoma, 9, Bold HotTracking = 48 112 208 Imagecount = 1 ImageFile = Normal\StartPanelMoreProgBackGround.BMP @@ -749,7 +749,7 @@ TRANSPARENTCOLOR = 255 0 255 BgType = None DefaultPaneSize = 0, 0, 357, 28 FillColorHint = 31 113 216 -Font = Ubuntu, 9, Bold +Font = Tahoma, 9, Bold Imagecount = 1 ImageFile = Normal\StartUserPanel.bmp ImageLayout = Horizontal @@ -825,7 +825,7 @@ MinDpi2 = 164 StockImageFile = Normal\TabBackground.bmp TrueSizeScalingType = Dpi TrueSizeStretchMark = 50 -FONT = Ubuntu, 9 +FONT = Tahoma, 9 TEXTCOLOR = 112 112 112 [Tab.Pane] @@ -849,7 +849,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 TRANSPARENT = true TRANSPARENTCOLOR = 255 0 255 -FONT = Ubuntu, 9 +FONT = Tahoma, 9 TEXTCOLOR = 112 112 112 TEXTSHADOWCOLOR = 255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -867,7 +867,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 TRANSPARENT = true TRANSPARENTCOLOR = 255 0 255 -FONT = Ubuntu, 9 +FONT = Tahoma, 9 TEXTCOLOR = 112 112 112 TEXTSHADOWCOLOR = 255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -885,7 +885,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 TRANSPARENT = true TRANSPARENTCOLOR = 255 0 255 -FONT = Ubuntu, 9 +FONT = Tahoma, 9 TEXTCOLOR = 112 112 112 TEXTSHADOWCOLOR = 255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -903,7 +903,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 TRANSPARENT = true TRANSPARENTCOLOR = 255 0 255 -FONT = Ubuntu, 9 +FONT = Tahoma, 9 TEXTCOLOR = 112 112 112 TEXTSHADOWCOLOR = 255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -921,7 +921,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 TRANSPARENT = true TRANSPARENTCOLOR = 255 0 255 -FONT = Ubuntu, 9 +FONT = Tahoma, 9 TEXTCOLOR = 112 112 112 TEXTSHADOWCOLOR = 255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -939,7 +939,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 TRANSPARENT = true TRANSPARENTCOLOR = 255 0 255 -FONT = Ubuntu, 9 +FONT = Tahoma, 9 TEXTCOLOR = 112 112 112 TEXTSHADOWCOLOR = 255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -961,7 +961,7 @@ TEXTSHADOWTYPE = Single TEXTSHADOWCOLOR = 255 255 255 TEXTSHADOWOFFSET = 1,1 TEXTCOLOR = 112 112 112 -FONT = Ubuntu, 9 +FONT = Tahoma, 9 [Tab.TopTabItemRightEdge] AccentColorHint = 255 200 60 @@ -975,7 +975,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 TRANSPARENT = true TRANSPARENTCOLOR = 255 0 255 -FONT = Ubuntu, 9 +FONT = Tahoma, 9 TEXTCOLOR = 112 112 112 TEXTSHADOWCOLOR = 255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -1011,7 +1011,7 @@ Transparent = True TransparentColor = 255 0 255 [TaskBand.GroupCount] -Font = Ubuntu, 9, Bold +Font = Tahoma, 9, Bold TextColor = 255 255 255 [TaskBar.BackgroundBottom] @@ -1663,7 +1663,7 @@ OffsetType = TopLeft [ExplorerBar::Rebar] Bgtype = imagefile FillColorHint = 243 247 253 -Font = Ubuntu, 9 +Font = Tahoma, 9 ImageFile = Normal\ExplorerBarToolbarBackground.bmp Sizingmargins = 0, 0, 34, 0 Sizingtype = stretch @@ -1869,7 +1869,7 @@ AccentColorHint = 48 127 229 BgType = ImageFile ContentMargins = 0, 0, 0, 0 FillColorHint = 255 255 255 -Font = Ubuntu, 9 +Font = Tahoma, 9 ImageFile = Normal\StartGroupBackground.bmp SizingMargins = 24, 3, 3, 4 SizingType = Stretch @@ -1975,7 +1975,7 @@ SizingMargins = 1, 1, 0, 0 [TaskBand::Toolbar] BgType = None -Font = Ubuntu, 9 +Font = Tahoma, 9 TextColor = 255 255 255 TEXTSHADOWCOLOR = 0 0 0 TEXTSHADOWOFFSET = 1,1 @@ -2035,7 +2035,7 @@ AccentColorHint = 255 199 60 BgType = ImageFile ContentMargins = 6, 11, 6, 6 FillColorHint = 33 87 213 -Font = Ubuntu, 9 +Font = Tahoma, 9 ImageFile = Normal\TaskBandBackground.bmp SizingMargins = 6, 6, 6, 6 SizingType = Stretch @@ -2056,7 +2056,7 @@ Transparent = True [TaskBandVert::Toolbar] BgType = None -Font = Ubuntu, 9 +Font = Tahoma, 9 TextColor = 255 255 255 [TaskBandVert::Toolbar.Button] @@ -2083,7 +2083,7 @@ Transparent = True [TaskBar::Rebar] BgType = None -Font = Ubuntu, 9 +Font = Tahoma, 9 TextColor = 123 182 232 [TaskBar::Rebar.Band] @@ -2142,7 +2142,7 @@ TransparentColor = 255 0 255 [TaskBar::Toolbar] BgType = None -Font = Ubuntu, 9 +Font = Tahoma, 9 TextColor = 255 255 255 [TaskBar::Toolbar.Button] @@ -2169,7 +2169,7 @@ Transparent = True [TaskBarVert::Toolbar] BgType = None -Font = Ubuntu, 9 +Font = Tahoma, 9 TextColor = 255 255 255 [TaskBarVert::Toolbar(Checked)] @@ -2204,7 +2204,7 @@ SizingType = Stretch Transparent = True [TrayNotify::Clock] -Font = Ubuntu, 9 +Font = Tahoma, 9 TextColor = 255 255 255 [TrayNotify::Toolbar] diff --git a/media/themes/Blackshade/blackshade.msstyles/textfiles/NormalNormal.INI b/media/themes/Blackshade/blackshade.msstyles/textfiles/NormalNormal.INI index 833b2e62e2b..cada612c297 100644 --- a/media/themes/Blackshade/blackshade.msstyles/textfiles/NormalNormal.INI +++ b/media/themes/Blackshade/blackshade.msstyles/textfiles/NormalNormal.INI @@ -13,7 +13,7 @@ Btnface = 239 238 243 BtnHighlight = 255 255 255 BtnShadow = 162 162 162 CaptionBarHeight = 24 -CaptionFont = Ubuntu, 8, Bold +CaptionFont = Tahoma, 8, Bold CaptionText = 255 255 255 CssName = cpwebvw.css DkShadow3d = 162 162 162 @@ -24,23 +24,23 @@ GrayText = 172 168 153 Highlight = 75 75 75 HighlightText = 255 255 255 HotTracking = 0 0 128 -IconTitleFont = Ubuntu, 8 +IconTitleFont = Tahoma, 8 InactiveCaption = 65 65 65 InactiveCaptionText = 180 180 180 Light3d = 241 239 226 Menu = 255 255 255 MenuBar = 239 238 243 -MenuFont = Ubuntu, 8 +MenuFont = Tahoma, 8 MenuHilight = 100 100 100 MenuText = 75 75 75 MinColorDepth = 15 -MsgBoxFont = Ubuntu, 8 +MsgBoxFont = Tahoma, 8 ScrollbarHeight = 15 ScrollbarWidth = 15 -SmallCaptionFont = Ubuntu, 8, Bold +SmallCaptionFont = Tahoma, 8, Bold SMCaptionBarHeight = 19 SMCaptionBarWidth = 21 -StatusFont = Ubuntu, 8 +StatusFont = Tahoma, 8 Window = 255 255 255 XmlName = default.xml @@ -101,7 +101,7 @@ SizingType = Stretch TextColor = 112 112 112 TRANSPARENT = true TRANSPARENTCOLOR = 255 0 255 -FONT = Ubuntu, 8 +FONT = Tahoma, 8 TEXTSHADOWOFFSET = 1,1 TEXTSHADOWTYPE = Single TEXTSHADOWCOLOR = 221 221 221 @@ -252,7 +252,7 @@ BgType = ImageFile BorderColor = 255 255 255 ContentMargins = 8, 8, 7, 7 FillColor = 214 223 247 -Font = Ubuntu, 8 +Font = Tahoma, 8 ImageFile = Normal\NormalGroupBackground.bmp SizingMargins = 3, 3, 3, 3 SizingType = Stretch @@ -297,7 +297,7 @@ Transparent = true BgType = ImageFile ContentMargins = 8, 8, 7, 7 FillColorHint = 239 243 255 -Font = Ubuntu, 8 +Font = Tahoma, 8 ImageFile = Normal\SpecialGroupBackground.bmp SizingMargins = 3, 3, 3, 3 SizingType = Stretch @@ -416,7 +416,7 @@ SizingType = Stretch [Rebar] Bgtype = imagefile FillColorHint = 241 243 239 -Font = Ubuntu, 8 +Font = Tahoma, 8 ImageFile = Normal\ToolbarBackground.bmp Sizingmargins = 1, 1, 1, 2 Sizingtype = stretch @@ -749,7 +749,7 @@ TRANSPARENTCOLOR = 255 0 255 BgType = None DefaultPaneSize = 0, 0, 357, 28 FillColorHint = 31 113 216 -Font = Ubuntu, 8, Bold +Font = Tahoma, 8, Bold Imagecount = 1 ImageFile = Normal\StartUserPanel.bmp ImageLayout = Horizontal @@ -825,7 +825,7 @@ MinDpi2 = 164 StockImageFile = Normal\TabBackground.bmp TrueSizeScalingType = Dpi TrueSizeStretchMark = 50 -FONT = Ubuntu, 8 +FONT = Tahoma, 8 TEXTCOLOR = 112 112 112 [Tab.Pane] @@ -849,7 +849,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 TRANSPARENT = true TRANSPARENTCOLOR = 255 0 255 -FONT = Ubuntu, 8 +FONT = Tahoma, 8 TEXTCOLOR = 112 112 112 TEXTSHADOWCOLOR = 255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -867,7 +867,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 TRANSPARENT = true TRANSPARENTCOLOR = 255 0 255 -FONT = Ubuntu, 8 +FONT = Tahoma, 8 TEXTCOLOR = 112 112 112 TEXTSHADOWCOLOR = 255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -885,7 +885,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 TRANSPARENT = true TRANSPARENTCOLOR = 255 0 255 -FONT = Ubuntu, 8 +FONT = Tahoma, 8 TEXTCOLOR = 112 112 112 TEXTSHADOWCOLOR = 255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -903,7 +903,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 TRANSPARENT = true TRANSPARENTCOLOR = 255 0 255 -FONT = Ubuntu, 8 +FONT = Tahoma, 8 TEXTCOLOR = 112 112 112 TEXTSHADOWCOLOR = 255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -921,7 +921,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 TRANSPARENT = true TRANSPARENTCOLOR = 255 0 255 -FONT = Ubuntu, 8 +FONT = Tahoma, 8 TEXTCOLOR = 112 112 112 TEXTSHADOWCOLOR = 255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -939,7 +939,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 TRANSPARENT = true TRANSPARENTCOLOR = 255 0 255 -FONT = Ubuntu, 8 +FONT = Tahoma, 8 TEXTCOLOR = 112 112 112 TEXTSHADOWCOLOR = 255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -961,7 +961,7 @@ TEXTSHADOWTYPE = Single TEXTSHADOWCOLOR = 255 255 255 TEXTSHADOWOFFSET = 1,1 TEXTCOLOR = 112 112 112 -FONT = Ubuntu, 8 +FONT = Tahoma, 8 [Tab.TopTabItemRightEdge] AccentColorHint = 255 200 60 @@ -975,7 +975,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 TRANSPARENT = true TRANSPARENTCOLOR = 255 0 255 -FONT = Ubuntu, 8 +FONT = Tahoma, 8 TEXTCOLOR = 112 112 112 TEXTSHADOWCOLOR = 255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -1663,7 +1663,7 @@ OffsetType = TopLeft [ExplorerBar::Rebar] Bgtype = imagefile FillColorHint = 243 247 253 -Font = Ubuntu, 8 +Font = Tahoma, 8 ImageFile = Normal\ExplorerBarToolbarBackground.bmp Sizingmargins = 0, 0, 34, 0 Sizingtype = stretch @@ -1869,7 +1869,7 @@ AccentColorHint = 48 127 229 BgType = ImageFile ContentMargins = 0, 0, 0, 0 FillColorHint = 255 255 255 -Font = Ubuntu, 8 +Font = Tahoma, 8 ImageFile = Normal\StartGroupBackground.bmp SizingMargins = 24, 3, 3, 4 SizingType = Stretch @@ -1975,7 +1975,7 @@ SizingMargins = 1, 1, 0, 0 [TaskBand::Toolbar] BgType = None -Font = Ubuntu, 8 +Font = Tahoma, 8 TextColor = 255 255 255 TEXTSHADOWCOLOR = 0 0 0 TEXTSHADOWOFFSET = 1,1 @@ -2035,7 +2035,7 @@ AccentColorHint = 255 199 60 BgType = ImageFile ContentMargins = 6, 11, 6, 6 FillColorHint = 33 87 213 -Font = Ubuntu, 8 +Font = Tahoma, 8 ImageFile = Normal\TaskBandBackground.bmp SizingMargins = 6, 6, 6, 6 SizingType = Stretch @@ -2056,7 +2056,7 @@ Transparent = True [TaskBandVert::Toolbar] BgType = None -Font = Ubuntu, 8 +Font = Tahoma, 8 TextColor = 255 255 255 [TaskBandVert::Toolbar.Button] @@ -2083,7 +2083,7 @@ Transparent = True [TaskBar::Rebar] BgType = None -Font = Ubuntu, 8 +Font = Tahoma, 8 TextColor = 123 182 232 [TaskBar::Rebar.Band] @@ -2142,7 +2142,7 @@ TransparentColor = 255 0 255 [TaskBar::Toolbar] BgType = None -Font = Ubuntu, 8 +Font = Tahoma, 8 TextColor = 255 255 255 [TaskBar::Toolbar.Button] @@ -2169,7 +2169,7 @@ Transparent = True [TaskBarVert::Toolbar] BgType = None -Font = Ubuntu, 8 +Font = Tahoma, 8 TextColor = 255 255 255 [TaskBarVert::Toolbar(Checked)] @@ -2204,7 +2204,7 @@ SizingType = Stretch Transparent = True [TrayNotify::Clock] -Font = Ubuntu, 8 +Font = Tahoma, 8 TextColor = 255 255 255 [TrayNotify::Toolbar] diff --git a/media/themes/Lautus/lautus.msstyles/textfiles/LargeFontsNormal.INI b/media/themes/Lautus/lautus.msstyles/textfiles/LargeFontsNormal.INI index 36b5181fab8..9d72583e432 100644 --- a/media/themes/Lautus/lautus.msstyles/textfiles/LargeFontsNormal.INI +++ b/media/themes/Lautus/lautus.msstyles/textfiles/LargeFontsNormal.INI @@ -13,7 +13,7 @@ Btnface = 239 238 243 BtnHighlight = 255 255 255 BtnShadow = 162 162 162 CaptionBarHeight = 24 -CaptionFont = Ubuntu, 9, Bold +CaptionFont = Tahoma, 9, Bold CaptionText = 255 255 255 CssName = cpwebvw.css DkShadow3d = 162 162 162 @@ -24,23 +24,23 @@ GrayText = 172 168 153 Highlight = 75 75 75 HighlightText = 255 255 255 HotTracking = 0 0 128 -IconTitleFont = Ubuntu, 9 +IconTitleFont = Tahoma, 9 InactiveCaption = 65 65 65 InactiveCaptionText = 180 180 180 Light3d = 241 239 226 Menu = 255 255 255 MenuBar = 239 238 243 -MenuFont = Ubuntu, 9 +MenuFont = Tahoma, 9 MenuHilight = 100 100 100 MenuText = 75 75 75 MinColorDepth = 15 -MsgBoxFont = Ubuntu, 9 +MsgBoxFont = Tahoma, 9 ScrollbarHeight = 15 ScrollbarWidth = 15 -SmallCaptionFont = Ubuntu, 9, Bold +SmallCaptionFont = Tahoma, 9, Bold SMCaptionBarHeight = 19 SMCaptionBarWidth = 21 -StatusFont = Ubuntu, 9 +StatusFont = Tahoma, 9 Window = 255 255 255 XmlName = default.xml @@ -101,7 +101,7 @@ SizingType = Stretch TextColor = 112 112 112 TRANSPARENT = true TRANSPARENTCOLOR = 255 0 255 -FONT = Ubuntu, 9 +FONT = Tahoma, 9 TEXTSHADOWOFFSET = 1,1 TEXTSHADOWTYPE = Single TEXTSHADOWCOLOR = 221 221 221 @@ -206,7 +206,7 @@ GradientRatio2 = 255 BgType = ImageFile ContentMargins = 8, 8, 7, 7 FillColorHint = 94 135 217 -Font = Ubuntu, 9, Bold +Font = Tahoma, 9, Bold ImageFile = Normal\ExplorerBarHeaderBackground.bmp SizingMargins = 17, 1, 0, 0 SizingType = Stretch @@ -252,7 +252,7 @@ BgType = ImageFile BorderColor = 255 255 255 ContentMargins = 8, 8, 7, 7 FillColor = 214 223 247 -Font = Ubuntu, 9 +Font = Tahoma, 9 ImageFile = Normal\NormalGroupBackground.bmp SizingMargins = 3, 3, 3, 3 SizingType = Stretch @@ -286,7 +286,7 @@ Transparent = true BgType = ImageFile ContentMargins = 8, 8, 7, 7 FillColorHint = 240 243 251 -Font = Ubuntu, 9, Bold +Font = Tahoma, 9, Bold ImageFile = Normal\NormalGroupHead.bmp SizingMargins = 3, 15, 3, 1 SizingType = Stretch @@ -297,7 +297,7 @@ Transparent = true BgType = ImageFile ContentMargins = 8, 8, 7, 7 FillColorHint = 239 243 255 -Font = Ubuntu, 9 +Font = Tahoma, 9 ImageFile = Normal\SpecialGroupBackground.bmp SizingMargins = 3, 3, 3, 3 SizingType = Stretch @@ -331,7 +331,7 @@ Transparent = true BgType = ImageFile ContentMargins = 8, 8, 7, 7 FillColor = 2 72 178 -Font = Ubuntu, 9, Bold +Font = Tahoma, 9, Bold ImageFile = Normal\SpecialGroupHead.bmp SizingMargins = 3, 6, 5, 16 SizingType = Stretch @@ -416,7 +416,7 @@ SizingType = Stretch [Rebar] Bgtype = imagefile FillColorHint = 241 243 239 -Font = Ubuntu, 9 +Font = Tahoma, 9 ImageFile = Normal\ToolbarBackground.bmp Sizingmargins = 1, 1, 1, 2 Sizingtype = stretch @@ -683,7 +683,7 @@ TRANSPARENTCOLOR = 255 0 255 BgType = ImageFile ContentMargins = 11, 2, 0, 5 DefaultPaneSize = 0, 0, 178, 30 -Font = Ubuntu, 9, Bold +Font = Tahoma, 9, Bold HotTracking = 48 112 208 Imagecount = 1 ImageFile = Normal\StartPanelMoreProgBackGround.BMP @@ -749,7 +749,7 @@ TRANSPARENTCOLOR = 255 0 255 BgType = None DefaultPaneSize = 0, 0, 357, 28 FillColorHint = 31 113 216 -Font = Ubuntu, 9, Bold +Font = Tahoma, 9, Bold Imagecount = 1 ImageFile = Normal\StartUserPanel.bmp ImageLayout = Horizontal @@ -825,7 +825,7 @@ MinDpi2 = 164 StockImageFile = Normal\TabBackground.bmp TrueSizeScalingType = Dpi TrueSizeStretchMark = 50 -FONT = Ubuntu, 9 +FONT = Tahoma, 9 TEXTCOLOR = 112 112 112 [Tab.Pane] @@ -849,7 +849,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 TRANSPARENT = true TRANSPARENTCOLOR = 255 0 255 -FONT = Ubuntu, 9 +FONT = Tahoma, 9 TEXTCOLOR = 112 112 112 TEXTSHADOWCOLOR = 255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -867,7 +867,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 TRANSPARENT = true TRANSPARENTCOLOR = 255 0 255 -FONT = Ubuntu, 9 +FONT = Tahoma, 9 TEXTCOLOR = 112 112 112 TEXTSHADOWCOLOR = 255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -885,7 +885,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 TRANSPARENT = true TRANSPARENTCOLOR = 255 0 255 -FONT = Ubuntu, 9 +FONT = Tahoma, 9 TEXTCOLOR = 112 112 112 TEXTSHADOWCOLOR = 255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -903,7 +903,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 TRANSPARENT = true TRANSPARENTCOLOR = 255 0 255 -FONT = Ubuntu, 9 +FONT = Tahoma, 9 TEXTCOLOR = 112 112 112 TEXTSHADOWCOLOR = 255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -921,7 +921,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 TRANSPARENT = true TRANSPARENTCOLOR = 255 0 255 -FONT = Ubuntu, 9 +FONT = Tahoma, 9 TEXTCOLOR = 112 112 112 TEXTSHADOWCOLOR = 255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -939,7 +939,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 TRANSPARENT = true TRANSPARENTCOLOR = 255 0 255 -FONT = Ubuntu, 9 +FONT = Tahoma, 9 TEXTCOLOR = 112 112 112 TEXTSHADOWCOLOR = 255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -961,7 +961,7 @@ TEXTSHADOWTYPE = Single TEXTSHADOWCOLOR = 255 255 255 TEXTSHADOWOFFSET = 1,1 TEXTCOLOR = 112 112 112 -FONT = Ubuntu, 9 +FONT = Tahoma, 9 [Tab.TopTabItemRightEdge] AccentColorHint = 255 200 60 @@ -975,7 +975,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 TRANSPARENT = true TRANSPARENTCOLOR = 255 0 255 -FONT = Ubuntu, 9 +FONT = Tahoma, 9 TEXTCOLOR = 112 112 112 TEXTSHADOWCOLOR = 255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -1011,7 +1011,7 @@ Transparent = True TransparentColor = 255 0 255 [TaskBand.GroupCount] -Font = Ubuntu, 9, Bold +Font = Tahoma, 9, Bold TextColor = 255 255 255 [TaskBar.BackgroundBottom] @@ -1663,7 +1663,7 @@ OffsetType = TopLeft [ExplorerBar::Rebar] Bgtype = imagefile FillColorHint = 243 247 253 -Font = Ubuntu, 9 +Font = Tahoma, 9 ImageFile = Normal\ExplorerBarToolbarBackground.bmp Sizingmargins = 0, 0, 34, 0 Sizingtype = stretch @@ -1869,7 +1869,7 @@ AccentColorHint = 48 127 229 BgType = ImageFile ContentMargins = 0, 0, 0, 0 FillColorHint = 255 255 255 -Font = Ubuntu, 9 +Font = Tahoma, 9 ImageFile = Normal\StartGroupBackground.bmp SizingMargins = 24, 3, 3, 4 SizingType = Stretch @@ -1975,7 +1975,7 @@ SizingMargins = 1, 1, 0, 0 [TaskBand::Toolbar] BgType = None -Font = Ubuntu, 9 +Font = Tahoma, 9 TextColor = 255 255 255 TEXTSHADOWCOLOR = 0 0 0 TEXTSHADOWOFFSET = 1,1 @@ -2035,7 +2035,7 @@ AccentColorHint = 255 199 60 BgType = ImageFile ContentMargins = 6, 11, 6, 6 FillColorHint = 33 87 213 -Font = Ubuntu, 9 +Font = Tahoma, 9 ImageFile = Normal\TaskBandBackground.bmp SizingMargins = 6, 6, 6, 6 SizingType = Stretch @@ -2056,7 +2056,7 @@ Transparent = True [TaskBandVert::Toolbar] BgType = None -Font = Ubuntu, 9 +Font = Tahoma, 9 TextColor = 255 255 255 [TaskBandVert::Toolbar.Button] @@ -2083,7 +2083,7 @@ Transparent = True [TaskBar::Rebar] BgType = None -Font = Ubuntu, 9 +Font = Tahoma, 9 TextColor = 123 182 232 [TaskBar::Rebar.Band] @@ -2142,7 +2142,7 @@ TransparentColor = 255 0 255 [TaskBar::Toolbar] BgType = None -Font = Ubuntu, 9 +Font = Tahoma, 9 TextColor = 255 255 255 [TaskBar::Toolbar.Button] @@ -2169,7 +2169,7 @@ Transparent = True [TaskBarVert::Toolbar] BgType = None -Font = Ubuntu, 9 +Font = Tahoma, 9 TextColor = 255 255 255 [TaskBarVert::Toolbar(Checked)] @@ -2204,7 +2204,7 @@ SizingType = Stretch Transparent = True [TrayNotify::Clock] -Font = Ubuntu, 9 +Font = Tahoma, 9 TextColor = 255 255 255 [TrayNotify::Toolbar] diff --git a/media/themes/Lautus/lautus.msstyles/textfiles/NormalNormal.INI b/media/themes/Lautus/lautus.msstyles/textfiles/NormalNormal.INI index 833b2e62e2b..cada612c297 100644 --- a/media/themes/Lautus/lautus.msstyles/textfiles/NormalNormal.INI +++ b/media/themes/Lautus/lautus.msstyles/textfiles/NormalNormal.INI @@ -13,7 +13,7 @@ Btnface = 239 238 243 BtnHighlight = 255 255 255 BtnShadow = 162 162 162 CaptionBarHeight = 24 -CaptionFont = Ubuntu, 8, Bold +CaptionFont = Tahoma, 8, Bold CaptionText = 255 255 255 CssName = cpwebvw.css DkShadow3d = 162 162 162 @@ -24,23 +24,23 @@ GrayText = 172 168 153 Highlight = 75 75 75 HighlightText = 255 255 255 HotTracking = 0 0 128 -IconTitleFont = Ubuntu, 8 +IconTitleFont = Tahoma, 8 InactiveCaption = 65 65 65 InactiveCaptionText = 180 180 180 Light3d = 241 239 226 Menu = 255 255 255 MenuBar = 239 238 243 -MenuFont = Ubuntu, 8 +MenuFont = Tahoma, 8 MenuHilight = 100 100 100 MenuText = 75 75 75 MinColorDepth = 15 -MsgBoxFont = Ubuntu, 8 +MsgBoxFont = Tahoma, 8 ScrollbarHeight = 15 ScrollbarWidth = 15 -SmallCaptionFont = Ubuntu, 8, Bold +SmallCaptionFont = Tahoma, 8, Bold SMCaptionBarHeight = 19 SMCaptionBarWidth = 21 -StatusFont = Ubuntu, 8 +StatusFont = Tahoma, 8 Window = 255 255 255 XmlName = default.xml @@ -101,7 +101,7 @@ SizingType = Stretch TextColor = 112 112 112 TRANSPARENT = true TRANSPARENTCOLOR = 255 0 255 -FONT = Ubuntu, 8 +FONT = Tahoma, 8 TEXTSHADOWOFFSET = 1,1 TEXTSHADOWTYPE = Single TEXTSHADOWCOLOR = 221 221 221 @@ -252,7 +252,7 @@ BgType = ImageFile BorderColor = 255 255 255 ContentMargins = 8, 8, 7, 7 FillColor = 214 223 247 -Font = Ubuntu, 8 +Font = Tahoma, 8 ImageFile = Normal\NormalGroupBackground.bmp SizingMargins = 3, 3, 3, 3 SizingType = Stretch @@ -297,7 +297,7 @@ Transparent = true BgType = ImageFile ContentMargins = 8, 8, 7, 7 FillColorHint = 239 243 255 -Font = Ubuntu, 8 +Font = Tahoma, 8 ImageFile = Normal\SpecialGroupBackground.bmp SizingMargins = 3, 3, 3, 3 SizingType = Stretch @@ -416,7 +416,7 @@ SizingType = Stretch [Rebar] Bgtype = imagefile FillColorHint = 241 243 239 -Font = Ubuntu, 8 +Font = Tahoma, 8 ImageFile = Normal\ToolbarBackground.bmp Sizingmargins = 1, 1, 1, 2 Sizingtype = stretch @@ -749,7 +749,7 @@ TRANSPARENTCOLOR = 255 0 255 BgType = None DefaultPaneSize = 0, 0, 357, 28 FillColorHint = 31 113 216 -Font = Ubuntu, 8, Bold +Font = Tahoma, 8, Bold Imagecount = 1 ImageFile = Normal\StartUserPanel.bmp ImageLayout = Horizontal @@ -825,7 +825,7 @@ MinDpi2 = 164 StockImageFile = Normal\TabBackground.bmp TrueSizeScalingType = Dpi TrueSizeStretchMark = 50 -FONT = Ubuntu, 8 +FONT = Tahoma, 8 TEXTCOLOR = 112 112 112 [Tab.Pane] @@ -849,7 +849,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 TRANSPARENT = true TRANSPARENTCOLOR = 255 0 255 -FONT = Ubuntu, 8 +FONT = Tahoma, 8 TEXTCOLOR = 112 112 112 TEXTSHADOWCOLOR = 255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -867,7 +867,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 TRANSPARENT = true TRANSPARENTCOLOR = 255 0 255 -FONT = Ubuntu, 8 +FONT = Tahoma, 8 TEXTCOLOR = 112 112 112 TEXTSHADOWCOLOR = 255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -885,7 +885,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 TRANSPARENT = true TRANSPARENTCOLOR = 255 0 255 -FONT = Ubuntu, 8 +FONT = Tahoma, 8 TEXTCOLOR = 112 112 112 TEXTSHADOWCOLOR = 255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -903,7 +903,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 TRANSPARENT = true TRANSPARENTCOLOR = 255 0 255 -FONT = Ubuntu, 8 +FONT = Tahoma, 8 TEXTCOLOR = 112 112 112 TEXTSHADOWCOLOR = 255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -921,7 +921,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 TRANSPARENT = true TRANSPARENTCOLOR = 255 0 255 -FONT = Ubuntu, 8 +FONT = Tahoma, 8 TEXTCOLOR = 112 112 112 TEXTSHADOWCOLOR = 255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -939,7 +939,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 TRANSPARENT = true TRANSPARENTCOLOR = 255 0 255 -FONT = Ubuntu, 8 +FONT = Tahoma, 8 TEXTCOLOR = 112 112 112 TEXTSHADOWCOLOR = 255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -961,7 +961,7 @@ TEXTSHADOWTYPE = Single TEXTSHADOWCOLOR = 255 255 255 TEXTSHADOWOFFSET = 1,1 TEXTCOLOR = 112 112 112 -FONT = Ubuntu, 8 +FONT = Tahoma, 8 [Tab.TopTabItemRightEdge] AccentColorHint = 255 200 60 @@ -975,7 +975,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 TRANSPARENT = true TRANSPARENTCOLOR = 255 0 255 -FONT = Ubuntu, 8 +FONT = Tahoma, 8 TEXTCOLOR = 112 112 112 TEXTSHADOWCOLOR = 255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -1663,7 +1663,7 @@ OffsetType = TopLeft [ExplorerBar::Rebar] Bgtype = imagefile FillColorHint = 243 247 253 -Font = Ubuntu, 8 +Font = Tahoma, 8 ImageFile = Normal\ExplorerBarToolbarBackground.bmp Sizingmargins = 0, 0, 34, 0 Sizingtype = stretch @@ -1869,7 +1869,7 @@ AccentColorHint = 48 127 229 BgType = ImageFile ContentMargins = 0, 0, 0, 0 FillColorHint = 255 255 255 -Font = Ubuntu, 8 +Font = Tahoma, 8 ImageFile = Normal\StartGroupBackground.bmp SizingMargins = 24, 3, 3, 4 SizingType = Stretch @@ -1975,7 +1975,7 @@ SizingMargins = 1, 1, 0, 0 [TaskBand::Toolbar] BgType = None -Font = Ubuntu, 8 +Font = Tahoma, 8 TextColor = 255 255 255 TEXTSHADOWCOLOR = 0 0 0 TEXTSHADOWOFFSET = 1,1 @@ -2035,7 +2035,7 @@ AccentColorHint = 255 199 60 BgType = ImageFile ContentMargins = 6, 11, 6, 6 FillColorHint = 33 87 213 -Font = Ubuntu, 8 +Font = Tahoma, 8 ImageFile = Normal\TaskBandBackground.bmp SizingMargins = 6, 6, 6, 6 SizingType = Stretch @@ -2056,7 +2056,7 @@ Transparent = True [TaskBandVert::Toolbar] BgType = None -Font = Ubuntu, 8 +Font = Tahoma, 8 TextColor = 255 255 255 [TaskBandVert::Toolbar.Button] @@ -2083,7 +2083,7 @@ Transparent = True [TaskBar::Rebar] BgType = None -Font = Ubuntu, 8 +Font = Tahoma, 8 TextColor = 123 182 232 [TaskBar::Rebar.Band] @@ -2142,7 +2142,7 @@ TransparentColor = 255 0 255 [TaskBar::Toolbar] BgType = None -Font = Ubuntu, 8 +Font = Tahoma, 8 TextColor = 255 255 255 [TaskBar::Toolbar.Button] @@ -2169,7 +2169,7 @@ Transparent = True [TaskBarVert::Toolbar] BgType = None -Font = Ubuntu, 8 +Font = Tahoma, 8 TextColor = 255 255 255 [TaskBarVert::Toolbar(Checked)] @@ -2204,7 +2204,7 @@ SizingType = Stretch Transparent = True [TrayNotify::Clock] -Font = Ubuntu, 8 +Font = Tahoma, 8 TextColor = 255 255 255 [TrayNotify::Toolbar] diff --git a/media/themes/Modern/modern.msstyles/textfiles/Dark/ExtraLargeDark.INI b/media/themes/Modern/modern.msstyles/textfiles/Dark/ExtraLargeDark.INI index 89183f37df6..355bc143f02 100644 --- a/media/themes/Modern/modern.msstyles/textfiles/Dark/ExtraLargeDark.INI +++ b/media/themes/Modern/modern.msstyles/textfiles/Dark/ExtraLargeDark.INI @@ -40,7 +40,7 @@ Light3d = 241 239 226 Menu = 255 255 255 MenuBar = 220 220 220 -MenuFont = Ubuntu, 12 +MenuFont = Tahoma, 12 MenuHilight = 151 169 227 MenuText = 75 75 75 @@ -51,14 +51,14 @@ Window = 255 255 255 ; DONT REMOVE THESE FONTS (must specify to be localizable) CaptionBarHeight = 25 -CaptionFont = Ubuntu, 12, Bold +CaptionFont = Tahoma, 12, Bold CaptionText = 28 28 28 -MsgBoxFont = Ubuntu, 12 -IconTitleFont = Ubuntu, 12 -SmallCaptionFont = Ubuntu, 12, Bold +MsgBoxFont = Tahoma, 12 +IconTitleFont = Tahoma, 12 +SmallCaptionFont = Tahoma, 12, Bold SMCaptionBarHeight = 17 SMCaptionBarWidth = 17 -StatusFont = Ubuntu, 12 +StatusFont = Tahoma, 12 ;The FlatMenus option allows the author to ;turn of the 3d border on menus @@ -86,7 +86,7 @@ BorderColorHint = 0 60 116; Edge color Bgtype = imagefile ContentMargins = 3, 3, 3, 3; Average fill color FillColorHint = 243 243 239 -Font = Ubuntu, 12 +Font = Tahoma, 12 ImageFile = Dark\button.bmp ImageCount = 5 ImageLayout = vertical @@ -300,7 +300,7 @@ BgType = ImageFile BorderColor = 255 255 255 ContentMargins = 8, 8, 7, 7 FillColor = 214 223 247 -Font = Ubuntu, 12 +Font = Tahoma, 12 ImageFile = Dark\NormalGroupBackground.bmp SizingMargins = 3, 3, 3, 3 SizingType = Stretch @@ -345,7 +345,7 @@ Transparent = True BgType = ImageFile ContentMargins = 8, 8, 7, 7 FillColorHint = 239 243 255 -Font = Ubuntu, 12 +Font = Tahoma, 12 ImageFile = Dark\SpecialGroupBackground.bmp SizingMargins = 3, 3, 3, 3 SizingType = Stretch @@ -478,7 +478,7 @@ SizingType = Stretch [Rebar] Bgtype = imagefile FillColorHint = 241 243 239 -Font = Ubuntu, 12 +Font = Tahoma, 12 ImageFile = Dark\ToolbarBackground.bmp Sizingmargins = 1, 1, 1, 2 Sizingtype = stretch @@ -840,7 +840,7 @@ TransparentColor = 255 0 255 BgType = none DefaultPaneSize = 0, 0, 380, 64 FillColorHint = 31 113 216 -Font = Ubuntu, 12, Bold +Font = Tahoma, 12, Bold Imagecount = 1 ImageFile = Dark\StartUserPanel.bmp ImageLayout = Horizontal @@ -929,7 +929,7 @@ MinDpi2 = 164 StockImageFile = Dark\TabBackground.bmp TrueSizeScalingType = Dpi TrueSizeStretchMark = 50 -FONT = Ubuntu, 8 +FONT = Tahoma, 8 TextColor = 112 112 112 ;The content area of a tab page @@ -954,7 +954,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 Transparent = True TransparentColor = 255 0 255 -FONT = Ubuntu, 8 +FONT = Tahoma, 8 TextColor = 112 112 112 TextShadowColor =255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -972,7 +972,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 Transparent = True TransparentColor = 255 0 255 -FONT = Ubuntu, 8 +FONT = Tahoma, 8 TextColor = 112 112 112 TextShadowColor =255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -990,7 +990,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 Transparent = True TransparentColor = 255 0 255 -FONT = Ubuntu, 8 +FONT = Tahoma, 8 TextColor = 112 112 112 TextShadowColor =255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -1008,7 +1008,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 Transparent = True TransparentColor = 255 0 255 -FONT = Ubuntu, 8 +FONT = Tahoma, 8 TextColor = 112 112 112 TextShadowColor = 255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -1026,7 +1026,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 Transparent = True TransparentColor = 255 0 255 -FONT = Ubuntu, 8 +FONT = Tahoma, 8 TextColor = 112 112 112 TextShadowColor =255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -1044,7 +1044,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 Transparent = True TransparentColor = 255 0 255 -FONT = Ubuntu, 8 +FONT = Tahoma, 8 TextColor = 112 112 112 TextShadowColor =255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -1066,7 +1066,7 @@ TextShadowType = Single TextShadowColor =255 255 255 TEXTSHADOWOFFSET = 1,1 TextColor = 112 112 112 -FONT = Ubuntu, 8 +FONT = Tahoma, 8 [Tab.TopTabItemRightEdge] AccentColorHint = 255 200 60; Rollover hilite color @@ -1080,7 +1080,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 Transparent = True TransparentColor = 255 0 255 -FONT = Ubuntu, 8 +FONT = Tahoma, 8 TextColor = 112 112 112 TextShadowColor =255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -1116,7 +1116,7 @@ Transparent = True TransparentColor = 255 0 255 [TaskBand.GroupCount] -Font = Ubuntu, 12, Bold +Font = Tahoma, 12, Bold TextColor =255 255 255 ; taskbar background (bottom) @@ -1825,7 +1825,7 @@ OffsetType = TopLeft [ExplorerBar::Rebar] Bgtype = imagefile FillColorHint = 243 247 253 -Font = Ubuntu, 12 +Font = Tahoma, 12 ImageFile = Dark\ExplorerBarToolbarBackground.bmp Sizingmargins = 0, 0, 34, 0 Sizingtype = stretch @@ -2031,7 +2031,7 @@ AccentColorHint = 48 127 229; Left edge of More Programs menu BgType = ImageFile ContentMargins = 0, 0, 0, 0 FillColorHint = 255 255 255; Background of More Programs menu -Font = Ubuntu, 12 +Font = Tahoma, 12 ImageFile = Dark\StartGroupBackground.bmp SizingMargins = 24, 3, 3, 4 SizingType = Stretch @@ -2144,7 +2144,7 @@ SizingMargins = 1, 1, 0, 0 [TaskBand::Toolbar] BgType = None -Font = Ubuntu, 12 +Font = Tahoma, 12 TextColor = 42 42 42 TextShadowType = Single @@ -2194,7 +2194,7 @@ AccentColorHint = 255 199 60; Menu top highlight color BgType = ImageFile ContentMargins = 6, 11, 6, 6 FillColorHint = 33 87 213; Average background color -Font = Ubuntu, 12 +Font = Tahoma, 12 ImageFile = Dark\TaskBandBackground.bmp SizingMargins = 6, 6, 6, 6 SizingType = Stretch @@ -2215,7 +2215,7 @@ Transparent = True [TaskBandVert::Toolbar] BgType = None -Font = Ubuntu, 12 +Font = Tahoma, 12 TextColor = 28 28 28 [TaskBandVert::Toolbar.Button] @@ -2242,7 +2242,7 @@ Transparent = True [TaskBar::Rebar] BgType = None -Font = Ubuntu, 12 +Font = Tahoma, 12 TextColor = 123 182 232 [TaskBar::Rebar.Band] @@ -2301,7 +2301,7 @@ TransparentColor = 255 0 255 [TaskBar::Toolbar] BgType = None -Font = Ubuntu, 12 +Font = Tahoma, 12 TextColor = 28 28 28 [TaskBar::Toolbar.Button] @@ -2328,7 +2328,7 @@ Transparent = True [TaskBarVert::Toolbar] BgType = None -Font = Ubuntu, 12 +Font = Tahoma, 12 TextColor = 255 255 255 [TaskBarVert::Toolbar(Checked)] @@ -2363,7 +2363,7 @@ SizingType = Stretch Transparent = True [TrayNotify::Clock] -Font = Ubuntu, 12 +Font = Tahoma, 12 TextColor = 255 255 255 [TrayNotify::Toolbar] diff --git a/media/themes/Modern/modern.msstyles/textfiles/Dark/LargeFontsDark.INI b/media/themes/Modern/modern.msstyles/textfiles/Dark/LargeFontsDark.INI index 817a35edda6..6f33cedc986 100644 --- a/media/themes/Modern/modern.msstyles/textfiles/Dark/LargeFontsDark.INI +++ b/media/themes/Modern/modern.msstyles/textfiles/Dark/LargeFontsDark.INI @@ -40,7 +40,7 @@ Light3d = 241 239 226 Menu = 255 255 255 MenuBar = 220 220 220 -MenuFont = Ubuntu, 10 +MenuFont = Tahoma, 10 MenuHilight = 151 169 227 MenuText = 75 75 75 @@ -51,14 +51,14 @@ Window = 255 255 255 ; DONT REMOVE THESE FONTS (must specify to be localizable) CaptionBarHeight = 25 -CaptionFont = Ubuntu, 10, Bold +CaptionFont = Tahoma, 10, Bold CaptionText = 28 28 28 -MsgBoxFont = Ubuntu, 10 -IconTitleFont = Ubuntu, 10 -SmallCaptionFont = Ubuntu, 10, Bold +MsgBoxFont = Tahoma, 10 +IconTitleFont = Tahoma, 10 +SmallCaptionFont = Tahoma, 10, Bold SMCaptionBarHeight = 17 SMCaptionBarWidth = 17 -StatusFont = Ubuntu, 10 +StatusFont = Tahoma, 10 ;The FlatMenus option allows the author to ;turn of the 3d border on menus @@ -86,7 +86,7 @@ BorderColorHint = 0 60 116; Edge color Bgtype = imagefile ContentMargins = 3, 3, 3, 3; Average fill color FillColorHint = 243 243 239 -Font = Ubuntu, 10 +Font = Tahoma, 10 ImageFile = Dark\button.bmp ImageCount = 5 ImageLayout = vertical @@ -300,7 +300,7 @@ BgType = ImageFile BorderColor = 255 255 255 ContentMargins = 8, 8, 7, 7 FillColor = 214 223 247 -Font = Ubuntu, 10 +Font = Tahoma, 10 ImageFile = Dark\NormalGroupBackground.bmp SizingMargins = 3, 3, 3, 3 SizingType = Stretch @@ -345,7 +345,7 @@ Transparent = True BgType = ImageFile ContentMargins = 8, 8, 7, 7 FillColorHint = 239 243 255 -Font = Ubuntu, 10 +Font = Tahoma, 10 ImageFile = Dark\SpecialGroupBackground.bmp SizingMargins = 3, 3, 3, 3 SizingType = Stretch @@ -478,7 +478,7 @@ SizingType = Stretch [Rebar] Bgtype = imagefile FillColorHint = 241 243 239 -Font = Ubuntu, 10 +Font = Tahoma, 10 ImageFile = Dark\ToolbarBackground.bmp Sizingmargins = 1, 1, 1, 2 Sizingtype = stretch @@ -840,7 +840,7 @@ TransparentColor = 255 0 255 BgType = none DefaultPaneSize = 0, 0, 380, 64 FillColorHint = 31 113 216 -Font = Ubuntu, 10, Bold +Font = Tahoma, 10, Bold Imagecount = 1 ImageFile = Dark\StartUserPanel.bmp ImageLayout = Horizontal @@ -929,7 +929,7 @@ MinDpi2 = 164 StockImageFile = Dark\TabBackground.bmp TrueSizeScalingType = Dpi TrueSizeStretchMark = 50 -FONT = Ubuntu, 8 +FONT = Tahoma, 8 TextColor = 112 112 112 ;The content area of a tab page @@ -954,7 +954,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 Transparent = True TransparentColor = 255 0 255 -FONT = Ubuntu, 8 +FONT = Tahoma, 8 TextColor = 112 112 112 TextShadowColor =255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -972,7 +972,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 Transparent = True TransparentColor = 255 0 255 -FONT = Ubuntu, 8 +FONT = Tahoma, 8 TextColor = 112 112 112 TextShadowColor =255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -990,7 +990,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 Transparent = True TransparentColor = 255 0 255 -FONT = Ubuntu, 8 +FONT = Tahoma, 8 TextColor = 112 112 112 TextShadowColor =255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -1008,7 +1008,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 Transparent = True TransparentColor = 255 0 255 -FONT = Ubuntu, 8 +FONT = Tahoma, 8 TextColor = 112 112 112 TextShadowColor = 255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -1026,7 +1026,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 Transparent = True TransparentColor = 255 0 255 -FONT = Ubuntu, 8 +FONT = Tahoma, 8 TextColor = 112 112 112 TextShadowColor =255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -1044,7 +1044,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 Transparent = True TransparentColor = 255 0 255 -FONT = Ubuntu, 8 +FONT = Tahoma, 8 TextColor = 112 112 112 TextShadowColor =255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -1066,7 +1066,7 @@ TextShadowType = Single TextShadowColor =255 255 255 TEXTSHADOWOFFSET = 1,1 TextColor = 112 112 112 -FONT = Ubuntu, 8 +FONT = Tahoma, 8 [Tab.TopTabItemRightEdge] AccentColorHint = 255 200 60; Rollover hilite color @@ -1080,7 +1080,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 Transparent = True TransparentColor = 255 0 255 -FONT = Ubuntu, 8 +FONT = Tahoma, 8 TextColor = 112 112 112 TextShadowColor =255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -1116,7 +1116,7 @@ Transparent = True TransparentColor = 255 0 255 [TaskBand.GroupCount] -Font = Ubuntu, 10, Bold +Font = Tahoma, 10, Bold TextColor =255 255 255 ; taskbar background (bottom) @@ -1825,7 +1825,7 @@ OffsetType = TopLeft [ExplorerBar::Rebar] Bgtype = imagefile FillColorHint = 243 247 253 -Font = Ubuntu, 10 +Font = Tahoma, 10 ImageFile = Dark\ExplorerBarToolbarBackground.bmp Sizingmargins = 0, 0, 34, 0 Sizingtype = stretch @@ -2031,7 +2031,7 @@ AccentColorHint = 48 127 229; Left edge of More Programs menu BgType = ImageFile ContentMargins = 0, 0, 0, 0 FillColorHint = 255 255 255; Background of More Programs menu -Font = Ubuntu, 10 +Font = Tahoma, 10 ImageFile = Dark\StartGroupBackground.bmp SizingMargins = 24, 3, 3, 4 SizingType = Stretch @@ -2144,7 +2144,7 @@ SizingMargins = 1, 1, 0, 0 [TaskBand::Toolbar] BgType = None -Font = Ubuntu, 10 +Font = Tahoma, 10 TextColor = 42 42 42 TextShadowType = Single @@ -2194,7 +2194,7 @@ AccentColorHint = 255 199 60; Menu top highlight color BgType = ImageFile ContentMargins = 6, 11, 6, 6 FillColorHint = 33 87 213; Average background color -Font = Ubuntu, 10 +Font = Tahoma, 10 ImageFile = Dark\TaskBandBackground.bmp SizingMargins = 6, 6, 6, 6 SizingType = Stretch @@ -2215,7 +2215,7 @@ Transparent = True [TaskBandVert::Toolbar] BgType = None -Font = Ubuntu, 10 +Font = Tahoma, 10 TextColor = 28 28 28 [TaskBandVert::Toolbar.Button] @@ -2242,7 +2242,7 @@ Transparent = True [TaskBar::Rebar] BgType = None -Font = Ubuntu, 10 +Font = Tahoma, 10 TextColor = 123 182 232 [TaskBar::Rebar.Band] @@ -2301,7 +2301,7 @@ TransparentColor = 255 0 255 [TaskBar::Toolbar] BgType = None -Font = Ubuntu, 10 +Font = Tahoma, 10 TextColor = 28 28 28 [TaskBar::Toolbar.Button] @@ -2328,7 +2328,7 @@ Transparent = True [TaskBarVert::Toolbar] BgType = None -Font = Ubuntu, 10 +Font = Tahoma, 10 TextColor = 255 255 255 [TaskBarVert::Toolbar(Checked)] @@ -2363,7 +2363,7 @@ SizingType = Stretch Transparent = True [TrayNotify::Clock] -Font = Ubuntu, 10 +Font = Tahoma, 10 TextColor = 255 255 255 [TrayNotify::Toolbar] diff --git a/media/themes/Modern/modern.msstyles/textfiles/Dark/RegularDark.INI b/media/themes/Modern/modern.msstyles/textfiles/Dark/RegularDark.INI index 0f3f624f137..23e5919524a 100644 --- a/media/themes/Modern/modern.msstyles/textfiles/Dark/RegularDark.INI +++ b/media/themes/Modern/modern.msstyles/textfiles/Dark/RegularDark.INI @@ -40,7 +40,7 @@ Light3d = 241 239 226 Menu = 255 255 255 MenuBar = 220 220 220 -MenuFont = Ubuntu, 8 +MenuFont = Tahoma, 8 MenuHilight = 151 169 227 MenuText = 75 75 75 @@ -51,14 +51,14 @@ Window = 255 255 255 ; DONT REMOVE THESE FONTS (must specify to be localizable) CaptionBarHeight = 25 -CaptionFont = Ubuntu, 8, Bold +CaptionFont = Tahoma, 8, Bold CaptionText = 28 28 28 -MsgBoxFont = Ubuntu, 8 -IconTitleFont = Ubuntu, 8 -SmallCaptionFont = Ubuntu, 8, Bold +MsgBoxFont = Tahoma, 8 +IconTitleFont = Tahoma, 8 +SmallCaptionFont = Tahoma, 8, Bold SMCaptionBarHeight = 17 SMCaptionBarWidth = 17 -StatusFont = Ubuntu, 8 +StatusFont = Tahoma, 8 ;The FlatMenus option allows the author to ;turn of the 3d border on menus @@ -86,7 +86,7 @@ BorderColorHint = 0 60 116; Edge color Bgtype = imagefile ContentMargins = 3, 3, 3, 3; Average fill color FillColorHint = 243 243 239 -Font = Ubuntu, 8 +Font = Tahoma, 8 ImageFile = Dark\button.bmp ImageCount = 5 ImageLayout = vertical @@ -300,7 +300,7 @@ BgType = ImageFile BorderColor = 255 255 255 ContentMargins = 8, 8, 7, 7 FillColor = 214 223 247 -Font = Ubuntu, 8 +Font = Tahoma, 8 ImageFile = Dark\NormalGroupBackground.bmp SizingMargins = 3, 3, 3, 3 SizingType = Stretch @@ -345,7 +345,7 @@ Transparent = True BgType = ImageFile ContentMargins = 8, 8, 7, 7 FillColorHint = 239 243 255 -Font = Ubuntu, 8 +Font = Tahoma, 8 ImageFile = Dark\SpecialGroupBackground.bmp SizingMargins = 3, 3, 3, 3 SizingType = Stretch @@ -478,7 +478,7 @@ SizingType = Stretch [Rebar] Bgtype = imagefile FillColorHint = 241 243 239 -Font = Ubuntu, 8 +Font = Tahoma, 8 ImageFile = Dark\ToolbarBackground.bmp Sizingmargins = 1, 1, 1, 2 Sizingtype = stretch @@ -840,7 +840,7 @@ TransparentColor = 255 0 255 BgType = none DefaultPaneSize = 0, 0, 380, 64 FillColorHint = 31 113 216 -Font = Ubuntu, 8, Bold +Font = Tahoma, 8, Bold Imagecount = 1 ImageFile = Dark\StartUserPanel.bmp ImageLayout = Horizontal @@ -929,7 +929,7 @@ MinDpi2 = 164 StockImageFile = Dark\TabBackground.bmp TrueSizeScalingType = Dpi TrueSizeStretchMark = 50 -FONT = Ubuntu, 8 +FONT = Tahoma, 8 TextColor = 112 112 112 ;The content area of a tab page @@ -954,7 +954,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 Transparent = True TransparentColor = 255 0 255 -FONT = Ubuntu, 8 +FONT = Tahoma, 8 TextColor = 112 112 112 TextShadowColor =255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -972,7 +972,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 Transparent = True TransparentColor = 255 0 255 -FONT = Ubuntu, 8 +FONT = Tahoma, 8 TextColor = 112 112 112 TextShadowColor =255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -990,7 +990,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 Transparent = True TransparentColor = 255 0 255 -FONT = Ubuntu, 8 +FONT = Tahoma, 8 TextColor = 112 112 112 TextShadowColor =255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -1008,7 +1008,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 Transparent = True TransparentColor = 255 0 255 -FONT = Ubuntu, 8 +FONT = Tahoma, 8 TextColor = 112 112 112 TextShadowColor = 255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -1026,7 +1026,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 Transparent = True TransparentColor = 255 0 255 -FONT = Ubuntu, 8 +FONT = Tahoma, 8 TextColor = 112 112 112 TextShadowColor =255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -1044,7 +1044,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 Transparent = True TransparentColor = 255 0 255 -FONT = Ubuntu, 8 +FONT = Tahoma, 8 TextColor = 112 112 112 TextShadowColor =255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -1066,7 +1066,7 @@ TextShadowType = Single TextShadowColor =255 255 255 TEXTSHADOWOFFSET = 1,1 TextColor = 112 112 112 -FONT = Ubuntu, 8 +FONT = Tahoma, 8 [Tab.TopTabItemRightEdge] AccentColorHint = 255 200 60; Rollover hilite color @@ -1080,7 +1080,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 Transparent = True TransparentColor = 255 0 255 -FONT = Ubuntu, 8 +FONT = Tahoma, 8 TextColor = 112 112 112 TextShadowColor =255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -1116,7 +1116,7 @@ Transparent = True TransparentColor = 255 0 255 [TaskBand.GroupCount] -Font = Ubuntu, 8, Bold +Font = Tahoma, 8, Bold TextColor =255 255 255 ; taskbar background (bottom) @@ -1825,7 +1825,7 @@ OffsetType = TopLeft [ExplorerBar::Rebar] Bgtype = imagefile FillColorHint = 243 247 253 -Font = Ubuntu, 8 +Font = Tahoma, 8 ImageFile = Dark\ExplorerBarToolbarBackground.bmp Sizingmargins = 0, 0, 34, 0 Sizingtype = stretch @@ -2031,7 +2031,7 @@ AccentColorHint = 48 127 229; Left edge of More Programs menu BgType = ImageFile ContentMargins = 0, 0, 0, 0 FillColorHint = 255 255 255; Background of More Programs menu -Font = Ubuntu, 8 +Font = Tahoma, 8 ImageFile = Dark\StartGroupBackground.bmp SizingMargins = 24, 3, 3, 4 SizingType = Stretch @@ -2144,7 +2144,7 @@ SizingMargins = 1, 1, 0, 0 [TaskBand::Toolbar] BgType = None -Font = Ubuntu, 8 +Font = Tahoma, 8 TextColor = 42 42 42 TextShadowType = Single @@ -2194,7 +2194,7 @@ AccentColorHint = 255 199 60; Menu top highlight color BgType = ImageFile ContentMargins = 6, 11, 6, 6 FillColorHint = 33 87 213; Average background color -Font = Ubuntu, 8 +Font = Tahoma, 8 ImageFile = Dark\TaskBandBackground.bmp SizingMargins = 6, 6, 6, 6 SizingType = Stretch @@ -2215,7 +2215,7 @@ Transparent = True [TaskBandVert::Toolbar] BgType = None -Font = Ubuntu, 8 +Font = Tahoma, 8 TextColor = 28 28 28 [TaskBandVert::Toolbar.Button] @@ -2242,7 +2242,7 @@ Transparent = True [TaskBar::Rebar] BgType = None -Font = Ubuntu, 8 +Font = Tahoma, 8 TextColor = 123 182 232 [TaskBar::Rebar.Band] @@ -2301,7 +2301,7 @@ TransparentColor = 255 0 255 [TaskBar::Toolbar] BgType = None -Font = Ubuntu, 8 +Font = Tahoma, 8 TextColor = 28 28 28 [TaskBar::Toolbar.Button] @@ -2328,7 +2328,7 @@ Transparent = True [TaskBarVert::Toolbar] BgType = None -Font = Ubuntu, 8 +Font = Tahoma, 8 TextColor = 255 255 255 [TaskBarVert::Toolbar(Checked)] @@ -2363,7 +2363,7 @@ SizingType = Stretch Transparent = True [TrayNotify::Clock] -Font = Ubuntu, 8 +Font = Tahoma, 8 TextColor = 255 255 255 [TrayNotify::Toolbar] diff --git a/media/themes/Modern/modern.msstyles/textfiles/Light/ExtraLargeLight.INI b/media/themes/Modern/modern.msstyles/textfiles/Light/ExtraLargeLight.INI index 99b212dd1aa..f70c2c12644 100644 --- a/media/themes/Modern/modern.msstyles/textfiles/Light/ExtraLargeLight.INI +++ b/media/themes/Modern/modern.msstyles/textfiles/Light/ExtraLargeLight.INI @@ -40,7 +40,7 @@ Light3d = 241 239 226 Menu = 255 255 255 MenuBar = 220 220 220 -MenuFont = Ubuntu, 12 +MenuFont = Tahoma, 12 MenuHilight = 151 169 227 MenuText = 75 75 75 @@ -51,14 +51,14 @@ Window = 255 255 255 ; DONT REMOVE THESE FONTS (must specify to be localizable) CaptionBarHeight = 25 -CaptionFont = Ubuntu, 12, Bold +CaptionFont = Tahoma, 12, Bold CaptionText = 28 28 28 -MsgBoxFont = Ubuntu, 12 -IconTitleFont = Ubuntu, 12 -SmallCaptionFont = Ubuntu, 12, Bold +MsgBoxFont = Tahoma, 12 +IconTitleFont = Tahoma, 12 +SmallCaptionFont = Tahoma, 12, Bold SMCaptionBarHeight = 17 SMCaptionBarWidth = 17 -StatusFont = Ubuntu, 12 +StatusFont = Tahoma, 12 ;The FlatMenus option allows the author to ;turn of the 3d border on menus @@ -86,7 +86,7 @@ BorderColorHint = 0 60 116; Edge color Bgtype = imagefile ContentMargins = 3, 3, 3, 3; Average fill color FillColorHint = 243 243 239 -Font = Ubuntu, 12 +Font = Tahoma, 12 ImageFile = Light\button.bmp ImageCount = 5 ImageLayout = vertical @@ -300,7 +300,7 @@ BgType = ImageFile BorderColor = 255 255 255 ContentMargins = 8, 8, 7, 7 FillColor = 214 223 247 -Font = Ubuntu, 12 +Font = Tahoma, 12 ImageFile = Light\NormalGroupBackground.bmp SizingMargins = 3, 3, 3, 3 SizingType = Stretch @@ -345,7 +345,7 @@ Transparent = True BgType = ImageFile ContentMargins = 8, 8, 7, 7 FillColorHint = 239 243 255 -Font = Ubuntu, 12 +Font = Tahoma, 12 ImageFile = Light\SpecialGroupBackground.bmp SizingMargins = 3, 3, 3, 3 SizingType = Stretch @@ -478,7 +478,7 @@ SizingType = Stretch [Rebar] Bgtype = imagefile FillColorHint = 241 243 239 -Font = Ubuntu, 12 +Font = Tahoma, 12 ImageFile = Light\ToolbarBackground.bmp Sizingmargins = 1, 1, 1, 2 Sizingtype = stretch @@ -840,7 +840,7 @@ TransparentColor = 255 0 255 BgType = none DefaultPaneSize = 0, 0, 380, 64 FillColorHint = 31 113 216 -Font = Ubuntu, 12, Bold +Font = Tahoma, 12, Bold Imagecount = 1 ImageFile = Light\StartUserPanel.bmp ImageLayout = Horizontal @@ -929,7 +929,7 @@ MinDpi2 = 164 StockImageFile = Light\TabBackground.bmp TrueSizeScalingType = Dpi TrueSizeStretchMark = 50 -FONT = Ubuntu, 8 +FONT = Tahoma, 8 TextColor = 112 112 112 ;The content area of a tab page @@ -954,7 +954,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 Transparent = True TransparentColor = 255 0 255 -FONT = Ubuntu, 8 +FONT = Tahoma, 8 TextColor = 112 112 112 TextShadowColor =255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -972,7 +972,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 Transparent = True TransparentColor = 255 0 255 -FONT = Ubuntu, 8 +FONT = Tahoma, 8 TextColor = 112 112 112 TextShadowColor =255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -990,7 +990,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 Transparent = True TransparentColor = 255 0 255 -FONT = Ubuntu, 8 +FONT = Tahoma, 8 TextColor = 112 112 112 TextShadowColor =255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -1008,7 +1008,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 Transparent = True TransparentColor = 255 0 255 -FONT = Ubuntu, 8 +FONT = Tahoma, 8 TextColor = 112 112 112 TextShadowColor = 255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -1026,7 +1026,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 Transparent = True TransparentColor = 255 0 255 -FONT = Ubuntu, 8 +FONT = Tahoma, 8 TextColor = 112 112 112 TextShadowColor =255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -1044,7 +1044,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 Transparent = True TransparentColor = 255 0 255 -FONT = Ubuntu, 8 +FONT = Tahoma, 8 TextColor = 112 112 112 TextShadowColor =255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -1066,7 +1066,7 @@ TextShadowType = Single TextShadowColor =255 255 255 TEXTSHADOWOFFSET = 1,1 TextColor = 112 112 112 -FONT = Ubuntu, 8 +FONT = Tahoma, 8 [Tab.TopTabItemRightEdge] AccentColorHint = 255 200 60; Rollover hilite color @@ -1080,7 +1080,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 Transparent = True TransparentColor = 255 0 255 -FONT = Ubuntu, 8 +FONT = Tahoma, 8 TextColor = 112 112 112 TextShadowColor =255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -1116,7 +1116,7 @@ Transparent = True TransparentColor = 255 0 255 [TaskBand.GroupCount] -Font = Ubuntu, 12, Bold +Font = Tahoma, 12, Bold TextColor =255 255 255 ; taskbar background (bottom) @@ -1825,7 +1825,7 @@ OffsetType = TopLeft [ExplorerBar::Rebar] Bgtype = imagefile FillColorHint = 243 247 253 -Font = Ubuntu, 12 +Font = Tahoma, 12 ImageFile = Light\ExplorerBarToolbarBackground.bmp Sizingmargins = 0, 0, 34, 0 Sizingtype = stretch @@ -2031,7 +2031,7 @@ AccentColorHint = 48 127 229; Left edge of More Programs menu BgType = ImageFile ContentMargins = 0, 0, 0, 0 FillColorHint = 255 255 255; Background of More Programs menu -Font = Ubuntu, 12 +Font = Tahoma, 12 ImageFile = Light\StartGroupBackground.bmp SizingMargins = 24, 3, 3, 4 SizingType = Stretch @@ -2144,7 +2144,7 @@ SizingMargins = 1, 1, 0, 0 [TaskBand::Toolbar] BgType = None -Font = Ubuntu, 12 +Font = Tahoma, 12 TextColor = 42 42 42 TextShadowType = Single @@ -2194,7 +2194,7 @@ AccentColorHint = 255 199 60; Menu top highlight color BgType = ImageFile ContentMargins = 6, 11, 6, 6 FillColorHint = 33 87 213; Average background color -Font = Ubuntu, 12 +Font = Tahoma, 12 ImageFile = Light\TaskBandBackground.bmp SizingMargins = 6, 6, 6, 6 SizingType = Stretch @@ -2215,7 +2215,7 @@ Transparent = True [TaskBandVert::Toolbar] BgType = None -Font = Ubuntu, 12 +Font = Tahoma, 12 TextColor = 28 28 28 [TaskBandVert::Toolbar.Button] @@ -2242,7 +2242,7 @@ Transparent = True [TaskBar::Rebar] BgType = None -Font = Ubuntu, 12 +Font = Tahoma, 12 TextColor = 123 182 232 [TaskBar::Rebar.Band] @@ -2301,7 +2301,7 @@ TransparentColor = 255 0 255 [TaskBar::Toolbar] BgType = None -Font = Ubuntu, 12 +Font = Tahoma, 12 TextColor = 28 28 28 [TaskBar::Toolbar.Button] @@ -2328,7 +2328,7 @@ Transparent = True [TaskBarVert::Toolbar] BgType = None -Font = Ubuntu, 12 +Font = Tahoma, 12 TextColor = 255 255 255 [TaskBarVert::Toolbar(Checked)] @@ -2363,7 +2363,7 @@ SizingType = Stretch Transparent = True [TrayNotify::Clock] -Font = Ubuntu, 12 +Font = Tahoma, 12 TextColor = 255 255 255 [TrayNotify::Toolbar] diff --git a/media/themes/Modern/modern.msstyles/textfiles/Light/LargeFontsLight.INI b/media/themes/Modern/modern.msstyles/textfiles/Light/LargeFontsLight.INI index 52c6931d1cc..db432059101 100644 --- a/media/themes/Modern/modern.msstyles/textfiles/Light/LargeFontsLight.INI +++ b/media/themes/Modern/modern.msstyles/textfiles/Light/LargeFontsLight.INI @@ -40,7 +40,7 @@ Light3d = 241 239 226 Menu = 255 255 255 MenuBar = 220 220 220 -MenuFont = Ubuntu, 10 +MenuFont = Tahoma, 10 MenuHilight = 151 169 227 MenuText = 75 75 75 @@ -51,14 +51,14 @@ Window = 255 255 255 ; DONT REMOVE THESE FONTS (must specify to be localizable) CaptionBarHeight = 25 -CaptionFont = Ubuntu, 10, Bold +CaptionFont = Tahoma, 10, Bold CaptionText = 28 28 28 -MsgBoxFont = Ubuntu, 10 -IconTitleFont = Ubuntu, 10 -SmallCaptionFont = Ubuntu, 10, Bold +MsgBoxFont = Tahoma, 10 +IconTitleFont = Tahoma, 10 +SmallCaptionFont = Tahoma, 10, Bold SMCaptionBarHeight = 17 SMCaptionBarWidth = 17 -StatusFont = Ubuntu, 10 +StatusFont = Tahoma, 10 ;The FlatMenus option allows the author to ;turn of the 3d border on menus @@ -86,7 +86,7 @@ BorderColorHint = 0 60 116; Edge color Bgtype = imagefile ContentMargins = 3, 3, 3, 3; Average fill color FillColorHint = 243 243 239 -Font = Ubuntu, 10 +Font = Tahoma, 10 ImageFile = Light\button.bmp ImageCount = 5 ImageLayout = vertical @@ -300,7 +300,7 @@ BgType = ImageFile BorderColor = 255 255 255 ContentMargins = 8, 8, 7, 7 FillColor = 214 223 247 -Font = Ubuntu, 10 +Font = Tahoma, 10 ImageFile = Light\NormalGroupBackground.bmp SizingMargins = 3, 3, 3, 3 SizingType = Stretch @@ -345,7 +345,7 @@ Transparent = True BgType = ImageFile ContentMargins = 8, 8, 7, 7 FillColorHint = 239 243 255 -Font = Ubuntu, 10 +Font = Tahoma, 10 ImageFile = Light\SpecialGroupBackground.bmp SizingMargins = 3, 3, 3, 3 SizingType = Stretch @@ -478,7 +478,7 @@ SizingType = Stretch [Rebar] Bgtype = imagefile FillColorHint = 241 243 239 -Font = Ubuntu, 10 +Font = Tahoma, 10 ImageFile = Light\ToolbarBackground.bmp Sizingmargins = 1, 1, 1, 2 Sizingtype = stretch @@ -840,7 +840,7 @@ TransparentColor = 255 0 255 BgType = none DefaultPaneSize = 0, 0, 380, 64 FillColorHint = 31 113 216 -Font = Ubuntu, 10, Bold +Font = Tahoma, 10, Bold Imagecount = 1 ImageFile = Light\StartUserPanel.bmp ImageLayout = Horizontal @@ -929,7 +929,7 @@ MinDpi2 = 164 StockImageFile = Light\TabBackground.bmp TrueSizeScalingType = Dpi TrueSizeStretchMark = 50 -FONT = Ubuntu, 8 +FONT = Tahoma, 8 TextColor = 112 112 112 ;The content area of a tab page @@ -954,7 +954,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 Transparent = True TransparentColor = 255 0 255 -FONT = Ubuntu, 8 +FONT = Tahoma, 8 TextColor = 112 112 112 TextShadowColor =255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -972,7 +972,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 Transparent = True TransparentColor = 255 0 255 -FONT = Ubuntu, 8 +FONT = Tahoma, 8 TextColor = 112 112 112 TextShadowColor =255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -990,7 +990,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 Transparent = True TransparentColor = 255 0 255 -FONT = Ubuntu, 8 +FONT = Tahoma, 8 TextColor = 112 112 112 TextShadowColor =255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -1008,7 +1008,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 Transparent = True TransparentColor = 255 0 255 -FONT = Ubuntu, 8 +FONT = Tahoma, 8 TextColor = 112 112 112 TextShadowColor = 255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -1026,7 +1026,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 Transparent = True TransparentColor = 255 0 255 -FONT = Ubuntu, 8 +FONT = Tahoma, 8 TextColor = 112 112 112 TextShadowColor =255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -1044,7 +1044,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 Transparent = True TransparentColor = 255 0 255 -FONT = Ubuntu, 8 +FONT = Tahoma, 8 TextColor = 112 112 112 TextShadowColor =255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -1066,7 +1066,7 @@ TextShadowType = Single TextShadowColor =255 255 255 TEXTSHADOWOFFSET = 1,1 TextColor = 112 112 112 -FONT = Ubuntu, 8 +FONT = Tahoma, 8 [Tab.TopTabItemRightEdge] AccentColorHint = 255 200 60; Rollover hilite color @@ -1080,7 +1080,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 Transparent = True TransparentColor = 255 0 255 -FONT = Ubuntu, 8 +FONT = Tahoma, 8 TextColor = 112 112 112 TextShadowColor =255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -1116,7 +1116,7 @@ Transparent = True TransparentColor = 255 0 255 [TaskBand.GroupCount] -Font = Ubuntu, 10, Bold +Font = Tahoma, 10, Bold TextColor =255 255 255 ; taskbar background (bottom) @@ -1825,7 +1825,7 @@ OffsetType = TopLeft [ExplorerBar::Rebar] Bgtype = imagefile FillColorHint = 243 247 253 -Font = Ubuntu, 10 +Font = Tahoma, 10 ImageFile = Light\ExplorerBarToolbarBackground.bmp Sizingmargins = 0, 0, 34, 0 Sizingtype = stretch @@ -2031,7 +2031,7 @@ AccentColorHint = 48 127 229; Left edge of More Programs menu BgType = ImageFile ContentMargins = 0, 0, 0, 0 FillColorHint = 255 255 255; Background of More Programs menu -Font = Ubuntu, 10 +Font = Tahoma, 10 ImageFile = Light\StartGroupBackground.bmp SizingMargins = 24, 3, 3, 4 SizingType = Stretch @@ -2144,7 +2144,7 @@ SizingMargins = 1, 1, 0, 0 [TaskBand::Toolbar] BgType = None -Font = Ubuntu, 10 +Font = Tahoma, 10 TextColor = 42 42 42 TextShadowType = Single @@ -2194,7 +2194,7 @@ AccentColorHint = 255 199 60; Menu top highlight color BgType = ImageFile ContentMargins = 6, 11, 6, 6 FillColorHint = 33 87 213; Average background color -Font = Ubuntu, 10 +Font = Tahoma, 10 ImageFile = Light\TaskBandBackground.bmp SizingMargins = 6, 6, 6, 6 SizingType = Stretch @@ -2215,7 +2215,7 @@ Transparent = True [TaskBandVert::Toolbar] BgType = None -Font = Ubuntu, 10 +Font = Tahoma, 10 TextColor = 28 28 28 [TaskBandVert::Toolbar.Button] @@ -2242,7 +2242,7 @@ Transparent = True [TaskBar::Rebar] BgType = None -Font = Ubuntu, 10 +Font = Tahoma, 10 TextColor = 123 182 232 [TaskBar::Rebar.Band] @@ -2301,7 +2301,7 @@ TransparentColor = 255 0 255 [TaskBar::Toolbar] BgType = None -Font = Ubuntu, 10 +Font = Tahoma, 10 TextColor = 28 28 28 [TaskBar::Toolbar.Button] @@ -2328,7 +2328,7 @@ Transparent = True [TaskBarVert::Toolbar] BgType = None -Font = Ubuntu, 10 +Font = Tahoma, 10 TextColor = 255 255 255 [TaskBarVert::Toolbar(Checked)] @@ -2363,7 +2363,7 @@ SizingType = Stretch Transparent = True [TrayNotify::Clock] -Font = Ubuntu, 10 +Font = Tahoma, 10 TextColor = 255 255 255 [TrayNotify::Toolbar] diff --git a/media/themes/Modern/modern.msstyles/textfiles/Light/RegularLight.INI b/media/themes/Modern/modern.msstyles/textfiles/Light/RegularLight.INI index 465069c15d5..4b76f19f1e1 100644 --- a/media/themes/Modern/modern.msstyles/textfiles/Light/RegularLight.INI +++ b/media/themes/Modern/modern.msstyles/textfiles/Light/RegularLight.INI @@ -40,7 +40,7 @@ Light3d = 241 239 226 Menu = 255 255 255 MenuBar = 220 220 220 -MenuFont = Ubuntu, 8 +MenuFont = Tahoma, 8 MenuHilight = 151 169 227 MenuText = 75 75 75 @@ -51,14 +51,14 @@ Window = 255 255 255 ; DONT REMOVE THESE FONTS (must specify to be localizable) CaptionBarHeight = 25 -CaptionFont = Ubuntu, 8, Bold +CaptionFont = Tahoma, 8, Bold CaptionText = 28 28 28 -MsgBoxFont = Ubuntu, 8 -IconTitleFont = Ubuntu, 8 -SmallCaptionFont = Ubuntu, 8, Bold +MsgBoxFont = Tahoma, 8 +IconTitleFont = Tahoma, 8 +SmallCaptionFont = Tahoma, 8, Bold SMCaptionBarHeight = 17 SMCaptionBarWidth = 17 -StatusFont = Ubuntu, 8 +StatusFont = Tahoma, 8 ;The FlatMenus option allows the author to ;turn of the 3d border on menus @@ -86,7 +86,7 @@ BorderColorHint = 0 60 116; Edge color Bgtype = imagefile ContentMargins = 3, 3, 3, 3; Average fill color FillColorHint = 243 243 239 -Font = Ubuntu, 8 +Font = Tahoma, 8 ImageFile = Light\button.bmp ImageCount = 5 ImageLayout = vertical @@ -300,7 +300,7 @@ BgType = ImageFile BorderColor = 255 255 255 ContentMargins = 8, 8, 7, 7 FillColor = 214 223 247 -Font = Ubuntu, 8 +Font = Tahoma, 8 ImageFile = Light\NormalGroupBackground.bmp SizingMargins = 3, 3, 3, 3 SizingType = Stretch @@ -345,7 +345,7 @@ Transparent = True BgType = ImageFile ContentMargins = 8, 8, 7, 7 FillColorHint = 239 243 255 -Font = Ubuntu, 8 +Font = Tahoma, 8 ImageFile = Light\SpecialGroupBackground.bmp SizingMargins = 3, 3, 3, 3 SizingType = Stretch @@ -478,7 +478,7 @@ SizingType = Stretch [Rebar] Bgtype = imagefile FillColorHint = 241 243 239 -Font = Ubuntu, 8 +Font = Tahoma, 8 ImageFile = Light\ToolbarBackground.bmp Sizingmargins = 1, 1, 1, 2 Sizingtype = stretch @@ -840,7 +840,7 @@ TransparentColor = 255 0 255 BgType = none DefaultPaneSize = 0, 0, 380, 64 FillColorHint = 31 113 216 -Font = Ubuntu, 8, Bold +Font = Tahoma, 8, Bold Imagecount = 1 ImageFile = Light\StartUserPanel.bmp ImageLayout = Horizontal @@ -929,7 +929,7 @@ MinDpi2 = 164 StockImageFile = Light\TabBackground.bmp TrueSizeScalingType = Dpi TrueSizeStretchMark = 50 -FONT = Ubuntu, 8 +FONT = Tahoma, 8 TextColor = 112 112 112 ;The content area of a tab page @@ -954,7 +954,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 Transparent = True TransparentColor = 255 0 255 -FONT = Ubuntu, 8 +FONT = Tahoma, 8 TextColor = 112 112 112 TextShadowColor =255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -972,7 +972,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 Transparent = True TransparentColor = 255 0 255 -FONT = Ubuntu, 8 +FONT = Tahoma, 8 TextColor = 112 112 112 TextShadowColor =255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -990,7 +990,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 Transparent = True TransparentColor = 255 0 255 -FONT = Ubuntu, 8 +FONT = Tahoma, 8 TextColor = 112 112 112 TextShadowColor =255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -1008,7 +1008,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 Transparent = True TransparentColor = 255 0 255 -FONT = Ubuntu, 8 +FONT = Tahoma, 8 TextColor = 112 112 112 TextShadowColor = 255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -1026,7 +1026,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 Transparent = True TransparentColor = 255 0 255 -FONT = Ubuntu, 8 +FONT = Tahoma, 8 TextColor = 112 112 112 TextShadowColor =255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -1044,7 +1044,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 Transparent = True TransparentColor = 255 0 255 -FONT = Ubuntu, 8 +FONT = Tahoma, 8 TextColor = 112 112 112 TextShadowColor =255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -1066,7 +1066,7 @@ TextShadowType = Single TextShadowColor =255 255 255 TEXTSHADOWOFFSET = 1,1 TextColor = 112 112 112 -FONT = Ubuntu, 8 +FONT = Tahoma, 8 [Tab.TopTabItemRightEdge] AccentColorHint = 255 200 60; Rollover hilite color @@ -1080,7 +1080,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 Transparent = True TransparentColor = 255 0 255 -FONT = Ubuntu, 8 +FONT = Tahoma, 8 TextColor = 112 112 112 TextShadowColor =255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -1116,7 +1116,7 @@ Transparent = True TransparentColor = 255 0 255 [TaskBand.GroupCount] -Font = Ubuntu, 8, Bold +Font = Tahoma, 8, Bold TextColor =255 255 255 ; taskbar background (bottom) @@ -1825,7 +1825,7 @@ OffsetType = TopLeft [ExplorerBar::Rebar] Bgtype = imagefile FillColorHint = 243 247 253 -Font = Ubuntu, 8 +Font = Tahoma, 8 ImageFile = Light\ExplorerBarToolbarBackground.bmp Sizingmargins = 0, 0, 34, 0 Sizingtype = stretch @@ -2031,7 +2031,7 @@ AccentColorHint = 48 127 229; Left edge of More Programs menu BgType = ImageFile ContentMargins = 0, 0, 0, 0 FillColorHint = 255 255 255; Background of More Programs menu -Font = Ubuntu, 8 +Font = Tahoma, 8 ImageFile = Light\StartGroupBackground.bmp SizingMargins = 24, 3, 3, 4 SizingType = Stretch @@ -2144,7 +2144,7 @@ SizingMargins = 1, 1, 0, 0 [TaskBand::Toolbar] BgType = None -Font = Ubuntu, 8 +Font = Tahoma, 8 TextColor = 42 42 42 TextShadowType = Single @@ -2194,7 +2194,7 @@ AccentColorHint = 255 199 60; Menu top highlight color BgType = ImageFile ContentMargins = 6, 11, 6, 6 FillColorHint = 33 87 213; Average background color -Font = Ubuntu, 8 +Font = Tahoma, 8 ImageFile = Light\TaskBandBackground.bmp SizingMargins = 6, 6, 6, 6 SizingType = Stretch @@ -2215,7 +2215,7 @@ Transparent = True [TaskBandVert::Toolbar] BgType = None -Font = Ubuntu, 8 +Font = Tahoma, 8 TextColor = 28 28 28 [TaskBandVert::Toolbar.Button] @@ -2242,7 +2242,7 @@ Transparent = True [TaskBar::Rebar] BgType = None -Font = Ubuntu, 8 +Font = Tahoma, 8 TextColor = 123 182 232 [TaskBar::Rebar.Band] @@ -2301,7 +2301,7 @@ TransparentColor = 255 0 255 [TaskBar::Toolbar] BgType = None -Font = Ubuntu, 8 +Font = Tahoma, 8 TextColor = 28 28 28 [TaskBar::Toolbar.Button] @@ -2328,7 +2328,7 @@ Transparent = True [TaskBarVert::Toolbar] BgType = None -Font = Ubuntu, 8 +Font = Tahoma, 8 TextColor = 255 255 255 [TaskBarVert::Toolbar(Checked)] @@ -2363,7 +2363,7 @@ SizingType = Stretch Transparent = True [TrayNotify::Clock] -Font = Ubuntu, 8 +Font = Tahoma, 8 TextColor = 255 255 255 [TrayNotify::Toolbar]

1 0

[reactos] 01/01: [NTGDI][NTUSER][INCLUDE] Add 'See also:' comments for structures (#4872)
by Katayama Hirofumi MZ 12 Nov '22

12 Nov '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0bc6bd64807b58c79051f… commit 0bc6bd64807b58c79051f4764947624927040427 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Nov 12 20:27:50 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Nov 12 20:27:50 2022 +0900 [NTGDI][NTUSER][INCLUDE] Add 'See also:' comments for structures (#4872) Add 'See also' URLs to some undocumented structures. --- win32ss/gdi/eng/engobjects.h | 5 ++++- win32ss/gdi/ntgdi/brush.h | 4 ++++ win32ss/gdi/ntgdi/dc.h | 5 ++++- win32ss/include/ntgdihdl.h | 4 ++++ win32ss/include/ntuser.h | 28 ++++++++++++++++++++++++++++ win32ss/user/ntuser/win32.h | 13 +++++++++++-- 6 files changed, 55 insertions(+), 4 deletions(-) diff --git a/win32ss/gdi/eng/engobjects.h b/win32ss/gdi/eng/engobjects.h index 6c3476f57ea..29f7f0f8709 100644 --- a/win32ss/gdi/eng/engobjects.h +++ b/win32ss/gdi/eng/engobjects.h @@ -45,7 +45,10 @@ typedef struct _RWNDOBJ { SURFOBJ *psoOwner; } RWNDOBJ; -/* EXtended CLip and Window Region Objects */ +/* + * XCLIPOBJ structure --- EXtended CLip and Window Region Objects. + * See also: https://reactos.org/wiki/Techwiki:Win32k/XCLIPOBJ + */ #ifdef __cplusplus typedef struct _XCLIPOBJ : _CLIPOBJ, _RWNDOBJ { diff --git a/win32ss/gdi/ntgdi/brush.h b/win32ss/gdi/ntgdi/brush.h index 99d29258041..8d24021def3 100644 --- a/win32ss/gdi/ntgdi/brush.h +++ b/win32ss/gdi/ntgdi/brush.h @@ -62,6 +62,10 @@ class BRUSH; typedef class BRUSH *PBRUSH; #endif +/* + * EBRUSHOBJ structure. + * See also: https://reactos.org/wiki/Techwiki:Win32k/EBRUSHOBJ + */ typedef struct _EBRUSHOBJ { BRUSHOBJ BrushObject; diff --git a/win32ss/gdi/ntgdi/dc.h b/win32ss/gdi/ntgdi/dc.h index 358527103aa..3da0376b8ed 100644 --- a/win32ss/gdi/ntgdi/dc.h +++ b/win32ss/gdi/ntgdi/dc.h @@ -88,7 +88,10 @@ typedef struct _DCLEVEL SIZE sizl; } DCLEVEL, *PDCLEVEL; -/* The DC object structure */ +/* + * The DC object structure. + * See also: https://reactos.org/wiki/Techwiki:Win32k/DC + */ typedef struct _DC { /* Header for all gdi objects in the handle table. diff --git a/win32ss/include/ntgdihdl.h b/win32ss/include/ntgdihdl.h index 8296be8ff22..d03c06c216a 100644 --- a/win32ss/include/ntgdihdl.h +++ b/win32ss/include/ntgdihdl.h @@ -284,6 +284,10 @@ typedef struct _LDC DWORD dwData[5]; } LDC, *PLDC; +/* + * DC_ATTR structure. + * See also: https://reactos.org/wiki/Techwiki:Win32k/DC_ATTR + */ typedef struct _DC_ATTR { PVOID pvLDC; diff --git a/win32ss/include/ntuser.h b/win32ss/include/ntuser.h index f5241d8350f..cd7fcdf7034 100644 --- a/win32ss/include/ntuser.h +++ b/win32ss/include/ntuser.h @@ -126,6 +126,10 @@ RtlLargeStringToUnicodeString( #define NB_HOOKS (WH_MAXHOOK - WH_MINHOOK + 1) +/* + * DESKTOPINFO structure. + * See also: https://reactos.org/wiki/Techwiki:Win32k/DESKTOP + */ typedef struct _DESKTOPINFO { PVOID pvDesktopBase; @@ -157,6 +161,10 @@ typedef struct _DESKTOPINFO #define CTI_THREADSYSLOCK 0x0001 #define CTI_INSENDMESSAGE 0x0002 +/* + * CLIENTTHREADINFO structure. + * See also: https://reactos.org/wiki/Techwiki:Win32k/CLIENTTHREADINFO + */ typedef struct _CLIENTTHREADINFO { DWORD CTI_flags; @@ -297,6 +305,10 @@ typedef struct _CALLBACKWND #define CI_IMMACTIVATE 0x00000040 #define CI_TFSDISABLED 0x00000400 +/* + * CLIENTINFO structure. + * See also: https://reactos.org/wiki/Techwiki:Win32k/CLIENTINFO + */ typedef struct _CLIENTINFO { ULONG_PTR CI_flags; @@ -669,6 +681,10 @@ typedef struct _SBINFOEX #define WPF_MININIT 0x0008 #define WPF_MAXINIT 0x0010 +/* + * WND structure. + * See also: https://reactos.org/wiki/Techwiki:Win32k/WND + */ typedef struct _WND { THRDESKHEAD head; @@ -975,6 +991,10 @@ typedef struct tagDPISERVERINFO #define PUSIF_LISTBOXSMOOTHSCROLLING 0x08 #define PUSIF_KEYBOARDCUES 0x20 +/* + * PERUSERSERVERINFO structure. + * See also: https://reactos.org/wiki/Techwiki:Win32k/SERVERINFO + */ typedef struct _PERUSERSERVERINFO { INT aiSysMet[SM_CMETRICS]; @@ -1017,6 +1037,10 @@ typedef struct _PERUSERSERVERINFO DWORD dwRIPFlags; } PERUSERSERVERINFO, *PPERUSERSERVERINFO; +/* + * SERVERINFO structure. + * See also: https://reactos.org/wiki/Techwiki:Win32k/SERVERINFO + */ typedef struct tagSERVERINFO { DWORD dwSRVIFlags; @@ -1092,6 +1116,10 @@ typedef struct _WNDMSG PINT abMsgs; } WNDMSG, *PWNDMSG; +/* + * SHAREDINFO structure. + * See also: https://reactos.org/wiki/Techwiki:Win32k/SHAREDINFO + */ typedef struct _SHAREDINFO { PSERVERINFO psi; /* Global Server Info */ diff --git a/win32ss/user/ntuser/win32.h b/win32ss/user/ntuser/win32.h index 9514b48c3ca..9f97725ff6b 100644 --- a/win32ss/user/ntuser/win32.h +++ b/win32ss/user/ntuser/win32.h @@ -72,6 +72,10 @@ typedef struct _W32THREAD struct tagIMC; +/* + * THREADINFO structure. + * See also: https://reactos.org/wiki/Techwiki:Win32k/THREADINFO + */ #ifdef __cplusplus typedef struct _THREADINFO : _W32THREAD { @@ -200,8 +204,9 @@ typedef struct _W32HEAP_USER_MAPPING /* - Information from STARTUPINFOW, psdk/winbase.h. - Set from PsGetCurrentProcess()->Peb->ProcessParameters. + * Information from STARTUPINFOW, psdk/winbase.h. + * Set from PsGetCurrentProcess()->Peb->ProcessParameters. + * See also: https://reactos.org/wiki/Techwiki:Win32k/PROCESSINFO */ typedef struct tagUSERSTARTUPINFO { @@ -236,6 +241,10 @@ typedef struct _W32PROCESS #define CLIBS 32 +/* + * PROCESSINFO structure. + * See also: https://reactos.org/wiki/Techwiki:Win32k/PROCESSINFO + */ #ifdef __cplusplus typedef struct _PROCESSINFO : _W32PROCESS {

1 0

[reactos] 01/01: [IMM32] ImmDllInitialize's first argument is an HINSTANCE
by Katayama Hirofumi MZ 12 Nov '22

12 Nov '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f73a4d6babeddf3df3dc6… commit f73a4d6babeddf3df3dc69ce510754b798533d33 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Nov 12 20:25:29 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sat Nov 12 20:25:29 2022 +0900 [IMM32] ImmDllInitialize's first argument is an HINSTANCE CORE-11700 --- dll/win32/imm32/imm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c index 27d80d3a82d..14193efb5cb 100644 --- a/dll/win32/imm32/imm.c +++ b/dll/win32/imm32/imm.c @@ -1311,7 +1311,7 @@ BOOL WINAPI User32InitializeImmEntryTable(DWORD); BOOL WINAPI ImmDllInitialize( - _In_ HANDLE hDll, + _In_ HINSTANCE hDll, _In_ ULONG dwReason, _In_opt_ PVOID pReserved) {

1 0

[reactos] 01/01: [SHELL32] Show 'comment' column for folders, make it rightmost CORE-18615 (#4868)
by Joachim Henze 11 Nov '22

11 Nov '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a33fe3841886e6d207c58… commit a33fe3841886e6d207c581c356ee57d6263cc1c8 Author: Joachim Henze <joachim.henze(a)reactos.org> AuthorDate: Fri Nov 11 18:25:50 2022 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Nov 11 18:25:50 2022 +0100 [SHELL32] Show 'comment' column for folders, make it rightmost CORE-18615 (#4868) In explorer filebrowser 'details' view the column 'comments' had invalid length of zero, and therefore was hidden under the 'attributes' column. I guess even after this patch, it will not display any sane contents in there yet. Therefore I chose a small width of 10 only, to reduce the chance for it to trigger an undesired horizontal scrollbar. As far as I see we don't support manual showing and hiding of additional columns yet. By default my Windows does not show this column. But when activated manually, it is always shown on the right hand side of the 'attributes' column. --- dll/win32/shell32/folders/CFSFolder.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dll/win32/shell32/folders/CFSFolder.cpp b/dll/win32/shell32/folders/CFSFolder.cpp index 4b7d8b3990b..95ba3b95f6c 100644 --- a/dll/win32/shell32/folders/CFSFolder.cpp +++ b/dll/win32/shell32/folders/CFSFolder.cpp @@ -530,8 +530,8 @@ static const shvheader GenericSFHeader[] = { {IDS_SHV_COLUMN_TYPE, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_LEFT, 10}, {IDS_SHV_COLUMN_SIZE, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 10}, {IDS_SHV_COLUMN_MODIFIED, SHCOLSTATE_TYPE_DATE | SHCOLSTATE_ONBYDEFAULT, LVCFMT_LEFT, 12}, - {IDS_SHV_COLUMN_COMMENTS, SHCOLSTATE_TYPE_STR, LVCFMT_LEFT, 0}, - {IDS_SHV_COLUMN_ATTRIBUTES, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_LEFT, 10} + {IDS_SHV_COLUMN_ATTRIBUTES, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_LEFT, 10}, + {IDS_SHV_COLUMN_COMMENTS, SHCOLSTATE_TYPE_STR, LVCFMT_LEFT, 10} }; #define GENERICSHELLVIEWCOLUMNS 6 @@ -987,11 +987,11 @@ HRESULT WINAPI CFSFolder::CompareIDs(LPARAM lParam, if (result == 0) result = pData1->u.file.uFileTime - pData2->u.file.uFileTime; break; - case 4: /* Comments */ + case 4: /* Attributes */ + return SHELL32_CompareDetails(this, lParam, pidl1, pidl2); + case 5: /* Comments */ result = 0; break; - case 5: /* Attributes */ - return SHELL32_CompareDetails(this, lParam, pidl1, pidl2); } if (result == 0) @@ -1541,12 +1541,12 @@ HRESULT WINAPI CFSFolder::GetDetailsOf(PCUITEMID_CHILD pidl, case 3: /* date */ _ILGetFileDate(pidl, psd->str.cStr, MAX_PATH); break; - case 4: /* FIXME: comments */ - psd->str.cStr[0] = 0; - break; - case 5: /* attributes */ + case 4: /* attributes */ _ILGetFileAttributes(pidl, psd->str.cStr, MAX_PATH); break; + case 5: /* FIXME: comments */ + psd->str.cStr[0] = 0; + break; } }

1 0

[reactos] 01/01: [BOCHSMP] Move related registry entries to bochsmp directory
by Hervé Poussineau 11 Nov '22

11 Nov '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d117765e712aa9c387259… commit d117765e712aa9c3872597951ad21845d0e1dc2c Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Fri Nov 11 11:31:05 2022 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Fri Nov 11 15:14:13 2022 +0100 [BOCHSMP] Move related registry entries to bochsmp directory --- boot/bootdata/hivesys.inf | 3 --- win32ss/drivers/miniport/bochs/bochsmp_reg.inf | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/boot/bootdata/hivesys.inf b/boot/bootdata/hivesys.inf index 3bc5eb62c63..45c3d6e6446 100644 --- a/boot/bootdata/hivesys.inf +++ b/boot/bootdata/hivesys.inf @@ -83,9 +83,6 @@ HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\HID_DEVICE_SYSTEM_ HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\HID_DEVICE_SYSTEM_MOUSE","Service",0x00000000,"mouhid" HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\HID_DEVICE_SYSTEM_MOUSE","ClassGUID",0x00000000,"{4D36E96F-E325-11CE-BFC1-08002BE10318}" -HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#VEN_1234&DEV_1111","Service",0x00000000,"bochsmp" -HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#VEN_1234&DEV_1111","ClassGUID",0x00000000,"{4D36E968-E325-11CE-BFC1-08002BE10318}" - HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0000","Service",0x00000000,"vga" HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0000","ClassGUID",0x00000000,"{4D36E968-E325-11CE-BFC1-08002BE10318}" diff --git a/win32ss/drivers/miniport/bochs/bochsmp_reg.inf b/win32ss/drivers/miniport/bochs/bochsmp_reg.inf index 740132606fb..8de0f3739a9 100644 --- a/win32ss/drivers/miniport/bochs/bochsmp_reg.inf +++ b/win32ss/drivers/miniport/bochs/bochsmp_reg.inf @@ -1,4 +1,7 @@ [AddReg] +HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#VEN_1234&DEV_1111","Service",0x00000000,"bochsmp" +HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#VEN_1234&DEV_1111","ClassGUID",0x00000000,"{4D36E968-E325-11CE-BFC1-08002BE10318}" + HKLM,"SYSTEM\CurrentControlSet\Services\bochsmp","ErrorControl",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\bochsmp","Group",0x00000000,"Video" HKLM,"SYSTEM\CurrentControlSet\Services\bochsmp","ImagePath",0x00020000,"system32\drivers\bochsmp.sys"

1 0

[reactos] 01/01: [SHELL32] Implement IsLFNDriveA/W and improve PathResolve (#4866)
by Katayama Hirofumi MZ 10 Nov '22

10 Nov '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=11a71418d50f48ff0e10d… commit 11a71418d50f48ff0e10d2dbbe243afaf34c4368 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Nov 10 23:18:04 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Nov 10 23:18:04 2022 +0900 [SHELL32] Implement IsLFNDriveA/W and improve PathResolve (#4866) - Fix IsLFNDriveA and IsLFNDriveW functions. - Add IsRemovableDrive helper function. - Fix PathQualifyExW by using IsLFNDriveW. CORE-11335 --- dll/win32/shell32/wine/shellpath.c | 176 ++++++++++++++++++++++++++++++++----- 1 file changed, 153 insertions(+), 23 deletions(-) diff --git a/dll/win32/shell32/wine/shellpath.c b/dll/win32/shell32/wine/shellpath.c index b39f7da7c49..604d98020d0 100644 --- a/dll/win32/shell32/wine/shellpath.c +++ b/dll/win32/shell32/wine/shellpath.c @@ -40,6 +40,7 @@ #include <strsafe.h> #include <wine/debug.h> #include <wine/unicode.h> +#include <assert.h> #include <shlwapi_undoc.h> #include <shellutils.h> @@ -103,6 +104,14 @@ DoGetProductType(PNT_PRODUCT_TYPE ProductType) return TRUE; } +BOOL APIENTRY IsRemovableDrive(DWORD iDrive) +{ + WCHAR szRoot[] = L"C:\\"; + assert(L'A' + iDrive <= L'Z'); + szRoot[0] = (WCHAR)(L'A' + iDrive); + return GetDriveTypeW(szRoot) == DRIVE_REMOVABLE; +} + /* ########## Combining and Constructing paths ########## */ @@ -151,7 +160,7 @@ PathQualifyExW(_Inout_ LPWSTR pszPath, _Inout_opt_ LPCWSTR pszDir, _In_ DWORD dw INT iDrive, cchPathLeft; WCHAR szTemp[MAX_PATH], szRoot[MAX_PATH]; PWCHAR pchTemp = szTemp, pchPath; - BOOL bLFN = TRUE; + BOOL bLFN; TRACE("(%s,%s,0x%08x)\n", debugstr_w(pszPath), debugstr_w(pszDir), dwFlags); @@ -208,12 +217,27 @@ PathQualifyExW(_Inout_ LPWSTR pszPath, _Inout_opt_ LPCWSTR pszDir, _In_ DWORD dw ++pchTemp; } -#if 0 // FIXME: IsLFNDriveW has a bug bLFN = IsLFNDriveW(szRoot); -#endif if (!bLFN) { - /* FIXME: Support non-LFN */ + PWCHAR pch; + for (pch = pchTemp; *pch != UNICODE_NULL; ++pch) + { +#define PATH_CHAR_CLASS_DOT 0x00000004 +#define PATH_CHAR_CLASS_BACKSLASH 0x00000008 +#define PATH_CHAR_CLASS_COLON 0x00000010 +#define PATH_CHAR_CLASS_OTHER_VALID 0x00000100 +#define VALID_SHORT_PATH_CHAR_CLASSES ( \ + PATH_CHAR_CLASS_DOT | \ + PATH_CHAR_CLASS_BACKSLASH | \ + PATH_CHAR_CLASS_COLON | \ + PATH_CHAR_CLASS_OTHER_VALID \ +) + if (!PathIsValidCharW(*pch, VALID_SHORT_PATH_CHAR_CLASSES)) + { + *pch = L'_'; + } + } } StringCchCopyW(pszPath, MAX_PATH, szRoot); @@ -221,16 +245,33 @@ PathQualifyExW(_Inout_ LPWSTR pszPath, _Inout_opt_ LPCWSTR pszDir, _In_ DWORD dw } else /* UNC path: Begins with double backslash */ { -#if 0 // FIXME: IsLFNDriveW has a bug bLFN = IsLFNDriveW(pchTemp); -#endif - if (!bLFN) + if (bLFN) { - /* FIXME: Support non-LFN */ + pszPath[2] = UNICODE_NULL; /* Cut off */ + cchPathLeft -= (2 + 1); + pchTemp += 2; + } + else + { + PWCHAR pchSlash = StrChrW(pszPath + 2, L'\\'); + if (pchSlash) + pchSlash = StrChrW(pchSlash + 1, L'\\'); + + if (pchSlash) + { + *(pchSlash + 1) = UNICODE_NULL; /* Cut off */ + pchTemp += pchSlash - pszPath; + cchPathLeft -= (INT)(SIZE_T)(pchSlash - pszPath) + 1; + } + else + { + bLFN = TRUE; + pszPath[2] = UNICODE_NULL; /* Cut off */ + cchPathLeft -= 2; + pchTemp += 2; + } } - pszPath[2] = UNICODE_NULL; /* Cut off */ - cchPathLeft -= (2 + 1); - pchTemp += 2; } /* Now pszPath is a root-like path or an empty string. */ @@ -280,11 +321,60 @@ PathQualifyExW(_Inout_ LPWSTR pszPath, _Inout_opt_ LPCWSTR pszDir, _In_ DWORD dw pchPath = &pszPath[lstrlenW(pszPath)]; - if (!bLFN) + if (!bLFN) /* Not LFN? */ { - /* FIXME: Support non-LFN */ + /* Copy MS-DOS 8.3 filename */ + PWCHAR pchDot = NULL; + INT ich; + WCHAR szTitle[8 + 1] = L""; + INT cchTitle = 0; + WCHAR szDotExtension[1 + 3 + 1] = L""; + INT cchDotExtension = 0; + + /* Copy the component to szTitle and szDotExtension... */ + while (*pchTemp && *pchTemp != L'\\') + { + if (*pchTemp == L'.') + { + pchDot = pchTemp; /* Remember the last position */ + + /* Clear szDotExtension */ + cchDotExtension = 0; + ZeroMemory(szDotExtension, sizeof(szDotExtension)); + } + + if (pchDot) + { + if (cchDotExtension < 1 + 3) + szDotExtension[cchDotExtension++] = *pchTemp; + } + else + { + if (cchTitle < 8) + szTitle[cchTitle++] = *pchTemp; + } + + ++pchTemp; + } + + /* Add file title 'szTitle' to pchPath */ + for (ich = 0; szTitle[ich] && cchPathLeft > 0; ++ich) + { + *pchPath++ = szTitle[ich]; + --cchPathLeft; + } + + /* Add file extension 'szDotExtension' to pchPath */ + if (pchDot) + { + for (ich = 0; szDotExtension[ich] && cchPathLeft > 0; ++ich) + { + *pchPath++ = szDotExtension[ich]; + --cchPathLeft; + } + } } - else + else /* LFN */ { /* Copy the component up to the next separator */ while (*pchTemp != UNICODE_NULL && *pchTemp != L'\\' && cchPathLeft > 0) @@ -490,11 +580,13 @@ BOOL WINAPI PathFileExistsAW (LPCVOID lpszPath) */ BOOL WINAPI IsLFNDriveA(LPCSTR lpszPath) { - DWORD fnlen; - - if (!GetVolumeInformationA(lpszPath, NULL, 0, NULL, &fnlen, NULL, NULL, 0)) - return FALSE; - return fnlen > 12; + WCHAR szBuffW[MAX_PATH], *pszW = NULL; + if (lpszPath) + { + SHAnsiToUnicode(lpszPath, szBuffW, _countof(szBuffW)); + pszW = szBuffW; + } + return IsLFNDriveW(pszW); } /************************************************************************* @@ -502,11 +594,49 @@ BOOL WINAPI IsLFNDriveA(LPCSTR lpszPath) */ BOOL WINAPI IsLFNDriveW(LPCWSTR lpszPath) { - DWORD fnlen; + DWORD cchMaxFileName, iDrive; + WCHAR szRoot[MAX_PATH]; - if (!GetVolumeInformationW(lpszPath, NULL, 0, NULL, &fnlen, NULL, NULL, 0)) - return FALSE; - return fnlen > 12; + if (lpszPath == NULL || lpszPath[0] == UNICODE_NULL) + { + szRoot[0] = 0; + GetWindowsDirectoryW(szRoot, _countof(szRoot)); + lpszPath = szRoot; + } + + if (PathIsUNCW(lpszPath)) + { + StringCchCopyW(szRoot, _countof(szRoot), lpszPath); + PathStripToRootW(szRoot); + + if (StrChrW(szRoot + 2, L'\\') == NULL) + return TRUE; /* LFN */ + + StringCchCatW(szRoot, _countof(szRoot), L"\\"); /* Add a backslash */ + } + else + { + assert(!PathIsRelativeW(lpszPath)); /* Assuming absolute path... */ + + iDrive = ((lpszPath[0] - L'A') & 0x1F); + PathBuildRootW(szRoot, iDrive); + + if (!IsRemovableDrive(iDrive)) + { + /* FIXME: Cache correctly */ + } + } + +#define MSDOS_8DOT3_LEN 12 /* MS-DOS 8.3 filename == length 12 */ + + /* GetVolumeInformation requires a root path */ + if (!GetVolumeInformationW(szRoot, NULL, 0, NULL, &cchMaxFileName, NULL, NULL, 0)) + { + /* Don't return FALSE when GetVolumeInformationW fails. */ + return TRUE; + } + + return cchMaxFileName > MSDOS_8DOT3_LEN; } /*************************************************************************

1 0

[reactos] 01/01: [NTUSER] Add 'Win:' comments around IntDefWindowProc
by Katayama Hirofumi MZ 10 Nov '22

10 Nov '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=40863aebc4456b1097cf0… commit 40863aebc4456b1097cf0ffa8b93d672c9d732d5 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Nov 10 15:59:52 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Nov 10 15:59:52 2022 +0900 [NTUSER] Add 'Win:' comments around IntDefWindowProc --- win32ss/user/ntuser/defwnd.c | 6 ++++++ win32ss/user/ntuser/hotkey.c | 8 ++++---- win32ss/user/ntuser/nonclient.c | 1 + 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/win32ss/user/ntuser/defwnd.c b/win32ss/user/ntuser/defwnd.c index e9a44f44bd9..27929de7dbe 100644 --- a/win32ss/user/ntuser/defwnd.c +++ b/win32ss/user/ntuser/defwnd.c @@ -91,6 +91,7 @@ DefWndHandleWindowPosChanging(PWND pWnd, WINDOWPOS* Pos) return 0; } +/* Win: xxxHandleWindowPosChanged */ LRESULT FASTCALL DefWndHandleWindowPosChanged(PWND pWnd, WINDOWPOS* Pos) { @@ -120,6 +121,7 @@ DefWndHandleWindowPosChanged(PWND pWnd, WINDOWPOS* Pos) // // Handle a WM_SYSCOMMAND message. Called from DefWindowProc(). // +// Win: xxxSysCommand LRESULT FASTCALL DefWndHandleSysCommand(PWND pWnd, WPARAM wParam, LPARAM lParam) { @@ -360,6 +362,7 @@ DefWndHandleSetCursor(PWND pWnd, WPARAM wParam, LPARAM lParam) return FALSE; } +/* Win: xxxDWPPrint */ VOID FASTCALL DefWndPrint( PWND pwnd, HDC hdc, ULONG uFlags) { /* @@ -430,6 +433,7 @@ UserPaintCaption(PWND pWnd, INT Flags) } // WM_SETICON +/* Win: xxxDWP_SetIcon */ LRESULT FASTCALL DefWndSetIcon(PWND pWnd, WPARAM wParam, LPARAM lParam) { @@ -468,6 +472,7 @@ DefWndSetIcon(PWND pWnd, WPARAM wParam, LPARAM lParam) return (LRESULT)hIconOld; } +/* Win: DWP_GetIcon */ LRESULT FASTCALL DefWndGetIcon(PWND pWnd, WPARAM wParam, LPARAM lParam) { @@ -527,6 +532,7 @@ DefWndScreenshot(PWND pWnd) /* Win32k counterpart of User DefWindowProc */ +/* Win: xxxRealDefWindowProc */ LRESULT FASTCALL IntDefWindowProc( PWND Wnd, diff --git a/win32ss/user/ntuser/hotkey.c b/win32ss/user/ntuser/hotkey.c index 02b504fe668..93b43d100d8 100644 --- a/win32ss/user/ntuser/hotkey.c +++ b/win32ss/user/ntuser/hotkey.c @@ -305,9 +305,9 @@ co_UserProcessHotKeys(WORD wVk, BOOL bIsDown) /* - * DefWndGetHotKey + * DefWndGetHotKey --- GetHotKey message support * - * GetHotKey message support + * Win: DWP_GetHotKey */ UINT FASTCALL DefWndGetHotKey(PWND pWnd) @@ -332,9 +332,9 @@ DefWndGetHotKey(PWND pWnd) } /* - * DefWndSetHotKey + * DefWndSetHotKey --- SetHotKey message support * - * SetHotKey message support + * Win: DWP_SetHotKey */ INT FASTCALL DefWndSetHotKey(PWND pWnd, WPARAM wParam) diff --git a/win32ss/user/ntuser/nonclient.c b/win32ss/user/ntuser/nonclient.c index 0cace3c0ba3..0561086024b 100644 --- a/win32ss/user/ntuser/nonclient.c +++ b/win32ss/user/ntuser/nonclient.c @@ -1245,6 +1245,7 @@ NC_DoNCPaint(PWND pWnd, HDC hDC, INT Flags) return 0; // For WM_NCPAINT message, return 0. } +/* Win: xxxCalcClientRect */ LRESULT NC_HandleNCCalcSize( PWND Wnd, WPARAM wparam, RECTL *Rect, BOOL Suspended ) { LRESULT Result = 0;

1 0

[reactos] 01/01: [NTUSER] Don't redraw scrollbar if it is hidden (#4849)
by Katayama Hirofumi MZ 10 Nov '22

10 Nov '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0484beb04b8c35599e9a3… commit 0484beb04b8c35599e9a32fa033645d6cc57ca40 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Nov 10 13:12:20 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Nov 10 13:12:20 2022 +0900 [NTUSER] Don't redraw scrollbar if it is hidden (#4849) Fix redrawing bug on Command Prompt. CORE-18593 --- win32ss/user/ntuser/scrollbar.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/win32ss/user/ntuser/scrollbar.c b/win32ss/user/ntuser/scrollbar.c index c4a6f2f1d8b..3763ac5c494 100644 --- a/win32ss/user/ntuser/scrollbar.c +++ b/win32ss/user/ntuser/scrollbar.c @@ -497,6 +497,7 @@ co_IntSetScrollInfo(PWND Window, INT nBar, LPCSCROLLINFO lpsi, BOOL bRedraw) static DWORD PrevPos[3] = { 0 }; static DWORD PrevMax[3] = { 0 }; static INT PrevAction[3] = { 0 }; + BOOL bVisible; ASSERT_REFS_CO(Window); @@ -663,7 +664,24 @@ co_IntSetScrollInfo(PWND Window, INT nBar, LPCSCROLLINFO lpsi, BOOL bRedraw) if ( action & SA_SSI_SHOW ) if ( co_UserShowScrollBar(Window, nBar, TRUE, TRUE) ) return lpsi->fMask & SIF_PREVIOUSPOS ? OldPos : pSBData->pos; /* SetWindowPos() already did the painting */ - if (bRedraw) + + switch (nBar) + { + case SB_HORZ: + bVisible = (Window->style & WS_HSCROLL); + break; + case SB_VERT: + bVisible = (Window->style & WS_VSCROLL); + break; + case SB_CTL: + bVisible = (Window->style & WS_VISIBLE); + break; + default: + bVisible = FALSE; + break; + } + + if (bRedraw && bVisible) { if (!(Info->fMask & SIF_THEMED)) /* Not Using Themes */ {

1 0

[reactos] 01/01: [SYSSETUP] Update Polish (pl-PL) translation (#4859)
by Piotr Hetnarowicz 09 Nov '22

09 Nov '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3fc6d90c589025a1f0288… commit 3fc6d90c589025a1f0288cd6d8ae834e10669e88 Author: Piotr Hetnarowicz <piotrhwz(a)gmail.com> AuthorDate: Thu Nov 10 00:10:19 2022 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Nov 10 02:10:19 2022 +0300 [SYSSETUP] Update Polish (pl-PL) translation (#4859) Reviewed-by: Adam Stachowicz <saibamenppl(a)gmail.com> --- dll/win32/syssetup/lang/pl-PL.rc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dll/win32/syssetup/lang/pl-PL.rc b/dll/win32/syssetup/lang/pl-PL.rc index 3ae108f9b43..3dae30b7caf 100644 --- a/dll/win32/syssetup/lang/pl-PL.rc +++ b/dll/win32/syssetup/lang/pl-PL.rc @@ -178,12 +178,12 @@ BEGIN IDS_COMPUTERSUBTITLE "Należy podać nazwę dla tego komputera oraz hasło administratora." IDS_LOCALETITLE "Opcje regionalne i językowe" IDS_LOCALESUBTITLE "System ReactOS można dostosować pod kątem języka i sposobu wyświetlania danych." - IDS_LOCALETEXT "The Standards and formats are set to %s, and the location is set to %s." - IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard layout" + IDS_LOCALETEXT "Standardy i formaty są ustawione na %s, a lokalizacja jest ustawiona na %s." + IDS_LAYOUTTEXT "Domyślnym językiem i metodą wprowadzania tekstu jest układ klawiatury: %s" IDS_DATETIMETITLE "Data i godzina" IDS_DATETIMESUBTITLE "Ustaw prawidłową datę i godzinę." - IDS_PROCESSTITLE "Finishing the Installation" - IDS_PROCESSSUBTITLE "Please wait while Setup completes the final steps." + IDS_PROCESSTITLE "Kończenie instalacji" + IDS_PROCESSSUBTITLE "Poczekaj, aż Instalator wykona ostatnie kroki." IDS_THEMESELECTIONTITLE "Wygląd" IDS_THEMESELECTIONSUBTITLE "Wybierz motyw, który preferujesz." END

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
18
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2022