diff options
| author | Alexey Kulakov <panda75@bk.ru> | 2012-06-23 20:08:25 +0000 |
|---|---|---|
| committer | Alexey Kulakov <panda75@bk.ru> | 2012-06-23 20:08:25 +0000 |
| commit | 5a06912fcbff12795fe781f6480295f7daf0dc8b (patch) | |
| tree | f65b9b8560ef92c297b2c91297791d38c8c9f8a2 /plugins/TopToolBar/topbutton.cpp | |
| parent | b3ee1318f6951965f0ae2d05d0121f6d7882e92c (diff) | |
1/2 of option dialog changes
git-svn-id: http://svn.miranda-ng.org/main/trunk@588 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/TopToolBar/topbutton.cpp')
| -rw-r--r-- | plugins/TopToolBar/topbutton.cpp | 46 |
1 files changed, 21 insertions, 25 deletions
diff --git a/plugins/TopToolBar/topbutton.cpp b/plugins/TopToolBar/topbutton.cpp index 3091d429b4..3c216e364a 100644 --- a/plugins/TopToolBar/topbutton.cpp +++ b/plugins/TopToolBar/topbutton.cpp @@ -77,33 +77,29 @@ void TopButtonInt::LoadSettings() dwFlags = dwFlags & (~TTBBF_VISIBLE);
if (dwFlags & TTBBF_ISSEPARATOR) {
- if (wParamDown != 0) {
- char buf1[10];
- _itoa(wParamDown, buf1, 10);
- char buf2[20];
- AS(buf2, "Sep", buf1);
-
- arrangedpos = DBGetContactSettingByte(0, TTB_OPTDIR, AS(buf, buf2, "_Position"), Buttons.getCount());
- if ( DBGetContactSettingByte(0, TTB_OPTDIR, AS(buf, buf2, "_Visible"), oldv) > 0 )
- dwFlags |= TTBBF_VISIBLE;
- }
+ char buf1[10];
+ _itoa(wParamDown, buf1, 10);
+ char buf2[20];
+ AS(buf2, "Sep", buf1);
+
+ arrangedpos = DBGetContactSettingByte(0, TTB_OPTDIR, AS(buf, buf2, "_Position"), Buttons.getCount());
+ if ( DBGetContactSettingByte(0, TTB_OPTDIR, AS(buf, buf2, "_Visible"), oldv) > 0 )
+ dwFlags |= TTBBF_VISIBLE;
}
else if (dwFlags & TTBBF_ISLBUTTON) {
- if (wParamDown != 0) {
- char buf1[10];
- _itoa(wParamDown, buf1, 10);
- char buf2[20];
- AS(buf2, "Launch", buf1);
-
- if (name != NULL) free(name);
- name = DBGetString(0, TTB_OPTDIR, AS(buf, buf2, "_name"));
- if (program != NULL) free(program);
- program = DBGetStringT(0, TTB_OPTDIR, AS(buf, buf2, "_lpath"));
-
- arrangedpos = DBGetContactSettingByte(0, TTB_OPTDIR, AS(buf, buf2, "_Position"), Buttons.getCount());
- if ( DBGetContactSettingByte(0, TTB_OPTDIR, AS(buf, buf2, "_Visible"), oldv) > 0 )
- dwFlags |= TTBBF_VISIBLE;
- }
+ char buf1[10];
+ _itoa(wParamDown, buf1, 10);
+ char buf2[20];
+ AS(buf2, "Launch", buf1);
+
+ if (name != NULL) free(name);
+ name = DBGetString(0, TTB_OPTDIR, AS(buf, buf2, "_name"));
+ if (program != NULL) free(program);
+ program = DBGetStringT(0, TTB_OPTDIR, AS(buf, buf2, "_lpath"));
+
+ arrangedpos = DBGetContactSettingByte(0, TTB_OPTDIR, AS(buf, buf2, "_Position"), Buttons.getCount());
+ if ( DBGetContactSettingByte(0, TTB_OPTDIR, AS(buf, buf2, "_Visible"), oldv) > 0 )
+ dwFlags |= TTBBF_VISIBLE;
}
else {
arrangedpos = DBGetContactSettingByte(0, TTB_OPTDIR, AS(buf, name, "_Position"), Buttons.getCount());
|