fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2010-06-15 08:33 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)

Browse Source 
* contrib/hbide/resources/setup.ui
    + Added few more settings.

  * contrib/hbide/hbide.prg
  * contrib/hbide/idedocks.prg
  * contrib/hbide/idestylesheets.prg
    ! Refined: editor tabs, splitters, etc.
    ! Refined: animation style confirming to uniformity.
This commit is contained in:
Pritpal Bedi
2010-06-15 15:39:23 +00:00
parent f35793fede
commit 5975c99d17
5 changed files with 108 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
harbour/ChangeLog
View File

@@ -16,6 +16,16 @@
The license applies to all entries newer than 2009-04-28.
*/
2010-06-15 08:33 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
* contrib/hbide/resources/setup.ui
+ Added few more settings.
* contrib/hbide/hbide.prg
* contrib/hbide/idedocks.prg
* contrib/hbide/idestylesheets.prg
! Refined: editor tabs, splitters, etc.
! Refined: animation style confirming to uniformity.
2010-06-15 16:34 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* contrib/hbcurl/hbcurl.c
! Fixed to build against very old libcurl versions.

2
harbour/contrib/hbide/hbide.prg
View File

@@ -564,7 +564,7 @@ METHOD HbIde:create( aParams )
HB_TRACE( HB_TR_ALWAYS, "Before ::oDlg:destroy()", memory( 1001 ) )
HB_TRACE( HB_TR_ALWAYS, " " )
#if 1
#if 0
::oSetup:destroy()
::oUpdn:destroy()
::oTM:destroy()

3
harbour/contrib/hbide/idedocks.prg
View File

@@ -589,7 +589,6 @@ METHOD IdeDocks:buildViewWidget( cObjectName )
::connect( qTBtnClose, "clicked()", {|| ::oSM:closeSource() } )
oFrame:oTabWidget:qCornerWidget := qTBtnClose
oFrame:oTabWidget:oWidget:setCornerWidget( qTBtnClose, Qt_TopRightCorner )
oFrame:oTabWidget:oWidget:setStyleSheet( GetStyleSheet( "QTabWidget", ::nAnimantionMode ) )
ENDIF
oFrame:oTabWidget:oWidget:setUsesScrollButtons( .t. )
@@ -1286,7 +1285,7 @@ METHOD IdeDocks:animateComponents( nMode )
::oFindDock:oWidget:setStyleSheet( cStyle )
::oDockB2:oWidget:setStyleSheet( cStyle )
#if 0
#if 1
// should be iteration
::qTabWidget:setStyleSheet( GetStyleSheet( "QTabWidget", nMode ) )
#endif

110
harbour/contrib/hbide/idestylesheets.prg
View File

@@ -139,11 +139,11 @@ FUNCTION GetStyleSheet( cWidget, nMode )
IF nMode == HBIDE_ANIMATION_GRADIENT
aadd( txt_, 'QMenuBar { ' )
aadd( txt_, hbide_ideThemeColorCSS( "MenubarTop", 1 ) )
aadd( txt_, hbide_ideThemeColorCSS( "MenubarTop", 1 ) )
aadd( txt_, '} ' )
ELSE
aadd( txt_, 'QMenuBar { ' )
aadd( txt_, hbide_cssColorString( "bg-std" ) )
aadd( txt_, hbide_cssColorString( "bg-std" ) )
aadd( txt_, '} ' )
ENDIF
aadd( txt_, 'QMenuBar::item { ' )
@@ -163,12 +163,12 @@ FUNCTION GetStyleSheet( cWidget, nMode )
CASE cWidget == "QToolBar"
IF nMode == HBIDE_ANIMATION_GRADIENT
aadd( txt_, 'QToolBar { ' )
aadd( txt_, hbide_ideThemeColorCSS( "ToolbarTop", 1 ) )
aadd( txt_, hbide_ideThemeColorCSS( "ToolbarTop", 1 ) )
aadd( txt_, ' /*spacing: 3px; spacing between items in the tool bar */ ' )
aadd( txt_, ' } ' )
ELSE
aadd( txt_, 'QToolBar { ' )
aadd( txt_, hbide_cssColorString( "bg-std" ) )
aadd( txt_, hbide_cssColorString( "bg-std" ) )
aadd( txt_, ' } ' )
ENDIF
@@ -180,19 +180,19 @@ FUNCTION GetStyleSheet( cWidget, nMode )
aadd( txt_, ' } ' )
ELSE
aadd( txt_, 'QToolBar { ' )
aadd( txt_, hbide_cssColorString( "bg-std" ) )
aadd( txt_, hbide_cssColorString( "bg-std" ) )
aadd( txt_, ' } ' )
ENDIF
CASE cWidget == "QToolBarLR5"
IF nMode == HBIDE_ANIMATION_GRADIENT
aadd( txt_, 'QToolBar { ' )
aadd( txt_, hbide_ideThemeColorCSS( "ToolbarLR", 1 ) )
aadd( txt_, hbide_ideThemeColorCSS( "ToolbarLR", 1 ) )
* aadd( txt_, ' spacing: 1px; color: white; margin-top: 2px; ' )
aadd( txt_, ' } ' )
ELSE
aadd( txt_, 'QToolBar { ' )
aadd( txt_, hbide_cssColorString( "bg-std" ) )
aadd( txt_, hbide_cssColorString( "bg-std" ) )
* aadd( txt_, ' spacing: 1px; color: white; margin-top: 2px; ' )
aadd( txt_, ' } ' )
ENDIF
@@ -203,11 +203,11 @@ FUNCTION GetStyleSheet( cWidget, nMode )
aadd( txt_, 'QToolBar { ' )
aadd( txt_, ' background-color: qlineargradient(x1:0, y1:0, x2:1, y2:0, ' )
aadd( txt_, ' stop:0 lightgray, stop:1 darkgray); ' )
aadd( txt_, ' /*spacing: 3px; spacing between items in the tool bar */ ' )
aadd( txt_, ' /*spacing: 3px; spacing between items in the tool bar */ ' )
aadd( txt_, ' } ' )
ELSE
aadd( txt_, 'QToolBar { ' )
aadd( txt_, hbide_cssColorString( "bg-std" ) )
aadd( txt_, hbide_cssColorString( "bg-std" ) )
aadd( txt_, ' } ' )
ENDIF
@@ -216,11 +216,11 @@ FUNCTION GetStyleSheet( cWidget, nMode )
aadd( txt_, 'QToolBar { ' )
aadd( txt_, ' background-color: qlineargradient(x1:0, y1:0, x2:1, y2:0, ' )
aadd( txt_, ' stop:0 lightgray, stop:1 darkgray); ' )
aadd( txt_, ' spacing: 1px; color: white; margin-top: 2px; ' )
aadd( txt_, ' spacing: 1px; color: white; margin-top: 2px; ' )
aadd( txt_, ' } ' )
ELSE
aadd( txt_, 'QToolBar { ' )
aadd( txt_, hbide_cssColorString( "bg-std" ) )
aadd( txt_, hbide_cssColorString( "bg-std" ) )
aadd( txt_, ' } ' )
ENDIF
@@ -298,10 +298,10 @@ FUNCTION GetStyleSheet( cWidget, nMode )
aadd( txt_, '} ' )
aadd( txt_, ' QListView { ' )
IF nMode == HBIDE_ANIMATION_GRADIENT
aadd( txt_, ' background: qlineargradient(spread:pad, x1:0.755727, y1:0.864, x2:1, y2:0,' )
aadd( txt_, ' background: qlineargradient(spread:pad, x1:0.755727, y1:0.864, x2:1, y2:0,' )
aadd( txt_, ' stop:0 rgba(214, 209, 142, 255), stop:1 rgba(255, 255, 255, 255));' )
ELSE
aadd( txt_, ' background: qlineargradient(x1: 1, y1: 0, x2: 0, y2: 0, ' )
aadd( txt_, ' background: qlineargradient(x1: 1, y1: 0, x2: 0, y2: 0, ' )
aadd( txt_, ' stop: 0 rgba(173, 173, 173, 255), stop:1 rgba(255, 255, 255, 255)); ' )
ENDIF
aadd( txt_, '} ' )
@@ -309,7 +309,7 @@ FUNCTION GetStyleSheet( cWidget, nMode )
CASE cWidget == "QMainWindow"
aadd( txt_, 'QMainWindow::separator { ' )
aadd( txt_, ' background: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 0, ' )
aadd( txt_, ' background: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 0, ' )
aadd( txt_, ' stop: 0 rgba(123, 123, 123, 255), stop:1 rgba(255, 255, 255, 255)); ' )
aadd( txt_, ' width: 6px; /* when vertical */ ' )
aadd( txt_, ' height: 6px; /* when horizontal */ ' )
@@ -321,76 +321,81 @@ FUNCTION GetStyleSheet( cWidget, nMode )
CASE cWidget == "QStatusBar"
IF nMode == HBIDE_ANIMATION_GRADIENT
aadd( txt_, 'QStatusBar { ' )
aadd( txt_, hbide_ideThemeColorCSS( "statusbar", 1 ) )
aadd( txt_, hbide_ideThemeColorCSS( "statusbar", 1 ) )
aadd( txt_, ' } ' )
ELSE
aadd( txt_, 'QStatusBar { ' )
aadd( txt_, hbide_cssColorString( "bg-std" ) )
aadd( txt_, hbide_cssColorString( "bg-std" ) )
aadd( txt_, ' } ' )
ENDIF
CASE cWidget == "QTabWidget"
IF nMode == HBIDE_ANIMATION_GRADIENT
aadd( txt_, 'QTabWidget::pane { /* The tab widget frame */ ' )
aadd( txt_, ' border-top: 2px solid #C2C7CB; ' )
aadd( txt_, ' border-top: 0px solid #C2C7CB; ' )
aadd( txt_, '} ' )
aadd( txt_, 'QTabWidget::tab-bar { ' )
IF nMode == HBIDE_ANIMATION_GRADIENT
aadd( txt_, ' background: qlineargradient(x1:0, y1:1, x2:0, y2:0, ' )
aadd( txt_, ' stop:0 lightgray, stop:1 darkgray); ' )
ENDIF
aadd( txt_, ' left: 5px; /* move to the right by 5px */ ' )
aadd( txt_, '} ' )
aadd( txt_, 'QTabBar { ' )
IF nMode == HBIDE_ANIMATION_GRADIENT
aadd( txt_, hbide_ideThemeColorCSS( "tabbar", 1 ) )
ELSE
aadd( txt_, hbide_cssColorString( "bg-std" ) )
ENDIF
aadd( txt_, hbide_ideThemeColorCSS( "TabBar", 1 ) )
aadd( txt_, '} ' )
aadd( txt_, 'QTabBar::tab { ' )
IF nMode == HBIDE_ANIMATION_GRADIENT
aadd( txt_, ' background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, ' )
aadd( txt_, ' stop: 0 #E1E1E1, stop: 0.4 #DDDDDD, ' )
aadd( txt_, ' stop: 0.5 #D8D8D8, stop: 1.0 #D3D3D3); ' )
ELSE
aadd( txt_, hbide_cssColorString( "bg-std" ) )
ENDIF
aadd( txt_, hbide_ideThemeColorCSS( "Tab", 1 ) )
aadd( txt_, ' border: 2px solid #94C4C3; ' )
aadd( txt_, ' border-bottom-color: #C2C7CB; /* same as the pane color */ ' )
aadd( txt_, ' border-top-left-radius: 6px; ' )
aadd( txt_, ' border-top-right-radius: 6px; ' )
aadd( txt_, ' min-width: 8px; ' )
aadd( txt_, ' padding: 2px; ' )
aadd( txt_, ' padding-left: 2px; ' )
aadd( txt_, '} ' )
aadd( txt_, ' QTabBar::tab:selected { ' )
IF nMode == HBIDE_ANIMATION_GRADIENT
aadd( txt_, ' background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, ' )
aadd( txt_, ' stop: 0 #fafafa, stop: 0.4 #f4f4f4, ' )
aadd( txt_, ' stop: 0.5 #e7e7e7, stop: 1.0 #fafafa); ' )
ELSE
aadd( txt_, ' background: rgb( 230,230,230 ); ' )
ENDIF
aadd( txt_, ' } ' )
aadd( txt_, ' QTabBar::tab:selected:hover { ' )
IF nMode == HBIDE_ANIMATION_GRADIENT
aadd( txt_, ' background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, ' )
aadd( txt_, ' stop: 0 #fafafa, stop: 0.4 #f4f4f4, ' )
aadd( txt_, ' stop: 0.5 #e7e7e7, stop: 1.0 #fafafa); ' )
ELSE
aadd( txt_, ' background: yellow; ' )
ENDIF
aadd( txt_, ' } ' )
aadd( txt_, ' QTabBar::tab:hover { ' )
aadd( txt_, ' background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, ' )
aadd( txt_, ' stop: 0 yellow, stop: 0.4 #f4f4f4, ' )
aadd( txt_, ' stop: 0.5 #e7e7e7, stop: 1.0 orange); ' )
aadd( txt_, ' } ' )
ELSE
aadd( txt_, 'QTabWidget::pane { /* The tab widget frame */ ' )
aadd( txt_, ' border-top: 0px solid #C2C7CB; ' )
aadd( txt_, '} ' )
aadd( txt_, 'QTabWidget::tab-bar { ' )
aadd( txt_, ' /* left: 5px; move to the right by 5px */ ' )
aadd( txt_, '} ' )
aadd( txt_, 'QTabBar { ' )
aadd( txt_, hbide_cssColorString( "bg-std" ) )
aadd( txt_, '} ' )
aadd( txt_, 'QTabBar::tab { ' )
aadd( txt_, hbide_cssColorString( "bg-std" ) )
aadd( txt_, ' border: 2px solid #94C4C3; ' )
aadd( txt_, ' border-bottom-color: #C2C7CB; /* same as the pane color */ ' )
aadd( txt_, ' border-top-left-radius: 6px; ' )
aadd( txt_, ' border-top-right-radius: 6px; ' )
aadd( txt_, ' padding-left: 2px; ' )
aadd( txt_, '} ' )
aadd( txt_, ' QTabBar::tab:selected { ' )
aadd( txt_, ' border-color: red /*/#9B9B9B*/ ; ' )
aadd( txt_, ' border-bottom-color: #C2C7CB; /* same as pane color */ ' )
aadd( txt_, ' background: rgb( 230,230,230 ); ' )
aadd( txt_, ' } ' )
aadd( txt_, ' QTabBar::tab:selected:hover { ' )
aadd( txt_, ' background: yellow; ' )
aadd( txt_, ' } ' )
aadd( txt_, ' QTabBar::tab:hover { ' )
aadd( txt_, ' background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, ' )
aadd( txt_, ' stop: 0 yellow, stop: 0.4 #f4f4f4, ' )
aadd( txt_, ' stop: 0.5 #e7e7e7, stop: 1.0 orange); ' )
aadd( txt_, ' } ' )
ENDIF
CASE cWidget == "QPlainTextEdit"
aadd( txt_, ' QPlainTextEdit { ' )
@@ -405,9 +410,9 @@ FUNCTION GetStyleSheet( cWidget, nMode )
aadd( txt_, ' } ' )
aadd( txt_, 'QDockWidget::title { ' )
IF nMode == HBIDE_ANIMATION_GRADIENT
aadd( txt_, hbide_ideThemeColorCSS( "DockWidget", 1 ) )
aadd( txt_, hbide_ideThemeColorCSS( "DockWidget", 1 ) )
ELSE
aadd( txt_, hbide_cssColorString( "bg-std" ) )
aadd( txt_, hbide_cssColorString( "bg-std" ) )
ENDIF
aadd( txt_, ' padding-left: 10px; ' )
aadd( txt_, ' padding-top: 4px; ' )
@@ -489,6 +494,15 @@ STATIC FUNCTION hbide_ideThemeColorCSS( cPart, nTheme )
CASE cPart == "statusbar"
cCSS := ' background-color: qlineargradient(x1:0, y1:1, x2:0, y2:0, ' + ;
hbide_buildGradientString( hbide_loadIdeTheme( nTheme ) ) + "); "
CASE cPart == "tab"
cCSS := ' background-color: qlineargradient(x1:0, y1:1, x2:0, y2:0, ' + ;
hbide_buildGradientString( hbide_loadIdeTheme( nTheme ) ) + "); "
CASE cPart == "tabselected"
cCSS := ' background-color: qlineargradient(x1:0, y1:1, x2:0, y2:0, ' + ;
hbide_buildGradientString( hbide_loadIdeTheme( nTheme ) ) + "); "
CASE cPart == "tabselectedhover"
cCSS := ' background-color: qlineargradient(x1:0, y1:1, x2:0, y2:0, ' + ;
hbide_buildGradientString( hbide_loadIdeTheme( nTheme ) ) + "); "
ENDCASE
RETURN cCSS

42
harbour/contrib/hbide/resources/setup.ui
View File

@@ -97,7 +97,7 @@
<property name="geometry">
<rect>
<x>8</x>
<y>42</y>
<y>108</y>
<width>99</width>
<height>19</height>
</rect>
@@ -110,7 +110,7 @@
<property name="geometry">
<rect>
<x>8</x>
<y>64</y>
<y>86</y>
<width>99</width>
<height>19</height>
</rect>
@@ -136,7 +136,7 @@
<property name="geometry">
<rect>
<x>8</x>
<y>86</y>
<y>42</y>
<width>82</width>
<height>19</height>
</rect>
@@ -149,7 +149,7 @@
<property name="geometry">
<rect>
<x>8</x>
<y>110</y>
<y>64</y>
<width>82</width>
<height>19</height>
</rect>
@@ -261,7 +261,7 @@
<property name="geometry">
<rect>
<x>14</x>
<y>42</y>
<y>36</y>
<width>301</width>
<height>19</height>
</rect>
@@ -274,7 +274,7 @@
<property name="geometry">
<rect>
<x>14</x>
<y>66</y>
<y>56</y>
<width>301</width>
<height>19</height>
</rect>
@@ -287,7 +287,7 @@
<property name="geometry">
<rect>
<x>14</x>
<y>92</y>
<y>96</y>
<width>301</width>
<height>19</height>
</rect>
@@ -296,13 +296,26 @@
<string>Convert tabs to spaces when a source is loaded ?</string>
</property>
</widget>
<widget class="QCheckBox" name="checkBox_9">
<property name="geometry">
<rect>
<x>14</x>
<y>76</y>
<width>301</width>
<height>19</height>
</rect>
</property>
<property name="text">
<string>Keyword RETURN be treated as AT-BEGINGING type ?</string>
</property>
</widget>
</widget>
<widget class="QGroupBox" name="groupBox_14">
<property name="geometry">
<rect>
<x>10</x>
<y>272</y>
<width>157</width>
<width>331</width>
<height>83</height>
</rect>
</property>
@@ -348,6 +361,19 @@
<string>Highlight current line</string>
</property>
</widget>
<widget class="QCheckBox" name="checkBox_12">
<property name="geometry">
<rect>
<x>184</x>
<y>16</y>
<width>133</width>
<height>19</height>
</rect>
</property>
<property name="text">
<string>Animated Display</string>
</property>
</widget>
</widget>
</widget>
</widget>