tvplanit: In fulldemo replace PageControl by NoteBook to see controls also with gtk2 widgetset.

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5001 8e941d3f-bd1b-0410-a28a-d453659cc2b4
2016-07-18 22:19:33 +00:00
parent b5317b3bae
commit 7119c27a3b
6 changed files with 187 additions and 273 deletions
--- a/components/tvplanit/examples/fulldemo/demomain.lfm
+++ b/components/tvplanit/examples/fulldemo/demomain.lfm
@ -20,34 +20,61 @@ object MainForm: TMainForm
    ClientHeight = 580
    ClientWidth = 780
    TabOrder = 0
-    object PageControl1: TPageControl
+    object HeaderPanel: TPanel
+      Left = 2
+      Height = 48
+      Top = 0
+      Width = 778
+      Align = alTop
+      BorderSpacing.Left = 2
+      BevelOuter = bvNone
+      ClientHeight = 48
+      ClientWidth = 778
+      Color = clActiveCaption
+      ParentColor = False
+      TabOrder = 0
+      object Img: TImage
+        Left = 8
+        Height = 32
+        Top = 8
+        Width = 32
+      end
+      object TitleLbl: TLabel
+        Left = 56
+        Height = 32
+        Top = 8
+        Width = 84
+        Caption = 'TitleLbl'
+        Font.Color = clWhite
+        Font.Height = -24
+        Font.Style = [fsBold]
+        ParentColor = False
+        ParentFont = False
+      end
+    end
+    object Notebook: TNotebook
      Left = 0
      Height = 532
      Top = 48
      Width = 780
-      ActivePage = TabEvents
+      PageIndex = 0
      Align = alClient
-      TabIndex = 0
-      TabOrder = 0
-      object TabEvents: TTabSheet
-        Caption = 'Events'
-        ClientHeight = 504
-        ClientWidth = 772
-        TabVisible = False
+      TabOrder = 1
+      object Events: TPage
        object LeftPanel: TPanel
          Left = 0
-          Height = 504
+          Height = 532
          Top = 0
          Width = 333
          Align = alLeft
          BevelOuter = bvNone
-          ClientHeight = 504
+          ClientHeight = 532
          ClientWidth = 333
          TabOrder = 0
          object VpMonthView1: TVpMonthView
            Left = 0
            Height = 197
-            Top = 307
+            Top = 335
            Width = 333
            DataStore = VpBufDSDataStore1
            ControlLink = VpControlLink1
@ -80,14 +107,14 @@ object MainForm: TMainForm
            Cursor = crVSplit
            Left = 0
            Height = 5
-            Top = 302
+            Top = 330
            Width = 333
            Align = alBottom
            ResizeAnchor = akBottom
          end
          object VpDayView1: TVpDayView
            Left = 0
-            Height = 260
+            Height = 288
            Top = 42
            Width = 333
            DataStore = VpBufDSDataStore1
@ -234,15 +261,15 @@ object MainForm: TMainForm
        end
        object Splitter3: TSplitter
          Left = 333
-          Height = 504
+          Height = 532
          Top = 0
          Width = 5
        end
        object VpWeekView1: TVpWeekView
          Left = 338
-          Height = 504
+          Height = 532
          Top = 0
-          Width = 434
+          Width = 442
          DataStore = VpBufDSDataStore1
          ControlLink = VpControlLink1
          Color = clWindow
@ -271,20 +298,16 @@ object MainForm: TMainForm
          TabOrder = 2
        end
      end
-      object TabTasks: TTabSheet
-        Caption = 'Tasks'
-        ClientHeight = 504
-        ClientWidth = 772
-        TabVisible = False
+      object Tasks: TPage
        object Panel6: TPanel
          Left = 0
          Height = 42
          Top = 0
-          Width = 772
+          Width = 626
          Align = alTop
          BevelOuter = bvNone
          ClientHeight = 42
-          ClientWidth = 772
+          ClientWidth = 626
          TabOrder = 0
          object RbAllTasks: TRadioButton
            Left = 8
@ -309,9 +332,9 @@ object MainForm: TMainForm
        end
        object VpTaskList1: TVpTaskList
          Left = 0
-          Height = 462
+          Height = 393
          Top = 42
-          Width = 772
+          Width = 626
          DataStore = VpBufDSDataStore1
          ControlLink = VpControlLink1
          Color = clWindow
@ -340,14 +363,10 @@ object MainForm: TMainForm
          ShowResourceName = True
        end
      end
-      object TabContacts: TTabSheet
-        Caption = 'Contacts'
-        ClientHeight = 504
-        ClientWidth = 772
-        TabVisible = False
+      object Contacts: TPage
        object VpContactButtonBar1: TVpContactButtonBar
          Left = 0
-          Height = 504
+          Height = 435
          Top = 0
          Width = 40
          DrawingStyle = dsFlat
@ -356,9 +375,9 @@ object MainForm: TMainForm
        end
        object VpContactGrid1: TVpContactGrid
          Left = 40
-          Height = 504
+          Height = 435
          Top = 0
-          Width = 732
+          Width = 586
          DataStore = VpBufDSDataStore1
          ControlLink = VpControlLink1
          Color = clWindow
@ -374,27 +393,15 @@ object MainForm: TMainForm
          DrawingStyle = dsFlat
        end
      end
-      object TabResources: TTabSheet
-        Caption = 'Resources'
-        ClientHeight = 504
-        ClientWidth = 772
-        TabVisible = False
-        object VpResourceCombo1: TVpResourceCombo
-          Left = 16
-          Height = 23
-          Top = 24
-          Width = 235
-          DataStore = VpBufDSDataStore1
-          Style = csDropDownList
-        end
-        object BtnNewRes: TButton
-          Left = 16
+      object Resources: TPage
+        object BtnDeleteRes: TButton
+          Left = 176
          Height = 25
          Top = 64
          Width = 75
-          Caption = 'New'
-          OnClick = BtnNewResClick
-          TabOrder = 1
+          Caption = 'Delete'
+          OnClick = BtnDeleteResClick
+          TabOrder = 0
        end
        object BtnEditRes: TButton
          Left = 96
@ -403,23 +410,27 @@ object MainForm: TMainForm
          Width = 75
          Caption = 'Edit'
          OnClick = BtnEditResClick
-          TabOrder = 2
+          TabOrder = 1
        end
-        object BtnDeleteRes: TButton
-          Left = 176
+        object BtnNewRes: TButton
+          Left = 16
          Height = 25
          Top = 64
          Width = 75
-          Caption = 'Delete'
-          OnClick = BtnDeleteResClick
-          TabOrder = 3
+          Caption = 'New'
+          OnClick = BtnNewResClick
+          TabOrder = 2
+        end
+        object VpResourceCombo1: TVpResourceCombo
+          Left = 16
+          Height = 23
+          Top = 24
+          Width = 235
+          DataStore = VpBufDSDataStore1
+          Style = csDropDownList
        end
      end
-      object TabSettings: TTabSheet
-        Caption = 'Settings'
-        ClientHeight = 504
-        ClientWidth = 772
-        TabVisible = False
+      object Settings: TPage
        object LblLanguage: TLabel
          AnchorSideTop.Control = CbLanguages
          AnchorSideTop.Side = asrCenter
@ -440,65 +451,22 @@ object MainForm: TMainForm
          Style = csDropDownList
          TabOrder = 0
        end
-        object LblTimeFormat: TLabel
-          AnchorSideTop.Control = CbTimeFormat
-          AnchorSideTop.Side = asrCenter
-          Left = 16
-          Height = 15
-          Top = 68
-          Width = 66
-          Caption = 'Time format'
-          ParentColor = False
-        end
-        object CbTimeFormat: TComboBox
-          Left = 112
+        object CbDrawingStyle: TComboBox
+          Left = 440
          Height = 23
          Top = 64
-          Width = 172
+          Width = 113
          ItemHeight = 15
-          OnChange = CbTimeFormatChange
+          OnChange = CbDrawingStyleChange
          Style = csDropDownList
          TabOrder = 1
        end
-        object LblFirstDayOfWeek: TLabel
-          AnchorSideTop.Control = CbFirstDayOfWeek
-          AnchorSideTop.Side = asrCenter
-          Left = 16
-          Height = 15
-          Top = 108
-          Width = 88
-          Caption = 'First day of week'
-          ParentColor = False
-        end
-        object CbFirstDayOfWeek: TComboBox
-          Left = 112
-          Height = 23
-          Top = 104
-          Width = 172
-          ItemHeight = 15
-          OnChange = CbFirstDayOfWeekChange
-          Style = csDropDownList
-          TabOrder = 2
-        end
-        object CbAllowInplaceEditing: TCheckBox
+        object LblDrawingStyle: TLabel
          Left = 349
-          Height = 19
-          Top = 28
-          Width = 131
-          Caption = 'Allow inplace editing'
-          Checked = True
-          OnChange = CbAllowInplaceEditingChange
-          State = cbChecked
-          TabOrder = 3
-        end
-        object LblAddressBuilder: TLabel
-          AnchorSideTop.Control = CbAddressBuilder
-          AnchorSideTop.Side = asrCenter
-          Left = 16
          Height = 15
-          Top = 148
-          Width = 82
-          Caption = 'Address builder'
+          Top = 68
+          Width = 74
+          Caption = 'Drawing style:'
          ParentColor = False
        end
        object CbAddressBuilder: TComboBox
@ -516,59 +484,70 @@ object MainForm: TMainForm
          )
          OnChange = CbAddressBuilderChange
          Style = csDropDownList
-          TabOrder = 4
+          TabOrder = 2
          Text = '(default)'
        end
-        object LblDrawingStyle: TLabel
-          Left = 349
+        object LblAddressBuilder: TLabel
+          AnchorSideTop.Control = CbAddressBuilder
+          AnchorSideTop.Side = asrCenter
+          Left = 16
          Height = 15
-          Top = 68
-          Width = 74
-          Caption = 'Drawing style:'
+          Top = 148
+          Width = 82
+          Caption = 'Address builder'
          ParentColor = False
        end
-        object CbDrawingStyle: TComboBox
-          Left = 440
+        object CbAllowInplaceEditing: TCheckBox
+          Left = 349
+          Height = 19
+          Top = 28
+          Width = 131
+          Caption = 'Allow inplace editing'
+          Checked = True
+          OnChange = CbAllowInplaceEditingChange
+          State = cbChecked
+          TabOrder = 3
+        end
+        object CbFirstDayOfWeek: TComboBox
+          Left = 112
+          Height = 23
+          Top = 104
+          Width = 172
+          ItemHeight = 15
+          OnChange = CbFirstDayOfWeekChange
+          Style = csDropDownList
+          TabOrder = 4
+        end
+        object LblFirstDayOfWeek: TLabel
+          AnchorSideTop.Control = CbFirstDayOfWeek
+          AnchorSideTop.Side = asrCenter
+          Left = 16
+          Height = 15
+          Top = 108
+          Width = 88
+          Caption = 'First day of week'
+          ParentColor = False
+        end
+        object CbTimeFormat: TComboBox
+          Left = 112
          Height = 23
          Top = 64
-          Width = 113
+          Width = 172
          ItemHeight = 15
-          OnChange = CbDrawingStyleChange
+          OnChange = CbTimeFormatChange
          Style = csDropDownList
          TabOrder = 5
        end
-      end
-    end
-    object HeaderPanel: TPanel
-      Left = 2
-      Height = 48
-      Top = 0
-      Width = 778
-      Align = alTop
-      BorderSpacing.Left = 2
-      BevelOuter = bvNone
-      ClientHeight = 48
-      ClientWidth = 778
-      Color = clActiveCaption
+        object LblTimeFormat: TLabel
+          AnchorSideTop.Control = CbTimeFormat
+          AnchorSideTop.Side = asrCenter
+          Left = 16
+          Height = 15
+          Top = 68
+          Width = 66
+          Caption = 'Time format'
          ParentColor = False
-      TabOrder = 1
-      object Img: TImage
-        Left = 8
-        Height = 32
-        Top = 8
-        Width = 32
        end
-      object TitleLbl: TLabel
-        Left = 56
-        Height = 32
-        Top = 8
-        Width = 84
-        Caption = 'TitleLbl'
-        Font.Color = clWhite
-        Font.Height = -24
-        Font.Style = [fsBold]
-        ParentColor = False
-        ParentFont = False
      end
    end
  end
--- a/components/tvplanit/examples/fulldemo/demomain.pas
+++ b/components/tvplanit/examples/fulldemo/demomain.pas
@ -38,6 +38,12 @@ type
    MnuPrint: TMenuItem;
    MnuEditPrintFormats: TMenuItem;
    MnuPrintPreview: TMenuItem;
+    Notebook: TNotebook;
+    Events: TPage;
+    Tasks: TPage;
+    Contacts: TPage;
+    Resources: TPage;
+    Settings: TPage;
    PrintDialog1: TPrintDialog;
    TitleLbl: TLabel;
    MainMenu1: TMainMenu;
@ -48,7 +54,6 @@ type
    MnuMaintenance: TMenuItem;
    MnuQuit: TMenuItem;
    MnuResources: TMenuItem;
-    PageControl1: TPageControl;
    Panel1: TPanel;
    LeftPanel: TPanel;
    DaySelectorPanel: TPanel;
@ -58,11 +63,6 @@ type
    RbHideCompletedTasks: TRadioButton;
    Splitter2: TSplitter;
    Splitter3: TSplitter;
-    TabEvents: TTabSheet;
-    TabContacts: TTabSheet;
-    TabResources: TTabSheet;
-    TabSettings: TTabSheet;
-    TabTasks: TTabSheet;
    DaysTrackBar: TTrackBar;
    VpBufDSDataStore1: TVpBufDSDataStore;
    VpContactButtonBar1: TVpContactButtonBar;
@ -802,7 +802,7 @@ end;

 procedure TMainForm.ShowAllEvents;
 begin
-  PageControl1.ActivePage := TabEvents;
+  Notebook.PageIndex := 0;
  VpDayView1.Parent := LeftPanel;
  VpMonthView1.Parent := LeftPanel;
  VpMonthView1.Align := alBottom;
@ -821,11 +821,12 @@ end;

 procedure TMainform.ShowEventsPerMonth;
 begin
-  PageControl1.ActivePage := TabEvents;
+  Notebook.PageIndex := 0;
  LeftPanel.Hide;
  Splitter3.Hide;
+  VpDayView1.Hide;
  VpWeekView1.Hide;
-  VpMonthView1.Parent := TabEvents;
+  VpMonthView1.Parent := Notebook.Page[0];
  VpMonthView1.Align := alClient;
  VpMonthView1.Show;
  DaySelectorPanel.Hide;
@ -835,7 +836,7 @@ end;

 procedure TMainForm.ShowEventsPerWeek;
 begin
-  PageControl1.ActivePage := TabEvents;
+  Notebook.PageIndex := 0;
  LeftPanel.Hide;
  Splitter3.Hide;
  VpMonthView1.Hide;
@ -848,15 +849,15 @@ end;

 procedure TMainform.ShowEventsPerDay;
 begin
-  PageControl1.ActivePage := TabEvents;
+  Notebook.PageIndex := 0;
  LeftPanel.Hide;
  Splitter3.Hide;
  VpMonthView1.Hide;
  VpWeekView1.Hide;
-  VpDayView1.Parent := TabEvents;
+  VpDayView1.Parent := Notebook.Page[Notebook.PageIndex];
  VpDayView1.Align := alClient;
  VpDayView1.Show;
-  DaySelectorPanel.Parent := TabEvents;
+  DaySelectorPanel.Parent := Notebook.Page[Notebook.PageIndex];
  DaySelectorPanel.Show;
  DaysTrackbar.Position := FVisibleDays;
  VpDayView1.NumDays := DaysTrackBar.Position;
@ -866,28 +867,28 @@ end;

 procedure TMainForm.ShowTasks;
 begin
-  Pagecontrol1.ActivePage := TabTasks;
+  Notebook.PageIndex := 1;
  titleLbl.Caption := RSTasks;
  ImageList1.GetBitmap(1, Img.Picture.Bitmap);
 end;

 procedure TMainForm.ShowContacts;
 begin
-  PageControl1.ActivePage := TabContacts;
+  Notebook.PageIndex := 2;
  TitleLbl.Caption := RSContacts;
  ImageList1.GetBitmap(2, Img.Picture.Bitmap);
 end;

 procedure TMainForm.ShowResources;
 begin
-  PageControl1.Activepage := TabResources;
+  Notebook.PageIndex := 3;
  TitleLbl.Caption := RSResources;
  ImageList1.GetBitmap(7, Img.Picture.Bitmap);
 end;

 procedure TMainForm.ShowSettings;
 begin
-  PageControl1.ActivePage := TabSettings;
+  Notebook.PageIndex := 4;
  TitleLbl.Caption := RSSettings;
  ImageList1.GetBitmap(8, Img.Picture.Bitmap);
 end;
--- a/components/tvplanit/languages/demo.de.po
+++ b/components/tvplanit/languages/demo.de.po
@ -309,31 +309,8 @@ msgstr "Alle Aufgaben"
 msgid "Hide completed tasks"
 msgstr "Fertiggestellte Aufgaben ausblenden"

-#: tmainform.tabcontacts.caption
-msgctxt "tmainform.tabcontacts.caption"
-msgid "Contacts"
-msgstr "Kontakte"
-
-#: tmainform.tabevents.caption
-msgid "Events"
-msgstr "Termine"
-
-#: tmainform.tabresources.caption
-msgctxt "tmainform.tabresources.caption"
-msgid "Resources"
-msgstr "Wartung"
-
-#: tmainform.tabsettings.caption
-msgctxt "tmainform.tabsettings.caption"
-msgid "Settings"
-msgstr "Einstellungen"
-
-#: tmainform.tabtasks.caption
-msgctxt "tmainform.tabtasks.caption"
-msgid "Tasks"
-msgstr "Aufgaben"
-
 # No need to translate
 #: tmainform.titlelbl.caption
 msgid "TitleLbl"
 msgstr ""
+
--- a/components/tvplanit/languages/demo.nl.po
+++ b/components/tvplanit/languages/demo.nl.po
@ -25,6 +25,10 @@ msgstr "24 uur"
 msgid "30 min"
 msgstr "30 min"

+#: demomain.rs3d
+msgid "3D"
+msgstr ""
+
 #: demomain.rs5min
 msgid "5 min"
 msgstr "5 min"
@ -37,6 +41,10 @@ msgstr "60 min"
 msgid "6 min"
 msgstr "6 min"

+#: demomain.rsborderless
+msgid "no border"
+msgstr ""
+
 #: demomain.rsconfirmdeleteres
 msgid "Do you really want to delete resource %s?"
 msgstr "Wilt u hulpmiddel %s echt wissen?"
@ -62,6 +70,10 @@ msgstr "Evenementen per maand"
 msgid "Events per week"
 msgstr "Evenementen per week"

+#: demomain.rsflat
+msgid "flat"
+msgstr ""
+
 #: demomain.rsfriday
 msgid "Friday"
 msgstr "Vrijdag"
@ -188,10 +200,6 @@ msgstr "Nieuw"
 msgid "Turbo Power VisualPlanIt Demo"
 msgstr "Turbo Power VisualPlanIt Demo"

-#: tmainform.cb3d.caption
-msgid "3d display mode"
-msgstr "3d display mode"
-
 #: tmainform.cbaddressbuilder.text
 msgid "(default)"
 msgstr "(standaard)"
@ -208,6 +216,10 @@ msgstr "30 Min"
 msgid "Address builder"
 msgstr "Adres bouwer"

+#: tmainform.lbldrawingstyle.caption
+msgid "Drawing style:"
+msgstr ""
+
 #: tmainform.lblfirstdayofweek.caption
 msgid "First day of week"
 msgstr "Eerste dag van de week"
@ -237,15 +249,31 @@ msgstr "Bestand"
 msgid "Help"
 msgstr "Help"

+#: tmainform.menuitem3.caption
+msgid "-"
+msgstr ""
+
 #: tmainform.mnuabout.caption
 msgid "About Visual PlanIt"
 msgstr "Over Visual PlanIt"

+#: tmainform.mnueditprintformats.caption
+msgid "Edit print formats..."
+msgstr ""
+
 #: tmainform.mnumaintenance.caption
 msgctxt "TMAINFORM.MNUMAINTENANCE.CAPTION"
 msgid "Maintenance"
 msgstr "Onderhoud"

+#: tmainform.mnuprint.caption
+msgid "Print..."
+msgstr ""
+
+#: tmainform.mnuprintpreview.caption
+msgid "Print preview..."
+msgstr ""
+
 #: tmainform.mnuquit.caption
 msgid "Quit"
 msgstr "Afsluiten"
@ -268,30 +296,6 @@ msgstr "Alle taken"
 msgid "Hide completed tasks"
 msgstr "Verberg afgewerkte taken"

-#: tmainform.tabcontacts.caption
-msgctxt "tmainform.tabcontacts.caption"
-msgid "Contacts"
-msgstr "Contacten"
-
-#: tmainform.tabevents.caption
-msgid "Events"
-msgstr "Evenementen"
-
-#: tmainform.tabresources.caption
-msgctxt "TMAINFORM.TABRESOURCES.CAPTION"
-msgid "Resources"
-msgstr "Hulpmiddelen"
-
-#: tmainform.tabsettings.caption
-msgctxt "tmainform.tabsettings.caption"
-msgid "Settings"
-msgstr "Instellingen"
-
-#: tmainform.tabtasks.caption
-msgctxt "tmainform.tabtasks.caption"
-msgid "Tasks"
-msgstr "Taken"
-
 #: tmainform.titlelbl.caption
 msgid "TitleLbl"
 msgstr "TitleLbl"
--- a/components/tvplanit/languages/demo.po
+++ b/components/tvplanit/languages/demo.po
@ -296,30 +296,6 @@ msgstr ""
 msgid "Hide completed tasks"
 msgstr ""

-#: tmainform.tabcontacts.caption
-msgctxt "tmainform.tabcontacts.caption"
-msgid "Contacts"
-msgstr ""
-
-#: tmainform.tabevents.caption
-msgid "Events"
-msgstr ""
-
-#: tmainform.tabresources.caption
-msgctxt "TMAINFORM.TABRESOURCES.CAPTION"
-msgid "Resources"
-msgstr ""
-
-#: tmainform.tabsettings.caption
-msgctxt "tmainform.tabsettings.caption"
-msgid "Settings"
-msgstr ""
-
-#: tmainform.tabtasks.caption
-msgctxt "tmainform.tabtasks.caption"
-msgid "Tasks"
-msgstr ""
-
 #: tmainform.titlelbl.caption
 msgid "TitleLbl"
 msgstr ""
--- a/components/tvplanit/languages/demo.ru.po
+++ b/components/tvplanit/languages/demo.ru.po
@ -308,31 +308,8 @@ msgstr "Все задачи"
 msgid "Hide completed tasks"
 msgstr "Скрыть исполненные задачи"

-#: tmainform.tabcontacts.caption
-msgctxt "tmainform.tabcontacts.caption"
-msgid "Contacts"
-msgstr "Контакты"
-
-#: tmainform.tabevents.caption
-msgid "Events"
-msgstr "События"
-
-#: tmainform.tabresources.caption
-msgctxt "TMAINFORM.TABRESOURCES.CAPTION"
-msgid "Resources"
-msgstr "Ресурсы"
-
-#: tmainform.tabsettings.caption
-msgctxt "tmainform.tabsettings.caption"
-msgid "Settings"
-msgstr "Настройки"
-
-#: tmainform.tabtasks.caption
-msgctxt "tmainform.tabtasks.caption"
-msgid "Tasks"
-msgstr "Задачи"
-
 # No need to translate
 #: tmainform.titlelbl.caption
 msgid "TitleLbl"
 msgstr ""
+