mirror of
https://github.com/IgorTimofeev/MineOS.git
synced 2026-01-08 20:22:38 +01:00
Багфикс
This commit is contained in:
Igor Timofeev
parent
9efb60d2e3
commit
c40e73bc97
@ -236,7 +236,7 @@
|
||||
path="/lib/MineOSInterface.lua",
|
||||
url="https://raw.githubusercontent.com/IgorTimofeev/OpenComputers/master/lib/MineOSInterface.lua",
|
||||
type="Library",
|
||||
version=1.02,
|
||||
version=1.04,
|
||||
},
|
||||
{
|
||||
path="/lib/MineOSPaths.lua",
|
||||
|
||||
99
ImageConverter/.idea/workspace.xml
generated
99
ImageConverter/.idea/workspace.xml
generated
@ -67,22 +67,14 @@
|
||||
<file leaf-file-name="Main.java" pinned="false" current-in-tab="true">
|
||||
<entry file="file://$PROJECT_DIR$/src/sample/Main.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="623">
|
||||
<caret line="82" column="30" lean-forward="true" selection-start-line="82" selection-start-column="4" selection-end-line="82" selection-end-column="30" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="OCIF.java" pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/src/sample/OCIF.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="255">
|
||||
<caret line="17" column="37" lean-forward="false" selection-start-line="17" selection-start-column="37" selection-end-line="17" selection-end-column="37" />
|
||||
<state relative-caret-position="227">
|
||||
<caret line="68" column="64" lean-forward="true" selection-start-line="68" selection-start-column="64" selection-end-line="68" selection-end-column="64" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
<element signature="e#3373#3819#0" expanded="true" />
|
||||
<element signature="e#3818#3819#0" expanded="true" />
|
||||
<element signature="e#4074#4463#0" expanded="true" />
|
||||
<element signature="e#4462#4463#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
@ -134,15 +126,14 @@
|
||||
<option value="$PROJECT_DIR$/src/sample/Palette.java" />
|
||||
<option value="$PROJECT_DIR$/src/sample/Image.java" />
|
||||
<option value="$PROJECT_DIR$/src/sample/OCIF.java" />
|
||||
<option value="$PROJECT_DIR$/src/sample/Main.java" />
|
||||
<option value="$PROJECT_DIR$/src/sample/ImageConverter.fxml" />
|
||||
<option value="$PROJECT_DIR$/src/sample/Main.java" />
|
||||
</list>
|
||||
</option>
|
||||
</component>
|
||||
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
|
||||
<component name="ProjectFrameBounds">
|
||||
<option name="x" value="61" />
|
||||
<option name="y" value="246" />
|
||||
<option name="y" value="23" />
|
||||
<option name="width" value="1920" />
|
||||
<option name="height" value="979" />
|
||||
</component>
|
||||
@ -165,6 +156,8 @@
|
||||
</navigator>
|
||||
<panes>
|
||||
<pane id="Scratches" />
|
||||
<pane id="PackagesPane" />
|
||||
<pane id="Scope" />
|
||||
<pane id="ProjectPane">
|
||||
<subPane>
|
||||
<PATH>
|
||||
@ -233,8 +226,6 @@
|
||||
</PATH>
|
||||
</subPane>
|
||||
</pane>
|
||||
<pane id="PackagesPane" />
|
||||
<pane id="Scope" />
|
||||
</panes>
|
||||
</component>
|
||||
<component name="PropertiesComponent">
|
||||
@ -520,18 +511,19 @@
|
||||
<option name="totallyTimeSpent" value="1302000" />
|
||||
</component>
|
||||
<component name="ToolWindowManager">
|
||||
<frame x="61" y="246" width="1920" height="979" extended-state="0" />
|
||||
<frame x="0" y="23" width="1920" height="979" extended-state="6" />
|
||||
<editor active="true" />
|
||||
<layout>
|
||||
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" 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="Nl-Palette" 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="false" content_ui="tabs" />
|
||||
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3296582" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Palette	" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Image Layers" 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="7" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" 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.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" 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.17530319" sideWeight="0.5" order="2" 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.17472528" sideWeight="0.5" order="2" 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="false" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Properties" active="false" anchor="right" 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="12" side_tool="false" content_ui="tabs" />
|
||||
@ -552,7 +544,6 @@
|
||||
<window_info id="Profiler" 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="9" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Changes" 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="11" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3296582" sideWeight="0.5" order="14" 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="JetGradle" active="false" anchor="right" 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="Problems" 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="13" side_tool="false" content_ui="tabs" />
|
||||
@ -583,6 +574,10 @@
|
||||
<caret line="49" column="9" lean-forward="false" selection-start-line="49" selection-start-column="9" selection-end-line="49" selection-end-column="9" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
<element signature="e#3373#3819#0" expanded="true" />
|
||||
<element signature="e#3818#3819#0" expanded="true" />
|
||||
<element signature="e#4074#4463#0" expanded="true" />
|
||||
<element signature="e#4462#4463#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
@ -620,15 +615,15 @@
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/sample/ImageConverter.fxml">
|
||||
<provider editor-type-id="JavaFX-Scene-Builder">
|
||||
<state />
|
||||
</provider>
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="105">
|
||||
<caret line="7" column="31" lean-forward="false" selection-start-line="7" selection-start-column="31" selection-end-line="7" selection-end-column="31" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
<provider editor-type-id="JavaFX-Scene-Builder">
|
||||
<state />
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/sample/Image.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
@ -646,6 +641,10 @@
|
||||
<caret line="143" column="46" lean-forward="false" selection-start-line="143" selection-start-column="46" selection-end-line="143" selection-end-column="46" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
<element signature="e#3373#3819#0" expanded="true" />
|
||||
<element signature="e#3818#3819#0" expanded="true" />
|
||||
<element signature="e#4074#4463#0" expanded="true" />
|
||||
<element signature="e#4462#4463#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
@ -683,15 +682,15 @@
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/sample/ImageConverter.fxml">
|
||||
<provider editor-type-id="JavaFX-Scene-Builder">
|
||||
<state />
|
||||
</provider>
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="105">
|
||||
<caret line="7" column="31" lean-forward="false" selection-start-line="7" selection-start-column="31" selection-end-line="7" selection-end-column="31" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
<provider editor-type-id="JavaFX-Scene-Builder">
|
||||
<state />
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/sample/Image.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
@ -709,6 +708,10 @@
|
||||
<caret line="143" column="46" lean-forward="false" selection-start-line="143" selection-start-column="46" selection-end-line="143" selection-end-column="46" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
<element signature="e#3373#3819#0" expanded="true" />
|
||||
<element signature="e#3818#3819#0" expanded="true" />
|
||||
<element signature="e#4074#4463#0" expanded="true" />
|
||||
<element signature="e#4462#4463#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
@ -746,15 +749,15 @@
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/sample/ImageConverter.fxml">
|
||||
<provider editor-type-id="JavaFX-Scene-Builder">
|
||||
<state />
|
||||
</provider>
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="105">
|
||||
<caret line="7" column="31" lean-forward="false" selection-start-line="7" selection-start-column="31" selection-end-line="7" selection-end-column="31" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
<provider editor-type-id="JavaFX-Scene-Builder">
|
||||
<state />
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/sample/Image.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
@ -772,6 +775,10 @@
|
||||
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
<element signature="e#3373#3819#0" expanded="true" />
|
||||
<element signature="e#3818#3819#0" expanded="true" />
|
||||
<element signature="e#4074#4463#0" expanded="true" />
|
||||
<element signature="e#4462#4463#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
@ -819,15 +826,15 @@
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/sample/ImageConverter.fxml">
|
||||
<provider editor-type-id="JavaFX-Scene-Builder">
|
||||
<state />
|
||||
</provider>
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="105">
|
||||
<caret line="7" column="31" lean-forward="false" selection-start-line="7" selection-start-column="31" selection-end-line="7" selection-end-column="31" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
<provider editor-type-id="JavaFX-Scene-Builder">
|
||||
<state />
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/sample/Main.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
@ -835,6 +842,10 @@
|
||||
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
<element signature="e#3373#3819#0" expanded="true" />
|
||||
<element signature="e#3818#3819#0" expanded="true" />
|
||||
<element signature="e#4074#4463#0" expanded="true" />
|
||||
<element signature="e#4462#4463#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
@ -887,6 +898,10 @@
|
||||
<caret line="8" column="0" lean-forward="false" selection-start-line="8" selection-start-column="0" selection-end-line="8" selection-end-column="0" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
<element signature="e#3373#3819#0" expanded="true" />
|
||||
<element signature="e#3818#3819#0" expanded="true" />
|
||||
<element signature="e#4074#4463#0" expanded="true" />
|
||||
<element signature="e#4462#4463#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
@ -946,20 +961,20 @@
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/sample/ImageConverter.fxml">
|
||||
<provider editor-type-id="JavaFX-Scene-Builder">
|
||||
<state />
|
||||
</provider>
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="318">
|
||||
<caret line="95" column="49" lean-forward="false" selection-start-line="95" selection-start-column="49" selection-end-line="95" selection-end-column="49" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
<provider editor-type-id="JavaFX-Scene-Builder">
|
||||
<state />
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$USER_HOME$/Desktop/IMG_2279.JPG" />
|
||||
<entry file="file://$PROJECT_DIR$/src/sample/OCIF.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="255">
|
||||
<state relative-caret-position="180">
|
||||
<caret line="17" column="37" lean-forward="false" selection-start-line="17" selection-start-column="37" selection-end-line="17" selection-end-column="37" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
@ -969,10 +984,14 @@
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/sample/Main.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="623">
|
||||
<caret line="82" column="30" lean-forward="true" selection-start-line="82" selection-start-column="4" selection-end-line="82" selection-end-column="30" />
|
||||
<state relative-caret-position="227">
|
||||
<caret line="68" column="64" lean-forward="true" selection-start-line="68" selection-start-column="64" selection-end-line="68" selection-end-column="64" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
<element signature="e#3373#3819#0" expanded="true" />
|
||||
<element signature="e#3818#3819#0" expanded="true" />
|
||||
<element signature="e#4074#4463#0" expanded="true" />
|
||||
<element signature="e#4462#4463#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
|
||||
@ -112,5 +112,6 @@
|
||||
</Text>
|
||||
</children>
|
||||
</Pane>
|
||||
<ColorPicker editable="true" prefHeight="57.0" prefWidth="123.0" promptText="afae" />
|
||||
</children>
|
||||
</Pane>
|
||||
|
||||
@ -89,7 +89,12 @@ local function iconDraw(icon)
|
||||
|
||||
buffer.image(icon.x + 2, icon.y, icon.semiTransparentImage, true)
|
||||
else
|
||||
buffer.image(icon.x + 2, icon.y, icon.image)
|
||||
|
||||
if icon.image then
|
||||
buffer.image(icon.x + 2, icon.y, icon.image)
|
||||
elseif icon.liveImage then
|
||||
icon.liveImage(icon.x + 2, icon.y)
|
||||
end
|
||||
end
|
||||
|
||||
if icon.isShortcut then
|
||||
@ -148,6 +153,7 @@ function MineOSInterface.icon(x, y, path, textColor, selectionColor)
|
||||
selection = selectionColor,
|
||||
selectionTransparency = 0.6
|
||||
}
|
||||
|
||||
icon.path = path
|
||||
icon.isDirectory = fs.isDirectory(icon.path)
|
||||
icon.extension = fs.extension(icon.path) or "script"
|
||||
@ -238,7 +244,23 @@ function iconAnalyseExtension(icon)
|
||||
if icon.isDirectory then
|
||||
if icon.extension == ".app" then
|
||||
if MineOSCore.properties.showApplicationIcons then
|
||||
icon.image = image.load(icon.path .. "/Resources/Icon.pic")
|
||||
if fs.exists(icon.path .. "/Resources/Icon.pic") then
|
||||
icon.image = image.load(icon.path .. "/Resources/Icon.pic")
|
||||
elseif fs.exists(icon.path .. "/Resources/Icon.lua") then
|
||||
local data, reason = loadfile(icon.path .. "/Resources/Icon.lua")
|
||||
if data then
|
||||
data, reason = data()
|
||||
if data then
|
||||
icon.liveImage = data
|
||||
else
|
||||
error("Failed to load live icon image: " .. tostring(reason))
|
||||
end
|
||||
else
|
||||
error("Failed to load live icon image: " .. tostring(reason))
|
||||
end
|
||||
else
|
||||
icon.image = MineOSInterface.iconsCache.fileNotExists
|
||||
end
|
||||
else
|
||||
icon.image = MineOSInterface.iconsCache.application
|
||||
end
|
||||
@ -793,7 +815,7 @@ function MineOSInterface.iconRightClick(icon, eventData)
|
||||
|
||||
menu:addItem(MineOSCore.localization.properties).onTouch = function()
|
||||
for i = 1, #selectedIcons do
|
||||
MineOSCore.propertiesWindow(eventData[3], eventData[4], 40, selectedIcons[i])
|
||||
MineOSInterface.propertiesWindow(eventData[3], eventData[4], 40, selectedIcons[i])
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user