fixes #4126 (Удалить экстра-значок "Видимость")

6 files changed, 2 insertions, 18 deletions

diff --git a/src/mir_app/res/always_visible.ico b/src/mir_app/res/always_visible.ico
deleted file mode 100644
index 1bc8480355..0000000000
--- a/src/mir_app/res/always_visible.ico
+++ /dev/null
diff --git a/src/mir_app/res/never_visible.ico b/src/mir_app/res/never_visible.ico
deleted file mode 100644
index 12a69a5807..0000000000
--- a/src/mir_app/res/never_visible.ico
+++ /dev/null
diff --git a/src/mir_app/res/resource.rc b/src/mir_app/res/resource.rc
index 9aaf8b1a00..b683748fde 100644
--- a/src/mir_app/res/resource.rc
+++ b/src/mir_app/res/resource.rc
@@ -1596,10 +1596,6 @@ IDI_ON                  ICON                    "On.ico"
 

 IDI_OFF                 ICON                    "Off.ico"

 

-IDI_ALWAYSVIS           ICON                    "always_visible.ico"

-

-IDI_NEVERVIS            ICON                    "never_visible.ico"

-

 IDI_CHAT                ICON                    "chat_channel.ico"

 

 IDI_MALE                ICON                    "male.ico"

diff --git a/src/mir_app/src/ei_defaulticons.cpp b/src/mir_app/src/ei_defaulticons.cpp
index f228c4c7af..dea63a7409 100644
--- a/src/mir_app/src/ei_defaulticons.cpp
+++ b/src/mir_app/src/ei_defaulticons.cpp
@@ -29,7 +29,7 @@ Boston, MA 02111-1307, USA.
 ////////////////////////////////////////////////////////////////////////////////////////

 // DB extra icons

 

-HANDLE hExtraVisibility, hExtraChat, hExtraChatMute, hExtraGender, hExtraProto;

+HANDLE hExtraChat, hExtraChatMute, hExtraGender, hExtraProto;

 

 static void SetVisibility(MCONTACT hContact, int apparentMode, bool clear)

 {

@@ -43,7 +43,7 @@ static void SetVisibility(MCONTACT hContact, int apparentMode, bool clear)
 	if (apparentMode <= 0)

 		apparentMode = db_get_w(hContact, proto, "ApparentMode", 0);

 

-	HANDLE hExtraIcon, hIcolib = nullptr;

+	HANDLE hExtraIcon = nullptr, hIcolib = nullptr;

 

 	// Is chat

 	if (Contact::IsGroupChat(hContact, proto)) {

@@ -51,13 +51,6 @@ static void SetVisibility(MCONTACT hContact, int apparentMode, bool clear)
 		if (apparentMode == ID_STATUS_OFFLINE)

 			hIcolib = IcoLib_GetIconHandle("ChatActivity");

 	}

-	else { // Not chat

-		hExtraIcon = hExtraVisibility;

-		if (apparentMode == ID_STATUS_OFFLINE)

-			hIcolib = Skin_GetIconHandle(SKINICON_OTHER_INVISIBLE_ALL);

-		else if (apparentMode == ID_STATUS_ONLINE)

-			hIcolib = Skin_GetIconHandle(SKINICON_OTHER_VISIBLE_ALL);

-	}

 

 	if (hIcolib != nullptr || clear)

 		ExtraIcon_SetIcon(hExtraIcon, hContact, hIcolib);

@@ -315,7 +308,6 @@ void DefaultExtraIcons_Load()
 {

 	hExtraChat = ExtraIcon_RegisterIcolib("chat_activity", LPGEN("Chat activity"), "ChatActivity");

 	hExtraChatMute = ExtraIcon_RegisterIcolib("chat_mute", LPGEN("Chat mute mode"), "ChatMute");

-	hExtraVisibility = ExtraIcon_RegisterIcolib("visibility", LPGEN("Visibility"), Skin_GetIconHandle(SKINICON_OTHER_VISIBLE_ALL));

 	hExtraGender = ExtraIcon_RegisterIcolib("gender", LPGEN("Gender"), "gender_male", nullptr, 0, EIF_DISABLED_BY_DEFAULT);

 	hExtraProto = ExtraIcon_RegisterCallback("protocol", LPGEN("Account"), Skin_GetIconHandle(SKINICON_OTHER_ACCMGR),

 		&ProtocolRebuildIcons, &ProtocolApplyIcon, &ProtocolOnClick, 0, EIF_DISABLED_BY_DEFAULT);

diff --git a/src/mir_app/src/resource.h b/src/mir_app/src/resource.h
index 1576f6d873..5d7c3e08d0 100644
--- a/src/mir_app/src/resource.h
+++ b/src/mir_app/src/resource.h
@@ -76,9 +76,7 @@
 #define IDR_CONTEXT                     180

 #define IDR_ICOLIB_CONTEXT              181

 #define IDC_DROP                        183

-#define IDI_ALWAYSVIS                   184

 #define IDD_EI_OPTIONS                  185

-#define IDI_NEVERVIS                    186

 #define IDI_CHAT                        187

 #define IDI_MALE                        188

 #define IDI_FEMALE                      189

diff --git a/src/mir_app/src/skinicons.cpp b/src/mir_app/src/skinicons.cpp
index 042c3d0737..5941c5b929 100644
--- a/src/mir_app/src/skinicons.cpp
+++ b/src/mir_app/src/skinicons.cpp
@@ -97,8 +97,6 @@ static struct StandardIconDescription mainIcons[] =
 	{ SKINICON_OTHER_EDIT,            LPGEN("Edit"),                  -IDI_TYPING,         0, nullptr }, // 56

 	{ SKINICON_OTHER_BLANK,           LPGEN("Blank"),                 -IDI_BLANK,          0, nullptr }, // 57

 	

-	{ SKINICON_OTHER_VISIBLE_ALL,     LPGEN("Always visible"),        -IDI_ALWAYSVIS,     0, LPGEN("Contact list") },

-	{ SKINICON_OTHER_INVISIBLE_ALL,   LPGEN("Always invisible"),      -IDI_NEVERVIS,      0, LPGEN("Contact list") },

 	{ SKINICON_OTHER_STATUS_LOCKED,   LPGEN("Locked status"),         -IDI_STATUS_LOCKED, 0, LPGEN("Status icons") },

 };