Index: src/ch/StatusDlg.cpp
===================================================================
diff -u -r814b694086d5dc450efb6a5e5c6902145ddc07fd -r428dbab8a736f60f57c2217cb23b0dcf21c5a923
--- src/ch/StatusDlg.cpp (.../StatusDlg.cpp) (revision 814b694086d5dc450efb6a5e5c6902145ddc07fd)
+++ src/ch/StatusDlg.cpp (.../StatusDlg.cpp) (revision 428dbab8a736f60f57c2217cb23b0dcf21c5a923)
@@ -72,14 +72,9 @@
ON_BN_CLICKED(IDC_PAUSE_BUTTON, OnPauseButton)
ON_BN_CLICKED(IDC_CANCEL_BUTTON, OnCancelButton)
ON_BN_CLICKED(IDC_SET_PRIORITY_BUTTON, OnSetPriorityButton)
- ON_BN_CLICKED(IDC_TASK_ADVANCED_BUTTON, OnTaskAdvancedOptions)
ON_BN_CLICKED(IDC_SET_BUFFERSIZE_BUTTON, OnSetBuffersizeButton)
- ON_BN_CLICKED(IDC_START_ALL_BUTTON, OnStartAllButton)
ON_BN_CLICKED(IDC_RESTART_BUTTON, OnRestartButton)
ON_BN_CLICKED(IDC_DELETE_BUTTON, OnDeleteButton)
- ON_BN_CLICKED(IDC_PAUSE_ALL_BUTTON, OnPauseAllButton)
- ON_BN_CLICKED(IDC_RESTART_ALL_BUTTON, OnRestartAllButton)
- ON_BN_CLICKED(IDC_CANCEL_ALL_BUTTON, OnCancelAllButton)
ON_BN_CLICKED(IDC_REMOVE_FINISHED_BUTTON, OnRemoveFinishedButton)
ON_NOTIFY(LVN_KEYDOWN, IDC_STATUS_LIST, OnKeydownStatusList)
ON_NOTIFY(LVN_CHANGEDSELECTION, IDC_STATUS_LIST, OnSelectionChanged)
@@ -214,7 +209,6 @@
// enable/disable controls
GetDlgItem(IDC_SET_BUFFERSIZE_BUTTON)->EnableWindow(bEnable);
GetDlgItem(IDC_SET_PRIORITY_BUTTON)->EnableWindow(bEnable);
- GetDlgItem(IDC_TASK_ADVANCED_BUTTON)->EnableWindow(bEnable);
if (!bEnable)
{
@@ -359,28 +353,6 @@
}
}
-void CStatusDlg::OnTaskAdvancedOptions()
-{
- CMenu menu;
- HMENU hMenu = GetResManager().LoadMenu(MAKEINTRESOURCE(IDR_TASK_ADVANCED_MENU));
- if(!menu.Attach(hMenu))
- {
- DestroyMenu(hMenu);
- return;
- }
-
- CMenu* pPopup = menu.GetSubMenu(0);
- ASSERT(pPopup != nullptr);
- if(pPopup)
- {
- // set point in which to set menu
- CRect rect;
- GetDlgItem(IDC_TASK_ADVANCED_BUTTON)->GetWindowRect(&rect);
-
- pPopup->TrackPopupMenu(TPM_LEFTALIGN | TPM_RIGHTBUTTON, rect.right + 1, rect.top, this);
- }
-}
-
BOOL CStatusDlg::OnCommand(WPARAM wParam, LPARAM lParam)
{
if (HIWORD(wParam) == 0)
@@ -425,10 +397,6 @@
break;
}
}
- else if(LOWORD(wParam) == ID_POPUP_RESET_APPLY_TO_ALL)
- {
- OnResetUserFeedback();
- }
}
return ictranslate::CLanguageDialog::OnCommand(wParam, lParam);
}
@@ -722,19 +690,19 @@
break;
case ID_TASK_MENU_PAUSE_ALL:
- m_pTasks->TasksPauseProcessing();
+ OnPauseAllButton();
break;
case ID_TASK_MENU_RESUME_ALL:
- m_pTasks->TasksResumeProcessing();
+ OnStartAllButton();
break;
case ID_TASK_MENU_RESTART_ALL:
- m_pTasks->TasksRestartProcessing();
+ OnRestartAllButton();
break;
case ID_TASK_MENU_CANCEL_ALL:
- m_pTasks->TasksCancelProcessing();
+ OnCancelAllButton();
break;
case ID_TASK_MENU_REMOVE_INACTIVE:
- m_pTasks->RemoveAllFinished();
+ OnRemoveFinishedButton();
break;
}
}
@@ -877,6 +845,7 @@
// left part of dialog (task list)
AddResizableControl(IDC_TASKLIST_LABEL_STATIC, 0, 0, 0.5, 0.0);
+ AddResizableControl(IDC_REMOVE_FINISHED_BUTTON, 0.5, 0.0, 0.0, 0);
AddResizableControl(IDC_STATUS_LIST, 0, 0, 0.5, 1.0);
// left part of dialog (buttons under the task list)
@@ -885,12 +854,6 @@
AddResizableControl(IDC_RESUME_BUTTON, 0, 1.0, 0, 0);
AddResizableControl(IDC_CANCEL_BUTTON, 0, 1.0, 0, 0);
AddResizableControl(IDC_DELETE_BUTTON, 0, 1.0, 0, 0);
- AddResizableControl(IDC_PAUSE_ALL_BUTTON, 0, 1.0, 0, 0);
- AddResizableControl(IDC_START_ALL_BUTTON, 0, 1.0, 0, 0);
- AddResizableControl(IDC_CANCEL_ALL_BUTTON, 0, 1.0, 0, 0);
- AddResizableControl(IDC_REMOVE_FINISHED_BUTTON, 0, 1.0, 0, 0);
- AddResizableControl(IDC_RESTART_ALL_BUTTON, 0, 1.0, 0, 0);
- AddResizableControl(IDC_TASK_ADVANCED_BUTTON, 0, 1.0, 0, 0);
// left part of dialog (global stats)
AddResizableControl(IDC_GLOBAL_GROUP_STATIC, 0.0, 1.0, 0.5, 0);
Index: src/ch/StatusDlg.h
===================================================================
diff -u -r814b694086d5dc450efb6a5e5c6902145ddc07fd -r428dbab8a736f60f57c2217cb23b0dcf21c5a923
--- src/ch/StatusDlg.h (.../StatusDlg.h) (revision 814b694086d5dc450efb6a5e5c6902145ddc07fd)
+++ src/ch/StatusDlg.h (.../StatusDlg.h) (revision 428dbab8a736f60f57c2217cb23b0dcf21c5a923)
@@ -91,7 +91,6 @@
afx_msg void OnPauseButton();
afx_msg void OnCancelButton();
afx_msg void OnSetPriorityButton();
- afx_msg void OnTaskAdvancedOptions();
afx_msg void OnSetBuffersizeButton();
afx_msg void OnStartAllButton();
afx_msg void OnRestartButton();
Index: src/ch/ch.rc
===================================================================
diff -u -r814b694086d5dc450efb6a5e5c6902145ddc07fd -r428dbab8a736f60f57c2217cb23b0dcf21c5a923
--- src/ch/ch.rc (.../ch.rc) (revision 814b694086d5dc450efb6a5e5c6902145ddc07fd)
+++ src/ch/ch.rc (.../ch.rc) (revision 428dbab8a736f60f57c2217cb23b0dcf21c5a923)
@@ -127,25 +127,20 @@
CAPTION "Status"
FONT 8, "Tahoma", 0, 0, 0x1
BEGIN
- CONTROL "List1",IDC_STATUS_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,19,223,171
- PUSHBUTTON "&Pause",IDC_PAUSE_BUTTON,7,193,44,14
- PUSHBUTTON "&Restart",IDC_RESTART_BUTTON,97,193,44,14
- PUSHBUTTON "&Cancel",IDC_CANCEL_BUTTON,142,193,44,14
- PUSHBUTTON "&Remove",IDC_DELETE_BUTTON,187,193,44,14
- PUSHBUTTON "Pause/all",IDC_PAUSE_ALL_BUTTON,7,208,71,14
- PUSHBUTTON "Resume/all",IDC_START_ALL_BUTTON,79,208,71,14
- PUSHBUTTON "Cancel/all",IDC_CANCEL_ALL_BUTTON,7,223,71,14
- PUSHBUTTON "Remove/all",IDC_REMOVE_FINISHED_BUTTON,79,223,71,14
- PUSHBUTTON "Restart/all",IDC_RESTART_ALL_BUTTON,151,223,79,14
- PUSHBUTTON "Advanced >",IDC_TASK_ADVANCED_BUTTON,151,208,79,14
+ CONTROL "",IDC_STATUS_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,21,223,196
+ PUSHBUTTON "&Pause",IDC_PAUSE_BUTTON,7,222,44,14
+ PUSHBUTTON "&Restart",IDC_RESTART_BUTTON,97,222,44,14
+ PUSHBUTTON "&Cancel",IDC_CANCEL_BUTTON,142,222,44,14
+ PUSHBUTTON "&Remove",IDC_DELETE_BUTTON,187,222,44,14
+ PUSHBUTTON "Remove inactive",IDC_REMOVE_FINISHED_BUTTON,159,7,71,14
PUSHBUTTON "",IDC_STICK_BUTTON,484,295,7,7,BS_CENTER | BS_VCENTER | BS_FLAT
PUSHBUTTON "...",IDC_SET_BUFFERSIZE_BUTTON,463,71,13,14
PUSHBUTTON ">",IDC_SET_PRIORITY_BUTTON,463,85,13,14
PUSHBUTTON "View log",IDC_SHOW_LOG_BUTTON,431,18,45,12
- LTEXT "List of tasks:",IDC_TASKLIST_LABEL_STATIC,7,7,223,8
- CONTROL "Progress1",IDC_GLOBAL_PROGRESS,"msctls_progress32",0x0,71,282,153,7
+ LTEXT "List of tasks:",IDC_TASKLIST_LABEL_STATIC,7,10,145,8
+ CONTROL "",IDC_GLOBAL_PROGRESS,"msctls_progress32",0x0,71,282,153,7
LTEXT "Progress:",IDC_GLOBALPROGRESS_LABEL_STATIC,13,281,54,8
- CONTROL "Progress2",IDC_TASKSIZE_PROGRESS,"msctls_progress32",0x0,311,282,165,6
+ CONTROL "",IDC_TASKSIZE_PROGRESS,"msctls_progress32",0x0,311,282,165,6
LTEXT "Task size:",IDC_TASKSIZE_LABEL_STATIC,247,280,62,8
LTEXT "Destination:",IDC_DESTINATIONOBJECT_LABEL_STATIC,247,61,40,8
LTEXT "Source:",IDC_SOURCEOBJECT_LABEL_STATIC,247,48,62,8
@@ -157,7 +152,7 @@
LTEXT "Transfer:",IDC_GLOBALTRANSFER_LABEL_STATIC,13,268,54,8
LTEXT "Processed:",IDC_GLOBALPROCESSED_LABEL_STATIC,13,255,54,8
LTEXT "Time:",IDC_TASKTIME_LABEL_STATIC,247,245,62,8
- PUSHBUTTON "&Resume",IDC_RESUME_BUTTON,52,193,44,14
+ PUSHBUTTON "&Resume",IDC_RESUME_BUTTON,52,222,44,14
LTEXT "Task ID:",IDC_TASKID_LABEL_STATIC,247,21,62,8
CONTROL "",IDC_TASKID_STATIC,"STATICEX",0x4,311,18,118,12,WS_EX_STATICEDGE
CONTROL "",IDC_OPERATION_STATIC,"STATICEX",0x4,311,32,165,12,WS_EX_STATICEDGE
@@ -984,14 +979,6 @@
END
END
-IDR_TASK_ADVANCED_MENU MENU
-BEGIN
- POPUP "_POPUP_"
- BEGIN
- MENUITEM "Reset 'apply to all' status", ID_POPUP_RESET_APPLY_TO_ALL
- END
-END
-
IDR_ALREADYEXISTS_MASS_REPLACE_MENU MENU
BEGIN
POPUP "POPUP"
Index: src/ch/resource.h
===================================================================
diff -u -r814b694086d5dc450efb6a5e5c6902145ddc07fd -r428dbab8a736f60f57c2217cb23b0dcf21c5a923
--- src/ch/resource.h (.../resource.h) (revision 814b694086d5dc450efb6a5e5c6902145ddc07fd)
+++ src/ch/resource.h (.../resource.h) (revision 428dbab8a736f60f57c2217cb23b0dcf21c5a923)
@@ -53,7 +53,6 @@
#define IDD_UPDATER_DIALOG 213
#define IDD_FEEDBACK_REPLACE_DIALOG 214
#define IDD_MSGBOX_DIALOG 215
-#define IDR_TASK_ADVANCED_MENU 216
#define IDR_ALREADYEXISTS_MASS_REPLACE_MENU 225
#define IDR_ALREADYEXISTS_MASS_SKIP_MENU 226
#define IDR_ALREADYEXISTS_MASS_RENAME_MENU 228
@@ -92,7 +91,6 @@
#define IDC_IGNOREFOLDERS_CHECK 1015
#define IDC_SET_PRIORITY_BUTTON 1016
#define IDC_ONLYSTRUCTURE_CHECK 1017
-#define IDC_TASK_ADVANCED_BUTTON 1017
#define IDC_PAUSE_BUTTON 1018
#define IDC_STANDARD_CHECK 1019
#define IDC_DONT_CREATE_EMPTY_DIRECTORIES_CHECK 1019
@@ -131,12 +129,8 @@
#define IDC_SUBTASKTIME_STATIC 1039
#define IDC_ASSOCIATEDFILES__STATIC 1040
#define IDC_TASKID_STATIC 1040
-#define IDC_START_ALL_BUTTON 1041
#define IDC_RESTART_BUTTON 1042
#define IDC_DELETE_BUTTON 1043
-#define IDC_PAUSE_ALL_BUTTON 1044
-#define IDC_RESTART_ALL_BUTTON 1045
-#define IDC_CANCEL_ALL_BUTTON 1046
#define IDC_REMOVE_FINISHED_BUTTON 1047
#define IDC_PROPERTIES_LIST 1048
#define IDC_SUBTASKTRANSFER_STATIC 1048
@@ -844,7 +838,6 @@
#define ID_POPUP_TEMP 32815
#define ID_POPUP_CHECKFORUPDATES 32816
#define ID_POPUP_TOOLS 32817
-#define ID_POPUP_RESET_APPLY_TO_ALL 32818
#define ID_FEEDBACK_REPLACE_ALLEXISTINGFILES 32819
#define ID_FEEDBACK_REPLACE_FILESWITHDIFFERENTDATESORSIZES 32820
#define ID_FEEDBACK_REPLACE_OLDERFILESWITHNEWERVERSIONS 32821