1.4.5a
Squashed a few bugs and optimized background draws
This commit is contained in:
parent
028b562275
commit
c56a313fc5
5 changed files with 163 additions and 228 deletions
6
.idea/encodings.xml
generated
Normal file
6
.idea/encodings.xml
generated
Normal file
|
@ -0,0 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="Encoding">
|
||||
<file url="file://$PROJECT_DIR$/JDE/Settings/settings.conf" charset="UTF-8" />
|
||||
</component>
|
||||
</project>
|
228
.idea/workspace.xml
generated
228
.idea/workspace.xml
generated
|
@ -20,7 +20,20 @@
|
|||
<favorites_list name="JDE" />
|
||||
</component>
|
||||
<component name="FileEditorManager">
|
||||
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
|
||||
<leaf>
|
||||
<file leaf-file-name="desktop.py" pinned="false" current-in-tab="true">
|
||||
<entry file="file://$PROJECT_DIR$/JDE/Interfaces/desktop.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="2227">
|
||||
<caret line="131" column="62" selection-start-line="131" selection-start-column="62" selection-end-line="131" selection-end-column="62" />
|
||||
<folding>
|
||||
<element signature="e#0#14#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
</leaf>
|
||||
</component>
|
||||
<component name="FileTemplateManagerImpl">
|
||||
<option name="RECENT_TEMPLATES">
|
||||
|
@ -42,6 +55,7 @@
|
|||
<option value="$PROJECT_DIR$/Programs/terminal.py" />
|
||||
<option value="$PROJECT_DIR$/Programs/webEdit/htmlEdit.py" />
|
||||
<option value="$PROJECT_DIR$/README.md" />
|
||||
<option value="$PROJECT_DIR$/JDE/Logs/09-07-2016-08-27AM.log" />
|
||||
<option value="$PROJECT_DIR$/JDE/JDE.py" />
|
||||
<option value="$PROJECT_DIR$/JDE/Interfaces/login.py" />
|
||||
<option value="$PROJECT_DIR$/JDE/Interfaces/desktop.py" />
|
||||
|
@ -112,46 +126,10 @@
|
|||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||
</PATH_ELEMENT>
|
||||
</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="JDE" />
|
||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||
</PATH_ELEMENT>
|
||||
<PATH_ELEMENT>
|
||||
<option name="myItemId" value="Settings" />
|
||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||
</PATH_ELEMENT>
|
||||
</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="JDE" />
|
||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||
</PATH_ELEMENT>
|
||||
<PATH_ELEMENT>
|
||||
<option name="myItemId" value="Interfaces" />
|
||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||
</PATH_ELEMENT>
|
||||
</PATH>
|
||||
</subPane>
|
||||
</pane>
|
||||
<pane id="Scope" />
|
||||
<pane id="Scratches" />
|
||||
<pane id="Scope" />
|
||||
</panes>
|
||||
</component>
|
||||
<component name="PropertiesComponent">
|
||||
|
@ -397,7 +375,7 @@
|
|||
<frame x="-8" y="-8" width="1296" height="776" extended-state="6" />
|
||||
<editor active="false" />
|
||||
<layout>
|
||||
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2281399" sideWeight="0.5" 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="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" />
|
||||
|
@ -442,21 +420,6 @@
|
|||
<watches-manager />
|
||||
</component>
|
||||
<component name="editorHistoryManager">
|
||||
<entry file="file://$PROJECT_DIR$/JDE/Logs/23-06-2016-11-26AM.log" />
|
||||
<entry file="file://$PROJECT_DIR$/JDE/Logs/23-06-2016-11-31AM.log" />
|
||||
<entry file="file://$PROJECT_DIR$/JDE/Logs/23-06-2016-11-33AM.log" />
|
||||
<entry file="file://$PROJECT_DIR$/JDE/Logs/23-06-2016-11-34AM.log" />
|
||||
<entry file="file://$PROJECT_DIR$/JDE/Interfaces/start.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" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/JDE/Logs/23-06-2016-11-36AM.log" />
|
||||
<entry file="file://$PROJECT_DIR$/JDE/Logs/23-06-2016-11-47AM.log" />
|
||||
<entry file="file://$PROJECT_DIR$/JDE/Logs/23-06-2016-11-49AM.log" />
|
||||
<entry file="file://$PROJECT_DIR$/JDE/Logs/23-06-2016-11-51AM.log" />
|
||||
<entry file="file://$PROJECT_DIR$/JDE/Logs/23-06-2016-11-55AM.log" />
|
||||
<entry file="file://$PROJECT_DIR$/JDE/Logs/23-06-2016-11-56AM.log" />
|
||||
<entry file="file://$PROJECT_DIR$/JDE/Logs/23-06-2016-11-59AM.log" />
|
||||
|
@ -543,7 +506,32 @@
|
|||
<state />
|
||||
</provider>
|
||||
</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-15AM.log" />
|
||||
<entry file="file://$PROJECT_DIR$/JDE/Logs/08-07-2016-10-25AM.log" />
|
||||
<entry file="file://$PROJECT_DIR$/JDE/Logs/08-07-2016-10-34AM.log" />
|
||||
<entry file="file://$PROJECT_DIR$/JDE/Logs/08-07-2016-10-41AM.log" />
|
||||
<entry file="file://$PROJECT_DIR$/JDE/Logs/08-07-2016-10-42AM.log" />
|
||||
<entry file="file://$PROJECT_DIR$/JDE/Logs/08-07-2016-10-44AM.log" />
|
||||
<entry file="file://$PROJECT_DIR$/JDE/Logs/08-07-2016-10-46AM.log" />
|
||||
<entry file="file://$PROJECT_DIR$/JDE/Logs/08-07-2016-10-47AM.log" />
|
||||
<entry file="file://$PROJECT_DIR$/JDE/Logs/08-07-2016-10-50AM.log" />
|
||||
<entry file="file://$PROJECT_DIR$/JDE/Logs/08-07-2016-10-57AM.log" />
|
||||
<entry file="file://$PROJECT_DIR$/JDE/Logs/08-07-2016-11-33AM.log" />
|
||||
<entry file="file://$PROJECT_DIR$/JDE/Logs/08-07-2016-11-41AM.log" />
|
||||
<entry file="file://$PROJECT_DIR$/JDE/Logs/08-07-2016-12-02PM.log" />
|
||||
<entry file="file://$PROJECT_DIR$/JDE/Logs/08-07-2016-12-04PM.log" />
|
||||
<entry file="file://$PROJECT_DIR$/JDE/Logs/08-07-2016-12-10PM.log" />
|
||||
<entry file="file://$PROJECT_DIR$/JDE/Logs/09-07-2016-08-15AM.log">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="119">
|
||||
<caret line="7" column="76" selection-start-line="7" selection-start-column="45" selection-end-line="7" selection-end-column="76" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/JDE/Logs/09-07-2016-08-17AM.log">
|
||||
<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" />
|
||||
|
@ -551,7 +539,7 @@
|
|||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/JDE/Logs/08-07-2016-10-12AM.log">
|
||||
<entry file="file://$PROJECT_DIR$/JDE/Logs/09-07-2016-08-21AM.log">
|
||||
<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" />
|
||||
|
@ -559,25 +547,7 @@
|
|||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/JDE/Logs/08-07-2016-10-15AM.log">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="51">
|
||||
<caret line="3" column="43" selection-start-line="3" selection-start-column="43" selection-end-line="3" selection-end-column="43" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/JDE/JDE.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="38">
|
||||
<caret line="15" column="114" selection-start-line="15" selection-start-column="114" selection-end-line="15" selection-end-column="114" />
|
||||
<folding>
|
||||
<element signature="e#24#38#0" expanded="false" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/JDE/Logs/08-07-2016-10-25AM.log">
|
||||
<entry file="file://$PROJECT_DIR$/JDE/Logs/09-07-2016-08-22AM.log">
|
||||
<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" />
|
||||
|
@ -585,63 +555,7 @@
|
|||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/JDE/Logs/08-07-2016-10-34AM.log">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="272">
|
||||
<caret line="16" column="88" selection-start-line="16" selection-start-column="45" selection-end-line="16" selection-end-column="88" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/JDE/Logs/08-07-2016-10-41AM.log">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="-64">
|
||||
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/JDE/Logs/08-07-2016-10-42AM.log">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="272">
|
||||
<caret line="16" column="88" selection-start-line="16" selection-start-column="56" selection-end-line="16" selection-end-column="88" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/JDE/Logs/08-07-2016-10-44AM.log">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="153">
|
||||
<caret line="24" column="91" selection-start-line="24" selection-start-column="74" selection-end-line="24" selection-end-column="91" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/JDE/Logs/08-07-2016-10-46AM.log">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="-435">
|
||||
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/JDE/Logs/08-07-2016-10-47AM.log">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="289">
|
||||
<caret line="29" column="60" selection-start-line="28" selection-start-column="115" selection-end-line="29" selection-end-column="60" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/JDE/Logs/08-07-2016-10-50AM.log">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="-632">
|
||||
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/JDE/Logs/08-07-2016-10-57AM.log">
|
||||
<entry file="file://$PROJECT_DIR$/JDE/Logs/09-07-2016-08-26AM.log">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="-153">
|
||||
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
||||
|
@ -649,68 +563,70 @@
|
|||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/JDE/Logs/08-07-2016-11-33AM.log">
|
||||
<entry file="file://$PROJECT_DIR$/JDE/Logs/09-07-2016-08-27AM.log">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="-204">
|
||||
<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 />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/JDE/Logs/08-07-2016-11-41AM.log">
|
||||
<entry file="file://$PROJECT_DIR$/JDE/Logs/09-07-2016-08-27AM.log">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="-408">
|
||||
<state relative-caret-position="-1380">
|
||||
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/JDE/Logs/08-07-2016-12-02PM.log">
|
||||
<entry file="file://$PROJECT_DIR$/JDE/Logs/09-07-2016-08-33AM.log">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="-561">
|
||||
<state relative-caret-position="-207">
|
||||
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/JDE/Logs/08-07-2016-12-04PM.log">
|
||||
<entry file="file://$PROJECT_DIR$/JDE/JDE.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="-663">
|
||||
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
||||
<folding />
|
||||
<state relative-caret-position="17">
|
||||
<caret line="4" column="10" selection-start-line="4" selection-start-column="10" selection-end-line="4" selection-end-column="10" />
|
||||
<folding>
|
||||
<element signature="e#24#38#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/JDE/Logs/08-07-2016-12-10PM.log">
|
||||
<entry file="file://$PROJECT_DIR$/JDE/Logs/09-07-2016-09-01AM.log">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="-632">
|
||||
<state relative-caret-position="-357">
|
||||
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/JDE/Settings/settings.conf">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="303">
|
||||
<caret line="28" column="1" selection-start-line="28" selection-start-column="1" selection-end-line="28" selection-end-column="1" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/JDE/Interfaces/login.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="272">
|
||||
<caret line="31" column="38" selection-start-line="31" selection-start-column="38" selection-end-line="31" selection-end-column="38" />
|
||||
<state relative-caret-position="221">
|
||||
<caret line="147" column="52" selection-start-line="147" selection-start-column="52" selection-end-line="147" selection-end-column="52" />
|
||||
<folding>
|
||||
<element signature="e#0#14#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/JDE/Settings/settings.conf">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="119">
|
||||
<caret line="7" column="24" selection-start-line="7" selection-start-column="24" selection-end-line="7" selection-end-column="24" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/JDE/Interfaces/desktop.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="255">
|
||||
<caret line="75" column="44" selection-start-line="75" selection-start-column="44" selection-end-line="75" selection-end-column="44" />
|
||||
<state relative-caret-position="2227">
|
||||
<caret line="131" column="62" selection-start-line="131" selection-start-column="62" selection-end-line="131" selection-end-column="62" />
|
||||
<folding>
|
||||
<element signature="e#0#14#0" expanded="true" />
|
||||
</folding>
|
||||
|
|
|
@ -13,6 +13,7 @@ from Programs import imageViewer
|
|||
from Programs import minesweeper
|
||||
from Programs import terminal
|
||||
from Programs.webEdit import htmlEdit as webEdit
|
||||
import threading
|
||||
|
||||
desktopLog = logging.getLogger(__name__)
|
||||
|
||||
|
@ -45,43 +46,53 @@ class desktop:
|
|||
desktopLog.error(str(e))
|
||||
|
||||
def reposition(self, event):
|
||||
desktopLog.debug("Running "+desktop.reposition.__name__)
|
||||
try:
|
||||
self.cHeight = self.window.winfo_height()
|
||||
self.cWidth = self.window.winfo_width()
|
||||
if self.tempWidth != self.window.winfo_width() or self.tempHeight != self.window.winfo_height():
|
||||
desktopLog.debug("Running "+desktop.reposition.__name__)
|
||||
try:
|
||||
self.cHeight = self.window.winfo_height()
|
||||
self.cWidth = self.window.winfo_width()
|
||||
|
||||
self.centerWidth = self.window.winfo_x() + int(int(self.cWidth) / 2)
|
||||
self.centerHeight = self.window.winfo_y() + int(int(self.cHeight) / 2)
|
||||
self.centerWidth = self.window.winfo_x() + int(int(self.cWidth) / 2)
|
||||
self.centerHeight = self.window.winfo_y() + int(int(self.cHeight) / 2)
|
||||
|
||||
self.screenCenter = str(self.centerWidth) + "+" + str(self.centerHeight)
|
||||
self.screenCenter = str(self.centerWidth) + "+" + str(self.centerHeight)
|
||||
|
||||
# self.startPic.place_configure(x=int(0), y=int(self.cHeight) - 55)
|
||||
# self.startPic.place_configure(x=int(0), y=int(self.cHeight) - 55)
|
||||
def searchPlaceRepos():
|
||||
self.search.place_configure(x=0, y=int(self.cHeight) - 55, height=55, width=300)
|
||||
|
||||
self.search.place_configure(x=0, y=int(self.cHeight) - 55, height=55, width=300)
|
||||
# versionText.place(x=int(cWidth) - 300, y=int(cHeight) - 120)
|
||||
|
||||
# versionText.place(x=int(cWidth) - 300, y=int(cHeight) - 120)
|
||||
def toolbarPlaceRepos():
|
||||
self.toolbar.place_configure(x=258, y=int(self.cHeight) - 55, height=55, width=int(self.cWidth))
|
||||
|
||||
self.toolbar.place_configure(x=258, y=int(self.cHeight) - 55, height=55, width=int(self.cWidth))
|
||||
def notifyBarPlaceRepos():
|
||||
self.notifcationBar.place_configure(x=int(self.cWidth) - 500, y=int(self.cHeight) - 55, height=55,
|
||||
width=500)
|
||||
|
||||
self.notifcationBar.place_configure(x=int(self.cWidth) - 500, y=int(self.cHeight) - 55, height=55,
|
||||
width=500)
|
||||
if config["resizeBackground"]:
|
||||
try:
|
||||
self.canvas.delete("background")
|
||||
backgroundResized = self.image.resize((self.cWidth, self.cHeight), PIL.Image.ANTIALIAS)
|
||||
backgroundResizedImage = PIL.ImageTk.PhotoImage(backgroundResized)
|
||||
self.canvas.backgroundImage = backgroundResizedImage
|
||||
self.canvas.create_image(0, 0, image=backgroundResizedImage, anchor=NW, tag="background")
|
||||
except Exception as e:
|
||||
desktopLog.error(str(e))
|
||||
def resizeBackground():
|
||||
if self.background_image.width() != self.cWidth or self.background_image.height() != self.cHeight:
|
||||
if config["resizeBackground"]:
|
||||
try:
|
||||
self.canvas.delete("background")
|
||||
backgroundResized = self.image.resize((self.cWidth, self.cHeight), PIL.Image.ANTIALIAS)
|
||||
self.background_image = PIL.ImageTk.PhotoImage(backgroundResized)
|
||||
self.canvas.backgroundImage = self.background_image
|
||||
self.canvas.create_image(0, 0, image=self.background_image, anchor=NW, tag="background")
|
||||
except Exception as e:
|
||||
desktopLog.error(str(e))
|
||||
threading.Thread(target=searchPlaceRepos, daemon=True).start()
|
||||
threading.Thread(target=toolbarPlaceRepos, daemon=True).start()
|
||||
threading.Thread(target=notifyBarPlaceRepos, daemon=True).start()
|
||||
threading.Thread(target=resizeBackground, daemon=True).start()
|
||||
|
||||
|
||||
self.windowX = self.window.winfo_x()
|
||||
self.windowY = (self.window.winfo_y() + self.window.winfo_height())
|
||||
self.windowX = self.window.winfo_x()
|
||||
self.windowY = (self.window.winfo_y() + self.window.winfo_height())
|
||||
|
||||
# displayTime.pack_configure(side=RIGHT)
|
||||
except Exception as e:
|
||||
desktopLog.error(str(e))
|
||||
# displayTime.pack_configure(side=RIGHT)
|
||||
except Exception as e:
|
||||
desktopLog.error(str(e))
|
||||
|
||||
def fullScreen(self, event):
|
||||
desktopLog.debug("Running "+desktop.fullScreen.__name__)
|
||||
|
@ -116,7 +127,7 @@ class desktop:
|
|||
try:
|
||||
self.searchText = Label(self.window, text="Search for: ")
|
||||
self.searchvar = StringVar()
|
||||
self.search = Entry(self.window, textvariable=self.searchvar, font=(14), bg=self.menuColour)
|
||||
self.search = Entry(self.window, textvariable=self.searchvar, font=(14), bg=self.menuColour, relief=FLAT)
|
||||
self.search.bind("<Button-1>", self.box)
|
||||
self.search.bind("<Return>", self.search_internet)
|
||||
self.search.place(x=0, y=350, height=50, width=100)
|
||||
|
@ -281,6 +292,8 @@ class desktop:
|
|||
self.window.minsize(640, 360)
|
||||
self.windowX = self.window.winfo_x()
|
||||
self.windowY = self.window.winfo_y()
|
||||
self.tempWidth = self.window.winfo_width()
|
||||
self.tempHeight = self.window.winfo_height()
|
||||
|
||||
self.canvas = Canvas(self.window, width=self.width, height=self.height)
|
||||
self.canvas.pack(expand=YES, fill=BOTH)
|
||||
|
|
|
@ -2,6 +2,7 @@ import logging
|
|||
import PIL.Image
|
||||
import PIL.ImageTk
|
||||
from tkinter import *
|
||||
import threading
|
||||
|
||||
loginLog = logging.getLogger(__name__)
|
||||
|
||||
|
@ -16,20 +17,30 @@ except Exception as e:
|
|||
|
||||
class login:
|
||||
def reposition(self, event):
|
||||
loginLog.debug("Running reposition")
|
||||
self.frame.place_configure(x=int(self.window.winfo_width() / 3), y=self.window.winfo_height() / 3,
|
||||
width=int(int(self.window.winfo_width()) / 3),
|
||||
height=int(int(self.window.winfo_height()) / 3))
|
||||
if config["resizeBackground"]:
|
||||
try:
|
||||
self.canvas.delete("Background")
|
||||
background_image_resized = self.bg_image.resize((self.window.winfo_width(), self.window.winfo_height()),
|
||||
PIL.Image.ANTIALIAS)
|
||||
background_image = PIL.ImageTk.PhotoImage(background_image_resized)
|
||||
self.canvas.backgroundImage = background_image
|
||||
self.canvas.create_image(0, 0, image=background_image, anchor=NW, tag="Background")
|
||||
except Exception as e:
|
||||
loginLog.error(str(e))
|
||||
if self.tempWidth != self.window.winfo_width() or self.tempHeight != self.window.winfo_height():
|
||||
loginLog.debug("Running reposition")
|
||||
def reposFrame():
|
||||
self.frame.place_configure(x=int(self.window.winfo_width() / 3), y=self.window.winfo_height() / 3,
|
||||
width=int(int(self.window.winfo_width()) / 3),
|
||||
height=int(int(self.window.winfo_height()) / 3))
|
||||
|
||||
if self.background_image.width() != self.window.winfo_width() or self.background_image.height() != self.window.winfo_height():
|
||||
def reposBackground():
|
||||
if config["resizeBackground"]:
|
||||
try:
|
||||
self.canvas.delete("Background")
|
||||
background_image_resized = self.bg_image.resize((self.window.winfo_width(), self.window.winfo_height()),
|
||||
PIL.Image.ANTIALIAS)
|
||||
self.background_image = PIL.ImageTk.PhotoImage(background_image_resized)
|
||||
self.canvas.backgroundImage = self.background_image
|
||||
self.canvas.create_image(0, 0, image=self.background_image, anchor=NW, tag="Background")
|
||||
except Exception as e:
|
||||
loginLog.error(str(e))
|
||||
|
||||
threading.Thread(target=reposFrame, daemon=True).start()
|
||||
threading.Thread(target=reposBackground, daemon=True).start()
|
||||
self.tempWidth = self.window.winfo_width()
|
||||
self.tempHeight = self.window.winfo_height()
|
||||
|
||||
def callback(self, event):
|
||||
loginLog.debug("Running callback")
|
||||
|
@ -79,7 +90,13 @@ class login:
|
|||
self.go.bind("<Button-1>", self.callback)
|
||||
self.go.bind("<Return>", self.callback)
|
||||
self.passw.bind("<Return>", self.callback)
|
||||
self.window.bind("<Configure>", self.reposition)
|
||||
|
||||
self.reposition(self)
|
||||
|
||||
def configureWindow():
|
||||
self.window.bind("<Configure>", self.reposition)
|
||||
|
||||
threading.Thread(target=configureWindow, daemon=True).start()
|
||||
|
||||
self.window.mainloop()
|
||||
|
||||
|
@ -127,6 +144,9 @@ class login:
|
|||
self.frame = Frame(self.canvas)
|
||||
self.frame.configure(bg=self.bgColour)
|
||||
|
||||
self.tempWidth = self.window.winfo_width()
|
||||
self.tempHeight = self.window.winfo_height()
|
||||
|
||||
self.canvas.pack()
|
||||
|
||||
self.window.attributes('-fullscreen', True)
|
||||
|
|
|
@ -1,29 +1,9 @@
|
|||
# --== JDE SETTINGS ==--
|
||||
|
||||
width = "1280" # Sets the width of JDE -- Outdated ( not used )
|
||||
height = "800" # Sets the height of JDE -- Outdated ( not used )
|
||||
userDirs = "Users/" # Sets the user directory
|
||||
background = "JDE/Images/background.png" # Path to background image
|
||||
colour = "#a0fd44" # Background colour of the taskbar
|
||||
startPic = "JDE/Images/start.png" # sets the start menu picture ( not used )
|
||||
contextMenuColour = "#a0fd44" # Sets the colour of the context menu
|
||||
|
||||
resizeBackground = False # Resizes the background but can be VERY slow!
|
||||
|
||||
version = "1.4.0 ALPHA" # Please don't Change, it's here for a reason!
|
||||
|
||||
#░░░░▄▄▄▄▀▀▀▀▀▀▀▀▄▄▄▄▄▄
|
||||
#░░░░█░░░░▒▒▒▒▒▒▒▒▒▒▒▒░░▀▀▄
|
||||
#░░░█░░░▒▒▒▒▒▒░░░░░░░░▒▒▒░░█
|
||||
#░░█░░░░░░▄██▀▄▄░░░░░▄▄▄░░░█
|
||||
#░▀▒▄▄▄▒░█▀▀▀▀▄▄█░░░██▄▄█░░░█
|
||||
#█▒█▒▄░▀▄▄▄▀░░░░░░░░█░░░▒▒▒▒▒█
|
||||
#█▒█░█▀▄▄░░░░░█▀░░░░▀▄░░▄▀▀▀▄▒█
|
||||
#░█▀▄░█▄░█▀▄▄░▀░▀▀░▄▄▀░░░░█░░█
|
||||
#░░█░░▀▄▀█▄▄░█▀▀▀▄▄▄▄▀▀█▀██░█
|
||||
#░░░█░░██░░▀█▄▄▄█▄▄█▄████░█
|
||||
#░░░░█░░░▀▀▄░█░░░█░███████░█
|
||||
#░░░░░▀▄░░░▀▀▄▄▄█▄█▄█▄█▄▀░░█
|
||||
#░░░░░░░▀▄▄░▒▒▒▒░░░░░░░░░░█
|
||||
#░░░░░░░░░░▀▀▄▄░▒▒▒▒▒▒▒▒▒▒░█
|
||||
#░░░░░░░░░░░░░░▀▄▄▄▄▄░░░░░█
|
||||
width = "1280"
|
||||
height = "800"
|
||||
userDirs = "Users/"
|
||||
background = "JDE/Images/background.png"
|
||||
colour = "#a0fd44"
|
||||
startPic = "JDE/Images/start.png"
|
||||
contextMenuColour = "#a0fd44"
|
||||
resizeBackground = False # This can be VERY slow!
|
||||
version = "1.4.0 ALPHA"
|
Reference in a new issue