jordon/JDE
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Compare commits

base: jordon:master
Branches Tags
jordon:master
jordon:1.2.0a
jordon:1.1.0a
jordon:1.0.0
jordon:1.5.0a
..
compare: jordon:1.5.0a
Branches Tags
jordon:master
jordon:1.2.0a
jordon:1.1.0a
jordon:1.0.0
jordon:1.5.0a

No commits in common. "master" and "1.5.0a" have entirely different histories.
master ... 1.5.0a

18 changed files with 78 additions and 208 deletions
Download patch file Download diff file Expand all files Collapse all files

153
.idea/workspace.xml generated
View file

@ -20,7 +20,42 @@
<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="68">
<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="true">
<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="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">
@ -38,6 +73,7 @@
<list> <list>
<option value="$PROJECT_DIR$/Programs/jpad.py" /> <option value="$PROJECT_DIR$/Programs/jpad.py" />
<option value="$PROJECT_DIR$/Programs/PyIDE.py" /> <option value="$PROJECT_DIR$/Programs/PyIDE.py" />
<option value="$PROJECT_DIR$/test.py" />
<option value="$PROJECT_DIR$/Programs/terminal.py" /> <option value="$PROJECT_DIR$/Programs/terminal.py" />
<option value="$PROJECT_DIR$/Programs/webEdit/htmlEdit.py" /> <option value="$PROJECT_DIR$/Programs/webEdit/htmlEdit.py" />
<option value="$PROJECT_DIR$/README.md" /> <option value="$PROJECT_DIR$/README.md" />
@ -45,8 +81,6 @@
<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" />
</list> </list>
@ -83,6 +117,7 @@
<foldersAlwaysOnTop value="true" /> <foldersAlwaysOnTop value="true" />
</navigator> </navigator>
<panes> <panes>
<pane id="Scope" />
<pane id="ProjectPane"> <pane id="ProjectPane">
<subPane> <subPane>
<PATH> <PATH>
@ -101,20 +136,6 @@
<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" />
@ -167,20 +188,14 @@
</PATH> </PATH>
</subPane> </subPane>
</pane> </pane>
<pane id="Scope" />
<pane id="Scratches" /> <pane id="Scratches" />
</panes> </panes>
</component> </component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">
<property name="last_opened_file_path" value="$PROJECT_DIR$" /> <property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="settings.editor.selected.configurable" value="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable" /> <property name="settings.editor.selected.configurable" value="project.propVCSSupport.Mappings" />
<property name="settings.editor.splitter.proportion" value="0.2" /> <property name="settings.editor.splitter.proportion" value="0.2" />
</component> </component>
<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"> <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="" />
@ -228,7 +243,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="C:\Users\jordon\Documents\GitHub\JDE\inDevelopment\PyIDE.py" /> <option name="SCRIPT_NAME" value="$PROJECT_DIR$/Programs/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 />
@ -250,23 +265,6 @@
<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" />
@ -401,20 +399,18 @@
<option name="USE_KEYWORD" value="false" /> <option name="USE_KEYWORD" value="false" />
<method /> <method />
</configuration> </configuration>
<list size="5"> <list size="4">
<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="5"> <list size="4">
<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.pyMonitor" /> <item index="1" class="java.lang.String" itemvalue="Python.terminal" />
<item index="2" class="java.lang.String" itemvalue="Python.test" /> <item index="2" class="java.lang.String" itemvalue="Python.test" />
<item index="3" class="java.lang.String" itemvalue="Python.terminal" /> <item index="3" class="java.lang.String" itemvalue="Python.PyIDE" />
<item index="4" class="java.lang.String" itemvalue="Python.PyIDE" />
</list> </list>
</recent_temporary> </recent_temporary>
</component> </component>
@ -438,23 +434,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.4937888" order="0" side_tool="false" content_ui="combo" /> <window_info id="Project" active="false" 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="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="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.25" sideWeight="0.5" order="1" 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.1963434" sideWeight="0.5085537" 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.33" sideWeight="0.5" 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.32659408" 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">
@ -483,6 +479,7 @@
<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" />
@ -495,7 +492,7 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/inDevelopment/PyIDE.py"> <entry file="file://$PROJECT_DIR$/Programs/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" />
@ -523,6 +520,7 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/test.py" />
<entry file="file://$PROJECT_DIR$/run.py"> <entry file="file://$PROJECT_DIR$/run.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="17"> <state relative-caret-position="17">
@ -547,11 +545,22 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/JDE/Logs/29-06-2016-14-14PM.log" /> <entry file="file://$PROJECT_DIR$/JDE/Logs/29-06-2016-14-14PM.log" />
<entry file="file://$PROJECT_DIR$/README.md"> <entry file="file://$PROJECT_DIR$/README.md">
<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="text-editor"> <provider editor-type-id="text-editor">
<state relative-caret-position="34"> <state relative-caret-position="34">
<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 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" />
@ -594,6 +603,16 @@
</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">
@ -601,29 +620,13 @@
</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="255"> <state relative-caret-position="68">
<caret line="15" column="32" selection-start-line="15" selection-start-column="32" selection-end-line="15" selection-end-column="32" /> <caret line="166" column="0" selection-start-line="166" selection-start-column="0" selection-end-line="166" selection-end-column="0" />
<folding /> <folding>
<element signature="e#0#14#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>

BIN
JDE Icon.xcf
View file

Binary file not shown.

BIN
JDE/Interfaces/__pycache__/desktop.cpython-35.pyc
View file

Binary file not shown.

BIN
JDE/Interfaces/__pycache__/login.cpython-35.pyc
View file

Binary file not shown.

BIN
JDE/Interfaces/__pycache__/start.cpython-35.pyc
View file

Binary file not shown.

2
JDE/Interfaces/desktop.py
View file

@ -176,8 +176,6 @@ 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)

BIN
JDE/__pycache__/JDE.cpython-35.pyc
View file

Binary file not shown.

0
inDevelopment/PyIDE.py → Programs/PyIDE.py
View file

BIN
Programs/__pycache__/FileBrowser.cpython-35.pyc
View file

Binary file not shown.

BIN
Programs/__pycache__/imageViewer.cpython-35.pyc
View file

Binary file not shown.

BIN
Programs/__pycache__/info.cpython-35.pyc
View file

Binary file not shown.

BIN
Programs/__pycache__/jpad.cpython-35.pyc
View file

Binary file not shown.

BIN
Programs/__pycache__/minesweeper.cpython-35.pyc
View file

Binary file not shown.

BIN
Programs/__pycache__/terminal.cpython-35.pyc
View file

Binary file not shown.

BIN
Programs/webEdit/__pycache__/htmlEdit.cpython-35.pyc
View file

Binary file not shown.

BIN
icon.ico
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 3.9 KiB

112
inDevelopment/pyMonitor.py
View file

@ -1,112 +0,0 @@
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()

19
setup.py
View file

@ -1,19 +0,0 @@
#!python3.4
import sys
from cx_Freeze import setup, Executable
# None for commandline or "Win32GUI" or GUI
base = "Win32GUI"
dataFiles = ["JDE/", "Programs/", "Users/"]
modules = ["logging", "tkinter", "PIL"]
setup(name="JDE",
version="1.5.0a",
author="Jordon Brooks",
url="https://jordonbc.github.io",
options = {'build_exe': {'include_files':dataFiles, 'packages': modules}},
description="Editor",
executables = [Executable("run.py", base=base, icon="icon.ico")])