Changeset 36 for trunk/Forms

Timestamp:

Mar 8, 2012, 7:51:16 AM (13 years ago)

Author:

chronos

Message:

• Removed: Main tabbed view of opened lists.

Location:

trunk

Files:

• . (modified) (1 prop)
• Forms/UItemList.pas (modified) (3 diffs)
• Forms/UItemView.pas (modified) (1 diff)
• Forms/UMainForm.lfm (modified) (4 diffs)
• Forms/UMainForm.pas (modified) (12 diffs)

trunk

@@ -5 +5 @@
 chronis.exe
 DebugLog.txt
+chronis.lps

@@ -5 +5 @@
 chronis.exe
 DebugLog.txt
+chronis.lps

trunk/Forms/UItemList.pas

@@ -87 +87 @@
     NewItemViewForm.SelectedItemId := Integer(ListView1.Selected.Data);
     NewItemViewForm.Caption := NewItemViewForm.Caption + ' ' + SelectedObject.Name;
-    MainForm.AddTabForm(NewItemViewForm);
+    MainForm.SetMainPanelForm(NewItemViewForm);
   end;
 end;
@@ -120 +120 @@
     NewItemEditForm.SelectedItemId := Integer(ListView1.Selected.Data);
     NewItemEditForm.Caption := NewItemEditForm.Caption + ' ' + SelectedObject.Name;
-    MainForm.AddTabForm(NewItemEditForm);
+    MainForm.SetMainPanelForm(NewItemEditForm);
   end;
 end;
@@ -132 +132 @@
   NewItemAddForm.SelectedItemId := Integer(ListView1.Selected.Data);
   NewItemAddForm.Caption := NewItemAddForm.Caption + ' ' + SelectedObject.Name;
-  MainForm.AddTabForm(NewItemAddForm);
+  MainForm.SetMainPanelForm(NewItemAddForm);
 end;
 

trunk/Forms/UItemView.pas

@@ -111 +111 @@
   NewItemEditForm.SelectedItemId := SelectedItemId;
   NewItemEditForm.Caption := NewItemEditForm.Caption + ' ' + SelectedObject.Name;
-  MainForm.AddTabForm(NewItemEditForm);
+  MainForm.SetMainPanelForm(NewItemEditForm);
 end;
 

trunk/Forms/UMainForm.lfm

@@ -4 +4 @@
   Top = 126
   Width = 640
-  ActiveControl = Panel1
+  ActiveControl = PanelMenu
   Caption = 'ChronIS'
   ClientHeight = 427
@@ -151 +151 @@
   OnShow = FormShow
   LCLVersion = '0.9.31'
-  object Panel1: TPanel
+  object PanelMenu: TPanel
     Left = 0
-    Height = 427
+    Height = 407
     Top = 0
     Width = 184
     Align = alLeft
     BevelOuter = bvNone
-    ClientHeight = 427
+    ClientHeight = 407
     ClientWidth = 184
     TabOrder = 0
@@ -171 +171 @@
     object TreeView1: TTreeView
       Left = 4
-      Height = 403
+      Height = 383
       Top = 19
       Width = 180
@@ -184 +184 @@
     end
   end
-  object Panel2: TPanel
+  object PanelData: TPanel
     Left = 189
-    Height = 427
+    Height = 407
     Top = 0
     Width = 451
     Align = alClient
     BevelOuter = bvNone
-    ClientHeight = 427
-    ClientWidth = 451
     TabOrder = 1
-    object PageControl1: TPageControl
-      Left = 0
-      Height = 427
-      Top = 0
-      Width = 451
-      Align = alClient
-      TabOrder = 0
-    end
   end
   object Splitter1: TSplitter
     Left = 184
-    Height = 427
+    Height = 407
     Top = 0
     Width = 5
+  end
+  object StatusBar1: TStatusBar
+    Left = 0
+    Height = 20
+    Top = 407
+    Width = 640
+    Panels = <    
+      item
+        Width = 150
+      end    
+      item
+        Width = 150
+      end    
+      item
+        Width = 150
+      end>
+    SimplePanel = False
   end
   object ActionListItem: TActionList

trunk/Forms/UMainForm.pas

@@ -9 +9 @@
   StdCtrls, ActnList, Menus, ExtCtrls, USqlDatabase, DOM, XMLRead, XMLWrite,
   UPersistentForm, UTreeState, SpecializedList, SpecializedDictionary,
-  URegistry, USystem;
+  URegistry, USystem, UItemList;
 
 type
@@ -54 +54 @@
     MenuItem8: TMenuItem;
     MenuItem9: TMenuItem;
-    PageControl1: TPageControl;
-    Panel1: TPanel;
-    Panel2: TPanel;
+    PanelMenu: TPanel;
+    PanelData: TPanel;
     PopupMenuObjectGroup: TPopupMenu;
     PopupMenuObject: TPopupMenu;
     PopupMenuItem: TPopupMenu;
     Splitter1: TSplitter;
+    StatusBar1: TStatusBar;
     TreeView1: TTreeView;
     procedure AAboutExecute(Sender: TObject);
@@ -87 +87 @@
     procedure SaveToRegistry;
   public
+    MainPanelForm: TForm;
     PersistentForm: TPersistentForm;
     TreeState: TTreeState;
     Report: TReport;
-    TabForms: TListObject; // TListObject<TForm>
     procedure UpdateInterface;
     procedure LoadTree;
-    procedure AddTabForm(Form: TForm);
+    procedure SetMainPanelForm(Form: TForm);
   end;
 
@@ -112 +112 @@
   UItemView, UItemEdit, UItemAdd, ULoginForm, USettingForm, UApplicationInfo,
   UCore, UImportStructureForm, UAboutForm, ULoginProfileForm, UChronisClientDirect,
-  UItemList, UChronisClient;
+  UChronisClient;
 
 {$R *.lfm}
@@ -124 +124 @@
     RootKey := Core.RegistryRootKey;
     OpenKey(Core.RegistryKey, True);
-    Panel1.Width := ReadIntegerWithDefault('GroupTreeWidth', 200);
+    PanelMenu.Width := ReadIntegerWithDefault('GroupTreeWidth', 200);
     with Core.CoolTranslator1 do
       Language := Languages.SearchByCode(ReadStringWithDefault('LanguageCode', ''));
@@ -138 +138 @@
     RootKey := Core.RegistryRootKey;
     OpenKey(Core.RegistryKey, True);
-    WriteInteger('GroupTreeWidth', Panel1.Width);
+    WriteInteger('GroupTreeWidth', PanelMenu.Width);
     with Core.CoolTranslator1 do
       WriteString('LanguageCode', Language.Code);
@@ -151 +151 @@
   AConnect.Enabled := not Core.System.Database.Connected;
   AImportStructure.Enabled := Core.System.Database.Connected;
+  if Assigned(MainPanelForm) then
+    Caption := MainPanelForm.Caption + ' - ' + ApplicationInfo.Name
+    else Caption :=  ApplicationInfo.Name;
+  if Assigned(Core.System.Client) then
+  with Core.System.Client do
+    StatusBar1.Panels[0].Text := User + '@' + Host + ':' + IntToStr(Port) + '/' + Schema;
 end;
 
 procedure TMainForm.FormCreate(Sender: TObject);
 begin
-  TabForms := TListObject.Create;
-  TabForms.OwnsObjects := False;
   TreeState := TTreeState.Create;
   Report := TReport.Create;
@@ -169 +173 @@
   TreeState.Free;
   PersistentForm.Free;
-  TabForms.Free;
 end;
 
@@ -204 +207 @@
 procedure TMainForm.ASettingsExecute(Sender: TObject);
 begin
-  SettingForm.ShowModal;
+  try
+    SettingForm := TSettingForm.Create(nil);
+    SettingForm.ShowModal;
+  finally
+    SettingForm.Free;
+  end;
 end;
 
@@ -311 +319 @@
     if TreeView1.Selected.ImageIndex = 0 then begin
       TreeView1.PopupMenu := PopupMenuObjectGroup;
-      PageControl1.Visible := False;
+      PanelData.Visible := False;
     end;
     if TreeView1.Selected.ImageIndex = 1 then begin
@@ -327 +335 @@
     NewItemListForm := TItemListForm.Create(Self);
     NewItemListForm.SelectedObject.Load(Integer(TreeView1.Selected.Data));
-    NewItemListForm.Caption := NewItemListForm.Caption + ' ' + NewItemListForm.SelectedObject.Name;
-    AddTabForm(NewItemListForm);
+    NewItemListForm.Caption := NewItemListForm.SelectedObject.Name;
+    SetMainPanelForm(NewItemListForm);
   end;
 end;
@@ -387 +395 @@
 end;
 
-procedure TMainForm.AddTabForm(Form: TForm);
-var
-  NewTabSheet: TTabSheet;
-begin
-  TabForms.Add(Form);
-  NewTabSheet := PageControl1.AddTabSheet;
-  NewTabSheet.DockSite := True;
-  NewTabSheet.UseDockManager := True;
-  NewTabSheet.Caption := Form.Caption;
-  PageControl1.TabIndex := PageControl1.PageCount - 1;
-  Form.DragKind := dkDock;
-  Form.DragMode := dmAutomatic;
-  Form.ManualDock(NewTabSheet);
-  Form.Show;
-
-  // Workaround for not showing content of first tab after docking
-  NewTabSheet.Visible := False;
-  NewTabSheet.Visible := True;
+procedure TMainForm.SetMainPanelForm(Form: TForm);
+begin
+  MainPanelForm.Free;
+  MainPanelForm := Form;
+  MainPanelForm.ManualDock(PanelData, nil, alClient);
+  MainPanelForm.Align := alClient;
+  MainPanelForm.Show;
+  UpdateInterface;
 end;
 

@@ -5 +5 @@
 chronis.exe
 DebugLog.txt
+chronis.lps