mORMot and Open Source friends
Check-in [ebc7d05200]
Not logged in

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:{2054} cosmetic fixes to "Mark" toolbar
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: ebc7d05200f5d4a956892cf6cef22ed8e35da948
User & Date: ab 2015-11-11 09:14:12
Context
2015-11-11
09:18
{2055} fixed unexpected GPF in TSQLRibbon.ChangeColorScheme - patch by kevinday check-in: 51e9c62af7 user: ab tags: trunk
09:14
{2054} cosmetic fixes to "Mark" toolbar check-in: ebc7d05200 user: ab tags: trunk
2015-11-10
21:35
{2053} new TDDDAdministratedDaemon.DaemonName function check-in: 19e0307943 user: ab tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to SQLite3/mORMot.pas.

8279
8280
8281
8282
8283
8284
8285
8286
8287
8288
8289
8290
8291
8292
8293
8294
8295
8296
8297
8298
  // - actmarkOlderThanOneYear to Mark rows older than one year
  // - actmarkInverse to Inverse Mark values (ON->OFF, OFF->ON)
  TSQLAction = (
    actNoAction,
    actMark,
    actUnmarkAll,
    actmarkAllEntries,
    actMarkToday,
    actMarkThisWeek,
    actMarkThisMonth,
    actMarkYesterday,
    actMarkLastWeek,
    actMarkLastMonth,
    actmarkOlderThanOneDay,
    actmarkOlderThanOneWeek,
    actmarkOlderThanOneMonth,
    actmarkOlderThanSixMonths,
    actmarkOlderThanOneYear,
    actmarkInverse);







|
|
|
|
|
|







8279
8280
8281
8282
8283
8284
8285
8286
8287
8288
8289
8290
8291
8292
8293
8294
8295
8296
8297
8298
  // - actmarkOlderThanOneYear to Mark rows older than one year
  // - actmarkInverse to Inverse Mark values (ON->OFF, OFF->ON)
  TSQLAction = (
    actNoAction,
    actMark,
    actUnmarkAll,
    actmarkAllEntries,
    actmarkToday,
    actmarkThisWeek,
    actmarkThisMonth,
    actmarkYesterday,
    actmarkLastWeek,
    actmarkLastMonth,
    actmarkOlderThanOneDay,
    actmarkOlderThanOneWeek,
    actmarkOlderThanOneMonth,
    actmarkOlderThanSixMonths,
    actmarkOlderThanOneYear,
    actmarkInverse);

Changes to SQLite3/mORMotToolBar.pas.

28
29
30
31
32
33
34


35
36
37
38
39
40
41
....
1034
1035
1036
1037
1038
1039
1040








1041
1042
1043
1044
1045
1046
1047
....
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114


1115
1116
1117

1118

1119
1120
1121
1122
1123
1124
1125
  The Initial Developer of the Original Code is Arnaud Bouchez.

  Portions created by the Initial Developer are Copyright (C) 2015
  the Initial Developer. All Rights Reserved.

  Contributor(s):


  Alternatively, the contents of this file may be used under the terms of
  either the GNU General Public License Version 2 or later (the "GPL"), or
  the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
  in which case the provisions of the GPL or the LGPL are applicable instead
  of those above. If you wish to allow use of your version of this file only
  under the terms of either the GPL or the LGPL, and not to allow others to
  use your version of this file under the terms of the MPL, indicate your
................................................................................
    A,iTB,iGB,iM,img: integer;
    GB: TSynToolButton;
    iAction: cardinal;
    M: TMenuItem;
    EN: boolean;
    A2: TSQLAction;
    ActionNames: TStringDynArray;








begin
  result := nil;
  if fPage=nil then
    exit;
  // on existing Toolbar: update its buttons from aActions, and exit
  for iTB := 0 to fPage.ToolBarCount-1 do
    // test exact match, not with SameText(), since Caption can be translated
................................................................................
        with result.CreateToolButton(ActionButtonClick,iAction,1,ActionNames[iAction],
           ActionHints,fShortCutUsed,60,ImageList32) do begin
          if GetBit(ActionIsNotButton,iAction) then
            Style := bsCheck;
          // create associated sub menu entry
          if Style<>bsCheck then begin
            NewMenuItem(fMenu,Caption,iAction-1);
            if TSQLAction(iAction)=actMark then
              // actMarkAllEntries..actMarkBeforeOneYear are regrouped in
              // an only one aAction=actMark
              with PTypeInfo(TypeInfo(TSQLAction))^.EnumBaseType^ do
              for A2 := actMarkAllEntries to actmarkInverse do
                if (A2<actmarkOlderThanOneDay) or (A2>actmarkOlderThanOneYear) or
                 (TableToGrid.FieldIndexTimeLogForMark>=0) then begin
                  if A2=actmarkInverse then


                    CreateSubMenuItem('-',iAction,nil);
                  CreateSubMenuItem(fClass.CaptionNameFromRTTI(GetEnumName(A2)),
                    iAction,nil,iAction-1,integer(A2));

                end;

          end;
        end;
    end;
    M := TMenuItem.Create(fMenu);
    M.Caption := '-';
    fMenu.Items.Add(M);
  finally






>
>







 







>
>
>
>
>
>
>
>







 







|
|
|
<
<
<
|
<
>
>

<
<
>

>







28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
....
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
....
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119



1120

1121
1122
1123


1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
  The Initial Developer of the Original Code is Arnaud Bouchez.

  Portions created by the Initial Developer are Copyright (C) 2015
  the Initial Developer. All Rights Reserved.

  Contributor(s):
  - kevinday
  
  Alternatively, the contents of this file may be used under the terms of
  either the GNU General Public License Version 2 or later (the "GPL"), or
  the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
  in which case the provisions of the GPL or the LGPL are applicable instead
  of those above. If you wish to allow use of your version of this file only
  under the terms of either the GPL or the LGPL, and not to allow others to
  use your version of this file under the terms of the MPL, indicate your
................................................................................
    A,iTB,iGB,iM,img: integer;
    GB: TSynToolButton;
    iAction: cardinal;
    M: TMenuItem;
    EN: boolean;
    A2: TSQLAction;
    ActionNames: TStringDynArray;

  procedure InsertSubMenu(A2: TSQLAction);
  begin
    CreateSubMenuItem(fClass.CaptionNameFromRTTI(
      PTypeInfo(TypeInfo(TSQLAction))^.EnumBaseType^.GetEnumName(A2)),
      iAction,nil,iAction-1,integer(A2));
  end;
  
begin
  result := nil;
  if fPage=nil then
    exit;
  // on existing Toolbar: update its buttons from aActions, and exit
  for iTB := 0 to fPage.ToolBarCount-1 do
    // test exact match, not with SameText(), since Caption can be translated
................................................................................
        with result.CreateToolButton(ActionButtonClick,iAction,1,ActionNames[iAction],
           ActionHints,fShortCutUsed,60,ImageList32) do begin
          if GetBit(ActionIsNotButton,iAction) then
            Style := bsCheck;
          // create associated sub menu entry
          if Style<>bsCheck then begin
            NewMenuItem(fMenu,Caption,iAction-1);
            if TSQLAction(iAction)=actMark then begin // Mark sub-menu
              InsertSubMenu(actmarkAllEntries);
              InsertSubMenu(actmarkInverse);



              if TableToGrid.FieldIndexTimeLogForMark>=0 then 

                for A2 := actmarkToday to actmarkOlderThanOneYear do begin
                  if A2 in [actmarkToday,actmarkOlderThanOneDay] then
                    CreateSubMenuItem('-',iAction,nil);


                  InsertSubMenu(A2);
                end;
            end;
          end;
        end;
    end;
    M := TMenuItem.Create(fMenu);
    M.Caption := '-';
    fMenu.Items.Add(M);
  finally

Changes to SynopseCommit.inc.

1
'1.18.2053'
|
1
'1.18.2054'