Changeset 16521


Ignore:
Timestamp:
Aug 10, 2016, 5:20:01 PM (3 years ago)
Author:
dcorreia
Message:

Clean up project folder.

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

Legend:

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

    r16512 r16521  
    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/mainwin.py" />
    6       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     5      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/trunk/proto1/checksystem.py" />
     6      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/trunk/proto1/fileHelper.py" />
     7      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/trunk/guilearning/qtdesigner/seriouswiz/w4pages.py" afterPath="$PROJECT_DIR$/trunk/guilearning/qtdesigner/seriouswiz/w4pages.py" />
     8      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/trunk/guilearning/qtdesigner/w4pages.py" afterPath="$PROJECT_DIR$/trunk/guilearning/qtdesigner/w4pages.py" />
     9      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/trunk/project1/main.py" afterPath="$PROJECT_DIR$/trunk/project1/main.py" />
     10      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/trunk/project1/tests.py" afterPath="$PROJECT_DIR$/trunk/project1/tests.py" />
     11      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/trunk/proto1/cardHelper.py" afterPath="$PROJECT_DIR$/trunk/proto1/cardHelper.py" />
     12      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/trunk/proto1/carduser.py" afterPath="$PROJECT_DIR$/trunk/proto1/carduser.py" />
     13      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/trunk/proto1/config.py" afterPath="$PROJECT_DIR$/trunk/proto1/config.py" />
    714      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/trunk/proto1/main.py" afterPath="$PROJECT_DIR$/trunk/proto1/main.py" />
     15      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/trunk/proto1/mainwin.py" afterPath="$PROJECT_DIR$/trunk/proto1/mainwin.py" />
     16      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/trunk/proto1/w4pages.py" afterPath="$PROJECT_DIR$/trunk/proto1/w4pages.py" />
     17      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/trunk/proto1/welcome.py" afterPath="$PROJECT_DIR$/trunk/proto1/welcome.py" />
    818    </list>
    919    <ignored path="estagiopycharm.iws" />
     
    2535  <component name="FileEditorManager">
    2636    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
    27       <file leaf-file-name="w4pages.py" pinned="false" current-in-tab="false">
    28         <entry file="file://$PROJECT_DIR$/trunk/proto1/w4pages.py">
    29           <provider selected="true" editor-type-id="text-editor">
    30             <state relative-caret-position="293">
    31               <caret line="50" column="4" selection-start-line="50" selection-start-column="4" selection-end-line="55" selection-end-column="45" />
    32               <folding>
    33                 <element signature="e#0#42#0" expanded="true" />
    34               </folding>
    35             </state>
    36           </provider>
    37         </entry>
    38       </file>
    39       <file leaf-file-name="mainwin.py" pinned="false" current-in-tab="true">
     37      <file leaf-file-name="mainwin.py" pinned="false" current-in-tab="false">
    4038        <entry file="file://$PROJECT_DIR$/trunk/proto1/mainwin.py">
    4139          <provider selected="true" editor-type-id="text-editor">
    42             <state relative-caret-position="275">
    43               <caret line="67" column="22" selection-start-line="67" selection-start-column="22" selection-end-line="67" selection-end-column="22" />
    44               <folding>
    45                 <element signature="e#0#42#0" expanded="true" />
    46               </folding>
    47             </state>
    48           </provider>
    49         </entry>
    50       </file>
    51       <file leaf-file-name="welcome.py" pinned="false" current-in-tab="false">
    52         <entry file="file://$PROJECT_DIR$/trunk/proto1/welcome.py">
    53           <provider selected="true" editor-type-id="text-editor">
    54             <state relative-caret-position="131">
    55               <caret line="10" column="29" selection-start-line="10" selection-start-column="29" selection-end-line="10" selection-end-column="29" />
     40            <state relative-caret-position="72">
     41              <caret line="4" column="0" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="0" />
    5642              <folding />
    5743            </state>
     
    5945        </entry>
    6046      </file>
    61       <file leaf-file-name="system.py" pinned="false" current-in-tab="false">
    62         <entry file="file://$PROJECT_DIR$/trunk/proto1/system.py">
     47      <file leaf-file-name="main.py" pinned="false" current-in-tab="false">
     48        <entry file="file://$PROJECT_DIR$/trunk/proto1/main.py">
    6349          <provider selected="true" editor-type-id="text-editor">
    64             <state relative-caret-position="-180">
    65               <caret line="12" column="56" selection-start-line="12" selection-start-column="56" selection-end-line="12" selection-end-column="56" />
    66               <folding>
    67                 <element signature="e#0#42#0" expanded="true" />
    68               </folding>
     50            <state relative-caret-position="18">
     51              <caret line="1" column="0" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
     52              <folding />
    6953            </state>
    7054          </provider>
    7155        </entry>
    7256      </file>
    73       <file leaf-file-name="carduser.py" pinned="false" current-in-tab="false">
    74         <entry file="file://$PROJECT_DIR$/trunk/proto1/carduser.py">
     57      <file leaf-file-name="fileHelper.py" pinned="false" current-in-tab="false">
     58        <entry file="file://$PROJECT_DIR$/trunk/proto1/fileHelper.py">
    7559          <provider selected="true" editor-type-id="text-editor">
    76             <state relative-caret-position="-594">
    77               <caret line="24" column="7" selection-start-line="24" selection-start-column="6" selection-end-line="24" selection-end-column="7" />
     60            <state relative-caret-position="0">
     61              <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
    7862              <folding>
    79                 <element signature="e#0#42#0" expanded="true" />
     63                <element signature="e#19#33#0" expanded="true" />
    8064              </folding>
    8165            </state>
     
    9377        </entry>
    9478      </file>
    95       <file leaf-file-name="main.py" pinned="false" current-in-tab="false">
    96         <entry file="file://$PROJECT_DIR$/trunk/proto1/main.py">
     79      <file leaf-file-name="config.py" pinned="false" current-in-tab="false">
     80        <entry file="file://$PROJECT_DIR$/trunk/proto1/config.py">
    9781          <provider selected="true" editor-type-id="text-editor">
    98             <state relative-caret-position="239">
    99               <caret line="104" column="76" selection-start-line="104" selection-start-column="76" selection-end-line="104" selection-end-column="76" />
     82            <state relative-caret-position="36">
     83              <caret line="2" column="29" selection-start-line="2" selection-start-column="29" selection-end-line="2" selection-end-column="29" />
     84              <folding>
     85                <element signature="e#19#28#0" expanded="true" />
     86              </folding>
     87            </state>
     88          </provider>
     89        </entry>
     90      </file>
     91      <file leaf-file-name="checksystem.py" pinned="false" current-in-tab="false">
     92        <entry file="file://$PROJECT_DIR$/trunk/proto1/checksystem.py">
     93          <provider selected="true" editor-type-id="text-editor">
     94            <state relative-caret-position="18">
     95              <caret line="1" column="0" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
    10096              <folding />
    10197            </state>
     
    10399        </entry>
    104100      </file>
    105       <file leaf-file-name="config.py" pinned="false" current-in-tab="false">
    106         <entry file="file://$PROJECT_DIR$/trunk/proto1/config.py">
     101      <file leaf-file-name="carduser.py" pinned="false" current-in-tab="true">
     102        <entry file="file://$PROJECT_DIR$/trunk/proto1/carduser.py">
    107103          <provider selected="true" editor-type-id="text-editor">
    108             <state relative-caret-position="2394">
    109               <caret line="204" column="37" selection-start-line="204" selection-start-column="37" selection-end-line="204" selection-end-column="37" />
     104            <state relative-caret-position="234">
     105              <caret line="13" column="31" selection-start-line="13" selection-start-column="31" selection-end-line="13" selection-end-column="31" />
    110106              <folding>
    111                 <element signature="e#19#28#0" expanded="true" />
     107                <element signature="e#0#42#0" expanded="true" />
    112108              </folding>
     109            </state>
     110          </provider>
     111        </entry>
     112      </file>
     113      <file leaf-file-name="cardHelper.py" pinned="false" current-in-tab="false">
     114        <entry file="file://$PROJECT_DIR$/trunk/proto1/cardHelper.py">
     115          <provider selected="true" editor-type-id="text-editor">
     116            <state relative-caret-position="72">
     117              <caret line="4" column="12" selection-start-line="4" selection-start-column="12" selection-end-line="4" selection-end-column="12" />
     118              <folding />
     119            </state>
     120          </provider>
     121        </entry>
     122      </file>
     123      <file leaf-file-name="welcome.py" pinned="false" current-in-tab="false">
     124        <entry file="file://$PROJECT_DIR$/trunk/proto1/welcome.py">
     125          <provider selected="true" editor-type-id="text-editor">
     126            <state relative-caret-position="180">
     127              <caret line="10" column="29" selection-start-line="10" selection-start-column="29" selection-end-line="10" selection-end-column="29" />
     128              <folding />
     129            </state>
     130          </provider>
     131        </entry>
     132      </file>
     133      <file leaf-file-name="w4pages.py" pinned="false" current-in-tab="false">
     134        <entry file="file://$PROJECT_DIR$/trunk/proto1/w4pages.py">
     135          <provider selected="true" editor-type-id="text-editor">
     136            <state relative-caret-position="18">
     137              <caret line="1" column="39" selection-start-line="1" selection-start-column="39" selection-end-line="1" selection-end-column="39" />
     138              <folding />
    113139            </state>
    114140          </provider>
     
    158184        <option value="$PROJECT_DIR$/trunk/proto1/gui/system.py" />
    159185        <option value="$PROJECT_DIR$/trunk/proto1/eidlibPython_Wrapper/examples/simple_example.py" />
    160         <option value="$PROJECT_DIR$/trunk/proto1/cardHelper.py" />
    161186        <option value="$PROJECT_DIR$/.idea/workspace.xml" />
    162187        <option value="$PROJECT_DIR$/trunk/proto1/final.py" />
    163188        <option value="$PROJECT_DIR$/trunk/proto1/welcome.py" />
    164189        <option value="$PROJECT_DIR$/trunk/proto1/system.py" />
     190        <option value="$PROJECT_DIR$/trunk/proto1/w4pages.py" />
     191        <option value="$PROJECT_DIR$/trunk/proto1/mainwin.py" />
     192        <option value="$PROJECT_DIR$/trunk/proto1/main.py" />
     193        <option value="$PROJECT_DIR$/trunk/proto1/config.py" />
     194        <option value="$PROJECT_DIR$/trunk/proto1/checksystem.py" />
    165195        <option value="$PROJECT_DIR$/trunk/proto1/carduser.py" />
    166         <option value="$PROJECT_DIR$/trunk/proto1/config.py" />
    167         <option value="$PROJECT_DIR$/trunk/proto1/w4pages.py" />
    168         <option value="$PROJECT_DIR$/trunk/proto1/main.py" />
    169         <option value="$PROJECT_DIR$/trunk/proto1/mainwin.py" />
     196        <option value="$PROJECT_DIR$/trunk/proto1/cardHelper.py" />
    170197      </list>
    171198    </option>
     
    224251    </navigator>
    225252    <panes>
    226       <pane id="Scratches" />
    227253      <pane id="ProjectPane">
    228254        <subPane>
     
    274300              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
    275301            </PATH_ELEMENT>
     302            <PATH_ELEMENT>
     303              <option name="myItemId" value="trunk" />
     304              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
     305            </PATH_ELEMENT>
     306            <PATH_ELEMENT>
     307              <option name="myItemId" value="proto1" />
     308              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
     309            </PATH_ELEMENT>
     310            <PATH_ELEMENT>
     311              <option name="myItemId" value="eidlibPython_Wrapper" />
     312              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
     313            </PATH_ELEMENT>
     314          </PATH>
     315          <PATH>
     316            <PATH_ELEMENT>
     317              <option name="myItemId" value="estagiopycharm" />
     318              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
     319            </PATH_ELEMENT>
     320            <PATH_ELEMENT>
     321              <option name="myItemId" value="estagiopycharm" />
     322              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
     323            </PATH_ELEMENT>
     324            <PATH_ELEMENT>
     325              <option name="myItemId" value="trunk" />
     326              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
     327            </PATH_ELEMENT>
     328            <PATH_ELEMENT>
     329              <option name="myItemId" value="proto1" />
     330              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
     331            </PATH_ELEMENT>
     332            <PATH_ELEMENT>
     333              <option name="myItemId" value="eidlibPython_Wrapper" />
     334              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
     335            </PATH_ELEMENT>
     336            <PATH_ELEMENT>
     337              <option name="myItemId" value="GeneratedModule" />
     338              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
     339            </PATH_ELEMENT>
     340          </PATH>
     341          <PATH>
     342            <PATH_ELEMENT>
     343              <option name="myItemId" value="estagiopycharm" />
     344              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
     345            </PATH_ELEMENT>
     346            <PATH_ELEMENT>
     347              <option name="myItemId" value="estagiopycharm" />
     348              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
     349            </PATH_ELEMENT>
     350            <PATH_ELEMENT>
     351              <option name="myItemId" value="trunk" />
     352              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
     353            </PATH_ELEMENT>
     354            <PATH_ELEMENT>
     355              <option name="myItemId" value="guilearning" />
     356              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
     357            </PATH_ELEMENT>
     358          </PATH>
     359          <PATH>
     360            <PATH_ELEMENT>
     361              <option name="myItemId" value="estagiopycharm" />
     362              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
     363            </PATH_ELEMENT>
     364            <PATH_ELEMENT>
     365              <option name="myItemId" value="estagiopycharm" />
     366              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
     367            </PATH_ELEMENT>
    276368          </PATH>
    277369        </subPane>
    278370      </pane>
     371      <pane id="Scratches" />
    279372      <pane id="Scope" />
    280373    </panes>
     
    286379  </component>
    287380  <component name="RecentsManager">
     381    <key name="CopyFile.RECENT_KEYS">
     382      <recent name="$PROJECT_DIR$/trunk/proto1" />
     383    </key>
    288384    <key name="MoveFile.RECENT_KEYS">
     385      <recent name="$PROJECT_DIR$/trunk/proto1/oldscripts" />
    289386      <recent name="$PROJECT_DIR$/trunk/guilearning/kivy" />
    290387      <recent name="$PROJECT_DIR$/trunk" />
    291388    </key>
    292389  </component>
    293   <component name="RunManager" selected="Python.w4pages">
    294     <configuration default="false" name="screentab" type="PythonConfigurationType" factoryName="Python" temporary="true">
    295       <option name="INTERPRETER_OPTIONS" value="" />
    296       <option name="PARENT_ENVS" value="true" />
    297       <envs>
    298         <env name="PYTHONUNBUFFERED" value="1" />
    299       </envs>
    300       <option name="SDK_HOME" value="" />
    301       <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/trunk/guilearning/kivy/screentabs" />
    302       <option name="IS_MODULE_SDK" value="true" />
    303       <option name="ADD_CONTENT_ROOTS" value="true" />
    304       <option name="ADD_SOURCE_ROOTS" value="true" />
    305       <module name="estagiopycharm" />
    306       <option name="SCRIPT_NAME" value="$PROJECT_DIR$/trunk/guilearning/kivy/screentabs/screentab.py" />
    307       <option name="PARAMETERS" value="" />
    308       <option name="SHOW_COMMAND_LINE" value="false" />
    309       <method />
    310     </configuration>
     390  <component name="RunManager" selected="Python.mainwin">
    311391    <configuration default="false" name="main (2)" type="PythonConfigurationType" factoryName="Python" temporary="true">
    312392      <option name="INTERPRETER_OPTIONS" value="" />
     
    373453      <module name="estagiopycharm" />
    374454      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/trunk/proto1/w4pages.py" />
     455      <option name="PARAMETERS" value="" />
     456      <option name="SHOW_COMMAND_LINE" value="false" />
     457      <method />
     458    </configuration>
     459    <configuration default="false" name="mainwin" type="PythonConfigurationType" factoryName="Python" temporary="true">
     460      <option name="INTERPRETER_OPTIONS" value="" />
     461      <option name="PARENT_ENVS" value="true" />
     462      <envs>
     463        <env name="PYTHONUNBUFFERED" value="1" />
     464      </envs>
     465      <option name="SDK_HOME" value="" />
     466      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/trunk/proto1" />
     467      <option name="IS_MODULE_SDK" value="true" />
     468      <option name="ADD_CONTENT_ROOTS" value="true" />
     469      <option name="ADD_SOURCE_ROOTS" value="true" />
     470      <module name="estagiopycharm" />
     471      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/trunk/proto1/mainwin.py" />
    375472      <option name="PARAMETERS" value="" />
    376473      <option name="SHOW_COMMAND_LINE" value="false" />
     
    512609    </configuration>
    513610    <list size="5">
    514       <item index="0" class="java.lang.String" itemvalue="Python.screentab" />
    515       <item index="1" class="java.lang.String" itemvalue="Python.main (2)" />
    516       <item index="2" class="java.lang.String" itemvalue="Python.screenbutton" />
    517       <item index="3" class="java.lang.String" itemvalue="Python.LabelBase" />
    518       <item index="4" class="java.lang.String" itemvalue="Python.w4pages" />
     611      <item index="0" class="java.lang.String" itemvalue="Python.main (2)" />
     612      <item index="1" class="java.lang.String" itemvalue="Python.screenbutton" />
     613      <item index="2" class="java.lang.String" itemvalue="Python.LabelBase" />
     614      <item index="3" class="java.lang.String" itemvalue="Python.w4pages" />
     615      <item index="4" class="java.lang.String" itemvalue="Python.mainwin" />
    519616    </list>
    520617    <recent_temporary>
    521618      <list size="5">
    522         <item index="0" class="java.lang.String" itemvalue="Python.w4pages" />
    523         <item index="1" class="java.lang.String" itemvalue="Python.screenbutton" />
    524         <item index="2" class="java.lang.String" itemvalue="Python.LabelBase" />
    525         <item index="3" class="java.lang.String" itemvalue="Python.main (2)" />
    526         <item index="4" class="java.lang.String" itemvalue="Python.screentab" />
     619        <item index="0" class="java.lang.String" itemvalue="Python.mainwin" />
     620        <item index="1" class="java.lang.String" itemvalue="Python.w4pages" />
     621        <item index="2" class="java.lang.String" itemvalue="Python.screenbutton" />
     622        <item index="3" class="java.lang.String" itemvalue="Python.LabelBase" />
     623        <item index="4" class="java.lang.String" itemvalue="Python.main (2)" />
    527624      </list>
    528625    </recent_temporary>
     
    811908      <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" />
    812909      <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" />
    813       <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" />
     910      <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.35085008" sideWeight="0.49323785" order="12" side_tool="false" content_ui="tabs" />
    814911      <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" />
    815       <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" />
     912      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.28748068" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
    816913      <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" />
    817914      <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" />
     
    880977  </component>
    881978  <component name="editorHistoryManager">
    882     <entry file="file://$PROJECT_DIR$/trunk/project1/editfiles.py" />
    883     <entry file="file://$PROJECT_DIR$/trunk/backup/pam_pkcs11.conf">
    884       <provider selected="true" editor-type-id="text-editor">
    885         <state relative-caret-position="114">
    886           <caret line="224" column="43" selection-start-line="224" selection-start-column="43" selection-end-line="224" selection-end-column="43" />
    887         </state>
    888       </provider>
    889     </entry>
    890979    <entry file="file://$PROJECT_DIR$/trunk/project1/configmapper.py" />
    891980    <entry file="file://$PROJECT_DIR$/trunk/project1/pkcs11.example">
     
    10671156      </provider>
    10681157    </entry>
    1069     <entry file="file://$PROJECT_DIR$/trunk/proto1/cardHelper.py">
    1070       <provider selected="true" editor-type-id="text-editor">
    1071         <state relative-caret-position="36">
    1072           <caret line="2" column="10" selection-start-line="1" selection-start-column="0" selection-end-line="2" selection-end-column="10" />
     1158    <entry file="file://$PROJECT_DIR$/trunk/proto1/system.py">
     1159      <provider selected="true" editor-type-id="text-editor">
     1160        <state relative-caret-position="18">
     1161          <caret line="12" column="56" selection-start-line="12" selection-start-column="56" selection-end-line="12" selection-end-column="56" />
     1162          <folding />
     1163        </state>
     1164      </provider>
     1165    </entry>
     1166    <entry file="file://$PROJECT_DIR$/trunk/proto1/welcome.py">
     1167      <provider selected="true" editor-type-id="text-editor">
     1168        <state relative-caret-position="180">
     1169          <caret line="10" column="29" selection-start-line="10" selection-start-column="29" selection-end-line="10" selection-end-column="29" />
     1170          <folding />
     1171        </state>
     1172      </provider>
     1173    </entry>
     1174    <entry file="file://$PROJECT_DIR$/trunk/proto1/w4pages.py">
     1175      <provider selected="true" editor-type-id="text-editor">
     1176        <state relative-caret-position="18">
     1177          <caret line="1" column="39" selection-start-line="1" selection-start-column="39" selection-end-line="1" selection-end-column="39" />
     1178          <folding />
     1179        </state>
     1180      </provider>
     1181    </entry>
     1182    <entry file="file://$PROJECT_DIR$/trunk/proto1/main.py">
     1183      <provider selected="true" editor-type-id="text-editor">
     1184        <state relative-caret-position="18">
     1185          <caret line="1" column="0" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
     1186          <folding />
     1187        </state>
     1188      </provider>
     1189    </entry>
     1190    <entry file="file://$PROJECT_DIR$/trunk/proto1/fileHelper.py">
     1191      <provider selected="true" editor-type-id="text-editor">
     1192        <state relative-caret-position="0">
     1193          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
     1194          <folding>
     1195            <element signature="e#19#33#0" expanded="true" />
     1196          </folding>
    10731197        </state>
    10741198      </provider>
     
    10821206      </provider>
    10831207    </entry>
     1208    <entry file="file://$PROJECT_DIR$/trunk/proto1/config.py">
     1209      <provider selected="true" editor-type-id="text-editor">
     1210        <state relative-caret-position="36">
     1211          <caret line="2" column="29" selection-start-line="2" selection-start-column="29" selection-end-line="2" selection-end-column="29" />
     1212          <folding>
     1213            <element signature="e#19#28#0" expanded="true" />
     1214          </folding>
     1215        </state>
     1216      </provider>
     1217    </entry>
     1218    <entry file="file://$PROJECT_DIR$/trunk/proto1/checksystem.py">
     1219      <provider selected="true" editor-type-id="text-editor">
     1220        <state relative-caret-position="18">
     1221          <caret line="1" column="0" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
     1222          <folding />
     1223        </state>
     1224      </provider>
     1225    </entry>
     1226    <entry file="file://$PROJECT_DIR$/trunk/proto1/cardHelper.py">
     1227      <provider selected="true" editor-type-id="text-editor">
     1228        <state relative-caret-position="72">
     1229          <caret line="4" column="12" selection-start-line="4" selection-start-column="12" selection-end-line="4" selection-end-column="12" />
     1230          <folding />
     1231        </state>
     1232      </provider>
     1233    </entry>
     1234    <entry file="file://$PROJECT_DIR$/trunk/proto1/mainwin.py">
     1235      <provider selected="true" editor-type-id="text-editor">
     1236        <state relative-caret-position="72">
     1237          <caret line="4" column="0" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="0" />
     1238          <folding />
     1239        </state>
     1240      </provider>
     1241    </entry>
    10841242    <entry file="file://$PROJECT_DIR$/trunk/proto1/carduser.py">
    10851243      <provider selected="true" editor-type-id="text-editor">
    1086         <state relative-caret-position="-594">
    1087           <caret line="24" column="7" selection-start-line="24" selection-start-column="6" selection-end-line="24" selection-end-column="7" />
     1244        <state relative-caret-position="234">
     1245          <caret line="13" column="31" selection-start-line="13" selection-start-column="31" selection-end-line="13" selection-end-column="31" />
    10881246          <folding>
    10891247            <element signature="e#0#42#0" expanded="true" />
     
    10921250      </provider>
    10931251    </entry>
    1094     <entry file="file://$PROJECT_DIR$/trunk/proto1/config.py">
    1095       <provider selected="true" editor-type-id="text-editor">
    1096         <state relative-caret-position="2394">
    1097           <caret line="204" column="37" selection-start-line="204" selection-start-column="37" selection-end-line="204" selection-end-column="37" />
    1098           <folding>
    1099             <element signature="e#19#28#0" expanded="true" />
    1100           </folding>
    1101         </state>
    1102       </provider>
    1103     </entry>
    1104     <entry file="file://$PROJECT_DIR$/trunk/proto1/welcome.py">
    1105       <provider selected="true" editor-type-id="text-editor">
    1106         <state relative-caret-position="131">
    1107           <caret line="10" column="29" selection-start-line="10" selection-start-column="29" selection-end-line="10" selection-end-column="29" />
    1108           <folding />
    1109         </state>
    1110       </provider>
    1111     </entry>
    1112     <entry file="file://$PROJECT_DIR$/trunk/proto1/w4pages.py">
    1113       <provider selected="true" editor-type-id="text-editor">
    1114         <state relative-caret-position="293">
    1115           <caret line="50" column="4" selection-start-line="50" selection-start-column="4" selection-end-line="55" selection-end-column="45" />
    1116           <folding>
    1117             <element signature="e#0#42#0" expanded="true" />
    1118           </folding>
    1119         </state>
    1120       </provider>
    1121     </entry>
    1122     <entry file="file://$PROJECT_DIR$/trunk/proto1/system.py">
    1123       <provider selected="true" editor-type-id="text-editor">
    1124         <state relative-caret-position="-180">
    1125           <caret line="12" column="56" selection-start-line="12" selection-start-column="56" selection-end-line="12" selection-end-column="56" />
    1126           <folding>
    1127             <element signature="e#0#42#0" expanded="true" />
    1128           </folding>
    1129         </state>
    1130       </provider>
    1131     </entry>
    1132     <entry file="file://$PROJECT_DIR$/trunk/proto1/main.py">
    1133       <provider selected="true" editor-type-id="text-editor">
    1134         <state relative-caret-position="239">
    1135           <caret line="104" column="76" selection-start-line="104" selection-start-column="76" selection-end-line="104" selection-end-column="76" />
    1136           <folding />
    1137         </state>
    1138       </provider>
    1139     </entry>
    1140     <entry file="file://$PROJECT_DIR$/trunk/proto1/mainwin.py">
    1141       <provider selected="true" editor-type-id="text-editor">
    1142         <state relative-caret-position="275">
    1143           <caret line="67" column="22" selection-start-line="67" selection-start-column="22" selection-end-line="67" selection-end-column="22" />
    1144           <folding>
    1145             <element signature="e#0#42#0" expanded="true" />
    1146           </folding>
    1147         </state>
    1148       </provider>
    1149     </entry>
    11501252  </component>
    11511253</project>
  • internals/2016/linuxloginsmartcardwizard/trunk/guilearning/qtdesigner/seriouswiz/w4pages.py

    r16467 r16521  
    88# WARNING! All changes made in this file will be lost!
    99
     10import carduser
     11import final
     12import welcome
    1013from PyQt5 import QtCore, QtGui, QtWidgets
    11 import welcome, system, carduser, final
     14
     15from gui import checksystem
    1216
    1317
     
    3034        self.addPage(self.wizardPage1)
    3135
    32         self.wizardPage2 = system.SystemPage()
     36        self.wizardPage2 = checksystem.SystemPage()
    3337        self.addPage(self.wizardPage2)
    3438       
  • internals/2016/linuxloginsmartcardwizard/trunk/guilearning/qtdesigner/w4pages.py

    r16451 r16521  
    99
    1010from PyQt5 import QtCore, QtGui, QtWidgets
    11 import welcome
     11
     12from gui import welcome
    1213
    1314
  • internals/2016/linuxloginsmartcardwizard/trunk/project1/main.py

    r16403 r16521  
    11#!/usr/bin/python3
    2 import config
    32import os
    43
    5 # PAM-PKCS#11
     4import fileHelper
     5
     6from scripts import config
     7
    68PAMPKCS11_PACKAGE = "libpam-pkcs11"
    79PAMPKCS11_DIRPATH = "/etc/pam_pkcs11"
     
    3537
    3638    # Create directories to support configuration files
    37     config.makeDirectory(PAMPKCS11_DIRPATH)
    38     config.makeDirectory(CACERTS_DIRPATH)
    39     config.makeDirectory(CRLS_DIRPATH)
     39    fileHelper.makeDirectory(PAMPKCS11_DIRPATH)
     40    fileHelper.makeDirectory(CACERTS_DIRPATH)
     41    fileHelper.makeDirectory(CRLS_DIRPATH)
    4042
    4143    # Copy pteid module data file to general directory
    42     config.copyFileToDirectory(PTEID_MODULE, PAMPKCS11_DIRPATH)
     44    fileHelper.copyFileToDirectory(PTEID_MODULE, PAMPKCS11_DIRPATH)
    4345
    4446    # Copy certificate files to cacerts directory and make hash links
    45     config.copyFileToDirectory(ECRAIZ_CERT, CACERTS_DIRPATH)
    46     config.copyFileToDirectory(CC001_CERT, CACERTS_DIRPATH)
     47    fileHelper.copyFileToDirectory(ECRAIZ_CERT, CACERTS_DIRPATH)
     48    fileHelper.copyFileToDirectory(CC001_CERT, CACERTS_DIRPATH)
    4749    config.makeHashLinks(CACERTS_DIRPATH)
    4850
     
    6567
    6668    # Copy subject_mapping file to main configuration folder
    67     config.copyFileToDirectory(SUBJECTMAPPING_EXAMPLE, PAMPKCS11_MAPPING)
     69    fileHelper.copyFileToDirectory(SUBJECTMAPPING_EXAMPLE, PAMPKCS11_MAPPING)
    6870
    6971    # Create the pkcs11 file with configuration info
    70     config.copyFileToDirectory(PAMCONFIG_EXAMPLE, PAMCONFIG)
     72    fileHelper.copyFileToDirectory(PAMCONFIG_EXAMPLE, PAMCONFIG)
    7173
    7274
     
    8183
    8284def resetConfigurations():
    83     config.deleteDirectory(PAMPKCS11_DIRPATH)
    84     config.deleteFile(PAMCONFIG)
     85    fileHelper.deleteDirectory(PAMPKCS11_DIRPATH)
     86    fileHelper.deleteFile(PAMCONFIG)
    8587    config.resetPamAuth()
    8688    config.deleteTemporaryData()
  • internals/2016/linuxloginsmartcardwizard/trunk/project1/tests.py

    r16380 r16521  
    11#!/usr/bin/python3
    2 import config
    32
    43# TODO tests for package installation
  • internals/2016/linuxloginsmartcardwizard/trunk/proto1/eidlibPython_Wrapper/examples/simple_example.py

    r16483 r16521  
    5151      card = ctx_with_card.getEIDCard()
    5252      for i in range(card.getCertificates().countFromCard()):
    53         # import OpenSSL
    54         der = card.getCertificates().getCertFromCard(i).getCertData().writeToFile("derfile"+str(i))
    55         """x509 = OpenSSL.crypto.load_certificate(OpenSSL.crypto.FILETYPE_ASN1, der)
     53        import OpenSSL
     54        der = card.getCertificates().getCertFromCard(i).getCertData().GetBytes()
     55        x509 = OpenSSL.crypto.load_certificate(OpenSSL.crypto.FILETYPE_ASN1, der)
    5656        #print(x509.get_subject().get_components())
    5757        comps = x509.get_subject().get_components()
     
    6363        for i in range(1,len(n_comps)):
    6464            ret_subject += n_comps[i]
    65         print(ret_subject.decode())"""
     65        print(ret_subject.decode())
    6666    else:
    6767      print("There's no card present in the reader, terminating...")
  • internals/2016/linuxloginsmartcardwizard/trunk/proto1/w4pages.py

    r16505 r16521  
    11from PyQt5 import QtCore, QtGui, QtWidgets
    2 import welcome
    3 import system
    4 import carduser
    5 import final
     2import welcome, checksystem, carduser, final
    63
    74
     
    3128        self.addPage(self.wizardPage1)
    3229
    33         self.wizardPage2 = system.SystemPage()
     30        self.wizardPage2 = checksystem.SystemPage()
    3431        self.addPage(self.wizardPage2)
    3532
     
    6057    ui.show()
    6158    sys.exit(app.exec_())
    62 
  • internals/2016/linuxloginsmartcardwizard/trunk/proto1/welcome.py

    r16500 r16521  
    1 from PyQt5 import QtCore, QtGui, QtWidgets
     1from PyQt5 import QtCore, QtWidgets
    22
    33
Note: See TracChangeset for help on using the changeset viewer.