Update documentation. Some DocumentView fixes again.
[GB.FORM] * NEW: Update documentation. * NEW: DocumentView: Remove useless methods MoveFirst(), MoveLast(), MoveTo(). * NEW: DocumentView: Rename FirstVisibleDocument and LastVisibleDocument as FirstVisiblePage and LastVisiblePage. * BUG: DocumentView: Setting Center property now relayout the preview.
This commit is contained in:
gambas
parent
bbf2c0f6aa
commit
bc0a5a63f4
5 changed files with 31 additions and 84 deletions
|
|
@ -1,6 +1,6 @@
|
|||
# Gambas Project File 3.0
|
||||
Title=More controls for graphical components
|
||||
Startup=FTestFileChooser
|
||||
Startup=FDocumentView
|
||||
Icon=.hidden/window.png
|
||||
Version=3.15.90
|
||||
VersionFile=1
|
||||
|
|
@ -10,7 +10,7 @@ Component=gb.form
|
|||
Component=gb.settings
|
||||
Component=gb.form.stock
|
||||
Authors="Benoît Minisini"
|
||||
Environment="GB_GUI=gb.gtk\n GB_STOCK_DEBUG=1\n LANG=zh_CN.UTF-8\n LC_ALL=en_US.UTF-8\n LC_ALL=zh_CN.UTF-8\n GTK_DEBUG=interactive"
|
||||
Environment="GB_GUI=gb.qt5\n GB_STOCK_DEBUG=1\n LANG=zh_CN.UTF-8\n LC_ALL=en_US.UTF-8\n LC_ALL=zh_CN.UTF-8\n GTK_DEBUG=interactive"
|
||||
TabSize=2
|
||||
Translate=1
|
||||
Language=en
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
Export
|
||||
Inherits UserControl
|
||||
|
||||
Public Const _Properties As String = "*,Border,Arrangement{Arrange.Row;Column;Vertical;Horizontal;Fill}=Row,Padding=10,Spacing=10,Columns,Center,ShowShadow,ShowPage"
|
||||
Public Const _Properties As String = "*,Border,Arrangement{Arrange.Row;Column;Vertical;Horizontal;Fill}=Row,Padding=16,Spacing=16,Columns,Center,ShowShadow,ShowPage"
|
||||
Public Const _Group As String = "View"
|
||||
Public Const _Similar As String = "GridView"
|
||||
|
||||
|
|
@ -43,12 +43,19 @@ Property Zoom, Scale As Float
|
|||
Property Columns As Integer
|
||||
|
||||
'' Return or set how the different pages are arranged inside the view.
|
||||
''
|
||||
'' This property can take one of the following values:
|
||||
'' - [Arrange.Vertical](/comp/gb.qt4/arrange/vertical)
|
||||
'' - [Arrange.Horizontal](/comp/gb.qt4/arrange/horizontal)
|
||||
'' - [Arrange.Row](/comp/gb.qt4/arrange/row)
|
||||
'' - [Arrange.Column](/comp/gb.qt4/arrange/column)
|
||||
'' - [Arrange.Fill](/comp/gb.qt4/arrange/fill)
|
||||
Property Arrangement As Integer
|
||||
|
||||
'' Return or set the padding around the view in pixels.
|
||||
'' Return or set the padding inside the view in millimiters.
|
||||
Property Padding As Integer
|
||||
|
||||
'' Return or set the spacing between the different pages in pixels.
|
||||
'' Return or set the spacing between the different pages in millimiters.
|
||||
Property Spacing As Integer
|
||||
|
||||
'' Return or set if pages are drawn with a little shadow.
|
||||
|
|
@ -57,10 +64,11 @@ Property ShowShadow As Boolean
|
|||
'' Return or set if the page number must be displayed inside the view.
|
||||
Property ShowPage As Boolean
|
||||
|
||||
Property Read Item As _DocumentItem
|
||||
'' Return the index of the first visible page.
|
||||
Property Read FirstVisiblePage As Integer
|
||||
|
||||
Property Read FirstVisibleDocument As Integer
|
||||
Property Read LastVisibleDocument As Integer
|
||||
'' Return the index of the last visible page.
|
||||
Property Read LastVisiblePage As Integer
|
||||
|
||||
'' Return or set if the page must be centered in the view.
|
||||
Property Center As Boolean
|
||||
|
|
@ -107,7 +115,6 @@ Private $aImageToLoad As New Integer[]
|
|||
Private $aImageLoaded As New Integer[]
|
||||
Private $iNbreDocByLine As Integer
|
||||
Private $hDocItem As _DocumentItem
|
||||
Private $iIntern As Integer
|
||||
Private $iCurrent As Integer
|
||||
Private $fZoom As Float = 1.0
|
||||
Private $aSelected As New Integer[]
|
||||
|
|
@ -948,66 +955,6 @@ Public Sub _get(Index As Integer) As _DocumentItem
|
|||
|
||||
End
|
||||
|
||||
'' Move to a specific page.
|
||||
''
|
||||
'' - ~Index~ is the page number, starting from zero.
|
||||
''
|
||||
'' Return 'TRUE' if the specified page does not exist.
|
||||
|
||||
Public Function MoveTo(Index As Integer) As Boolean
|
||||
|
||||
If Index < 0 Or Index >= $iCount Then Return True
|
||||
$iIntern = Index
|
||||
|
||||
End
|
||||
|
||||
'' Move to the first page.
|
||||
''
|
||||
'' This function returns 'TRUE' if there is no page in the document.
|
||||
|
||||
Public Function MoveFirst() As Boolean
|
||||
|
||||
If $iCount = 0 Then Return True
|
||||
$iIntern = 0
|
||||
|
||||
End
|
||||
|
||||
'' Move to the next page.
|
||||
''
|
||||
'' This function returns 'TRUE' if we already are at the last page or if there is no page in the document.
|
||||
|
||||
Public Function MoveNext() As Boolean
|
||||
|
||||
If $iIntern + 1 >= $iCount Then Return True
|
||||
Inc $iIntern
|
||||
|
||||
End
|
||||
|
||||
'' Move to the previous page.
|
||||
''
|
||||
'' This function returns 'TRUE' if we already are at the first page or if there is no page in the document.
|
||||
|
||||
Public Function MovePrevious() As Boolean
|
||||
|
||||
If $iIntern = 0 Then Return True
|
||||
Dec $iIntern
|
||||
|
||||
End
|
||||
|
||||
Private Function Item_Read() As _DocumentItem
|
||||
|
||||
$hDocItem._Index = $iIntern
|
||||
Return $hDocItem
|
||||
|
||||
End
|
||||
|
||||
' Private Function Current_Read() As _DocumentItem
|
||||
'
|
||||
' $hDocItem._Index = $iCurrent
|
||||
' Return $hDocItem
|
||||
'
|
||||
' End
|
||||
|
||||
Public Sub View_MouseDown()
|
||||
|
||||
$MX = Mouse.X
|
||||
|
|
@ -1052,21 +999,13 @@ Public Function _IsVisible(Index As Integer) As Boolean
|
|||
|
||||
End
|
||||
|
||||
' Public Function _GetX(Index As Integer) As Integer
|
||||
'
|
||||
' End
|
||||
'
|
||||
' Public Function _GetY(Index As Integer) As Integer
|
||||
'
|
||||
' End
|
||||
|
||||
Private Function FirstVisibleDocument_Read() As Integer
|
||||
Private Function FirstVisiblePage_Read() As Integer
|
||||
|
||||
Return $iFirstVisibleDocument
|
||||
|
||||
End
|
||||
|
||||
Private Function LastVisibleDocument_Read() As Integer
|
||||
Private Function LastVisiblePage_Read() As Integer
|
||||
|
||||
Return $iLastVisibleDocument
|
||||
|
||||
|
|
@ -1096,6 +1035,7 @@ Private Sub Center_Write(Value As Boolean)
|
|||
|
||||
If value = $bAutoCenter Then Return
|
||||
$bAutoCenter = Value
|
||||
DoLayout
|
||||
$tmrRefresh.Trigger
|
||||
|
||||
End
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ Property Read Width, W As Integer
|
|||
|
||||
Public _Index As Integer
|
||||
|
||||
Event Foo
|
||||
Event _Foo
|
||||
|
||||
Private Function Height_Read() As Integer
|
||||
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ End
|
|||
Public Sub Form_Open()
|
||||
|
||||
'hpdf.Open("/home/fabien/Downloads/cerfa_14952-01.pdf")
|
||||
hpdf.Open("~/30-10-2020-attestation-de-deplacement-derogatoire.pdf")
|
||||
hpdf.Open("~/IMSLP07596-BWV0997.pdf")
|
||||
DV.Count = hpdf.Count
|
||||
DV2.Count = 0
|
||||
DV2.DocHeight = hpdf[1].Height / 0.72
|
||||
|
|
@ -132,6 +132,6 @@ End
|
|||
|
||||
Public Sub CheckBox2_Click()
|
||||
|
||||
DV.AutoCenter = Last.Value
|
||||
DV.Center = Last.Value
|
||||
|
||||
End
|
||||
|
|
|
|||
|
|
@ -3,15 +3,22 @@
|
|||
{ Form Form
|
||||
MoveScaled(0,0,121,68)
|
||||
Arrangement = Arrange.Horizontal
|
||||
Spacing = True
|
||||
Margin = True
|
||||
{ DV2 DocumentView
|
||||
MoveScaled(1,1,13,66)
|
||||
Visible = False
|
||||
Arrangement = Arrange.Vertical
|
||||
}
|
||||
{ DV DocumentView
|
||||
MoveScaled(14,1,58,66)
|
||||
Background = &HC0C0C0&
|
||||
Expand = True
|
||||
Arrangement = Arrange.Horizontal
|
||||
Border = True
|
||||
Padding = 30
|
||||
Spacing = 30
|
||||
ShowShadow = True
|
||||
ShowPage = True
|
||||
}
|
||||
{ Panel1 Panel
|
||||
MoveScaled(72,1,39,66)
|
||||
|
|
@ -78,7 +85,7 @@
|
|||
}
|
||||
{ CheckBox2 CheckBox
|
||||
MoveScaled(2,45,22,2)
|
||||
Text = ("Autocenter")
|
||||
Text = ("Center")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue