Skip to content

Release v1.1.15 #101

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Nov 1, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions css/api_block/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -324,6 +324,7 @@
}
.vp-block {
position: relative;
min-width: 205px;
min-height: 25px;
z-index: 1;
text-align: left;
Expand Down
12 changes: 10 additions & 2 deletions css/common/frameEditor.css
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,8 @@
grid-row-gap: 5px;
/* grid-template-rows: 35px 30px 60% calc(40% - 80px); */
/* grid-template-rows: 35px 30px calc(100% - 80px); */
grid-template-rows: 35px 65px calc(100% - 110px);
/* grid-template-rows: 35px 65px calc(100% - 110px); */
grid-template-rows: 35px 65px 35px calc(100% - 145px);
grid-template-columns: 100%;
}

Expand Down Expand Up @@ -93,6 +94,13 @@
cursor: pointer;
margin-left: 5px;
}
.vp-fe-toolbar {
border-top: 1px solid var(--border-gray-color);
padding-top: 5px;
}
.vp-fe-toolbar-item {
width: fit-content;
}
.vp-fe-menu-box {
position: absolute;
top: 0;
Expand Down Expand Up @@ -141,7 +149,7 @@
transform: translate(-50%, -50%);
min-width: 400px;
min-height: 150px;
width: 30%;
width: fit-content;
height: fit-content;
background-color: white;
z-index: 200;
Expand Down
20 changes: 16 additions & 4 deletions src/api/functions/fileNaviCommand.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ def _vp_get_documents_path():

def _vp_sizeof_fmt(num, suffix='B'):
"""
파일크기 보기 좋게 변환해서 반환
Return resized image
"""
for unit in ['','K','M','G','T','P','E','Z']:
if abs(num) < 1024.0:
Expand All @@ -66,7 +66,7 @@ def _vp_sizeof_fmt(num, suffix='B'):

def _vp_search_path(path):
"""
경로 하위 폴더, 파일 조회
Search child folder and file list under the given path
"""
import datetime as _dt
_current = _vp_os.path.abspath(path)
Expand Down Expand Up @@ -94,8 +94,20 @@ def _vp_search_path(path):

def _vp_get_image_by_path(path):
"""
경로로 이미지 파일 받아오기
Get image file by path
"""
from PIL import Image
img = Image.open(path)
return img
return img

def _vp_get_relative_path(start, path):
"""
Get relative path using start path and current path
start: str
start path
path: str
current path
returns: str
current relative path
"""
return _vp_os.path.relpath(path, start)
2 changes: 1 addition & 1 deletion src/api_block/blockContainer.js
Original file line number Diff line number Diff line change
Expand Up @@ -2649,7 +2649,7 @@ define([
this.hideOptionPreviewBox();
$(VP_ID_PREFIX + VP_APIBLOCK_BOARD_OPTION_PREVIEW_BUTTON).removeClass('enabled');

this.setNavigator(BLOCK_CODELINE_TYPE.NONE, 'Visual Python 1.1.14');
this.setNavigator(BLOCK_CODELINE_TYPE.NONE, 'Visual Python 1.1.15');
this.setFocusedPageType(FOCUSED_PAGE_TYPE.BOARD);
$('.vp-apiblock-option-tab-none').css(STR_DISPLAY, STR_BLOCK);
}
Expand Down
2 changes: 1 addition & 1 deletion src/api_block/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@
id='vp_apiblock_option_page'>
<div class="vp-apiblock-option-navigator">
<div class="vp-apiblock-option-navigator-label">
<span class="vp-orange-text">Visual Python 1.1.14</span>
<span class="vp-orange-text">Visual Python 1.1.15</span>
</div>
<div class="vp-apiblock-option-new-to-save" title="something modified...">

Expand Down
4 changes: 2 additions & 2 deletions src/common/component/vpMultiSelector.js
Original file line number Diff line number Diff line change
Expand Up @@ -233,8 +233,8 @@ define([
dataList && dataList.forEach((data, idx) => {
// for column : data.array parsing
var info = vpCommon.safeString(data.array);
if (info) {
info = data.value + ':\n';
if (info && info != 'undefined') {
info = data.value + ':\n' + info;
} else {
info = '';
}
Expand Down
2 changes: 1 addition & 1 deletion src/common/constant.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ define ([
* toolbar btn properties
*/
const TOOLBAR_BTN_INFO = {
HELP: "Visual Python 1.1.14"
HELP: "Visual Python 1.1.15"
// , ICON: "fa-angellist"
, ICON: "vp-main-icon"
, ID: "vpBtnToggle"
Expand Down
4 changes: 2 additions & 2 deletions src/common/vpBind.js
Original file line number Diff line number Diff line change
Expand Up @@ -342,14 +342,14 @@ define([
page.appendFormatLine('<div class="{0} {1}" {2}>', 'vp-bd-type-box', 'merge', this.state.type=='merge'?'':'style="display: none;"');
// left dataframe
page.appendLine('<div>');
page.appendFormatLine('<label for="{0}" class="{1}">{2}</label>', 'vp_bdLeftDataframe', 'vp-orange-text wp100', 'Left Dataframe');
page.appendFormatLine('<label for="{0}" class="{1}">{2}</label>', 'vp_bdLeftDataframe', 'vp-orange-text wp100', 'Left Data');
page.appendFormatLine('<select id="{0}">', 'vp_bdLeftDataframe');
page.appendLine('</select>');
page.appendFormatLine('<div class="{0}" title="{1}"><img src="{2}"/></div>', 'vp-bd-df-refresh', 'Refresh all dataframe list', '/nbextensions/visualpython/resource/refresh.svg');
page.appendLine('</div>');
// right dataframe
page.appendLine('<div>');
page.appendFormatLine('<label for="{0}" class="{1}">{2}</label>', 'vp_bdRightDataframe', 'vp-orange-text wp100', 'Right Dataframe');
page.appendFormatLine('<label for="{0}" class="{1}">{2}</label>', 'vp_bdRightDataframe', 'vp-orange-text wp100', 'Right Data');
page.appendFormatLine('<select id="{0}">', 'vp_bdRightDataframe');
page.appendLine('</select>');
page.appendLine('</div>');
Expand Down
Loading