diff options
Diffstat (limited to 'plugins/PluginUpdater/src')
| -rw-r--r-- | plugins/PluginUpdater/src/Common.h | 5 | ||||
| -rw-r--r-- | plugins/PluginUpdater/src/Events.cpp | 4 | ||||
| -rw-r--r-- | plugins/PluginUpdater/src/Notifications.cpp | 5 | ||||
| -rw-r--r-- | plugins/PluginUpdater/src/Options.cpp | 4 | ||||
| -rw-r--r-- | plugins/PluginUpdater/src/Utils.cpp | 1 | ||||
| -rw-r--r-- | plugins/PluginUpdater/src/resource.h | 1 |
6 files changed, 8 insertions, 12 deletions
diff --git a/plugins/PluginUpdater/src/Common.h b/plugins/PluginUpdater/src/Common.h index d61a75ac2c..9cb0a418be 100644 --- a/plugins/PluginUpdater/src/Common.h +++ b/plugins/PluginUpdater/src/Common.h @@ -87,17 +87,16 @@ struct PopupDataText struct PlugOptions
{
- BYTE bReminder, bUpdateOnStartup, bUpdateOnPeriod, bOnlyOnceADay, bUpdateIcons;
+ BYTE bUpdateOnStartup, bUpdateOnPeriod, bOnlyOnceADay, bUpdateIcons;
BOOL bSilent, bDlgDld;
BYTE bPeriodMeasure;
INT Period;
};
-#define DEFAULT_REMINDER 1
#define DEFAULT_UPDATEICONS 0
#define DEFAULT_UPDATEONSTARTUP 1
-#define DEFAULT_ONLYONCEADAY 0
+#define DEFAULT_ONLYONCEADAY 1
#define DEFAULT_UPDATEONPERIOD 0
#define DEFAULT_PERIOD 1
#define DEFAULT_PERIODMEASURE 1
diff --git a/plugins/PluginUpdater/src/Events.cpp b/plugins/PluginUpdater/src/Events.cpp index 295b9288cb..23d6fb26ca 100644 --- a/plugins/PluginUpdater/src/Events.cpp +++ b/plugins/PluginUpdater/src/Events.cpp @@ -25,9 +25,9 @@ int ModulesLoaded(WPARAM wParam, LPARAM lParam) {
opts.bSilent = true;
- int iRestartCount = DBGetContactSettingByte(NULL, MODULEA, "RestartCount", 2);
+ int iRestartCount = DBGetContactSettingByte(NULL, MODNAME, "RestartCount", 2);
if (iRestartCount > 0)
- DBWriteContactSettingByte(NULL, MODULEA, "RestartCount", iRestartCount-1);
+ DBWriteContactSettingByte(NULL, MODNAME, "RestartCount", iRestartCount-1);
else
EmptyFolder(0, TRUE); // silently
diff --git a/plugins/PluginUpdater/src/Notifications.cpp b/plugins/PluginUpdater/src/Notifications.cpp index 22086497b5..59a2b57735 100644 --- a/plugins/PluginUpdater/src/Notifications.cpp +++ b/plugins/PluginUpdater/src/Notifications.cpp @@ -285,7 +285,7 @@ static void ApplyUpdates(void* param) DeleteFile(p.File.tszDiskPath);
}
- DBWriteContactSettingByte(NULL, MODULEA, "RestartCount", 2);
+ DBWriteContactSettingByte(NULL, MODNAME, "RestartCount", 2);
DestroyWindow(hDlg);
CallFunctionAsync(RestartMe, 0);
}
@@ -400,6 +400,9 @@ INT_PTR CALLBACK DlgUpdate(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam if (HIWORD( wParam ) == BN_CLICKED) {
switch(LOWORD(wParam)) {
case IDOK:
+ EnableWindow( GetDlgItem(hDlg, IDOK), FALSE);
+ EnableWindow( GetDlgItem(hDlg, IDC_SELALL), FALSE);
+ EnableWindow( GetDlgItem(hDlg, IDC_SELNONE), FALSE);
mir_forkthread(ApplyUpdates, hDlg);
return TRUE;
diff --git a/plugins/PluginUpdater/src/Options.cpp b/plugins/PluginUpdater/src/Options.cpp index f26a351977..011692e5ae 100644 --- a/plugins/PluginUpdater/src/Options.cpp +++ b/plugins/PluginUpdater/src/Options.cpp @@ -55,7 +55,6 @@ INT_PTR CALLBACK UpdateNotifyOptsProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPA ComboBox_InsertString(GetDlgItem(hwndDlg, IDC_PERIODMEASURE), 1, TranslateT("days"));
ComboBox_SetCurSel(GetDlgItem(hwndDlg, IDC_PERIODMEASURE), opts.bPeriodMeasure);
- CheckDlgButton(hwndDlg, IDC_REMINDER, opts.bReminder);
CheckDlgButton(hwndDlg, IDC_UPDATEICONS, opts.bUpdateIcons);
return TRUE;
@@ -86,7 +85,6 @@ INT_PTR CALLBACK UpdateNotifyOptsProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPA break;
case IDC_UPDATEICONS:
- case IDC_REMINDER:
SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);
break;
@@ -127,8 +125,6 @@ INT_PTR CALLBACK UpdateNotifyOptsProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPA DBWriteContactSettingByte(NULL, MODNAME, "UpdateOnPeriod", opts.bUpdateOnPeriod);
DBWriteContactSettingByte(NULL, MODNAME, "PeriodMeasure", opts.bPeriodMeasure);
DBWriteContactSettingDword(NULL, MODNAME, "Period", opts.Period);
- opts.bReminder = IsDlgButtonChecked(hwndDlg, IDC_REMINDER);
- DBWriteContactSettingByte(NULL, MODNAME, "Reminder", opts.bReminder);
opts.bUpdateIcons = IsDlgButtonChecked(hwndDlg, IDC_UPDATEICONS);
DBWriteContactSettingByte(NULL, MODNAME, "UpdateIcons", opts.bUpdateIcons);
}
diff --git a/plugins/PluginUpdater/src/Utils.cpp b/plugins/PluginUpdater/src/Utils.cpp index c3863552dc..a4ad93525b 100644 --- a/plugins/PluginUpdater/src/Utils.cpp +++ b/plugins/PluginUpdater/src/Utils.cpp @@ -119,7 +119,6 @@ VOID LoadOptions() opts.bUpdateOnPeriod = DBGetContactSettingByte(NULL, MODNAME, "UpdateOnPeriod", DEFAULT_UPDATEONPERIOD);
opts.Period = DBGetContactSettingDword(NULL, MODNAME, "Period", DEFAULT_PERIOD);
opts.bPeriodMeasure = DBGetContactSettingByte(NULL, MODNAME, "PeriodMeasure", DEFAULT_PERIODMEASURE);
- opts.bReminder = DBGetContactSettingByte(NULL, MODNAME, "Reminder", DEFAULT_REMINDER);
opts.bUpdateIcons = DBGetContactSettingByte(NULL, MODNAME, "UpdateIcons", DEFAULT_UPDATEICONS);
}
diff --git a/plugins/PluginUpdater/src/resource.h b/plugins/PluginUpdater/src/resource.h index c5d64e2b7f..aa0c81abbf 100644 --- a/plugins/PluginUpdater/src/resource.h +++ b/plugins/PluginUpdater/src/resource.h @@ -31,7 +31,6 @@ #define IDC_TIMEOUT_VALUE 1017
#define IDC_USEOWNCOLORS 1018
#define IDC_ENABLEUPDATES 1019
-#define IDC_REMINDER 1020
#define IDC_LIST_UPDATES 1021
#define IDC_MESSAGE 1022
#define IDC_DESCR 1023
|