Ignore:
Timestamp:
Oct 9, 2009, 12:04:49 AM (12 years ago)
Author:
Arno Wacker
Message:

Small cosmetic enhancements for enigma (this refs #85):

  • Added "Remove all plugs" button in the Plugboard section to easily reset the plugboard
  • The Involutoric checkbox is now visible only in expert mode (even though CT2 always starts as default in "Expert")
  • Rotor 4 and Ring 4 are now hidden when a model without them is selected (this only works after selecting once a model, FIX needed)


Minor change to RandomInput: Renamed to Random Generator in order to fit in the generator category.

Location:
trunk/CrypPlugins/Enigma
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/CrypPlugins/Enigma/Enigma.cs

    r614 r691  
    1 /*                              Apache License
    2                            Version 2.0, January 2004
    3                         http://www.apache.org/licenses/
    4 
    5    TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
    6 
    7    1. Definitions.
    8 
    9       "License" shall mean the terms and conditions for use, reproduction,
    10       and distribution as defined by Sections 1 through 9 of this document.
    11 
    12       "Licensor" shall mean the copyright owner or entity authorized by
    13       the copyright owner that is granting the License.
    14 
    15       "Legal Entity" shall mean the union of the acting entity and all
    16       other entities that control, are controlled by, or are under common
    17       control with that entity. For the purposes of this definition,
    18       "control" means (i) the power, direct or indirect, to cause the
    19       direction or management of such entity, whether by contract or
    20       otherwise, or (ii) ownership of fifty percent (50%) or more of the
    21       outstanding shares, or (iii) beneficial ownership of such entity.
    22 
    23       "You" (or "Your") shall mean an individual or Legal Entity
    24       exercising permissions granted by this License.
    25 
    26       "Source" form shall mean the preferred form for making modifications,
    27       including but not limited to software source code, documentation
    28       source, and configuration files.
    29 
    30       "Object" form shall mean any form resulting from mechanical
    31       transformation or translation of a Source form, including but
    32       not limited to compiled object code, generated documentation,
    33       and conversions to other media types.
    34 
    35       "Work" shall mean the work of authorship, whether in Source or
    36       Object form, made available under the License, as indicated by a
    37       copyright notice that is included in or attached to the work
    38       (an example is provided in the Appendix below).
    39 
    40       "Derivative Works" shall mean any work, whether in Source or Object
    41       form, that is based on (or derived from) the Work and for which the
    42       editorial revisions, annotations, elaborations, or other modifications
    43       represent, as a whole, an original work of authorship. For the purposes
    44       of this License, Derivative Works shall not include works that remain
    45       separable from, or merely link (or bind by name) to the interfaces of,
    46       the Work and Derivative Works thereof.
    47 
    48       "Contribution" shall mean any work of authorship, including
    49       the original version of the Work and any modifications or additions
    50       to that Work or Derivative Works thereof, that is intentionally
    51       submitted to Licensor for inclusion in the Work by the copyright owner
    52       or by an individual or Legal Entity authorized to submit on behalf of
    53       the copyright owner. For the purposes of this definition, "submitted"
    54       means any form of electronic, verbal, or written communication sent
    55       to the Licensor or its representatives, including but not limited to
    56       communication on electronic mailing lists, source code control systems,
    57       and issue tracking systems that are managed by, or on behalf of, the
    58       Licensor for the purpose of discussing and improving the Work, but
    59       excluding communication that is conspicuously marked or otherwise
    60       designated in writing by the copyright owner as "Not a Contribution."
    61 
    62       "Contributor" shall mean Licensor and any individual or Legal Entity
    63       on behalf of whom a Contribution has been received by Licensor and
    64       subsequently incorporated within the Work.
    65 
    66    2. Grant of Copyright License. Subject to the terms and conditions of
    67       this License, each Contributor hereby grants to You a perpetual,
    68       worldwide, non-exclusive, no-charge, royalty-free, irrevocable
    69       copyright license to reproduce, prepare Derivative Works of,
    70       publicly display, publicly perform, sublicense, and distribute the
    71       Work and such Derivative Works in Source or Object form.
    72 
    73    3. Grant of Patent License. Subject to the terms and conditions of
    74       this License, each Contributor hereby grants to You a perpetual,
    75       worldwide, non-exclusive, no-charge, royalty-free, irrevocable
    76       (except as stated in this section) patent license to make, have made,
    77       use, offer to sell, sell, import, and otherwise transfer the Work,
    78       where such license applies only to those patent claims licensable
    79       by such Contributor that are necessarily infringed by their
    80       Contribution(s) alone or by combination of their Contribution(s)
    81       with the Work to which such Contribution(s) was submitted. If You
    82       institute patent litigation against any entity (including a
    83       cross-claim or counterclaim in a lawsuit) alleging that the Work
    84       or a Contribution incorporated within the Work constitutes direct
    85       or contributory patent infringement, then any patent licenses
    86       granted to You under this License for that Work shall terminate
    87       as of the date such litigation is filed.
    88 
    89    4. Redistribution. You may reproduce and distribute copies of the
    90       Work or Derivative Works thereof in any medium, with or without
    91       modifications, and in Source or Object form, provided that You
    92       meet the following conditions:
    93 
    94       (a) You must give any other recipients of the Work or
    95           Derivative Works a copy of this License; and
    96 
    97       (b) You must cause any modified files to carry prominent notices
    98           stating that You changed the files; and
    99 
    100       (c) You must retain, in the Source form of any Derivative Works
    101           that You distribute, all copyright, patent, trademark, and
    102           attribution notices from the Source form of the Work,
    103           excluding those notices that do not pertain to any part of
    104           the Derivative Works; and
    105 
    106       (d) If the Work includes a "NOTICE" text file as part of its
    107           distribution, then any Derivative Works that You distribute must
    108           include a readable copy of the attribution notices contained
    109           within such NOTICE file, excluding those notices that do not
    110           pertain to any part of the Derivative Works, in at least one
    111           of the following places: within a NOTICE text file distributed
    112           as part of the Derivative Works; within the Source form or
    113           documentation, if provided along with the Derivative Works; or,
    114           within a display generated by the Derivative Works, if and
    115           wherever such third-party notices normally appear. The contents
    116           of the NOTICE file are for informational purposes only and
    117           do not modify the License. You may add Your own attribution
    118           notices within Derivative Works that You distribute, alongside
    119           or as an addendum to the NOTICE text from the Work, provided
    120           that such additional attribution notices cannot be construed
    121           as modifying the License.
    122 
    123       You may add Your own copyright statement to Your modifications and
    124       may provide additional or different license terms and conditions
    125       for use, reproduction, or distribution of Your modifications, or
    126       for any such Derivative Works as a whole, provided Your use,
    127       reproduction, and distribution of the Work otherwise complies with
    128       the conditions stated in this License.
    129 
    130    5. Submission of Contributions. Unless You explicitly state otherwise,
    131       any Contribution intentionally submitted for inclusion in the Work
    132       by You to the Licensor shall be under the terms and conditions of
    133       this License, without any additional terms or conditions.
    134       Notwithstanding the above, nothing herein shall supersede or modify
    135       the terms of any separate license agreement you may have executed
    136       with Licensor regarding such Contributions.
    137 
    138    6. Trademarks. This License does not grant permission to use the trade
    139       names, trademarks, service marks, or product names of the Licensor,
    140       except as required for reasonable and customary use in describing the
    141       origin of the Work and reproducing the content of the NOTICE file.
    142 
    143    7. Disclaimer of Warranty. Unless required by applicable law or
    144       agreed to in writing, Licensor provides the Work (and each
    145       Contributor provides its Contributions) on an "AS IS" BASIS,
    146       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
    147       implied, including, without limitation, any warranties or conditions
    148       of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
    149       PARTICULAR PURPOSE. You are solely responsible for determining the
    150       appropriateness of using or redistributing the Work and assume any
    151       risks associated with Your exercise of permissions under this License.
    152 
    153    8. Limitation of Liability. In no event and under no legal theory,
    154       whether in tort (including negligence), contract, or otherwise,
    155       unless required by applicable law (such as deliberate and grossly
    156       negligent acts) or agreed to in writing, shall any Contributor be
    157       liable to You for damages, including any direct, indirect, special,
    158       incidental, or consequential damages of any character arising as a
    159       result of this License or out of the use or inability to use the
    160       Work (including but not limited to damages for loss of goodwill,
    161       work stoppage, computer failure or malfunction, or any and all
    162       other commercial damages or losses), even if such Contributor
    163       has been advised of the possibility of such damages.
    164 
    165    9. Accepting Warranty or Additional Liability. While redistributing
    166       the Work or Derivative Works thereof, You may choose to offer,
    167       and charge a fee for, acceptance of support, warranty, indemnity,
    168       or other liability obligations and/or rights consistent with this
    169       License. However, in accepting such obligations, You may act only
    170       on Your own behalf and on Your sole responsibility, not on behalf
    171       of any other Contributor, and only if You agree to indemnify,
    172       defend, and hold each Contributor harmless for any liability
    173       incurred by, or claims asserted against, such Contributor by reason
    174       of your accepting any such warranty or additional liability.
    175 
    176    END OF TERMS AND CONDITIONS
    177 
    178    APPENDIX: How to apply the Apache License to your work.
    179 
    180       To apply the Apache License to your work, attach the following
    181       boilerplate notice, with the fields enclosed by brackets "[]"
    182       replaced with your own identifying information. (Don't include
    183       the brackets!)  The text should be enclosed in the appropriate
    184       comment syntax for the file format. We also recommend that a
    185       file or class name and description of purpose be included on the
    186       same "printed page" as the copyright notice for easier
    187       identification within third-party archives.
    188 
    189    Copyright [2008] [Dr. Arno Wacker, University of Duisburg-Essen]
     1/*
     2   Copyright 2008-2009, Dr. Arno Wacker, University of Duisburg-Essen
    1903
    1914   Licensed under the Apache License, Version 2.0 (the "License");
     
    21427using System.Collections;
    21528using System.Diagnostics;
     29using System.IO;
     30using System.Reflection;
     31using System.Resources;
    21632
    21733//Cryptool 2.0 specific includes
     
    22137using Cryptool.PluginBase.Miscellaneous;
    22238using Cryptool.PluginBase.IO;
    223 using System.IO;
    224 using System.Reflection;
    225 using System.Resources;
    226 
    22739
    22840
    22941namespace Cryptool.Enigma
    23042{
    231     [Author("Dr. Arno Wacker, Matthäus Wander", "arno.wacker@cryptool.org", "Uni Duisburg-Essen", "http://www.uni-duisburg-essen.de")]
     43    [Author("Dr. Arno Wacker, Matthäus Wander", "arno.wacker@cryptool.org", "Uni Duisburg-Essen, Fachgebiet Verteilte Systeme", "http://www.vs.uni-due.de")]
    23244    [PluginInfo(false, "Enigma", "Polyalphabetic rotor-cipher machine", null,
    23345      "Enigma/Images/Enigma.png", "Enigma/Images/encrypt.png", "Enigma/Images/decrypt.png")]
  • trunk/CrypPlugins/Enigma/EnigmaSettings.cs

    r440 r691  
    1 /*                              Apache License
    2                            Version 2.0, January 2004
    3                         http://www.apache.org/licenses/
    4 
    5    TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
    6 
    7    1. Definitions.
    8 
    9       "License" shall mean the terms and conditions for use, reproduction,
    10       and distribution as defined by Sections 1 through 9 of this document.
    11 
    12       "Licensor" shall mean the copyright owner or entity authorized by
    13       the copyright owner that is granting the License.
    14 
    15       "Legal Entity" shall mean the union of the acting entity and all
    16       other entities that control, are controlled by, or are under common
    17       control with that entity. For the purposes of this definition,
    18       "control" means (i) the power, direct or indirect, to cause the
    19       direction or management of such entity, whether by contract or
    20       otherwise, or (ii) ownership of fifty percent (50%) or more of the
    21       outstanding shares, or (iii) beneficial ownership of such entity.
    22 
    23       "You" (or "Your") shall mean an individual or Legal Entity
    24       exercising permissions granted by this License.
    25 
    26       "Source" form shall mean the preferred form for making modifications,
    27       including but not limited to software source code, documentation
    28       source, and configuration files.
    29 
    30       "Object" form shall mean any form resulting from mechanical
    31       transformation or translation of a Source form, including but
    32       not limited to compiled object code, generated documentation,
    33       and conversions to other media types.
    34 
    35       "Work" shall mean the work of authorship, whether in Source or
    36       Object form, made available under the License, as indicated by a
    37       copyright notice that is included in or attached to the work
    38       (an example is provided in the Appendix below).
    39 
    40       "Derivative Works" shall mean any work, whether in Source or Object
    41       form, that is based on (or derived from) the Work and for which the
    42       editorial revisions, annotations, elaborations, or other modifications
    43       represent, as a whole, an original work of authorship. For the purposes
    44       of this License, Derivative Works shall not include works that remain
    45       separable from, or merely link (or bind by name) to the interfaces of,
    46       the Work and Derivative Works thereof.
    47 
    48       "Contribution" shall mean any work of authorship, including
    49       the original version of the Work and any modifications or additions
    50       to that Work or Derivative Works thereof, that is intentionally
    51       submitted to Licensor for inclusion in the Work by the copyright owner
    52       or by an individual or Legal Entity authorized to submit on behalf of
    53       the copyright owner. For the purposes of this definition, "submitted"
    54       means any form of electronic, verbal, or written communication sent
    55       to the Licensor or its representatives, including but not limited to
    56       communication on electronic mailing lists, source code control systems,
    57       and issue tracking systems that are managed by, or on behalf of, the
    58       Licensor for the purpose of discussing and improving the Work, but
    59       excluding communication that is conspicuously marked or otherwise
    60       designated in writing by the copyright owner as "Not a Contribution."
    61 
    62       "Contributor" shall mean Licensor and any individual or Legal Entity
    63       on behalf of whom a Contribution has been received by Licensor and
    64       subsequently incorporated within the Work.
    65 
    66    2. Grant of Copyright License. Subject to the terms and conditions of
    67       this License, each Contributor hereby grants to You a perpetual,
    68       worldwide, non-exclusive, no-charge, royalty-free, irrevocable
    69       copyright license to reproduce, prepare Derivative Works of,
    70       publicly display, publicly perform, sublicense, and distribute the
    71       Work and such Derivative Works in Source or Object form.
    72 
    73    3. Grant of Patent License. Subject to the terms and conditions of
    74       this License, each Contributor hereby grants to You a perpetual,
    75       worldwide, non-exclusive, no-charge, royalty-free, irrevocable
    76       (except as stated in this section) patent license to make, have made,
    77       use, offer to sell, sell, import, and otherwise transfer the Work,
    78       where such license applies only to those patent claims licensable
    79       by such Contributor that are necessarily infringed by their
    80       Contribution(s) alone or by combination of their Contribution(s)
    81       with the Work to which such Contribution(s) was submitted. If You
    82       institute patent litigation against any entity (including a
    83       cross-claim or counterclaim in a lawsuit) alleging that the Work
    84       or a Contribution incorporated within the Work constitutes direct
    85       or contributory patent infringement, then any patent licenses
    86       granted to You under this License for that Work shall terminate
    87       as of the date such litigation is filed.
    88 
    89    4. Redistribution. You may reproduce and distribute copies of the
    90       Work or Derivative Works thereof in any medium, with or without
    91       modifications, and in Source or Object form, provided that You
    92       meet the following conditions:
    93 
    94       (a) You must give any other recipients of the Work or
    95           Derivative Works a copy of this License; and
    96 
    97       (b) You must cause any modified files to carry prominent notices
    98           stating that You changed the files; and
    99 
    100       (c) You must retain, in the Source form of any Derivative Works
    101           that You distribute, all copyright, patent, trademark, and
    102           attribution notices from the Source form of the Work,
    103           excluding those notices that do not pertain to any part of
    104           the Derivative Works; and
    105 
    106       (d) If the Work includes a "NOTICE" text file as part of its
    107           distribution, then any Derivative Works that You distribute must
    108           include a readable copy of the attribution notices contained
    109           within such NOTICE file, excluding those notices that do not
    110           pertain to any part of the Derivative Works, in at least one
    111           of the following places: within a NOTICE text file distributed
    112           as part of the Derivative Works; within the Source form or
    113           documentation, if provided along with the Derivative Works; or,
    114           within a display generated by the Derivative Works, if and
    115           wherever such third-party notices normally appear. The contents
    116           of the NOTICE file are for informational purposes only and
    117           do not modify the License. You may add Your own attribution
    118           notices within Derivative Works that You distribute, alongside
    119           or as an addendum to the NOTICE text from the Work, provided
    120           that such additional attribution notices cannot be construed
    121           as modifying the License.
    122 
    123       You may add Your own copyright statement to Your modifications and
    124       may provide additional or different license terms and conditions
    125       for use, reproduction, or distribution of Your modifications, or
    126       for any such Derivative Works as a whole, provided Your use,
    127       reproduction, and distribution of the Work otherwise complies with
    128       the conditions stated in this License.
    129 
    130    5. Submission of Contributions. Unless You explicitly state otherwise,
    131       any Contribution intentionally submitted for inclusion in the Work
    132       by You to the Licensor shall be under the terms and conditions of
    133       this License, without any additional terms or conditions.
    134       Notwithstanding the above, nothing herein shall supersede or modify
    135       the terms of any separate license agreement you may have executed
    136       with Licensor regarding such Contributions.
    137 
    138    6. Trademarks. This License does not grant permission to use the trade
    139       names, trademarks, service marks, or product names of the Licensor,
    140       except as required for reasonable and customary use in describing the
    141       origin of the Work and reproducing the content of the NOTICE file.
    142 
    143    7. Disclaimer of Warranty. Unless required by applicable law or
    144       agreed to in writing, Licensor provides the Work (and each
    145       Contributor provides its Contributions) on an "AS IS" BASIS,
    146       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
    147       implied, including, without limitation, any warranties or conditions
    148       of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
    149       PARTICULAR PURPOSE. You are solely responsible for determining the
    150       appropriateness of using or redistributing the Work and assume any
    151       risks associated with Your exercise of permissions under this License.
    152 
    153    8. Limitation of Liability. In no event and under no legal theory,
    154       whether in tort (including negligence), contract, or otherwise,
    155       unless required by applicable law (such as deliberate and grossly
    156       negligent acts) or agreed to in writing, shall any Contributor be
    157       liable to You for damages, including any direct, indirect, special,
    158       incidental, or consequential damages of any character arising as a
    159       result of this License or out of the use or inability to use the
    160       Work (including but not limited to damages for loss of goodwill,
    161       work stoppage, computer failure or malfunction, or any and all
    162       other commercial damages or losses), even if such Contributor
    163       has been advised of the possibility of such damages.
    164 
    165    9. Accepting Warranty or Additional Liability. While redistributing
    166       the Work or Derivative Works thereof, You may choose to offer,
    167       and charge a fee for, acceptance of support, warranty, indemnity,
    168       or other liability obligations and/or rights consistent with this
    169       License. However, in accepting such obligations, You may act only
    170       on Your own behalf and on Your sole responsibility, not on behalf
    171       of any other Contributor, and only if You agree to indemnify,
    172       defend, and hold each Contributor harmless for any liability
    173       incurred by, or claims asserted against, such Contributor by reason
    174       of your accepting any such warranty or additional liability.
    175 
    176    END OF TERMS AND CONDITIONS
    177 
    178    APPENDIX: How to apply the Apache License to your work.
    179 
    180       To apply the Apache License to your work, attach the following
    181       boilerplate notice, with the fields enclosed by brackets "[]"
    182       replaced with your own identifying information. (Don't include
    183       the brackets!)  The text should be enclosed in the appropriate
    184       comment syntax for the file format. We also recommend that a
    185       file or class name and description of purpose be included on the
    186       same "printed page" as the copyright notice for easier
    187       identification within third-party archives.
    188 
    189    Copyright [2008] [Dr. Arno Wacker, University of Duisburg-Essen]
     1/*
     2   Copyright 2008-2009, Dr. Arno Wacker, University of Duisburg-Essen
    1903
    1914   Licensed under the Apache License, Version 2.0 (the "License");
     
    21124using System.ComponentModel;
    21225using System.Collections.ObjectModel;
    213 
     26using System.Windows;
    21427
    21528// Cryptool 2.0 specific includes
    21629using Cryptool.PluginBase;
    21730using Cryptool.PluginBase.Miscellaneous;
    218 
    21931
    22032
     
    322134        }
    323135
    324         #endregion
    325 
    326         #region Public and Internal Methods
     136        private void showSettingsElement(string element)
     137        {
     138            if (TaskPaneAttributeChanged != null)
     139            {
     140                TaskPaneAttributeChanged(this, new TaskPaneAttributeChangedEventArgs(new TaskPaneAttribteContainer(element, Visibility.Visible)));
     141            }
     142        }
     143
     144        private void hideSettingsElement(string element)
     145        {
     146            if (TaskPaneAttributeChanged != null)
     147            {
     148                TaskPaneAttributeChanged(this, new TaskPaneAttributeChangedEventArgs(new TaskPaneAttribteContainer(element, Visibility.Collapsed)));
     149            }
     150        }
     151
     152        #endregion
     153
     154        #region Public Events and Methods
     155
     156        /// <summary>
     157        /// This event is needed in order to render settings elements visible/invisible
     158        /// </summary>
     159        public event TaskPaneAttributeChangedHandler TaskPaneAttributeChanged;
    327160
    328161        /// <summary>
     
    351184        }
    352185
    353         public void resetPlugBoard()
    354         {
    355             plugBoard = new StringBuilder("ABCDEFGHIJKLMNOPQRSTUVWXYZ");
    356             OnPropertyChanged("PlugBoardDisplay");
    357         }
    358 
    359186        public int AlphabetIndexOf(char c)
    360187        {
     
    374201            rotorAStrings.Add("VII (since 1939, M3/M4)"); rotorAStrings.Add("VIII (since 1939, M3/M4)");
    375202            rotorBStrings.Add("Not available for this model.");
     203            hideSettingsElement("Rotor4"); hideSettingsElement("Ring4"); //FIXME: They still show initially... ? Probably, the event is not registered yet..
    376204        }
    377205
     
    414242                        rotorBStrings.Clear(); rotorBStrings.Add("Not available for this model."); rotor4 = 0;  OnPropertyChanged("Rotor4");
    415243                        reflectorStrings.Clear(); reflectorStrings.Add("Not available for this model."); reflector = 0; OnPropertyChanged("Reflector");
     244                        hideSettingsElement("Rotor4"); hideSettingsElement("Ring4"); hideSettingsElement("Reflector");
    416245                        break;
    417246                    case 1: // Enigma D
     
    422251                        rotorBStrings.Clear(); rotorBStrings.Add("Not available for this model."); rotor4 = 0; OnPropertyChanged("Rotor4");
    423252                        reflectorStrings.Clear(); reflectorStrings.Add("UKW (D)"); reflector = 0; OnPropertyChanged("Reflector");
     253                        hideSettingsElement("Rotor4"); hideSettingsElement("Ring4");
     254                        showSettingsElement("Reflector");
    424255                        break;
    425256                    case 2: // Reichsbahn (Rocket)
     
    430261                        rotorBStrings.Clear(); rotorBStrings.Add("Not available for this model."); rotor4 = 0; OnPropertyChanged("Rotor4");
    431262                        reflectorStrings.Clear(); reflectorStrings.Add("UKW -- since 7th Feb. 1941"); reflector = 0; OnPropertyChanged("Reflector");
     263                        hideSettingsElement("Rotor4"); hideSettingsElement("Ring4");
     264                        showSettingsElement("Reflector");
    432265                        break;
    433266                    case 3: // Enigma I / M3
     
    441274                        reflectorStrings.Clear(); reflectorStrings.Add("UKW A"); reflectorStrings.Add("UKW B (2. November 1937)");
    442275                        reflectorStrings.Add("UKW C (since 1940/41)"); reflector = 1; OnPropertyChanged("Reflector");
     276                        hideSettingsElement("Rotor4"); hideSettingsElement("Ring4");
     277                        showSettingsElement("Reflector");
    443278                        break;
    444279                    case 4: // Enigma M4 "Shark"
     
    452287                        reflectorStrings.Clear(); reflectorStrings.Add("UKW B \"thin\" -- since 1st Feb. 1942"); reflectorStrings.Add("UKW C \"thin\" -- since 1st July 1943");
    453288                        reflector = 0; OnPropertyChanged("Reflector");
     289                        showSettingsElement("Rotor4"); showSettingsElement("Ring4"); showSettingsElement("Reflector");
    454290                        break;
    455291                    case 5: // Enigma K-Model
     
    460296                        rotorBStrings.Clear(); rotorBStrings.Add("Not available for this model."); rotor4 = 0; OnPropertyChanged("Rotor4");
    461297                        reflectorStrings.Clear(); reflectorStrings.Add("UKW (K) -- since Feb. 1939"); reflector = 0; OnPropertyChanged("Reflector");
     298                        hideSettingsElement("Rotor4"); hideSettingsElement("Ring4");
     299                        showSettingsElement("Reflector");
    462300                        break;
    463301                    case 6: // Enigam G / Abwehr
     
    468306                        rotorBStrings.Clear(); rotorBStrings.Add("Not available for this model."); rotor4 = 0; OnPropertyChanged("Rotor4");
    469307                        reflectorStrings.Clear(); reflectorStrings.Add("UKW (G)"); reflector = 0; OnPropertyChanged("Reflector");
     308                        hideSettingsElement("Rotor4"); hideSettingsElement("Ring4");
     309                        showSettingsElement("Reflector");
    470310                        break;
    471311                }
     
    1005845        }
    1006846
    1007         [TaskPane("Involutoric", "The mapping and the inverse mapping are the same. As an example if A mapps to X, also X is mapped to A", "Plugboard", 31, false, DisplayLevel.Beginner, ControlType.CheckBox, "", null)]
     847        [TaskPane("Involutoric", "The mapping and the inverse mapping are the same. As an example if A mapps to X, also X is mapped to A", "Plugboard", 31, false, DisplayLevel.Expert, ControlType.CheckBox, "", null)]
    1008848        public bool Involutoric
    1009849        {
     
    12551095
    12561096
     1097        [TaskPane("Remove all plugs", "By pressing this button the plugboard is reset to its empty state, i.e. all plugs are removed", "Plugboard", 70, false, DisplayLevel.Beginner, ControlType.Button)]
     1098        public void ResetPlugboard()
     1099        {
     1100            plugBoard = new StringBuilder("ABCDEFGHIJKLMNOPQRSTUVWXYZ");
     1101            OnPropertyChanged("PlugBoardDisplay");
     1102            for (int i = 0; i < alphabet.Length; i++)
     1103            {
     1104                OnPropertyChanged("PlugBoard" + alphabet[i]);
     1105            }
     1106        }
     1107
    12571108        #endregion
    12581109
Note: See TracChangeset for help on using the changeset viewer.