unify area variable style

Author: needle-wang

handlers.py

@@ -196,121 +196,121 @@ def _collect_opts(self):
 
     _other_opts = [
       self._get_text_only_ckbtn("--check-internet",
-                                m._page1_general_check_internet_ckbtn),
+                                m._general_area_check_internet_ckbtn),
       self._get_text_only_ckbtn("--fresh-queries",
-                                m._page1_general_fresh_queries_ckbtn),
+                                m._general_area_fresh_queries_ckbtn),
       self._get_text_only_ckbtn("--forms",
-                                m._page1_general_forms_ckbtn),
+                                m._general_area_forms_ckbtn),
       self._get_text_only_ckbtn("--parse-errors",
-                                m._page1_general_parse_errors_ckbtn),
+                                m._general_area_parse_errors_ckbtn),
       self._get_text_only_ckbtn("--cleanup",
-                                m._page1_misc_cleanup_ckbtn),
+                                m._misc_area_cleanup_ckbtn),
       self._get_text_from_entry("--base64=",
-                                m._page1_general_base64_ckbtn,
-                                m._page1_general_base64_entry),
+                                m._general_area_base64_ckbtn,
+                                m._general_area_base64_entry),
       self._get_text_only_ckbtn("--base64-safe",
-                                m._page1_general_base64_safe_ckbtn),
+                                m._general_area_base64_safe_ckbtn),
       self._get_text_from_entry("--table-prefix=",
-                                m._page1_general_table_prefix_ckbtn,
-                                m._page1_general_table_prefix_entry),
+                                m._general_area_table_prefix_ckbtn,
+                                m._general_area_table_prefix_entry),
       self._get_text_from_entry("--binary-fields=",
-                                m._page1_general_binary_fields_ckbtn,
-                                m._page1_general_binary_fields_entry),
+                                m._general_area_binary_fields_ckbtn,
+                                m._general_area_binary_fields_entry),
       self._get_text_from_entry("--preprocess=",
-                                m._page1_general_preprocess_ckbtn,
-                                m._page1_general_preprocess_entry),
+                                m._general_area_preprocess_ckbtn,
+                                m._general_area_preprocess_entry),
       self._get_text_from_entry("--postprocess=",
-                                m._page1_general_postprocess_ckbtn,
-                                m._page1_general_postprocess_entry),
+                                m._general_area_postprocess_ckbtn,
+                                m._general_area_postprocess_entry),
       self._get_text_from_entry("--charset=",
-                                m._page1_general_charset_ckbtn,
-                                m._page1_general_charset_entry),
+                                m._general_area_charset_ckbtn,
+                                m._general_area_charset_entry),
       self._get_text_from_entry("--encoding=",
-                                m._page1_general_encoding_ckbtn,
-                                m._page1_general_encoding_entry),
+                                m._general_area_encoding_ckbtn,
+                                m._general_area_encoding_entry),
       self._get_text_from_entry("--web-root=",
-                                m._page1_general_web_root_ckbtn,
-                                m._page1_general_web_root_entry),
+                                m._general_area_web_root_ckbtn,
+                                m._general_area_web_root_entry),
       self._get_text_from_entry("--scope=",
-                                m._page1_general_scope_ckbtn,
-                                m._page1_general_scope_entry),
+                                m._general_area_scope_ckbtn,
+                                m._general_area_scope_entry),
       self._get_text_from_entry("--test-filter=",
-                                m._page1_general_test_filter_ckbtn,
-                                m._page1_general_test_filter_entry),
+                                m._general_area_test_filter_ckbtn,
+                                m._general_area_test_filter_entry),
       self._get_text_from_entry("--test-skip=",
-                                m._page1_general_test_skip_ckbtn,
-                                m._page1_general_test_skip_entry),
+                                m._general_area_test_skip_ckbtn,
+                                m._general_area_test_skip_entry),
       self._get_text_from_entry("--crawl=",
-                                m._page1_general_crawl_ckbtn,
-                                m._page1_general_crawl_entry),
+                                m._general_area_crawl_ckbtn,
+                                m._general_area_crawl_entry),
       self._get_text_from_entry("--crawl-exclude=",
-                                m._page1_general_crawl_exclude_ckbtn,
-                                m._page1_general_crawl_exclude_entry),
+                                m._general_area_crawl_exclude_ckbtn,
+                                m._general_area_crawl_exclude_entry),
       self._get_text_from_entry("-t ",
-                                m._page1_general_traffic_file_ckbtn,
-                                m._page1_general_traffic_file_entry),
+                                m._general_area_traffic_file_ckbtn,
+                                m._general_area_traffic_file_entry),
       self._get_text_from_entry("--har=",
-                                m._page1_general_har_ckbtn,
-                                m._page1_general_har_entry),
+                                m._general_area_har_ckbtn,
+                                m._general_area_har_entry),
       self._get_text_only_ckbtn("--flush-session",
-                                m._page1_general_flush_session_ckbtn),
+                                m._general_area_flush_session_ckbtn),
       self._get_text_from_entry("--dump-format=",
-                                m._page1_general_dump_format_ckbtn,
-                                m._page1_general_dump_format_entry),
+                                m._general_area_dump_format_ckbtn,
+                                m._general_area_dump_format_entry),
       self._get_text_from_entry("--csv-del=",
-                                m._page1_general_csv_del_ckbtn,
-                                m._page1_general_csv_del_entry),
+                                m._general_area_csv_del_ckbtn,
+                                m._general_area_csv_del_entry),
       self._get_text_from_entry("--save=",
-                                m._page1_general_save_ckbtn,
-                                m._page1_general_save_entry),
+                                m._general_area_save_ckbtn,
+                                m._general_area_save_entry),
       self._get_text_from_entry("-s ",
-                                m._page1_general_session_file_ckbtn,
-                                m._page1_general_session_file_entry),
+                                m._general_area_session_file_ckbtn,
+                                m._general_area_session_file_entry),
       self._get_text_from_entry("--output-dir=",
-                                m._page1_general_output_dir_ckbtn,
-                                m._page1_general_output_dir_entry),
+                                m._general_area_output_dir_ckbtn,
+                                m._general_area_output_dir_entry),
       self._get_text_only_ckbtn("--skip-heuristics",
-                                m._page1_misc_skip_heuristics_ckbtn),
+                                m._misc_area_skip_heuristics_ckbtn),
       self._get_text_only_ckbtn("--skip-waf",
-                                m._page1_misc_skip_waf_ckbtn),
+                                m._misc_area_skip_waf_ckbtn),
       self._get_text_only_ckbtn("--unstable",
-                                m._page1_misc_unstable_ckbtn),
+                                m._misc_area_unstable_ckbtn),
       self._get_text_only_ckbtn("--list-tampers",
-                                m._page1_misc_list_tampers_ckbtn),
+                                m._misc_area_list_tampers_ckbtn),
       self._get_text_only_ckbtn("--sqlmap-shell",
-                                m._page1_misc_sqlmap_shell_ckbtn),
+                                m._misc_area_sqlmap_shell_ckbtn),
       self._get_text_only_ckbtn("--disable-coloring",
-                                m._page1_misc_disable_color_ckbtn),
+                                m._misc_area_disable_color_ckbtn),
       self._get_text_only_ckbtn("--eta",
-                                m._page1_general_eta_ckbtn),
+                                m._general_area_eta_ckbtn),
       self._get_text_from_entry("--gpage=",
-                                m._page1_misc_gpage_ckbtn,
-                                m._page1_misc_gpage_spinbtn),
+                                m._misc_area_gpage_ckbtn,
+                                m._misc_area_gpage_spinbtn),
       self._get_text_only_ckbtn("--beep",
-                                m._page1_misc_beep_ckbtn),
+                                m._misc_area_beep_ckbtn),
       self._get_text_only_ckbtn("--offline",
-                                m._page1_misc_offline_ckbtn),
+                                m._misc_area_offline_ckbtn),
       self._get_text_only_ckbtn("--purge",
-                                m._page1_misc_purge_ckbtn),
+                                m._misc_area_purge_ckbtn),
       self._get_text_only_ckbtn("--dependencies",
-                                m._page1_misc_dependencies_ckbtn),
+                                m._misc_area_dependencies_ckbtn),
       self._get_text_only_ckbtn("--update",
-                                m._page1_misc_update_ckbtn),
+                                m._misc_area_update_ckbtn),
       self._get_text_from_entry("--alert=",
-                                m._page1_misc_alert_ckbtn,
-                                m._page1_misc_alert_entry),
+                                m._misc_area_alert_ckbtn,
+                                m._misc_area_alert_entry),
       self._get_text_from_entry("--tmp-dir=",
-                                m._page1_misc_tmp_dir_ckbtn,
-                                m._page1_misc_tmp_dir_entry),
+                                m._misc_area_tmp_dir_ckbtn,
+                                m._misc_area_tmp_dir_entry),
       self._get_text_from_entry("--answers=",
-                                m._page1_misc_answers_ckbtn,
-                                m._page1_misc_answers_entry),
+                                m._misc_area_answers_ckbtn,
+                                m._misc_area_answers_entry),
       self._get_text_from_entry("-z ",
-                                m._page1_misc_z_ckbtn,
-                                m._page1_misc_z_entry),
+                                m._misc_area_z_ckbtn,
+                                m._misc_area_z_entry),
       self._get_text_from_entry("--results-file=",
-                                m._page1_misc_results_file_ckbtn,
-                                m._page1_misc_results_file_entry),
+                                m._misc_area_results_file_ckbtn,
+                                m._misc_area_results_file_entry),
     ]
 
     _file_opts = [
@@ -329,38 +329,38 @@ def _collect_opts(self):
                                 m._file_write_area_file_dest_ckbtn,
                                 m._file_write_area_file_dest_entry),
       self._get_text_from_entry("--os-cmd=",
-                                m._file_os_access_os_cmd_ckbtn,
-                                m._file_os_access_os_cmd_entry),
+                                m._os_access_area_os_cmd_ckbtn,
+                                m._os_access_area_os_cmd_entry),
       self._get_text_only_ckbtn("--os-shell",
-                                m._file_os_access_os_shell_ckbtn),
+                                m._os_access_area_os_shell_ckbtn),
       self._get_text_only_ckbtn("--os-pwn",
-                                m._file_os_access_os_pwn_ckbtn),
+                                m._os_access_area_os_pwn_ckbtn),
       self._get_text_only_ckbtn("--os-smbrelay",
-                                m._file_os_access_os_smbrelay_ckbtn),
+                                m._os_access_area_os_smbrelay_ckbtn),
       self._get_text_only_ckbtn("--os-bof",
-                                m._file_os_access_os_bof_ckbtn),
+                                m._os_access_area_os_bof_ckbtn),
       self._get_text_only_ckbtn("--priv-esc",
-                                m._file_os_access_priv_esc_ckbtn),
+                                m._os_access_area_priv_esc_ckbtn),
       self._get_text_from_entry("--msf-path=",
-                                m._file_os_access_msf_path_ckbtn,
-                                m._file_os_access_msf_path_entry),
+                                m._os_access_area_msf_path_ckbtn,
+                                m._os_access_area_msf_path_entry),
       self._get_text_from_entry("--tmp-path=",
-                                m._file_os_access_tmp_path_ckbtn,
-                                m._file_os_access_tmp_path_entry),
-      self._get_text_only_ckbtn(m._file_os_registry_reg_combobox.get_active_id(),
-                                m._file_os_registry_reg_ckbtn),
+                                m._os_access_area_tmp_path_ckbtn,
+                                m._os_access_area_tmp_path_entry),
+      self._get_text_only_ckbtn(m._registry_area_reg_combobox.get_active_id(),
+                                m._registry_area_reg_ckbtn),
       self._get_text_from_entry("--reg-key=",
-                                m._file_os_registry_reg_ckbtn,
-                                m._file_os_registry_reg_key_entry),
+                                m._registry_area_reg_ckbtn,
+                                m._registry_area_reg_key_entry),
       self._get_text_from_entry("--reg-value=",
-                                m._file_os_registry_reg_ckbtn,
-                                m._file_os_registry_reg_value_entry),
+                                m._registry_area_reg_ckbtn,
+                                m._registry_area_reg_value_entry),
       self._get_text_from_entry("--reg-data=",
-                                m._file_os_registry_reg_ckbtn,
-                                m._file_os_registry_reg_data_entry),
+                                m._registry_area_reg_ckbtn,
+                                m._registry_area_reg_data_entry),
       self._get_text_from_entry("--reg-type=",
-                                m._file_os_registry_reg_ckbtn,
-                                m._file_os_registry_reg_type_entry),
+                                m._registry_area_reg_ckbtn,
+                                m._registry_area_reg_type_entry),
     ]
 
     _enumeration_opts = [
@@ -692,7 +692,7 @@ def _collect_opts(self):
       self._get_text_only_ckbtn("--batch",
                                 m._general_area_batch_ckbtn),
       self._get_text_only_ckbtn("--wizard",
-                                m._page1_misc_wizard_ckbtn),
+                                m._misc_area_wizard_ckbtn),
       self._get_tampers('--tamper=',
                         m._tamper_area_tamper_view),
       self._get_text_only_ckbtn("--crack",