Merge branch 'master' of ssh://villavu.com:54367/simba

Projects/Simba/simbasettings.lrs

@@ -0,0 +1,26 @@
+LazarusResources.Add('TSettingsForm','FORMDATA',[
+  'TPF0'#13'TSettingsForm'#12'SettingsForm'#4'Left'#3'3'#2#6'Height'#3'.'#2#3'T'
+  +'op'#3#173#0#5'Width'#3'h'#1#7'Caption'#6#14'Simba Settings'#12'ClientHeight'
+  +#3'.'#2#11'ClientWidth'#3'h'#1#8'OnCreate'#7#10'FormCreate'#9'OnDestroy'#7#11
+  +'FormDestroy'#9'OnMouseUp'#7#7'MouseUp'#10'LCLVersion'#6#6'0.9.29'#0#9'TTree'
+  +'View'#16'SettingsTreeView'#4'Left'#2#16#6'Height'#3#217#1#3'Top'#2#16#5'Wid'
+  +'th'#3'D'#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#17'Def'
+  +'aultItemHeight'#2#15#8'ReadOnly'#9#10'ScrollBars'#7#10'ssAutoBoth'#8'TabOrd'
+  +'er'#2#0#10'OnDblClick'#7#24'SettingsTreeViewDblClick'#10'OnKeyPress'#7#10'O'
+  +'nKeyPress'#9'OnMouseUp'#7#7'MouseUp'#7'Options'#11#17'tvoAutoItemHeight'#16
+  +'tvoHideSelection'#21'tvoKeepCollapsedNodes'#11'tvoReadOnly'#14'tvoShowButto'
+  +'ns'#12'tvoShowLines'#11'tvoShowRoot'#11'tvoToolTips'#0#0#0#7'TButton'#20'Se'
+  +'ttingsFormButtonOK'#4'Left'#3#9#1#6'Height'#2#25#3'Top'#3#255#1#5'Width'#2
+  +'K'#7'Anchors'#11#7'akRight'#8'akBottom'#0#7'Caption'#6#2'OK'#7'OnClick'#7#25
+  +'SettingsFormButtonOKClick'#8'TabOrder'#2#1#0#0#7'TButton'#24'SettingsFormBu'
+  +'ttonCancel'#4'Left'#2#16#6'Height'#2#25#3'Top'#3#255#1#5'Width'#2'K'#7'Anch'
+  +'ors'#11#6'akLeft'#8'akBottom'#0#7'Caption'#6#6'Cancel'#7'OnClick'#7#29'Sett'
+  +'ingsFormButtonCancelClick'#8'TabOrder'#2#2#0#0#7'TButton'#12'DeleteButton'#4
+  +'Left'#2'x'#6'Height'#2#25#3'Top'#3#255#1#5'Width'#2'x'#7'Anchors'#11#8'akBo'
+  +'ttom'#0#7'Caption'#6#15'Delete Selected'#7'OnClick'#7#14'DeleteSelected'#8
+  +'TabOrder'#2#3#0#0#10'TPopupMenu'#13'SettingsPopup'#4'left'#2'('#3'top'#2' '
+  +#0#9'TMenuItem'#11'PopupRename'#7'Caption'#6#6'Rename'#7'OnClick'#7#16'Popup'
+  +'RenameClick'#0#0#9'TMenuItem'#11'PopupDelete'#7'Caption'#6#6'Delete'#7'OnCl'
+  +'ick'#7#16'PopupDeleteClick'#0#0#9'TMenuItem'#11'PopupCreate'#7'Caption'#6#13
+  +'Create subkey'#7'OnClick'#7#14'PopupCreateKey'#0#0#0#0
+]);

Projects/Simba/simbaunit.lfm

@@ -1,11 +1,12 @@
 object SimbaForm: TSimbaForm
-  Left = 483
+  Left = 602
   Height = 623
-  Top = 95
+  Top = 75
   Width = 660
+  ActiveControl = ScriptPanel
   AllowDropFiles = True
   Caption = 'THA FUKING Simba'
-  ClientHeight = 603
+  ClientHeight = 598
   ClientWidth = 660
   KeyPreview = True
   Menu = MainMenu
@@ -207,8 +208,8 @@ object SimbaForm: TSimbaForm
   end
   object StatusBar: TStatusBar
     Left = 0
-    Height = 23
+    Height = 21
-    Top = 580
+    Top = 577
     Width = 660
     Panels = <    
       item
@@ -230,7 +231,7 @@ object SimbaForm: TSimbaForm
   object PanelMemo: TPanel
     Left = 0
     Height = 154
-    Top = 426
+    Top = 423
     Width = 660
     Align = alBottom
     ClientHeight = 154
@@ -253,19 +254,19 @@ object SimbaForm: TSimbaForm
     Cursor = crVSplit
     Left = 0
     Height = 5
-    Top = 421
+    Top = 418
     Width = 660
     Align = alBottom
     ResizeAnchor = akBottom
   end
   object ScriptPanel: TPanel
     Left = 0
-    Height = 397
+    Height = 394
     Top = 24
     Width = 660
     Align = alClient
     BevelOuter = bvNone
-    ClientHeight = 397
+    ClientHeight = 394
     ClientWidth = 660
     DockSite = True
     TabOrder = 4
@@ -273,7 +274,7 @@ object SimbaForm: TSimbaForm
     OnDockOver = ScriptPanelDockOver
     object PageControl1: TPageControl
       Left = 155
-      Height = 362
+      Height = 359
       Top = 0
       Width = 505
       Align = alClient
@@ -292,7 +293,7 @@ object SimbaForm: TSimbaForm
     object SearchPanel: TPanel
       Left = 0
       Height = 35
-      Top = 362
+      Top = 359
       Width = 660
       Align = alBottom
       BevelOuter = bvSpace
@@ -388,18 +389,18 @@ object SimbaForm: TSimbaForm
       end
       object LabeledEditSearch: TLabeledEdit
         Left = 104
-        Height = 21
+        Height = 27
         Top = 6
-        Width = 174
+        Width = 80
         EditLabel.AnchorSideLeft.Control = LabeledEditSearch
         EditLabel.AnchorSideTop.Control = LabeledEditSearch
         EditLabel.AnchorSideTop.Side = asrCenter
         EditLabel.AnchorSideRight.Control = LabeledEditSearch
         EditLabel.AnchorSideBottom.Control = LabeledEditSearch
-        EditLabel.Left = 73
+        EditLabel.Left = 67
-        EditLabel.Height = 14
+        EditLabel.Height = 18
-        EditLabel.Top = 9
+        EditLabel.Top = 10
-        EditLabel.Width = 28
+        EditLabel.Width = 34
         EditLabel.Caption = 'Find: '
         EditLabel.ParentColor = False
         LabelPosition = lpLeft
@@ -412,9 +413,9 @@ object SimbaForm: TSimbaForm
       end
       object CheckBoxMatchCase: TCheckBox
         Left = 320
-        Height = 17
+        Height = 22
         Top = 7
-        Width = 72
+        Width = 97
         Caption = 'Match case'
         OnClick = CheckBoxMatchCaseClick
         TabOrder = 1
@@ -422,34 +423,38 @@ object SimbaForm: TSimbaForm
     end
     object SplitterFunctionList: TSplitter
       Left = 150
-      Height = 362
+      Height = 359
       Top = 0
       Width = 5
       OnCanResize = SplitterFunctionListCanResize
       Visible = False
     end
     inline frmFunctionList: TFunctionListFrame
-      Height = 362
+      Height = 359
       Width = 150
-      ClientHeight = 362
+      ClientHeight = 359
       ClientWidth = 150
       OnEndDock = nil
       TabOrder = 3
       inherited FunctionList: TTreeView
-        Height = 323
+        Height = 310
+        Top = 22
         Width = 150
+        DefaultItemHeight = 19
         OnChange = FunctionListChange
         OnEnter = FunctionListEnter
         OnExit = FunctionListExit
       end
       inherited editSearchList: TEdit
-        Top = 341
+        Height = 27
+        Top = 332
         Width = 150
         OnExit = editSearchListExit
         OnKeyDown = editSearchListKeyDown
         OnKeyPress = editSearchListKeyPress
       end
       inherited FunctionListLabel: TLabel
+        Height = 18
         Width = 146
       end
     end

Projects/Simba/simbaunit.pas

@@ -1118,6 +1118,7 @@ begin
     exit;
   end;
   NewTab := PageControl1.TabIndex;
+  if NewTab < 0 then exit;
   Tab := TMufasaTab(Tabs[Newtab]);
   Script := Tab.ScriptFrame;
   Self.CurrScript := Script;