Fix T49506: Remove unused File Browser theme settings
authorJulian Eisel <eiseljulian@gmail.com>
Mon, 3 Oct 2016 11:26:52 +0000 (13:26 +0200)
committerJulian Eisel <eiseljulian@gmail.com>
Mon, 3 Oct 2016 11:47:00 +0000 (13:47 +0200)
If I didn't miss anything these are indeed not used. Old themes should still work (will only print info on redundant theme defines into console), but updated non-contrib themes already.

12 files changed:
release/scripts/presets/interface_theme/back_to_black.xml
release/scripts/presets/interface_theme/blender_24x.xml
release/scripts/presets/interface_theme/elsyiun.xml
release/scripts/presets/interface_theme/flatty_light.xml
release/scripts/presets/interface_theme/graph.xml
release/scripts/presets/interface_theme/hexagon.xml
release/scripts/presets/interface_theme/rtheme.xml
release/scripts/presets/interface_theme/science_lab.xml
release/scripts/presets/interface_theme/softimage.xml
release/scripts/presets/interface_theme/ubuntu_ambiance.xml
source/blender/editors/interface/resources.c
source/blender/makesrna/intern/rna_userdef.c

index 3b2b9b99ed2284ba9213821316332f0a04ea232b..915e9cb64f1f26b9affc4404aa3883c2caaccdc7 100644 (file)
       </ThemeGraphEditor>
     </graph_editor>
     <file_browser>
-      <ThemeFileBrowser selected_file="#354d66"
-                        scrollbar="#a0a0a0"
-                        scroll_handle="#7f7070"
-                        active_file="#b1b1b1"
-                        active_file_text="#ffffff">
+      <ThemeFileBrowser selected_file="#354d66">
         <space>
           <ThemeSpaceGeneric back="#000000"
                              title="#5d5d5d"
             </panelcolors>
           </ThemeSpaceGeneric>
         </space>
-        <space_list>
-          <ThemeSpaceListGeneric list="#181818"
-                                 list_title="#9e9e9e"
-                                 list_text="#5d5d5d"
-                                 list_text_hi="#ffffff">
-          </ThemeSpaceListGeneric>
-        </space_list>
       </ThemeFileBrowser>
     </file_browser>
     <nla_editor>
index 90730aeaebc91251132308c36e92bfda28b1c3f2..818e557adf0b7f9a50e9085db9086c920c9264ce 100644 (file)
       </ThemeGraphEditor>
     </graph_editor>
     <file_browser>
-      <ThemeFileBrowser selected_file="#a0a0d0"
-                        scrollbar="#a0a0a0"
-                        scroll_handle="#7f7070"
-                        active_file="#828282"
-                        active_file_text="#ffffff">
+      <ThemeFileBrowser selected_file="#a0a0d0">
         <space>
           <ThemeSpaceGeneric back="#808080"
                              title="#000000"
             </panelcolors>
           </ThemeSpaceGeneric>
         </space>
-        <space_list>
-          <ThemeSpaceListGeneric list="#b4b4b4"
-                                 list_title="#000000"
-                                 list_text="#000000"
-                                 list_text_hi="#ffffff">
-          </ThemeSpaceListGeneric>
-        </space_list>
       </ThemeFileBrowser>
     </file_browser>
     <nla_editor>
index 20c88363aa9f8339389a5ce67973779c56a1ba20..7a3d5146636895d3a67c3220413353d7b4f01b6b 100644 (file)
       </ThemeGraphEditor>
     </graph_editor>
     <file_browser>
-      <ThemeFileBrowser selected_file="#755129"
-                        scrollbar="#a0a0a0"
-                        scroll_handle="#7f7070"
-                        active_file="#828282"
-                        active_file_text="#fafafa">
+      <ThemeFileBrowser selected_file="#755129">
         <space>
           <ThemeSpaceGeneric back="#4b4b4b"
                              title="#8b8b8b"
             </panelcolors>
           </ThemeSpaceGeneric>
         </space>
-        <space_list>
-          <ThemeSpaceListGeneric list="#3b3b3b"
-                                 list_title="#8b8b8b"
-                                 list_text="#8b8b8b"
-                                 list_text_hi="#ffffff">
-          </ThemeSpaceListGeneric>
-        </space_list>
       </ThemeFileBrowser>
     </file_browser>
     <nla_editor>
index f9fed2d97da906c109f2f70266181604ce6aea9c..623e0b334dd5dd59a7d741c461363946bd17bad2 100644 (file)
       </ThemeGraphEditor>
     </graph_editor>
     <file_browser>
-      <ThemeFileBrowser selected_file="#ff8c19"
-                        scrollbar="#a0a0a0"
-                        scroll_handle="#7f7070"
-                        active_file="#828282"
-                        active_file_text="#fafafa">
+      <ThemeFileBrowser selected_file="#ff8c19">
         <space>
           <ThemeSpaceGeneric back="#404040"
                              title="#000000"
             </panelcolors>
           </ThemeSpaceGeneric>
         </space>
-        <space_list>
-          <ThemeSpaceListGeneric list="#808080"
-                                 list_title="#000000"
-                                 list_text="#000000"
-                                 list_text_hi="#ffffff">
-          </ThemeSpaceListGeneric>
-        </space_list>
       </ThemeFileBrowser>
     </file_browser>
     <nla_editor>
index 4943bf3b4d53e161aa0d5e708343f8c9fbfb49c4..a032d8bd3b2e4b92c438d3cbd1521466d6b5bb16 100644 (file)
       </ThemeGraphEditor>
     </graph_editor>
     <file_browser>
-      <ThemeFileBrowser selected_file="#607f9e"
-                        scrollbar="#a0a0a0"
-                        scroll_handle="#7f7070"
-                        active_file="#ffffff"
-                        active_file_text="#ffffff">
+      <ThemeFileBrowser selected_file="#607f9e">
         <space>
           <ThemeSpaceGeneric back="#4b4b4b"
                              title="#e4e4e4"
             </panelcolors>
           </ThemeSpaceGeneric>
         </space>
-        <space_list>
-          <ThemeSpaceListGeneric list="#3b3b3b"
-                                 list_title="#8b8b8b"
-                                 list_text="#8b8b8b"
-                                 list_text_hi="#ffffff">
-          </ThemeSpaceListGeneric>
-        </space_list>
       </ThemeFileBrowser>
     </file_browser>
     <nla_editor>
index 1db4db0cb47fff49b7788413c4e9eca968776339..4b24abc5fa70ccf9e99df4b5516d8c37866492ff 100644 (file)
       </ThemeGraphEditor>
     </graph_editor>
     <file_browser>
-      <ThemeFileBrowser selected_file="#69a5be"
-                        scrollbar="#a0a0a0"
-                        scroll_handle="#7f7070"
-                        active_file="#859cb9"
-                        active_file_text="#fafafa">
+      <ThemeFileBrowser selected_file="#69a5be">
         <space>
           <ThemeSpaceGeneric back="#646875"
                              title="#000000"
             </panelcolors>
           </ThemeSpaceGeneric>
         </space>
-        <space_list>
-          <ThemeSpaceListGeneric list="#6c717f"
-                                 list_title="#d7d7d7"
-                                 list_text="#d7d7d7"
-                                 list_text_hi="#ffffff">
-          </ThemeSpaceListGeneric>
-        </space_list>
       </ThemeFileBrowser>
     </file_browser>
     <nla_editor>
index 1f1876959095fcad506553cfb16ed4d41e195c67..27f33aa2fe59e134adc2cec06ef1fec1cc71554c 100644 (file)
       </ThemeGraphEditor>
     </graph_editor>
     <file_browser>
-      <ThemeFileBrowser selected_file="#ff8c19"
-                        scrollbar="#a0a0a0"
-                        scroll_handle="#7f7070"
-                        active_file="#828282"
-                        active_file_text="#fafafa">
+      <ThemeFileBrowser selected_file="#ff8c19">
         <space>
           <ThemeSpaceGeneric back="#9098a0"
                              title="#000000"
             </panelcolors>
           </ThemeSpaceGeneric>
         </space>
-        <space_list>
-          <ThemeSpaceListGeneric list="#484848"
-                                 list_title="#000000"
-                                 list_text="#000000"
-                                 list_text_hi="#ffffff">
-          </ThemeSpaceListGeneric>
-        </space_list>
       </ThemeFileBrowser>
     </file_browser>
     <nla_editor>
index 7ebaa68b5a692258528b31baeb22f7b044ce4e81..9341e945375bc7775832df46473c93c130695de6 100644 (file)
       </ThemeGraphEditor>
     </graph_editor>
     <file_browser>
-      <ThemeFileBrowser selected_file="#517da1"
-                        scrollbar="#a0a0a0"
-                        scroll_handle="#7f7070"
-                        active_file="#828282"
-                        active_file_text="#fafafa">
+      <ThemeFileBrowser selected_file="#517da1">
         <space>
           <ThemeSpaceGeneric back="#363636"
                              title="#646464"
             </panelcolors>
           </ThemeSpaceGeneric>
         </space>
-        <space_list>
-          <ThemeSpaceListGeneric list="#444444"
-                                 list_title="#c0c0c0"
-                                 list_text="#999999"
-                                 list_text_hi="#ffffff">
-          </ThemeSpaceListGeneric>
-        </space_list>
       </ThemeFileBrowser>
     </file_browser>
     <nla_editor>
index 619af7c5e5251c17de66d770f35a1576c6a4ed75..ab0a599483818a35565daddda3acd3244a161696 100644 (file)
       </ThemeGraphEditor>
     </graph_editor>
     <file_browser>
-      <ThemeFileBrowser selected_file="#f1e593"
-                        scrollbar="#4d4b4d"
-                        scroll_handle="#8c8a88"
-                        active_file="#f1e593"
-                        active_file_text="#ffffff">
+      <ThemeFileBrowser selected_file="#f1e593">
         <space>
           <ThemeSpaceGeneric back="#aca8a7"
                              title="#ffffff"
             </panelcolors>
           </ThemeSpaceGeneric>
         </space>
-        <space_list>
-          <ThemeSpaceListGeneric list="#aaa8a6"
-                                 list_title="#3a3a3a"
-                                 list_text="#7f7f7f"
-                                 list_text_hi="#ffffff">
-          </ThemeSpaceListGeneric>
-        </space_list>
       </ThemeFileBrowser>
     </file_browser>
     <nla_editor>
index a319b0be5c0e592850d7c38d3b9a34a2fdedf597..184ea4214a44bfdb0d6a2b21beb1e5771eea6427 100644 (file)
       </ThemeGraphEditor>
     </graph_editor>
     <file_browser>
-      <ThemeFileBrowser selected_file="#6b395a"
-                        scrollbar="#a0a0a0"
-                        scroll_handle="#7f7070"
-                        active_file="#eeedeb"
-                        active_file_text="#ffffff">
+      <ThemeFileBrowser selected_file="#6b395a">
         <space>
           <ThemeSpaceGeneric back="#131311"
                              title="#000000"
             </panelcolors>
           </ThemeSpaceGeneric>
         </space>
-        <space_list>
-          <ThemeSpaceListGeneric list="#3c3b37"
-                                 list_title="#95948f"
-                                 list_text="#95948f"
-                                 list_text_hi="#ffffff">
-          </ThemeSpaceListGeneric>
-        </space_list>
       </ThemeFileBrowser>
     </file_browser>
     <nla_editor>
index 6b7867c845f763830adee7a569a0738b8b9cce98..79fa7a7571aed554b1a782162b792d222004e828 100644 (file)
@@ -1047,10 +1047,8 @@ void ui_theme_init_default(void)
        rgba_char_args_set(btheme->tfile.text,  250, 250, 250, 255);
        rgba_char_args_set(btheme->tfile.text_hi, 15, 15, 15, 255);
 //     rgba_char_args_set(btheme->tfile.panel, 145, 145, 145, 255);  /* bookmark/ui regions */
-       rgba_char_args_set(btheme->tfile.active, 130, 130, 130, 255); /* selected files */
        rgba_char_args_set(btheme->tfile.hilite, 255, 140, 25, 255);  /* selected files */
-       
-       rgba_char_args_set(btheme->tfile.grid,  250, 250, 250, 255);
+
        rgba_char_args_set(btheme->tfile.image, 250, 250, 250, 255);
        rgba_char_args_set(btheme->tfile.movie, 250, 250, 250, 255);
        rgba_char_args_set(btheme->tfile.scene, 250, 250, 250, 255);
index 0cd1acd63f5d5266f8efe38ccbebeda53a373341..b2aadbcaf0aa13fd15f4c81af76175e117e82b9b 100644 (file)
@@ -1901,37 +1901,12 @@ static void rna_def_userdef_theme_space_file(BlenderRNA *brna)
        RNA_def_struct_ui_text(srna, "Theme File Browser", "Theme settings for the File Browser");
 
        rna_def_userdef_theme_spaces_main(srna);
-       rna_def_userdef_theme_spaces_list_main(srna);
 
        prop = RNA_def_property(srna, "selected_file", PROP_FLOAT, PROP_COLOR_GAMMA);
        RNA_def_property_float_sdna(prop, NULL, "hilite");
        RNA_def_property_array(prop, 3);
        RNA_def_property_ui_text(prop, "Selected File", "");
        RNA_def_property_update(prop, 0, "rna_userdef_update");
-
-       prop = RNA_def_property(srna, "scrollbar", PROP_FLOAT, PROP_COLOR_GAMMA);
-       RNA_def_property_float_sdna(prop, NULL, "shade1");
-       RNA_def_property_array(prop, 3);
-       RNA_def_property_ui_text(prop, "Scrollbar", "");
-       RNA_def_property_update(prop, 0, "rna_userdef_update");
-
-       prop = RNA_def_property(srna, "scroll_handle", PROP_FLOAT, PROP_COLOR_GAMMA);
-       RNA_def_property_float_sdna(prop, NULL, "shade2");
-       RNA_def_property_array(prop, 3);
-       RNA_def_property_ui_text(prop, "Scroll Handle", "");
-       RNA_def_property_update(prop, 0, "rna_userdef_update");
-
-       prop = RNA_def_property(srna, "active_file", PROP_FLOAT, PROP_COLOR_GAMMA);
-       RNA_def_property_float_sdna(prop, NULL, "active");
-       RNA_def_property_array(prop, 3);
-       RNA_def_property_ui_text(prop, "Active File", "");
-       RNA_def_property_update(prop, 0, "rna_userdef_update");
-       
-       prop = RNA_def_property(srna, "active_file_text", PROP_FLOAT, PROP_COLOR_GAMMA);
-       RNA_def_property_float_sdna(prop, NULL, "grid");
-       RNA_def_property_array(prop, 3);
-       RNA_def_property_ui_text(prop, "Active File Text", "");
-       RNA_def_property_update(prop, 0, "rna_userdef_update");
 }
 
 static void rna_def_userdef_theme_space_outliner(BlenderRNA *brna)