2010-06-17 19:07 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
* contrib/hbide/resources/setup.ui
* contrib/hbide/resources/setup.uic
* contrib/hbide/hbide.prg
* contrib/hbide/idedocks.prg
* contrib/hbide/ideedit.prg
* contrib/hbide/ideeditor.prg
* contrib/hbide/ideobject.prg
* contrib/hbide/idesaveload.prg
* contrib/hbide/idestylesheets.prg
+ Started: cleaning and extendibility of .ini variables.
This commit is contained in:
@@ -16,6 +16,18 @@
|
||||
The license applies to all entries newer than 2009-04-28.
|
||||
*/
|
||||
|
||||
2010-06-17 19:07 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
|
||||
* contrib/hbide/resources/setup.ui
|
||||
* contrib/hbide/resources/setup.uic
|
||||
* contrib/hbide/hbide.prg
|
||||
* contrib/hbide/idedocks.prg
|
||||
* contrib/hbide/ideedit.prg
|
||||
* contrib/hbide/ideeditor.prg
|
||||
* contrib/hbide/ideobject.prg
|
||||
* contrib/hbide/idesaveload.prg
|
||||
* contrib/hbide/idestylesheets.prg
|
||||
+ Started: cleaning and extendibility of .ini variables.
|
||||
|
||||
2010-06-17 23:14 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
|
||||
* config/globsh.mk
|
||||
+ 'FALSE' variable set for 'nt' shells.
|
||||
|
||||
@@ -144,6 +144,7 @@ CLASS HbIde
|
||||
DATA oTM /* Plugin Tools Manager */
|
||||
DATA oTH /* Themes Manager */
|
||||
DATA oSetup /* Setup Manager */
|
||||
DATA oINI /* INI Manager */
|
||||
|
||||
DATA nRunMode INIT HBIDE_RUN_MODE_INI
|
||||
DATA nAnimantionMode INIT HBIDE_ANIMATION_NONE
|
||||
@@ -385,7 +386,12 @@ METHOD HbIde:create( aParams )
|
||||
/* Initialte Project Manager */
|
||||
::oPM := IdeProjManager():new( Self ):create()
|
||||
|
||||
/* Load IDE Settings */
|
||||
/* INI Manager - array base to be removed later */
|
||||
::oINI := IdeINI():new( Self ):create()
|
||||
IF ::nRunMode == HBIDE_RUN_MODE_INI
|
||||
::oINI:load( ::cProjIni )
|
||||
ENDIF
|
||||
/* Load IDE Settings */ /* TODO: delete */
|
||||
IF ::nRunMode == HBIDE_RUN_MODE_INI
|
||||
hbide_loadINI( Self, ::cProjIni )
|
||||
ENDIF
|
||||
@@ -417,6 +423,10 @@ METHOD HbIde:create( aParams )
|
||||
/* Store to restore when all preliminary operations are completed */
|
||||
cView := ::cWrkView
|
||||
|
||||
/* Setup Manager */
|
||||
::oSetup := IdeSetup():new( Self ):create()
|
||||
::oSetup:setBaseColor()
|
||||
|
||||
/* Load Code Skeletons */
|
||||
hbide_loadSkltns( Self )
|
||||
|
||||
@@ -464,9 +474,6 @@ METHOD HbIde:create( aParams )
|
||||
/* Home Implementation */
|
||||
::oHM := IdeHome():new():create( Self )
|
||||
|
||||
/* Setup Manager */
|
||||
::oSetup := IdeSetup():new( Self ):create()
|
||||
|
||||
/* Fill various elements of the IDE */
|
||||
::cWrkProject := ::aINI[ INI_HBIDE, CurrentProject ]
|
||||
::oPM:populate()
|
||||
@@ -538,13 +545,13 @@ METHOD HbIde:create( aParams )
|
||||
|
||||
IF ::nEvent == xbeP_Quit
|
||||
HB_TRACE( HB_TR_ALWAYS, "---------------- xbeP_Quit" )
|
||||
hbide_saveINI( Self )
|
||||
hbide_saveINI( Self ) ; ::oINI:save()
|
||||
EXIT
|
||||
ENDIF
|
||||
|
||||
IF ::nEvent == xbeP_Close
|
||||
HB_TRACE( HB_TR_ALWAYS, "================ xbeP_Close" )
|
||||
hbide_saveINI( Self )
|
||||
hbide_saveINI( Self ) ; ::oINI:save()
|
||||
::oSM:closeAllSources()
|
||||
EXIT
|
||||
|
||||
|
||||
@@ -577,7 +577,8 @@ METHOD IdeDocks:buildViewWidget( cObjectName )
|
||||
::oStackedWidget:addChild( oFrame )
|
||||
|
||||
oFrame:hbLayout := HBPLAYOUT_TYPE_VERTBOX
|
||||
oFrame:qLayout:setContentsMargins( 2, 2, 2, 2 )
|
||||
//oFrame:qLayout:setContentsMargins( 2, 2, 2, 2 )
|
||||
oFrame:qLayout:setContentsMargins( 0,0,0,0 )
|
||||
|
||||
oFrame:oTabWidget := XbpTabWidget():new():create( oFrame, , {0,0}, {200,200}, , .t. )
|
||||
|
||||
|
||||
@@ -282,6 +282,7 @@ METHOD IdeEdit:create( oEditor, nMode )
|
||||
NEXT
|
||||
|
||||
::qHLayout := QHBoxLayout():new()
|
||||
::qHLayout:setContentsMargins( 0,0,0,0 )
|
||||
::qHLayout:setSpacing( 0 )
|
||||
|
||||
::qHLayout:addWidget( ::qEdit )
|
||||
|
||||
@@ -1391,6 +1391,9 @@ METHOD IdeEditor:relay( oEdit )
|
||||
//
|
||||
oEdt:qHLayout:removeWidget( oEdt:qEdit )
|
||||
oEdt:qHLayout := QHBoxLayout():new()
|
||||
oEdt:qHLayout:setContentsMargins( 0,0,0,0 )
|
||||
oEdt:qHLayout:setSpacing( 0 )
|
||||
|
||||
oEdt:qHLayout:addWidget( oEdt:qEdit )
|
||||
NEXT
|
||||
|
||||
|
||||
@@ -100,6 +100,7 @@ CLASS IdeObject
|
||||
ACCESS oTH INLINE ::oIde:oTH
|
||||
ACCESS oFF INLINE ::oIde:oFF
|
||||
ACCESS oSetup INLINE ::oIde:oSetup
|
||||
ACCESS oINI INLINE ::oIde:oINI
|
||||
|
||||
ACCESS aMeta INLINE ::oIde:aMeta
|
||||
ACCESS aTags INLINE ::oIde:aTags
|
||||
|
||||
@@ -597,6 +597,7 @@ FUNCTION hbide_saveShortcuts( oIde, a_, cFileShortcuts )
|
||||
|
||||
CLASS IdeSetup INHERIT IdeObject
|
||||
|
||||
DATA qOrgPalette
|
||||
DATA aItems INIT {}
|
||||
DATA aTree INIT { "General", "Selections", "Font", "Paths", "Variables", "Dictionaries" }
|
||||
DATA aStyles INIT { "default", "cleanlooks", "windows", "windowsxp", ;
|
||||
@@ -609,6 +610,7 @@ CLASS IdeSetup INHERIT IdeObject
|
||||
METHOD execEvent( cEvent, p )
|
||||
METHOD buildTree()
|
||||
METHOD setSystemStyle( cStyle )
|
||||
METHOD setBaseColor()
|
||||
|
||||
ENDCLASS
|
||||
|
||||
@@ -621,13 +623,30 @@ METHOD IdeSetup:new( oIde )
|
||||
/*----------------------------------------------------------------------*/
|
||||
|
||||
METHOD IdeSetup:create( oIde )
|
||||
DEFAULT oIde TO ::oIde
|
||||
::oIde := oIde
|
||||
RETURN Self
|
||||
|
||||
/*----------------------------------------------------------------------*/
|
||||
|
||||
METHOD IdeSetup:destroy()
|
||||
|
||||
IF !empty( ::oUI )
|
||||
::disConnect( ::oUI:q_buttonClose, "clicked()" )
|
||||
::disConnect( ::oUI:q_treeWidget , "itemSelectionChanged()" )
|
||||
::disconnect( ::oUI:q_comboStyle , "currentIndexChanged(int)" )
|
||||
|
||||
::oUI:destroy()
|
||||
ENDIF
|
||||
|
||||
RETURN Self
|
||||
|
||||
/*----------------------------------------------------------------------*/
|
||||
|
||||
METHOD IdeSetup:show()
|
||||
LOCAL cStyle
|
||||
|
||||
DEFAULT oIde TO ::oIde
|
||||
|
||||
::oIde := oIde
|
||||
|
||||
IF .t.
|
||||
IF empty( ::oUI )
|
||||
::oUI := HbQtUI():new( hbide_uic( "setup" ), ::oDlg:oWidget ):build()
|
||||
|
||||
::oUI:setMaximumWidth( ::oUI:width() )
|
||||
@@ -671,26 +690,6 @@ METHOD IdeSetup:create( oIde )
|
||||
::oUI:hide()
|
||||
ENDIF
|
||||
|
||||
RETURN Self
|
||||
|
||||
/*----------------------------------------------------------------------*/
|
||||
|
||||
METHOD IdeSetup:destroy()
|
||||
|
||||
IF !empty( ::oUI )
|
||||
::disConnect( ::oUI:q_buttonClose, "clicked()" )
|
||||
::disConnect( ::oUI:q_treeWidget , "itemSelectionChanged()" )
|
||||
::disconnect( ::oUI:q_comboStyle , "currentIndexChanged(int)" )
|
||||
|
||||
::oUI:destroy()
|
||||
ENDIF
|
||||
|
||||
RETURN Self
|
||||
|
||||
/*----------------------------------------------------------------------*/
|
||||
|
||||
METHOD IdeSetup:show()
|
||||
|
||||
::oUI:exec()
|
||||
|
||||
RETURN Self
|
||||
@@ -763,6 +762,28 @@ METHOD IdeSetup:setSystemStyle( cStyle )
|
||||
|
||||
RETURN Self
|
||||
|
||||
/*----------------------------------------------------------------------*/
|
||||
|
||||
METHOD IdeSetup:setBaseColor()
|
||||
#if 0
|
||||
LOCAL qPalette, oApp, qBrush, qColor
|
||||
|
||||
oApp := QApplication():new()
|
||||
|
||||
::qOrgPalette := QPalette():from( oApp:palette() )
|
||||
|
||||
qColor := QColor():new( Qt_red )
|
||||
qBrush := QBrush():new( "QColor", qColor )
|
||||
|
||||
qPalette := QPalette():from( oApp:palette() )
|
||||
qPalette:setBrush( QPalette_Window, qBrush )
|
||||
qPalette:setColor( QPalette_Window, qColor )
|
||||
qPalette:setColor( QPalette_Base, qColor )
|
||||
|
||||
oApp:setPalette( qPalette )
|
||||
#endif
|
||||
RETURN Self
|
||||
|
||||
/*----------------------------------------------------------------------*/
|
||||
/*----------------------------------------------------------------------*/
|
||||
/*----------------------------------------------------------------------*/
|
||||
@@ -777,32 +798,29 @@ CLASS IdeINI INHERIT IdeObject
|
||||
|
||||
DATA aINI INIT {}
|
||||
|
||||
DATA vMainWindowGeometry INIT ""
|
||||
DATA vProjectTreeVisible INIT ""
|
||||
DATA vFunctionListVisible INIT ""
|
||||
DATA vRecentTabIndex INIT ""
|
||||
DATA vCurrentProject INIT ""
|
||||
DATA vGotoDialogGeometry INIT ""
|
||||
DATA vFindDialogGeometry INIT ""
|
||||
DATA vCurrentTheme INIT ""
|
||||
DATA vCurrentCodec INIT ""
|
||||
DATA vPathMk2 INIT ""
|
||||
DATA vPathEnv INIT ""
|
||||
DATA vCurrentEnvironment INIT ""
|
||||
DATA vCurrentFind INIT ""
|
||||
DATA vCurrentFolderFind INIT ""
|
||||
DATA vCurrentReplace INIT ""
|
||||
DATA vCurrentView INIT ""
|
||||
DATA vCurrentHarbour INIT ""
|
||||
DATA vCurrentShortcuts INIT ""
|
||||
DATA vTextFileExtensions INIT ""
|
||||
DATA vFindInFilesDialogGeometry INIT ""
|
||||
DATA vCurrentLineHighlightMode INIT ""
|
||||
DATA vLineNumbersDisplayMode INIT ""
|
||||
DATA vHorzRulerDisplayMode INIT ""
|
||||
DATA vToolsDialogGeometry INIT ""
|
||||
DATA vIdeTheme INIT ""
|
||||
DATA vIdeAnimated INIT ""
|
||||
DATA cMainWindowGeometry INIT ""
|
||||
DATA cGotoDialogGeometry INIT ""
|
||||
DATA cFindDialogGeometry INIT ""
|
||||
DATA cToolsDialogGeometry INIT ""
|
||||
DATA cRecentTabIndex INIT ""
|
||||
DATA cPathMk2 INIT ""
|
||||
DATA cPathEnv INIT ""
|
||||
DATA cCurrentProject INIT ""
|
||||
DATA cCurrentTheme INIT ""
|
||||
DATA cCurrentCodec INIT ""
|
||||
DATA cCurrentEnvironment INIT ""
|
||||
DATA cCurrentFind INIT ""
|
||||
DATA cCurrentFolderFind INIT ""
|
||||
DATA cCurrentReplace INIT ""
|
||||
DATA cCurrentView INIT ""
|
||||
DATA cCurrentHarbour INIT ""
|
||||
DATA cCurrentShortcuts INIT ""
|
||||
DATA cCurrentLineHighlightMode INIT ""
|
||||
DATA cTextFileExtensions INIT ""
|
||||
DATA cLineNumbersDisplayMode INIT ""
|
||||
DATA cHorzRulerDisplayMode INIT ""
|
||||
DATA cIdeTheme INIT ""
|
||||
DATA cIdeAnimated INIT ""
|
||||
|
||||
DATA aProjects INIT {}
|
||||
DATA aFiles INIT {}
|
||||
@@ -818,6 +836,8 @@ CLASS IdeINI INHERIT IdeObject
|
||||
|
||||
METHOD new( oIde )
|
||||
METHOD create( oIde )
|
||||
METHOD load( cHbideIni )
|
||||
METHOD save( cHbideIni )
|
||||
|
||||
ENDCLASS
|
||||
|
||||
@@ -836,3 +856,338 @@ METHOD IdeINI:create( oIde )
|
||||
|
||||
/*----------------------------------------------------------------------*/
|
||||
|
||||
METHOD IdeINI:load( cHbideIni )
|
||||
LOCAL aElem, s, nPart, cKey, cVal, a_
|
||||
|
||||
::oIde:cProjIni := hbide_getIniPath( cHbideIni )
|
||||
|
||||
IF hb_FileExists( ::oIde:cProjIni )
|
||||
aElem := hbide_readSource( ::oIde:cProjIni )
|
||||
|
||||
FOR EACH s IN aElem
|
||||
|
||||
s := alltrim( s )
|
||||
IF !empty( s )
|
||||
SWITCH Upper( s )
|
||||
|
||||
CASE "[GENERAL]"
|
||||
nPart := INI_GENERAL
|
||||
EXIT
|
||||
CASE "[HBIDE]"
|
||||
nPart := INI_HBIDE
|
||||
EXIT
|
||||
CASE "[PROJECTS]"
|
||||
nPart := INI_PROJECTS
|
||||
EXIT
|
||||
CASE "[FILES]"
|
||||
nPart := INI_FILES
|
||||
EXIT
|
||||
CASE "[FIND]"
|
||||
nPart := INI_FIND
|
||||
EXIT
|
||||
CASE "[REPLACE]"
|
||||
nPart := INI_REPLACE
|
||||
EXIT
|
||||
CASE "[RECENTFILES]"
|
||||
nPart := INI_RECENTFILES
|
||||
EXIT
|
||||
CASE "[RECENTPROJECTS]"
|
||||
nPart := INI_RECENTPROJECTS
|
||||
EXIT
|
||||
CASE "[FOLDERS]"
|
||||
nPart := INI_FOLDERS
|
||||
EXIT
|
||||
CASE "[VIEWS]"
|
||||
nPart := INI_VIEWS
|
||||
EXIT
|
||||
CASE "[TAGGEDPROJECTS]"
|
||||
nPart := INI_TAGGEDPROJECTS
|
||||
EXIT
|
||||
CASE "[TOOLS]"
|
||||
nPart := INI_TOOLS
|
||||
EXIT
|
||||
CASE "[USERTOOLBARS]"
|
||||
nPart := INI_USERTOOLBARS
|
||||
EXIT
|
||||
OTHERWISE
|
||||
DO CASE
|
||||
CASE Left( s, 1 ) $ '#['
|
||||
* Nothing todo!
|
||||
|
||||
CASE nPart == INI_GENERAL
|
||||
* Qt Setttings, do nothing.
|
||||
|
||||
CASE nPart == INI_HBIDE
|
||||
IF hbide_parseKeyValPair( s, @cKey, @cVal )
|
||||
|
||||
SWITCH cKey
|
||||
|
||||
CASE "MainWindowGeometry" ; ::cMainWindowGeometry := cVal ; EXIT
|
||||
CASE "GotoDialogGeometry" ; ::cGotoDialogGeometry := cVal ; EXIT
|
||||
CASE "FindDialogGeometry" ; ::cFindDialogGeometry := cVal ; EXIT
|
||||
CASE "ToolsDialogGeometry" ; ::cToolsDialogGeometry := cVal ; EXIT
|
||||
//
|
||||
CASE "CurrentLineHighlightMode" ; ::cCurrentLineHighlightMode := cVal ; EXIT
|
||||
CASE "LineNumbersDisplayMode" ; ::cLineNumbersDisplayMode := cVal ; EXIT
|
||||
CASE "HorzRulerDisplayMode" ; ::cHorzRulerDisplayMode := cVal ; EXIT
|
||||
//
|
||||
CASE "RecentTabIndex" ; ::cRecentTabIndex := cVal ; EXIT
|
||||
//
|
||||
CASE "IdeTheme" ; ::cIdeTheme := cVal ; EXIT
|
||||
CASE "IdeAnimated" ; ::cIdeAnimated := cVal ; EXIT
|
||||
// /* Subject to be identified under this object only */
|
||||
CASE "PathMk2" ; ::oIde:cWrkPathMk2 := cVal ; EXIT
|
||||
CASE "PathEnv" ; ::oIde:cWrkPathEnv := cVal ; EXIT
|
||||
CASE "CurrentProject" ; ::oIde:cWrkProject := cVal ; EXIT
|
||||
CASE "CurrentTheme" ; ::oIde:cWrkTheme := cVal ; EXIT
|
||||
CASE "CurrentCodec" ; ::oIde:cWrkCodec := cVal ; EXIT
|
||||
CASE "CurrentEnvironment" ; ::oIde:cWrkEnvironment := cVal ; EXIT
|
||||
CASE "CurrentFind" ; ::oIde:cWrkFind := cVal ; EXIT
|
||||
CASE "CurrentFolderFind" ; ::oIde:cWrkFolderFind := cVal ; EXIT
|
||||
CASE "CurrentReplace" ; ::oIde:cWrkReplace := cVal ; EXIT
|
||||
CASE "CurrentView" ; ::oIde:cWrkView := cVal ; EXIT
|
||||
CASE "CurrentHarbour" ; ::oIde:cWrkHarbour := cVal ; EXIT
|
||||
CASE "CurrentShortcuts" ; ::oIde:cPathShortcuts := cVal ; EXIT
|
||||
CASE "TextFileExtensions" ; ::oIde:cTextExtensions := cVal ; EXIT
|
||||
|
||||
ENDSWITCH
|
||||
ENDIF
|
||||
|
||||
CASE nPart == INI_PROJECTS
|
||||
IF hbide_parseKeyValPair( s, @cKey, @cVal )
|
||||
aadd( ::aProjects, cVal )
|
||||
ENDIF
|
||||
|
||||
CASE nPart == INI_FILES
|
||||
IF hbide_parseKeyValPair( s, @cKey, @cVal )
|
||||
a_:= hbide_parseSourceComponents( cVal )
|
||||
IF !Empty( a_[ 1 ] )
|
||||
aadd( ::aFiles, a_ )
|
||||
ENDIF
|
||||
ENDIF
|
||||
|
||||
CASE nPart == INI_FIND
|
||||
IF hbide_parseKeyValPair( s, @cKey, @cVal )
|
||||
aadd( ::aFind, cVal )
|
||||
ENDIF
|
||||
|
||||
CASE nPart == INI_REPLACE
|
||||
IF hbide_parseKeyValPair( s, @cKey, @cVal )
|
||||
aadd( ::aReplace, cVal )
|
||||
ENDIF
|
||||
|
||||
CASE nPart == INI_RECENTPROJECTS
|
||||
IF hbide_parseKeyValPair( s, @cKey, @cVal )
|
||||
IF Len( ::aRecentProjects ) < 25
|
||||
cVal := hbide_pathNormalized( cVal, .f. )
|
||||
IF aScan( ::aRecentProjects, {|e| hbide_pathNormalized( e, .f. ) == cVal } ) == 0
|
||||
AAdd( ::aRecentProjects, cVal )
|
||||
ENDIF
|
||||
ENDIF
|
||||
ENDIF
|
||||
|
||||
CASE nPart == INI_RECENTFILES
|
||||
IF hbide_parseKeyValPair( s, @cKey, @cVal )
|
||||
IF Len( ::aRecentFiles ) < 25
|
||||
cVal := hbide_pathNormalized( cVal, .f. )
|
||||
IF aScan( ::aRecentFiles, {|e| hbide_pathNormalized( e, .f. ) == cVal } ) == 0
|
||||
AAdd( ::aRecentFiles, cVal )
|
||||
ENDIF
|
||||
ENDIF
|
||||
ENDIF
|
||||
|
||||
CASE nPart == INI_FOLDERS
|
||||
IF hbide_parseKeyValPair( s, @cKey, @cVal )
|
||||
aadd( ::aFolders, cVal )
|
||||
ENDIF
|
||||
|
||||
CASE nPart == INI_VIEWS
|
||||
IF hbide_parseKeyValPair( s, @cKey, @cVal )
|
||||
aadd( ::aViews, cVal )
|
||||
ENDIF
|
||||
|
||||
CASE nPart == INI_TAGGEDPROJECTS
|
||||
IF hbide_parseKeyValPair( s, @cKey, @cVal )
|
||||
aadd(::aTaggedProjects, cVal )
|
||||
ENDIF
|
||||
|
||||
CASE nPart == INI_TOOLS
|
||||
IF hbide_parseKeyValPair( s, @cKey, @cVal )
|
||||
a_:= hbide_parseToolComponents( cVal )
|
||||
aadd( ::aTools, a_ )
|
||||
ENDIF
|
||||
|
||||
CASE nPart == INI_USERTOOLBARS
|
||||
IF hbide_parseKeyValPair( s, @cKey, @cVal )
|
||||
a_:= hbide_parseUserToolbarComponents( cVal )
|
||||
aadd( ::aUserToolbars, a_ )
|
||||
ENDIF
|
||||
|
||||
ENDCASE
|
||||
EXIT
|
||||
ENDSWITCH
|
||||
ENDIF
|
||||
NEXT
|
||||
ENDIF
|
||||
|
||||
RETURN Self
|
||||
|
||||
/*----------------------------------------------------------------------*/
|
||||
|
||||
METHOD IdeINI:save( cHbideIni )
|
||||
LOCAL j, nTab, pTab, n, txt_, oEdit, nTabs, nn, a_
|
||||
|
||||
DEFAULT cHbideIni TO ::oIde:cProjIni
|
||||
|
||||
HB_TRACE( HB_TR_ALWAYS, "IdeINI:saveINI( cHbideIni )" )
|
||||
|
||||
IF ::oIde:nRunMode != HBIDE_RUN_MODE_INI
|
||||
RETURN Nil
|
||||
ENDIF
|
||||
|
||||
txt_:= {}
|
||||
|
||||
aadd( txt_, "[HBIDE]" )
|
||||
aadd( txt_, " " )
|
||||
//
|
||||
aadd( txt_, "MainWindowGeometry" + "=" + hbide_posAndSize( ::oDlg:oWidget ) )
|
||||
aadd( txt_, "GotoDialogGeometry" + "=" + ::cGotoDialogGeometry )
|
||||
aadd( txt_, "FindDialogGeometry" + "=" + ::cFindDialogGeometry )
|
||||
aadd( txt_, "ToolsDialogGeometry" + "=" + ::cToolsDialogGeometry )
|
||||
//
|
||||
aadd( txt_, "CurrentLineHighlightMode" + "=" + iif( ::lCurrentLineHighlightEnabled, "YES", "NO" ) )
|
||||
aadd( txt_, "LineNumbersDisplayMode" + "=" + iif( ::lLineNumbersVisible, "YES", "NO" ) )
|
||||
aadd( txt_, "HorzRulerDisplayMode" + "=" + iif( ::lHorzRulerVisible, "YES", "NO" ) )
|
||||
//
|
||||
aadd( txt_, "RecentTabIndex" + "=" + hb_ntos( ::qTabWidget:currentIndex() ) )
|
||||
//
|
||||
aadd( txt_, "IdeTheme" + "=" + ::cIdeTheme )
|
||||
aadd( txt_, "IdeAnimated" + "=" + ::cIdeAnimated )
|
||||
|
||||
aadd( txt_, "PathMk2" + "=" + ::oIde:cWrkPathMk2 )
|
||||
aadd( txt_, "PathEnv" + "=" + ::oIde:cWrkPathEnv )
|
||||
aadd( txt_, "CurrentProject" + "=" + ::oIde:cWrkProject )
|
||||
aadd( txt_, "CurrentTheme" + "=" + ::oIde:cWrkTheme )
|
||||
aadd( txt_, "CurrentCodec" + "=" + ::oIde:cWrkCodec )
|
||||
aadd( txt_, "CurrentEnvironment" + "=" + ::oIde:cWrkEnvironment )
|
||||
aadd( txt_, "CurrentFind" + "=" + ::oIde:cWrkFind )
|
||||
aadd( txt_, "CurrentFolderFind" + "=" + ::oIde:cWrkFolderFind )
|
||||
aadd( txt_, "CurrentReplace" + "=" + ::oIde:cWrkReplace )
|
||||
aadd( txt_, "CurrentView" + "=" + ::oIde:cWrkView )
|
||||
aadd( txt_, "CurrentHarbour" + "=" + ::oIde:cWrkHarbour )
|
||||
aadd( txt_, "CurrentShortcuts" + "=" + ::oIde:cPathShortcuts )
|
||||
aadd( txt_, "TextFileExtensions" + "=" + ::oIde:cTextExtensions )
|
||||
//
|
||||
aadd( txt_, " " )
|
||||
|
||||
aadd( txt_, "[PROJECTS]" )
|
||||
aadd( txt_, " " )
|
||||
FOR n := 1 TO len( ::oIde:aProjects )
|
||||
aadd( txt_, "project_" + hb_ntos( n ) + "=" + hbide_pathNormalized( ::oIde:aProjects[ n, 2 ], .f. ) )
|
||||
NEXT
|
||||
aadd( txt_, " " )
|
||||
|
||||
/*------------------- FILES -------------------*/
|
||||
aadd( txt_, "[FILES]" )
|
||||
aadd( txt_, " " )
|
||||
nn := 0
|
||||
FOR j := 2 TO len( ::aViews )
|
||||
::oIde:lClosing := .t.
|
||||
::oIde:oDK:setView( ::aViews[ j ]:oWidget:objectName() )
|
||||
|
||||
nTabs := ::qTabWidget:count()
|
||||
FOR n := 1 TO nTabs
|
||||
pTab := ::qTabWidget:widget( n - 1 )
|
||||
nTab := ascan( ::aTabs, {|e_| hbqt_IsEqualGcQtPointer( e_[ 1 ]:oWidget:pPtr, pTab ) } )
|
||||
oEdit := ::aTabs[ nTab, TAB_OEDITOR ]
|
||||
|
||||
IF !Empty( oEdit:sourceFile ) .AND. !( ".ppo" == lower( oEdit:cExt ) )
|
||||
IF oEdit:lLoaded
|
||||
aadd( txt_, "file_" + hb_ntos( ++nn ) + "=" + hbide_getEditInfoAsString( oEdit ) )
|
||||
|
||||
ELSE
|
||||
aadd( txt_, "file_" + hb_ntos( ++nn ) + "=" + hbide_pathNormalized( oEdit:sourceFile, .f. ) + "," + ;
|
||||
hb_ntos( oEdit:nPos ) + "," + ;
|
||||
hb_ntos( oEdit:nHPos ) + "," + ;
|
||||
hb_ntos( oEdit:nVPos ) + "," + ;
|
||||
oEdit:cTheme + "," + ;
|
||||
oEdit:cView + "," + ;
|
||||
hbide_nArray2string( oEdit:oEdit:aBookMarks ) + "," )
|
||||
ENDIF
|
||||
ENDIF
|
||||
NEXT
|
||||
NEXT
|
||||
aadd( txt_, " " )
|
||||
|
||||
aadd( txt_, "[FIND]" )
|
||||
aadd( txt_, " " )
|
||||
FOR n := 1 TO len( ::aFind )
|
||||
aadd( txt_, "find_" + hb_ntos( n ) + "=" + ::aFind[ n ] )
|
||||
NEXT
|
||||
aadd( txt_, " " )
|
||||
|
||||
aadd( txt_, "[REPLACE]" )
|
||||
aadd( txt_, " " )
|
||||
FOR n := 1 TO len( ::aReplace )
|
||||
aadd( txt_, "replace_" + hb_ntos( n ) + "=" + ::aReplace[ n ] )
|
||||
NEXT
|
||||
aadd( txt_, " " )
|
||||
|
||||
aadd( txt_, "[RECENTFILES]" )
|
||||
aadd( txt_, " " )
|
||||
FOR n := 1 TO len( ::aRecentFiles )
|
||||
aadd( txt_, "recentfile_" + hb_ntos( n ) + "=" + hbide_pathNormalized( ::aRecentFiles[ n ], .f. ) )
|
||||
NEXT
|
||||
aadd( txt_, " " )
|
||||
|
||||
aadd( txt_, "[RECENTPROJECTS]" )
|
||||
aadd( txt_, " " )
|
||||
FOR n := 1 TO len( ::aRecentProjects )
|
||||
aadd( txt_, "recentproject_" + hb_ntos( n ) + "=" + hbide_pathNormalized( ::aRecentProjects[ n ], .f. ) )
|
||||
NEXT
|
||||
aadd( txt_, " " )
|
||||
|
||||
aadd( txt_, "[FOLDERS]" )
|
||||
aadd( txt_, " " )
|
||||
FOR n := 1 TO len( ::aFolders )
|
||||
aadd( txt_, "folder_" + hb_ntos( n ) + "=" + hbide_pathNormalized( ::aFolders[ n ], .f. ) )
|
||||
NEXT
|
||||
aadd( txt_, " " )
|
||||
|
||||
aadd( txt_, "[VIEWS]" )
|
||||
aadd( txt_, " " )
|
||||
FOR n := 1 TO len( ::aViews )
|
||||
aadd( txt_, "view_" + hb_ntos( n ) + "=" + ::aViews[ n ] )
|
||||
NEXT
|
||||
aadd( txt_, " " )
|
||||
|
||||
aadd( txt_, "[TAGGEDPROJECTS]" )
|
||||
aadd( txt_, " " )
|
||||
FOR n := 1 TO len( ::aTaggedProjects )
|
||||
aadd( txt_, "taggedproject_" + hb_ntos( n ) + "=" + ::aTaggedProjects[ n ] )
|
||||
NEXT
|
||||
aadd( txt_, " " )
|
||||
|
||||
aadd( txt_, "[TOOLS]" )
|
||||
aadd( txt_, " " )
|
||||
FOR EACH a_ IN ::aTools
|
||||
aadd( txt_, "tool_" + hb_ntos( a_:__enumIndex() ) + "=" + hbide_array2string( a_, "," ) )
|
||||
NEXT
|
||||
aadd( txt_, " " )
|
||||
|
||||
aadd( txt_, "[USERTOOLBARS]" )
|
||||
aadd( txt_, " " )
|
||||
FOR n := 1 TO len( ::aUserToolbars )
|
||||
aadd( txt_, "usertoolbars_" + hb_ntos( n ) + "=" + hbide_array2string( ::aUserToolbars[ n ], "," ) )
|
||||
NEXT
|
||||
aadd( txt_, " " )
|
||||
|
||||
aadd( txt_, "[General]" )
|
||||
aadd( txt_, " " )
|
||||
|
||||
//hbide_createTarget( oIde:cProjIni, txt_ )
|
||||
//hbide_createTarget( "e:\temp\test.ini", txt_ )
|
||||
|
||||
RETURN cHbideIni //hbide_saveSettings( ::oIde )
|
||||
|
||||
/*----------------------------------------------------------------------*/
|
||||
|
||||
@@ -72,7 +72,11 @@
|
||||
FUNCTION GetStyleSheet( cWidget, nMode )
|
||||
LOCAL txt_:= {}
|
||||
LOCAL s := ""
|
||||
|
||||
#if 0
|
||||
IF .t.
|
||||
RETURN ""
|
||||
ENDIF
|
||||
#endif
|
||||
DEFAULT nMode TO HBIDE_ANIMATION_NONE
|
||||
|
||||
DO CASE
|
||||
@@ -434,8 +438,12 @@ FUNCTION hbide_cssColorString( cPart )
|
||||
|
||||
SWITCH lower( cPart )
|
||||
CASE "bg-std"
|
||||
RETURN ' background-color: rgb(212,208,200);'
|
||||
|
||||
RETURN ' background-color: ' + hbide_rgbString( 212,208,200 ) + ';' // Gray - original wondows
|
||||
#if 0
|
||||
// RETURN ' background-color: ' + hbide_rgbString( 199,212,231 ) + ';'
|
||||
RETURN ' background-color: qlineargradient(x1:0, y1:1, x2:0, y2:0, ' + ;
|
||||
hbide_buildGradientString( hbide_loadIdeTheme( 2 ) ) + "); "
|
||||
#endif
|
||||
ENDSWITCH
|
||||
|
||||
RETURN cStr
|
||||
@@ -464,6 +472,8 @@ STATIC FUNCTION hbide_loadIdeTheme( nTheme )
|
||||
DO CASE
|
||||
CASE nTheme == 1
|
||||
RETURN { {0,255,255,255}, {0.25,219,230,244}, {0.5,201,217,237}, {0.75,231,242,255} }
|
||||
CASE nTheme == 2
|
||||
RETURN { {0,173,185,207}, {1,199,212,231} }
|
||||
ENDCASE
|
||||
|
||||
RETURN NIL
|
||||
|
||||
@@ -41,7 +41,7 @@
|
||||
</rect>
|
||||
</property>
|
||||
<property name="currentIndex">
|
||||
<number>3</number>
|
||||
<number>2</number>
|
||||
</property>
|
||||
<widget class="QWidget" name="pageGeneral">
|
||||
<widget class="QGroupBox" name="groupBox">
|
||||
@@ -669,7 +669,7 @@
|
||||
<x>12</x>
|
||||
<y>94</y>
|
||||
<width>329</width>
|
||||
<height>155</height>
|
||||
<height>135</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="title">
|
||||
@@ -702,7 +702,7 @@
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>12</x>
|
||||
<y>48</y>
|
||||
<y>42</y>
|
||||
<width>235</width>
|
||||
<height>16</height>
|
||||
</rect>
|
||||
@@ -715,7 +715,7 @@
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>12</x>
|
||||
<y>70</y>
|
||||
<y>60</y>
|
||||
<width>239</width>
|
||||
<height>20</height>
|
||||
</rect>
|
||||
@@ -725,7 +725,7 @@
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>276</x>
|
||||
<y>70</y>
|
||||
<y>60</y>
|
||||
<width>25</width>
|
||||
<height>20</height>
|
||||
</rect>
|
||||
@@ -738,7 +738,7 @@
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>14</x>
|
||||
<y>102</y>
|
||||
<y>86</y>
|
||||
<width>235</width>
|
||||
<height>16</height>
|
||||
</rect>
|
||||
@@ -751,13 +751,62 @@
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>12</x>
|
||||
<y>120</y>
|
||||
<y>104</y>
|
||||
<width>239</width>
|
||||
<height>20</height>
|
||||
</rect>
|
||||
</property>
|
||||
</widget>
|
||||
</widget>
|
||||
<widget class="QGroupBox" name="groupBox_20">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>12</x>
|
||||
<y>236</y>
|
||||
<width>151</width>
|
||||
<height>119</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="title">
|
||||
<string> Text files extensions </string>
|
||||
</property>
|
||||
<widget class="QListWidget" name="listTextExt">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>12</x>
|
||||
<y>16</y>
|
||||
<width>77</width>
|
||||
<height>93</height>
|
||||
</rect>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QToolButton" name="buttonAddTextExt">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>112</x>
|
||||
<y>18</y>
|
||||
<width>25</width>
|
||||
<height>20</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>...</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QToolButton" name="buttonDelTextExt">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>112</x>
|
||||
<y>44</y>
|
||||
<width>25</width>
|
||||
<height>20</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>...</string>
|
||||
</property>
|
||||
</widget>
|
||||
</widget>
|
||||
</widget>
|
||||
</widget>
|
||||
<widget class="QWidget" name="pagePaths">
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
/********************************************************************************
|
||||
** Form generated from reading UI file 'setup.ui'
|
||||
** Form generated from reading ui file 'setup.ui'
|
||||
**
|
||||
** Created: Thu Jun 17 09:21:50 2010
|
||||
** by: Qt User Interface Compiler version 4.6.2
|
||||
** Created: Thu Jun 17 17:04:10 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
|
||||
@@ -98,6 +98,10 @@ public:
|
||||
QToolButton *buttonBackupPath;
|
||||
QLabel *label_18;
|
||||
QLineEdit *editBackupSuffix;
|
||||
QGroupBox *groupBox_20;
|
||||
QListWidget *listTextExt;
|
||||
QToolButton *buttonAddTextExt;
|
||||
QToolButton *buttonDelTextExt;
|
||||
QWidget *pagePaths;
|
||||
QGroupBox *groupBox_4;
|
||||
QLabel *label_9;
|
||||
@@ -338,7 +342,7 @@ public:
|
||||
buttonSelFont->setGeometry(QRect(274, 16, 25, 20));
|
||||
groupBox_19 = new QGroupBox(groupBox_3);
|
||||
groupBox_19->setObjectName(QString::fromUtf8("groupBox_19"));
|
||||
groupBox_19->setGeometry(QRect(12, 94, 329, 155));
|
||||
groupBox_19->setGeometry(QRect(12, 94, 329, 135));
|
||||
label_15 = new QLabel(groupBox_19);
|
||||
label_15->setObjectName(QString::fromUtf8("label_15"));
|
||||
label_15->setGeometry(QRect(10, 20, 177, 16));
|
||||
@@ -347,19 +351,31 @@ public:
|
||||
lineEdit->setGeometry(QRect(190, 18, 59, 20));
|
||||
label_17 = new QLabel(groupBox_19);
|
||||
label_17->setObjectName(QString::fromUtf8("label_17"));
|
||||
label_17->setGeometry(QRect(12, 48, 235, 16));
|
||||
label_17->setGeometry(QRect(12, 42, 235, 16));
|
||||
editBackupPath = new QLineEdit(groupBox_19);
|
||||
editBackupPath->setObjectName(QString::fromUtf8("editBackupPath"));
|
||||
editBackupPath->setGeometry(QRect(12, 70, 239, 20));
|
||||
editBackupPath->setGeometry(QRect(12, 60, 239, 20));
|
||||
buttonBackupPath = new QToolButton(groupBox_19);
|
||||
buttonBackupPath->setObjectName(QString::fromUtf8("buttonBackupPath"));
|
||||
buttonBackupPath->setGeometry(QRect(276, 70, 25, 20));
|
||||
buttonBackupPath->setGeometry(QRect(276, 60, 25, 20));
|
||||
label_18 = new QLabel(groupBox_19);
|
||||
label_18->setObjectName(QString::fromUtf8("label_18"));
|
||||
label_18->setGeometry(QRect(14, 102, 235, 16));
|
||||
label_18->setGeometry(QRect(14, 86, 235, 16));
|
||||
editBackupSuffix = new QLineEdit(groupBox_19);
|
||||
editBackupSuffix->setObjectName(QString::fromUtf8("editBackupSuffix"));
|
||||
editBackupSuffix->setGeometry(QRect(12, 120, 239, 20));
|
||||
editBackupSuffix->setGeometry(QRect(12, 104, 239, 20));
|
||||
groupBox_20 = new QGroupBox(groupBox_3);
|
||||
groupBox_20->setObjectName(QString::fromUtf8("groupBox_20"));
|
||||
groupBox_20->setGeometry(QRect(12, 236, 151, 119));
|
||||
listTextExt = new QListWidget(groupBox_20);
|
||||
listTextExt->setObjectName(QString::fromUtf8("listTextExt"));
|
||||
listTextExt->setGeometry(QRect(12, 16, 77, 93));
|
||||
buttonAddTextExt = new QToolButton(groupBox_20);
|
||||
buttonAddTextExt->setObjectName(QString::fromUtf8("buttonAddTextExt"));
|
||||
buttonAddTextExt->setGeometry(QRect(112, 18, 25, 20));
|
||||
buttonDelTextExt = new QToolButton(groupBox_20);
|
||||
buttonDelTextExt->setObjectName(QString::fromUtf8("buttonDelTextExt"));
|
||||
buttonDelTextExt->setGeometry(QRect(112, 44, 25, 20));
|
||||
stackedWidget->addWidget(pageFontEtc);
|
||||
pagePaths = new QWidget();
|
||||
pagePaths->setObjectName(QString::fromUtf8("pagePaths"));
|
||||
@@ -565,7 +581,7 @@ public:
|
||||
|
||||
retranslateUi(DialogSetup);
|
||||
|
||||
stackedWidget->setCurrentIndex(3);
|
||||
stackedWidget->setCurrentIndex(2);
|
||||
|
||||
|
||||
QMetaObject::connectSlotsByName(DialogSetup);
|
||||
@@ -621,6 +637,9 @@ public:
|
||||
label_17->setText(QApplication::translate("DialogSetup", "Permanent backup path:", 0, QApplication::UnicodeUTF8));
|
||||
buttonBackupPath->setText(QApplication::translate("DialogSetup", "...", 0, QApplication::UnicodeUTF8));
|
||||
label_18->setText(QApplication::translate("DialogSetup", "Permanent backup suffix:", 0, QApplication::UnicodeUTF8));
|
||||
groupBox_20->setTitle(QApplication::translate("DialogSetup", " Text files extensions ", 0, QApplication::UnicodeUTF8));
|
||||
buttonAddTextExt->setText(QApplication::translate("DialogSetup", "...", 0, QApplication::UnicodeUTF8));
|
||||
buttonDelTextExt->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));
|
||||
@@ -675,6 +694,7 @@ public:
|
||||
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
|
||||
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user