Made btnToggleEditMode/btnToggleStructureVisible, btnToggleTargetsVis…

…ible buttons toggle ones and syncing their IsPressed status to respective HUD properties (with change events)
Zoomicon · Jan 21, 2022 · 8551642 · 8551642
1 parent edb4c1e
commit 8551642
Show file tree

Hide file tree

Showing 9 changed files with 217 additions and 169 deletions.
diff --git a/App/READCOM.App.Globals.dfm b/App/READCOM.App.Globals.dfm
@@ -30466,7 +30466,7 @@ object Globals: TGlobals
       item
         MultiResBitmap = <
           item
-            Size = 16
+            Size = 64
           end>
         IconName = 'Anchor'
         SVGText = 
@@ -30561,7 +30561,7 @@ object Globals: TGlobals
       item
         MultiResBitmap = <
           item
-            Size = 16
+            Size = 64
           end>
         IconName = 'Delete'
         SVGText = 
@@ -30596,7 +30596,7 @@ object Globals: TGlobals
       item
         MultiResBitmap = <
           item
-            Size = 16
+            Size = 64
           end>
         IconName = 'GlobeWithMeridians'
         SVGText = 
@@ -30625,7 +30625,7 @@ object Globals: TGlobals
       item
         MultiResBitmap = <
           item
-            Size = 16
+            Size = 64
           end>
         IconName = 'Plus'
         SVGText = 
@@ -30665,7 +30665,7 @@ object Globals: TGlobals
       item
         MultiResBitmap = <
           item
-            Size = 16
+            Size = 64
           end>
         IconName = 'Camera'
         SVGText = 
@@ -30774,7 +30774,7 @@ object Globals: TGlobals
       item
         MultiResBitmap = <
           item
-            Size = 16
+            Size = 64
           end>
         IconName = 'Signpost'
         SVGText = 
@@ -30907,6 +30907,8 @@ object Globals: TGlobals
         Layers = <
           item
             Name = 'Anchor'
+            SourceRect.Right = 64.000000000000000000
+            SourceRect.Bottom = 64.000000000000000000
           end>
       end
       item
@@ -30929,24 +30931,32 @@ object Globals: TGlobals
         Layers = <
           item
             Name = 'Delete'
+            SourceRect.Right = 64.000000000000000000
+            SourceRect.Bottom = 64.000000000000000000
           end>
       end
       item
         Layers = <
           item
             Name = 'GlobeWithMeridians'
+            SourceRect.Right = 64.000000000000000000
+            SourceRect.Bottom = 64.000000000000000000
           end>
       end
       item
         Layers = <
           item
             Name = 'Plus'
+            SourceRect.Right = 64.000000000000000000
+            SourceRect.Bottom = 64.000000000000000000
           end>
       end
       item
         Layers = <
           item
             Name = 'Camera'
+            SourceRect.Right = 64.000000000000000000
+            SourceRect.Bottom = 64.000000000000000000
           end>
       end
       item
@@ -30969,6 +30979,8 @@ object Globals: TGlobals
         Layers = <
           item
             Name = 'Signpost'
+            SourceRect.Right = 64.000000000000000000
+            SourceRect.Bottom = 64.000000000000000000
           end>
       end
       item

diff --git a/App/READCOM.App.dproj b/App/READCOM.App.dproj
@@ -442,25 +442,25 @@
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_LauncherIcon_36x36.png" Configuration="Release" Class="Android_LauncherIcon36">
+                <DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_SplashImage_470x320.png" Configuration="Release" Class="Android_SplashImage470">
                     <Platform Name="Android">
-                        <RemoteName>ic_launcher.png</RemoteName>
+                        <RemoteName>splash_image.png</RemoteName>
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_LauncherIcon_72x72.png" Configuration="Release" Class="Android_LauncherIcon72">
+                <DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_LauncherIcon_36x36.png" Configuration="Release" Class="Android_LauncherIcon36">
                     <Platform Name="Android">
                         <RemoteName>ic_launcher.png</RemoteName>
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_NotificationIcon_36x36.png" Configuration="Release" Class="Android_NotificationIcon36">
+                <DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_LauncherIcon_72x72.png" Configuration="Release" Class="Android_LauncherIcon72">
                     <Platform Name="Android">
-                        <RemoteName>ic_notification.png</RemoteName>
+                        <RemoteName>ic_launcher.png</RemoteName>
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_NotificationIcon_72x72.png" Configuration="Release" Class="Android_NotificationIcon72">
+                <DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_NotificationIcon_36x36.png" Configuration="Release" Class="Android_NotificationIcon36">
                     <Platform Name="Android">
                         <RemoteName>ic_notification.png</RemoteName>
                         <Overwrite>true</Overwrite>
@@ -472,9 +472,9 @@
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_SplashImage_470x320.png" Configuration="Release" Class="Android_SplashImage470">
+                <DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_NotificationIcon_72x72.png" Configuration="Release" Class="Android_NotificationIcon72">
                     <Platform Name="Android">
-                        <RemoteName>splash_image.png</RemoteName>
+                        <RemoteName>ic_notification.png</RemoteName>
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>

diff --git a/App/Views/Options/READCOM.Views.Options.StoryItemOptions.pas b/App/Views/Options/READCOM.Views.Options.StoryItemOptions.pas
@@ -125,7 +125,6 @@ procedure TStoryItemOptions.SetStoryItem(const Value: IStoryItem);
   with FStoryItem do
   begin
     editUrlAction.Text := GetUrlAction;
-    //btnToggleHome.IsPressed := Home;
     btnToggleHome.IsPressed := Home;
     btnToggleStoryPoint.IsPressed := StoryPoint;
     btnToggleAnchored.IsPressed := Anchored;

diff --git a/App/Views/READCOM.Views.Main.fmx b/App/Views/READCOM.Views.Main.fmx
@@ -23,6 +23,17 @@ object MainForm: TMainForm
     Size.PlatformDefault = False
     ParentShowHint = False
     ShowHint = True
+    inherited layoutContent: TLayout
+      Size.Width = 876.000000000000000000
+      Size.Height = 616.000000000000000000
+      object ZoomFrame: TZoomFrame
+        Align = Client
+        Size.Width = 876.000000000000000000
+        Size.Height = 616.000000000000000000
+        Size.PlatformDefault = False
+        Proportional = True
+      end
+    end
     inherited layoutButtons: TLayout
       Size.Width = 876.000000000000000000
       Size.Height = 616.000000000000000000
@@ -40,17 +51,9 @@ object MainForm: TMainForm
         Position.X = 826.000000000000000000
         Size.Height = 576.000000000000000000
         TabOrder = 174
-      end
-    end
-    inherited layoutContent: TLayout
-      Size.Width = 876.000000000000000000
-      Size.Height = 616.000000000000000000
-      object ZoomFrame: TZoomFrame
-        Align = Client
-        Size.Width = 876.000000000000000000
-        Size.Height = 616.000000000000000000
-        Size.PlatformDefault = False
-        Proportional = True
+        inherited btnAdd: TSpeedButton
+          Visible = True
+        end
       end
     end
     inherited MultiView: TMultiView
@@ -71,24 +74,14 @@ object MainForm: TMainForm
         OnExecute = HUDactionNextExecute
         ImageIndex = 2
       end
-      inherited actionEdit: TAction
-        OnExecute = HUDactionEditExecute
-        ImageIndex = 0
-      end
       inherited actionAdd: TAction
+        Visible = True
         OnExecute = HUDactionAddExecute
+        ImageIndex = 10
       end
       inherited actionAbout: TAction
         ImageIndex = 15
       end
-      inherited actionStructure: TAction
-        OnExecute = HUDactionStructureExecute
-        ImageIndex = 3
-      end
-      inherited actionTargets: TAction
-        OnExecute = HUDactionTargetsExecute
-        ImageIndex = 4
-      end
       inherited actionNew: TAction
         OnExecute = HUDactionNewExecute
         ImageIndex = 12