Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2024-12-03 17:29:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove duplicate icon

Browse source 
only one icon file remains

make splash screen smaller since we don't have a 64x64 icon preview anymore (only 32x32 & smaller)
This commit is contained in:
Kurt 2020-05-26 14:43:57 -07:00
parent 9b6190a3e9
commit 4f039fe732
7 changed files with 1104 additions and 1117 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
PKHeX.WinForms/Misc/SplashScreen.Designer.cs generated
View file

@ -29,54 +29,53 @@
private void InitializeComponent()
{
this.L_Status = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
this.pictureBox1 = new System.Windows.Forms.PictureBox();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
this.L_Site = new System.Windows.Forms.Label();
this.PB_Icon = new System.Windows.Forms.PictureBox();
((System.ComponentModel.ISupportInitialize)(this.PB_Icon)).BeginInit();
this.SuspendLayout();
//
// L_Status
//
this.L_Status.AutoSize = true;
this.L_Status.Location = new System.Drawing.Point(70, 16);
this.L_Status.Location = new System.Drawing.Point(40, 3);
this.L_Status.Name = "L_Status";
this.L_Status.Size = new System.Drawing.Size(105, 13);
this.L_Status.TabIndex = 0;
this.L_Status.Text = "Starting up PKHeX...";
//
// label2
// L_Site
//
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(71, 42);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(103, 13);
this.label2.TabIndex = 1;
this.label2.Text = "ProjectPokemon.org";
this.L_Site.AutoSize = true;
this.L_Site.Location = new System.Drawing.Point(40, 21);
this.L_Site.Name = "L_Site";
this.L_Site.Size = new System.Drawing.Size(103, 13);
this.L_Site.TabIndex = 1;
this.L_Site.Text = "ProjectPokemon.org";
//
// pictureBox1
// PB_Icon
//
this.pictureBox1.BackgroundImage = global::PKHeX.WinForms.Properties.Resources.SplashIcon;
this.pictureBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.pictureBox1.Location = new System.Drawing.Point(2, 3);
this.pictureBox1.Name = "pictureBox1";
this.pictureBox1.Size = new System.Drawing.Size(64, 64);
this.pictureBox1.TabIndex = 2;
this.pictureBox1.TabStop = false;
this.PB_Icon.BackgroundImage = global::PKHeX.WinForms.Properties.Resources.Icon.ToBitmap();
this.PB_Icon.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.PB_Icon.Location = new System.Drawing.Point(2, 3);
this.PB_Icon.Name = "PB_Icon";
this.PB_Icon.Size = new System.Drawing.Size(32, 32);
this.PB_Icon.TabIndex = 2;
this.PB_Icon.TabStop = false;
//
// SplashScreen
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(181, 69);
this.Controls.Add(this.pictureBox1);
this.Controls.Add(this.label2);
this.ClientSize = new System.Drawing.Size(150, 38);
this.Controls.Add(this.PB_Icon);
this.Controls.Add(this.L_Site);
this.Controls.Add(this.L_Status);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
this.Icon = global::PKHeX.WinForms.Properties.Resources.Icon;
this.Name = "SplashScreen";
this.Opacity = 0.5D;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "Loading...";
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.PB_Icon)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
@ -84,8 +83,8 @@
#endregion
private System.Windows.Forms.Label label2;
private System.Windows.Forms.PictureBox pictureBox1;
private System.Windows.Forms.Label L_Site;
private System.Windows.Forms.PictureBox PB_Icon;
public System.Windows.Forms.Label L_Status;
}
}

6
PKHeX.WinForms/Misc/SplashScreen.cs
View file

@ -4,10 +4,6 @@ namespace PKHeX.WinForms
{
public partial class SplashScreen : Form
{
public SplashScreen()
{
InitializeComponent();
Icon = Properties.Resources.Icon;
}
public SplashScreen() => InitializeComponent();
}
}

2
PKHeX.WinForms/PKHeX.WinForms.csproj
View file

@ -9,7 +9,7 @@
<Authors>Kaphotics</Authors>
<Product>PKHeX</Product>
<Description>Pokémon Save Editor</Description>
<ApplicationIcon>icon.ico</ApplicationIcon>
<ApplicationIcon>Resources\Icon.ico</ApplicationIcon>
<StartupObject>PKHeX.WinForms.Program</StartupObject>
<AssemblyName>PKHeX</AssemblyName>
<Version>20.04.14</Version>

101
PKHeX.WinForms/Properties/Resources.Designer.cs generated
View file

@ -214,13 +214,15 @@ namespace PKHeX.WinForms.Properties {
/// Looks up a localized string similar to PKHeX - By Kaphotics
///http://projectpokemon.org/pkhex/
///
///19/12/26 - New Update:
///20/04/14 - New Update:
/// - Legality:
/// - - Added: PP Count verification, Egg TR/StatNature checks, etc.
/// - - Added: More static encounter locations.
/// - - Added: Handling for downleveled raid content, and location crossover comparisons for wild encounters.
/// - - Changed: Encounter yielding pattern for Gen8 is now slightly different from the one used for Gen5-7 (now yields more).
/// - - Fixed: EvolutionTree regressions have been resolved. Please repor [rest of string was truncated]&quot;;.
/// - - Added: Latest raid news data.
/// - - Fixed: HOME gifts now recognized.
/// - - Fixed: Antishiny Colosseum/XD spreads are recognized better for various gifts.
/// - - Fixed: Some unavailable evolution cases are now recognized correctly.
/// - - Fixed: Silvally Pixie Plate is now recognized correctly.
/// - - Fixed: Gen8 Raid downleveling thresholds are now recognized correctly.
/// - - Fixed: Gen8 Link trade eggs are no [rest of string was truncated]&quot;;.
/// </summary>
public static string changelog {
get {
@ -518,6 +520,7 @@ namespace PKHeX.WinForms.Properties {
///RibbonEditor=Ribbon Editor
///SAV_Apricorn=Apricorn Editor
///SAV_BerryField=Berry Field Viewer
///SAV_BlockDump8=Savedata Block Dump
///SAV_BoxLayout=Box Layout Editor
///SAV_BoxList=Storage Viewer
///SAV_CGearSkin=C-Gear Skin
@ -527,8 +530,7 @@ namespace PKHeX.WinForms.Properties {
///SAV_EventReset1=Event Resetter
///SAV_EventWork=Event Flag Editor
///SAV_FolderList=Folder List
///SAV_GameSelect=Game Selection
///SAV_Hal [rest of string was truncated]&quot;;.
///SA [rest of string was truncated]&quot;;.
/// </summary>
public static string lang_de {
get {
@ -546,6 +548,7 @@ namespace PKHeX.WinForms.Properties {
///RibbonEditor=Ribbon Editor
///SAV_Apricorn=Apricorn Editor
///SAV_BerryField=Berry Field Viewer
///SAV_BlockDump8=Savedata Block Dump
///SAV_BoxLayout=Box Layout Editor
///SAV_BoxList=Storage Viewer
///SAV_CGearSkin=C-Gear Skin
@ -555,8 +558,7 @@ namespace PKHeX.WinForms.Properties {
///SAV_EventReset1=Event Resetter
///SAV_EventWork=Event Flag Editor
///SAV_FolderList=Folder List
///SAV_GameSelect=Game Selection
///SAV_Hal [rest of string was truncated]&quot;;.
///SA [rest of string was truncated]&quot;;.
/// </summary>
public static string lang_en {
get {
@ -574,14 +576,14 @@ namespace PKHeX.WinForms.Properties {
///RibbonEditor=Editor de cintas
///SAV_Apricorn=Editor de Bonguri
///SAV_BerryField=Visor de campos de bayas
///SAV_BlockDump8=Respaldo de bloques
///SAV_BoxLayout=Editor de fondos de cajas
///SAV_BoxList=Visor de almacenamiento
///SAV_CGearSkin=Editor de la apariencia C-Gear
///SAV_Database=Base de datos
///SAV_Encounters=Base de datos
///SAV_EventFlags=Editor de marca de eventos
///SAV_EventReset1=Reiniciador de eventos
///SAV_E [rest of string was truncated]&quot;;.
///SAV_Event [rest of string was truncated]&quot;;.
/// </summary>
public static string lang_es {
get {
@ -599,6 +601,7 @@ namespace PKHeX.WinForms.Properties {
///RibbonEditor=Rubans
///SAV_Apricorn=Noigrumes
///SAV_BerryField=Champs de Baies
///SAV_BlockDump8=Savedata Block Dump
///SAV_BoxLayout=Fonds de Boîtes
///SAV_BoxList=Storage Viewer
///SAV_CGearSkin=Fonds C-Gear
@ -607,8 +610,7 @@ namespace PKHeX.WinForms.Properties {
///SAV_EventFlags=Événements dans le Jeu
///SAV_EventReset1=Réinitialisateur d&apos;événements
///SAV_EventWork=Event Flag Editor
///SAV_FolderList=Liste Dossiers
///SAV_GameSelect=Choix [rest of string was truncated]&quot;;.
///SAV_FolderList=L [rest of string was truncated]&quot;;.
/// </summary>
public static string lang_fr {
get {
@ -626,6 +628,7 @@ namespace PKHeX.WinForms.Properties {
///RibbonEditor=Ribbon Editor
///SAV_Apricorn=Apricorn Editor
///SAV_BerryField=Berry Field Viewer
///SAV_BlockDump8=Savedata Block Dump
///SAV_BoxLayout=Box Layout Editor
///SAV_BoxList=Storage Viewer
///SAV_CGearSkin=C-Gear Skin
@ -635,8 +638,7 @@ namespace PKHeX.WinForms.Properties {
///SAV_EventReset1=Event Resetter
///SAV_EventWork=Event Flag Editor
///SAV_FolderList=Folder List
///SAV_GameSelect=Game Selection
///SAV_Hal [rest of string was truncated]&quot;;.
///SA [rest of string was truncated]&quot;;.
/// </summary>
public static string lang_it {
get {
@ -654,6 +656,7 @@ namespace PKHeX.WinForms.Properties {
///RibbonEditor=取得リボン
///SAV_Apricorn=ぼんぐり
///SAV_BerryField=きのみ畑
///SAV_BlockDump8=Savedata Block Dump
///SAV_BoxLayout=ボックスレイアウト
///SAV_BoxList=ボックスリスト
///SAV_CGearSkin=Cギア スキン
@ -666,9 +669,7 @@ namespace PKHeX.WinForms.Properties {
///SAV_GameSelect=ゲームバーション
///SAV_HallOfFame=殿堂入りデータ
///SAV_HallOfFame7=殿堂入りデータ参照
///SAV_HoneyTree=あまいかおりのするき
///SAV_Inventory=アイテム
///SAV_Link6=ポケモ [rest of string was truncated]&quot;;.
///SAV_HoneyTree=あまいかおりのする [rest of string was truncated]&quot;;.
/// </summary>
public static string lang_ja {
get {
@ -677,26 +678,29 @@ namespace PKHeX.WinForms.Properties {
}
/// <summary>
/// Looks up a localized string similar to About=About
///BatchEditor=Batch Editor
///ErrorWindow=Error
/// Looks up a localized string similar to About=정보
///BatchEditor=일괄 편집 도구
///ErrorWindow=오류
///KChart=KChart
///Main=PKHeX
///MemoryAmie=Memory / Amie Editor
///RibbonEditor=Ribbon Editor
///SAV_Apricorn=Apricorn Editor
///SAV_BerryField=Berry Field Viewer
///SAV_BoxLayout=Box Layout Editor
///SAV_BoxList=Storage Viewer
///SAV_CGearSkin=C-Gear Skin
///SAV_Database=Database
///SAV_Encounters=Database
///SAV_EventFlags=Event Flag Editor
///SAV_EventReset1=Event Resetter
///SAV_EventWork=Event Flag Editor
///SAV_FolderList=Folder List
///SAV_GameSelect=Game Selection
///SAV_Hal [rest of string was truncated]&quot;;.
///MemoryAmie=기억 / 파를레 편집 도구
///RibbonEditor=리본 편집 도구
///SAV_Apricorn=규토리 편집 도구
///SAV_BerryField=나무열매 밭 뷰어
///SAV_BlockDump8=세이브 데이터 블록 덤프
///SAV_BoxLayout=박스 레이아웃 편집 도구
///SAV_BoxList=소지 공간 뷰어
///SAV_CGearSkin=C기어 스킨
///SAV_Database=데이터베이스
///SAV_Encounters=데이터베이스
///SAV_EventFlags=이벤트 플래그 편집 도구
///SAV_EventReset1=이벤트 초기화 도구
///SAV_EventWork=이벤트 플래그 편집 도구
///SAV_FolderList=폴더 목록
///SAV_GameSelect=게임 선택
///SAV_HallOfFame=전당등록 편집 도구
///SAV_HallOfFame7=전당등록 편집 도구
///SAV_ [rest of string was truncated]&quot;;.
/// </summary>
public static string lang_ko {
get {
@ -705,23 +709,24 @@ namespace PKHeX.WinForms.Properties {
}
/// <summary>
/// Looks up a localized string similar to About=About
/// Looks up a localized string similar to About=关于
///BatchEditor=批量编辑器
///ErrorWindow=错误
///KChart=信息列表
///Main=PKHeX
///MemoryAmie=回忆/清爽乐
///MemoryAmie=回忆编辑器
///RibbonEditor=奖章
///SAV_Apricorn=球果编辑
///SAV_BerryField=树果田查看器
///SAV_BlockDump8=存档转储
///SAV_BoxLayout=盒子外观
///SAV_BoxList=寄放系统
///SAV_CGearSkin=C-装置皮肤
///SAV_CGearSkin=C装置皮肤
///SAV_Database=数据库
///SAV_Encounters=Database
///SAV_Encounters=数据库
///SAV_EventFlags=事件旗标编辑
///SAV_EventReset1=事件重置
///SAV_EventWork=Event Flag Editor
///SAV_EventWork=事件标志编辑器
///SAV_FolderList=文件夹列表
///SAV_GameSelect=游戏选择
///SAV_HallOfFame=名人堂
@ -730,7 +735,7 @@ namespace PKHeX.WinForms.Properties {
///SAV_Inventory=物品栏
///SAV_Link6=宝可梦连接工具
///SAV_MailBox=邮箱编辑
///SAV_Misc3=训练家数据编辑 /// [rest of string was truncated]&quot;;.
///SAV_Misc3=训练家数据编辑 [rest of string was truncated]&quot;;.
/// </summary>
public static string lang_zh {
get {
@ -979,16 +984,6 @@ namespace PKHeX.WinForms.Properties {
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
public static System.Drawing.Bitmap SplashIcon {
get {
object obj = ResourceManager.GetObject("SplashIcon", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>

3
PKHeX.WinForms/Properties/Resources.resx
View file

@ -313,9 +313,6 @@
<data name="Icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="SplashIcon" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\SplashIcon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="rare_icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\img\Markings\rare_icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>

BIN
PKHeX.WinForms/Resources/SplashIcon.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 3.9 KiB

BIN
PKHeX.WinForms/icon.ico
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 5.3 KiB