From 35279b6e28e55b832bcc0143e89fe53848e60f82 Mon Sep 17 00:00:00 2001
From: Thomas Goyne <plorkyeran@aegisub.org>
Date: Sat, 19 May 2012 15:49:23 +0000
Subject: [PATCH] Remove pointless blank buttons

Originally committed to SVN as r6835.
---
 .../src/bitmaps/button/blank_button_16.png    | Bin 96 -> 0 bytes
 .../src/bitmaps/button/blank_button_24.png    | Bin 102 -> 0 bytes
 .../src/bitmaps/button/blank_button_32.png    | Bin 288 -> 0 bytes
 aegisub/src/bitmaps/button/exit_button_16.png | Bin 96 -> 0 bytes
 aegisub/src/bitmaps/button/exit_button_24.png | Bin 102 -> 0 bytes
 aegisub/src/bitmaps/button/null_button_16.png | Bin 96 -> 0 bytes
 aegisub/src/bitmaps/button/null_button_24.png | Bin 102 -> 0 bytes
 .../bitmaps/button/paste_over_button_16.png   | Bin 96 -> 0 bytes
 .../bitmaps/button/paste_over_button_24.png   | Bin 102 -> 0 bytes
 aegisub/src/bitmaps/manifest.respack          |  12 -----------
 aegisub/src/command/icon.cpp                  |  19 ------------------
 11 files changed, 31 deletions(-)
 delete mode 100644 aegisub/src/bitmaps/button/blank_button_16.png
 delete mode 100644 aegisub/src/bitmaps/button/blank_button_24.png
 delete mode 100644 aegisub/src/bitmaps/button/blank_button_32.png
 delete mode 100644 aegisub/src/bitmaps/button/exit_button_16.png
 delete mode 100644 aegisub/src/bitmaps/button/exit_button_24.png
 delete mode 100644 aegisub/src/bitmaps/button/null_button_16.png
 delete mode 100644 aegisub/src/bitmaps/button/null_button_24.png
 delete mode 100644 aegisub/src/bitmaps/button/paste_over_button_16.png
 delete mode 100644 aegisub/src/bitmaps/button/paste_over_button_24.png

diff --git a/aegisub/src/bitmaps/button/blank_button_16.png b/aegisub/src/bitmaps/button/blank_button_16.png
deleted file mode 100644
index f6f8b6631fd0295b62da91a2ecc269d6087d852e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 96
zcmeAS@N?(olHy`uVBq!ia0vp^0zk~q!2%@RtJ;?UDbBJ2$8?wk!^Am@V}TqYPZ!4!
miST5b0}b*9eOeN3Tnr1&a0jg5mlOfYGI+ZBxvX<aXaWEq-4kX2

diff --git a/aegisub/src/bitmaps/button/blank_button_24.png b/aegisub/src/bitmaps/button/blank_button_24.png
deleted file mode 100644
index a74ba24203216c18be77fff140b576e838b6785b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 102
zcmeAS@N?(olHy`uVBq!ia0vp^5<o1@!2%?AYq&21Qk-Q4j_EK7hW}S~W`a1LE{-7<
sy~#EQ9HbItt{SXL3^}}lZ4v{+Nf*J0)YThnfod2$UHx3vIVCg!01U1e<p2Nx

diff --git a/aegisub/src/bitmaps/button/blank_button_32.png b/aegisub/src/bitmaps/button/blank_button_32.png
deleted file mode 100644
index 1409282d93b48f6beaadb92b8bfa0d779db564d0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 288
zcmeAS@N?(olHy`uVBq!ia0vp^3Lwk~Bp9L@-6Me%OS+@4BLl<6e(pbstUx|vage(c
z!@6@aFM%9|WRD<U28Jp%28M<f28Lfip@tU>45bDP46hOx7_4S6Fo+k-*%fF5l;AAz
zh%5%u9$@TtGTRQwU@8gn3ua&_n|#&+#7pvacVS?>+a<gN$m8~OaSY**O_q29<Sbxd
zoIYzU$c3sUt`Q|Ei6yC4$wjF^iowXh&`8(7RM*fV#K^$P)Xd7zP}jiR%D_M=sr^2R
dhTQy=%(P0}8iMWZlYtr-JYD@<);T3K0RR%bLdXCB

diff --git a/aegisub/src/bitmaps/button/exit_button_16.png b/aegisub/src/bitmaps/button/exit_button_16.png
deleted file mode 100644
index f6f8b6631fd0295b62da91a2ecc269d6087d852e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 96
zcmeAS@N?(olHy`uVBq!ia0vp^0zk~q!2%@RtJ;?UDbBJ2$8?wk!^Am@V}TqYPZ!4!
miST5b0}b*9eOeN3Tnr1&a0jg5mlOfYGI+ZBxvX<aXaWEq-4kX2

diff --git a/aegisub/src/bitmaps/button/exit_button_24.png b/aegisub/src/bitmaps/button/exit_button_24.png
deleted file mode 100644
index a74ba24203216c18be77fff140b576e838b6785b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 102
zcmeAS@N?(olHy`uVBq!ia0vp^5<o1@!2%?AYq&21Qk-Q4j_EK7hW}S~W`a1LE{-7<
sy~#EQ9HbItt{SXL3^}}lZ4v{+Nf*J0)YThnfod2$UHx3vIVCg!01U1e<p2Nx

diff --git a/aegisub/src/bitmaps/button/null_button_16.png b/aegisub/src/bitmaps/button/null_button_16.png
deleted file mode 100644
index f6f8b6631fd0295b62da91a2ecc269d6087d852e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 96
zcmeAS@N?(olHy`uVBq!ia0vp^0zk~q!2%@RtJ;?UDbBJ2$8?wk!^Am@V}TqYPZ!4!
miST5b0}b*9eOeN3Tnr1&a0jg5mlOfYGI+ZBxvX<aXaWEq-4kX2

diff --git a/aegisub/src/bitmaps/button/null_button_24.png b/aegisub/src/bitmaps/button/null_button_24.png
deleted file mode 100644
index a74ba24203216c18be77fff140b576e838b6785b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 102
zcmeAS@N?(olHy`uVBq!ia0vp^5<o1@!2%?AYq&21Qk-Q4j_EK7hW}S~W`a1LE{-7<
sy~#EQ9HbItt{SXL3^}}lZ4v{+Nf*J0)YThnfod2$UHx3vIVCg!01U1e<p2Nx

diff --git a/aegisub/src/bitmaps/button/paste_over_button_16.png b/aegisub/src/bitmaps/button/paste_over_button_16.png
deleted file mode 100644
index f6f8b6631fd0295b62da91a2ecc269d6087d852e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 96
zcmeAS@N?(olHy`uVBq!ia0vp^0zk~q!2%@RtJ;?UDbBJ2$8?wk!^Am@V}TqYPZ!4!
miST5b0}b*9eOeN3Tnr1&a0jg5mlOfYGI+ZBxvX<aXaWEq-4kX2

diff --git a/aegisub/src/bitmaps/button/paste_over_button_24.png b/aegisub/src/bitmaps/button/paste_over_button_24.png
deleted file mode 100644
index a74ba24203216c18be77fff140b576e838b6785b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 102
zcmeAS@N?(olHy`uVBq!ia0vp^5<o1@!2%?AYq&21Qk-Q4j_EK7hW}S~W`a1LE{-7<
sy~#EQ9HbItt{SXL3^}}lZ4v{+Nf*J0)YThnfod2$UHx3vIVCg!01U1e<p2Nx

diff --git a/aegisub/src/bitmaps/manifest.respack b/aegisub/src/bitmaps/manifest.respack
index de6f0fb08..1ad567da6 100644
--- a/aegisub/src/bitmaps/manifest.respack
+++ b/aegisub/src/bitmaps/manifest.respack
@@ -28,9 +28,6 @@ button/attach_button_32.png
 button/automation_toolbutton_16.png
 button/automation_toolbutton_24.png
 button/automation_toolbutton_32.png
-button/blank_button_16.png
-button/blank_button_24.png
-button/blank_button_32.png
 button/bugtracker_button_16.png
 button/bugtracker_button_24.png
 button/bugtracker_button_32.png
@@ -157,9 +154,6 @@ button/delete_button_32.png
 button/detach_video_menu_16.png
 button/detach_video_menu_24.png
 button/detach_video_menu_32.png
-button/exit_button_16.png
-button/exit_button_24.png
-button/exit_button_32.png
 button/export_menu_16.png
 button/export_menu_24.png
 button/export_menu_32.png
@@ -220,9 +214,6 @@ button/new_toolbutton_32.png
 button/new_window_menu_16.png
 button/new_window_menu_24.png
 button/new_window_menu_32.png
-button/null_button_16.png
-button/null_button_24.png
-button/null_button_32.png
 button/open_audio_from_video_menu_16.png
 button/open_audio_from_video_menu_24.png
 button/open_audio_from_video_menu_32.png
@@ -253,9 +244,6 @@ button/override_aspect_menu_32.png
 button/paste_button_16.png
 button/paste_button_24.png
 button/paste_button_32.png
-button/paste_over_button_16.png
-button/paste_over_button_24.png
-button/paste_over_button_32.png
 button/properties_toolbutton_16.png
 button/properties_toolbutton_24.png
 button/properties_toolbutton_32.png
diff --git a/aegisub/src/command/icon.cpp b/aegisub/src/command/icon.cpp
index 86a3ad5c7..8a905dbe4 100644
--- a/aegisub/src/command/icon.cpp
+++ b/aegisub/src/command/icon.cpp
@@ -87,13 +87,11 @@ void icon_init() {
 INSERT_ICON("am/manager", automation_toolbutton)
 INSERT_ICON("am/meta", automation_toolbutton)
 INSERT_ICON("app/about", about_menu)
-INSERT_ICON("app/exit", exit_button)
 INSERT_ICON("app/language", languages_menu)
 INSERT_ICON("app/log", about_menu)
 INSERT_ICON("app/new_window", new_window_menu)
 INSERT_ICON("app/options", options_button)
 INSERT_ICON("app/toggle/global_hotkeys", toggle_audio_medusa)
-INSERT_ICON("app/updates", blank_button)
 INSERT_ICON("audio/close", close_audio_menu)
 INSERT_ICON("audio/commit", button_audio_commit)
 INSERT_ICON("audio/go_to", button_audio_goto)
@@ -115,15 +113,7 @@ INSERT_ICON("audio/stop", button_stop)
 INSERT_ICON("edit/line/copy", copy_button)
 INSERT_ICON("edit/line/cut", cut_button)
 INSERT_ICON("edit/line/delete", delete_button)
-INSERT_ICON("edit/line/duplicate", blank_button)
-INSERT_ICON("edit/line/duplicate/shift", blank_button)
-INSERT_ICON("edit/line/join/as_karaoke", blank_button)
-INSERT_ICON("edit/line/join/concatenate", blank_button)
-INSERT_ICON("edit/line/join/keep_first", blank_button)
 INSERT_ICON("edit/line/paste", paste_button)
-INSERT_ICON("edit/line/paste/over", paste_over_button)
-INSERT_ICON("edit/line/recombine", blank_button)
-INSERT_ICON("edit/line/split/by_karaoke", blank_button)
 INSERT_ICON("edit/line/swap", arrow_sort)
 INSERT_ICON("edit/redo", redo_button)
 INSERT_ICON("edit/search_replace", find_replace_menu)
@@ -142,10 +132,6 @@ INSERT_ICON("keyframe/save", save_keyframes_menu)
 INSERT_ICON("subtitle/attachment", attach_button)
 INSERT_ICON("subtitle/find", find_button)
 INSERT_ICON("subtitle/find/next", find_next_menu)
-INSERT_ICON("subtitle/insert/after", blank_button)
-INSERT_ICON("subtitle/insert/after/videotime", blank_button)
-INSERT_ICON("subtitle/insert/before", blank_button)
-INSERT_ICON("subtitle/insert/before/videotime", blank_button)
 INSERT_ICON("subtitle/new", new_toolbutton)
 INSERT_ICON("subtitle/open", open_toolbutton)
 INSERT_ICON("subtitle/open/charset", open_with_toolbutton)
@@ -154,8 +140,6 @@ INSERT_ICON("subtitle/save", save_toolbutton)
 INSERT_ICON("subtitle/save/as", save_as_toolbutton)
 INSERT_ICON("subtitle/select/visible", select_visible_button)
 INSERT_ICON("subtitle/spellcheck", spellcheck_toolbutton)
-INSERT_ICON("time/continous/end", blank_button)
-INSERT_ICON("time/continous/start", blank_button)
 INSERT_ICON("time/frame/current", shift_to_frame)
 INSERT_ICON("time/lead/in", button_leadin)
 INSERT_ICON("time/lead/out", button_leadout)
@@ -165,9 +149,6 @@ INSERT_ICON("time/shift", shift_times_toolbutton)
 INSERT_ICON("time/snap/end_video", subend_to_video)
 INSERT_ICON("time/snap/scene", snap_subs_to_scene)
 INSERT_ICON("time/snap/start_video", substart_to_video)
-INSERT_ICON("time/sort/end", blank_button)
-INSERT_ICON("time/sort/start", blank_button)
-INSERT_ICON("time/sort/style", blank_button)
 INSERT_ICON("timecode/close", close_timecodes_menu)
 INSERT_ICON("timecode/open", open_timecodes_menu)
 INSERT_ICON("timecode/save", save_timecodes_menu)