artin/miniPaint
1
0
Fork 0
mirror of https://github.com/viliusle/miniPaint.git synced 2026-02-06 13:51:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

popup lib update

Browse Source
This commit is contained in:
Vilius 2016-10-03 20:36:24 +03:00
parent b287c46247
commit 0a0f8cbe1a
5 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
index.html
View File

@ -140,8 +140,8 @@
<li><a class="trn" onclick="call_menu(IMAGE, 'zoom_in');" href="#">Zoom In</a></li>
<li><a class="trn" onclick="call_menu(IMAGE, 'zoom_out');" href="#">Zoom Out</a></li>
<li><div class="mid-line"></div></li>
<li><a class="trn dots" onclick="call_menu(IMAGE, 'zoom_original');" href="#">Original size</a></li>
<li><a class="trn dots" onclick="call_menu(IMAGE, 'zoom_auto');" href="#">Fit window</a></li>
<li><a class="trn" onclick="call_menu(IMAGE, 'zoom_original');" href="#">Original size</a></li>
<li><a class="trn" onclick="call_menu(IMAGE, 'zoom_auto');" href="#">Fit window</a></li>
</ul>
</li>
<li><div class="mid-line"></div></li>
@ -258,11 +258,12 @@
<li class="more">
<a class="trn" href="#">Language</a>
<ul>
<li><a onclick="call_menu(HELP, 'help_translate', 'zh');" href="#">简体中文）</a>
<li><a onclick="call_menu(HELP, 'help_translate', 'en');" href="#">English</a>
<li><div class="mid-line"></div></li>
<li><a onclick="call_menu(HELP, 'help_translate', 'zh');" href="#">简体中文）</a>
<li><a onclick="call_menu(HELP, 'help_translate', 'es');" href="#">Español</a>
<li><a onclick="call_menu(HELP, 'help_translate', 'it');" href="#">Italiano</a>
<li><a onclick="call_menu(HELP, 'help_translate', 'lt');" href="#">Lietuvių</a>
<li><a onclick="call_menu(HELP, 'help_translate', 'es');" href="#">Español</a>
</ul>
</li>
<li><div class="mid-line"></div></li>

7
js/file.js
View File

@ -1,4 +1,4 @@
/* global MAIN, POP, LAYER, EXIF, HELPER, IMAGE, GUI */
/* global MAIN, POP, LAYER, EXIF, HELPER, IMAGE, GUI, EDIT */
/* global SAVE_TYPES */
var FILE = new FILE_CLASS();
@ -39,7 +39,7 @@ function FILE_CLASS() {
var h = HEIGHT;
var resolutions = ['Custom'];
for(var i in GUI.common_dimensions){
resolutions.push(GUI.common_dimensions[i][0]+'x'+GUI.common_dimensions[i][1]);
resolutions.push(GUI.common_dimensions[i][0]+'x'+GUI.common_dimensions[i][1]+' - '+GUI.common_dimensions[i][2]);
}
var save_resolution_cookie = HELPER.getCookie('save_resolution');
@ -66,7 +66,8 @@ function FILE_CLASS() {
var save_resolution = response.save_resolution;
if(resolution != 'Custom'){
var dim = resolution.split("x");
var dim = resolution.split(" "); console.log(dim);
dim = dim[0].split("x"); console.log(dim);
width = dim[0];
height = dim[1];
}

16
js/gui.js
View File

@ -49,14 +49,14 @@ function GUI_CLASS() {
* common image dimensions
*/
this.common_dimensions = [
[640,480], //480p
[800,600], //SVGA
[1024,768], //XGA
[1280,720], //hdtv, 720p
[1600,1200], //UXGA
[1920,1080], //Full HD, 1080p
[3840,2160], //4K UHD
[7680,4320], //8K UHD
[640,480, '480p'],
[800,600, 'SVGA'],
[1024,768, 'XGA'],
[1280,720, 'hdtv, 720p'],
[1600,1200, 'UXGA'],
[1920,1080, 'Full HD, 1080p'],
[3840,2160, '4K UHD'],
[7680,4320, '8K UHD'],
];
/**

9
libs/popup.js
View File

@ -160,8 +160,15 @@ function popup() {
ch = 'checked="checked"';
if (onchange == '' && preview_handler != undefined)
onchange = ' onchange="POP.view();" ';
var title = parameter.values[j];
var parts = parameter.values[j].split(" - ");
if(parts.length > 1){
title = parts[0] + ' - <span class="trn">'+parts[1]+'</span>';
}
html += '<input type="radio" ' + onchange + ' ' + ch + ' name="' + parameter.name + '" id="pop_data_' + parameter.name + "_poptmp" + j + '" value="' + parameter.values[j] + '">';
html += '<label style="margin-right:20px;" class="trn" for="pop_data_' + parameter.name + "_poptmp" + j + '">' + parameter.values[j] + '</label>';
html += '<label style="margin-right:20px;" class="trn" for="pop_data_' + parameter.name + "_poptmp" + j + '">' + title + '</label>';
if (parameter.values.length > 2)
html += '<br />';
k++;

3
styles/styles.css
View File

@ -691,6 +691,9 @@ input[type="button"]{
#popup input[type="text"], #popup input[type="number"], #popup textarea{
width:100%;
}
label span{
color:#777777;
}
@media screen and (max-width:400px){
#popup{
top: 100px !important;