Skip to content

Commit

Permalink
release
Browse files Browse the repository at this point in the history
  • Loading branch information
cfry committed May 4, 2017
1 parent 3cf4144 commit 97b11f0
Show file tree
Hide file tree
Showing 8 changed files with 40 additions and 20 deletions.
3 changes: 2 additions & 1 deletion doc/release_notes.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
.doc_details summary { font-weight: 600; }
</style>

<details class="doc_details"><summary>v 1.1.7, May 2, 2017</summary>
<details class="doc_details"><summary>v 1.1.7, May 3, 2017</summary>
Highlights: Lots of UI tweaks. file system fix.
<ul>
<li> Added indenting to "loading persistent" output message.</li>
Expand All @@ -33,6 +33,7 @@
Tooltip on the menu shows you the full file path.</li>

<li> Made files outside of dde_apps accessable.</li>
<li> Better stop button image. There's a "pressed" indicator.</li>
</ul>
</details>

Expand Down
3 changes: 2 additions & 1 deletion editor.js
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,7 @@ Editor.restore_selection_from_map = function(){
}

Editor.edit_file = function(path){ //path could be "new file"
path = convert_backslashes_to_slashes(path) //must store only slashes in files menu
if(Editor.current_file_path){ //false when we first boot up.
Editor.store_selection_in_map()
if ((Editor.current_file_path != "new file") &&
Expand All @@ -290,7 +291,7 @@ Editor.edit_file = function(path){ //path could be "new file"
if (!path_already_in_menu) { Editor.add_path_to_files_menu(path) }
var content
if (path == "new file"){ content = "" }
else { content = file_content(path) }
else { content = file_content(path) } //file_content will conver to windows format if needed
Editor.set_javascript(content)
Editor.current_file_path = path
Editor.restore_selection_from_map()
Expand Down
12 changes: 6 additions & 6 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -478,13 +478,13 @@
</li>
</ul>
</div>
<div style="vertical-align:top;display:inline-block;line-height: 1.0;font-size:10px;margin:0px;padding:0px;">
<div style="display:inline-block;">
fontsize<br/>
<input id="font_size_id" type="number" style="vertical-align:top; width:30px;" value="17" min="6"/>
<!-- <div style="vertical-align:top;display:inline-block;line-height: 1.0;font-size:10px;margin:0px;padding:0px;"> -->
<div style="display:inline-block;margin:0px;padding:0px;vertical-align:super;">
<span style="font-size:9px;margin:0px;padding:0px;">fontsize</span><br/>
<input id="font_size_id" type="number" style="vertical-align:top; width:30px;margin:0px;padding:0px;" value="17" min="6"/>
</div>
<select id="file_name_id" style="width:250px;font-size:14px;margin-right:0px;padding-right:0px;" title=""><option>new file</option></select>
</div>
<select id="file_name_id" style="width:250px;font-size:14px;margin-right:0px;padding-right:0px;vertical-align:50%;" title=""><option>new file</option></select>
<!-- </div> -->
<!--ROS url: <input id='dexter_url' value="localhost:9090" style="font-size:14px;"/> -->
</div>
<textarea id="js_textarea" wrap="off" style="width:98%; height:84%; font-size:17px; font-family:monospace;padding:4px;"
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "dexter_dev_env",
"productName": "dexter_dev_env",
"version": "1.1.7",
"release_date": "May 2, 2017",
"release_date": "May 3, 2017",
"description": "Dexter Development Environment",
"author": "Fry",
"license": "GPL-3.0",
Expand Down
2 changes: 1 addition & 1 deletion ready.js
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@
if (operating_system == "darwin") { operating_system = "mac" }
else if (operating_system == "windows") { operating_system = "win" }
const remote = require("electron").remote
window.dde_apps_dir = remote.getGlobal("dde_apps_dir")
window.dde_apps_dir = convert_backslashes_to_slashes(remote.getGlobal("dde_apps_dir"))
console.log("In renderer dde_apps_dir: " + window.dde_apps_dir)
console.log("In renderer appPath: " + remote.app.getAppPath())
console.log("In renderer __dirname: " + __dirname)
Expand Down
Binary file modified stop_sign.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 17 additions & 5 deletions storage.js
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ function dde_init_dot_js_initialize() {
'//To change DDE colors,\n' +
'// 1. Uncomment the below line(s).\n' +
'// 2. Select the first arg.\n' +
'// 3. Choose Insert menu "Color" item.\n' +
'// 3. Choose the "Insert" menu, "Color" item.\n' +
'// 4. After inserting the new color, eval the "set_" call.\n' +
'// 5. To get the default color, just comment out the line and relaunch DDE.\n' +
'// set_window_frame_background_color("#ff8c96")\n' +
Expand Down Expand Up @@ -189,14 +189,22 @@ function choose_file(show_dialog_options={}) { //todo document
const dialog = app.dialog;
const paths = dialog.showOpenDialog(show_dialog_options)
if (paths) {
if (Array.isArray(paths) && (paths.length == 1)) { return paths[0] }
else return paths
if (Array.isArray(paths) && (paths.length == 1)) {
return convert_backslashes_to_slashes(paths[0]) }
else {
let slashed_paths = []
for (let p of paths){
slashed_paths.push(convert_backslashes_to_slashes(p))
}
return slashed_paths

}
}
else { return paths }
}

function choose_file_and_get_content(show_dialog_options={}, encoding="utf8") { //todo document
const path = choose_file(show_dialog_options)
var path = choose_file(show_dialog_options)
if (path){
if (Array.isArray(path)) { path = path[0] }
return file_content(path, encoding)
Expand Down Expand Up @@ -258,7 +266,11 @@ function add_folder_separator_prefix_maybe(filepath){
}
else { return "/" + filepath }
}

//within dde, paths should have slashes.
//I convert "incomming paths to have slashes.
//but when we have to access the OS, the
//files have to be convered to be OS specific, ie for windows, have backslashes.
//for that we call adjust_path_to_os
function convert_backslashes_to_slashes(a_string){
return a_string.replace(/\\/g, "/")
}
Expand Down
16 changes: 11 additions & 5 deletions styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,23 @@ html, body { width: 100%; height: 100%; font-family: sans-serif; overflow:hidd

.window_frame { background-color: #b8bbff; } /*used for main window AND for show_window header background color */
.menubar_menu { display:inline-block; padding-left:3px; padding-right:0px; }
.dde_menu { background-color: #ff8c96; }
.dde_menu { background-color: #4cc9fd; }

.pane_header_wrapper {
padding:5px;
background-color: #e39f5a; /* for orig color, this was orange #ffbe3c;*/
height:30px;}
background-color: #93dfff; /* for orig color, this was orange #ffbe3c;*/
min-height:30px;} /*the Editor pan header, files menu might go on right if dispay is wide enough
but if not, it should go on 2nd row, thus the height of the header changes
based on allwoable width */

.pane_header {font-size:16px; vertical-align:top;}

/* summary {font-weight: 600;} now in each page for better loading on Website doc page*/

input[type=button] {background-color:#ddd3ff; font-size:14px;}

button {background-color:#ff8c96; font-size:14px;} /*same color as input-submit. see output.js set_button_background_color*/
input[type=submit] {background-color:#ff8c96; font-size:14px;} /*background-color: #ffb6c0; pink */
button {background-color:#4cc9fd; font-size:14px;} /*same color as input-submit. see output.js set_button_background_color*/
input[type=submit] {background-color:#4cc9fd; font-size:14px;} /*background-color: #ffb6c0; pink */
/*so input type submits and buttons are coral colored and input type button will be default white background
dde dialogs shouldn't use buttons, they should just use input type submit and input type button.
which will then be the different colors signifying whether they are submits or not, ie whether
Expand Down Expand Up @@ -47,6 +49,10 @@ th, td { text-align:left; }
font-weight:400;
background-color: #b8bbff;
}
#stop_all_jobs_id:active{ /*for button press effect */
height:25px;
width:30px;
}

/*
.vsplitbar {
Expand Down

0 comments on commit 97b11f0

Please sign in to comment.