From 93be572ca3539d39a0797cd8befbb2478c2d4a1d Mon Sep 17 00:00:00 2001
From: Garux <garux@mail.ru>
Date: Tue, 8 Aug 2017 20:45:21 +0300
Subject: [PATCH] * filterbar: removed barely used areaportal button, moved
 'apply nodraw/nodrawnonsolid' functions to translucent button

---
 radiant/filterbar.cpp                      |  19 ++++++++++---------
 setup/data/tools/bitmaps/f-areaportal.png  | Bin 247 -> 0 bytes
 setup/data/tools/bitmaps/f-translucent.png | Bin 237 -> 193 bytes
 3 files changed, 10 insertions(+), 9 deletions(-)
 delete mode 100644 setup/data/tools/bitmaps/f-areaportal.png

diff --git a/radiant/filterbar.cpp b/radiant/filterbar.cpp
index 01460eb6..823e98cf 100644
--- a/radiant/filterbar.cpp
+++ b/radiant/filterbar.cpp
@@ -56,7 +56,7 @@ const char* GetCaulkShader(){
 	return g_caulk_shader;
 }
 
-gboolean Areaportals_button_press( GtkWidget *widget, GdkEventButton *event, gpointer data ){
+gboolean Translucent_button_press( GtkWidget *widget, GdkEventButton *event, gpointer data ){
 	if ( event->button == 3 && event->type == GDK_BUTTON_PRESS ) {
 		if ( ButtonNum == 1 ){
 			ToggleActions %= 2;
@@ -235,16 +235,17 @@ GtkToolbar* create_filter_toolbar(){
 			toolbar_append_toggle_button( toolbar, "Patches (CTRL + P)", "patch_wireframe.png", "FilterPatches" );
 			gtk_toolbar_append_space( GTK_TOOLBAR( toolbar ) );
 
-			if ( g_pGameDescription->mGameType == "doom3" ) {
-				button = toolbar_append_toggle_button( toolbar, "Visportals (ALT + 3)\nRightClick: toggle tex\n\tnoDraw\n\tnoDrawNonSolid", "f-areaportal.png", "FilterVisportals" );
-			}
-			else{
-				button = toolbar_append_toggle_button( toolbar, "Areaportals (ALT + 3)\nRightClick: toggle tex\n\tnoDraw\n\tnoDrawNonSolid", "f-areaportal.png", "FilterAreaportals" );
-			}
-			g_signal_connect( G_OBJECT( button ), "button_press_event", G_CALLBACK( Areaportals_button_press ), 0 );
+//			if ( g_pGameDescription->mGameType == "doom3" ) {
+//				button = toolbar_append_toggle_button( toolbar, "Visportals (ALT + 3)\nRightClick: toggle tex\n\tnoDraw\n\tnoDrawNonSolid", "f-areaportal.png", "FilterVisportals" );
+//			}
+//			else{
+//				button = toolbar_append_toggle_button( toolbar, "Areaportals (ALT + 3)\nRightClick: toggle tex\n\tnoDraw\n\tnoDrawNonSolid", "f-areaportal.png", "FilterAreaportals" );
+//			}
+//			g_signal_connect( G_OBJECT( button ), "button_press_event", G_CALLBACK( Translucent_button_press ), 0 );
 
 
-			toolbar_append_toggle_button( toolbar, "Translucent (ALT + 4)", "f-translucent.png", "FilterTranslucent" );
+			button = toolbar_append_toggle_button( toolbar, "Translucent (ALT + 4)\nRightClick: toggle tex\n\tnoDraw\n\tnoDrawNonSolid", "f-translucent.png", "FilterTranslucent" );
+			g_signal_connect( G_OBJECT( button ), "button_press_event", G_CALLBACK( Translucent_button_press ), 0 );
 
 			button = toolbar_append_toggle_button( toolbar, "Liquids (ALT + 5)\nRightClick: toggle tex\n\twaterCaulk\n\tlavaCaulk\n\tslimeCaulk", "f-liquids.png", "FilterLiquids" );
 			g_signal_connect( G_OBJECT( button ), "button_press_event", G_CALLBACK( Liquids_button_press ), 0 );
diff --git a/setup/data/tools/bitmaps/f-areaportal.png b/setup/data/tools/bitmaps/f-areaportal.png
deleted file mode 100644
index dd85eaf0e662a4d6bae280de90b9f4936af00bd5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 247
zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s77>k44ofy`glX=O&z`&C3
z=<CS9u(6-}Pa-P=1A{`cN02WALzNl>LqiJ#!!HH~hK3gm45bDP46hOx7_4S6Fo+k-
z*%fHRz`(#+;1OBOz`%DHgc*<LuSj8FV2~<tjVKAuPb(=;EJ|evNX*PD(erZ+Q7ALk
zGu1ORF!)lmkb!~0%G1R$#KJ#0B_ZJl{}GYK|Gd2a3zHW7bl@&X?0CAEji<}tfOzPS
t#S&7zi`g2On98e`hbuHKZr0&pIFTuuy<B6NF9QPugQu&X%Q~loCIG%eMtlGO

diff --git a/setup/data/tools/bitmaps/f-translucent.png b/setup/data/tools/bitmaps/f-translucent.png
index 98c2fe11ec8b155cdee1c4b69c9f2a915c2b74e9..90d335134283e54cbd970ad452298e94dcffff51 100644
GIT binary patch
delta 127
zcmaFMc#v^|iV{n@qpu?a!^VE@KZ&di3=EtF9+AZi419+`m{C;2t6^fjW{|C?i(`m|
ze{xDf!Vmr<B8~rlOaJ@)=+IZ5|9cA)XFOfZ#*m!&fLSm;<YBR_jg&iY!Vmioi447b
f0o&9hnHjd-*wbU+kXFXPz`)??>gTe~DWM4f^vEs0

delta 156
zcmX@e_?B^k3KwH>kh>GZx^prwCn^ftDI|LY`7$t6sWC7#v@kIIVqjosc)`F>YQVto
zDuIE)Y6b&?c)^@qfi?^b44efXk;M!QY_CC>(Z_I}*F-l>R|8KM#}Etu<dlSjAN)r|
z8vp-qOq;-*IIUlbp@+4INnlC3iGcfI231)HVHS-Lk7Eo|CT)(%w|r>Cz`(%Z>FVdQ
I&MBb@02hQWLI3~&