diff options
author | George Hazan <ghazan@miranda.im> | 2018-05-11 21:22:17 +0200 |
---|---|---|
committer | George Hazan <ghazan@miranda.im> | 2018-05-11 21:22:17 +0200 |
commit | 3f1628f127d35aa14da97e50c2a94cfd61ad52dd (patch) | |
tree | e9f1d8a1282e3c5ee0139003f4aac0e932a99213 /plugins/Scriver/res/resource.rc | |
parent | 6a6f2b9e3b2749f16b513dfc98d5d5038b5628fb (diff) |
merge from master to
fixes #1349 (Miranda crashes on coming back from auto away)
Diffstat (limited to 'plugins/Scriver/res/resource.rc')
-rw-r--r-- | plugins/Scriver/res/resource.rc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/plugins/Scriver/res/resource.rc b/plugins/Scriver/res/resource.rc index 69aadc0e0d..b5254672e9 100644 --- a/plugins/Scriver/res/resource.rc +++ b/plugins/Scriver/res/resource.rc @@ -91,9 +91,7 @@ BEGIN CONTROL "Show toolbar",IDC_SHOWTOOLBAR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,34,180,10
CONTROL "Show info bar",IDC_SHOWINFOBAR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,45,180,10
CONTROL "Show avatars",IDC_AVATARSUPPORT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,56,180,10
- CONTROL "Use the contact's status icon as the window icon",IDC_STATUSWIN,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,67,292,10
- CONTROL "Show progress indicator",IDC_SHOWPROGRESS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,78,180,10
+ CONTROL "Show progress indicator",IDC_SHOWPROGRESS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,67,180,10
CONTROL "Enable transparency",IDC_TRANSPARENCY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,95,140,10
LTEXT "active",IDC_TRANSPARENCYTEXT1,152,91,36,8
CONTROL "Slider1",IDC_ATRANSPARENCYVALUE,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,194,91,70,12
|