1.5.0a
This commit is contained in:
parent
394beef34c
commit
bb31f2821d
9 changed files with 195 additions and 156 deletions
176
.idea/workspace.xml
generated
176
.idea/workspace.xml
generated
|
@ -20,52 +20,7 @@
|
||||||
<favorites_list name="JDE" />
|
<favorites_list name="JDE" />
|
||||||
</component>
|
</component>
|
||||||
<component name="FileEditorManager">
|
<component name="FileEditorManager">
|
||||||
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
|
||||||
<file leaf-file-name="desktop.py" pinned="false" current-in-tab="false">
|
|
||||||
<entry file="file://$PROJECT_DIR$/JDE/Interfaces/desktop.py">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="2550">
|
|
||||||
<caret line="166" column="0" selection-start-line="166" selection-start-column="0" selection-end-line="166" selection-end-column="0" />
|
|
||||||
<folding>
|
|
||||||
<element signature="e#0#14#0" expanded="true" />
|
|
||||||
</folding>
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
</file>
|
|
||||||
<file leaf-file-name="settings.conf" pinned="false" current-in-tab="false">
|
|
||||||
<entry file="file://$PROJECT_DIR$/JDE/Settings/settings.conf">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="136">
|
|
||||||
<caret line="8" column="14" selection-start-line="8" selection-start-column="14" selection-end-line="8" selection-end-column="14" />
|
|
||||||
<folding />
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
</file>
|
|
||||||
<file leaf-file-name="test.py" pinned="false" current-in-tab="true">
|
|
||||||
<entry file="file://$PROJECT_DIR$/test.py">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="153">
|
|
||||||
<caret line="9" column="4" selection-start-line="9" selection-start-column="4" selection-end-line="9" selection-end-column="4" />
|
|
||||||
<folding />
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
</file>
|
|
||||||
<file leaf-file-name="FileBrowser.py" pinned="false" current-in-tab="false">
|
|
||||||
<entry file="file://$PROJECT_DIR$/Programs/FileBrowser.py">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="102">
|
|
||||||
<caret line="7" column="45" selection-start-line="7" selection-start-column="45" selection-end-line="7" selection-end-column="45" />
|
|
||||||
<folding>
|
|
||||||
<element signature="e#0#21#0" expanded="true" />
|
|
||||||
</folding>
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
</file>
|
|
||||||
</leaf>
|
|
||||||
</component>
|
</component>
|
||||||
<component name="FileTemplateManagerImpl">
|
<component name="FileTemplateManagerImpl">
|
||||||
<option name="RECENT_TEMPLATES">
|
<option name="RECENT_TEMPLATES">
|
||||||
|
@ -90,9 +45,10 @@
|
||||||
<option value="$PROJECT_DIR$/JDE/JDE.py" />
|
<option value="$PROJECT_DIR$/JDE/JDE.py" />
|
||||||
<option value="$PROJECT_DIR$/JDE/Interfaces/login.py" />
|
<option value="$PROJECT_DIR$/JDE/Interfaces/login.py" />
|
||||||
<option value="$PROJECT_DIR$/Programs/FileBrowser.py" />
|
<option value="$PROJECT_DIR$/Programs/FileBrowser.py" />
|
||||||
|
<option value="$PROJECT_DIR$/test.py" />
|
||||||
|
<option value="$PROJECT_DIR$/Programs/pyMonitor.py" />
|
||||||
<option value="$PROJECT_DIR$/JDE/Interfaces/desktop.py" />
|
<option value="$PROJECT_DIR$/JDE/Interfaces/desktop.py" />
|
||||||
<option value="$PROJECT_DIR$/JDE/Settings/settings.conf" />
|
<option value="$PROJECT_DIR$/JDE/Settings/settings.conf" />
|
||||||
<option value="$PROJECT_DIR$/test.py" />
|
|
||||||
</list>
|
</list>
|
||||||
</option>
|
</option>
|
||||||
</component>
|
</component>
|
||||||
|
@ -127,8 +83,6 @@
|
||||||
<foldersAlwaysOnTop value="true" />
|
<foldersAlwaysOnTop value="true" />
|
||||||
</navigator>
|
</navigator>
|
||||||
<panes>
|
<panes>
|
||||||
<pane id="Scope" />
|
|
||||||
<pane id="Scratches" />
|
|
||||||
<pane id="ProjectPane">
|
<pane id="ProjectPane">
|
||||||
<subPane>
|
<subPane>
|
||||||
<PATH>
|
<PATH>
|
||||||
|
@ -147,6 +101,20 @@
|
||||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||||
</PATH_ELEMENT>
|
</PATH_ELEMENT>
|
||||||
</PATH>
|
</PATH>
|
||||||
|
<PATH>
|
||||||
|
<PATH_ELEMENT>
|
||||||
|
<option name="myItemId" value="JDE" />
|
||||||
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
|
||||||
|
</PATH_ELEMENT>
|
||||||
|
<PATH_ELEMENT>
|
||||||
|
<option name="myItemId" value="JDE" />
|
||||||
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||||
|
</PATH_ELEMENT>
|
||||||
|
<PATH_ELEMENT>
|
||||||
|
<option name="myItemId" value="inDevelopment" />
|
||||||
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||||
|
</PATH_ELEMENT>
|
||||||
|
</PATH>
|
||||||
<PATH>
|
<PATH>
|
||||||
<PATH_ELEMENT>
|
<PATH_ELEMENT>
|
||||||
<option name="myItemId" value="JDE" />
|
<option name="myItemId" value="JDE" />
|
||||||
|
@ -199,6 +167,8 @@
|
||||||
</PATH>
|
</PATH>
|
||||||
</subPane>
|
</subPane>
|
||||||
</pane>
|
</pane>
|
||||||
|
<pane id="Scope" />
|
||||||
|
<pane id="Scratches" />
|
||||||
</panes>
|
</panes>
|
||||||
</component>
|
</component>
|
||||||
<component name="PropertiesComponent">
|
<component name="PropertiesComponent">
|
||||||
|
@ -206,7 +176,12 @@
|
||||||
<property name="settings.editor.selected.configurable" value="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable" />
|
<property name="settings.editor.selected.configurable" value="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable" />
|
||||||
<property name="settings.editor.splitter.proportion" value="0.2" />
|
<property name="settings.editor.splitter.proportion" value="0.2" />
|
||||||
</component>
|
</component>
|
||||||
<component name="RunManager" selected="Python.test">
|
<component name="RecentsManager">
|
||||||
|
<key name="MoveFile.RECENT_KEYS">
|
||||||
|
<recent name="C:\Users\jordon\Documents\GitHub\JDE\inDevelopment" />
|
||||||
|
</key>
|
||||||
|
</component>
|
||||||
|
<component name="RunManager" selected="Python.run">
|
||||||
<configuration default="false" name="run" type="PythonConfigurationType" factoryName="Python" temporary="true">
|
<configuration default="false" name="run" type="PythonConfigurationType" factoryName="Python" temporary="true">
|
||||||
<option name="INTERPRETER_OPTIONS" value="" />
|
<option name="INTERPRETER_OPTIONS" value="" />
|
||||||
<option name="PARENT_ENVS" value="true" />
|
<option name="PARENT_ENVS" value="true" />
|
||||||
|
@ -253,7 +228,7 @@
|
||||||
<option name="ADD_CONTENT_ROOTS" value="true" />
|
<option name="ADD_CONTENT_ROOTS" value="true" />
|
||||||
<option name="ADD_SOURCE_ROOTS" value="true" />
|
<option name="ADD_SOURCE_ROOTS" value="true" />
|
||||||
<module name="JDE" />
|
<module name="JDE" />
|
||||||
<option name="SCRIPT_NAME" value="$PROJECT_DIR$/Programs/PyIDE.py" />
|
<option name="SCRIPT_NAME" value="C:\Users\jordon\Documents\GitHub\JDE\inDevelopment\PyIDE.py" />
|
||||||
<option name="PARAMETERS" value="" />
|
<option name="PARAMETERS" value="" />
|
||||||
<option name="SHOW_COMMAND_LINE" value="false" />
|
<option name="SHOW_COMMAND_LINE" value="false" />
|
||||||
<method />
|
<method />
|
||||||
|
@ -275,6 +250,23 @@
|
||||||
<option name="SHOW_COMMAND_LINE" value="false" />
|
<option name="SHOW_COMMAND_LINE" value="false" />
|
||||||
<method />
|
<method />
|
||||||
</configuration>
|
</configuration>
|
||||||
|
<configuration default="false" name="pyMonitor" type="PythonConfigurationType" factoryName="Python" temporary="true">
|
||||||
|
<option name="INTERPRETER_OPTIONS" value="" />
|
||||||
|
<option name="PARENT_ENVS" value="true" />
|
||||||
|
<envs>
|
||||||
|
<env name="PYTHONUNBUFFERED" value="1" />
|
||||||
|
</envs>
|
||||||
|
<option name="SDK_HOME" value="" />
|
||||||
|
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/Programs" />
|
||||||
|
<option name="IS_MODULE_SDK" value="true" />
|
||||||
|
<option name="ADD_CONTENT_ROOTS" value="true" />
|
||||||
|
<option name="ADD_SOURCE_ROOTS" value="true" />
|
||||||
|
<module name="JDE" />
|
||||||
|
<option name="SCRIPT_NAME" value="C:\Users\jordon\Documents\GitHub\JDE\inDevelopment\pyMonitor.py" />
|
||||||
|
<option name="PARAMETERS" value="" />
|
||||||
|
<option name="SHOW_COMMAND_LINE" value="false" />
|
||||||
|
<method />
|
||||||
|
</configuration>
|
||||||
<configuration default="true" type="PythonConfigurationType" factoryName="Python">
|
<configuration default="true" type="PythonConfigurationType" factoryName="Python">
|
||||||
<option name="INTERPRETER_OPTIONS" value="" />
|
<option name="INTERPRETER_OPTIONS" value="" />
|
||||||
<option name="PARENT_ENVS" value="true" />
|
<option name="PARENT_ENVS" value="true" />
|
||||||
|
@ -409,18 +401,20 @@
|
||||||
<option name="USE_KEYWORD" value="false" />
|
<option name="USE_KEYWORD" value="false" />
|
||||||
<method />
|
<method />
|
||||||
</configuration>
|
</configuration>
|
||||||
<list size="4">
|
<list size="5">
|
||||||
<item index="0" class="java.lang.String" itemvalue="Python.run" />
|
<item index="0" class="java.lang.String" itemvalue="Python.run" />
|
||||||
<item index="1" class="java.lang.String" itemvalue="Python.terminal" />
|
<item index="1" class="java.lang.String" itemvalue="Python.terminal" />
|
||||||
<item index="2" class="java.lang.String" itemvalue="Python.PyIDE" />
|
<item index="2" class="java.lang.String" itemvalue="Python.PyIDE" />
|
||||||
<item index="3" class="java.lang.String" itemvalue="Python.test" />
|
<item index="3" class="java.lang.String" itemvalue="Python.test" />
|
||||||
|
<item index="4" class="java.lang.String" itemvalue="Python.pyMonitor" />
|
||||||
</list>
|
</list>
|
||||||
<recent_temporary>
|
<recent_temporary>
|
||||||
<list size="4">
|
<list size="5">
|
||||||
<item index="0" class="java.lang.String" itemvalue="Python.test" />
|
<item index="0" class="java.lang.String" itemvalue="Python.run" />
|
||||||
<item index="1" class="java.lang.String" itemvalue="Python.run" />
|
<item index="1" class="java.lang.String" itemvalue="Python.pyMonitor" />
|
||||||
<item index="2" class="java.lang.String" itemvalue="Python.terminal" />
|
<item index="2" class="java.lang.String" itemvalue="Python.test" />
|
||||||
<item index="3" class="java.lang.String" itemvalue="Python.PyIDE" />
|
<item index="3" class="java.lang.String" itemvalue="Python.terminal" />
|
||||||
|
<item index="4" class="java.lang.String" itemvalue="Python.PyIDE" />
|
||||||
</list>
|
</list>
|
||||||
</recent_temporary>
|
</recent_temporary>
|
||||||
</component>
|
</component>
|
||||||
|
@ -444,23 +438,23 @@
|
||||||
<frame x="-8" y="-8" width="1296" height="776" extended-state="6" />
|
<frame x="-8" y="-8" width="1296" height="776" extended-state="6" />
|
||||||
<editor active="false" />
|
<editor active="false" />
|
||||||
<layout>
|
<layout>
|
||||||
<window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.14228936" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
|
<window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.14228936" sideWeight="0.4937888" order="0" side_tool="false" content_ui="combo" />
|
||||||
<window_info id="TODO" 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="6" side_tool="false" content_ui="tabs" />
|
<window_info id="TODO" 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="6" side_tool="false" content_ui="tabs" />
|
||||||
<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.32882884" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
|
<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.32882884" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
|
||||||
<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.32970452" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
<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.32970452" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
||||||
<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.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
<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.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Structure" active="false" anchor="left" 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" />
|
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32298136" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
|
||||||
|
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.1963434" sideWeight="0.49144635" order="1" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Terminal" 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="7" side_tool="false" content_ui="tabs" />
|
<window_info id="Terminal" 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="7" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
|
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.1963434" sideWeight="0.5085537" order="2" side_tool="true" content_ui="tabs" />
|
||||||
|
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.39906833" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
||||||
<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="4" side_tool="false" content_ui="tabs" />
|
<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="4" side_tool="false" content_ui="tabs" />
|
||||||
<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="0" side_tool="false" content_ui="tabs" />
|
<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="0" side_tool="false" content_ui="tabs" />
|
||||||
<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" />
|
<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" />
|
||||||
<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="5" side_tool="false" content_ui="tabs" />
|
<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="5" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32608697" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
|
|
||||||
<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" />
|
<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" />
|
||||||
<window_info id="Find" 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" />
|
<window_info id="Find" 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" />
|
||||||
<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" />
|
<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" />
|
||||||
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.39906833" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
|
||||||
</layout>
|
</layout>
|
||||||
</component>
|
</component>
|
||||||
<component name="UnknownFeatures">
|
<component name="UnknownFeatures">
|
||||||
|
@ -489,7 +483,6 @@
|
||||||
<watches-manager />
|
<watches-manager />
|
||||||
</component>
|
</component>
|
||||||
<component name="editorHistoryManager">
|
<component name="editorHistoryManager">
|
||||||
<entry file="file://$PROJECT_DIR$/JDE/Logs/23-06-2016-12-03PM.log" />
|
|
||||||
<entry file="file://$PROJECT_DIR$/JDE/Logs/23-06-2016-12-04PM.log" />
|
<entry file="file://$PROJECT_DIR$/JDE/Logs/23-06-2016-12-04PM.log" />
|
||||||
<entry file="file://$PROJECT_DIR$/JDE/Logs/23-06-2016-12-08PM.log" />
|
<entry file="file://$PROJECT_DIR$/JDE/Logs/23-06-2016-12-08PM.log" />
|
||||||
<entry file="file://$PROJECT_DIR$/JDE/Logs/23-06-2016-12-13PM.log" />
|
<entry file="file://$PROJECT_DIR$/JDE/Logs/23-06-2016-12-13PM.log" />
|
||||||
|
@ -502,7 +495,7 @@
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
<entry file="file://$PROJECT_DIR$/Programs/PyIDE.py">
|
<entry file="file://$PROJECT_DIR$/inDevelopment/PyIDE.py">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="136">
|
<state relative-caret-position="136">
|
||||||
<caret line="13" column="49" selection-start-line="13" selection-start-column="49" selection-end-line="13" selection-end-column="49" />
|
<caret line="13" column="49" selection-start-line="13" selection-start-column="49" selection-end-line="13" selection-end-column="49" />
|
||||||
|
@ -559,17 +552,6 @@
|
||||||
<caret line="2" column="0" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" />
|
<caret line="2" column="0" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" />
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
<provider selected="true" editor-type-id="split-provider[text-editor;MarkdownPreviewEditor]">
|
|
||||||
<state split_layout="FIRST">
|
|
||||||
<first_editor relative-caret-position="170">
|
|
||||||
<caret line="10" column="32" selection-start-line="10" selection-start-column="32" selection-end-line="10" selection-end-column="32" />
|
|
||||||
</first_editor>
|
|
||||||
<second_editor />
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
<provider editor-type-id="MarkdownFxPreviewEditor">
|
|
||||||
<state />
|
|
||||||
</provider>
|
|
||||||
</entry>
|
</entry>
|
||||||
<entry file="file://$PROJECT_DIR$/JDE/Logs/08-07-2016-10-04AM.log" />
|
<entry file="file://$PROJECT_DIR$/JDE/Logs/08-07-2016-10-04AM.log" />
|
||||||
<entry file="file://$PROJECT_DIR$/JDE/Logs/08-07-2016-10-12AM.log" />
|
<entry file="file://$PROJECT_DIR$/JDE/Logs/08-07-2016-10-12AM.log" />
|
||||||
|
@ -612,16 +594,6 @@
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
<entry file="file://$PROJECT_DIR$/JDE/Logs/09-07-2016-09-27AM.log" />
|
<entry file="file://$PROJECT_DIR$/JDE/Logs/09-07-2016-09-27AM.log" />
|
||||||
<entry file="file://$PROJECT_DIR$/Programs/FileBrowser.py">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="102">
|
|
||||||
<caret line="7" column="45" selection-start-line="7" selection-start-column="45" selection-end-line="7" selection-end-column="45" />
|
|
||||||
<folding>
|
|
||||||
<element signature="e#0#21#0" expanded="true" />
|
|
||||||
</folding>
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
<entry file="file://$USER_HOME$/PycharmProjects/tkinterWindows/myProgram.py">
|
<entry file="file://$USER_HOME$/PycharmProjects/tkinterWindows/myProgram.py">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="0">
|
<state relative-caret-position="0">
|
||||||
|
@ -629,13 +601,29 @@
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
|
<entry file="file://$PROJECT_DIR$/test.py" />
|
||||||
|
<entry file="file://$PROJECT_DIR$/Programs/FileBrowser.py">
|
||||||
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
|
<state relative-caret-position="102">
|
||||||
|
<caret line="7" column="45" selection-start-line="7" selection-start-column="45" selection-end-line="7" selection-end-column="45" />
|
||||||
|
</state>
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
|
<entry file="file://$PROJECT_DIR$/inDevelopment/pyMonitor.py">
|
||||||
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
|
<state relative-caret-position="0">
|
||||||
|
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
||||||
|
<folding>
|
||||||
|
<element signature="e#0#21#0" expanded="true" />
|
||||||
|
</folding>
|
||||||
|
</state>
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
<entry file="file://$PROJECT_DIR$/JDE/Interfaces/desktop.py">
|
<entry file="file://$PROJECT_DIR$/JDE/Interfaces/desktop.py">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="2550">
|
<state relative-caret-position="255">
|
||||||
<caret line="166" column="0" selection-start-line="166" selection-start-column="0" selection-end-line="166" selection-end-column="0" />
|
<caret line="15" column="32" selection-start-line="15" selection-start-column="32" selection-end-line="15" selection-end-column="32" />
|
||||||
<folding>
|
<folding />
|
||||||
<element signature="e#0#14#0" expanded="true" />
|
|
||||||
</folding>
|
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
|
@ -647,13 +635,5 @@
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
<entry file="file://$PROJECT_DIR$/test.py">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="153">
|
|
||||||
<caret line="9" column="4" selection-start-line="9" selection-start-column="4" selection-end-line="9" selection-end-column="4" />
|
|
||||||
<folding />
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
</component>
|
</component>
|
||||||
</project>
|
</project>
|
Binary file not shown.
Binary file not shown.
|
@ -176,6 +176,8 @@ class desktop:
|
||||||
|
|
||||||
def webEditor():
|
def webEditor():
|
||||||
webEdit.webEdit(self.window)
|
webEdit.webEdit(self.window)
|
||||||
|
# def runPymonitor():
|
||||||
|
# pyMonitor.pyMonitor(self.window)
|
||||||
|
|
||||||
self.contextMenu.add_command(label="Refresh", command=self.desktopRefresh)
|
self.contextMenu.add_command(label="Refresh", command=self.desktopRefresh)
|
||||||
|
|
||||||
|
|
|
@ -1,37 +0,0 @@
|
||||||
05:26:00 PM:JDE.JDE:16}:INFO - Python version: 3.5.2
|
|
||||||
05:26:00 PM:JDE.JDE:18}:INFO - Importing tkinter
|
|
||||||
05:26:00 PM:JDE.JDE:22}:INFO - Import Successful
|
|
||||||
05:26:00 PM:JDE.JDE:26}:INFO - Importing os
|
|
||||||
05:26:00 PM:JDE.JDE:30}:INFO - Import Successful
|
|
||||||
05:26:00 PM:JDE.JDE:34}:INFO - Importing JDE/Interfaces/login
|
|
||||||
05:26:01 PM:JDE.Interfaces.login:9}:DEBUG - Atempting to read settings file
|
|
||||||
05:26:01 PM:JDE.Interfaces.login:13}:DEBUG - System settings Detected!
|
|
||||||
05:26:01 PM:JDE.JDE:38}:INFO - Import Successful!
|
|
||||||
05:26:01 PM:JDE.JDE:42}:INFO - Importing JDE/Interfaces/desktop
|
|
||||||
05:26:01 PM:Programs.jpad:7}:DEBUG - Atempting to read settings file
|
|
||||||
05:26:01 PM:Programs.jpad:11}:DEBUG - System settings Detected!
|
|
||||||
05:26:01 PM:JDE.Interfaces.desktop:21}:DEBUG - Atempting to read settings file
|
|
||||||
05:26:01 PM:JDE.Interfaces.desktop:25}:DEBUG - System settings Detected!
|
|
||||||
05:26:01 PM:JDE.JDE:46}:INFO - Import Successful!
|
|
||||||
05:26:01 PM:JDE.Interfaces.login:160}:DEBUG - Running __init__
|
|
||||||
05:26:01 PM:JDE.Interfaces.login:139}:DEBUG - Running createWindow
|
|
||||||
05:26:01 PM:JDE.Interfaces.login:118}:DEBUG - Running createBackground
|
|
||||||
05:26:01 PM:PIL.PngImagePlugin:135}:DEBUG - STREAM b'IHDR' 16 13
|
|
||||||
05:26:01 PM:PIL.PngImagePlugin:135}:DEBUG - STREAM b'bKGD' 41 6
|
|
||||||
05:26:01 PM:PIL.PngImagePlugin:511}:DEBUG - b'bKGD' 41 6 (unknown)
|
|
||||||
05:26:01 PM:PIL.PngImagePlugin:135}:DEBUG - STREAM b'pHYs' 59 9
|
|
||||||
05:26:01 PM:PIL.PngImagePlugin:135}:DEBUG - STREAM b'tIME' 80 7
|
|
||||||
05:26:01 PM:PIL.PngImagePlugin:511}:DEBUG - b'tIME' 80 7 (unknown)
|
|
||||||
05:26:01 PM:PIL.PngImagePlugin:135}:DEBUG - STREAM b'iTXt' 99 29
|
|
||||||
05:26:01 PM:PIL.PngImagePlugin:135}:DEBUG - STREAM b'IDAT' 140 8192
|
|
||||||
05:26:02 PM:JDE.Interfaces.login:111}:DEBUG - Running createIcon
|
|
||||||
05:26:02 PM:JDE.Interfaces.login:71}:DEBUG - Running createWidgets
|
|
||||||
05:26:02 PM:JDE.Interfaces.login:21}:DEBUG - Running reposition
|
|
||||||
05:26:03 PM:JDE.Interfaces.login:130}:DEBUG - Running fullscreen
|
|
||||||
05:26:03 PM:JDE.Interfaces.login:21}:DEBUG - Running reposition
|
|
||||||
05:26:14 PM:JDE.Interfaces.login:21}:DEBUG - Running reposition
|
|
||||||
05:26:20 PM:JDE.Interfaces.login:130}:DEBUG - Running fullscreen
|
|
||||||
05:26:20 PM:JDE.Interfaces.login:21}:DEBUG - Running reposition
|
|
||||||
05:26:20 PM:JDE.Interfaces.login:130}:DEBUG - Running fullscreen
|
|
||||||
05:26:20 PM:JDE.Interfaces.login:21}:DEBUG - Running reposition
|
|
||||||
05:26:21 PM:JDE.JDE:60}:CRITICAL - [Errno 2] No such file or directory: 'active'
|
|
|
@ -1,18 +0,0 @@
|
||||||
05:29:30 PM:JDE.JDE:16}:INFO - Python version: 3.5.2
|
|
||||||
05:29:30 PM:JDE.JDE:18}:INFO - Importing tkinter
|
|
||||||
05:29:30 PM:JDE.JDE:22}:INFO - Import Successful
|
|
||||||
05:29:30 PM:JDE.JDE:26}:INFO - Importing os
|
|
||||||
05:29:30 PM:JDE.JDE:30}:INFO - Import Successful
|
|
||||||
05:29:30 PM:JDE.JDE:34}:INFO - Importing JDE/Interfaces/login
|
|
||||||
05:29:30 PM:JDE.Interfaces.login:9}:DEBUG - Atempting to read settings file
|
|
||||||
05:29:30 PM:JDE.Interfaces.login:13}:DEBUG - System settings Detected!
|
|
||||||
05:29:30 PM:JDE.JDE:38}:INFO - Import Successful!
|
|
||||||
05:29:30 PM:JDE.JDE:42}:INFO - Importing JDE/Interfaces/desktop
|
|
||||||
05:29:30 PM:Programs.jpad:7}:DEBUG - Atempting to read settings file
|
|
||||||
05:29:30 PM:Programs.jpad:11}:DEBUG - System settings Detected!
|
|
||||||
05:29:30 PM:JDE.Interfaces.desktop:21}:DEBUG - Atempting to read settings file
|
|
||||||
05:29:30 PM:JDE.Interfaces.desktop:25}:DEBUG - System settings Detected!
|
|
||||||
05:29:30 PM:JDE.JDE:46}:INFO - Import Successful!
|
|
||||||
05:29:30 PM:JDE.Interfaces.login:161}:DEBUG - Running __init__
|
|
||||||
05:29:30 PM:JDE.Interfaces.login:139}:DEBUG - Running createWindow
|
|
||||||
05:29:30 PM:JDE.JDE:60}:CRITICAL - couldn't open "your-icon": no such file or directory
|
|
112
inDevelopment/pyMonitor.py
Normal file
112
inDevelopment/pyMonitor.py
Normal file
|
@ -0,0 +1,112 @@
|
||||||
|
from tkinter import *
|
||||||
|
import threading
|
||||||
|
import cpuinfo.cpuinfo as cpuinfo
|
||||||
|
import psutil
|
||||||
|
|
||||||
|
|
||||||
|
class pyMonitor:
|
||||||
|
def storageRender(self):
|
||||||
|
def storage():
|
||||||
|
try:
|
||||||
|
storageFreeLabel.configure(text="Disk(0) Free: " + str(psutil.disk_usage("/").free) + " Bytes")
|
||||||
|
storageUsedLabel.configure(text="Disk(0) Used: " + str(psutil.disk_usage("/").used) + " Bytes")
|
||||||
|
storagePercentLabel.configure(text="Disk(0) Total: " + str(psutil.disk_usage("/").percent) + "%")
|
||||||
|
threading.Timer(1, storage)
|
||||||
|
except:
|
||||||
|
pass
|
||||||
|
storageUsageLabel = Label(self.storageFrame,
|
||||||
|
text="Disk(0) Total: " + str(psutil.disk_usage("/").total) + " Bytes")
|
||||||
|
storageUsedLabel = Label(self.storageFrame,
|
||||||
|
text="Disk(0) Used: " + str(psutil.disk_usage("/").used) + " Bytes")
|
||||||
|
storageFreeLabel = Label(self.storageFrame,
|
||||||
|
text="Disk(0) Free: " + str(psutil.disk_usage("/").free) + " Bytes")
|
||||||
|
storagePercentLabel = Label(self.storageFrame,
|
||||||
|
text="Disk(0) Used: " + str(psutil.disk_usage("/").percent) + "%")
|
||||||
|
|
||||||
|
storageUsageLabel.pack()
|
||||||
|
storageUsedLabel.pack()
|
||||||
|
storageFreeLabel.pack()
|
||||||
|
storagePercentLabel.pack()
|
||||||
|
|
||||||
|
storageThread = threading.Thread(target=storage, name="storage", daemon=True)
|
||||||
|
storageThread.start()
|
||||||
|
|
||||||
|
def ramRender(self):
|
||||||
|
def usedRam():
|
||||||
|
try:
|
||||||
|
usedRamLabel.configure(text="Used RAM: " + str(psutil.virtual_memory().used) + " Bytes")
|
||||||
|
avaailableRamLabel.configure(text="Available RAM: " + str(psutil.virtual_memory().available) + " Bytes")
|
||||||
|
percentRamLabel.configure(text="Used RAM: " + str(psutil.virtual_memory().percent) + "%")
|
||||||
|
threading.Timer(1, usedRam).start()
|
||||||
|
except:
|
||||||
|
pass
|
||||||
|
|
||||||
|
totalRamLabel = Label(self.ramFrame, text="Total RAM: " + str(psutil.virtual_memory().total) + " Bytes")
|
||||||
|
usedRamLabel = Label(self.ramFrame, text="Used RAM: " + str(psutil.virtual_memory().used) + " Bytes")
|
||||||
|
|
||||||
|
avaailableRamLabel = Label(self.ramFrame,
|
||||||
|
text="Available RAM: " + str(psutil.virtual_memory().available) + " Bytes")
|
||||||
|
percentRamLabel = Label(self.ramFrame,
|
||||||
|
text="Used RAM: " + str(psutil.virtual_memory().percent) + "%")
|
||||||
|
|
||||||
|
totalRamLabel.pack()
|
||||||
|
usedRamLabel.pack()
|
||||||
|
avaailableRamLabel.pack()
|
||||||
|
percentRamLabel.pack()
|
||||||
|
|
||||||
|
usedRamThread = threading.Thread(target=usedRam, name="usedRam", daemon=True)
|
||||||
|
usedRamThread.start()
|
||||||
|
|
||||||
|
def cpuRender(self):
|
||||||
|
def getUsage():
|
||||||
|
try:
|
||||||
|
cpuPercentLabel.configure(text="Usage: " + str(psutil.cpu_percent(interval=1)) + "%")
|
||||||
|
threading.Timer(1, getUsage).start()
|
||||||
|
except:
|
||||||
|
pass
|
||||||
|
|
||||||
|
cpuName = cpuinfo.get_cpu_info()["brand"]
|
||||||
|
cpuNameLabel = Label(self.cpuFrame, text="Name: " + cpuName)
|
||||||
|
|
||||||
|
cpuFreqActual = cpuinfo.get_cpu_info()["hz_actual"]
|
||||||
|
cpuFreqActualLabel = Label(self.cpuFrame, text="Actual Speed: " + cpuFreqActual)
|
||||||
|
|
||||||
|
cpuCoreCount = cpuinfo.get_cpu_info()["count"]
|
||||||
|
cpuCoreCountLabel = Label(self.cpuFrame, text="Cores: " + str(cpuCoreCount))
|
||||||
|
|
||||||
|
cpuPercentLabel = Label(self.cpuFrame, text="Usage: " + str(psutil.cpu_percent()) + "%")
|
||||||
|
|
||||||
|
cpuNameLabel.pack()
|
||||||
|
cpuFreqActualLabel.pack()
|
||||||
|
cpuCoreCountLabel.pack()
|
||||||
|
cpuPercentLabel.pack()
|
||||||
|
getUsageThread = threading.Thread(target=getUsage, name="getUsage", daemon=True)
|
||||||
|
getUsageThread.start()
|
||||||
|
|
||||||
|
def createContainers(self):
|
||||||
|
self.storageFrame = LabelFrame(self.window, text="Storage")
|
||||||
|
self.ramFrame = LabelFrame(self.window, text="RAM")
|
||||||
|
self.cpuFrame = LabelFrame(self.window, text="CPU")
|
||||||
|
|
||||||
|
self.storageFrame.pack(side=LEFT, expand=YES, fill=BOTH)
|
||||||
|
self.ramFrame.pack(side=LEFT, expand=YES, fill=BOTH)
|
||||||
|
self.cpuFrame.pack(side=LEFT, expand=YES, fill=BOTH)
|
||||||
|
|
||||||
|
cpuRenderThread = threading.Thread(target=self.cpuRender, name="cpuRender", daemon=True)
|
||||||
|
cpuRenderThread.start()
|
||||||
|
|
||||||
|
ramRenderThread = threading.Thread(target=self.ramRender, name="ramRender", daemon=True)
|
||||||
|
ramRenderThread.start()
|
||||||
|
|
||||||
|
storageRenderThread = threading.Thread(target=self.storageRender, name="storageRender", daemon=True)
|
||||||
|
storageRenderThread.start()
|
||||||
|
|
||||||
|
def __init__(self, master):
|
||||||
|
self.window = Toplevel(master)
|
||||||
|
self.window.title("pyMonitor")
|
||||||
|
# self.window.geometry("800x400")
|
||||||
|
|
||||||
|
containerThread = threading.Thread(target=self.createContainers, name="createContainers", daemon=True)
|
||||||
|
containerThread.start()
|
||||||
|
|
||||||
|
self.window.mainloop()
|
6
setup.py
6
setup.py
|
@ -2,9 +2,9 @@
|
||||||
import sys
|
import sys
|
||||||
from cx_Freeze import setup, Executable
|
from cx_Freeze import setup, Executable
|
||||||
|
|
||||||
base = None
|
# None for commandline or "Win32GUI" or GUI
|
||||||
if sys.platform == "win32":
|
|
||||||
base = "Win32GUI"
|
base = "Win32GUI"
|
||||||
|
|
||||||
|
|
||||||
dataFiles = ["JDE/", "Programs/", "Users/"]
|
dataFiles = ["JDE/", "Programs/", "Users/"]
|
||||||
|
|
Reference in a new issue