Skip to content

Commit

Permalink
JPEGView-Static v1.2.45.0 has been released
Browse files Browse the repository at this point in the history
  • Loading branch information
annh9b committed Jun 17, 2023
1 parent f868e25 commit 3cb0a92
Show file tree
Hide file tree
Showing 7 changed files with 29 additions and 21 deletions.
16 changes: 8 additions & 8 deletions JPEGView/AboutDlg.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -51,15 +51,15 @@ LRESULT CAboutDlg::OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lPara
#ifdef _DEBUG
// the debug version does not require localized title strings
#ifdef _WIN64
LPCTSTR sTitle = _T("About JPEGView (Debug version, 64-bit)...");
LPCTSTR sTitle = _T("About JPEGView-Static (Debug version, 64-bit)...");
#else
LPCTSTR sTitle = _T("About JPEGView (Debug version, 32-bit)...");
LPCTSTR sTitle = _T("About JPEGView-Static (Debug version, 32-bit)...");
#endif
#else
#ifdef _WIN64
LPCTSTR sTitle = CNLS::GetString(_T("About JPEGView (64-bit version)..."));
LPCTSTR sTitle = CNLS::GetString(_T("About JPEGView-Static (64-bit version)..."));
#else
LPCTSTR sTitle = CNLS::GetString(_T("About JPEGView (32-bit version)..."));
LPCTSTR sTitle = CNLS::GetString(_T("About JPEGView-Static (32-bit version)..."));
#endif
#endif
this->SetWindowText(sTitle);
Expand All @@ -71,7 +71,7 @@ LRESULT CAboutDlg::OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lPara
m_btnClose.Attach(GetDlgItem(IDC_CLOSE));
m_lblIcon.Attach(GetDlgItem(IDC_ICONJPEGVIEW));

m_lblVersion.SetWindowText(CString(_T("JPEGView ")) + JPEGVIEW_VERSION);
m_lblVersion.SetWindowText(CString(_T("JPEGView-Static ")) + JPEGVIEW_VERSION_PRINT);

m_lblSIMD.SetWindowText(CString(CNLS::GetString(_T("SIMD mode used"))) + _T(": ") + GetSIMDModeString());
TCHAR sNumCores[16];
Expand All @@ -81,10 +81,10 @@ LRESULT CAboutDlg::OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lPara

m_richEdit.SetBackgroundColor(::GetSysColor(COLOR_3DFACE));
m_richEdit.SetAutoURLDetect(TRUE);
m_richEdit.SetWindowText(CString(CNLS::GetString(_T("Licensed under the GNU general public license (GPL), see readme file for details"))) +
_T(":\nfile://") + GetReadmeFileName() + _T("\n") +
m_richEdit.SetWindowText(CString(CNLS::GetString(_T("Licensed under the GNU General Public License (GPLv3)"))) +
_T("\n\n") +
CNLS::GetString(_T("Project home page")) +
_T(":\nhttps://github.com/sylikc/jpegview/\n"));
_T(":\nhttps://github.com/annh9b/JPEGView-Static\n"));
m_richEdit.SetEventMask(ENM_LINK);

HICON hIconLarge = (HICON)::LoadImage(_Module.GetResourceInstance(), MAKEINTRESOURCE(IDR_MAINFRAME),
Expand Down
22 changes: 11 additions & 11 deletions JPEGView/JPEGView.rc
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ END

// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
IDR_MAINFRAME ICON "res\\JPEGView.ico"
IDR_MAINFRAME ICON "res\\JPEGView-Static.ico"


/////////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -114,11 +114,11 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
DEFPUSHBUTTON "",IDC_CLOSE,133,120,104,15
LTEXT "",IDC_JPEGVIEW,64,7,163,9,NOT WS_GROUP
LTEXT "Copyright 2006-2018 David Kleiner\nCopyright 2020-2023 Kevin M (sylikc)",IDC_COPYRIGHT,64,17,163,18,NOT WS_GROUP
LTEXT "Copyright 2006-2018 David Kleiner\nCopyright 2020-2023 Kevin M (sylikc)\nCopyright 2022-2023 Ann Hatt (annh9b)",IDC_COPYRIGHT,64,17,163,25,NOT WS_GROUP
ICON IDR_MAINFRAME,IDC_ICONJPEGVIEW,12,6,64,64
CONTROL "",IDC_LICENSE,"RichEdit20W",WS_TABSTOP | 0x804,64,68,168,42
LTEXT "",IDC_SIMDMODE,64,36,163,10,NOT WS_GROUP
LTEXT "",IDC_NUMCORES,64,49,163,10,NOT WS_GROUP
LTEXT "",IDC_SIMDMODE,64,48,163,10,NOT WS_GROUP
LTEXT "",IDC_NUMCORES,64,56,163,10,NOT WS_GROUP
END

IDD_SET_CROP_SIZE DIALOGEX 8, 7, 159, 101
Expand Down Expand Up @@ -449,7 +449,7 @@ BEGIN
MENUITEM "_empty_", IDM_ABOUT
END
MENUITEM SEPARATOR
MENUITEM "About JPEGView...", IDM_ABOUT
MENUITEM "About JPEGView-Static...", IDM_ABOUT
MENUITEM SEPARATOR
MENUITEM "Exit\t0xffff", IDM_EXIT
END
Expand Down Expand Up @@ -513,13 +513,13 @@ BEGIN
BEGIN
BLOCK "040904b0"
BEGIN
VALUE "CompanyName", "Kevin M (sylikc)"
VALUE "FileDescription", "JPEGView"
VALUE "CompanyName", "Ann Hatt (annh9b)"
VALUE "FileDescription", "JPEGView-Static"
VALUE "FileVersion", "1.2.45.0"
VALUE "InternalName", "JPEGView"
VALUE "LegalCopyright", "Copyright 2020-2023 Kevin M (sylikc), 2006-2018 David Kleiner"
VALUE "OriginalFilename", "JPEGView.exe"
VALUE "ProductName", "JPEGView Application"
VALUE "InternalName", "JPEGView-Static"
VALUE "LegalCopyright", "Copyright 2022-2023 Ann Hatt (annh9b), 2020-2023 Kevin M (sylikc), 2006-2018 David Kleiner"
VALUE "OriginalFilename", "JPEGView-Static.exe"
VALUE "ProductName", "JPEGView-Static Application"
VALUE "ProductVersion", "1.2.45.0"
END
END
Expand Down
9 changes: 8 additions & 1 deletion JPEGView/JPEGView_VS2017.vcxproj.user
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LocalDebuggerWorkingDirectory>$(TargetDir)</LocalDebuggerWorkingDirectory>
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LocalDebuggerWorkingDirectory>$(TargetDir)</LocalDebuggerWorkingDirectory>
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
</PropertyGroup>
</Project>
Binary file added JPEGView/res/JPEGView-Static.ico
Binary file not shown.
Binary file modified JPEGView/res/favicon_source.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added JPEGView/res/jpegPIA19400.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 2 additions & 1 deletion JPEGView/resource.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@
// don't worry about the formatting, the script that auto-generates the definition will take care of it

#define JPEGVIEW_VERSION "1, 2, 45, 0\0"
#define JPEGVIEW_VERSION_PRINT "1.2.45.0\0"
// title for main window and msgbox so it can be change via actions
#define JPEGVIEW_TITLE "JPEGView"
#define JPEGVIEW_TITLE "JPEGView-Static"


#define IDD_ABOUTBOX 100
Expand Down

0 comments on commit 3cb0a92

Please sign in to comment.