diff --git a/README.md b/README.md index 3ce10ad..29935a8 100644 --- a/README.md +++ b/README.md @@ -8,9 +8,9 @@ This is a fork of the [original TPFC](https://github.com/ThinkPad-Forum/TPFanCon To avoid errors, either install [tvicport](https://www.entechtaiwan.com/dev/port/index.shtm) manually or install the original version of TPFanControl found [here](https://sourceforge.net/projects/tp4xfancontrol/), and run the dual-fan version instead of the original version. -## Running at startup +## Running at startup (Not Recommended) -The easiest way to run TPFC at startup is: +You can choose to run TPFC at startup: - Right-click on fancontrol.exe and select copy - Press Windows-r or search for run in the start menu diff --git a/TPFCIcon/res/FanControl.rc b/TPFCIcon/res/FanControl.rc index 8f5e910..c8f77a6 100644 --- a/TPFCIcon/res/FanControl.rc +++ b/TPFCIcon/res/FanControl.rc @@ -147,11 +147,9 @@ BEGIN BLOCK "040704b0" BEGIN VALUE "Comments", "usage on your own risk" - VALUE "CompanyName", "troubadix" VALUE "FileDescription", "Fan Control Software" VALUE "FileVersion", "1, 0, 0, 60" VALUE "InternalName", "TPFanControl" - VALUE "LegalCopyright", "Copyright (C) 2009 by troubadix" VALUE "OriginalFilename", "FanControl.rc" VALUE "ProductName", "FanControl" VALUE "ProductVersion", "1, 0, 0, 60" diff --git a/TPFCIcon_noballons/res/FanControl.rc b/TPFCIcon_noballons/res/FanControl.rc index c4c3976..dfc5a62 100644 --- a/TPFCIcon_noballons/res/FanControl.rc +++ b/TPFCIcon_noballons/res/FanControl.rc @@ -147,11 +147,9 @@ BEGIN BLOCK "040704b0" BEGIN VALUE "Comments", "usage on your own risk" - VALUE "CompanyName", "troubadix" VALUE "FileDescription", "TPFanControl" VALUE "FileVersion", "1, 0, 0, 60" VALUE "InternalName", "Fan Control Software" - VALUE "LegalCopyright", "Copyright (C) 2009 by troubadix" VALUE "OriginalFilename", "FanControl.rc" VALUE "ProductName", "TPFanControl" VALUE "ProductVersion", "1, 0, 0, 60" diff --git a/fancontrol/fancontrol.cpp b/fancontrol/fancontrol.cpp index 6dd8019..4a53390 100644 --- a/fancontrol/fancontrol.cpp +++ b/fancontrol/fancontrol.cpp @@ -221,63 +221,63 @@ FANCONTROL::FANCONTROL(HINSTANCE hinstapp) */ } - // code Title4 http://www.staff.uni-marburg.de/~schmitzr/donate.html + // code Title4 for (int __i=0; __i < 111; __i++) { switch (__i) { - case 0 : this->Title4[0]=bias + 4; break; //h - case 1 : this->Title4[1]=bias + 16; break; //t - case 2 : this->Title4[2]=bias + 16; break; //t - case 3 : this->Title4[3]=bias + 12; break; //p - case 4 : this->Title4[4]=bias - 42; break; //: - case 5 : this->Title4[5]=bias - 8; break; /// - case 6 : this->Title4[6]=bias - 8; break; /// - case 7 : this->Title4[7]=bias + 19; break; //w - case 8 : this->Title4[8]=bias + 19; break; //w - case 9 : this->Title4[9]=bias + 19; break; //w - case 10 : this->Title4[10]=bias - 54; break; //. - case 11 : this->Title4[11]=bias + 15; break; //s - case 12 : this->Title4[12]=bias + 16; break; //t - case 13 : this->Title4[13]=bias - 3 ; break; //a - case 14 : this->Title4[14]=bias + 2; break; //f - case 15 : this->Title4[15]=bias + 2; break; //f - case 16 : this->Title4[16]=bias - 54; break; //. - case 17 : this->Title4[17]=bias + 17; break; //u - case 18 : this->Title4[18]=bias + 10; break; //n - case 19 : this->Title4[19]=bias + 5; break; //i - case 20 : this->Title4[20]=bias - 55; break; //- - case 21 : this->Title4[21]=bias + 9; break; //m - case 22 : this->Title4[22]=bias - 3 ; break; //a - case 23 : this->Title4[23]=bias + 14; break; //r - case 24 : this->Title4[24]=bias - 2; break; //b - case 25 : this->Title4[25]=bias + 17; break; //u - case 26 : this->Title4[26]=bias + 14; break; //r - case 27 : this->Title4[27]=bias + 3; break; //g - case 28 : this->Title4[28]=bias - 54; break; //. - case 29 : this->Title4[29]=bias ; break; //d - case 30 : this->Title4[30]=bias + 1; break; //e - case 31 : this->Title4[31]=bias - 8; break; /// - case 32 : this->Title4[32]=bias + 26; break; //~ - case 33 : this->Title4[33]=bias + 15; break; //s - case 34 : this->Title4[34]=bias - 1 ; break; //c - case 35 : this->Title4[35]=bias + 4; break; //h - case 36 : this->Title4[36]=bias + 9; break; //m - case 37 : this->Title4[37]=bias + 5; break; //i - case 38 : this->Title4[38]=bias + 16; break; //t - case 39 : this->Title4[39]=bias + 22; break; //z - case 40 : this->Title4[40]=bias + 14; break; //r - case 41 : this->Title4[41]=bias - 8; break; /// - case 42 : this->Title4[42]=bias ; break; //d - case 43 : this->Title4[43]=bias + 11; break; //o - case 44 : this->Title4[44]=bias + 10; break; //n - case 45 : this->Title4[45]=bias - 3; break; //a - case 46 : this->Title4[46]=bias + 16; break; //t - case 47 : this->Title4[47]=bias + 1; break; //e - case 48 : this->Title4[48]=bias - 54; break; //. - case 49 : this->Title4[49]=bias + 4; break; //h - case 50 : this->Title4[50]=bias + 16; break; //t - case 51 : this->Title4[51]=bias + 9; break; //m - case 52 : this->Title4[52]=bias + 8; break; //l + case 0 : this->Title4[0]=bias + 4; break; + case 1 : this->Title4[1]=bias + 16; break; + case 2 : this->Title4[2]=bias + 16; break; + case 3 : this->Title4[3]=bias + 12; break; + case 4 : this->Title4[4]=bias - 42; break; + case 5 : this->Title4[5]=bias - 8; break; + case 6 : this->Title4[6]=bias - 8; break; + case 7 : this->Title4[7]=bias + 19; break; + case 8 : this->Title4[8]=bias + 19; break; + case 9 : this->Title4[9]=bias + 19; break; + case 10 : this->Title4[10]=bias - 54; break; + case 11 : this->Title4[11]=bias + 15; break; + case 12 : this->Title4[12]=bias + 16; break; + case 13 : this->Title4[13]=bias - 3 ; break; + case 14 : this->Title4[14]=bias + 2; break; + case 15 : this->Title4[15]=bias + 2; break; + case 16 : this->Title4[16]=bias - 54; break; + case 17 : this->Title4[17]=bias + 17; break; + case 18 : this->Title4[18]=bias + 10; break; + case 19 : this->Title4[19]=bias + 5; break; + case 20 : this->Title4[20]=bias - 55; break; + case 21 : this->Title4[21]=bias + 9; break; + case 22 : this->Title4[22]=bias - 3 ; break; + case 23 : this->Title4[23]=bias + 14; break; + case 24 : this->Title4[24]=bias - 2; break; + case 25 : this->Title4[25]=bias + 17; break; + case 26 : this->Title4[26]=bias + 14; break; + case 27 : this->Title4[27]=bias + 3; break; + case 28 : this->Title4[28]=bias - 54; break; + case 29 : this->Title4[29]=bias ; break; + case 30 : this->Title4[30]=bias + 1; break; + case 31 : this->Title4[31]=bias - 8; break; + case 32 : this->Title4[32]=bias + 26; break; + case 33 : this->Title4[33]=bias + 15; break; + case 34 : this->Title4[34]=bias - 1 ; break; + case 35 : this->Title4[35]=bias + 4; break; + case 36 : this->Title4[36]=bias + 9; break; + case 37 : this->Title4[37]=bias + 5; break; + case 38 : this->Title4[38]=bias + 16; break; + case 39 : this->Title4[39]=bias + 22; break; + case 40 : this->Title4[40]=bias + 14; break; + case 41 : this->Title4[41]=bias - 8; break; + case 42 : this->Title4[42]=bias ; break; + case 43 : this->Title4[43]=bias + 11; break; + case 44 : this->Title4[44]=bias + 10; break; + case 45 : this->Title4[45]=bias - 3; break; + case 46 : this->Title4[46]=bias + 16; break; + case 47 : this->Title4[47]=bias + 1; break; + case 48 : this->Title4[48]=bias - 54; break; + case 49 : this->Title4[49]=bias + 4; break; + case 50 : this->Title4[50]=bias + 16; break; + case 51 : this->Title4[51]=bias + 9; break; + case 52 : this->Title4[52]=bias + 8; break; } } @@ -1205,10 +1205,6 @@ switch (msg) { NULL, NULL, SW_SHOW); break; - case 5060: // hide window - this->SetHdw("Thinklight", 2, 59, 16); - break; - case 5070: // show temp icon this->ShowTempIcon = 0; this->pTaskbarIcon = new TASKBARICON(this->hwndDialog, 10, "TPFanControl"); diff --git a/fancontrol/fancontrol.h b/fancontrol/fancontrol.h index 20d4914..cd48b8f 100644 --- a/fancontrol/fancontrol.h +++ b/fancontrol/fancontrol.h @@ -28,7 +28,7 @@ -#define FANCONTROLVERSION "0.63 multiHotKey" +#define FANCONTROLVERSION "2.01 Dual Fan" #define WM__DISMISSDLG WM_USER+5 #define WM__GETDATA WM_USER+6 diff --git a/fancontrol/res/app.ico b/fancontrol/res/app.ico index e5ab5b5..96ee81e 100644 Binary files a/fancontrol/res/app.ico and b/fancontrol/res/app.ico differ diff --git a/fancontrol/res/fancontrol.aps b/fancontrol/res/fancontrol.aps new file mode 100644 index 0000000..3815b25 Binary files /dev/null and b/fancontrol/res/fancontrol.aps differ diff --git a/fancontrol/res/fancontrol.rc b/fancontrol/res/fancontrol.rc index 59f4459..bb8aa66 100644 --- a/fancontrol/res/fancontrol.rc +++ b/fancontrol/res/fancontrol.rc @@ -1,6 +1,6 @@ // Microsoft Visual C++ generated resource script. // -#include "resource.h" +#include "resource." #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// @@ -13,13 +13,11 @@ #undef APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// -// Neutral (Standard) resources +// Neutral (Default) resources #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEUD) -#ifdef _WIN32 LANGUAGE LANG_NEUTRAL, SUBLANG_DEFAULT #pragma code_page(1252) -#endif //_WIN32 ///////////////////////////////////////////////////////////////////////////// // @@ -45,16 +43,16 @@ BEGIN LTEXT "(0-7)",IDC_STATIC,199,81,15,8 LTEXT "Speed",IDC_STATIC,160,40,21,8 EDITTEXT 8102,183,38,50,13,ES_AUTOHSCROLL | ES_READONLY - GROUPBOX "Temperatures",IDC_STATIC,7,7,85,126 - EDITTEXT 8101,15,18,70,102,ES_MULTILINE | ES_READONLY + GROUPBOX "Temperatures",IDC_STATIC,7,7,85,110 + EDITTEXT 8101,15,18,70,82,ES_MULTILINE | ES_READONLY GROUPBOX "Status",9199,97,106,467,27 EDITTEXT 8112,103,115,218,13,ES_AUTOHSCROLL | ES_READONLY LTEXT "Last",IDC_STATIC,324,116,15,8 EDITTEXT 8113,340,115,219,13,ES_AUTOHSCROLL | ES_READONLY GROUPBOX "Log (see TPFanControl.log)",9201,246,7,317,95 EDITTEXT 9200,254,18,302,78,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_READONLY | ES_WANTRETURN | WS_VSCROLL | WS_HSCROLL - CONTROL "all",7001,"Button",BS_AUTORADIOBUTTON | BS_RIGHT,21,121,20,10 - CONTROL "active",7002,"Button",BS_AUTORADIOBUTTON | BS_RIGHT,46,121,31,10 + CONTROL "all",7001,"Button",BS_AUTORADIOBUTTON | BS_RIGHT,20,103,20,10 + CONTROL "active",7002,"Button",BS_AUTORADIOBUTTON | BS_RIGHT,45,103,31,10 END 9001 DIALOGEX 0, 0, 50, 265 @@ -142,9 +140,8 @@ END // Menu // -5000 MENU +5000 MENU BEGIN - MENUITEM "Thinklight", 5060 MENUITEM "Bluetooth", 5040 MENUITEM SEPARATOR MENUITEM "Show Window", 5010 @@ -154,8 +151,6 @@ BEGIN MENUITEM SEPARATOR MENUITEM "BIOS Mode", 5001 MENUITEM "Smart Mode", 5002 -// MENUITEM "Smart Mode 1", 5003 -// MENUITEM "Smart Mode 2", 5004 MENUITEM "Manual Mode", 5005 MENUITEM "End Program", 5020 MENUITEM SEPARATOR @@ -171,17 +166,28 @@ END // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. 1 ICON "app.ico" + 21 ICON "ico21.ico" + 22 ICON "ico22.ico" + 23 ICON "ico23.ico" + 24 ICON "ico24.ico" + 25 ICON "ico25.ico" + 10 ICON "bw.ico" + 11 ICON "blue.ico" + 12 ICON "yellow.ico" + 13 ICON "orange.ico" + 14 ICON "red.ico" + ///////////////////////////////////////////////////////////////////////////// // // RT_MANIFEST @@ -189,6 +195,7 @@ END 1 RT_MANIFEST "xp-manifest.txt" + ///////////////////////////////////////////////////////////////////////////// // // Version @@ -212,11 +219,9 @@ BEGIN BLOCK "040704b0" BEGIN VALUE "Comments", "Usage on own risk!" - VALUE "CompanyName", "troubadix" VALUE "FileDescription", "Fan Control Software" VALUE "FileVersion", "1, 0, 0, 63" - VALUE "InternalName", "TPFanControl" - VALUE "LegalCopyright", "Copyright (C) 2013 by troubadix" + VALUE "InternalName", "TPFanControl 2" VALUE "LegalTrademarks", "TPFanControl" VALUE "OriginalFilename", "TPFanControl.exe" VALUE "PrivateBuild", "Fan Control Software" @@ -238,8 +243,12 @@ END // #ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO +GUIDELINES DESIGNINFO BEGIN + 9000, DIALOG + BEGIN + END + 9001, DIALOG BEGIN BOTTOMMARGIN, 264 @@ -259,18 +268,16 @@ BEGIN END #endif // APSTUDIO_INVOKED -#endif // Neutral (Standard) resources +#endif // Neutral (Default) resources ///////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////// -// Deutsch (Deutschland) resources +// German (Germany) resources #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEU) -#ifdef _WIN32 LANGUAGE LANG_GERMAN, SUBLANG_GERMAN #pragma code_page(1252) -#endif //_WIN32 #ifdef APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// @@ -295,18 +302,16 @@ END #endif // APSTUDIO_INVOKED -#endif // Deutsch (Deutschland) resources +#endif // German (Germany) resources ///////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////// -// Englisch (USA) resources +// English (United States) resources #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US #pragma code_page(1252) -#endif //_WIN32 ///////////////////////////////////////////////////////////////////////////// // @@ -316,12 +321,18 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. 1 ICON "app.ico" + 10 ICON "bw.ico" + 11 ICON "blue.ico" + 12 ICON "yellow.ico" + 13 ICON "orange.ico" + 14 ICON "red.ico" -#endif // Englisch (USA) resources + +#endif // English (United States) resources ///////////////////////////////////////////////////////////////////////////// diff --git a/fancontrol/res/resource b/fancontrol/res/resource index f2986b6..a7686bb 100644 --- a/fancontrol/res/resource +++ b/fancontrol/res/resource @@ -2,14 +2,22 @@ // Microsoft Visual C++ generated include file. // Used by fancontrol.rc // +#define IDI_ICON1 109 +#define IDC_RADIOBUTTON1 1002 +#define IDC_RADIOBUTTON2 1003 +#define IDC_EDIT1 1003 +#define IDC_BUTTON1 1009 +#define IDC_BUTTON2 1010 +#define IDC_STATIC -1 // Next default values for new objects // #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 101 +#define _APS_NO_MFC 1 +#define _APS_NEXT_RESOURCE_VALUE 110 #define _APS_NEXT_COMMAND_VALUE 40001 -#define _APS_NEXT_CONTROL_VALUE 1000 +#define _APS_NEXT_CONTROL_VALUE 1011 #define _APS_NEXT_SYMED_VALUE 101 #endif #endif diff --git a/fancontrol/res/signatur.txt b/fancontrol/res/signatur.txt index 94dfc15..69b7d86 100644 --- a/fancontrol/res/signatur.txt +++ b/fancontrol/res/signatur.txt @@ -4,7 +4,7 @@ NOTE: These instructions assume you have visual studio installed and are using a - In the command shell, execute the following commands: - makecert -r -pe -n "CN=TPFanControl by Troubadix" -ss PrivateCertStore tpfccert.cer + makecert -r -pe -n "CN=TPFanControl 2" -ss PrivateCertStore tpfccert.cer signtool signwizard @@ -12,4 +12,4 @@ oder: - In the command shell, browse to the location of your exe -SignTool sign /v /s PrivateCertStore /n "TPFanControl by Troubadix" /t http://timestamp.verisign.com/scripts/timestamp.dll fancontrol.exe +SignTool sign /v /s PrivateCertStore /n "TPFanControl 2" /t http://timestamp.verisign.com/scripts/timestamp.dll fancontrol.exe