diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 150ffc24af..e71aae3f21 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,24 @@ The license applies to all entries newer than 2009-04-28. */ +2010-06-15 19:02 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) + * contrib/hbide/resources/setup.ui + * contrib/hbide/resources/setup.uic + * contrib/hbide/hbide.ch + * contrib/hbide/hbide.prg + * contrib/hbide/idedocks.prg + * contrib/hbide/idesaveload.prg + * contrib/hbide/idestylesheets.prg + + Implemented: OS system themes via "Setup" dialog. + Animation mode and system theme ( both settable via "Setup" ) + are remembered for next run. Please do not set "macintosh" theme + on windows machines, it GPF's. + + % Enhanced: "Setup" dialog with fields to hold settings for + variety of actions. Please have a look into them and propose more. + Currently only Theme and Animation mode, two actions are active + in real-time. + 2010-06-15 20:38 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * INSTALL * config/detfun.mk diff --git a/harbour/contrib/hbide/hbide.ch b/harbour/contrib/hbide/hbide.ch index 2b2463c4aa..2469f9734d 100644 --- a/harbour/contrib/hbide/hbide.ch +++ b/harbour/contrib/hbide/hbide.ch @@ -114,9 +114,11 @@ #define LineNumbersDisplayMode 26 #define HorzRulerDisplayMode 27 #define ToolsDialogGeometry 28 +#define IdeTheme 29 +#define IdeAnimated 30 -#define INI_HBIDE_VRBLS 28 +#define INI_HBIDE_VRBLS 30 /* .hbi structure constants */ #define PRJ_PRP_PROPERTIES 1 diff --git a/harbour/contrib/hbide/hbide.prg b/harbour/contrib/hbide/hbide.prg index 5e22169efa..712cc4e276 100644 --- a/harbour/contrib/hbide/hbide.prg +++ b/harbour/contrib/hbide/hbide.prg @@ -506,6 +506,10 @@ METHOD HbIde:create( aParams ) /* Request Main Window to Appear on the Screen */ ::oHM:refresh() + + ::oDK:animateComponents( val( ::aINI[ INI_HBIDE, IdeAnimated ] ) ) + ::oSetup:setSystemStyle( ::aINI[ INI_HBIDE, IdeTheme ] ) + ::oDlg:Show() IF ::nRunMode == HBIDE_RUN_MODE_PRG ::oDockPT:hide() @@ -680,8 +684,7 @@ METHOD HbIde:execAction( cKey ) ::oDK:setView( "Stats" ) EXIT CASE "Animate" - ::nAnimantionMode := iif( ::nAnimantionMode == HBIDE_ANIMATION_NONE, HBIDE_ANIMATION_GRADIENT, HBIDE_ANIMATION_NONE ) - ::oDK:animateComponents( ::nAnimantionMode ) + ::oDK:animateComponents() // ::nAnimantionMode ) EXIT CASE "Setup" ::oSetup:show() diff --git a/harbour/contrib/hbide/idedocks.prg b/harbour/contrib/hbide/idedocks.prg index 3c79278ae7..673c009474 100644 --- a/harbour/contrib/hbide/idedocks.prg +++ b/harbour/contrib/hbide/idedocks.prg @@ -720,7 +720,7 @@ METHOD IdeDocks:buildToolBarPanels() ::qTBarDocks:setStyleSheet( GetStyleSheet( "QToolBarLR5", ::nAnimantionMode ) ) ::qTBarDocks:setObjectName( "ToolBar_Docks" ) ::qTBarDocks:setWindowTitle( "ToolBar: Dockable Widgets" ) - ::qTBarDocks:setIconSize( QSize():new( 16,16 ) ) + ::qTBarDocks:setIconSize( qSize ) ::qTBarDocks:setToolButtonStyle( Qt_ToolButtonIconOnly ) ::qTBarDocks:setAllowedAreas( Qt_LeftToolBarArea + Qt_RightToolBarArea + Qt_TopToolBarArea + Qt_BottomToolBarArea ) @@ -1258,6 +1258,13 @@ METHOD IdeDocks:getMarkWidget( nIndex ) METHOD IdeDocks:animateComponents( nMode ) LOCAL cStyle + IF nMode == NIL + ::oIde:nAnimantionMode := iif( ::nAnimantionMode == HBIDE_ANIMATION_NONE, HBIDE_ANIMATION_GRADIENT, HBIDE_ANIMATION_NONE ) + nMode := ::nAnimantionMode + ENDIF + ::oIde:nAnimantionMode := nMode + ::oIde:aINI[ INI_HBIDE, IdeAnimated ] := hb_ntos( ::nAnimantionMode ) + ::oDlg:menubar():setStyleSheet( GetStyleSheet( "QMenuBar", nMode ) ) ::qTBarPanels:setStyleSheet( GetStyleSheet( "QToolBarLR5", nMode ) ) @@ -1270,20 +1277,20 @@ METHOD IdeDocks:animateComponents( nMode ) cStyle := GetStyleSheet( "QDockWidget", nMode ) - ::oDockPT:oWidget:setStyleSheet( cStyle ) - ::oDockED:oWidget:setStyleSheet( cStyle ) + ::oDockPT:oWidget :setStyleSheet( cStyle ) + ::oDockED:oWidget :setStyleSheet( cStyle ) ::oSkltnsTreeDock:oWidget:setStyleSheet( cStyle ) - ::oHelpDock:oWidget:setStyleSheet( cStyle ) - ::oDocViewDock:oWidget:setStyleSheet( cStyle ) - ::oDocWriteDock:oWidget:setStyleSheet( cStyle ) - ::oFuncDock:oWidget:setStyleSheet( cStyle ) - ::oFunctionsDock:oWidget:setStyleSheet( cStyle ) + ::oHelpDock:oWidget :setStyleSheet( cStyle ) + ::oDocViewDock:oWidget :setStyleSheet( cStyle ) + ::oDocWriteDock:oWidget :setStyleSheet( cStyle ) + ::oFuncDock:oWidget :setStyleSheet( cStyle ) + ::oFunctionsDock:oWidget :setStyleSheet( cStyle ) ::oPropertiesDock:oWidget:setStyleSheet( cStyle ) - ::oEnvironDock:oWidget:setStyleSheet( cStyle ) - ::oSkeltnDock:oWidget:setStyleSheet( cStyle ) - ::oThemesDock:oWidget:setStyleSheet( cStyle ) - ::oFindDock:oWidget:setStyleSheet( cStyle ) - ::oDockB2:oWidget:setStyleSheet( cStyle ) + ::oEnvironDock:oWidget :setStyleSheet( cStyle ) + ::oSkeltnDock:oWidget :setStyleSheet( cStyle ) + ::oThemesDock:oWidget :setStyleSheet( cStyle ) + ::oFindDock:oWidget :setStyleSheet( cStyle ) + ::oDockB2:oWidget :setStyleSheet( cStyle ) #if 1 // should be iteration diff --git a/harbour/contrib/hbide/idesaveload.prg b/harbour/contrib/hbide/idesaveload.prg index 68c54db54d..a392cc08ec 100644 --- a/harbour/contrib/hbide/idesaveload.prg +++ b/harbour/contrib/hbide/idesaveload.prg @@ -144,6 +144,8 @@ HB_TRACE( HB_TR_ALWAYS, "hbide_saveINI( oIde )", 0, oIde:nRunMode, oIde:cProjIni aadd( txt_, "LineNumbersDisplayMode=" + iif( oIde:lLineNumbersVisible, "YES", "NO" ) ) aadd( txt_, "HorzRulerDisplayMode=" + iif( oIde:lHorzRulerVisible, "YES", "NO" ) ) aadd( txt_, "ToolsDialogGeometry=" + oIde:aIni[ INI_HBIDE, ToolsDialogGeometry ] ) + aadd( txt_, "IdeTheme=" + oIde:aIni[ INI_HBIDE, IdeTheme ] ) + aadd( txt_, "IdeAnimated=" + oIde:aIni[ INI_HBIDE, IdeAnimated ] ) aadd( txt_, " " ) aadd( txt_, "[PROJECTS]" ) @@ -299,7 +301,7 @@ FUNCTION hbide_loadINI( oIde, cHbideIni ) "currentreplace" , "currentfolderfind" , "currentview" , ; "currentharbour" , "currentshortcuts" , "textfileextensions" , ; "currentlinehighlightmode", "linenumbersdisplaymode", "horzrulerdisplaymode", ; - "toolsdialoggeometry" ; + "toolsdialoggeometry", "idetheme" , "ideanimated" ; } #if 0 @@ -596,7 +598,9 @@ FUNCTION hbide_saveShortcuts( oIde, a_, cFileShortcuts ) CLASS IdeSetup INHERIT IdeObject DATA aItems INIT {} - DATA aTree INIT { "General", "Selections", "Projects", "Files", "Variables", "Backups" } + DATA aTree INIT { "General", "Selections", "Font", "Paths", "Variables", "Dictionaries" } + DATA aStyles INIT { "default", "cleanlooks", "windows", "windowsxp", ; + "windowsvista", "cde", "motif", "plastique", "macintosh" } METHOD new( oIde ) METHOD create( oIde ) @@ -604,6 +608,7 @@ CLASS IdeSetup INHERIT IdeObject METHOD show() METHOD execEvent( cEvent, p ) METHOD buildTree() + METHOD setSystemStyle( cStyle ) ENDCLASS @@ -616,6 +621,8 @@ METHOD IdeSetup:new( oIde ) /*----------------------------------------------------------------------*/ METHOD IdeSetup:create( oIde ) + LOCAL cStyle + DEFAULT oIde TO ::oIde ::oIde := oIde @@ -637,6 +644,14 @@ METHOD IdeSetup:create( oIde ) ::oUI:q_buttonUp :setIcon( hbide_image( "dc_up" ) ) ::oUI:q_buttonDown:setIcon( hbide_image( "dc_down" ) ) + + ::oUI:q_buttonPathIni :setIcon( hbide_image( "open" ) ) + ::oUI:q_buttonPathHbmk2 :setIcon( hbide_image( "open" ) ) + ::oUI:q_buttonPathSnippets :setIcon( hbide_image( "open" ) ) + ::oUI:q_buttonPathEnv :setIcon( hbide_image( "open" ) ) + ::oUI:q_buttonPathShortcuts:setIcon( hbide_image( "open" ) ) + ::oUI:q_buttonPathThemes :setIcon( hbide_image( "open" ) ) + ::buildTree() ::connect( ::oUI:q_buttonClose, "clicked()" , {|| ::execEvent( "buttonClose_clicked" ) } ) @@ -644,6 +659,15 @@ METHOD IdeSetup:create( oIde ) ::oUI:q_treeWidget:setCurrentItem( ::aItems[ 2 ] ) /* General */ + FOR EACH cStyle IN ::aStyles + ::oUI:q_comboStyle:addItem( cStyle ) + NEXT + ::oUI:q_comboStyle:setCurrentIndex( 0 ) + ::connect( ::oUI:q_comboStyle, "currentIndexChanged(int)", {|p| ::execEvent( "comboStyle_currentIndexChanged", p ) } ) + + ::oUI:q_checkAnimated:setChecked( val( ::oIde:aINI[ INI_HBIDE, IdeAnimated ] ) > 0 ) + ::connect( ::oUI:q_checkAnimated, "stateChanged(int)", {|i| ::execEvent( "checkAnimated_stateChanged", i ) } ) + ::oUI:hide() ENDIF @@ -654,8 +678,9 @@ METHOD IdeSetup:create( oIde ) METHOD IdeSetup:destroy() IF !empty( ::oUI ) - ::disConnect( ::oUI:q_buttonClose, "clicked()" ) - ::disConnect( ::oUI:q_treeWidget , "itemSelectionChanged()" ) + ::disConnect( ::oUI:q_buttonClose, "clicked()" ) + ::disConnect( ::oUI:q_treeWidget , "itemSelectionChanged()" ) + ::disconnect( ::oUI:q_comboStyle , "currentIndexChanged(int)" ) ::oUI:destroy() ENDIF @@ -675,9 +700,10 @@ METHOD IdeSetup:show() METHOD IdeSetup:execEvent( cEvent, p ) LOCAL qItem, nIndex - HB_SYMBOL_UNUSED( p ) - SWITCH cEvent + CASE "checkAnimated_stateChanged" + ::oDK:animateComponents( iif( p == 0, 0, 1 ) ) + EXIT CASE "treeWidget_itemSelectionChanged" qItem := QTreeWidgetItem():from( ::oUI:q_treeWidget:currentItem() ) IF ( nIndex := ascan( ::aTree, qItem:text() ) ) > 0 @@ -689,6 +715,12 @@ METHOD IdeSetup:execEvent( cEvent, p ) ::oUI:done( 1 ) EXIT + CASE "comboStyle_currentIndexChanged" + IF ( nIndex := ::oUI:q_comboStyle:currentIndex() ) > -1 + ::oIde:aINI[ INI_HBIDE, IdeTheme ] := ::aStyles[ nIndex + 1 ] + ::setSystemStyle( ::aStyles[ nIndex + 1 ] ) + ENDIF + EXIT ENDSWITCH RETURN Self @@ -720,5 +752,17 @@ METHOD IdeSetup:buildTree() /*----------------------------------------------------------------------*/ +METHOD IdeSetup:setSystemStyle( cStyle ) + LOCAL oApp, qFactory + + IF !empty( cStyle ) + oApp := QApplication():new() + qFactory := QStyleFactory():new() + oApp:setStyle( qFactory:create( cStyle ) ) + ENDIF + + RETURN Self + +/*----------------------------------------------------------------------*/ diff --git a/harbour/contrib/hbide/idestylesheets.prg b/harbour/contrib/hbide/idestylesheets.prg index f84839ef84..41705956c7 100644 --- a/harbour/contrib/hbide/idestylesheets.prg +++ b/harbour/contrib/hbide/idestylesheets.prg @@ -333,7 +333,7 @@ FUNCTION GetStyleSheet( cWidget, nMode ) IF nMode == HBIDE_ANIMATION_GRADIENT aadd( txt_, 'QTabWidget::pane { /* The tab widget frame */ ' ) - aadd( txt_, ' border-top: 0px solid #C2C7CB; ' ) + aadd( txt_, ' border-top: 2px solid #C2C7CB; ' ) aadd( txt_, '} ' ) aadd( txt_, 'QTabWidget::tab-bar { ' ) aadd( txt_, ' background: qlineargradient(x1:0, y1:1, x2:0, y2:0, ' ) @@ -367,7 +367,7 @@ FUNCTION GetStyleSheet( cWidget, nMode ) ELSE aadd( txt_, 'QTabWidget::pane { /* The tab widget frame */ ' ) - aadd( txt_, ' border-top: 0px solid #C2C7CB; ' ) + aadd( txt_, ' border-top: 2px solid #C2C7CB; ' ) aadd( txt_, '} ' ) aadd( txt_, 'QTabWidget::tab-bar { ' ) aadd( txt_, ' /* left: 5px; move to the right by 5px */ ' ) diff --git a/harbour/contrib/hbide/resources/setup.ui b/harbour/contrib/hbide/resources/setup.ui index ade12729d6..5ae4c8cc24 100644 --- a/harbour/contrib/hbide/resources/setup.ui +++ b/harbour/contrib/hbide/resources/setup.ui @@ -43,7 +43,7 @@ 0 - + @@ -68,7 +68,7 @@ Source - + 14 @@ -93,7 +93,7 @@ Line ending mode - + 8 @@ -106,7 +106,7 @@ Auto detected - + 8 @@ -119,7 +119,7 @@ OS dependent - + 8 @@ -132,7 +132,7 @@ CRLF (0D+0A) default - + 8 @@ -145,7 +145,7 @@ CR (0D) - + 8 @@ -171,7 +171,7 @@ TABS - Indents - + 8 @@ -197,7 +197,7 @@ Spaces for a TAB - + 98 @@ -207,7 +207,7 @@ - + 8 @@ -220,7 +220,7 @@ Auto indent - + 8 @@ -246,7 +246,7 @@ Indent size - + 98 @@ -257,7 +257,7 @@ - + 14 @@ -270,7 +270,7 @@ Save source before compiling process starts ? - + 14 @@ -283,7 +283,7 @@ Supress convertion to uppcase of Harbour keywords ? - + 14 @@ -296,7 +296,7 @@ Convert tabs to spaces when a source is loaded ? - + 14 @@ -322,7 +322,7 @@ Display - + 12 @@ -335,7 +335,7 @@ Show horizontal ruler - + 12 @@ -348,7 +348,7 @@ Show line numbers - + 12 @@ -361,23 +361,46 @@ Highlight current line - + - 184 - 16 + 182 + 58 133 19 - Animated Display + Animated ? + + + + + + 182 + 28 + 135 + 22 + + + + + + + 184 + 12 + 46 + 14 + + + + Style: - + @@ -555,7 +578,7 @@ - + @@ -568,9 +591,81 @@ + + + + 10 + 4 + 331 + 81 + + + + Font + + + + + 10 + 18 + 41 + 16 + + + + Name: + + + + + + 52 + 16 + 195 + 20 + + + + + + + 130 + 52 + 57 + 16 + + + + PointSize: + + + + + + 190 + 52 + 57 + 20 + + + + + + + 274 + 16 + 25 + 20 + + + + ... + + + - + @@ -581,11 +676,227 @@ - + Paths + + + + 14 + 72 + 89 + 16 + + + + hbMK2.exe + + + + + + 14 + 88 + 259 + 20 + + + + + + + 14 + 122 + 139 + 16 + + + + Snippets ( hbide.skl ) + + + + + + 14 + 140 + 259 + 20 + + + + + + + 14 + 176 + 197 + 16 + + + + Environments ( hbide.env ) + + + + + + 14 + 194 + 261 + 20 + + + + + + + 14 + 18 + 99 + 16 + + + + hbIDE.ini + + + + + + 14 + 34 + 259 + 20 + + + + + + + 14 + 232 + 143 + 16 + + + + Shortcuts ( hbide.scu ) + + + + + + 14 + 250 + 261 + 20 + + + + + + + 14 + 290 + 183 + 16 + + + + Syntax Themes ( hbide.thm ) + + + + + + 14 + 308 + 261 + 20 + + + + + + + 308 + 34 + 25 + 20 + + + + ... + + + + + + 308 + 88 + 25 + 20 + + + + ... + + + + + + 308 + 140 + 25 + 20 + + + + ... + + + + + + 308 + 194 + 25 + 20 + + + + ... + + + + + + 308 + 250 + 25 + 20 + + + + ... + + + + + + 308 + 308 + 25 + 20 + + + + ... + + - + @@ -662,19 +973,413 @@ - + 0 - 2 + -2 351 - 365 + 369 - + Keywords Dictionaries + + + + 10 + 16 + 243 + 79 + + + + + + + 268 + 16 + 75 + 24 + + + + Add + + + + + + 268 + 44 + 75 + 24 + + + + Delete + + + + + + 10 + 104 + 33 + 16 + + + + Path: + + + + + + 44 + 104 + 237 + 20 + + + + + + + 316 + 104 + 25 + 20 + + + + ... + + + + + + 268 + 78 + 71 + 19 + + + + Active + + + + + + 10 + 168 + 331 + 35 + + + + Auto case convertion ? + + + + + 62 + 12 + 69 + 19 + + + + To Lower + + + + + + 142 + 12 + 69 + 19 + + + + To Upper + + + + + + 226 + 12 + 97 + 19 + + + + As in dictionary + + + + + + 8 + 12 + 63 + 19 + + + + No + + + + + + + 146 + 218 + 193 + 143 + + + + + + + 10 + 126 + 331 + 37 + + + + Apply to + + + + + 246 + 14 + 43 + 19 + + + + Txt + + + + + + 286 + 14 + 43 + 19 + + + + Hbp + + + + + + 6 + 14 + 43 + 19 + + + + Prg + + + + + + 46 + 14 + 39 + 19 + + + + C + + + + + + 206 + 14 + 43 + 19 + + + + Ini + + + + + + 166 + 14 + 43 + 19 + + + + H + + + + + + 80 + 14 + 43 + 19 + + + + Cpp + + + + + + 126 + 14 + 43 + 19 + + + + Ch + + + + + + + 10 + 212 + 123 + 149 + + + + Colors / Fonts + + + + + 8 + 16 + 101 + 19 + + + + Case sensitive ? + + + + + + 8 + 36 + 71 + 19 + + + + Bold + + + + + + 8 + 56 + 71 + 19 + + + + Italics + + + + + + 8 + 78 + 71 + 19 + + + + Underline + + + + + + 8 + 100 + 71 + 19 + + + + Text color + + + + + + 8 + 124 + 75 + 19 + + + + Background + + + + + + 88 + 98 + 25 + 20 + + + + ... + + + + + + 88 + 124 + 25 + 20 + + + + ... + + + diff --git a/harbour/contrib/hbide/resources/setup.uic b/harbour/contrib/hbide/resources/setup.uic index d47ba29f43..73def251ef 100644 --- a/harbour/contrib/hbide/resources/setup.uic +++ b/harbour/contrib/hbide/resources/setup.uic @@ -1,10 +1,10 @@ /******************************************************************************** -** Form generated from reading UI file 'setup.ui' +** Form generated from reading ui file 'setup.ui' ** -** Created: Sun Jun 13 18:46:20 2010 -** by: Qt User Interface Compiler version 4.6.2 +** Created: Tue Jun 15 17:29:54 2010 +** by: Qt User Interface Compiler version 4.5.3 ** -** WARNING! All changes made in this file will be lost when recompiling UI file! +** WARNING! All changes made in this file will be lost when recompiling ui file! ********************************************************************************/ #ifndef SETUP_H @@ -21,6 +21,8 @@ #include #include #include +#include +#include #include #include #include @@ -36,32 +38,36 @@ class Ui_DialogSetup public: QTreeWidget *treeWidget; QStackedWidget *stackedWidget; - QWidget *page; + QWidget *pageGeneral; QGroupBox *groupBox; QGroupBox *groupBox_11; - QCheckBox *checkBox; + QCheckBox *checkTrimLines; QGroupBox *groupBox_12; - QRadioButton *radioButton_5; - QRadioButton *radioButton_6; - QRadioButton *radioButton_7; - QRadioButton *radioButton_8; - QRadioButton *radioButton_9; + QRadioButton *radioLineEndAuto; + QRadioButton *radioLineEndOS; + QRadioButton *radioLineEndCRLF; + QRadioButton *radioLineEndCR; + QRadioButton *radioLineEndLF; QGroupBox *groupBox_13; - QCheckBox *checkBox_2; + QCheckBox *checkTab2Spc; QLabel *label_4; - QLineEdit *lineEdit; - QCheckBox *checkBox_11; - QCheckBox *checkBox_6; + QLineEdit *editSpcPerTab; + QCheckBox *checkAutoIndent; + QCheckBox *checkSmartIndent; QLabel *label_5; - QLineEdit *lineEdit_2; - QCheckBox *checkBox_10; - QCheckBox *checkBox_7; - QCheckBox *checkBox_8; + QLineEdit *editIndentSize; + QCheckBox *checkSaveSrcOnComp; + QCheckBox *checkNoHBKeysCaseConv; + QCheckBox *checkConvTabsOnLoad; + QCheckBox *checkReturnAtBegin; QGroupBox *groupBox_14; - QCheckBox *checkBox_3; - QCheckBox *checkBox_4; - QCheckBox *checkBox_5; - QWidget *page_2; + QCheckBox *checkHorzRuler; + QCheckBox *checkLineNumbers; + QCheckBox *checkHilightLine; + QCheckBox *checkAnimated; + QComboBox *comboStyle; + QLabel *label_6; + QWidget *pageSelections; QGroupBox *groupBox_2; QGroupBox *groupBox_6; QLabel *label; @@ -76,19 +82,74 @@ public: QGroupBox *groupBox_9; QRadioButton *radioButton_3; QRadioButton *radioButton_4; - QWidget *page_3; + QWidget *pageFontEtc; QGroupBox *groupBox_3; - QWidget *page_4; + QGroupBox *groupBox_15; + QLabel *label_7; + QLineEdit *editFontName; + QLabel *label_8; + QLineEdit *editPointSize; + QToolButton *buttonSelFont; + QWidget *pagePaths; QGroupBox *groupBox_4; - QWidget *page_5; + QLabel *label_9; + QLineEdit *editPathHbmk2; + QLabel *label_10; + QLineEdit *editPathSnippets; + QLabel *label_11; + QLineEdit *editPathEnv; + QLabel *label_12; + QLineEdit *editPathIni; + QLabel *label_13; + QLineEdit *editPathShortcuts; + QLabel *label_14; + QLineEdit *editPathThemes; + QToolButton *buttonPathIni; + QToolButton *buttonPathHbmk2; + QToolButton *buttonPathSnippets; + QToolButton *buttonPathEnv; + QToolButton *buttonPathShortcuts; + QToolButton *buttonPathThemes; + QWidget *pageVariables; QGroupBox *groupBox_5; QTableWidget *tableVar; QToolButton *buttonAdd; QToolButton *buttonDel; QToolButton *buttonDown; QToolButton *buttonUp; - QWidget *page_6; + QWidget *pageDictionaries; QGroupBox *groupBox_10; + QListWidget *listDictNames; + QPushButton *buttonDictAdd; + QPushButton *buttonDictDelete; + QLabel *label_16; + QLineEdit *editDictPath; + QToolButton *buttonDictPath; + QCheckBox *checkDictActive; + QGroupBox *groupBox_16; + QRadioButton *radioDictToLower; + QRadioButton *radioDictToUpper; + QRadioButton *radioButton_7; + QRadioButton *radioDictConvNone; + QPlainTextEdit *plainKeywords; + QGroupBox *groupBox_17; + QCheckBox *checkDictToTxt; + QCheckBox *checkDictToHbp; + QCheckBox *checkDictToPrg; + QCheckBox *checkDictToC; + QCheckBox *checkDictToIni; + QCheckBox *checkDictToH; + QCheckBox *checkDictToCpp; + QCheckBox *checkDictToCh; + QGroupBox *groupBox_18; + QCheckBox *checkDictCaseSens; + QCheckBox *checkDictBold; + QCheckBox *checkDictItalic; + QCheckBox *checkDictULine; + QCheckBox *checkDictColorText; + QCheckBox *checkDictColorBack; + QToolButton *buttonDictColorText; + QToolButton *buttonDictColorBack; QPushButton *buttonClose; QPushButton *buttonCancel; QPushButton *buttonOk; @@ -108,84 +169,96 @@ public: stackedWidget = new QStackedWidget(DialogSetup); stackedWidget->setObjectName(QString::fromUtf8("stackedWidget")); stackedWidget->setGeometry(QRect(116, 8, 351, 367)); - page = new QWidget(); - page->setObjectName(QString::fromUtf8("page")); - groupBox = new QGroupBox(page); + pageGeneral = new QWidget(); + pageGeneral->setObjectName(QString::fromUtf8("pageGeneral")); + groupBox = new QGroupBox(pageGeneral); groupBox->setObjectName(QString::fromUtf8("groupBox")); groupBox->setGeometry(QRect(0, 0, 351, 365)); groupBox_11 = new QGroupBox(groupBox); groupBox_11->setObjectName(QString::fromUtf8("groupBox_11")); groupBox_11->setGeometry(QRect(10, 2, 331, 265)); - checkBox = new QCheckBox(groupBox_11); - checkBox->setObjectName(QString::fromUtf8("checkBox")); - checkBox->setGeometry(QRect(14, 18, 301, 19)); + checkTrimLines = new QCheckBox(groupBox_11); + checkTrimLines->setObjectName(QString::fromUtf8("checkTrimLines")); + checkTrimLines->setGeometry(QRect(14, 18, 301, 19)); groupBox_12 = new QGroupBox(groupBox_11); groupBox_12->setObjectName(QString::fromUtf8("groupBox_12")); groupBox_12->setGeometry(QRect(10, 120, 147, 135)); - radioButton_5 = new QRadioButton(groupBox_12); - radioButton_5->setObjectName(QString::fromUtf8("radioButton_5")); - radioButton_5->setGeometry(QRect(8, 42, 99, 19)); - radioButton_6 = new QRadioButton(groupBox_12); - radioButton_6->setObjectName(QString::fromUtf8("radioButton_6")); - radioButton_6->setGeometry(QRect(8, 64, 99, 19)); - radioButton_7 = new QRadioButton(groupBox_12); - radioButton_7->setObjectName(QString::fromUtf8("radioButton_7")); - radioButton_7->setGeometry(QRect(8, 20, 131, 19)); - radioButton_8 = new QRadioButton(groupBox_12); - radioButton_8->setObjectName(QString::fromUtf8("radioButton_8")); - radioButton_8->setGeometry(QRect(8, 86, 82, 19)); - radioButton_9 = new QRadioButton(groupBox_12); - radioButton_9->setObjectName(QString::fromUtf8("radioButton_9")); - radioButton_9->setGeometry(QRect(8, 110, 82, 19)); + radioLineEndAuto = new QRadioButton(groupBox_12); + radioLineEndAuto->setObjectName(QString::fromUtf8("radioLineEndAuto")); + radioLineEndAuto->setGeometry(QRect(8, 108, 99, 19)); + radioLineEndOS = new QRadioButton(groupBox_12); + radioLineEndOS->setObjectName(QString::fromUtf8("radioLineEndOS")); + radioLineEndOS->setGeometry(QRect(8, 86, 99, 19)); + radioLineEndCRLF = new QRadioButton(groupBox_12); + radioLineEndCRLF->setObjectName(QString::fromUtf8("radioLineEndCRLF")); + radioLineEndCRLF->setGeometry(QRect(8, 20, 131, 19)); + radioLineEndCR = new QRadioButton(groupBox_12); + radioLineEndCR->setObjectName(QString::fromUtf8("radioLineEndCR")); + radioLineEndCR->setGeometry(QRect(8, 42, 82, 19)); + radioLineEndLF = new QRadioButton(groupBox_12); + radioLineEndLF->setObjectName(QString::fromUtf8("radioLineEndLF")); + radioLineEndLF->setGeometry(QRect(8, 64, 82, 19)); groupBox_13 = new QGroupBox(groupBox_11); groupBox_13->setObjectName(QString::fromUtf8("groupBox_13")); groupBox_13->setGeometry(QRect(172, 120, 149, 135)); - checkBox_2 = new QCheckBox(groupBox_13); - checkBox_2->setObjectName(QString::fromUtf8("checkBox_2")); - checkBox_2->setGeometry(QRect(8, 18, 131, 19)); + checkTab2Spc = new QCheckBox(groupBox_13); + checkTab2Spc->setObjectName(QString::fromUtf8("checkTab2Spc")); + checkTab2Spc->setGeometry(QRect(8, 18, 131, 19)); label_4 = new QLabel(groupBox_13); label_4->setObjectName(QString::fromUtf8("label_4")); label_4->setGeometry(QRect(8, 42, 85, 16)); - lineEdit = new QLineEdit(groupBox_13); - lineEdit->setObjectName(QString::fromUtf8("lineEdit")); - lineEdit->setGeometry(QRect(98, 42, 39, 20)); - checkBox_11 = new QCheckBox(groupBox_13); - checkBox_11->setObjectName(QString::fromUtf8("checkBox_11")); - checkBox_11->setGeometry(QRect(8, 64, 89, 19)); - checkBox_6 = new QCheckBox(groupBox_13); - checkBox_6->setObjectName(QString::fromUtf8("checkBox_6")); - checkBox_6->setGeometry(QRect(8, 86, 87, 19)); + editSpcPerTab = new QLineEdit(groupBox_13); + editSpcPerTab->setObjectName(QString::fromUtf8("editSpcPerTab")); + editSpcPerTab->setGeometry(QRect(98, 42, 39, 20)); + checkAutoIndent = new QCheckBox(groupBox_13); + checkAutoIndent->setObjectName(QString::fromUtf8("checkAutoIndent")); + checkAutoIndent->setGeometry(QRect(8, 64, 89, 19)); + checkSmartIndent = new QCheckBox(groupBox_13); + checkSmartIndent->setObjectName(QString::fromUtf8("checkSmartIndent")); + checkSmartIndent->setGeometry(QRect(8, 86, 87, 19)); label_5 = new QLabel(groupBox_13); label_5->setObjectName(QString::fromUtf8("label_5")); label_5->setGeometry(QRect(8, 108, 59, 16)); - lineEdit_2 = new QLineEdit(groupBox_13); - lineEdit_2->setObjectName(QString::fromUtf8("lineEdit_2")); - lineEdit_2->setGeometry(QRect(98, 104, 39, 20)); - checkBox_10 = new QCheckBox(groupBox_11); - checkBox_10->setObjectName(QString::fromUtf8("checkBox_10")); - checkBox_10->setGeometry(QRect(14, 42, 301, 19)); - checkBox_7 = new QCheckBox(groupBox_11); - checkBox_7->setObjectName(QString::fromUtf8("checkBox_7")); - checkBox_7->setGeometry(QRect(14, 66, 301, 19)); - checkBox_8 = new QCheckBox(groupBox_11); - checkBox_8->setObjectName(QString::fromUtf8("checkBox_8")); - checkBox_8->setGeometry(QRect(14, 92, 301, 19)); + editIndentSize = new QLineEdit(groupBox_13); + editIndentSize->setObjectName(QString::fromUtf8("editIndentSize")); + editIndentSize->setGeometry(QRect(98, 104, 39, 20)); + checkSaveSrcOnComp = new QCheckBox(groupBox_11); + checkSaveSrcOnComp->setObjectName(QString::fromUtf8("checkSaveSrcOnComp")); + checkSaveSrcOnComp->setGeometry(QRect(14, 36, 301, 19)); + checkNoHBKeysCaseConv = new QCheckBox(groupBox_11); + checkNoHBKeysCaseConv->setObjectName(QString::fromUtf8("checkNoHBKeysCaseConv")); + checkNoHBKeysCaseConv->setGeometry(QRect(14, 56, 301, 19)); + checkConvTabsOnLoad = new QCheckBox(groupBox_11); + checkConvTabsOnLoad->setObjectName(QString::fromUtf8("checkConvTabsOnLoad")); + checkConvTabsOnLoad->setGeometry(QRect(14, 96, 301, 19)); + checkReturnAtBegin = new QCheckBox(groupBox_11); + checkReturnAtBegin->setObjectName(QString::fromUtf8("checkReturnAtBegin")); + checkReturnAtBegin->setGeometry(QRect(14, 76, 301, 19)); groupBox_14 = new QGroupBox(groupBox); groupBox_14->setObjectName(QString::fromUtf8("groupBox_14")); - groupBox_14->setGeometry(QRect(10, 272, 157, 83)); - checkBox_3 = new QCheckBox(groupBox_14); - checkBox_3->setObjectName(QString::fromUtf8("checkBox_3")); - checkBox_3->setGeometry(QRect(12, 16, 143, 19)); - checkBox_4 = new QCheckBox(groupBox_14); - checkBox_4->setObjectName(QString::fromUtf8("checkBox_4")); - checkBox_4->setGeometry(QRect(12, 36, 151, 19)); - checkBox_5 = new QCheckBox(groupBox_14); - checkBox_5->setObjectName(QString::fromUtf8("checkBox_5")); - checkBox_5->setGeometry(QRect(12, 58, 149, 19)); - stackedWidget->addWidget(page); - page_2 = new QWidget(); - page_2->setObjectName(QString::fromUtf8("page_2")); - groupBox_2 = new QGroupBox(page_2); + groupBox_14->setGeometry(QRect(10, 272, 331, 83)); + checkHorzRuler = new QCheckBox(groupBox_14); + checkHorzRuler->setObjectName(QString::fromUtf8("checkHorzRuler")); + checkHorzRuler->setGeometry(QRect(12, 16, 143, 19)); + checkLineNumbers = new QCheckBox(groupBox_14); + checkLineNumbers->setObjectName(QString::fromUtf8("checkLineNumbers")); + checkLineNumbers->setGeometry(QRect(12, 36, 151, 19)); + checkHilightLine = new QCheckBox(groupBox_14); + checkHilightLine->setObjectName(QString::fromUtf8("checkHilightLine")); + checkHilightLine->setGeometry(QRect(12, 58, 149, 19)); + checkAnimated = new QCheckBox(groupBox_14); + checkAnimated->setObjectName(QString::fromUtf8("checkAnimated")); + checkAnimated->setGeometry(QRect(182, 58, 133, 19)); + comboStyle = new QComboBox(groupBox_14); + comboStyle->setObjectName(QString::fromUtf8("comboStyle")); + comboStyle->setGeometry(QRect(182, 28, 135, 22)); + label_6 = new QLabel(groupBox_14); + label_6->setObjectName(QString::fromUtf8("label_6")); + label_6->setGeometry(QRect(184, 12, 46, 14)); + stackedWidget->addWidget(pageGeneral); + pageSelections = new QWidget(); + pageSelections->setObjectName(QString::fromUtf8("pageSelections")); + groupBox_2 = new QGroupBox(pageSelections); groupBox_2->setObjectName(QString::fromUtf8("groupBox_2")); groupBox_2->setGeometry(QRect(0, 2, 351, 363)); groupBox_6 = new QGroupBox(groupBox_2); @@ -227,22 +300,94 @@ public: radioButton_4 = new QRadioButton(groupBox_9); radioButton_4->setObjectName(QString::fromUtf8("radioButton_4")); radioButton_4->setGeometry(QRect(124, 6, 59, 19)); - stackedWidget->addWidget(page_2); - page_3 = new QWidget(); - page_3->setObjectName(QString::fromUtf8("page_3")); - groupBox_3 = new QGroupBox(page_3); + stackedWidget->addWidget(pageSelections); + pageFontEtc = new QWidget(); + pageFontEtc->setObjectName(QString::fromUtf8("pageFontEtc")); + groupBox_3 = new QGroupBox(pageFontEtc); groupBox_3->setObjectName(QString::fromUtf8("groupBox_3")); groupBox_3->setGeometry(QRect(0, 2, 351, 365)); - stackedWidget->addWidget(page_3); - page_4 = new QWidget(); - page_4->setObjectName(QString::fromUtf8("page_4")); - groupBox_4 = new QGroupBox(page_4); + groupBox_15 = new QGroupBox(groupBox_3); + groupBox_15->setObjectName(QString::fromUtf8("groupBox_15")); + groupBox_15->setGeometry(QRect(10, 4, 331, 81)); + label_7 = new QLabel(groupBox_15); + label_7->setObjectName(QString::fromUtf8("label_7")); + label_7->setGeometry(QRect(10, 18, 41, 16)); + editFontName = new QLineEdit(groupBox_15); + editFontName->setObjectName(QString::fromUtf8("editFontName")); + editFontName->setGeometry(QRect(52, 16, 195, 20)); + label_8 = new QLabel(groupBox_15); + label_8->setObjectName(QString::fromUtf8("label_8")); + label_8->setGeometry(QRect(130, 52, 57, 16)); + editPointSize = new QLineEdit(groupBox_15); + editPointSize->setObjectName(QString::fromUtf8("editPointSize")); + editPointSize->setGeometry(QRect(190, 52, 57, 20)); + buttonSelFont = new QToolButton(groupBox_15); + buttonSelFont->setObjectName(QString::fromUtf8("buttonSelFont")); + buttonSelFont->setGeometry(QRect(274, 16, 25, 20)); + stackedWidget->addWidget(pageFontEtc); + pagePaths = new QWidget(); + pagePaths->setObjectName(QString::fromUtf8("pagePaths")); + groupBox_4 = new QGroupBox(pagePaths); groupBox_4->setObjectName(QString::fromUtf8("groupBox_4")); groupBox_4->setGeometry(QRect(0, 2, 351, 365)); - stackedWidget->addWidget(page_4); - page_5 = new QWidget(); - page_5->setObjectName(QString::fromUtf8("page_5")); - groupBox_5 = new QGroupBox(page_5); + label_9 = new QLabel(groupBox_4); + label_9->setObjectName(QString::fromUtf8("label_9")); + label_9->setGeometry(QRect(14, 72, 89, 16)); + editPathHbmk2 = new QLineEdit(groupBox_4); + editPathHbmk2->setObjectName(QString::fromUtf8("editPathHbmk2")); + editPathHbmk2->setGeometry(QRect(14, 88, 259, 20)); + label_10 = new QLabel(groupBox_4); + label_10->setObjectName(QString::fromUtf8("label_10")); + label_10->setGeometry(QRect(14, 122, 139, 16)); + editPathSnippets = new QLineEdit(groupBox_4); + editPathSnippets->setObjectName(QString::fromUtf8("editPathSnippets")); + editPathSnippets->setGeometry(QRect(14, 140, 259, 20)); + label_11 = new QLabel(groupBox_4); + label_11->setObjectName(QString::fromUtf8("label_11")); + label_11->setGeometry(QRect(14, 176, 197, 16)); + editPathEnv = new QLineEdit(groupBox_4); + editPathEnv->setObjectName(QString::fromUtf8("editPathEnv")); + editPathEnv->setGeometry(QRect(14, 194, 261, 20)); + label_12 = new QLabel(groupBox_4); + label_12->setObjectName(QString::fromUtf8("label_12")); + label_12->setGeometry(QRect(14, 18, 99, 16)); + editPathIni = new QLineEdit(groupBox_4); + editPathIni->setObjectName(QString::fromUtf8("editPathIni")); + editPathIni->setGeometry(QRect(14, 34, 259, 20)); + label_13 = new QLabel(groupBox_4); + label_13->setObjectName(QString::fromUtf8("label_13")); + label_13->setGeometry(QRect(14, 232, 143, 16)); + editPathShortcuts = new QLineEdit(groupBox_4); + editPathShortcuts->setObjectName(QString::fromUtf8("editPathShortcuts")); + editPathShortcuts->setGeometry(QRect(14, 250, 261, 20)); + label_14 = new QLabel(groupBox_4); + label_14->setObjectName(QString::fromUtf8("label_14")); + label_14->setGeometry(QRect(14, 290, 183, 16)); + editPathThemes = new QLineEdit(groupBox_4); + editPathThemes->setObjectName(QString::fromUtf8("editPathThemes")); + editPathThemes->setGeometry(QRect(14, 308, 261, 20)); + buttonPathIni = new QToolButton(groupBox_4); + buttonPathIni->setObjectName(QString::fromUtf8("buttonPathIni")); + buttonPathIni->setGeometry(QRect(308, 34, 25, 20)); + buttonPathHbmk2 = new QToolButton(groupBox_4); + buttonPathHbmk2->setObjectName(QString::fromUtf8("buttonPathHbmk2")); + buttonPathHbmk2->setGeometry(QRect(308, 88, 25, 20)); + buttonPathSnippets = new QToolButton(groupBox_4); + buttonPathSnippets->setObjectName(QString::fromUtf8("buttonPathSnippets")); + buttonPathSnippets->setGeometry(QRect(308, 140, 25, 20)); + buttonPathEnv = new QToolButton(groupBox_4); + buttonPathEnv->setObjectName(QString::fromUtf8("buttonPathEnv")); + buttonPathEnv->setGeometry(QRect(308, 194, 25, 20)); + buttonPathShortcuts = new QToolButton(groupBox_4); + buttonPathShortcuts->setObjectName(QString::fromUtf8("buttonPathShortcuts")); + buttonPathShortcuts->setGeometry(QRect(308, 250, 25, 20)); + buttonPathThemes = new QToolButton(groupBox_4); + buttonPathThemes->setObjectName(QString::fromUtf8("buttonPathThemes")); + buttonPathThemes->setGeometry(QRect(308, 308, 25, 20)); + stackedWidget->addWidget(pagePaths); + pageVariables = new QWidget(); + pageVariables->setObjectName(QString::fromUtf8("pageVariables")); + groupBox_5 = new QGroupBox(pageVariables); groupBox_5->setObjectName(QString::fromUtf8("groupBox_5")); groupBox_5->setGeometry(QRect(0, 2, 351, 365)); tableVar = new QTableWidget(groupBox_5); @@ -260,13 +405,106 @@ public: buttonUp = new QToolButton(groupBox_5); buttonUp->setObjectName(QString::fromUtf8("buttonUp")); buttonUp->setGeometry(QRect(112, 6, 25, 20)); - stackedWidget->addWidget(page_5); - page_6 = new QWidget(); - page_6->setObjectName(QString::fromUtf8("page_6")); - groupBox_10 = new QGroupBox(page_6); + stackedWidget->addWidget(pageVariables); + pageDictionaries = new QWidget(); + pageDictionaries->setObjectName(QString::fromUtf8("pageDictionaries")); + groupBox_10 = new QGroupBox(pageDictionaries); groupBox_10->setObjectName(QString::fromUtf8("groupBox_10")); - groupBox_10->setGeometry(QRect(0, 2, 351, 365)); - stackedWidget->addWidget(page_6); + groupBox_10->setGeometry(QRect(0, -2, 351, 369)); + listDictNames = new QListWidget(groupBox_10); + listDictNames->setObjectName(QString::fromUtf8("listDictNames")); + listDictNames->setGeometry(QRect(10, 16, 243, 79)); + buttonDictAdd = new QPushButton(groupBox_10); + buttonDictAdd->setObjectName(QString::fromUtf8("buttonDictAdd")); + buttonDictAdd->setGeometry(QRect(268, 16, 75, 24)); + buttonDictDelete = new QPushButton(groupBox_10); + buttonDictDelete->setObjectName(QString::fromUtf8("buttonDictDelete")); + buttonDictDelete->setGeometry(QRect(268, 44, 75, 24)); + label_16 = new QLabel(groupBox_10); + label_16->setObjectName(QString::fromUtf8("label_16")); + label_16->setGeometry(QRect(10, 104, 33, 16)); + editDictPath = new QLineEdit(groupBox_10); + editDictPath->setObjectName(QString::fromUtf8("editDictPath")); + editDictPath->setGeometry(QRect(44, 104, 237, 20)); + buttonDictPath = new QToolButton(groupBox_10); + buttonDictPath->setObjectName(QString::fromUtf8("buttonDictPath")); + buttonDictPath->setGeometry(QRect(316, 104, 25, 20)); + checkDictActive = new QCheckBox(groupBox_10); + checkDictActive->setObjectName(QString::fromUtf8("checkDictActive")); + checkDictActive->setGeometry(QRect(268, 78, 71, 19)); + groupBox_16 = new QGroupBox(groupBox_10); + groupBox_16->setObjectName(QString::fromUtf8("groupBox_16")); + groupBox_16->setGeometry(QRect(10, 168, 331, 35)); + radioDictToLower = new QRadioButton(groupBox_16); + radioDictToLower->setObjectName(QString::fromUtf8("radioDictToLower")); + radioDictToLower->setGeometry(QRect(62, 12, 69, 19)); + radioDictToUpper = new QRadioButton(groupBox_16); + radioDictToUpper->setObjectName(QString::fromUtf8("radioDictToUpper")); + radioDictToUpper->setGeometry(QRect(142, 12, 69, 19)); + radioButton_7 = new QRadioButton(groupBox_16); + radioButton_7->setObjectName(QString::fromUtf8("radioButton_7")); + radioButton_7->setGeometry(QRect(226, 12, 97, 19)); + radioDictConvNone = new QRadioButton(groupBox_16); + radioDictConvNone->setObjectName(QString::fromUtf8("radioDictConvNone")); + radioDictConvNone->setGeometry(QRect(8, 12, 63, 19)); + plainKeywords = new QPlainTextEdit(groupBox_10); + plainKeywords->setObjectName(QString::fromUtf8("plainKeywords")); + plainKeywords->setGeometry(QRect(146, 218, 193, 143)); + groupBox_17 = new QGroupBox(groupBox_10); + groupBox_17->setObjectName(QString::fromUtf8("groupBox_17")); + groupBox_17->setGeometry(QRect(10, 126, 331, 37)); + checkDictToTxt = new QCheckBox(groupBox_17); + checkDictToTxt->setObjectName(QString::fromUtf8("checkDictToTxt")); + checkDictToTxt->setGeometry(QRect(246, 14, 43, 19)); + checkDictToHbp = new QCheckBox(groupBox_17); + checkDictToHbp->setObjectName(QString::fromUtf8("checkDictToHbp")); + checkDictToHbp->setGeometry(QRect(286, 14, 43, 19)); + checkDictToPrg = new QCheckBox(groupBox_17); + checkDictToPrg->setObjectName(QString::fromUtf8("checkDictToPrg")); + checkDictToPrg->setGeometry(QRect(6, 14, 43, 19)); + checkDictToC = new QCheckBox(groupBox_17); + checkDictToC->setObjectName(QString::fromUtf8("checkDictToC")); + checkDictToC->setGeometry(QRect(46, 14, 39, 19)); + checkDictToIni = new QCheckBox(groupBox_17); + checkDictToIni->setObjectName(QString::fromUtf8("checkDictToIni")); + checkDictToIni->setGeometry(QRect(206, 14, 43, 19)); + checkDictToH = new QCheckBox(groupBox_17); + checkDictToH->setObjectName(QString::fromUtf8("checkDictToH")); + checkDictToH->setGeometry(QRect(166, 14, 43, 19)); + checkDictToCpp = new QCheckBox(groupBox_17); + checkDictToCpp->setObjectName(QString::fromUtf8("checkDictToCpp")); + checkDictToCpp->setGeometry(QRect(80, 14, 43, 19)); + checkDictToCh = new QCheckBox(groupBox_17); + checkDictToCh->setObjectName(QString::fromUtf8("checkDictToCh")); + checkDictToCh->setGeometry(QRect(126, 14, 43, 19)); + groupBox_18 = new QGroupBox(groupBox_10); + groupBox_18->setObjectName(QString::fromUtf8("groupBox_18")); + groupBox_18->setGeometry(QRect(10, 212, 123, 149)); + checkDictCaseSens = new QCheckBox(groupBox_18); + checkDictCaseSens->setObjectName(QString::fromUtf8("checkDictCaseSens")); + checkDictCaseSens->setGeometry(QRect(8, 16, 101, 19)); + checkDictBold = new QCheckBox(groupBox_18); + checkDictBold->setObjectName(QString::fromUtf8("checkDictBold")); + checkDictBold->setGeometry(QRect(8, 36, 71, 19)); + checkDictItalic = new QCheckBox(groupBox_18); + checkDictItalic->setObjectName(QString::fromUtf8("checkDictItalic")); + checkDictItalic->setGeometry(QRect(8, 56, 71, 19)); + checkDictULine = new QCheckBox(groupBox_18); + checkDictULine->setObjectName(QString::fromUtf8("checkDictULine")); + checkDictULine->setGeometry(QRect(8, 78, 71, 19)); + checkDictColorText = new QCheckBox(groupBox_18); + checkDictColorText->setObjectName(QString::fromUtf8("checkDictColorText")); + checkDictColorText->setGeometry(QRect(8, 100, 71, 19)); + checkDictColorBack = new QCheckBox(groupBox_18); + checkDictColorBack->setObjectName(QString::fromUtf8("checkDictColorBack")); + checkDictColorBack->setGeometry(QRect(8, 124, 75, 19)); + buttonDictColorText = new QToolButton(groupBox_18); + buttonDictColorText->setObjectName(QString::fromUtf8("buttonDictColorText")); + buttonDictColorText->setGeometry(QRect(88, 98, 25, 20)); + buttonDictColorBack = new QToolButton(groupBox_18); + buttonDictColorBack->setObjectName(QString::fromUtf8("buttonDictColorBack")); + buttonDictColorBack->setGeometry(QRect(88, 124, 25, 20)); + stackedWidget->addWidget(pageDictionaries); buttonClose = new QPushButton(DialogSetup); buttonClose->setObjectName(QString::fromUtf8("buttonClose")); buttonClose->setGeometry(QRect(218, 384, 75, 24)); @@ -279,7 +517,7 @@ public: retranslateUi(DialogSetup); - stackedWidget->setCurrentIndex(0); + stackedWidget->setCurrentIndex(5); QMetaObject::connectSlotsByName(DialogSetup); @@ -290,26 +528,29 @@ public: DialogSetup->setWindowTitle(QApplication::translate("DialogSetup", "Setup", 0, QApplication::UnicodeUTF8)); groupBox->setTitle(QString()); groupBox_11->setTitle(QApplication::translate("DialogSetup", " Source ", 0, QApplication::UnicodeUTF8)); - checkBox->setText(QApplication::translate("DialogSetup", "Trim trailing blanks while source is saved ?", 0, QApplication::UnicodeUTF8)); + checkTrimLines->setText(QApplication::translate("DialogSetup", "Trim trailing blanks while source is saved ?", 0, QApplication::UnicodeUTF8)); groupBox_12->setTitle(QApplication::translate("DialogSetup", " Line ending mode ", 0, QApplication::UnicodeUTF8)); - radioButton_5->setText(QApplication::translate("DialogSetup", "Auto detected", 0, QApplication::UnicodeUTF8)); - radioButton_6->setText(QApplication::translate("DialogSetup", "OS dependent", 0, QApplication::UnicodeUTF8)); - radioButton_7->setText(QApplication::translate("DialogSetup", "CRLF (0D+0A) default", 0, QApplication::UnicodeUTF8)); - radioButton_8->setText(QApplication::translate("DialogSetup", "CR (0D)", 0, QApplication::UnicodeUTF8)); - radioButton_9->setText(QApplication::translate("DialogSetup", "LF (0A)", 0, QApplication::UnicodeUTF8)); + radioLineEndAuto->setText(QApplication::translate("DialogSetup", "Auto detected", 0, QApplication::UnicodeUTF8)); + radioLineEndOS->setText(QApplication::translate("DialogSetup", "OS dependent", 0, QApplication::UnicodeUTF8)); + radioLineEndCRLF->setText(QApplication::translate("DialogSetup", "CRLF (0D+0A) default", 0, QApplication::UnicodeUTF8)); + radioLineEndCR->setText(QApplication::translate("DialogSetup", "CR (0D)", 0, QApplication::UnicodeUTF8)); + radioLineEndLF->setText(QApplication::translate("DialogSetup", "LF (0A)", 0, QApplication::UnicodeUTF8)); groupBox_13->setTitle(QApplication::translate("DialogSetup", " TABS - Indents", 0, QApplication::UnicodeUTF8)); - checkBox_2->setText(QApplication::translate("DialogSetup", "Convert TAB to spaces", 0, QApplication::UnicodeUTF8)); + checkTab2Spc->setText(QApplication::translate("DialogSetup", "Convert TAB to spaces", 0, QApplication::UnicodeUTF8)); label_4->setText(QApplication::translate("DialogSetup", "Spaces for a TAB", 0, QApplication::UnicodeUTF8)); - checkBox_11->setText(QApplication::translate("DialogSetup", "Auto indent", 0, QApplication::UnicodeUTF8)); - checkBox_6->setText(QApplication::translate("DialogSetup", "Smart indent", 0, QApplication::UnicodeUTF8)); + checkAutoIndent->setText(QApplication::translate("DialogSetup", "Auto indent", 0, QApplication::UnicodeUTF8)); + checkSmartIndent->setText(QApplication::translate("DialogSetup", "Smart indent", 0, QApplication::UnicodeUTF8)); label_5->setText(QApplication::translate("DialogSetup", "Indent size", 0, QApplication::UnicodeUTF8)); - checkBox_10->setText(QApplication::translate("DialogSetup", "Save source before compiling process starts ?", 0, QApplication::UnicodeUTF8)); - checkBox_7->setText(QApplication::translate("DialogSetup", "Supress convertion to uppcase of Harbour keywords ?", 0, QApplication::UnicodeUTF8)); - checkBox_8->setText(QApplication::translate("DialogSetup", "Convert tabs to spaces when a source is loaded ?", 0, QApplication::UnicodeUTF8)); + checkSaveSrcOnComp->setText(QApplication::translate("DialogSetup", "Save source before compiling process starts ?", 0, QApplication::UnicodeUTF8)); + checkNoHBKeysCaseConv->setText(QApplication::translate("DialogSetup", "Supress convertion to uppcase of Harbour keywords ?", 0, QApplication::UnicodeUTF8)); + checkConvTabsOnLoad->setText(QApplication::translate("DialogSetup", "Convert tabs to spaces when a source is loaded ?", 0, QApplication::UnicodeUTF8)); + checkReturnAtBegin->setText(QApplication::translate("DialogSetup", "Keyword RETURN be treated as AT-BEGINGING type ?", 0, QApplication::UnicodeUTF8)); groupBox_14->setTitle(QApplication::translate("DialogSetup", " Display ", 0, QApplication::UnicodeUTF8)); - checkBox_3->setText(QApplication::translate("DialogSetup", "Show horizontal ruler", 0, QApplication::UnicodeUTF8)); - checkBox_4->setText(QApplication::translate("DialogSetup", "Show line numbers", 0, QApplication::UnicodeUTF8)); - checkBox_5->setText(QApplication::translate("DialogSetup", "Highlight current line", 0, QApplication::UnicodeUTF8)); + checkHorzRuler->setText(QApplication::translate("DialogSetup", "Show horizontal ruler", 0, QApplication::UnicodeUTF8)); + checkLineNumbers->setText(QApplication::translate("DialogSetup", "Show line numbers", 0, QApplication::UnicodeUTF8)); + checkHilightLine->setText(QApplication::translate("DialogSetup", "Highlight current line", 0, QApplication::UnicodeUTF8)); + checkAnimated->setText(QApplication::translate("DialogSetup", "Animated ?", 0, QApplication::UnicodeUTF8)); + label_6->setText(QApplication::translate("DialogSetup", "Style:", 0, QApplication::UnicodeUTF8)); groupBox_2->setTitle(QString()); groupBox_6->setTitle(QApplication::translate("DialogSetup", "Caret after paste operation", 0, QApplication::UnicodeUTF8)); label->setText(QApplication::translate("DialogSetup", "Stream Selection:", 0, QApplication::UnicodeUTF8)); @@ -323,16 +564,61 @@ public: radioButton_3->setText(QApplication::translate("DialogSetup", "Top", 0, QApplication::UnicodeUTF8)); radioButton_4->setText(QApplication::translate("DialogSetup", "Bottom", 0, QApplication::UnicodeUTF8)); groupBox_3->setTitle(QString()); - groupBox_4->setTitle(QString()); + groupBox_15->setTitle(QApplication::translate("DialogSetup", " Font ", 0, QApplication::UnicodeUTF8)); + label_7->setText(QApplication::translate("DialogSetup", "Name:", 0, QApplication::UnicodeUTF8)); + label_8->setText(QApplication::translate("DialogSetup", "PointSize:", 0, QApplication::UnicodeUTF8)); + buttonSelFont->setText(QApplication::translate("DialogSetup", "...", 0, QApplication::UnicodeUTF8)); + groupBox_4->setTitle(QApplication::translate("DialogSetup", " Paths ", 0, QApplication::UnicodeUTF8)); + label_9->setText(QApplication::translate("DialogSetup", "hbMK2.exe", 0, QApplication::UnicodeUTF8)); + label_10->setText(QApplication::translate("DialogSetup", "Snippets ( hbide.skl )", 0, QApplication::UnicodeUTF8)); + label_11->setText(QApplication::translate("DialogSetup", "Environments ( hbide.env )", 0, QApplication::UnicodeUTF8)); + label_12->setText(QApplication::translate("DialogSetup", "hbIDE.ini", 0, QApplication::UnicodeUTF8)); + label_13->setText(QApplication::translate("DialogSetup", "Shortcuts ( hbide.scu )", 0, QApplication::UnicodeUTF8)); + label_14->setText(QApplication::translate("DialogSetup", "Syntax Themes ( hbide.thm )", 0, QApplication::UnicodeUTF8)); + buttonPathIni->setText(QApplication::translate("DialogSetup", "...", 0, QApplication::UnicodeUTF8)); + buttonPathHbmk2->setText(QApplication::translate("DialogSetup", "...", 0, QApplication::UnicodeUTF8)); + buttonPathSnippets->setText(QApplication::translate("DialogSetup", "...", 0, QApplication::UnicodeUTF8)); + buttonPathEnv->setText(QApplication::translate("DialogSetup", "...", 0, QApplication::UnicodeUTF8)); + buttonPathShortcuts->setText(QApplication::translate("DialogSetup", "...", 0, QApplication::UnicodeUTF8)); + buttonPathThemes->setText(QApplication::translate("DialogSetup", "...", 0, QApplication::UnicodeUTF8)); groupBox_5->setTitle(QString()); buttonAdd->setText(QApplication::translate("DialogSetup", "...", 0, QApplication::UnicodeUTF8)); buttonDel->setText(QApplication::translate("DialogSetup", "...", 0, QApplication::UnicodeUTF8)); buttonDown->setText(QApplication::translate("DialogSetup", "...", 0, QApplication::UnicodeUTF8)); buttonUp->setText(QApplication::translate("DialogSetup", "...", 0, QApplication::UnicodeUTF8)); - groupBox_10->setTitle(QString()); + groupBox_10->setTitle(QApplication::translate("DialogSetup", " Keywords Dictionaries ", 0, QApplication::UnicodeUTF8)); + buttonDictAdd->setText(QApplication::translate("DialogSetup", "Add", 0, QApplication::UnicodeUTF8)); + buttonDictDelete->setText(QApplication::translate("DialogSetup", "Delete", 0, QApplication::UnicodeUTF8)); + label_16->setText(QApplication::translate("DialogSetup", "Path:", 0, QApplication::UnicodeUTF8)); + buttonDictPath->setText(QApplication::translate("DialogSetup", "...", 0, QApplication::UnicodeUTF8)); + checkDictActive->setText(QApplication::translate("DialogSetup", "Active", 0, QApplication::UnicodeUTF8)); + groupBox_16->setTitle(QApplication::translate("DialogSetup", " Auto case convertion ?", 0, QApplication::UnicodeUTF8)); + radioDictToLower->setText(QApplication::translate("DialogSetup", "To Lower", 0, QApplication::UnicodeUTF8)); + radioDictToUpper->setText(QApplication::translate("DialogSetup", "To Upper", 0, QApplication::UnicodeUTF8)); + radioButton_7->setText(QApplication::translate("DialogSetup", "As in dictionary", 0, QApplication::UnicodeUTF8)); + radioDictConvNone->setText(QApplication::translate("DialogSetup", "No", 0, QApplication::UnicodeUTF8)); + groupBox_17->setTitle(QApplication::translate("DialogSetup", " Apply to ", 0, QApplication::UnicodeUTF8)); + checkDictToTxt->setText(QApplication::translate("DialogSetup", "Txt", 0, QApplication::UnicodeUTF8)); + checkDictToHbp->setText(QApplication::translate("DialogSetup", "Hbp", 0, QApplication::UnicodeUTF8)); + checkDictToPrg->setText(QApplication::translate("DialogSetup", "Prg", 0, QApplication::UnicodeUTF8)); + checkDictToC->setText(QApplication::translate("DialogSetup", "C", 0, QApplication::UnicodeUTF8)); + checkDictToIni->setText(QApplication::translate("DialogSetup", "Ini", 0, QApplication::UnicodeUTF8)); + checkDictToH->setText(QApplication::translate("DialogSetup", "H", 0, QApplication::UnicodeUTF8)); + checkDictToCpp->setText(QApplication::translate("DialogSetup", "Cpp", 0, QApplication::UnicodeUTF8)); + checkDictToCh->setText(QApplication::translate("DialogSetup", "Ch", 0, QApplication::UnicodeUTF8)); + groupBox_18->setTitle(QApplication::translate("DialogSetup", " Colors / Fonts ", 0, QApplication::UnicodeUTF8)); + checkDictCaseSens->setText(QApplication::translate("DialogSetup", "Case sensitive ?", 0, QApplication::UnicodeUTF8)); + checkDictBold->setText(QApplication::translate("DialogSetup", "Bold", 0, QApplication::UnicodeUTF8)); + checkDictItalic->setText(QApplication::translate("DialogSetup", "Italics", 0, QApplication::UnicodeUTF8)); + checkDictULine->setText(QApplication::translate("DialogSetup", "Underline", 0, QApplication::UnicodeUTF8)); + checkDictColorText->setText(QApplication::translate("DialogSetup", "Text color", 0, QApplication::UnicodeUTF8)); + checkDictColorBack->setText(QApplication::translate("DialogSetup", "Background", 0, QApplication::UnicodeUTF8)); + buttonDictColorText->setText(QApplication::translate("DialogSetup", "...", 0, QApplication::UnicodeUTF8)); + buttonDictColorBack->setText(QApplication::translate("DialogSetup", "...", 0, QApplication::UnicodeUTF8)); buttonClose->setText(QApplication::translate("DialogSetup", "Close", 0, QApplication::UnicodeUTF8)); buttonCancel->setText(QApplication::translate("DialogSetup", "Cancel", 0, QApplication::UnicodeUTF8)); buttonOk->setText(QApplication::translate("DialogSetup", "Ok", 0, QApplication::UnicodeUTF8)); + Q_UNUSED(DialogSetup); } // retranslateUi };