diff --git a/src/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj b/src/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj index 95f426f0bb..0dff4c83f1 100755 --- a/src/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj +++ b/src/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj @@ -107,39 +107,18 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/src/BizHawk.Client.EmuHawk/MainForm.cs b/src/BizHawk.Client.EmuHawk/MainForm.cs index 92b89a7429..13c1e7807f 100644 --- a/src/BizHawk.Client.EmuHawk/MainForm.cs +++ b/src/BizHawk.Client.EmuHawk/MainForm.cs @@ -174,7 +174,7 @@ namespace BizHawk.Client.EmuHawk return new CoreComm(ShowMessageCoreComm, AddOnScreenMessage, cfp, prefs); } - void SetImages() + private void SetImages() { OpenRomMenuItem.Image = Properties.Resources.OpenFile; RecentRomSubMenu.Image = Properties.Resources.Recent; @@ -213,7 +213,7 @@ namespace BizHawk.Client.EmuHawk ToolBoxMenuItem.Image = Properties.Resources.ToolBox; RamWatchMenuItem.Image = Properties.Resources.watch; RamSearchMenuItem.Image = Properties.Resources.search; - LuaConsoleMenuItem.Image = Properties.Resources.Lua; + LuaConsoleMenuItem.Image = Properties.Resources.TextDoc; TAStudioMenuItem.Image = Properties.Resources.TAStudio; HexEditorMenuItem.Image = Properties.Resources.poke; TraceLoggerMenuItem.Image = Properties.Resources.pencil; diff --git a/src/BizHawk.Client.EmuHawk/Properties/Resources.cs b/src/BizHawk.Client.EmuHawk/Properties/Resources.cs index e0c4efa8b2..f7aeff996c 100644 --- a/src/BizHawk.Client.EmuHawk/Properties/Resources.cs +++ b/src/BizHawk.Client.EmuHawk/Properties/Resources.cs @@ -114,7 +114,6 @@ namespace BizHawk.Client.EmuHawk.Properties internal static readonly Icon logo = ReadEmbeddedIcon("logo"); internal static readonly Icon log_window_MultiSize = ReadEmbeddedIcon("log_window"); internal static readonly Bitmap log_window = ReadEmbeddedBitmap("log_window"); - internal static readonly Bitmap Lua = ReadEmbeddedBitmap("Lua"); internal static readonly Bitmap luaPictureBox = ReadEmbeddedBitmap("luaPictureBox"); internal static readonly Bitmap mame = ReadEmbeddedBitmap("mame"); internal static readonly Bitmap MessageConfig = ReadEmbeddedBitmap("MessageConfig"); @@ -188,6 +187,7 @@ namespace BizHawk.Client.EmuHawk.Properties internal static readonly Bitmap ts_v_arrow_blue = ReadEmbeddedBitmap("tastudio.ts_v_arrow_blue"); internal static readonly Bitmap ts_v_arrow_green = ReadEmbeddedBitmap("tastudio.ts_v_arrow_green"); internal static readonly Bitmap ts_v_arrow_green_blue = ReadEmbeddedBitmap("tastudio.ts_v_arrow_green_blue"); + internal static readonly Bitmap TextDoc = ReadEmbeddedBitmap("textdoc"); internal static readonly Icon textdoc_MultiSize = ReadEmbeddedIcon("textdoc"); internal static readonly Bitmap thumbsdown = ReadEmbeddedBitmap("thumbsdown"); internal static readonly Icon ToolBox_MultiSize = ReadEmbeddedIcon("ToolBox"); diff --git a/src/BizHawk.Client.EmuHawk/Resources/ZXSpectrumKeyboard.bmp b/src/BizHawk.Client.EmuHawk/Resources/ZXSpectrumKeyboard.bmp deleted file mode 100644 index 55516c7aaa..0000000000 Binary files a/src/BizHawk.Client.EmuHawk/Resources/ZXSpectrumKeyboard.bmp and /dev/null differ diff --git a/src/BizHawk.Client.EmuHawk/Resources/courier16px.bmfc b/src/BizHawk.Client.EmuHawk/Resources/courier16px.bmfc deleted file mode 100644 index a84a08dcfc..0000000000 --- a/src/BizHawk.Client.EmuHawk/Resources/courier16px.bmfc +++ /dev/null @@ -1,55 +0,0 @@ -# AngelCode Bitmap Font Generator configuration file -fileVersion=1 - -# font settings -fontName=Courier -fontFile= -charSet=204 -fontSize=16 -aa=1 -scaleH=100 -useSmoothing=0 -isBold=1 -isItalic=0 -useUnicode=1 -disableBoxChars=1 -outputInvalidCharGlyph=1 -dontIncludeKerningPairs=0 -useHinting=1 -renderFromOutline=0 -useClearType=1 - -# character alignment -paddingDown=0 -paddingUp=0 -paddingRight=0 -paddingLeft=0 -spacingHoriz=1 -spacingVert=1 -useFixedHeight=0 -forceZero=0 - -# output file -outWidth=128 -outHeight=256 -outBitDepth=32 -fontDescFormat=1 -fourChnlPacked=0 -textureFormat=png -textureCompression=0 -alphaChnl=0 -redChnl=4 -greenChnl=4 -blueChnl=4 -invA=0 -invR=0 -invG=0 -invB=0 - -# outline -outlineThickness=2 - -# selected chars -chars=32-127,152,160,164,166-167,169,171-174,176-177,181-183,187 - -# imported icon images diff --git a/src/BizHawk.Client.EmuHawk/images/AtariControllerIcon.png b/src/BizHawk.Client.EmuHawk/images/AtariControllerIcon.png deleted file mode 100644 index b25a6b54c1..0000000000 Binary files a/src/BizHawk.Client.EmuHawk/images/AtariControllerIcon.png and /dev/null differ diff --git a/src/BizHawk.Client.EmuHawk/images/BuilderDialog_delete.bmp b/src/BizHawk.Client.EmuHawk/images/BuilderDialog_delete.bmp deleted file mode 100644 index 13897c4086..0000000000 Binary files a/src/BizHawk.Client.EmuHawk/images/BuilderDialog_delete.bmp and /dev/null differ diff --git a/src/BizHawk.Client.EmuHawk/images/BuilderDialog_movedown.bmp b/src/BizHawk.Client.EmuHawk/images/BuilderDialog_movedown.bmp deleted file mode 100644 index 4bf1204a40..0000000000 Binary files a/src/BizHawk.Client.EmuHawk/images/BuilderDialog_movedown.bmp and /dev/null differ diff --git a/src/BizHawk.Client.EmuHawk/images/BuilderDialog_moveup.bmp b/src/BizHawk.Client.EmuHawk/images/BuilderDialog_moveup.bmp deleted file mode 100644 index de5f8f1837..0000000000 Binary files a/src/BizHawk.Client.EmuHawk/images/BuilderDialog_moveup.bmp and /dev/null differ diff --git a/src/BizHawk.Client.EmuHawk/images/Cheats.ico b/src/BizHawk.Client.EmuHawk/images/Cheats.ico deleted file mode 100644 index 191e225857..0000000000 Binary files a/src/BizHawk.Client.EmuHawk/images/Cheats.ico and /dev/null differ diff --git a/src/BizHawk.Client.EmuHawk/images/Debugger.ico b/src/BizHawk.Client.EmuHawk/images/Debugger.ico deleted file mode 100644 index 4290942ab4..0000000000 Binary files a/src/BizHawk.Client.EmuHawk/images/Debugger.ico and /dev/null differ diff --git a/src/BizHawk.Client.EmuHawk/images/GenesisControllerIcon.png b/src/BizHawk.Client.EmuHawk/images/GenesisControllerIcon.png deleted file mode 100644 index d519379829..0000000000 Binary files a/src/BizHawk.Client.EmuHawk/images/GenesisControllerIcon.png and /dev/null differ diff --git a/src/BizHawk.Client.EmuHawk/images/InserSeparator.bmp b/src/BizHawk.Client.EmuHawk/images/InserSeparator.bmp deleted file mode 100644 index cb1aab28dc..0000000000 Binary files a/src/BizHawk.Client.EmuHawk/images/InserSeparator.bmp and /dev/null differ diff --git a/src/BizHawk.Client.EmuHawk/images/Lua.png b/src/BizHawk.Client.EmuHawk/images/Lua.png deleted file mode 100644 index 05dc80a0c0..0000000000 Binary files a/src/BizHawk.Client.EmuHawk/images/Lua.png and /dev/null differ diff --git a/src/BizHawk.Client.EmuHawk/images/NESControllerIcon.png b/src/BizHawk.Client.EmuHawk/images/NESControllerIcon.png deleted file mode 100644 index 68f9a81ac3..0000000000 Binary files a/src/BizHawk.Client.EmuHawk/images/NESControllerIcon.png and /dev/null differ diff --git a/src/BizHawk.Client.EmuHawk/images/PrintPreviewHS.png b/src/BizHawk.Client.EmuHawk/images/PrintPreviewHS.png deleted file mode 100644 index 44d3fd6ca8..0000000000 Binary files a/src/BizHawk.Client.EmuHawk/images/PrintPreviewHS.png and /dev/null differ diff --git a/src/BizHawk.Client.EmuHawk/images/SNESControllerIcon.png b/src/BizHawk.Client.EmuHawk/images/SNESControllerIcon.png deleted file mode 100644 index fd95abf879..0000000000 Binary files a/src/BizHawk.Client.EmuHawk/images/SNESControllerIcon.png and /dev/null differ diff --git a/src/BizHawk.Client.EmuHawk/images/SaveAllHS.png b/src/BizHawk.Client.EmuHawk/images/SaveAllHS.png deleted file mode 100644 index 7bde10a6d2..0000000000 Binary files a/src/BizHawk.Client.EmuHawk/images/SaveAllHS.png and /dev/null differ diff --git a/src/BizHawk.Client.EmuHawk/images/TurboFastForward.png b/src/BizHawk.Client.EmuHawk/images/TurboFastForward.png deleted file mode 100644 index 016611d269..0000000000 Binary files a/src/BizHawk.Client.EmuHawk/images/TurboFastForward.png and /dev/null differ diff --git a/src/BizHawk.Client.EmuHawk/images/WarningHS.png b/src/BizHawk.Client.EmuHawk/images/WarningHS.png deleted file mode 100644 index 15e31e872d..0000000000 Binary files a/src/BizHawk.Client.EmuHawk/images/WarningHS.png and /dev/null differ diff --git a/src/BizHawk.Client.EmuHawk/images/cheat.png b/src/BizHawk.Client.EmuHawk/images/cheat.png deleted file mode 100644 index 438fcef00d..0000000000 Binary files a/src/BizHawk.Client.EmuHawk/images/cheat.png and /dev/null differ diff --git a/src/BizHawk.Client.EmuHawk/images/dual.png b/src/BizHawk.Client.EmuHawk/images/dual.png deleted file mode 100644 index fe0ce4a2dc..0000000000 Binary files a/src/BizHawk.Client.EmuHawk/images/dual.png and /dev/null differ diff --git a/src/BizHawk.Client.EmuHawk/images/snes9x.ico b/src/BizHawk.Client.EmuHawk/images/snes9x.ico deleted file mode 100644 index 9bd310bd1e..0000000000 Binary files a/src/BizHawk.Client.EmuHawk/images/snes9x.ico and /dev/null differ diff --git a/src/BizHawk.Client.EmuHawk/images/user_blue.png b/src/BizHawk.Client.EmuHawk/images/user_blue.png deleted file mode 100644 index 8e2fc36fec..0000000000 Binary files a/src/BizHawk.Client.EmuHawk/images/user_blue.png and /dev/null differ