Changeset 16500


Ignore:
Timestamp:
Aug 8, 2016, 2:44:48 PM (3 years ago)
Author:
dcorreia
Message:

Added progress messages to system page.
Fixed bugs and design.

Location:
internals/2016/linuxloginsmartcardwizard
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • internals/2016/linuxloginsmartcardwizard/.idea/workspace.xml

    r16495 r16500  
    22<project version="4">
    33  <component name="ChangeListManager">
    4     <list default="true" readonly="true" id="fbd8e757-714d-41c6-a2b9-8558c09dbd04" name="Default" comment="">
     4    <list default="true" readonly="true" id="fbd8e757-714d-41c6-a2b9-8558c09dbd04" name="Default" comment="Update IDE workspace">
    55      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     6      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/trunk/proto1/carduser.py" afterPath="$PROJECT_DIR$/trunk/proto1/carduser.py" />
     7      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/trunk/proto1/config.py" afterPath="$PROJECT_DIR$/trunk/proto1/config.py" />
     8      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/trunk/proto1/final.py" afterPath="$PROJECT_DIR$/trunk/proto1/final.py" />
     9      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/trunk/proto1/main.py" afterPath="$PROJECT_DIR$/trunk/proto1/main.py" />
     10      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/trunk/proto1/system.py" afterPath="$PROJECT_DIR$/trunk/proto1/system.py" />
     11      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/trunk/proto1/w4pages.py" afterPath="$PROJECT_DIR$/trunk/proto1/w4pages.py" />
     12      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/trunk/proto1/welcome.py" afterPath="$PROJECT_DIR$/trunk/proto1/welcome.py" />
    613    </list>
    714    <ignored path="estagiopycharm.iws" />
     
    2633        <entry file="file://$PROJECT_DIR$/trunk/proto1/w4pages.py">
    2734          <provider selected="true" editor-type-id="text-editor">
    28             <state relative-caret-position="351">
    29               <caret line="50" column="0" selection-start-line="50" selection-start-column="0" selection-end-line="50" selection-end-column="0" />
     35            <state relative-caret-position="203">
     36              <caret line="24" column="56" selection-start-line="24" selection-start-column="56" selection-end-line="24" selection-end-column="56" />
    3037              <folding>
    31                 <element signature="e#228#270#0" expanded="true" />
     38                <element signature="e#0#42#0" expanded="true" />
    3239              </folding>
    3340            </state>
     
    3845        <entry file="file://$PROJECT_DIR$/trunk/proto1/welcome.py">
    3946          <provider selected="true" editor-type-id="text-editor">
    40             <state relative-caret-position="743">
    41               <caret line="42" column="0" selection-start-line="42" selection-start-column="0" selection-end-line="42" selection-end-column="0" />
     47            <state relative-caret-position="90">
     48              <caret line="5" column="43" selection-start-line="5" selection-start-column="43" selection-end-line="5" selection-end-column="43" />
    4249              <folding />
    4350            </state>
     
    4855        <entry file="file://$PROJECT_DIR$/trunk/proto1/system.py">
    4956          <provider selected="true" editor-type-id="text-editor">
    50             <state relative-caret-position="725">
    51               <caret line="70" column="32" selection-start-line="70" selection-start-column="32" selection-end-line="70" selection-end-column="32" />
     57            <state relative-caret-position="216">
     58              <caret line="12" column="56" selection-start-line="12" selection-start-column="56" selection-end-line="12" selection-end-column="56" />
    5259              <folding>
    5360                <element signature="e#0#42#0" expanded="true" />
     
    6067        <entry file="file://$PROJECT_DIR$/trunk/proto1/carduser.py">
    6168          <provider selected="true" editor-type-id="text-editor">
    62             <state relative-caret-position="180">
    63               <caret line="13" column="60" selection-start-line="13" selection-start-column="60" selection-end-line="13" selection-end-column="60" />
     69            <state relative-caret-position="66">
     70              <caret line="24" column="7" selection-start-line="24" selection-start-column="6" selection-end-line="24" selection-end-column="7" />
    6471              <folding>
    6572                <element signature="e#0#42#0" expanded="true" />
    66               </folding>
    67             </state>
    68           </provider>
    69         </entry>
    70       </file>
    71       <file leaf-file-name="main.py" pinned="false" current-in-tab="false">
    72         <entry file="file://$PROJECT_DIR$/trunk/proto1/main.py">
    73           <provider selected="true" editor-type-id="text-editor">
    74             <state relative-caret-position="828">
    75               <caret line="71" column="4" selection-start-line="71" selection-start-column="4" selection-end-line="71" selection-end-column="4" />
    76               <folding />
    77             </state>
    78           </provider>
    79         </entry>
    80       </file>
    81       <file leaf-file-name="config.py" pinned="false" current-in-tab="false">
    82         <entry file="file://$PROJECT_DIR$/trunk/proto1/config.py">
    83           <provider selected="true" editor-type-id="text-editor">
    84             <state relative-caret-position="780">
    85               <caret line="282" column="40" selection-start-line="282" selection-start-column="40" selection-end-line="282" selection-end-column="40" />
    86               <folding>
    87                 <element signature="e#19#28#0" expanded="true" />
    8873              </folding>
    8974            </state>
     
    9479        <entry file="file://$PROJECT_DIR$/trunk/proto1/final.py">
    9580          <provider selected="true" editor-type-id="text-editor">
    96             <state relative-caret-position="288">
    97               <caret line="16" column="65" selection-start-line="16" selection-start-column="65" selection-end-line="16" selection-end-column="65" />
     81            <state relative-caret-position="509">
     82              <caret line="31" column="85" selection-start-line="31" selection-start-column="85" selection-end-line="31" selection-end-column="85" />
    9883              <folding />
    9984            </state>
     
    10186        </entry>
    10287      </file>
    103       <file leaf-file-name="cardHelper.py" pinned="false" current-in-tab="true">
    104         <entry file="file://$PROJECT_DIR$/trunk/proto1/cardHelper.py">
     88      <file leaf-file-name="main.py" pinned="false" current-in-tab="false">
     89        <entry file="file://$PROJECT_DIR$/trunk/proto1/main.py">
    10590          <provider selected="true" editor-type-id="text-editor">
    106             <state relative-caret-position="90">
    107               <caret line="5" column="7" selection-start-line="5" selection-start-column="7" selection-end-line="5" selection-end-column="7" />
     91            <state relative-caret-position="195">
     92              <caret line="50" column="27" selection-start-line="50" selection-start-column="26" selection-end-line="50" selection-end-column="27" />
    10893              <folding />
     94            </state>
     95          </provider>
     96        </entry>
     97      </file>
     98      <file leaf-file-name="config.py" pinned="false" current-in-tab="true">
     99        <entry file="file://$PROJECT_DIR$/trunk/proto1/config.py">
     100          <provider selected="true" editor-type-id="text-editor">
     101            <state relative-caret-position="1859">
     102              <caret line="325" column="26" selection-start-line="325" selection-start-column="26" selection-end-line="325" selection-end-column="26" />
     103              <folding>
     104                <element signature="e#19#28#0" expanded="true" />
     105              </folding>
    109106            </state>
    110107          </provider>
     
    134131        <option value="$PROJECT_DIR$/trunk/project1/pkcs11.example" />
    135132        <option value="$PROJECT_DIR$/trunk/project1/configpkcs11.py" />
    136         <option value="$PROJECT_DIR$/.idea/workspace.xml" />
    137133        <option value="$PROJECT_DIR$/trunk/project1/tests.py" />
    138134        <option value="$PROJECT_DIR$/trunk/project1/main.py" />
     
    155151        <option value="$PROJECT_DIR$/trunk/proto1/gui/system.py" />
    156152        <option value="$PROJECT_DIR$/trunk/proto1/eidlibPython_Wrapper/examples/simple_example.py" />
    157         <option value="$PROJECT_DIR$/trunk/proto1/w4pages.py" />
     153        <option value="$PROJECT_DIR$/trunk/proto1/cardHelper.py" />
     154        <option value="$PROJECT_DIR$/.idea/workspace.xml" />
     155        <option value="$PROJECT_DIR$/trunk/proto1/main.py" />
     156        <option value="$PROJECT_DIR$/trunk/proto1/final.py" />
    158157        <option value="$PROJECT_DIR$/trunk/proto1/welcome.py" />
    159         <option value="$PROJECT_DIR$/trunk/proto1/main.py" />
    160         <option value="$PROJECT_DIR$/trunk/proto1/config.py" />
    161         <option value="$PROJECT_DIR$/trunk/proto1/cardHelper.py" />
    162         <option value="$PROJECT_DIR$/trunk/proto1/final.py" />
    163158        <option value="$PROJECT_DIR$/trunk/proto1/system.py" />
    164159        <option value="$PROJECT_DIR$/trunk/proto1/carduser.py" />
     160        <option value="$PROJECT_DIR$/trunk/proto1/w4pages.py" />
     161        <option value="$PROJECT_DIR$/trunk/proto1/config.py" />
    165162      </list>
    166163    </option>
     
    220217    <panes>
    221218      <pane id="Scope" />
    222       <pane id="Scratches" />
    223219      <pane id="ProjectPane">
    224220        <subPane />
    225221      </pane>
     222      <pane id="Scratches" />
    226223    </panes>
    227224  </component>
     
    710707      <updated>1470415006584</updated>
    711708    </task>
    712     <option name="localTasksCounter" value="30" />
     709    <task id="LOCAL-00030" summary="Update IDE workspace">
     710      <created>1470415036209</created>
     711      <option name="number" value="00030" />
     712      <option name="presentableId" value="LOCAL-00030" />
     713      <option name="project" value="LOCAL" />
     714      <updated>1470415036209</updated>
     715    </task>
     716    <option name="localTasksCounter" value="31" />
    713717    <servers />
    714718  </component>
     
    728732      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.22593476" sideWeight="0.49195403" order="0" side_tool="false" content_ui="combo" />
    729733      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24574961" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
    730       <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32921174" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
    731734      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.23802164" sideWeight="0.50676215" order="9" side_tool="true" content_ui="tabs" />
    732       <window_info id="Version Control" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3122102" sideWeight="0.49323785" order="12" side_tool="false" content_ui="tabs" />
     735      <window_info id="Version Control" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.35085008" sideWeight="0.49323785" order="12" side_tool="false" content_ui="tabs" />
    733736      <window_info id="Python Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32612056" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
    734737      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24900557" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
     
    737740      <window_info id="SVN Repositories" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32921174" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
    738741      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
     742      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32921174" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
    739743      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
    740744      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
     
    747751      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.39876354" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
    748752    </layout>
    749     <layout-to-restore>
    750       <window_info id="SVN Repositories" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32921174" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
    751       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24574961" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
    752       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
    753       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
    754       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
    755       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.23802164" sideWeight="0.50676215" order="9" side_tool="true" content_ui="tabs" />
    756       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
    757       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3122102" sideWeight="0.49323785" order="12" side_tool="false" content_ui="tabs" />
    758       <window_info id="Python Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32612056" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
    759       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.28902626" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
    760       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.23029366" sideWeight="0.4953125" order="10" side_tool="false" content_ui="tabs" />
    761       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.22593476" sideWeight="0.49195403" order="0" side_tool="false" content_ui="combo" />
    762       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
    763       <window_info id="Inspection Results" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32945737" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
    764       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32921174" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
    765       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24900557" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
    766       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
    767       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.17263326" sideWeight="0.508046" order="1" side_tool="true" content_ui="tabs" />
    768       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.39876354" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
    769     </layout-to-restore>
    770753  </component>
    771754  <component name="UnknownFeatures">
     
    785768  <component name="VcsManagerConfiguration">
    786769    <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="true" />
    787     <MESSAGE value="Added debug messages, docstrings and tests" />
    788770    <MESSAGE value="Added main.py to manage calls to config modules.&#10;Added tests.py to manage tests." />
    789771    <MESSAGE value="Added troubleshooting regarding CyberTrust certificate." />
     
    810792    <MESSAGE value="Added functions to check if  reader is connected and card is inserted." />
    811793    <MESSAGE value="Added read smartcard info feature and troubleshooting messages.&#10;Fixed hidden button trick in system page.&#10;Fixed design characteristics in carduser page." />
    812     <option name="LAST_COMMIT_MESSAGE" value="Added read smartcard info feature and troubleshooting messages.&#10;Fixed hidden button trick in system page.&#10;Fixed design characteristics in carduser page." />
     794    <MESSAGE value="Update IDE workspace" />
     795    <option name="LAST_COMMIT_MESSAGE" value="Update IDE workspace" />
    813796  </component>
    814797  <component name="XDebuggerManager">
    815798    <breakpoint-manager>
    816       <option name="time" value="23" />
     799      <option name="time" value="25" />
    817800    </breakpoint-manager>
    818801    <watches-manager />
     
    1006989      </provider>
    1007990    </entry>
     991    <entry file="file://$PROJECT_DIR$/trunk/proto1/tmpfile" />
    1008992    <entry file="file://$PROJECT_DIR$/.idea/workspace.xml">
    1009993      <provider selected="true" editor-type-id="text-editor">
    1010994        <state relative-caret-position="18">
    1011           <caret line="294" column="4" selection-start-line="294" selection-start-column="4" selection-end-line="294" selection-end-column="4" />
     995          <caret line="304" column="4" selection-start-line="304" selection-start-column="4" selection-end-line="304" selection-end-column="4" />
     996        </state>
     997      </provider>
     998    </entry>
     999    <entry file="file://$PROJECT_DIR$/trunk/proto1/cardHelper.py">
     1000      <provider selected="true" editor-type-id="text-editor">
     1001        <state relative-caret-position="36">
     1002          <caret line="2" column="10" selection-start-line="1" selection-start-column="0" selection-end-line="2" selection-end-column="10" />
    10121003          <folding />
    10131004        </state>
    10141005      </provider>
    10151006    </entry>
     1007    <entry file="file://$PROJECT_DIR$/trunk/proto1/welcome.py">
     1008      <provider selected="true" editor-type-id="text-editor">
     1009        <state relative-caret-position="90">
     1010          <caret line="5" column="43" selection-start-line="5" selection-start-column="43" selection-end-line="5" selection-end-column="43" />
     1011          <folding />
     1012        </state>
     1013      </provider>
     1014    </entry>
     1015    <entry file="file://$PROJECT_DIR$/trunk/proto1/system.py">
     1016      <provider selected="true" editor-type-id="text-editor">
     1017        <state relative-caret-position="216">
     1018          <caret line="12" column="56" selection-start-line="12" selection-start-column="56" selection-end-line="12" selection-end-column="56" />
     1019          <folding>
     1020            <element signature="e#0#42#0" expanded="true" />
     1021          </folding>
     1022        </state>
     1023      </provider>
     1024    </entry>
     1025    <entry file="file://$PROJECT_DIR$/trunk/proto1/carduser.py">
     1026      <provider selected="true" editor-type-id="text-editor">
     1027        <state relative-caret-position="66">
     1028          <caret line="24" column="7" selection-start-line="24" selection-start-column="6" selection-end-line="24" selection-end-column="7" />
     1029          <folding>
     1030            <element signature="e#0#42#0" expanded="true" />
     1031          </folding>
     1032        </state>
     1033      </provider>
     1034    </entry>
     1035    <entry file="file://$PROJECT_DIR$/trunk/proto1/final.py">
     1036      <provider selected="true" editor-type-id="text-editor">
     1037        <state relative-caret-position="509">
     1038          <caret line="31" column="85" selection-start-line="31" selection-start-column="85" selection-end-line="31" selection-end-column="85" />
     1039          <folding />
     1040        </state>
     1041      </provider>
     1042    </entry>
     1043    <entry file="file://$PROJECT_DIR$/trunk/proto1/w4pages.py">
     1044      <provider selected="true" editor-type-id="text-editor">
     1045        <state relative-caret-position="203">
     1046          <caret line="24" column="56" selection-start-line="24" selection-start-column="56" selection-end-line="24" selection-end-column="56" />
     1047          <folding>
     1048            <element signature="e#0#42#0" expanded="true" />
     1049          </folding>
     1050        </state>
     1051      </provider>
     1052    </entry>
     1053    <entry file="file://$PROJECT_DIR$/trunk/proto1/main.py">
     1054      <provider selected="true" editor-type-id="text-editor">
     1055        <state relative-caret-position="195">
     1056          <caret line="50" column="27" selection-start-line="50" selection-start-column="26" selection-end-line="50" selection-end-column="27" />
     1057          <folding />
     1058        </state>
     1059      </provider>
     1060    </entry>
    10161061    <entry file="file://$PROJECT_DIR$/trunk/proto1/config.py">
    10171062      <provider selected="true" editor-type-id="text-editor">
    1018         <state relative-caret-position="780">
    1019           <caret line="282" column="40" selection-start-line="282" selection-start-column="40" selection-end-line="282" selection-end-column="40" />
     1063        <state relative-caret-position="1859">
     1064          <caret line="325" column="26" selection-start-line="325" selection-start-column="26" selection-end-line="325" selection-end-column="26" />
    10201065          <folding>
    10211066            <element signature="e#19#28#0" expanded="true" />
     
    10241069      </provider>
    10251070    </entry>
    1026     <entry file="file://$PROJECT_DIR$/trunk/proto1/w4pages.py">
    1027       <provider selected="true" editor-type-id="text-editor">
    1028         <state relative-caret-position="351">
    1029           <caret line="50" column="0" selection-start-line="50" selection-start-column="0" selection-end-line="50" selection-end-column="0" />
    1030           <folding>
    1031             <element signature="e#228#270#0" expanded="true" />
    1032           </folding>
    1033         </state>
    1034       </provider>
    1035     </entry>
    1036     <entry file="file://$PROJECT_DIR$/trunk/proto1/welcome.py">
    1037       <provider selected="true" editor-type-id="text-editor">
    1038         <state relative-caret-position="743">
    1039           <caret line="42" column="0" selection-start-line="42" selection-start-column="0" selection-end-line="42" selection-end-column="0" />
    1040           <folding />
    1041         </state>
    1042       </provider>
    1043     </entry>
    1044     <entry file="file://$PROJECT_DIR$/trunk/proto1/final.py">
    1045       <provider selected="true" editor-type-id="text-editor">
    1046         <state relative-caret-position="288">
    1047           <caret line="16" column="65" selection-start-line="16" selection-start-column="65" selection-end-line="16" selection-end-column="65" />
    1048           <folding />
    1049         </state>
    1050       </provider>
    1051     </entry>
    1052     <entry file="file://$PROJECT_DIR$/trunk/proto1/main.py">
    1053       <provider selected="true" editor-type-id="text-editor">
    1054         <state relative-caret-position="828">
    1055           <caret line="71" column="4" selection-start-line="71" selection-start-column="4" selection-end-line="71" selection-end-column="4" />
    1056           <folding />
    1057         </state>
    1058       </provider>
    1059     </entry>
    1060     <entry file="file://$PROJECT_DIR$/trunk/proto1/system.py">
    1061       <provider selected="true" editor-type-id="text-editor">
    1062         <state relative-caret-position="725">
    1063           <caret line="70" column="32" selection-start-line="70" selection-start-column="32" selection-end-line="70" selection-end-column="32" />
    1064           <folding>
    1065             <element signature="e#0#42#0" expanded="true" />
    1066           </folding>
    1067         </state>
    1068       </provider>
    1069     </entry>
    1070     <entry file="file://$PROJECT_DIR$/trunk/proto1/carduser.py">
    1071       <provider selected="true" editor-type-id="text-editor">
    1072         <state relative-caret-position="180">
    1073           <caret line="13" column="60" selection-start-line="13" selection-start-column="60" selection-end-line="13" selection-end-column="60" />
    1074           <folding>
    1075             <element signature="e#0#42#0" expanded="true" />
    1076           </folding>
    1077         </state>
    1078       </provider>
    1079     </entry>
    1080     <entry file="file://$PROJECT_DIR$/trunk/proto1/tmpfile">
    1081       <provider selected="true" editor-type-id="text-editor">
    1082         <state relative-caret-position="0">
    1083           <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
    1084           <folding />
    1085         </state>
    1086       </provider>
    1087     </entry>
    1088     <entry file="file://$PROJECT_DIR$/trunk/proto1/cardHelper.py">
    1089       <provider selected="true" editor-type-id="text-editor">
    1090         <state relative-caret-position="90">
    1091           <caret line="5" column="7" selection-start-line="5" selection-start-column="7" selection-end-line="5" selection-end-column="7" />
    1092           <folding />
    1093         </state>
    1094       </provider>
    1095     </entry>
    10961071  </component>
    10971072</project>
  • internals/2016/linuxloginsmartcardwizard/trunk/proto1/carduser.py

    r16494 r16500  
    1010        self.setObjectName("wizardPage3")
    1111
    12         self.goodCardLabel = QtWidgets.QLabel(self)
    13         self.goodCardLabel.setEnabled(True)
    14         self.goodCardLabel.setGeometry(QtCore.QRect(300, 75, 41, 41))
    15         self.goodCardLabel.setPixmap(QtGui.QPixmap("img/transparent-green-checkmark-hi.png"))
    16         self.goodCardLabel.setScaledContents(True)
    17         self.goodCardLabel.setObjectName("goodCardLabel")
    18 
    1912        self.layoutWidget2 = QtWidgets.QWidget(self)
    20         self.layoutWidget2.setGeometry(QtCore.QRect(40, 20, 311, 111))
     13        self.layoutWidget2.setGeometry(QtCore.QRect(40, 20, 260, 130))
    2114        self.layoutWidget2.setObjectName("layoutWidget2")
    2215        self.cardVLayout = QtWidgets.QVBoxLayout(self.layoutWidget2)
     
    3225        self.cardVLayout.addWidget(self.cardErrorLabel)
    3326
     27        self.goodCardLabel = QtWidgets.QLabel(self)
     28        self.goodCardLabel.setEnabled(True)
     29        self.goodCardLabel.setGeometry(QtCore.QRect(315, 85, 45, 45))
     30        self.goodCardLabel.setPixmap(QtGui.QPixmap("img/green-checkmark.png"))
     31        self.goodCardLabel.setScaledContents(True)
     32        self.goodCardLabel.setObjectName("goodCardLabel")
     33
    3434        self.layoutWidget3 = QtWidgets.QWidget(self)
    35         self.layoutWidget3.setGeometry(QtCore.QRect(40, 170, 241, 71))
     35        self.layoutWidget3.setGeometry(QtCore.QRect(40, 170, 230, 80))
    3636        self.layoutWidget3.setObjectName("layoutWidget3")
    3737        self.userVLayout = QtWidgets.QVBoxLayout(self.layoutWidget3)
     
    4949        self.goodUserLabel = QtWidgets.QLabel(self)
    5050        self.goodUserLabel.setEnabled(True)
    51         self.goodUserLabel.setGeometry(QtCore.QRect(300, 195, 41, 41))
    52         self.goodUserLabel.setPixmap(QtGui.QPixmap("img/transparent-green-checkmark-hi.png"))
     51        self.goodUserLabel.setGeometry(QtCore.QRect(315, 195, 45, 45))
     52        self.goodUserLabel.setPixmap(QtGui.QPixmap("img/green-checkmark.png"))
    5353        self.goodUserLabel.setScaledContents(True)
    5454        self.goodUserLabel.setObjectName("goodUserLabel")
     
    6363
    6464        self.helpMessage = "This is the third screen of the wizard.\n\n" \
    65                            "The wizard needs you to select a username from the list \n " \
     65                           "The wizard needs you to select a username from the list \n" \
    6666                           "and to insert the smartcard in the reader in order to \n" \
    6767                           "finish the configuration process.\n\n" \
    68                            "Please make sure the smartcard reader is plugged and that \n" \
    69                            "the smartcard is a Portuguese Citizen Card.\n"
     68                           "Please make sure the smartcard reader is connected to the \n" \
     69                           "computer and that the smartcard is a Portuguese Citizen Card.\n"
    7070
    7171        self.cardSubjectInfo = ""
    7272
    7373        self.timer = QtCore.QTimer()
     74
     75        self.registerField("username", self.userListBox, "currentText")
    7476
    7577    def checkCurrentBoxOption(self):
     
    9799        if cardHelper.hasReaderConnected():
    98100            self.cardErrorLabel.setText("Smartcard reader is connected.")
    99             self.cardErrorLabel.repaint()
    100101            if cardHelper.hasCardInserted():
    101102                self.cardErrorLabel.setText(self.cardErrorLabel.text() +
     
    105106                self.cardErrorLabel.setText(self.cardErrorLabel.text() +
    106107                                            "\n\nSmartcard reading finished.")
    107                 self.cardErrorLabel.repaint()
    108108                if self.hasCardSubjectInfo():
    109109                    self.checkCardSubjectInfo()
     
    113113            else:
    114114                self.cardErrorLabel.setText(self.cardErrorLabel.text() +
    115                                             "\n\nNo smartcard detected. Please insert it in the reader.")
     115                                            "\n\nNo smartcard detected.\n\nPlease insert it in the reader.")
    116116                self.timer.singleShot(1000, self.buildCardSubjectInfo)
    117117        else:
  • internals/2016/linuxloginsmartcardwizard/trunk/proto1/final.py

    r16483 r16500  
    77        self.setObjectName("wizardPage4")
    88        self.layoutWidget4 = QtWidgets.QWidget(self)
    9         self.layoutWidget4.setGeometry(QtCore.QRect(20, 30, 491, 211))
     9        self.layoutWidget4.setGeometry(QtCore.QRect(40, 40, 450, 100))
    1010        self.layoutWidget4.setObjectName("layoutWidget4")
    1111        self.finalVLayout = QtWidgets.QVBoxLayout(self.layoutWidget4)
     
    1616        self.finalVLayout.addWidget(self.resultTextLabel)
    1717        self.finalTextLabel = QtWidgets.QLabel(self.layoutWidget4)
    18         self.finalTextLabel.setLineWidth(2)
    19         self.finalTextLabel.setScaledContents(False)
    20         self.finalTextLabel.setWordWrap(True)
    2118        self.finalTextLabel.setObjectName("finalTextLabel")
    2219        self.finalVLayout.addWidget(self.finalTextLabel)
     
    2421        self.setTitle("Add User Login")
    2522        self.setSubTitle("Conclusion")
    26         self.resultTextLabel.setText("Added login configuration for username X with smartcard Y.")
    2723        self.finalTextLabel.setText("Application finished.")
    2824
     
    3430    def initializePage(self):
    3531        print("Run final scripts...")
     32        self.resultTextLabel.setText("Added smartcard login configuration for user %s." % self.field("username"))
  • internals/2016/linuxloginsmartcardwizard/trunk/proto1/system.py

    r16494 r16500  
    88        self.setAutoFillBackground(False)
    99        self.setObjectName("wizardPage2")
     10
    1011        self.goodSystemLabel = QtWidgets.QLabel(self)
    11         self.goodSystemLabel.setGeometry(QtCore.QRect(380, 130, 51, 51))
    12         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
    13         sizePolicy.setHorizontalStretch(0)
    14         sizePolicy.setVerticalStretch(0)
    15         sizePolicy.setHeightForWidth(self.goodSystemLabel.sizePolicy().hasHeightForWidth())
    16         self.goodSystemLabel.setSizePolicy(sizePolicy)
    17         self.goodSystemLabel.setMinimumSize(QtCore.QSize(10, 10))
    18         self.goodSystemLabel.setBaseSize(QtCore.QSize(10, 10))
    19         self.goodSystemLabel.setText("")
    20         self.goodSystemLabel.setPixmap(QtGui.QPixmap("img/transparent-green-checkmark-hi.png"))
     12        self.goodSystemLabel.setEnabled(True)
     13        self.goodSystemLabel.setGeometry(QtCore.QRect(350, 125, 45, 45))
     14        self.goodSystemLabel.setPixmap(QtGui.QPixmap("img/green-checkmark.png"))
    2115        self.goodSystemLabel.setScaledContents(True)
    2216        self.goodSystemLabel.setObjectName("goodSystemLabel")
    23         self.goodSystemLabel.setEnabled(False)
    2417        self.goodSystemLabel.hide()
    2518       
    2619        self.layoutWidget1 = QtWidgets.QWidget(self)
    27         self.layoutWidget1.setGeometry(QtCore.QRect(30, 70, 351, 171))
     20        self.layoutWidget1.setGeometry(QtCore.QRect(40, 40, 300, 200))
    2821        self.layoutWidget1.setObjectName("layoutWidget1")
    2922        self.systemVLayout = QtWidgets.QVBoxLayout(self.layoutWidget1)
    3023        self.systemVLayout.setContentsMargins(0, 0, 0, 0)
    3124        self.systemVLayout.setObjectName("systemVLayout")
     25
    3226        self.systemTextLabel = QtWidgets.QLabel(self.layoutWidget1)
    33         self.systemTextLabel.setLineWidth(0)
    34         self.systemTextLabel.setMidLineWidth(0)
    3527        self.systemTextLabel.setContentsMargins(0, 0, 0, 0)
    3628        self.systemTextLabel.setObjectName("systemTextLabel")
    3729        self.systemVLayout.addWidget(self.systemTextLabel)
     30
    3831        self.systemErrorLabel = QtWidgets.QLabel(self.layoutWidget1)
    39         self.systemErrorLabel.setIndent(20)
     32        self.systemErrorLabel.setContentsMargins(0, 0, 0, 0)
     33        self.systemErrorLabel.setIndent(30)
    4034        self.systemErrorLabel.setObjectName("systemErrorLabel")
    4135        self.systemVLayout.addWidget(self.systemErrorLabel)
    4236
    4337        self.setTitle("Add User Login")
    44         self.setSubTitle("Verification system packages")
     38        self.setSubTitle("Check system packages")
    4539        self.systemTextLabel.setText("Checking system for necessary packages...")
    46         self.systemErrorLabel.setText("(system error messages or sucess)")
     40        self.systemErrorLabel.setText("")
    4741
    4842        self.timer = QtCore.QTimer()
     
    5448                           "the instructions in the user manual.\n"
    5549
    56     def checkSystem(self):
    57         return self.goodSystemLabel.isEnabled()
    58 
    5950    def config(self):
    6051        print("Start config")
    61         main.configurePamPkcs11()
    62         self.goodSystemLabel.setEnabled(True)
    63         self.goodSystemLabel.show()
    64         self.completeChanged.emit()
     52        if main.checkPackages() and main.checkDirectories():
     53            self.systemErrorLabel.setText("Installed necessary packages.\n\n"
     54                                          "Created configuration directories.\n\n")
     55            self.systemErrorLabel.repaint()
     56            if main.copyCertificates():
     57                self.systemErrorLabel.setText(self.systemErrorLabel.text() +
     58                                              "Obtained smartcard certificates.\n\n")
     59                self.repaint()
     60                if main.setupConfigurationFiles():
     61                    self.systemErrorLabel.setText(self.systemErrorLabel.text() +
     62                                                  "Finished setup of configuration files.\n\n")
     63                    self.repaint()
     64                    self.goodSystemLabel.show()
     65                    self.completeChanged.emit()
     66                else:
     67                    self.systemErrorLabel.setText(self.systemErrorLabel.text() +
     68                                                  "Failed to setup configuration files.\n\n")
     69            else:
     70                self.systemErrorLabel.setText(self.systemErrorLabel.text() +
     71                                              "Failed to obtain smartcard certificates.\n\n")
     72        else:
     73            self.systemErrorLabel.setText("Failed to install necessary packages.\n\n"
     74                                          "Failed to create configuration directories.\n\n"
     75                                          "Please use the manual to check if you have admin permissions.\n\n")
    6576
    6677    def isComplete(self):
    67         return self.checkSystem()
     78        return not self.goodSystemLabel.isHidden()
    6879
    6980    def initializePage(self):
  • internals/2016/linuxloginsmartcardwizard/trunk/proto1/w4pages.py

    r16483 r16500  
    1 # -*- coding: utf-8 -*-
    2 
    3 # Form implementation generated from reading ui file 'w4pages.ui'
    4 #
    5 # Created: Mon Aug  1 12:35:14 2016
    6 #      by: PyQt5 UI code generator 5.2.1
    7 #
    8 # WARNING! All changes made in this file will be lost!
    9 
    101from PyQt5 import QtCore, QtGui, QtWidgets
    112import welcome
     
    1910        super(MyWizard, self).__init__()
    2011        self.setObjectName("Wizard")
    21         self.resize(577, 452)
     12        self.resize(600, 450)
    2213        self.setCursor(QtGui.QCursor(QtCore.Qt.ArrowCursor))
    2314        self.setContextMenuPolicy(QtCore.Qt.DefaultContextMenu)
     
    2516        self.setSizeGripEnabled(False)
    2617        self.setModal(True)
     18        self.customFont = QtGui.QFont()
     19        self.customFont.setPointSize(10.5)
     20        self.setFont(self.customFont)
    2721        self.setWizardStyle(QtWidgets.QWizard.ModernStyle)
    28         self.setOptions(QtWidgets.QWizard.HaveHelpButton|QtWidgets.QWizard.NoBackButtonOnLastPage|QtWidgets.QWizard.NoBackButtonOnStartPage|QtWidgets.QWizard.NoCancelButton|QtWidgets.QWizard.IndependentPages)
     22        self.setOptions(QtWidgets.QWizard.HaveHelpButton |
     23                        QtWidgets.QWizard.NoBackButtonOnLastPage |
     24                        QtWidgets.QWizard.NoBackButtonOnStartPage |
     25                        QtWidgets.QWizard.NoCancelButton |
     26                        QtWidgets.QWizard.IndependentPages)
    2927        self.setTitleFormat(QtCore.Qt.AutoText)
    3028        self.setWindowTitle("SmartCard Login")
     
    3533        self.wizardPage2 = system.SystemPage()
    3634        self.addPage(self.wizardPage2)
    37        
     35
    3836        self.wizardPage3 = carduser.CardUserPage()
    3937        self.addPage(self.wizardPage3)
     
    4442        self.helpMessageBox = QtWidgets.QMessageBox()
    4543        self.helpRequested.connect(self.showHelp)
    46         QtCore.QMetaObject.connectSlotsByName(self)
    4744
    4845    def showHelp(self):
  • internals/2016/linuxloginsmartcardwizard/trunk/proto1/welcome.py

    r16483 r16500  
    77        self.setObjectName("wizardPage1")
    88        self.layoutWidget = QtWidgets.QWidget(self)
    9         self.layoutWidget.setGeometry(QtCore.QRect(30, 30, 501, 271))
     9        self.layoutWidget.setGeometry(QtCore.QRect(40, 40, 400, 130))
    1010        self.layoutWidget.setObjectName("layoutWidget")
    1111        self.welcomeVLayout = QtWidgets.QVBoxLayout(self.layoutWidget)
    1212        self.welcomeVLayout.setContentsMargins(0, 0, 0, 0)
    1313        self.welcomeVLayout.setObjectName("welcomeVLayout")
     14
    1415        self.welcomeTextLabel1 = QtWidgets.QLabel(self.layoutWidget)
    15         self.welcomeTextLabel1.setFrameShape(QtWidgets.QFrame.NoFrame)
    16         self.welcomeTextLabel1.setLineWidth(0)
    17         self.welcomeTextLabel1.setTextFormat(QtCore.Qt.AutoText)
    18         self.welcomeTextLabel1.setScaledContents(False)
    19         self.welcomeTextLabel1.setWordWrap(True)
    2016        self.welcomeTextLabel1.setContentsMargins(0, 0, 0, 0)
    21         self.welcomeTextLabel1.setTextInteractionFlags(QtCore.Qt.LinksAccessibleByMouse)
    2217        self.welcomeTextLabel1.setObjectName("welcomeTextLabel1")
    2318        self.welcomeVLayout.addWidget(self.welcomeTextLabel1)
    24         self.welcomeTextLabel2 = QtWidgets.QLabel(self.layoutWidget)
    25         self.welcomeTextLabel2.setObjectName("welcomeTextLabel2")
    26         self.welcomeVLayout.addWidget(self.welcomeTextLabel2)
    27         self.welcomeTextLabel3 = QtWidgets.QLabel(self.layoutWidget)
    28         self.welcomeTextLabel3.setObjectName("welcomeTextLabel3")
    29         self.welcomeVLayout.addWidget(self.welcomeTextLabel3)
    3019
    3120        self.setTitle("Add User Login")
    3221        self.setSubTitle("Introduction to the wizard")
    33         self.welcomeTextLabel1.setText("This is the Welcome Screen for the application.")
    34         self.welcomeTextLabel2.setText("Press Next to go to the next step.")
    35         self.welcomeTextLabel3.setText("Press Cancel to close the application.")
     22        self.welcomeTextLabel1.setText("This is the Welcome Screen for the application.\n\n\n"
     23                                       "Press Next to go to the next step.\n\n\n"
     24                                       "Press Cancel to close the application.")
    3625
    3726        self.helpMessage = "This is the welcome screen of the wizard.\n\n" \
Note: See TracChangeset for help on using the changeset viewer.