From 5f2ee4fa8941049dbdc8277ee0f7b4b131df291c Mon Sep 17 00:00:00 2001 From: greedysky Date: Sun, 30 Jun 2019 10:42:35 +0800 Subject: [PATCH] Fixed app builder[548665] --- TTKScript/ttk.iss | 6 +- TTKThirdParty/TTKExtras/qrencode/qrencode.h | 78 --------------------- 2 files changed, 3 insertions(+), 81 deletions(-) diff --git a/TTKScript/ttk.iss b/TTKScript/ttk.iss index 0fccb2728..dc407d365 100644 --- a/TTKScript/ttk.iss +++ b/TTKScript/ttk.iss @@ -9,7 +9,7 @@ #define OutputPath "D:\Qt" #define SourceMain "D:\Qt\TTKMusicPlayer\TTKMusicPlayer.exe" #define SourceFolder "D:\Qt\TTKMusicPlayer\*" -#define SetupIconFilePath "resource\lb_app_logo.ico" +#define SetupIconFilePath "resource\lb_player_logo.ico" #define ResourcesPath "resource\*" [setup] @@ -380,7 +380,7 @@ procedure InitializeWizard(); ExtractTemporaryFile('btn_custom.png'); ExtractTemporaryFile('label_shellLink.png'); ExtractTemporaryFile('label_taskbarpin.png'); - ExtractTemporaryFile('lb_app_logo.ico'); + ExtractTemporaryFile('lb_player_logo.ico'); // 关闭按钮样式 CancelBtn:=BtnCreate(WizardForm.Handle,627,8,12,12,ExpandConstant('{tmp}\btn_close.png'),1,False) @@ -525,7 +525,7 @@ procedure CurPageChanged(CurPageID: Integer); DeleteFile('{commondesktop}\{#MyAppNameZh}.lnk'); end CreateShellLink(ExpandConstant('{commondesktop}\{#MyAppNameZh}.lnk'), - '快捷方式',ExpandConstant('{app}\{#MyAppExeName}'),ExpandConstant(''),ExpandConstant('{app}'),ExpandConstant('{tmp}\lb_app_logo.ico'),0,SW_SHOWNORMAL); + '快捷方式',ExpandConstant('{app}\{#MyAppExeName}'),ExpandConstant(''),ExpandConstant('{app}'),ExpandConstant('{tmp}\lb_player_logo.ico'),0,SW_SHOWNORMAL); end // 固定到任务栏 diff --git a/TTKThirdParty/TTKExtras/qrencode/qrencode.h b/TTKThirdParty/TTKExtras/qrencode/qrencode.h index e554bb924..c937d1c7d 100644 --- a/TTKThirdParty/TTKExtras/qrencode/qrencode.h +++ b/TTKThirdParty/TTKExtras/qrencode/qrencode.h @@ -18,84 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -/** \mainpage - * Libqrencode is a library for encoding data in a QR Code symbol, a kind of 2D - * symbology. - * - * \section encoding Encoding - * - * There are two methods to encode data: encoding a string/data or - * encoding a structured data. - * - * \subsection encoding-string Encoding a string/data - * You can encode a string by calling QRcode_encodeString(). - * The given string is parsed automatically and encoded. If you want to encode - * data that can be represented as a C string style (NUL terminated), you can - * simply use this way. - * - * If the input data contains Kanji (Shift-JIS) characters and you want to - * encode them as Kanji in QR Code, you should give QR_MODE_KANJI as a hint. - * Otherwise, all of non-alphanumeric characters are encoded as 8 bit data. - * If you want to encode a whole string in 8 bit mode, you can use - * QRcode_encodeString8bit() instead. - * - * Please note that a C string can not contain NUL characters. If your data - * contains NUL, you must use QRcode_encodeData(). - * - * \subsection encoding-input Encoding a structured data - * You can construct a structured input data manually. If the structure of the - * input data is known, you can use this way. - * At first, create a ::QRinput object by QRinput_new(). Then add input data - * to the QRinput object by QRinput_append(). Finally call QRcode_encodeInput() - * to encode the QRinput data. - * You can reuse the QRinput data again to encode it in other symbols with - * different parameters. - * - * \section result Result - * The encoded symbol is resulted as a ::QRcode object. It will contain - * its version number, width of the symbol and an array represents the symbol. - * See ::QRcode for the details. You can free the object by QRcode_free(). - * - * Please note that the version of the result may be larger than specified. - * In such cases, the input data would be too large to be encoded in a - * symbol of the specified version. - * - * \section structured Structured append - * Libqrencode can generate "Structured-appended" symbols that enables to split - * a large data set into mulitple QR codes. A QR code reader concatenates - * multiple QR code symbols into a string. - * Just like QRcode_encodeString(), you can use QRcode_encodeStringStructured() - * to generate structured-appended symbols. This functions returns an instance - * of ::QRcode_List. The returned list is a singly-linked list of QRcode: you - * can retrieve each QR code in this way: - * - * \code - * QRcode_List *qrcodes; - * QRcode_List *entry; - * QRcode *qrcode; - * - * qrcodes = QRcode_encodeStringStructured(...); - * entry = qrcodes; - * while(entry != NULL) { - * qrcode = entry->code; - * // do something - * entry = entry->next; - * } - * QRcode_List_free(entry); - * \endcode - * - * Instead of using auto-parsing functions, you can construct your own - * structured input. At first, instantiate an object of ::QRinput_Struct - * by calling QRinput_Struct_new(). This object can hold multiple ::QRinput, - * and one QR code is generated for a ::QRinput. - * QRinput_Struct_appendInput() appends a ::QRinput to a ::QRinput_Struct - * object. In order to generate structured-appended symbols, it is required to - * embed headers to each symbol. You can use - * QRinput_Struct_insertStructuredAppendHeaders() to insert appropriate - * headers to each symbol. You should call this function just once before - * encoding symbols. - */ - #ifndef __QRENCODE_H__ #define __QRENCODE_H__