From 2818386fb22c8eb8fd05560c69b96b568226a167 Mon Sep 17 00:00:00 2001 From: donho Date: Wed, 14 Jan 2009 20:45:10 +0000 Subject: [PATCH] [BUG_FIXED] Fix a cosmetic bug. Correct a label in installer. git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository@397 f5eea248-9336-0410-98b8-ebc06183d4e3 --- PowerEditor/installer/nppSetup.nsi | 2 +- .../src/WinControls/Preference/preference.rc | 22 +++++++++++-------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/PowerEditor/installer/nppSetup.nsi b/PowerEditor/installer/nppSetup.nsi index aa6389abf..2909df989 100644 --- a/PowerEditor/installer/nppSetup.nsi +++ b/PowerEditor/installer/nppSetup.nsi @@ -621,7 +621,7 @@ SubSection "Plugins" Plugins File "..\bin\plugins\NppExport.dll" SectionEnd - Section "NppExport" ComparePlugin + Section "ComparePlugin" ComparePlugin Delete "$INSTDIR\plugins\ComparePlugin.dll" SetOutPath "$INSTDIR\plugins" File "..\bin\plugins\ComparePlugin.dll" diff --git a/PowerEditor/src/WinControls/Preference/preference.rc b/PowerEditor/src/WinControls/Preference/preference.rc index 686409c30..91c25a917 100644 --- a/PowerEditor/src/WinControls/Preference/preference.rc +++ b/PowerEditor/src/WinControls/Preference/preference.rc @@ -32,15 +32,16 @@ BEGIN PUSHBUTTON "Close",IDC_BUTTON_CLOSE,174,206,45,14 END + IDD_PREFERENCE_BAR_BOX DIALOGEX 0, 0, 370, 180 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Tool bar",IDC_TOOLBAR_GB_STATIC,17,47,147,68,BS_CENTER - CONTROL "Hide",IDC_CHECK_HIDE,"Button",BS_AUTOCHECKBOX,24,57,94,10 - CONTROL "Small icons",IDC_RADIO_SMALLICON,"Button",BS_AUTORADIOBUTTON,24,71,114,10 - CONTROL "Big icons",IDC_RADIO_BIGICON,"Button",BS_AUTORADIOBUTTON,24,85,109,10 - CONTROL "Small standard icons",IDC_RADIO_STANDARD,"Button",BS_AUTORADIOBUTTON,24,99,119,10 + GROUPBOX "Tool bar",IDC_TOOLBAR_GB_STATIC,17,45,147,68,BS_CENTER + CONTROL "Hide",IDC_CHECK_HIDE,"Button",BS_AUTOCHECKBOX,24,55,94,10 + CONTROL "Small icons",IDC_RADIO_SMALLICON,"Button",BS_AUTORADIOBUTTON,24,69,114,10 + CONTROL "Big icons",IDC_RADIO_BIGICON,"Button",BS_AUTORADIOBUTTON,24,83,109,10 + CONTROL "Small standard icons",IDC_RADIO_STANDARD,"Button",BS_AUTORADIOBUTTON,24,97,119,10 GROUPBOX "Tab bar",IDC_TABBAR_GB_STATIC,183,6,176,151,BS_CENTER CONTROL "Hide",IDC_CHECK_TAB_HIDE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,189,16,108,10 CONTROL "Multi-Line",IDC_CHECK_TAB_MULTILINE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,189,30,134,10 @@ -49,11 +50,14 @@ BEGIN CONTROL "Lock (No Drag N Drop)",IDC_CHECK_LOCK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,189,73,134,10 CONTROL "Draw the inactive tabs",IDC_CHECK_DRAWINACTIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,189,88,134,10 CONTROL "Draw the orange top bar",IDC_CHECK_ORANGE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,189,103,133,10 - CONTROL "Enable close button on each tab",IDC_CHECK_ENABLETABCLOSE, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,189,118,133,10 - CONTROL "Double click to close document",IDC_CHECK_DBCLICK2CLOSE, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,189,133,133,10 + CONTROL "Enable close button on each tab",IDC_CHECK_ENABLETABCLOSE, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,189,118,133,10 + CONTROL "Double click to close document",IDC_CHECK_DBCLICK2CLOSE, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,189,133,133,10 CONTROL "Show Status Bar",IDC_CHECK_SHOWSTATUSBAR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,163,130,10 - GROUPBOX "Menu bar",IDC_MENUBAR_GB_STATIC,17,120,147,35,BS_CENTER - CONTROL "Hide (Use Alt or F10 key to toggle it)",IDC_CHECK_HIDEMENUBAR,"Button",BS_AUTOCHECKBOX | BS_MULTILINE,24,127,135,25 + GROUPBOX "Menu bar",IDC_MENUBAR_GB_STATIC,17,117,147,40,BS_CENTER + CONTROL "Hide (Use Alt or F10 key to toggle it)",IDC_CHECK_HIDEMENUBAR, + "Button",BS_AUTOCHECKBOX | BS_MULTILINE,24,127,135,25 GROUPBOX "Localization",IDC_LOCALIZATION_GB_STATIC,17,6,147,35,BS_CENTER COMBOBOX IDC_COMBO_LOCALIZATION,28,20,119,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END