Changeset 16483


Ignore:
Timestamp:
Aug 4, 2016, 3:50:28 PM (3 years ago)
Author:
dcorreia
Message:

Fixed page initialization and help messageBox calls.
Added input validation to carduser when next is clicked.

Location:
internals/2016/linuxloginsmartcardwizard
Files:
1 deleted
8 edited

Legend:

Unmodified
Added
Removed
  • internals/2016/linuxloginsmartcardwizard/.idea/dictionaries/danielcorreia.xml

    r16468 r16483  
    66      <w>cacerts</w>
    77      <w>cartaode</w>
     8      <w>certdata</w>
    89      <w>checkmark</w>
    910      <w>cidadao</w>
    1011      <w>crls</w>
     12      <w>defs</w>
     13      <w>eidlib</w>
    1114      <w>estado</w>
     15      <w>firstname</w>
    1216      <w>gunzip</w>
     17      <w>localusers</w>
     18      <w>noout</w>
    1319      <w>novo</w>
    1420      <w>pteid</w>
  • internals/2016/linuxloginsmartcardwizard/.idea/workspace.xml

    r16479 r16483  
    33  <component name="ChangeListManager">
    44    <list default="true" readonly="true" id="fbd8e757-714d-41c6-a2b9-8558c09dbd04" name="Default" comment="">
     5      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/trunk/proto1/cardHelper.py" />
     6      <change type="DELETED" beforePath="$PROJECT_DIR$/trunk/proto1/simple_example.py" afterPath="" />
     7      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/dictionaries/danielcorreia.xml" afterPath="$PROJECT_DIR$/.idea/dictionaries/danielcorreia.xml" />
    58      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
    69      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/trunk/proto1/carduser.py" afterPath="$PROJECT_DIR$/trunk/proto1/carduser.py" />
    710      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/trunk/proto1/config.py" afterPath="$PROJECT_DIR$/trunk/proto1/config.py" />
     11      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/trunk/proto1/eidlibPython_Wrapper/examples/simple_example.py" afterPath="$PROJECT_DIR$/trunk/proto1/eidlibPython_Wrapper/examples/simple_example.py" />
    812      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/trunk/proto1/final.py" afterPath="$PROJECT_DIR$/trunk/proto1/final.py" />
    913      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/trunk/proto1/system.py" afterPath="$PROJECT_DIR$/trunk/proto1/system.py" />
     
    2933  <component name="FileEditorManager">
    3034    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
     35      <file leaf-file-name="cardHelper.py" pinned="false" current-in-tab="true">
     36        <entry file="file://$PROJECT_DIR$/trunk/proto1/cardHelper.py">
     37          <provider selected="true" editor-type-id="text-editor">
     38            <state relative-caret-position="360">
     39              <caret line="59" column="33" selection-start-line="59" selection-start-column="33" selection-end-line="59" selection-end-column="33" />
     40              <folding />
     41            </state>
     42          </provider>
     43        </entry>
     44      </file>
    3145      <file leaf-file-name="w4pages.py" pinned="false" current-in-tab="false">
    3246        <entry file="file://$PROJECT_DIR$/trunk/proto1/w4pages.py">
    3347          <provider selected="true" editor-type-id="text-editor">
    34             <state relative-caret-position="373">
    35               <caret line="60" column="0" selection-start-line="60" selection-start-column="0" selection-end-line="60" selection-end-column="0" />
     48            <state relative-caret-position="369">
     49              <caret line="50" column="0" selection-start-line="50" selection-start-column="0" selection-end-line="50" selection-end-column="0" />
    3650              <folding>
    3751                <element signature="e#228#270#0" expanded="true" />
     
    4458        <entry file="file://$PROJECT_DIR$/trunk/proto1/welcome.py">
    4559          <provider selected="true" editor-type-id="text-editor">
    46             <state relative-caret-position="450">
    47               <caret line="37" column="17" selection-start-line="37" selection-start-column="17" selection-end-line="37" selection-end-column="17" />
     60            <state relative-caret-position="509">
     61              <caret line="42" column="0" selection-start-line="42" selection-start-column="0" selection-end-line="42" selection-end-column="0" />
    4862              <folding />
    4963            </state>
     
    5165        </entry>
    5266      </file>
    53       <file leaf-file-name="system.py" pinned="false" current-in-tab="true">
     67      <file leaf-file-name="system.py" pinned="false" current-in-tab="false">
    5468        <entry file="file://$PROJECT_DIR$/trunk/proto1/system.py">
    5569          <provider selected="true" editor-type-id="text-editor">
    56             <state relative-caret-position="301">
    57               <caret line="54" column="25" selection-start-line="54" selection-start-column="25" selection-end-line="54" selection-end-column="25" />
     70            <state relative-caret-position="473">
     71              <caret line="75" column="29" selection-start-line="75" selection-start-column="29" selection-end-line="75" selection-end-column="29" />
    5872              <folding>
    5973                <element signature="e#0#42#0" expanded="true" />
     
    6680        <entry file="file://$PROJECT_DIR$/trunk/proto1/carduser.py">
    6781          <provider selected="true" editor-type-id="text-editor">
    68             <state relative-caret-position="1944">
    69               <caret line="109" column="67" selection-start-line="109" selection-start-column="67" selection-end-line="109" selection-end-column="67" />
     82            <state relative-caret-position="192">
     83              <caret line="54" column="57" selection-start-line="54" selection-start-column="57" selection-end-line="54" selection-end-column="57" />
    7084              <folding>
    7185                <element signature="e#0#42#0" expanded="true" />
     
    7892        <entry file="file://$PROJECT_DIR$/trunk/proto1/final.py">
    7993          <provider selected="true" editor-type-id="text-editor">
    80             <state relative-caret-position="648">
    81               <caret line="36" column="58" selection-start-line="36" selection-start-column="58" selection-end-line="36" selection-end-column="58" />
     94            <state relative-caret-position="522">
     95              <caret line="29" column="57" selection-start-line="29" selection-start-column="57" selection-end-line="29" selection-end-column="57" />
    8296              <folding />
    8397            </state>
     
    129143        <option value="$PROJECT_DIR$/trunk/proto1/gui/system.py" />
    130144        <option value="$PROJECT_DIR$/trunk/proto1/main.py" />
     145        <option value="$PROJECT_DIR$/trunk/proto1/eidlibPython_Wrapper/examples/simple_example.py" />
     146        <option value="$PROJECT_DIR$/trunk/proto1/cardHelper.py" />
    131147        <option value="$PROJECT_DIR$/trunk/proto1/config.py" />
     148        <option value="$PROJECT_DIR$/trunk/proto1/w4pages.py" />
     149        <option value="$PROJECT_DIR$/trunk/proto1/welcome.py" />
     150        <option value="$PROJECT_DIR$/trunk/proto1/system.py" />
     151        <option value="$PROJECT_DIR$/trunk/proto1/final.py" />
    132152        <option value="$PROJECT_DIR$/trunk/proto1/carduser.py" />
    133         <option value="$PROJECT_DIR$/trunk/proto1/final.py" />
    134         <option value="$PROJECT_DIR$/trunk/proto1/welcome.py" />
    135         <option value="$PROJECT_DIR$/trunk/proto1/w4pages.py" />
    136         <option value="$PROJECT_DIR$/trunk/proto1/system.py" />
    137153      </list>
    138154    </option>
     
    192208    <panes>
    193209      <pane id="Scope" />
     210      <pane id="Scratches" />
    194211      <pane id="ProjectPane">
    195         <subPane />
     212        <subPane>
     213          <PATH>
     214            <PATH_ELEMENT>
     215              <option name="myItemId" value="estagiopycharm" />
     216              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
     217            </PATH_ELEMENT>
     218          </PATH>
     219          <PATH>
     220            <PATH_ELEMENT>
     221              <option name="myItemId" value="estagiopycharm" />
     222              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
     223            </PATH_ELEMENT>
     224            <PATH_ELEMENT>
     225              <option name="myItemId" value="estagiopycharm" />
     226              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
     227            </PATH_ELEMENT>
     228            <PATH_ELEMENT>
     229              <option name="myItemId" value="trunk" />
     230              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
     231            </PATH_ELEMENT>
     232          </PATH>
     233          <PATH>
     234            <PATH_ELEMENT>
     235              <option name="myItemId" value="estagiopycharm" />
     236              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
     237            </PATH_ELEMENT>
     238            <PATH_ELEMENT>
     239              <option name="myItemId" value="estagiopycharm" />
     240              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
     241            </PATH_ELEMENT>
     242            <PATH_ELEMENT>
     243              <option name="myItemId" value="trunk" />
     244              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
     245            </PATH_ELEMENT>
     246            <PATH_ELEMENT>
     247              <option name="myItemId" value="proto1" />
     248              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
     249            </PATH_ELEMENT>
     250          </PATH>
     251          <PATH>
     252            <PATH_ELEMENT>
     253              <option name="myItemId" value="estagiopycharm" />
     254              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
     255            </PATH_ELEMENT>
     256            <PATH_ELEMENT>
     257              <option name="myItemId" value="estagiopycharm" />
     258              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
     259            </PATH_ELEMENT>
     260          </PATH>
     261        </subPane>
    196262      </pane>
    197       <pane id="Scratches" />
    198263    </panes>
    199264  </component>
     
    633698      <updated>1470237060173</updated>
    634699    </task>
    635     <option name="localTasksCounter" value="23" />
     700    <task id="LOCAL-00023" summary="Added help message dialogs and function execution after showing the page.">
     701      <created>1470237196802</created>
     702      <option name="number" value="00023" />
     703      <option name="presentableId" value="LOCAL-00023" />
     704      <option name="project" value="LOCAL" />
     705      <updated>1470237196802</updated>
     706    </task>
     707    <option name="localTasksCounter" value="24" />
    636708    <servers />
    637709  </component>
     
    649721    <editor active="false" />
    650722    <layout>
    651       <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" />
     723      <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" />
    652724      <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" />
    653725      <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" />
    654       <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.5857805" sideWeight="0.49323785" order="12" side_tool="false" content_ui="tabs" />
     726      <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" />
     727      <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" />
    655728      <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" />
    656729      <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" />
    657       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.21020092" sideWeight="0.4953125" order="10" side_tool="false" content_ui="tabs" />
     730      <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" />
    658731      <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" />
    659732      <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" />
     
    665738      <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" />
    666739      <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" />
    667       <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" />
    668740      <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" />
    669741      <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" />
     
    729801    <MESSAGE value="Added function to get list of local users to be used in GUI combobox." />
    730802    <MESSAGE value="Updated middleware Python wrapper files" />
    731     <option name="LAST_COMMIT_MESSAGE" value="Updated middleware Python wrapper files" />
     803    <MESSAGE value="Added help message dialogs and function execution after showing the page." />
     804    <option name="LAST_COMMIT_MESSAGE" value="Added help message dialogs and function execution after showing the page." />
    732805  </component>
    733806  <component name="XDebuggerManager">
     
    738811  </component>
    739812  <component name="editorHistoryManager">
    740     <entry file="file://$PROJECT_DIR$/trunk/dir1/testfile" />
    741     <entry file="file://$PROJECT_DIR$/trunk/dir1/testfile" />
    742     <entry file="file://$PROJECT_DIR$/trunk/dir1/jsonfile" />
    743     <entry file="file://$PROJECT_DIR$/trunk/dir1/testfile" />
    744     <entry file="file://$PROJECT_DIR$/trunk/sudotxt" />
    745     <entry file="file://$PROJECT_DIR$/trunk/sudotxt1" />
    746813    <entry file="file://$PROJECT_DIR$/trunk/sudotests.py" />
    747814    <entry file="file://$PROJECT_DIR$/trunk/project1/expfile.txt" />
     
    908975      </provider>
    909976    </entry>
     977    <entry file="file://$USER_HOME$/.PyCharm2016.2/system/python_stubs/-1247971765/PyQt5/QtWidgets/QWizardPage.py">
     978      <provider selected="true" editor-type-id="text-editor">
     979        <state relative-caret-position="376">
     980          <caret line="98" column="8" selection-start-line="98" selection-start-column="8" selection-end-line="98" selection-end-column="20" />
     981          <folding />
     982        </state>
     983      </provider>
     984    </entry>
     985    <entry file="file://$PROJECT_DIR$/trunk/proto1/simple_example.py">
     986      <provider selected="true" editor-type-id="text-editor">
     987        <state relative-caret-position="-594">
     988          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
     989          <folding />
     990        </state>
     991      </provider>
     992    </entry>
     993    <entry file="file://$PROJECT_DIR$/trunk/proto1/eidlibPython_Wrapper/GeneratedModule/pteid.py">
     994      <provider selected="true" editor-type-id="text-editor">
     995        <state relative-caret-position="360">
     996          <caret line="667" column="24" selection-start-line="667" selection-start-column="24" selection-end-line="667" selection-end-column="24" />
     997          <folding />
     998        </state>
     999      </provider>
     1000    </entry>
     1001    <entry file="file://$PROJECT_DIR$/trunk/proto1/eidlibPython_Wrapper/examples/simple_example.py">
     1002      <provider selected="true" editor-type-id="text-editor">
     1003        <state relative-caret-position="252">
     1004          <caret line="53" column="82" selection-start-line="53" selection-start-column="82" selection-end-line="53" selection-end-column="82" />
     1005          <folding />
     1006        </state>
     1007      </provider>
     1008    </entry>
    9101009    <entry file="file://$PROJECT_DIR$/trunk/proto1/main.py">
    9111010      <provider selected="true" editor-type-id="text-editor">
    912         <state relative-caret-position="229">
     1011        <state relative-caret-position="607">
    9131012          <caret line="79" column="32" selection-start-line="79" selection-start-column="32" selection-end-line="79" selection-end-column="32" />
    914         </state>
    915       </provider>
    916     </entry>
    917     <entry file="file://$PROJECT_DIR$/trunk/proto1/config.py">
    918       <provider selected="true" editor-type-id="text-editor">
    919         <state relative-caret-position="377">
    920           <caret line="329" column="0" selection-start-line="329" selection-start-column="0" selection-end-line="329" selection-end-column="0" />
     1013          <folding />
     1014        </state>
     1015      </provider>
     1016    </entry>
     1017    <entry file="file://$USER_HOME$/.PyCharm2016.2/system/python_stubs/-1247971765/PyQt5/QtWidgets/QWidget.py">
     1018      <provider selected="true" editor-type-id="text-editor">
     1019        <state relative-caret-position="313">
     1020          <caret line="369" column="20" selection-start-line="369" selection-start-column="15" selection-end-line="369" selection-end-column="20" />
     1021          <folding />
     1022        </state>
     1023      </provider>
     1024    </entry>
     1025    <entry file="file://$PROJECT_DIR$/trunk/proto1/w4pages.py">
     1026      <provider selected="true" editor-type-id="text-editor">
     1027        <state relative-caret-position="369">
     1028          <caret line="50" column="0" selection-start-line="50" selection-start-column="0" selection-end-line="50" selection-end-column="0" />
    9211029          <folding>
    922             <element signature="e#19#28#0" expanded="false" />
     1030            <element signature="e#228#270#0" expanded="true" />
    9231031          </folding>
    9241032        </state>
    9251033      </provider>
    9261034    </entry>
    927     <entry file="file://$PROJECT_DIR$/trunk/proto1/carduser.py">
    928       <provider selected="true" editor-type-id="text-editor">
    929         <state relative-caret-position="1944">
    930           <caret line="109" column="67" selection-start-line="109" selection-start-column="67" selection-end-line="109" selection-end-column="67" />
     1035    <entry file="file://$PROJECT_DIR$/trunk/proto1/welcome.py">
     1036      <provider selected="true" editor-type-id="text-editor">
     1037        <state relative-caret-position="509">
     1038          <caret line="42" column="0" selection-start-line="42" selection-start-column="0" selection-end-line="42" selection-end-column="0" />
     1039          <folding />
     1040        </state>
     1041      </provider>
     1042    </entry>
     1043    <entry file="file://$PROJECT_DIR$/trunk/proto1/system.py">
     1044      <provider selected="true" editor-type-id="text-editor">
     1045        <state relative-caret-position="473">
     1046          <caret line="75" column="29" selection-start-line="75" selection-start-column="29" selection-end-line="75" selection-end-column="29" />
    9311047          <folding>
    9321048            <element signature="e#0#42#0" expanded="true" />
     
    9351051      </provider>
    9361052    </entry>
    937     <entry file="file://$PROJECT_DIR$/trunk/proto1/final.py">
    938       <provider selected="true" editor-type-id="text-editor">
    939         <state relative-caret-position="648">
    940           <caret line="36" column="58" selection-start-line="36" selection-start-column="58" selection-end-line="36" selection-end-column="58" />
    941           <folding />
    942         </state>
    943       </provider>
    944     </entry>
    945     <entry file="file://$PROJECT_DIR$/trunk/proto1/w4pages.py">
    946       <provider selected="true" editor-type-id="text-editor">
    947         <state relative-caret-position="373">
    948           <caret line="60" column="0" selection-start-line="60" selection-start-column="0" selection-end-line="60" selection-end-column="0" />
     1053    <entry file="file://$PROJECT_DIR$/trunk/proto1/config.py">
     1054      <provider selected="true" editor-type-id="text-editor">
     1055        <state relative-caret-position="-2790">
     1056          <caret line="7" column="0" selection-start-line="7" selection-start-column="0" selection-end-line="7" selection-end-column="0" />
    9491057          <folding>
    950             <element signature="e#228#270#0" expanded="true" />
     1058            <element signature="e#19#28#0" expanded="true" />
    9511059          </folding>
    9521060        </state>
    9531061      </provider>
    9541062    </entry>
    955     <entry file="file://$PROJECT_DIR$/trunk/proto1/welcome.py">
    956       <provider selected="true" editor-type-id="text-editor">
    957         <state relative-caret-position="450">
    958           <caret line="37" column="17" selection-start-line="37" selection-start-column="17" selection-end-line="37" selection-end-column="17" />
    959           <folding />
    960         </state>
    961       </provider>
    962     </entry>
    963     <entry file="file://$PROJECT_DIR$/trunk/proto1/system.py">
    964       <provider selected="true" editor-type-id="text-editor">
    965         <state relative-caret-position="301">
    966           <caret line="54" column="25" selection-start-line="54" selection-start-column="25" selection-end-line="54" selection-end-column="25" />
     1063    <entry file="file://$PROJECT_DIR$/trunk/proto1/carduser.py">
     1064      <provider selected="true" editor-type-id="text-editor">
     1065        <state relative-caret-position="192">
     1066          <caret line="54" column="57" selection-start-line="54" selection-start-column="57" selection-end-line="54" selection-end-column="57" />
    9671067          <folding>
    9681068            <element signature="e#0#42#0" expanded="true" />
     
    9711071      </provider>
    9721072    </entry>
     1073    <entry file="file://$PROJECT_DIR$/trunk/proto1/final.py">
     1074      <provider selected="true" editor-type-id="text-editor">
     1075        <state relative-caret-position="522">
     1076          <caret line="29" column="57" selection-start-line="29" selection-start-column="57" selection-end-line="29" selection-end-column="57" />
     1077          <folding />
     1078        </state>
     1079      </provider>
     1080    </entry>
     1081    <entry file="file://$PROJECT_DIR$/trunk/proto1/cardHelper.py">
     1082      <provider selected="true" editor-type-id="text-editor">
     1083        <state relative-caret-position="360">
     1084          <caret line="59" column="33" selection-start-line="59" selection-start-column="33" selection-end-line="59" selection-end-column="33" />
     1085          <folding />
     1086        </state>
     1087      </provider>
     1088    </entry>
    9731089  </component>
    9741090</project>
  • internals/2016/linuxloginsmartcardwizard/trunk/proto1/carduser.py

    r16479 r16483  
    5454        self.goodCardLabel.setScaledContents(True)
    5555        self.goodCardLabel.setObjectName("goodCardLabel")
     56
    5657        self.layoutWidget3 = QtWidgets.QWidget(self)
    5758        self.layoutWidget3.setGeometry(QtCore.QRect(30, 20, 311, 131))
     
    7475        self.cardErrorLabel.setText("(smartcard debug message)")
    7576
    76         self.fillUserListBox()
    77         self.userListBox.currentIndexChanged.connect(self.boxCheck)
     77        self.userListBox.currentIndexChanged.connect(self.checkCurrentBoxOption)
     78
     79        self.helpMessage = "This is the third screen of the wizard.\n\n" \
     80                           "The wizard needs you to select a username from the list \n " \
     81                           "and to insert the smartcard in the reader in order to \n" \
     82                           "finish the configuration process.\n\n" \
     83                           "Please make sure the smartcard reader is plugged and that \n" \
     84                           "the smartcard is a Portuguese Citizen Card.\n"
     85
     86    def checkCurrentBoxOption(self):
     87        self.completeChanged.emit()
     88        print("Current option -> ", self.getCurrentBoxOption())
     89        if self.getCurrentBoxOption() != "List of usernames":
     90            self.goodUserLabel.show()
     91        else:
     92            self.goodUserLabel.hide()
     93
     94    def getCurrentBoxOption(self):
     95        return self.userListBox.currentText()
     96
     97    def isComplete(self):
     98        return not self.goodUserLabel.isHidden() and not self.goodCardLabel.isHidden()
    7899
    79100    def fillUserListBox(self):
     
    84105                    self.userListBox.addItem(user)
    85106
    86     def boxCheck(self):
    87         selected = self.userListBox.currentText()
    88         self.completeChanged.emit()
    89         print("Current option -> ", selected)
    90         if self.checkSelectedBox():
    91             self.goodUserLabel.show()
    92         else:
    93             self.goodUserLabel.hide()
     107    def initializePage(self):
     108        print("Run card+user scripts...")
     109        self.fillUserListBox()
    94110
    95     def checkSelectedBox(self):
    96         return self.userListBox.currentText() != "List of usernames"
    97 
    98     def isComplete(self):
    99         return self.checkSelectedBox()
    100 
    101     def runInitScripts(self):
    102         print("Run card+user scripts...")
    103 
    104     def buildHelpMessage(self):
    105         retMessage = "This is the third screen of the wizard.\n\n" \
    106                      "The wizard needs you to select a username from the list \n " \
    107                      "and to insert the smartcard in the reader in order to \n" \
    108                      "finish the configuration process.\n\n" \
    109                      "Please make sure the smartcard reader is plugged and that \n" \
    110                      "the smartcard is a Portuguese Citizen Card.\n"
    111         return retMessage
    112 
    113     def showHelpMessage(self):
    114         message = self.buildHelpMessage()
    115         QtWidgets.QMessageBox.information(self, "Welcome Page Help", message)
     111    def validatePage(self):
     112        print(self.getCurrentBoxOption())
     113        return True
  • internals/2016/linuxloginsmartcardwizard/trunk/proto1/eidlibPython_Wrapper/examples/simple_example.py

    r16478 r16483  
    5151      card = ctx_with_card.getEIDCard()
    5252      for i in range(card.getCertificates().countFromCard()):
    53         import OpenSSL
    54         der = card.getCertificates().getCertFromCard(i).getCertData().GetBytes()
    55         return der
     53        # import OpenSSL
     54        der = card.getCertificates().getCertFromCard(i).getCertData().writeToFile("derfile"+str(i))
    5655        """x509 = OpenSSL.crypto.load_certificate(OpenSSL.crypto.FILETYPE_ASN1, der)
    5756        #print(x509.get_subject().get_components())
  • internals/2016/linuxloginsmartcardwizard/trunk/proto1/final.py

    r16479 r16483  
    1 from PyQt5 import QtCore, QtGui, QtWidgets
     1from PyQt5 import QtCore, QtWidgets
    22
    33
     
    2727        self.finalTextLabel.setText("Application finished.")
    2828
     29        self.helpMessage = "This is the final screen of the wizard.\n\n" \
     30                           "The configuration process was successful.\n" \
     31                           "Feel free to use your smartcard to login on user session.\n\n" \
     32                           "Press Finish to close the wizard.\n"
    2933
    30     def runInitScripts(self):
     34    def initializePage(self):
    3135        print("Run final scripts...")
    32 
    33     def buildHelpMessage(self):
    34         retMessage = "This is the final screen of the wizard.\n\n" \
    35                       "The configuration process was successful.\n" \
    36                       "Feel free to use your smartcard to login on user session.\n\n" \
    37                       "Press Finish to close the wizard.\n"
    38         return retMessage
    39 
    40     def showHelpMessage(self):
    41         message = self.buildHelpMessage()
    42         QtWidgets.QMessageBox.information(self, "Welcome Page Help", message)
  • internals/2016/linuxloginsmartcardwizard/trunk/proto1/system.py

    r16479 r16483  
    2222        self.goodSystemLabel.setObjectName("goodSystemLabel")
    2323        self.goodSystemLabel.setEnabled(False)
     24        self.goodSystemLabel.hide()
    2425       
    2526        self.layoutWidget1 = QtWidgets.QWidget(self)
     
    5051        self.hiddenbutton.clicked.connect(self.runConfigs)
    5152
     53        self.helpMessage = "This is the second screen of the wizard.\n\n" \
     54                           "The wizard is making sure your system has all the tools needed \n" \
     55                           "to setup the configuration of user login with a smartcard.\n\n" \
     56                           "If you get an error message, please contact support or use \n" \
     57                           "the instructions in the user manual.\n"
     58
    5259    def checkSystem(self):
    5360        return self.goodSystemLabel.isEnabled()
     
    5865    def runConfigs(self):
    5966        print("RunConfigs -> start timer")
    60         self.timer.singleShot(10000, self.config)
     67        self.timer.singleShot(5000, self.config)
    6168
    6269    def config(self):
     70        print("Start config")
    6371        main.configurePamPkcs11()
    6472        self.goodSystemLabel.setEnabled(True)
     73        self.goodSystemLabel.show()
    6574        self.completeChanged.emit()
    6675
    67     def runInitScripts(self):
     76    def initializePage(self):
    6877        print("Run system scripts...")
    6978        self.hiddenbutton.click()
    70 
    71     def buildHelpMessage(self):
    72         retMessage = "This is the second screen of the wizard.\n\n" \
    73                      "The wizard is making sure your system has all the tools needed \n" \
    74                      "to setup the configuration of user login with a smartcard.\n\n" \
    75                      "If you get an error message, please contact support or use \n" \
    76                      "the instructions in the user manual.\n"
    77         return retMessage
    78 
    79     def showHelpMessage(self):
    80         message = self.buildHelpMessage()
    81         QtWidgets.QMessageBox.information(self, "Welcome Page Help", message)
  • internals/2016/linuxloginsmartcardwizard/trunk/proto1/w4pages.py

    r16479 r16483  
    4242        self.addPage(self.wizardPage4)
    4343
    44         self.currentIdChanged.connect(self.runInit)
     44        self.helpMessageBox = QtWidgets.QMessageBox()
    4545        self.helpRequested.connect(self.showHelp)
    4646        QtCore.QMetaObject.connectSlotsByName(self)
    4747
    48     def runInit(self):
    49         self.currentPage().runInitScripts()
    50 
    5148    def showHelp(self):
    52         self.currentPage().showHelpMessage()
     49        message = self.currentPage().helpMessage
     50        self.helpMessageBox.information(self, "Help Dialog", message)
    5351
    5452if __name__ == "__main__":
  • internals/2016/linuxloginsmartcardwizard/trunk/proto1/welcome.py

    r16479 r16483  
    3535        self.welcomeTextLabel3.setText("Press Cancel to close the application.")
    3636
    37     def runInitScripts(self):
     37        self.helpMessage = "This is the welcome screen of the wizard.\n\n" \
     38                           "Feel free to familiarize yourself with the available options.\n\n" \
     39                           "Press the Next button to go to the next step.\n"
     40
     41    def initializePage(self):
    3842        print("Run welcome scripts...")
    39 
    40     def buildHelpMessage(self):
    41         retMessage = "This is the welcome screen of the wizard.\n\n" \
    42                       "Feel free to familiarize yourself with the available options.\n\n" \
    43                       "Press the Next button to go to the next step.\n"
    44         return retMessage
    45 
    46     def showHelpMessage(self):
    47         message = self.buildHelpMessage()
    48         QtWidgets.QMessageBox.information(self, "Welcome Page Help", message)
Note: See TracChangeset for help on using the changeset viewer.