diff --git a/index.html b/index.html index 794e81e..6ab76c3 100644 --- a/index.html +++ b/index.html @@ -140,8 +140,8 @@
  • Zoom In
  • Zoom Out
  • -
  • Original size
  • -
  • Fit window
  • +
  • Original size
  • +
  • Fit window
  • @@ -258,11 +258,12 @@
  • Language
  • diff --git a/js/file.js b/js/file.js index 6011e7b..8852e93 100644 --- a/js/file.js +++ b/js/file.js @@ -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]; } diff --git a/js/gui.js b/js/gui.js index 328e1e2..798f2a3 100644 --- a/js/gui.js +++ b/js/gui.js @@ -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'], ]; /** diff --git a/libs/popup.js b/libs/popup.js index fd004bb..c74cf34 100644 --- a/libs/popup.js +++ b/libs/popup.js @@ -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] + ' - '+parts[1]+''; + } + html += ''; - html += ''; + html += ''; if (parameter.values.length > 2) html += '
    '; k++; diff --git a/styles/styles.css b/styles/styles.css index 30fda40..c3a0ed0 100644 --- a/styles/styles.css +++ b/styles/styles.css @@ -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;