Changeset 15 for trunk/Forms

Timestamp:

Feb 27, 2018, 6:11:44 PM (7 years ago)

Author:

chronos

Message:

• Added: Partial support for color theming.
• Added: Allow to edit contact properties in the list of all.

Location:

trunk/Forms

Files:

• UFormAbout.pas (modified) (1 diff)
• UFormContact.lfm (modified) (4 diffs)
• UFormContact.pas (modified) (5 diffs)
• UFormContacts.pas (modified) (1 diff)
• UFormMain.lfm (modified) (7 diffs)
• UFormMain.pas (modified) (1 diff)
• UFormSettings.lfm (modified) (2 diffs)
• UFormSettings.pas (modified) (6 diffs)

trunk/Forms/UFormAbout.pas

@@ -69 +69 @@
 begin
   Core.CoolTranslator1.TranslateComponentRecursive(Self);
+  Core.ThemeManager1.UseTheme(Self);
 end;
 

trunk/Forms/UFormContact.lfm

@@ -17 +17 @@
     Top = 8
     Width = 744
-    ActivePage = TabSheetGeneral
+    ActivePage = TabSheetAll
     Anchors = [akTop, akLeft, akRight, akBottom]
-    TabIndex = 0
+    TabIndex = 2
     TabOrder = 0
     object TabSheetGeneral: TTabSheet
@@ -398 +398 @@
           end>
         OwnerData = True
+        PopupMenu = PopupMenu1
         ReadOnly = True
         RowSelect = True
@@ -403 +404 @@
         ViewStyle = vsReport
         OnData = ListView1Data
+        OnDblClick = AEditFieldExecute
       end
     end
@@ -426 +428 @@
     TabOrder = 2
   end
+  object ActionList1: TActionList
+    Images = Core.ImageList1
+    left = 317
+    top = 157
+    object AEditField: TAction
+      Caption = 'Edit'
+      OnExecute = AEditFieldExecute
+    end
+  end
+  object PopupMenu1: TPopupMenu
+    Images = Core.ImageList1
+    left = 172
+    top = 159
+    object MenuItem1: TMenuItem
+      Action = AEditField
+    end
+  end
 end

trunk/Forms/UFormContact.pas

@@ -7 +7 @@
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
-  ComCtrls, UContact;
+  ComCtrls, ActnList, Menus, UContact;
 
 type
@@ -14 +14 @@
 
   TFormContact = class(TForm)
+    AEditField: TAction;
+    ActionList1: TActionList;
     ButtonCancel: TButton;
     ButtonOk: TButton;
@@ -63 +65 @@
     ListView1: TListView;
     MemoNotes: TMemo;
+    MenuItem1: TMenuItem;
     PageControlContact: TPageControl;
+    PopupMenu1: TPopupMenu;
     TabSheetGeneral: TTabSheet;
     TabSheetDetails: TTabSheet;
     TabSheetAll: TTabSheet;
+    procedure AEditFieldExecute(Sender: TObject);
     procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
     procedure FormCreate(Sender: TObject);
@@ -89 +94 @@
 uses
   UCore;
+
+resourcestring
+  SFieldEdit = 'Field edit';
+  SEditFieldValue = 'Edit field value';
 
 { TFormContact }
@@ -126 +135 @@
 end;
 
+procedure TFormContact.AEditFieldExecute(Sender: TObject);
+begin
+  if Assigned(ListView1.Selected) then begin
+    Contact.Fields[TContactFieldIndex(ListView1.Selected.Index)] :=
+      InputBox(SFieldEdit, SEditFieldValue, Contact.Fields[TContactFieldIndex(ListView1.Selected.Index)]);
+  end;
+end;
+
 procedure TFormContact.FormCreate(Sender: TObject);
 begin
   Core.CoolTranslator1.TranslateComponentRecursive(Self);
+  Core.ThemeManager1.UseTheme(Self);
   Contact := nil;
 end;

trunk/Forms/UFormContacts.pas

@@ -101 +101 @@
 begin
   Core.PersistentForm1.Load(Self);
+  Core.ThemeManager1.UseTheme(Self);
   ReloadList;
   UpdateInterface;

trunk/Forms/UFormMain.lfm

@@ -5 +5 @@
   Width = 785
   Caption = 'vCard Studio'
-  ClientHeight = 497
+  ClientHeight = 506
   ClientWidth = 785
+  DesignTimePPI = 120
   Menu = MainMenu1
   OnClose = FormClose
@@ -12 +13 @@
   OnCreate = FormCreate
   OnShow = FormShow
-  LCLVersion = '1.8.0.4'
+  LCLVersion = '1.8.0.6'
   object CoolBar1: TCoolBar
     Left = 0
-    Height = 32
+    Height = 38
     Top = 0
     Width = 785
@@ -35 +36 @@
       AnchorSideTop.Control = CoolBar1
       Left = 24
-      Height = 28
+      Height = 22
       Top = 5
-      Width = 132
+      Width = 105
       Align = alNone
       AutoSize = True
@@ -55 +56 @@
       end
       object ToolButton2: TToolButton
-        Left = 30
+        Left = 24
         Top = 0
         Action = Core.AFileOpen
@@ -62 +63 @@
       end
       object ToolButton3: TToolButton
-        Left = 74
+        Left = 59
         Top = 0
         Action = Core.AFileSave
       end
       object ToolButton4: TToolButton
-        Left = 103
+        Left = 82
         Top = 0
         Action = Core.AFileClose
@@ -76 +77 @@
       AnchorSideTop.Control = CoolBar1
       Left = 188
-      Height = 28
+      Height = 22
       Top = 5
-      Width = 30
+      Width = 24
       Align = alNone
       AutoSize = True
@@ -99 +100 @@
   object StatusBar1: TStatusBar
     Left = 0
-    Height = 30
-    Top = 467
+    Height = 28
+    Top = 478
     Width = 785
     Panels = <    

trunk/Forms/UFormMain.pas

@@ -93 +93 @@
 begin
   Core.Initialize;
+  Core.ThemeManager1.UseTheme(Self);
   Core.PersistentForm1.Load(Self);
   FormContacts.ManualDock(Self, nil, alClient);

trunk/Forms/UFormSettings.lfm

@@ -63 +63 @@
   end
   object SpinEditDPI: TSpinEdit
-    Left = 152
+    Left = 160
     Height = 28
     Top = 144
@@ -97 +97 @@
     Anchors = [akLeft, akRight, akBottom]
   end
+  object Label2: TLabel
+    Left = 20
+    Height = 20
+    Top = 184
+    Width = 48
+    Caption = 'Theme:'
+    ParentColor = False
+  end
+  object ComboBoxTheme: TComboBox
+    Left = 160
+    Height = 28
+    Top = 184
+    Width = 260
+    ItemHeight = 20
+    Style = csDropDownList
+    TabOrder = 6
+  end
 end

trunk/Forms/UFormSettings.pas

@@ -20 +20 @@
     CheckBoxAutomaticDPI: TCheckBox;
     ComboBoxLanguage: TComboBox;
+    ComboBoxTheme: TComboBox;
     Label1: TLabel;
+    Label2: TLabel;
     LabelDPI: TLabel;
     SpinEditDPI: TSpinEdit;
@@ -39 +41 @@
   FormSettings: TFormSettings;
 
+
 implementation
 
@@ -44 +47 @@
 
 uses
-  UCore;
+  UCore, UTheme;
 
 { TFormSettings }
@@ -53 +56 @@
   ComboBoxLanguage.ItemIndex := ComboBoxLanguage.Items.IndexOfObject(Core.CoolTranslator1.Language);
   if ComboBoxLanguage.ItemIndex = -1 then ComboBoxLanguage.ItemIndex := 0;
+
+  Core.ThemeManager1.Themes.LoadToStrings(ComboBoxTheme.Items);
+  ComboBoxTheme.ItemIndex := ComboBoxTheme.Items.IndexOfObject(Core.ThemeManager1.Theme);
+  if ComboBoxTheme.ItemIndex = -1 then ComboBoxTheme.ItemIndex := 0;
 end;
 
@@ -58 +65 @@
 begin
   if ComboBoxLanguage.ItemIndex <> -1 then
-    Core.CoolTranslator1.Language := TLanguage(ComboBoxLanguage.Items.Objects[ComboBoxLanguage.ItemIndex]);
+    Core.CoolTranslator1.Language := TLanguage(ComboBoxLanguage.Items.Objects[ComboBoxTheme.ItemIndex]);
+  if ComboBoxTheme.ItemIndex <> -1 then
+    Core.ThemeManager1.Theme := TTheme(ComboBoxTheme.Items.Objects[ComboBoxTheme.ItemIndex]);
 end;
 
@@ -74 +83 @@
 begin
   Core.CoolTranslator1.TranslateComponentRecursive(Self);
+  Core.ThemeManager1.UseTheme(Self);
 end;