Changeset 54 for trunk/Client/Forms

Timestamp:

Oct 12, 2012, 11:43:43 AM (12 years ago)

Author:

chronos

Message:

• Added: ChronisAppServer base project.
• Modified: Changes in client virtual database layer handling.

Location:

trunk/Client/Forms

Files:

• UFormImportStructure.pas (modified) (2 diffs)
• UFormItemEdit.pas (modified) (1 diff)
• UFormMain.lfm (modified) (5 diffs)
• UFormMain.pas (modified) (1 diff)
• UFormMenu.lfm (modified) (2 diffs)
• UFormMenu.pas (modified) (3 diffs)

trunk/Client/Forms/UFormImportStructure.pas

@@ -126 +126 @@
 
     SQLTables.Clear;
-    GroupId := Core.System.AddGroup(Database.Database, 0);
+    GroupId := Core.System.AddMenu(Database.Database, 0);
     Database.Query(DbRows, 'SHOW TABLES');
     for T := 0 to DbRows.Count - 1 do begin
@@ -133 +133 @@
       TableName := DbRows[T].Items[0].Value;
       Memo1.Lines.Add('Create object "' + TableName + '"');
-      NewTable.Table.Add('ObjId', IntToStr(Core.System.AddObject(TableName, TableName, Database.Database, GroupId)));
+      NewTable.Table.Add('ObjId', IntToStr(Core.System.AddObject(TableName, TableName, Database.Database)));
     end;
 

trunk/Client/Forms/UFormItemEdit.pas

@@ -141 +141 @@
     Proxy.Free;
   end;
-  if (SelectedObject.Table = ObjectGroupTable) or
-  (SelectedObject.Table = ObjectTable) then
+  if (SelectedObject.Table = SystemMenuTable) or
+  (SelectedObject.Table = SystemObjectTable) then
     FormMenu.LoadTree;
   //MainForm.LoadItemList;

trunk/Client/Forms/UFormMain.lfm

@@ -6 +6 @@
   ActiveControl = PanelMenu
   Caption = 'ChronIS'
-  ClientHeight = 421
+  ClientHeight = 427
   ClientWidth = 640
   Icon.Data = {
@@ -153 +153 @@
   object PanelMenu: TPanel
     Left = 0
-    Height = 374
+    Height = 381
     Top = 26
     Width = 184
@@ -162 +162 @@
   object PanelData: TPanel
     Left = 189
-    Height = 374
+    Height = 381
     Top = 26
     Width = 451
@@ -171 +171 @@
   object Splitter1: TSplitter
     Left = 184
-    Height = 374
+    Height = 381
     Top = 26
     Width = 5
@@ -177 +177 @@
   object StatusBar1: TStatusBar
     Left = 0
-    Height = 21
-    Top = 400
+    Height = 20
+    Top = 407
     Width = 640
     Panels = <    

trunk/Client/Forms/UFormMain.pas

@@ -150 +150 @@
   if Core.System.Active then
   with Core.System.Client do
-    StatusBar1.Panels[0].Text := User + '@' + Host + ':' + IntToStr(Port) + '/' + Schema;
+    StatusBar1.Panels[0].Text := User + '@' + Host + ':' + IntToStr(Port) + '/' + Schema
+    else StatusBar1.Panels[0].Text := '';
 
   for I := 0 to ToolBar1.ButtonCount - 1 do

trunk/Client/Forms/UFormMenu.lfm

@@ -1 +1 @@
 object FormMenu: TFormMenu
-  Left = 333
+  Left = 335
   Height = 487
-  Top = 70
+  Top = 108
   Width = 262
   Caption = 'Navigation'
@@ -10 +10 @@
   OnDestroy = FormDestroy
   LCLVersion = '0.9.31'
+  object TabControl1: TTabControl
+    Left = 0
+    Height = 26
+    Top = 0
+    Width = 262
+    TabIndex = 0
+    Tabs.Strings = (
+      'All'
+      'Favorite'
+      'History'
+    )
+    Align = alTop
+    TabOrder = 0
+  end
   object TreeViewMenu: TTreeView
     Left = 2
-    Height = 483
-    Top = 2
+    Height = 457
+    Top = 28
     Width = 258
     Align = alClient
     BorderSpacing.Around = 2
     DefaultItemHeight = 16
-    Images = MainForm.ImageListActions
     PopupMenu = PopupMenuObjectGroup
     ReadOnly = True
-    TabOrder = 0
+    TabOrder = 1
     OnChange = TreeViewMenuChange
     OnDblClick = AObjectGroupShowExecute

trunk/Client/Forms/UFormMenu.pas

@@ -31 +31 @@
     PopupMenuObject: TPopupMenu;
     PopupMenuObjectGroup: TPopupMenu;
+    TabControl1: TTabControl;
     TreeViewMenu: TTreeView;
     procedure AObjectEditExecute(Sender: TObject);
@@ -141 +142 @@
       Groups := TListProxy.Create;
       Groups.Client := Core.System.Client;
-      Groups.ObjectName := ObjectGroupTable;
+      Groups.ObjectName := SystemMenuTable;
       Groups.Path := Core.System.Client.Schema;
       Groups.Load;
@@ -153 +154 @@
           Objects := TListProxy.Create;
           Objects.Client := Core.System.Client;
-          Objects.ObjectName := ObjectTable;
+          Objects.ObjectName := SystemObjectTable;
           Objects.Path := Core.System.Client.Schema;
           Objects.Condition := '`Group`="' + Obj.Properties.Values['Id'] + '"';