Skip to content

Commit

Permalink
Update OgreNext logo for Windows
Browse files Browse the repository at this point in the history
  • Loading branch information
darksylinc committed Nov 7, 2023
1 parent 8de8c10 commit 152b79d
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 21 deletions.
45 changes: 24 additions & 21 deletions OgreMain/src/WIN32/OgreWin32Resources.rc
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,8 @@
// Neutral resources

#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU)
#ifdef _WIN32
LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
#pragma code_page(1252)
#endif //_WIN32

/////////////////////////////////////////////////////////////////////////////
//
Expand All @@ -33,6 +31,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL

IDB_SPLASH BITMAP "ogrelogo.bmp"


/////////////////////////////////////////////////////////////////////////////
//
// Icon
Expand All @@ -41,18 +40,17 @@ IDB_SPLASH BITMAP "ogrelogo.bmp"
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
IDI_OGREICON ICON "ogre.ico"

#endif // Neutral resources
/////////////////////////////////////////////////////////////////////////////


/////////////////////////////////////////////////////////////////////////////
// English (U.K.) resources
// English (United Kingdom) resources

#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG)
#ifdef _WIN32
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK
#pragma code_page(1252)
#endif //_WIN32

#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -93,30 +91,24 @@ BEGIN
DEFPUSHBUTTON "&OK",IDOK,205,253,60,14
PUSHBUTTON "&Cancel",IDCANCEL,267,253,60,14
LTEXT "Rendering Subsystem:",IDC_OGRE_ICON,21,136,73,12
COMBOBOX IDC_CBO_RENDERSYSTEM,95,134,219,57,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
COMBOBOX IDC_CBO_RENDERSYSTEM,95,134,219,57,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
GROUPBOX "Rendering System Options",IDC_OPTFRAME,5,152,322,101
LISTBOX IDC_LST_OPTIONS,13,163,310,68,LBS_NOINTEGRALHEIGHT |
WS_VSCROLL | WS_TABSTOP
LISTBOX IDC_LST_OPTIONS,13,163,310,68,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
RTEXT "[Click On An Option]:",IDC_LBL_OPTION,14,237,125,11
COMBOBOX IDC_CBO_OPTION,143,235,180,94,CBS_DROPDOWNLIST |
WS_DISABLED | WS_VSCROLL | WS_TABSTOP
CONTROL 106,IDC_OGRE_ICON,"Static",SS_BITMAP,0,0,327,140
COMBOBOX IDC_CBO_OPTION,143,235,180,94,CBS_DROPDOWNLIST | WS_DISABLED | WS_VSCROLL | WS_TABSTOP
CONTROL IDB_SPLASH,IDC_OGRE_ICON,"Static",SS_BITMAP,0,0,327,140
END

IDD_DLG_ERROR DIALOG 0, 0, 243, 178
IDD_DLG_ERROR DIALOG 0, 0, 243, 178
STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
CAPTION "Error"
FONT 8, "MS Sans Serif"
BEGIN
DEFPUSHBUTTON "&Close",IDOK,81,157,80,14
LTEXT "The Ogre engine has encountered an error from which it cannot recover. The last message was:",
IDC_OGRE_ICON,7,7,229,19
LTEXT "The Ogre engine has encountered an error from which it cannot recover. The last message was:",IDC_OGRE_ICON,7,7,229,19
LTEXT "",IDC_ERRMSG,17,29,209,84,SS_SUNKEN
LTEXT "If you cannot resolve this issue yourself, please report it through the web site at http://www.ogre3d.org.",
IDC_OGRE_ICON,7,118,229,19
LTEXT "If you report the error, please include details of your hardware setup, and attach a copy of the 'ogre.log' file which you will find in the local folder.",
IDC_OGRE_ICON,7,138,229,17
LTEXT "If you cannot resolve this issue yourself, please report it through the web site at http://www.ogre3d.org.",IDC_OGRE_ICON,7,118,229,19
LTEXT "If you report the error, please include details of your hardware setup, and attach a copy of the 'ogre.log' file which you will find in the local folder.",IDC_OGRE_ICON,7,138,229,17
END


Expand All @@ -126,7 +118,7 @@ END
//

#ifdef APSTUDIO_INVOKED
GUIDELINES DESIGNINFO
GUIDELINES DESIGNINFO
BEGIN
IDD_DLG_CONFIG, DIALOG
BEGIN
Expand All @@ -144,7 +136,18 @@ BEGIN
END
#endif // APSTUDIO_INVOKED

#endif // English (U.K.) resources

/////////////////////////////////////////////////////////////////////////////
//
// AFX_DIALOG_LAYOUT
//

IDD_DLG_CONFIG AFX_DIALOG_LAYOUT
BEGIN
0
END

#endif // English (United Kingdom) resources
/////////////////////////////////////////////////////////////////////////////


Expand Down
Binary file modified OgreMain/src/WIN32/ogre.ico
Binary file not shown.
Binary file modified OgreMain/src/WIN32/ogrelogo.bmp
Binary file not shown.

1 comment on commit 152b79d

@cryham
Copy link
Contributor

@cryham cryham commented on 152b79d Nov 8, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay, cool, look changed, but it doesn't actually say 'Next' on logo. I'd say it's worth adding to .bmp to make it clear, since differences are major.

Please sign in to comment.