Tools__ChangeSetDiffTool.st
branchjv
changeset 19604 b02a518e2c70
parent 18532 cccb41254edf
equal deleted inserted replaced
19603:e1fd0c06dfa6 19604:b02a518e2c70
     1 "{ Encoding: utf8 }"
       
     2 
       
     3 "
     1 "
     4  Copyright (c) 2007-2010 Jan Vrany
     2  Copyright (c) 2007-2010 Jan Vrany
     5  Copyright (c) 2009-2010 eXept Software AG
     3  Copyright (c) 2009-2010 eXept Software AG
       
     4  Copyright (c) 2021 LabWare
     6 
     5 
     7  Permission is hereby granted, free of charge, to any person
     6  Permission is hereby granted, free of charge, to any person
     8  obtaining a copy of this software and associated documentation
     7  obtaining a copy of this software and associated documentation
     9  files (the 'Software'), to deal in the Software without
     8  files (the 'Software'), to deal in the Software without
    10  restriction, including without limitation the rights to use,
     9  restriction, including without limitation the rights to use,
    60 
    59 
    61 copyright
    60 copyright
    62 "
    61 "
    63  Copyright (c) 2007-2010 Jan Vrany
    62  Copyright (c) 2007-2010 Jan Vrany
    64  Copyright (c) 2009-2010 eXept Software AG
    63  Copyright (c) 2009-2010 eXept Software AG
       
    64  Copyright (c) 2021 LabWare
    65 
    65 
    66  Permission is hereby granted, free of charge, to any person
    66  Permission is hereby granted, free of charge, to any person
    67  obtaining a copy of this software and associated documentation
    67  obtaining a copy of this software and associated documentation
    68  files (the 'Software'), to deal in the Software without
    68  files (the 'Software'), to deal in the Software without
    69  restriction, including without limitation the rights to use,
    69  restriction, including without limitation the rights to use,
   774 
   774 
   775     <resource: #canvas>
   775     <resource: #canvas>
   776 
   776 
   777     ^
   777     ^
   778      #(FullSpec
   778      #(FullSpec
   779 	name: mergeALabelSpec
   779         name: mergeALabelSpec
   780 	window:
   780         window:
   781        (WindowSpec
       
   782 	  label: 'Version A'
       
   783 	  name: 'Version A'
       
   784 	  min: (Point 10 10)
       
   785 	  bounds: (Rectangle 0 0 300 30)
       
   786 	  backgroundColor: (Color 79.6078431372549 90.5882352941177 69.4117647058823)
       
   787 	  forceRecursiveBackground: true
       
   788 	)
       
   789 	component:
       
   790        (SpecCollection
       
   791 	  collection: (
       
   792 	   (LabelSpec
       
   793 	      label: 'mergeDiff3BaseToAArrow30x30'
       
   794 	      name: 'Label1'
       
   795 	      layout: (LayoutFrame 0 0 0 0 30 0 0 1)
       
   796 	      hasCharacterOrientedLabel: false
       
   797 	      translateLabel: true
       
   798 	    )
       
   799 	   (LabelSpec
       
   800 	      label: 'versionA24x24'
       
   801 	      name: 'VersionAIcon'
       
   802 	      layout: (LayoutFrame 30 0 -12 0.5 57 0 12 0.5)
       
   803 	      hasCharacterOrientedLabel: false
       
   804 	      translateLabel: true
       
   805 	    )
       
   806 	   (LabelSpec
       
   807 	      label: 'mergeDiff3AToMergedArrow30x30'
       
   808 	      name: 'Label2'
       
   809 	      layout: (LayoutFrame 60 0 0 0 90 0 0 1)
       
   810 	      hasCharacterOrientedLabel: false
       
   811 	      translateLabel: true
       
   812 	    )
       
   813 	   (LabelSpec
       
   814 	      label: 'Version A'
       
   815 	      name: 'VersionALabel'
       
   816 	      layout: (LayoutFrame 90 0 0 0 0 1 0 1)
       
   817 	      translateLabel: true
       
   818 	      labelChannel: versionALabelHolder
       
   819 	      resizeForLabel: true
       
   820 	      adjust: left
       
   821 	    )
       
   822 	   (LabelSpec
       
   823 	      label: '(A)'
       
   824 	      name: 'ALabel'
       
   825 	      layout: (LayoutFrame -30 1 0 0 0 1 0 1)
       
   826 	      translateLabel: true
       
   827 	    )
       
   828 	   )
       
   829 
       
   830 	)
       
   831       )
       
   832 !
       
   833 
       
   834 mergeBLabelSpec
       
   835     "This resource specification was automatically generated
       
   836      by the UIPainter of ST/X."
       
   837 
       
   838     "Do not manually edit this!! If it is corrupted,
       
   839      the UIPainter may not be able to read the specification."
       
   840 
       
   841     "
       
   842      UIPainter new openOnClass:Tools::ChangeSetDiffTool andSelector:#versionBLabelSpec
       
   843      Tools::ChangeSetDiffTool new openInterface:#versionBLabelSpec
       
   844     "
       
   845 
       
   846     <resource: #canvas>
       
   847 
       
   848     ^
       
   849      #(FullSpec
       
   850 	name: versionBLabelSpec
       
   851 	window:
       
   852        (WindowSpec
       
   853 	  label: 'Version B'
       
   854 	  name: 'Version B'
       
   855 	  min: (Point 10 10)
       
   856 	  bounds: (Rectangle 0 0 300 30)
       
   857 	  backgroundColor: (Color 100.0 90.5882352941177 60.0)
       
   858 	  forceRecursiveBackground: true
       
   859 	)
       
   860 	component:
       
   861        (SpecCollection
       
   862 	  collection: (
       
   863 	    (LabelSpec
       
   864 	      label: 'mergeDiff3BaseToBArrow30x30'
       
   865 	      name: 'Label1'
       
   866 	      layout: (LayoutFrame 0 0 0 0 30 0 0 1)
       
   867 	      hasCharacterOrientedLabel: false
       
   868 	      translateLabel: true
       
   869 	    )
       
   870 	   (LabelSpec
       
   871 	      label: 'versionB24x24'
       
   872 	      name: 'VersionBIcon'
       
   873 	      layout: (LayoutFrame 30 0 -12 0.5 57 0 12 0.5)
       
   874 	      hasCharacterOrientedLabel: false
       
   875 	      translateLabel: true
       
   876 	    )
       
   877 	    (LabelSpec
       
   878 	      label: 'mergeDiff3BToMergedArrow30x30'
       
   879 	      name: 'Label2'
       
   880 	      layout: (LayoutFrame 60 0 0 0 90 0 0 1)
       
   881 	      hasCharacterOrientedLabel: false
       
   882 	      translateLabel: true
       
   883 	    )
       
   884 	   (LabelSpec
       
   885 	      label: 'Version B'
       
   886 	      name: 'VersionBLabel'
       
   887 	      layout: (LayoutFrame 90 0 0 0 167 0 0 1)
       
   888 	      translateLabel: true
       
   889 	      labelChannel: versionBLabelHolder
       
   890 	      resizeForLabel: true
       
   891 	      adjust: left
       
   892 	      useDynamicPreferredWidth: true
       
   893 	      usePreferredWidth: true
       
   894 	    )
       
   895 	     (LabelSpec
       
   896 	     label: '(B)'
       
   897 	     name: 'BLabel'
       
   898 	     layout: (LayoutFrame -30 1 0 0 0 1 0 1)
       
   899 	     translateLabel: true
       
   900 	    )
       
   901 	   )
       
   902 
       
   903 	)
       
   904       )
       
   905 
       
   906     "Created: / 17-01-2013 / 23:44:17 / Jan Vrany <jan.vrany@fit.cvut.cz>"
       
   907 !
       
   908 
       
   909 mergeBaseLabelSpec
       
   910     "This resource specification was automatically generated
       
   911      by the UIPainter of ST/X."
       
   912 
       
   913     "Do not manually edit this!! If it is corrupted,
       
   914      the UIPainter may not be able to read the specification."
       
   915 
       
   916     "
       
   917      UIPainter new openOnClass:Tools::ChangeSetDiffTool andSelector:#versionBaseLabelSpec
       
   918      Tools::ChangeSetDiffTool new openInterface:#versionBaseLabelSpec
       
   919     "
       
   920 
       
   921     <resource: #canvas>
       
   922 
       
   923     ^
       
   924      #(FullSpec
       
   925 	name: versionBaseLabelSpec
       
   926 	window:
       
   927        (WindowSpec
       
   928 	  label: 'Version Base'
       
   929 	  name: 'Version Base'
       
   930 	  min: (Point 10 10)
       
   931 	  bounds: (Rectangle 0 0 300 30)
       
   932 	  backgroundColor: (Color 67.843137254902 87.843137254902 96.4705882352941)
       
   933 	  forceRecursiveBackground: true
       
   934 	)
       
   935 	component:
       
   936        (SpecCollection
       
   937 	  collection: (
       
   938 	   (LabelSpec
       
   939 	      label: 'versionBase24x24'
       
   940 	      name: 'VersionBIcon'
       
   941 	      layout: (LayoutFrame 0 0 -12 0.5 27 0 12 0.5)
       
   942 	      hasCharacterOrientedLabel: false
       
   943 	      translateLabel: true
       
   944 	    )
       
   945 	   (LabelSpec
       
   946 	      label: 'Version B'
       
   947 	      name: 'VersionBLabel'
       
   948 	      layout: (LayoutFrame 90 0 0 0 190 0 0 1)
       
   949 	      translateLabel: true
       
   950 	      labelChannel: versionBaseLabelHolder
       
   951 	      resizeForLabel: true
       
   952 	      adjust: left
       
   953 	      useDynamicPreferredWidth: true
       
   954 	      usePreferredWidth: true
       
   955 	    )
       
   956 	   (LabelSpec
       
   957 	      label: '(Base)'
       
   958 	      name: 'BaseLabel'
       
   959 	      layout: (LayoutFrame -50 1 0 0 0 1 0 1)
       
   960 	      translateLabel: true
       
   961 	    )
       
   962 	   )
       
   963 
       
   964 	)
       
   965       )
       
   966 
       
   967     "Created: / 17-01-2013 / 23:44:23 / Jan Vrany <jan.vrany@fit.cvut.cz>"
       
   968 !
       
   969 
       
   970 mergeMergeLabelSpec
       
   971     "This resource specification was automatically generated
       
   972      by the UIPainter of ST/X."
       
   973 
       
   974     "Do not manually edit this!! If it is corrupted,
       
   975      the UIPainter may not be able to read the specification."
       
   976 
       
   977     "
       
   978      UIPainter new openOnClass:Tools::ChangeSetDiffTool andSelector:#mergeMergeLabelSpec
       
   979      Tools::ChangeSetDiffTool new openInterface:#mergeMergeLabelSpec
       
   980     "
       
   981 
       
   982     <resource: #canvas>
       
   983 
       
   984     ^
       
   985      #(FullSpec
       
   986 	name: mergeMergeLabelSpec
       
   987 	window:
       
   988        (WindowSpec
       
   989 	  label: 'Version Merged'
       
   990 	  name: 'Version Merged'
       
   991 	  min: (Point 10 10)
       
   992 	  bounds: (Rectangle 0 0 300 30)
       
   993 	  backgroundColor: (Color 96.2554360265507 72.7275501640345 95.8999008163577)
       
   994 	  forceRecursiveBackground: true
       
   995 	)
       
   996 	component:
       
   997        (SpecCollection
       
   998 	  collection: (
       
   999 	   (LabelSpec
       
  1000 	      label: 'versionMerged24x24'
       
  1001 	      name: 'VersionMergedIcon'
       
  1002 	      layout: (LayoutFrame 60 0 -12 0.5 87 0 12 0.5)
       
  1003 	      hasCharacterOrientedLabel: false
       
  1004 	      translateLabel: true
       
  1005 	    )
       
  1006 	   (LabelSpec
       
  1007 	      label: 'Version B'
       
  1008 	      name: 'VersionMergedLabel'
       
  1009 	      layout: (LayoutFrame 90 0 0 0 267 0 0 1)
       
  1010 	      translateLabel: true
       
  1011 	      labelChannel: versionMergedLabelHolder
       
  1012 	      resizeForLabel: true
       
  1013 	      adjust: left
       
  1014 	      useDynamicPreferredWidth: true
       
  1015 	      usePreferredWidth: true
       
  1016 	    )
       
  1017 	   (LabelSpec
       
  1018 	      label: '(Merge)'
       
  1019 	      name: 'MergedLabel'
       
  1020 	      layout: (LayoutFrame -70 1 0 0 0 1 0 1)
       
  1021 	      translateLabel: true
       
  1022 	    )
       
  1023 	   )
       
  1024 
       
  1025 	)
       
  1026       )
       
  1027 !
       
  1028 
       
  1029 versionALabelSpec
       
  1030     "This resource specification was automatically generated
       
  1031      by the UIPainter of ST/X."
       
  1032 
       
  1033     "Do not manually edit this!! If it is corrupted,
       
  1034      the UIPainter may not be able to read the specification."
       
  1035 
       
  1036     "
       
  1037      UIPainter new openOnClass:Tools::ChangeSetDiffTool andSelector:#versionALabelSpec
       
  1038      Tools::ChangeSetDiffTool new openInterface:#versionALabelSpec
       
  1039     "
       
  1040 
       
  1041     <resource: #canvas>
       
  1042 
       
  1043     ^ 
       
  1044      #(FullSpec
       
  1045         name: versionALabelSpec
       
  1046         window: 
       
  1047        (WindowSpec
   781        (WindowSpec
  1048           label: 'Version A'
   782           label: 'Version A'
  1049           name: 'Version A'
   783           name: 'Version A'
  1050           min: (Point 10 10)
   784           min: (Point 10 10)
  1051           bounds: (Rectangle 0 0 300 30)
   785           bounds: (Rectangle 0 0 300 30)
  1052           backgroundColor: (Color 79.6078431372549 90.5882352941177 69.4117647058823)
   786           backgroundColor: (Color 79.6078431372549 90.5882352941177 69.4117647058823)
  1053           forceRecursiveBackground: true
   787           forceRecursiveBackground: true
  1054         )
   788         )
  1055         component: 
   789         component:
  1056        (SpecCollection
   790        (SpecCollection
  1057           collection: (
   791           collection: (
  1058            (LabelSpec
   792            (LabelSpec
       
   793               label: 'mergeDiff3BaseToAArrow30x30'
       
   794               name: 'Label1'
       
   795               layout: (LayoutFrame 0 0 0 0 30 0 0 1)
       
   796               hasCharacterOrientedLabel: false
       
   797               translateLabel: true
       
   798             )
       
   799            (LabelSpec
  1059               label: 'versionA24x24'
   800               label: 'versionA24x24'
  1060               name: 'VersionAIcon'
   801               name: 'VersionAIcon'
  1061               layout: (LayoutFrame 0 0 -12 0.5 27 0 12 0.5)
   802               layout: (LayoutFrame 30 0 -12 0.5 57 0 12 0.5)
       
   803               hasCharacterOrientedLabel: false
       
   804               translateLabel: true
       
   805             )
       
   806            (LabelSpec
       
   807               label: 'mergeDiff3AToMergedArrow30x30'
       
   808               name: 'Label2'
       
   809               layout: (LayoutFrame 60 0 0 0 90 0 0 1)
  1062               hasCharacterOrientedLabel: false
   810               hasCharacterOrientedLabel: false
  1063               translateLabel: true
   811               translateLabel: true
  1064             )
   812             )
  1065            (LabelSpec
   813            (LabelSpec
  1066               label: 'Version A'
   814               label: 'Version A'
  1067               name: 'VersionALabel'
   815               name: 'VersionALabel'
  1068               layout: (LayoutFrame 30 0 0 0 0 1 0 1)
   816               layout: (LayoutFrame 90 0 0 0 0 1 0 1)
  1069               translateLabel: true
   817               translateLabel: true
  1070               labelChannel: versionALabelHolder
   818               labelChannel: versionALabelHolder
       
   819               foregroundColor: (Color 0.0 0.0 0.0)
  1071               resizeForLabel: true
   820               resizeForLabel: true
  1072               adjust: left
   821               adjust: left
  1073             )
   822             )
  1074            (LabelSpec
   823            (LabelSpec
  1075               label: '(A)'
   824               label: '(A)'
  1076               name: 'ALabel'
   825               name: 'ALabel'
  1077               layout: (LayoutFrame -30 1 0 0 0 1 0 1)
   826               layout: (LayoutFrame -30 1 0 0 0 1 0 1)
  1078               translateLabel: true
   827               translateLabel: true
       
   828               foregroundColor: (Color 0.0 0.0 0.0)
  1079             )
   829             )
  1080            )
   830            )
  1081          
   831 
  1082         )
   832         )
  1083       )
   833       )
  1084 !
   834 
  1085 
   835     "Modified: / 19-08-2021 / 23:26:43 / Jan Vrany <jan.vrany@labware.com>"
  1086 versionBLabelSpec
   836 !
       
   837 
       
   838 mergeBLabelSpec
  1087     "This resource specification was automatically generated
   839     "This resource specification was automatically generated
  1088      by the UIPainter of ST/X."
   840      by the UIPainter of ST/X."
  1089 
   841 
  1090     "Do not manually edit this!! If it is corrupted,
   842     "Do not manually edit this!! If it is corrupted,
  1091      the UIPainter may not be able to read the specification."
   843      the UIPainter may not be able to read the specification."
  1095      Tools::ChangeSetDiffTool new openInterface:#versionBLabelSpec
   847      Tools::ChangeSetDiffTool new openInterface:#versionBLabelSpec
  1096     "
   848     "
  1097 
   849 
  1098     <resource: #canvas>
   850     <resource: #canvas>
  1099 
   851 
  1100     ^ 
   852     ^
  1101      #(FullSpec
   853      #(FullSpec
  1102         name: versionBLabelSpec
   854         name: versionBLabelSpec
  1103         window: 
   855         window:
  1104        (WindowSpec
   856        (WindowSpec
  1105           label: 'Version B'
   857           label: 'Version B'
  1106           name: 'Version B'
   858           name: 'Version B'
  1107           min: (Point 10 10)
   859           min: (Point 10 10)
  1108           bounds: (Rectangle 0 0 300 30)
   860           bounds: (Rectangle 0 0 300 30)
  1109           backgroundColor: (Color 100.0 90.5882352941177 60.0)
   861           backgroundColor: (Color 100.0 90.5882352941177 60.0)
  1110           forceRecursiveBackground: true
   862           forceRecursiveBackground: true
  1111         )
   863         )
  1112         component: 
   864         component:
       
   865        (SpecCollection
       
   866           collection: (
       
   867             (LabelSpec
       
   868               label: 'mergeDiff3BaseToBArrow30x30'
       
   869               name: 'Label1'
       
   870               layout: (LayoutFrame 0 0 0 0 30 0 0 1)
       
   871               hasCharacterOrientedLabel: false
       
   872               translateLabel: true
       
   873             )
       
   874            (LabelSpec
       
   875               label: 'versionB24x24'
       
   876               name: 'VersionBIcon'
       
   877               layout: (LayoutFrame 30 0 -12 0.5 57 0 12 0.5)
       
   878               hasCharacterOrientedLabel: false
       
   879               translateLabel: true
       
   880             )
       
   881             (LabelSpec
       
   882               label: 'mergeDiff3BToMergedArrow30x30'
       
   883               name: 'Label2'
       
   884               layout: (LayoutFrame 60 0 0 0 90 0 0 1)
       
   885               hasCharacterOrientedLabel: false
       
   886               translateLabel: true
       
   887             )
       
   888            (LabelSpec
       
   889               label: 'Version B'
       
   890               name: 'VersionBLabel'
       
   891               layout: (LayoutFrame 90 0 0 0 167 0 0 1)
       
   892               translateLabel: true
       
   893               labelChannel: versionBLabelHolder
       
   894               resizeForLabel: true
       
   895               adjust: left
       
   896               useDynamicPreferredWidth: true
       
   897               usePreferredWidth: true
       
   898               foregroundColor: (Color 0.0 0.0 0.0)
       
   899             )
       
   900              (LabelSpec
       
   901              label: '(B)'
       
   902              name: 'BLabel'
       
   903              layout: (LayoutFrame -30 1 0 0 0 1 0 1)
       
   904              translateLabel: true
       
   905              foregroundColor: (Color 0.0 0.0 0.0)
       
   906             )
       
   907            )
       
   908 
       
   909         )
       
   910       )
       
   911 
       
   912     "Created: / 17-01-2013 / 23:44:17 / Jan Vrany <jan.vrany@fit.cvut.cz>"
       
   913     "Modified: / 19-08-2021 / 23:26:54 / Jan Vrany <jan.vrany@labware.com>"
       
   914 !
       
   915 
       
   916 mergeBaseLabelSpec
       
   917     "This resource specification was automatically generated
       
   918      by the UIPainter of ST/X."
       
   919 
       
   920     "Do not manually edit this!! If it is corrupted,
       
   921      the UIPainter may not be able to read the specification."
       
   922 
       
   923     "
       
   924      UIPainter new openOnClass:Tools::ChangeSetDiffTool andSelector:#versionBaseLabelSpec
       
   925      Tools::ChangeSetDiffTool new openInterface:#versionBaseLabelSpec
       
   926     "
       
   927 
       
   928     <resource: #canvas>
       
   929 
       
   930     ^
       
   931      #(FullSpec
       
   932         name: versionBaseLabelSpec
       
   933         window:
       
   934        (WindowSpec
       
   935           label: 'Version Base'
       
   936           name: 'Version Base'
       
   937           min: (Point 10 10)
       
   938           bounds: (Rectangle 0 0 300 30)
       
   939           backgroundColor: (Color 67.843137254902 87.843137254902 96.4705882352941)
       
   940           forceRecursiveBackground: true
       
   941         )
       
   942         component:
  1113        (SpecCollection
   943        (SpecCollection
  1114           collection: (
   944           collection: (
  1115            (LabelSpec
   945            (LabelSpec
  1116               label: 'versionB24x24'
   946               label: 'versionBase24x24'
  1117               name: 'VersionBIcon'
   947               name: 'VersionBIcon'
  1118               layout: (LayoutFrame 0 0 -12 0.5 27 0 12 0.5)
   948               layout: (LayoutFrame 0 0 -12 0.5 27 0 12 0.5)
  1119               hasCharacterOrientedLabel: false
   949               hasCharacterOrientedLabel: false
  1120               translateLabel: true
   950               translateLabel: true
  1121             )
   951             )
  1122            (LabelSpec
   952            (LabelSpec
  1123               label: 'Version B'
   953               label: 'Version B'
  1124               name: 'VersionBLabel'
   954               name: 'VersionBLabel'
  1125               layout: (LayoutFrame 30 0 0 0 167 0 0 1)
   955               layout: (LayoutFrame 90 0 0 0 190 0 0 1)
  1126               translateLabel: true
   956               translateLabel: true
  1127               labelChannel: versionBLabelHolder
   957               labelChannel: versionBaseLabelHolder
  1128               resizeForLabel: true
   958               resizeForLabel: true
  1129               adjust: left
   959               adjust: left
  1130               useDynamicPreferredWidth: true
   960               useDynamicPreferredWidth: true
  1131               usePreferredWidth: true
   961               usePreferredWidth: true
       
   962               foregroundColor: (Color 0.0 0.0 0.0)
  1132             )
   963             )
  1133              (LabelSpec
   964            (LabelSpec
       
   965               label: '(Base)'
       
   966               name: 'BaseLabel'
       
   967               layout: (LayoutFrame -50 1 0 0 0 1 0 1)
       
   968               translateLabel: true
       
   969               foregroundColor: (Color 0.0 0.0 0.0)
       
   970             )
       
   971            )
       
   972 
       
   973         )
       
   974       )
       
   975 
       
   976     "Created: / 17-01-2013 / 23:44:23 / Jan Vrany <jan.vrany@fit.cvut.cz>"
       
   977     "Modified: / 19-08-2021 / 23:27:05 / Jan Vrany <jan.vrany@labware.com>"
       
   978 !
       
   979 
       
   980 mergeMergeLabelSpec
       
   981     "This resource specification was automatically generated
       
   982      by the UIPainter of ST/X."
       
   983 
       
   984     "Do not manually edit this!! If it is corrupted,
       
   985      the UIPainter may not be able to read the specification."
       
   986 
       
   987     "
       
   988      UIPainter new openOnClass:Tools::ChangeSetDiffTool andSelector:#mergeMergeLabelSpec
       
   989      Tools::ChangeSetDiffTool new openInterface:#mergeMergeLabelSpec
       
   990     "
       
   991 
       
   992     <resource: #canvas>
       
   993 
       
   994     ^ 
       
   995     #(FullSpec
       
   996        name: mergeMergeLabelSpec
       
   997        uuid: '57a41780-013c-11ec-9f3c-606720e43e2c'
       
   998        window: 
       
   999       (WindowSpec
       
  1000          label: 'Version Merged'
       
  1001          name: 'Version Merged'
       
  1002          uuid: '57a41781-013c-11ec-9f3c-606720e43e2c'
       
  1003          min: (Point 10 10) bounds: (Rectangle 0 0 300 30) backgroundColor: (Color 96.25 72.75 96.0) forceRecursiveBackground: true
       
  1004       ) component: 
       
  1005       (SpecCollection
       
  1006          collection: (
       
  1007           (LabelSpec
       
  1008              label: 'versionMerged24x24'
       
  1009              name: 'VersionMergedIcon'
       
  1010              layout: (LayoutFrame 60 0 -12 0.5 87 0 12 0.5) uuid: '57a41782-013c-11ec-9f3c-606720e43e2c'
       
  1011              hasCharacterOrientedLabel: false
       
  1012              translateLabel: true
       
  1013           )
       
  1014           (LabelSpec
       
  1015              label: 'Version B'
       
  1016              name: 'VersionMergedLabel'
       
  1017              layout: (LayoutFrame 90 0 0 0 276 0 0 1) uuid: '57a43e90-013c-11ec-9f3c-606720e43e2c'
       
  1018              foregroundColor: (Color 0.0 0.0 0.0) translateLabel: true
       
  1019              labelChannel: versionMergedLabelHolder
       
  1020              resizeForLabelHorizontal: true
       
  1021              resizeForLabelVertical: true
       
  1022              adjust: left
       
  1023              usePreferredWidth: true
       
  1024              useDynamicPreferredWidth: true
       
  1025           )
       
  1026           (LabelSpec
       
  1027              label: '(Merge)'
       
  1028              name: 'MergedLabel'
       
  1029              layout: (LayoutFrame -70 1 0 0 0 1 0 1) uuid: '57a43e91-013c-11ec-9f3c-606720e43e2c'
       
  1030              foregroundColor: (Color 0.0 0.0 0.0) translateLabel: true
       
  1031           )
       
  1032         )
       
  1033       )
       
  1034     )
       
  1035 !
       
  1036 
       
  1037 versionALabelSpec
       
  1038     "This resource specification was automatically generated
       
  1039      by the UIPainter of ST/X."
       
  1040 
       
  1041     "Do not manually edit this!! If it is corrupted,
       
  1042      the UIPainter may not be able to read the specification."
       
  1043 
       
  1044     "
       
  1045      UIPainter new openOnClass:Tools::ChangeSetDiffTool andSelector:#versionALabelSpec
       
  1046      Tools::ChangeSetDiffTool new openInterface:#versionALabelSpec
       
  1047     "
       
  1048 
       
  1049     <resource: #canvas>
       
  1050 
       
  1051     ^ 
       
  1052     #(FullSpec
       
  1053        name: versionALabelSpec
       
  1054        uuid: 'fa4cfb10-013b-11ec-9f3c-606720e43e2c'
       
  1055        window: 
       
  1056       (WindowSpec
       
  1057          label: 'Version A'
       
  1058          name: 'Version A'
       
  1059          uuid: 'fa4d2220-013b-11ec-9f3c-606720e43e2c'
       
  1060          min: (Point 10 10) bounds: (Rectangle 0 0 300 30) backgroundColor: (Color 79.5 90.5 69.5) forceRecursiveBackground: true
       
  1061       ) component: 
       
  1062       (SpecCollection
       
  1063          collection: (
       
  1064           (LabelSpec
       
  1065              label: 'versionA24x24'
       
  1066              name: 'VersionAIcon'
       
  1067              layout: (LayoutFrame 0 0 -12 0.5 27 0 12 0.5) uuid: 'fa4d2221-013b-11ec-9f3c-606720e43e2c'
       
  1068              hasCharacterOrientedLabel: false
       
  1069              translateLabel: true
       
  1070           )
       
  1071           (LabelSpec
       
  1072              label: 'Version A'
       
  1073              name: 'VersionALabel'
       
  1074              layout: (LayoutFrame 30 0 0 0 0 1 0 1) uuid: 'fa4d2222-013b-11ec-9f3c-606720e43e2c'
       
  1075              foregroundColor: (Color 0.0 0.0 0.0) translateLabel: true
       
  1076              labelChannel: versionALabelHolder
       
  1077              resizeForLabelHorizontal: true
       
  1078              resizeForLabelVertical: true
       
  1079              adjust: left
       
  1080           )
       
  1081           (LabelSpec
       
  1082              label: '(A)'
       
  1083              name: 'ALabel'
       
  1084              layout: (LayoutFrame -30 1 0 0 0 1 0 1) uuid: 'fa4d2223-013b-11ec-9f3c-606720e43e2c'
       
  1085              foregroundColor: (Color 0.0 0.0 0.0) translateLabel: true
       
  1086           )
       
  1087         )
       
  1088       )
       
  1089     )
       
  1090 !
       
  1091 
       
  1092 versionBLabelSpec
       
  1093     "This resource specification was automatically generated
       
  1094      by the UIPainter of ST/X."
       
  1095 
       
  1096     "Do not manually edit this!! If it is corrupted,
       
  1097      the UIPainter may not be able to read the specification."
       
  1098 
       
  1099     "
       
  1100      UIPainter new openOnClass:Tools::ChangeSetDiffTool andSelector:#versionBLabelSpec
       
  1101      Tools::ChangeSetDiffTool new openInterface:#versionBLabelSpec
       
  1102     "
       
  1103 
       
  1104     <resource: #canvas>
       
  1105 
       
  1106     ^ 
       
  1107     #(FullSpec
       
  1108        name: versionBLabelSpec
       
  1109        uuid: '22ea2ac0-013c-11ec-9f3c-606720e43e2c'
       
  1110        window: 
       
  1111       (WindowSpec
       
  1112          label: 'Version B'
       
  1113          name: 'Version B'
       
  1114          uuid: '22ea2ac1-013c-11ec-9f3c-606720e43e2c'
       
  1115          min: (Point 10 10) bounds: (Rectangle 0 0 300 30) backgroundColor: (Color 100.0 90.5 60.0) forceRecursiveBackground: true
       
  1116       ) component: 
       
  1117       (SpecCollection
       
  1118          collection: (
       
  1119           (LabelSpec
       
  1120              label: 'versionB24x24'
       
  1121              name: 'VersionBIcon'
       
  1122              layout: (LayoutFrame 0 0 -12 0.5 27 0 12 0.5) uuid: '22ea2ac2-013c-11ec-9f3c-606720e43e2c'
       
  1123              hasCharacterOrientedLabel: false
       
  1124              translateLabel: true
       
  1125           )
       
  1126           (LabelSpec
       
  1127              label: 'Version B'
       
  1128              name: 'VersionBLabel'
       
  1129              layout: (LayoutFrame 30 0 0 0 175 0 0 1) uuid: '22ea51d0-013c-11ec-9f3c-606720e43e2c'
       
  1130              foregroundColor: (Color 0.0 0.0 0.0) translateLabel: true
       
  1131              labelChannel: versionBLabelHolder
       
  1132              resizeForLabelHorizontal: true
       
  1133              resizeForLabelVertical: true
       
  1134              adjust: left
       
  1135              usePreferredWidth: true
       
  1136              useDynamicPreferredWidth: true
       
  1137           )
       
  1138           (LabelSpec
  1134              label: '(B)'
  1139              label: '(B)'
  1135              name: 'BLabel'
  1140              name: 'BLabel'
  1136              layout: (LayoutFrame -30 1 0 0 0 1 0 1)
  1141              layout: (LayoutFrame -30 1 0 0 0 1 0 1) uuid: '22ea51d1-013c-11ec-9f3c-606720e43e2c'
  1137              translateLabel: true
  1142              foregroundColor: (Color 0.0 0.0 0.0) translateLabel: true
  1138             )
  1143           )
  1139            )
       
  1140          
       
  1141         )
  1144         )
  1142       )
  1145       )
  1143 
  1146     )
  1144     "Modified: / 16-12-2011 / 14:17:33 / Jan Vrany <jan.vrany@fit.cvut.cz>"
       
  1145 !
  1147 !
  1146 
  1148 
  1147 versionBaseLabelSpec
  1149 versionBaseLabelSpec
  1148     "This resource specification was automatically generated
  1150     "This resource specification was automatically generated
  1149      by the UIPainter of ST/X."
  1151      by the UIPainter of ST/X."
  1156      Tools::ChangeSetDiffTool new openInterface:#versionBaseLabelSpec
  1158      Tools::ChangeSetDiffTool new openInterface:#versionBaseLabelSpec
  1157     "
  1159     "
  1158 
  1160 
  1159     <resource: #canvas>
  1161     <resource: #canvas>
  1160 
  1162 
  1161     ^
  1163     ^ 
  1162      #(FullSpec
  1164     #(FullSpec
  1163 	name: versionBaseLabelSpec
  1165        name: versionBaseLabelSpec
  1164 	window:
  1166        uuid: '3a0081a0-013c-11ec-9f3c-606720e43e2c'
  1165        (WindowSpec
  1167        window: 
  1166 	  label: 'Version Base'
  1168       (WindowSpec
  1167 	  name: 'Version Base'
  1169          label: 'Version Base'
  1168 	  min: (Point 10 10)
  1170          name: 'Version Base'
  1169 	  bounds: (Rectangle 0 0 300 30)
  1171          uuid: '3a0081a1-013c-11ec-9f3c-606720e43e2c'
  1170 	  backgroundColor: (Color 67.843137254902 87.843137254902 96.4705882352941)
  1172          min: (Point 10 10) bounds: (Rectangle 0 0 300 30) backgroundColor: (Color 67.75 87.75 96.5) forceRecursiveBackground: true
  1171 	  forceRecursiveBackground: true
  1173       ) component: 
  1172 	)
  1174       (SpecCollection
  1173 	component:
  1175          collection: (
  1174        (SpecCollection
  1176           (LabelSpec
  1175 	  collection: (
  1177              label: 'versionBase24x24'
  1176 	   (LabelSpec
  1178              name: 'VersionBIcon'
  1177 	      label: 'versionBase24x24'
  1179              layout: (LayoutFrame 0 0 -12 0.5 27 0 12 0.5) uuid: '3a00a8b0-013c-11ec-9f3c-606720e43e2c'
  1178 	      name: 'VersionBIcon'
  1180              hasCharacterOrientedLabel: false
  1179 	      layout: (LayoutFrame 0 0 -12 0.5 27 0 12 0.5)
  1181              translateLabel: true
  1180 	      hasCharacterOrientedLabel: false
  1182           )
  1181 	      translateLabel: true
  1183           (LabelSpec
  1182 	    )
  1184              label: 'Version B'
  1183 	   (LabelSpec
  1185              name: 'VersionBLabel'
  1184 	      label: 'Version B'
  1186              layout: (LayoutFrame 30 0 0 0 198 0 0 1) uuid: '3a00a8b1-013c-11ec-9f3c-606720e43e2c'
  1185 	      name: 'VersionBLabel'
  1187              foregroundColor: (Color 0.0 0.0 0.0) translateLabel: true
  1186 	      layout: (LayoutFrame 30 0 0 0 190 0 0 1)
  1188              labelChannel: versionBaseLabelHolder
  1187 	      translateLabel: true
  1189              resizeForLabelHorizontal: true
  1188 	      labelChannel: versionBaseLabelHolder
  1190              resizeForLabelVertical: true
  1189 	      resizeForLabel: true
  1191              adjust: left
  1190 	      adjust: left
  1192              usePreferredWidth: true
  1191 	      useDynamicPreferredWidth: true
  1193              useDynamicPreferredWidth: true
  1192 	      usePreferredWidth: true
  1194           )
  1193 	    )
  1195           (LabelSpec
  1194 	   (LabelSpec
  1196              label: '(Base)'
  1195 	      label: '(Base)'
  1197              name: 'BaseLabel'
  1196 	      name: 'BaseLabel'
  1198              layout: (LayoutFrame -50 1 0 0 0 1 0 1) uuid: '3a00a8b2-013c-11ec-9f3c-606720e43e2c'
  1197 	      layout: (LayoutFrame -50 1 0 0 0 1 0 1)
  1199              foregroundColor: (Color 0.0 0.0 0.0) translateLabel: true
  1198 	      translateLabel: true
  1200           )
  1199 	    )
  1201         )
  1200 	   )
       
  1201 
       
  1202 	)
       
  1203       )
  1202       )
       
  1203     )
  1204 !
  1204 !
  1205 
  1205 
  1206 versionMergeLabelSpec
  1206 versionMergeLabelSpec
  1207     "This resource specification was automatically generated
  1207     "This resource specification was automatically generated
  1208      by the UIPainter of ST/X."
  1208      by the UIPainter of ST/X."
  1209 
  1209 
  1210     "Do not manually edit this!! If it is corrupted,
  1210     "Do not manually edit this!! If it is corrupted,
  1211      the UIPainter may not be able to read the specification."
  1211      the UIPainter may not be able to read the specification."
  1212 
  1212 
  1213     "
  1213     "
  1214      UIPainter new openOnClass:Tools::ChangeSetDiffTool andSelector:#versionBaseLabelSpec
  1214      UIPainter new openOnClass:Tools::ChangeSetDiffTool andSelector:#versionMergeLabelSpec
  1215      Tools::ChangeSetDiffTool new openInterface:#versionBaseLabelSpec
  1215      Tools::ChangeSetDiffTool new openInterface:#versionMergeLabelSpec
  1216     "
  1216     "
  1217 
  1217 
  1218     <resource: #canvas>
  1218     <resource: #canvas>
  1219 
  1219 
  1220     ^
  1220     ^ 
  1221      #(FullSpec
  1221     #(FullSpec
  1222 	name: versionBaseLabelSpec
  1222        name: versionMergeLabelSpec
  1223 	window:
  1223        uuid: '4910dc30-013c-11ec-9f3c-606720e43e2c'
  1224        (WindowSpec
  1224        window: 
  1225 	  label: 'Version Merged'
  1225       (WindowSpec
  1226 	  name: 'Version Merged'
  1226          label: 'Version Merged'
  1227 	  min: (Point 10 10)
  1227          name: 'Version Merged'
  1228 	  bounds: (Rectangle 0 0 300 30)
  1228          uuid: '4910dc31-013c-11ec-9f3c-606720e43e2c'
  1229 	  backgroundColor: (Color 96.2554360265507 72.7275501640345 95.8999008163577)
  1229          min: (Point 10 10) bounds: (Rectangle 0 0 300 30) backgroundColor: (Color 96.25 72.75 96.0) forceRecursiveBackground: true
  1230 	  forceRecursiveBackground: true
  1230       ) component: 
  1231 	)
  1231       (SpecCollection
  1232 	component:
  1232          collection: (
  1233        (SpecCollection
  1233           (LabelSpec
  1234 	  collection: (
  1234              label: 'versionMerged24x24'
  1235 	   (LabelSpec
  1235              name: 'VersionMergedIcon'
  1236 	      label: 'versionMerged24x24'
  1236              layout: (LayoutFrame 0 0 -12 0.5 27 0 12 0.5) uuid: '4910dc32-013c-11ec-9f3c-606720e43e2c'
  1237 	      name: 'VersionMergedIcon'
  1237              hasCharacterOrientedLabel: false
  1238 	      layout: (LayoutFrame 0 0 -12 0.5 27 0 12 0.5)
  1238              foregroundColor: (Color 0.0 0.0 0.0) translateLabel: true
  1239 	      hasCharacterOrientedLabel: false
  1239           )
  1240 	      translateLabel: true
  1240           (LabelSpec
  1241 	    )
  1241              label: 'Version B'
  1242 	   (LabelSpec
  1242              name: 'VersionMergedLabel'
  1243 	      label: 'Version B'
  1243              layout: (LayoutFrame 30 0 0 0 216 0 0 1) uuid: '4910dc33-013c-11ec-9f3c-606720e43e2c'
  1244 	      name: 'VersionMergedLabel'
  1244              foregroundColor: (Color 0.0 0.0 0.0) translateLabel: true
  1245 	      layout: (LayoutFrame 30 0 0 0 190 0 0 1)
  1245              labelChannel: versionMergedLabelHolder
  1246 	      translateLabel: true
  1246              resizeForLabelHorizontal: true
  1247 	      labelChannel: versionMergedLabelHolder
  1247              resizeForLabelVertical: true
  1248 	      resizeForLabel: true
  1248              adjust: left
  1249 	      adjust: left
  1249              usePreferredWidth: true
  1250 	      useDynamicPreferredWidth: true
  1250              useDynamicPreferredWidth: true
  1251 	      usePreferredWidth: true
  1251           )
  1252 	    )
  1252           (LabelSpec
  1253 	   (LabelSpec
  1253              label: '(Merge)'
  1254 	      label: '(Merge)'
  1254              name: 'MergedLabel'
  1255 	      name: 'MergedLabel'
  1255              layout: (LayoutFrame -70 1 0 0 0 1 0 1) uuid: '49110340-013c-11ec-9f3c-606720e43e2c'
  1256 	      layout: (LayoutFrame -70 1 0 0 0 1 0 1)
  1256              foregroundColor: (Color 0.0 0.0 0.0) translateLabel: true
  1257 	      translateLabel: true
  1257           )
  1258 	    )
  1258         )
  1259 	   )
       
  1260 
       
  1261 	)
       
  1262       )
  1259       )
  1263 
  1260     )
  1264     "Created: / 17-01-2013 / 22:53:50 / Jan Vrany <jan.vrany@fit.cvut.cz>"
       
  1265 ! !
  1261 ! !
  1266 
  1262 
  1267 !ChangeSetDiffTool class methodsFor:'menu specs'!
  1263 !ChangeSetDiffTool class methodsFor:'menu specs'!
  1268 
  1264 
  1269 listMenu
  1265 listMenu
  2827             ]
  2823             ]
  2828         ] ifFalse:[
  2824         ] ifFalse:[
  2829             Dialog warn: (self class resources at: 'Oops, class is gone')
  2825             Dialog warn: (self class resources at: 'Oops, class is gone')
  2830         ]
  2826         ]
  2831     ] ifFalse:[
  2827     ] ifFalse:[
  2832         Dialog error: 'Not yet implemented (Tools::ChangeSetDiffTool » listMenuBrowse)'.                        
  2828         Dialog error: 'Not yet implemented (Tools::ChangeSetDiffTool » listMenuBrowse)'.                        
  2833     ]
  2829     ]
  2834 
  2830 
  2835     "Created: / 30-11-2011 / 11:30:54 / Jan Vrany <jan.vrany@fit.cvut.cz>"
  2831     "Created: / 30-11-2011 / 11:30:54 / Jan Vrany <jan.vrany@fit.cvut.cz>"
  2836 !
  2832 !
  2837 
  2833 
  3961 
  3957 
  3962 version_CVS
  3958 version_CVS
  3963     ^ '$Header$'
  3959     ^ '$Header$'
  3964 !
  3960 !
  3965 
  3961 
       
  3962 version_HG
       
  3963 
       
  3964     ^ '$Changeset: <not expanded> $'
       
  3965 !
       
  3966 
  3966 version_SVN
  3967 version_SVN
  3967     ^ '$Id$'
  3968     ^ '$Id$'
  3968 ! !
  3969 ! !
  3969 
  3970