Browse Source

Simple Stepped menu entry.

Margers 4 months ago
parent
commit
edf4f0b416
4 changed files with 15 additions and 38 deletions
  1. 2 2
      packages/ide/fpconst.pas
  2. 7 11
      packages/ide/fpide.pas
  3. 5 24
      packages/ide/fpmwnd.inc
  4. 1 1
      packages/ide/fpviews.pas

+ 2 - 2
packages/ide/fpconst.pas

@@ -167,7 +167,7 @@ const
      { Command constants }
      cmShowClipboard     = 201;
      cmStepped           = 203;
-     cmSteppedRevers     = 204;
+     cmSteppedReverse    = 204;
      cmTileVertical      = 205;
      cmFindProcedure     = 206;
      cmObjects           = 207;
@@ -417,7 +417,7 @@ const
      hcClearPrimary      = hcShift+cmClearPrimary;
      hcTileVertical      = hcShift+cmTileVertical;
      hcStepped           = hcShift+cmStepped;
-     hcSteppedRevers     = hcShift+cmSteppedRevers;
+     hcSteppedReverse    = hcShift+cmSteppedReverse;
      hcWindowList        = hcShift+cmWindowList;
      hcNewFromTemplate   = hcShift+cmNewFromTemplate;
      hcHelpTopicSearch   = hcShift+cmHelpTopicSearch;

+ 7 - 11
packages/ide/fpide.pas

@@ -135,8 +135,6 @@ type
       procedure SaveAsINI;
       procedure TileVertical;
       procedure Stepped(aDirection:boolean);
-      procedure UpdateTileMenu;
-      procedure UpdateSteppedMenu;
       procedure CloseAll;
       procedure WindowList;
       procedure HelpContents;
@@ -344,10 +342,10 @@ resourcestring  menu_local_gotosource = '~G~oto source';
 
                 menu_window            = '~W~indow';
                 menu_window_tile       = '~T~ile';
-                menu_window_tile_vertical = '~T~ile (vertical)';
+                menu_window_tile_vertical = 'Tile ~v~ertical';
                 menu_window_cascade    = 'C~a~scade';
                 menu_window_stepped    = 'Steppe~d~';
-                menu_window_stepped_revers = 'Steppe~d~ (revers)';
+                menu_window_stepped_reverse = 'Stepp~e~d reverse';
                 menu_window_closeall   = 'Cl~o~se all';
                 menu_window_resize     = '~S~ize/Move';
                 menu_window_zoom       = '~Z~oom';
@@ -1083,7 +1081,7 @@ begin
     NewSubMenu(menu_window, hcWindowMenu, NewMenu(
       NewItem(menu_window_tile,'', kbNoKey, cmTile, hcTile,
       NewItem(menu_window_cascade,'', kbNoKey, cmCascade, hcCascade,
-      NewItem(menu_window_stepped,'', kbNoKey, cmStepped, hcStepped,
+      NewItem(menu_window_stepped,'', kbNoKey, cmSteppedReverse, hcStepped,
       NewItem(menu_window_closeall,'', kbNoKey, cmCloseAll, hcCloseAll,
       NewLine(
       NewItem(menu_window_resize,menu_key_window_resize, kbCtrlF5, cmResize, hcResize,
@@ -1427,10 +1425,9 @@ begin
              cmToolsBase+MaxToolCount
                              : ExecuteTool(Event.Command-cmToolsBase);
            { -- Window menu -- }
-             cmTile          : begin UpdateTileMenu; Tile; end;
-             cmTileVertical  : begin UpdateTileMenu; TileVertical; end;
-             cmStepped       : begin UpdateSteppedMenu; Stepped(True); end;
-             cmSteppedRevers : begin UpdateSteppedMenu; Stepped(False); end;
+             cmTileVertical  : TileVertical;
+             cmStepped       : Stepped(True);
+             cmSteppedReverse: Stepped(False);
              cmCloseAll      : CloseAll;
              cmWindowList    : WindowList;
              cmUserScreenWindow: DoUserScreenWindow;
@@ -1707,9 +1704,8 @@ procedure TIDEApp.Update;
 begin
   SetCmdState([cmSaveAll],IsThereAnyEditor);
   SetCmdState([cmCloseAll,cmWindowList],IsThereAnyWindow);
-  SetCmdState([cmTile,cmCascade,cmTileVertical,cmStepped,cmSteppedRevers],IsThereAnyVisibleEditorWindow);
+  SetCmdState([cmTile,cmCascade,cmTileVertical,cmStepped,cmSteppedReverse],IsThereAnyVisibleEditorWindow);
   SetCmdState([cmFindProcedure,cmObjects,cmModules,cmGlobals,cmSymbol],IsSymbolInfoAvailable);
-
 {$ifndef NODEBUG}
   SetCmdState([cmResetDebugger,cmUntilReturn],assigned(debugger) and debugger^.debuggee_started);
 {$endif}

+ 5 - 24
packages/ide/fpmwnd.inc

@@ -27,9 +27,9 @@ BEGIN
      (P^.State AND sfVisible <> 0);                   { View is visible }
 END;
 
-{ This pritty much copy of window cascade }
+{ This pretty much copy of window cascade }
 { added extra variable `Count` }
-{ calculate one of `NR.A.Y` or `NR.A.X` in revers }
+{ calculate one of `NR.A.Y` or `NR.A.X` in reverse }
 procedure TIDEApp.Stepped(aDirection:boolean);
 var R: TRect;
 VAR CascadeNum, Count: SmallInt; LastView: PView; Min, Max: TPoint;
@@ -37,14 +37,14 @@ VAR CascadeNum, Count: SmallInt; LastView: PView; Min, Max: TPoint;
    PROCEDURE DoCount (P: PView);
    BEGIN
      If Tileable(P) Then Begin
-       Inc(CascadeNum); LastView := P;                { Count steppable }
+       Inc(CascadeNum); LastView := P;                { Count tileable }
      End;
    END;
 
    PROCEDURE DoCascade (P: PView);
    VAR PState: Word; NR: TRect;
    BEGIN
-     If Tileable(P) AND (CascadeNum >= 0) Then Begin  { View steppable }
+     If Tileable(P) AND (CascadeNum >= 0) Then Begin  { View tileable }
        NR.Copy(R);                                    { Copy rect area }
        if aDirection then
        begin
@@ -69,7 +69,7 @@ begin
    if not assigned(Desktop) then exit;
    GetTileRect(R);                                    { Tileable area }
    CascadeNum := 0;                                   { Zero step count }
-   Desktop^.ForEach(TCallbackProcParam(@DoCount));    { Count stepable }
+   Desktop^.ForEach(TCallbackProcParam(@DoCount));    { Count tileable }
    Count:=CascadeNum;                                 { Keep count in Count }
    If (CascadeNum>0) Then Begin
      LastView^.SizeLimits(Min, Max);                  { Check size limits }
@@ -83,25 +83,6 @@ begin
    End;
 end;
 
-
-procedure TIDEApp.UpdateTileMenu;
-var MenuItem : PMenuItem;
-    bFirst : boolean;
-begin
-  MenuItem:=PAdvancedMenuBar(MenuBar)^.GetMenuItem(cmTileVertical);
-  bFirst:=assigned(MenuItem);
-  ChangeMenu(PAdvancedMenuBar(MenuBar),bFirst,cmTile,menu_window_tile,cmTileVertical,menu_window_tile_vertical);
-end;
-
-procedure TIDEApp.UpdateSteppedMenu;
-var MenuItem : PMenuItem;
-    bFirst : boolean;
-begin
-  MenuItem:=PAdvancedMenuBar(MenuBar)^.GetMenuItem(cmSteppedRevers);
-  bFirst:=assigned(MenuItem);
-  ChangeMenu(PAdvancedMenuBar(MenuBar),bFirst,cmStepped,menu_window_stepped,cmSteppedRevers,menu_window_stepped_revers);
-end;
-
 procedure TIDEApp.CloseAll;
 
   procedure SendClose(P: PView);

+ 1 - 1
packages/ide/fpviews.pas

@@ -2681,7 +2681,7 @@ begin
     SetCmdState(EditorCmds,Active);
   end;
   SetCmdState(ToClipCmds+FromClipCmds+NulClipCmds+UndoCmd+RedoCmd+[cmHide],Active);
-  SetCmdState([cmTile,cmCascade],Visible or IsThereAnyVisibleEditorWindow);
+  SetCmdState([cmTile,cmCascade,cmTileVertical,cmStepped,cmSteppedReverse],Visible or IsThereAnyVisibleEditorWindow);
   Message(Application,evBroadcast,cmCommandSetChanged,nil);
 end;