From f8ab8e8c46ffcc4c129217e2515f4d638c8167ae Mon Sep 17 00:00:00 2001 From: Don Ho Date: Sun, 5 Jan 2014 21:47:20 +0000 Subject: [PATCH] [ENHANCE] Make extension column optional in vertical file switcher (in progress). git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@1168 f5eea248-9336-0410-98b8-ebc06183d4e3 --- .../src/WinControls/Preference/preference.rc | 33 ++++++++++--------- .../WinControls/Preference/preference_rc.h | 1 + 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/PowerEditor/src/WinControls/Preference/preference.rc b/PowerEditor/src/WinControls/Preference/preference.rc index 32f20e37f..e2b65bebd 100644 --- a/PowerEditor/src/WinControls/Preference/preference.rc +++ b/PowerEditor/src/WinControls/Preference/preference.rc @@ -52,27 +52,28 @@ BEGIN CONTROL "Small icons",IDC_RADIO_SMALLICON,"Button",BS_AUTORADIOBUTTON,64,69,114,10 CONTROL "Big icons",IDC_RADIO_BIGICON,"Button",BS_AUTORADIOBUTTON,64,83,109,10 CONTROL "Standard icons",IDC_RADIO_STANDARD,"Button",BS_AUTORADIOBUTTON,64,97,119,10 - GROUPBOX "Tab Bar",IDC_TABBAR_GB_STATIC,223,36,176,142,BS_CENTER - CONTROL "Hide",IDC_CHECK_TAB_HIDE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,229,45,108,10 - CONTROL "Multi-line",IDC_CHECK_TAB_MULTILINE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,229,59,134,10 - CONTROL "Vertical",IDC_CHECK_TAB_VERTICAL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,229,73,134,10 - CONTROL "Reduce",IDC_CHECK_REDUCE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,229,88,108,10 - CONTROL "Lock (no drag and drop)",IDC_CHECK_LOCK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,229,102,134,10 - CONTROL "Darken inactive tabs",IDC_CHECK_DRAWINACTIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,229,117,134,10 + GROUPBOX "Tab Bar",IDC_TABBAR_GB_STATIC,223,6,176,142,BS_CENTER + CONTROL "Hide",IDC_CHECK_TAB_HIDE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,229,15,108,10 + CONTROL "Multi-line",IDC_CHECK_TAB_MULTILINE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,229,29,134,10 + CONTROL "Vertical",IDC_CHECK_TAB_VERTICAL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,229,43,134,10 + CONTROL "Reduce",IDC_CHECK_REDUCE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,229,58,108,10 + CONTROL "Lock (no drag and drop)",IDC_CHECK_LOCK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,229,72,134,10 + CONTROL "Darken inactive tabs",IDC_CHECK_DRAWINACTIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,229,87,134,10 CONTROL "Draw a coloured bar on active tab",IDC_CHECK_ORANGE, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,229,132,137,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,229,102,137,10 CONTROL "Show close button on each tab",IDC_CHECK_ENABLETABCLOSE, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,229,147,133,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,229,117,133,10 CONTROL "Double click to close document",IDC_CHECK_DBCLICK2CLOSE, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,229,162,133,10 - CONTROL "Show status bar",IDC_CHECK_SHOWSTATUSBAR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,58,163,130,10 - GROUPBOX "Menu Bar",IDC_MENUBAR_GB_STATIC,57,117,147,40,BS_CENTER - CONTROL "Hide (use Alt or F10 key to toggle)",IDC_CHECK_HIDEMENUBAR, - "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,64,127,135,25 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,229,132,133,10 + CONTROL "Show status bar",IDC_CHECK_SHOWSTATUSBAR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,223,169,130,10 + CONTROL "Hide menu bar (use Alt or F10 key to toggle)",IDC_CHECK_HIDEMENUBAR, + "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,223,153,218,10 GROUPBOX "Localization",IDC_LOCALIZATION_GB_STATIC,57,6,147,35,BS_CENTER COMBOBOX IDC_COMBO_LOCALIZATION,68,20,119,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - GROUPBOX "Document List Panel",IDC_DOCSWITCH_GB_STATIC,223,6,176,27,BS_CENTER - CONTROL "Show",IDC_CHECK_DOCSWITCH,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,230,15,89,14 + GROUPBOX "Document List Panel",IDC_DOCSWITCH_GB_STATIC,57,121,147,40,BS_CENTER + CONTROL "Show",IDC_CHECK_DOCSWITCH,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,64,131,89,10 + CONTROL "Disable extension column",IDC_CHECK_DOCSWITCH_NOEXTCOLUMN, + "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,64,146,124,10 END IDD_PREFERENCE_MARGEIN_BOX DIALOGEX 0, 0, 455, 185 diff --git a/PowerEditor/src/WinControls/Preference/preference_rc.h b/PowerEditor/src/WinControls/Preference/preference_rc.h index f974dbcd2..cfca6f9db 100644 --- a/PowerEditor/src/WinControls/Preference/preference_rc.h +++ b/PowerEditor/src/WinControls/Preference/preference_rc.h @@ -61,6 +61,7 @@ #define IDC_COMBO_LOCALIZATION (IDD_PREFERENCE_BAR_BOX + 24) #define IDC_DOCSWITCH_GB_STATIC (IDD_PREFERENCE_BAR_BOX + 25) #define IDC_CHECK_DOCSWITCH (IDD_PREFERENCE_BAR_BOX + 26) + #define IDC_CHECK_DOCSWITCH_NOEXTCOLUMN (IDD_PREFERENCE_BAR_BOX + 27) #define IDD_PREFERENCE_MULTIINSTANCE_BOX 6150 //(IDD_PREFERENCE_BOX + 150) #define IDC_MULTIINST_GB_STATIC (IDD_PREFERENCE_MULTIINSTANCE_BOX + 1)