Skip to content

Commit

Permalink
Add updater icon
Browse files Browse the repository at this point in the history
  • Loading branch information
equation314 committed Feb 20, 2017
1 parent d4cf5ff commit 3bfd01c
Show file tree
Hide file tree
Showing 9 changed files with 56 additions and 5 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ log.*

# Test files
[Tt]est/
private

# *nix related
# Common convention for backup or temporary files
Expand Down
File renamed without changes.
1 change: 1 addition & 0 deletions resources/image.qrc
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@
<file>folder.png</file>
<file>logo.png</file>
<file>logo2.png</file>
<file>update.ico</file>
</qresource>
</RCC>
Binary file added resources/update.ico
Binary file not shown.
36 changes: 36 additions & 0 deletions resources/updater_icon.rc
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
IDI_ICON1 ICON DISCARDABLE "update.ico"
#if defined(UNDER_CE)
#include <winbase.h>
#else
#include <winver.h>
#endif
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,1,0,0
PRODUCTVERSION 1,1,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS VS_FF_DEBUG
#else
FILEFLAGS 0x0L
#endif
FILEOS VOS__WINDOWS32
FILETYPE VFT_DLL
FILESUBTYPE 0x0L
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "080404b0"
BEGIN
VALUE "CompanyName", "����һ�� ��Խ��"
VALUE "FileDescription", "CCR Plus ���³���"
VALUE "ProductName", "CCR Plus"
VALUE "OriginalFilename", "upgrader.exe"
VALUE "ProductVersion", "1.1.0"
VALUE "LegalCopyright", "Copyright (C) 2017 Yuekai Jia. All Rights Reserved."
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x804, 1200
END
END
2 changes: 1 addition & 1 deletion src/CCR-Plus.pro
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,6 @@ FORMS += configure/configuredialog.ui \
RESOURCES = ../resources/image.qrc \
../resources/trans.qrc

RC_FILE = ../resources/icon.rc
RC_FILE = ../resources/CCR_icon.rc

win32: LIBS += -lpsapi
8 changes: 7 additions & 1 deletion src/updater/checkupdatesdialog.ui
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@
<property name="windowTitle">
<string>检查更新</string>
</property>
<property name="windowIcon">
<iconset resource="../../resources/image.qrc">
<normaloff>:/image/update.ico</normaloff>:/image/update.ico</iconset>
</property>
<property name="styleSheet">
<string notr="true">QWidget
{
Expand Down Expand Up @@ -127,7 +131,9 @@ QMainWindow
</item>
</layout>
</widget>
<resources/>
<resources>
<include location="../../resources/image.qrc"/>
</resources>
<connections>
<connection>
<sender>buttonBox</sender>
Expand Down
8 changes: 7 additions & 1 deletion src/updater/downloaddialog.ui
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@
<property name="windowTitle">
<string>下载更新</string>
</property>
<property name="windowIcon">
<iconset resource="../../resources/image.qrc">
<normaloff>:/image/update.ico</normaloff>:/image/update.ico</iconset>
</property>
<property name="styleSheet">
<string notr="true">QWidget
{
Expand Down Expand Up @@ -68,7 +72,9 @@ QMainWindow
</item>
</layout>
</widget>
<resources/>
<resources>
<include location="../../resources/image.qrc"/>
</resources>
<connections>
<connection>
<sender>buttonBox</sender>
Expand Down
5 changes: 3 additions & 2 deletions src/updater/updater.pro
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ HEADERS += updaterconst.h \
FORMS += checkupdatesdialog.ui \
downloaddialog.ui

RESOURCES = ../../resources/trans.qrc
RESOURCES = ../../resources/image.qrc \
../../resources/trans.qrc

#RC_FILE = ../resources/icon.rc
RC_FILE = ../../resources/updater_icon.rc

0 comments on commit 3bfd01c

Please sign in to comment.