X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/Ventoy.git/blobdiff_plain/3f09fb9a2389c5c212a70feada3206a3cb523c95..4790dedbb19821794c1cf4bfeb671c5be8c19043:/Plugson/www/plugson_theme.html

diff --git a/Plugson/www/plugson_theme.html b/Plugson/www/plugson_theme.html
index e6f96a0..1e6e8b0 100644
--- a/Plugson/www/plugson_theme.html
+++ b/Plugson/www/plugson_theme.html
@@ -71,6 +71,50 @@
             </div><!-- /.box-body -->
         </div><!-- /.box -->
     
+        
+        <div class="box box-primary box-solid" id='resolution_fit_div'>
+          <div class="box-header with-border">
+            <h3 class="box-title" style="font-size: 14px;font-weight: bold;">resolution_fit
+              <span id="id_span_desc_cn"> —— 按照分辨率过滤</span></h3>
+            <div class="box-tools pull-right">
+              <button class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
+            </div><!-- /.box-tools -->
+          </div><!-- /.box-header -->
+          <div class="box-body no-padding">
+              <table class="table table-bordered  no-padding">
+                  <tr style="font-weight:bold;">
+                    <td class="td_ctrl_col" id="td_title_setting">选项设置</td>
+                    <td>
+                      <label class="radio-inline">
+                          <input type="radio" id="id_ctrl_radio_res_fit0" name="id_ctrl_radio_res_fit" data-type="0" value="0"> <span style="font-weight:bold;">0</span>
+                      </label>&nbsp;&nbsp;&nbsp;&nbsp;
+                      <label class="radio-inline">
+                          <input type="radio" id="id_ctrl_radio_res_fit1" name="id_ctrl_radio_res_fit" data-type="1" value="1"> <span style="font-weight:bold;">1</span>
+                      </label>
+                    </td>
+                  </tr>
+                  <tr id="tr_title_desc_cn">
+                    <td class="td_ctrl_col" id="td_title_desc">选项说明</td>
+                    <td>当设置多个主题时，在随机选择时是否按照当前分辨率过滤。&nbsp;&nbsp;
+                      <code style="font-weight: bold;">0</code> 不过滤 &nbsp;&nbsp;
+                      <code style="font-weight: bold;">1</code> 过滤 <br/>
+                      注意，这个选项必须在上面设置了多个主题配置文件，同时 "默认" 设置为 “随机选择” 时才有效，其他情况下均无效。<br/>
+                      关于这个选项的详细解释，请参考 <a href="https://www.ventoy.net/cn/plugin_theme.html#vtoy_theme_res_fit">resolution_fit 选项说明</a>
+                    </td>
+                  </tr>
+                  <tr id="tr_title_desc_en">
+                    <td class="td_ctrl_col">Option Description</td>
+                    <td>
+                      Filter by current resolution when you set more than one themes. &nbsp;&nbsp;
+                      <code style="font-weight: bold;">0</code> No filter &nbsp;&nbsp
+                      <code style="font-weight: bold;">1</code> Filter <br/>
+                      You can refer <a href="https://www.ventoy.net/en/plugin_theme.html#vtoy_theme_res_fit">About resolution_fit</a> for details about this option.
+                    </td>
+                  </tr>
+              </table>
+          </div><!-- /.box-body -->
+      </div><!-- /.box -->
+        
     
         <div class="box box-primary box-solid">
             <div class="box-header with-border">
@@ -131,6 +175,7 @@
                       <td class="td_ctrl_col" id="td_title_setting">选项设置</td>
                       <td>
                         <select id="id_theme_sel_gfxmode" name="name_theme_sel_gfxmode" class="form-control">
+                            <option title="max">max</option>
                             <option title="1920x1080">1920x1080</option>
                             <option title="1680x1050">1680x1050</option>
                             <option title="1600x900">1600x900</option>
@@ -239,6 +284,8 @@
     } else {
       data.display_mode = 0;
     }
+    
+    data.resolution_fit = parseInt($('input:radio[name=id_ctrl_radio_res_fit]:checked').val());
   }
 
   function VtoySaveCurrentPage() {
@@ -249,6 +296,7 @@
       method : 'save_theme',
       index: current_tab_index,
       display_mode: data.display_mode,
+      resolution_fit: data.resolution_fit,
       gfxmode: data.gfxmode,
       default_file: data.default_file
     }, function(e) {
@@ -269,6 +317,12 @@
     var $tbl = $("#id_theme_tbl_file tbody");
     $tbl.empty();
 
+    if (list.length > 1) {
+        $('#resolution_fit_div').show();
+    } else {
+        $('#resolution_fit_div').hide();
+    }
+
     for (var i = 0; i < list.length; i++) {
       var $tr;
       td1 = '<td>' + (i + 1) + '</td>';
@@ -303,7 +357,12 @@
       var id = $(this).attr('id');
       if (typeof(id) != 'undefined' && id.startsWith('id_theme_file')) {
         $(this).change(function() {
-          m_data_theme[current_tab_index].default_file =parseInt(id.substr(id.length - 1));
+          var prelen = 'id_theme_file_radio'.length;
+          m_data_theme[current_tab_index].default_file = parseInt(id.substr(id.length - 1));
+          if (id.substr(0, prelen) === 'id_theme_file_radio') {
+              m_data_theme[current_tab_index].default_file = parseInt(id.substr(prelen));
+          }
+          
           VtoySaveCurrentPage();
         });
       }
@@ -365,6 +424,8 @@
       $('select[id=id_theme_sel_dismode').val('GUI');
     }
     
+    $('input:radio[name=id_ctrl_radio_res_fit]')[data.resolution_fit].checked = true;
+    
     FillThemeFileTable(data.filelist, data.default_file);
     FillThemeFontTable(data.fontslist);
   }
@@ -403,9 +464,13 @@
       index: current_tab_index,
       path: data.path
     }, function(e) {
-      list.push(data);
-      FillThemeFileTable(list, m_data_theme[current_tab_index].default_file);
-      Message.success(g_vtoy_cur_language.STR_SAVE_SUCCESS);
+        if (e.result === 'success') {
+            list.push(data);
+            FillThemeFileTable(list, m_data_theme[current_tab_index].default_file);
+            Message.success(g_vtoy_cur_language.STR_SAVE_SUCCESS);
+        } else if (e.result === 'duplicate') {
+            Message.error(g_vtoy_cur_language.STR_DUPLICATE_PATH);
+        }
     });
   }
 
@@ -428,9 +493,13 @@
       index: current_tab_index,
       path: data.path
     }, function(e) {
-      list.push(data);
-      FillThemeFontTable(list);
-      Message.success(g_vtoy_cur_language.STR_SAVE_SUCCESS);
+        if (e.result === 'success') {
+            list.push(data);
+            FillThemeFontTable(list);
+            Message.success(g_vtoy_cur_language.STR_SAVE_SUCCESS);
+        } else if (e.result === 'duplicate') {
+            Message.error(g_vtoy_cur_language.STR_DUPLICATE_PATH);
+        }
     });
   }
 
@@ -507,6 +576,8 @@
 
   $('select[id=id_theme_sel_gfxmode]').change(VtoySaveCurrentPage);
   $('select[id=id_theme_sel_dismode]').change(VtoySaveCurrentPage);
+  $('#id_ctrl_radio_res_fit0').change(VtoySaveCurrentPage);
+  $('#id_ctrl_radio_res_fit1').change(VtoySaveCurrentPage);
 
   $('#id_tab_theme a[href="#tab_0"]').click(OnClickMultiModeTab);
   $('#id_tab_theme a[href="#tab_1"]').click(OnClickMultiModeTab);