icons included into bridge. by default

bridge-core · Aug 6, 2019 · 7695d19 · 7695d19
1 parent be22915
commit 7695d19
Show file tree

Hide file tree

Showing 18 changed files with 40 additions and 38 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "bridge",
   "productName": "bridge.",
-  "version": "0.13.1",
+  "version": "0.13.2",
   "author": "solvedDev <[email protected]>",
   "description": "A powerful add-on editor",
   "license": "GNU",
@@ -54,7 +54,7 @@
     }
   },
   "dependencies": {
-    "@mdi/font": "^3.3.92",
+    "@mdi/font": "^3.9.95",
     "clean-css": "^4.2.1",
     "comment-json": "^1.1.3",
     "dataurl": "^0.1.0",

diff --git a/src/renderer/App.vue b/src/renderer/App.vue
@@ -104,8 +104,7 @@
 </script>
 
 <style>
-  @import url('https://fonts.googleapis.com/css?family=Roboto:300,400,500,700|Material+Icons');
-  @import url('https://cdn.materialdesignicons.com/2.5.94/css/materialdesignicons.min.css');
+  @import url('https://fonts.googleapis.com/css?family=Roboto:300,400,500,700');
 
   /* Global CSS */
   html {

diff --git a/src/renderer/components/AppMenu.vue b/src/renderer/components/AppMenu.vue
@@ -17,7 +17,7 @@
                 </v-list-tile-content>
 
     	        <v-list-tile-action>
-                    <v-icon small>keyboard_arrow_right</v-icon>
+                    <v-icon small>mdi-chevron-right</v-icon>
                 </v-list-tile-action>
         </v-list-tile>
 

diff --git a/src/renderer/components/AppToolbar.vue b/src/renderer/components/AppToolbar.vue
@@ -9,13 +9,13 @@
 
         <v-toolbar-items>
             <v-btn small icon flat @click.stop="minWindow">
-                <v-icon small>minimize</v-icon>
+                <v-icon small>mdi-minus</v-icon>
             </v-btn>
             <v-btn small icon flat @click.stop="maxWindow">
-                <v-icon small>add</v-icon>
+                <v-icon small>mdi-plus</v-icon>
             </v-btn>
             <v-btn small icon flat @click.stop="closeWindow" class="last-btn">
-                <v-icon small>close</v-icon>
+                <v-icon small>mdi-close</v-icon>
             </v-btn>
         </v-toolbar-items>
     </v-toolbar>
@@ -26,8 +26,8 @@
     import { remote } from "electron";
     import MouseTrap from "mousetrap";
     import KeyManager from "../scripts/appMenu/KeyManager";
-import TabSystem from '../scripts/TabSystem';
-import ConfirmWindow from '../scripts/commonWindows/Confirm';
+    import TabSystem from '../scripts/TabSystem';
+    import ConfirmWindow from '../scripts/commonWindows/Confirm';
 
     export default {
         name: "app-toolbar",

diff --git a/src/renderer/components/editor_shell/JsonEditor/ObjectKey.vue b/src/renderer/components/editor_shell/JsonEditor/ObjectKey.vue
@@ -17,11 +17,11 @@
             <v-icon
                 v-if="inversed_arrows && node_context.open || !inversed_arrows && !node_context.open"
                 small
-            >keyboard_arrow_down</v-icon>
+            >mdi-chevron-down</v-icon>
             <v-icon
                 v-if="!inversed_arrows && node_context.open || inversed_arrows && !node_context.open"
                 small
-            >keyboard_arrow_up</v-icon>
+            >mdi-chevron-up</v-icon>
         </v-btn>
 
         <v-tooltip

diff --git a/src/renderer/components/editor_shell/TabSystem.vue b/src/renderer/components/editor_shell/TabSystem.vue
@@ -14,7 +14,7 @@
                         <span>{{ file.file_name }}</span>
                     </v-tooltip>
 
-                    <v-btn @click.stop="closeTab(i)" flat icon small><v-icon small>close</v-icon></v-btn>
+                    <v-btn @click.stop="closeTab(i)" flat icon small><v-icon small>mdi-close</v-icon></v-btn>
                 </v-tab>
             </v-tabs>
     </v-layout>

diff --git a/src/renderer/components/plugin_install/CloudPlugin.vue b/src/renderer/components/plugin_install/CloudPlugin.vue
@@ -12,7 +12,7 @@
                 <v-list-tile-action-text>{{ plugin.version }}</v-list-tile-action-text>
                 <v-tooltip :right="!is_fullscreen" :left="is_fullscreen" v-if="!is_update">
                     <v-btn slot="activator" @click.stop="download()" :disabled="!is_compatible" :loading="loading" icon>
-                        <v-icon>cloud_download</v-icon>
+                        <v-icon>mdi-cloud-download</v-icon>
                     </v-btn>
                     <span>Download</span>
                 </v-tooltip>

diff --git a/src/renderer/components/plugin_install/Main.vue b/src/renderer/components/plugin_install/Main.vue
@@ -9,10 +9,10 @@
                     <span class="window-title">Extensions</span>
                     <v-spacer></v-spacer>
                     <v-btn small icon @click.stop="is_fullscreen = !is_fullscreen">
-                        <v-icon small>add</v-icon>
+                        <v-icon small>mdi-plus</v-icon>
                     </v-btn>
                     <v-btn small icon @click.stop="is_menu_open = false" class="last-btn">
-                        <v-icon small>close</v-icon>
+                        <v-icon small>mdi-close</v-icon>
                     </v-btn>
                 </v-toolbar>
             </v-card-title>
@@ -31,17 +31,17 @@
                 >
                     <v-btn flat value="active">
                         <span>Active</span>
-                        <v-icon>bookmark</v-icon>
+                        <v-icon>mdi-bookmark</v-icon>
                     </v-btn>
 
                     <v-btn flat value="available">
                         <span>Available</span>
-                        <v-icon>apps</v-icon>
+                        <v-icon>mdi-apps</v-icon>
                     </v-btn>
 
                     <v-btn flat value="web">
                         <span>Web</span>
-                        <v-icon>cloud</v-icon>
+                        <v-icon>mdi-cloud</v-icon>
                     </v-btn>
                 </v-bottom-nav>
             </v-card-actions>

diff --git a/src/renderer/components/sidebar/content/Plugins.vue b/src/renderer/components/sidebar/content/Plugins.vue
@@ -3,7 +3,7 @@
         <v-toolbar flat height="30px">
             <v-tooltip bottom class="first">
                 <v-btn slot="activator" @click.stop="is_menu_open = true" class="first" small icon>
-                    <v-icon small>settings</v-icon>
+                    <v-icon small>mdi-settings</v-icon>
                 </v-btn>
                 <span>Manage</span>
             </v-tooltip>
@@ -27,7 +27,7 @@
                                     flat
                                     icon
                                     small>
-                                    <v-icon small>info</v-icon>
+                                    <v-icon small>mdi-information</v-icon>
                                 </v-btn>
                                 <span>More...</span>
                             </v-tooltip>
@@ -50,20 +50,20 @@
 
                             <v-tooltip right v-if="plugin.link != undefined">
                                 <v-icon @click.stop.native="openLink(plugin.link)" slot="activator" color="primary">
-                                    language
+                                    mdi-earth
                                 </v-icon>
                                 <span>More...</span>
                             </v-tooltip>
 
                             <v-tooltip right v-if="!uninstalled_plugins().includes(plugin.id)">
                                 <v-icon slot="activator" color="success">
-                                    done
+                                    mdi-check
                                 </v-icon>
                                 <span>Active</span>
                             </v-tooltip>
                             <v-tooltip right v-else>
                                 <v-icon slot="activator" color="error">
-                                    close
+                                    mdi-close
                                 </v-icon>
                                 <span>Inactive</span>
                             </v-tooltip>

diff --git a/src/renderer/components/sidebar/content/explorer/FileDisplayer.vue b/src/renderer/components/sidebar/content/explorer/FileDisplayer.vue
@@ -5,7 +5,7 @@
     <div :style="element_style" :class="element_class" v-else>
         <details v-for="(file) in only_folders" :open="file.is_open" :key="file.absolutePath + file.is_open">
             <summary @click="openDir(file.path)" v-ripple>
-                <v-icon class="open" small>folder_open</v-icon><v-icon class="closed" small>folder</v-icon>
+                <v-icon class="open" small>mdi-folder-open</v-icon><v-icon class="closed" small>mdi-folder</v-icon>
                 <span class="folder"> {{ file.name }}</span>
             </summary>
             <file-displayer

diff --git a/src/renderer/components/sidebar/content/explorer/RpToolbar.vue b/src/renderer/components/sidebar/content/explorer/RpToolbar.vue
@@ -2,7 +2,7 @@
     <v-toolbar flat height="30px">
         <v-tooltip bottom class="first">
             <v-btn icon flat @click.stop="refresh" slot="activator" small>
-                <v-icon small>refresh</v-icon>
+                <v-icon small>mdi-refresh</v-icon>
             </v-btn>
             <span>Refresh</span>
         </v-tooltip>

diff --git a/src/renderer/components/sidebar/content/explorer/Toolbar.vue b/src/renderer/components/sidebar/content/explorer/Toolbar.vue
@@ -2,7 +2,7 @@
     <v-toolbar flat height="30px">
         <v-tooltip bottom class="first">
             <v-btn icon flat @click.stop="refresh" slot="activator" small>
-                <v-icon small>refresh</v-icon>
+                <v-icon small>mdi-refresh</v-icon>
             </v-btn>
             <span>Refresh</span>
         </v-tooltip>
@@ -38,7 +38,7 @@
         <v-spacer></v-spacer>
         <v-tooltip bottom>
             <v-btn icon flat @click.stop="" slot="activator" small>
-                <v-icon small>more_vert</v-icon>
+                <v-icon small>mdi-dots-vertical</v-icon>
             </v-btn>
             <span>More...</span>
         </v-tooltip>

diff --git a/src/renderer/components/windowFactory/Window.vue b/src/renderer/components/windowFactory/Window.vue
@@ -29,7 +29,7 @@
                     :class="has_close_button ? '' : 'last-btn'"
                     v-if="has_maximize_button"
                 >
-                    <v-icon small>add</v-icon>
+                    <v-icon small>mdi-plus</v-icon>
                 </v-btn>
                 <v-btn 
                     small
@@ -38,7 +38,7 @@
                     class="last-btn"
                     v-if="has_close_button"
                 >
-                    <v-icon small>close</v-icon>
+                    <v-icon small>mdi-close</v-icon>
                 </v-btn>
             </v-toolbar>
 

diff --git a/src/renderer/main.js b/src/renderer/main.js
@@ -4,11 +4,13 @@ import "vuetify/dist/vuetify.css";
 import VueCodeMirror from "vue-codemirror";
 import App from "./App";
 import store from "./store";
+import "@mdi/font/css/materialdesignicons.css";
 
 Vue.use(Vuetify, {
   options: {
     customProperties: true
-  }
+  },
+  iconfont: 'mdi'
 });
 Vue.use(VueCodeMirror);
 

diff --git a/src/renderer/scripts/constants/app_version.js b/src/renderer/scripts/constants/app_version.js
@@ -2,4 +2,4 @@
  * Version number is in a dedicated file because it's also used by the main thread. 
  * Otherwise, any changes to the main constant file would completely restart "bridge." (in development mode).
 */
-export default "v0.13.1";
+export default "v0.13.2";
diff --git a/src/renderer/store/modules/SidebarMenu.js b/src/renderer/store/modules/SidebarMenu.js
@@ -8,7 +8,7 @@ const state = {
     items: [
         {
             title: "Explorer",
-            icon: "folder",
+            icon: "mdi-folder",
             menu_type: "explorer"
         },
         {
@@ -23,7 +23,7 @@ const state = {
         },
         {
             title: "Extensions",
-            icon: "extension",
+            icon: "mdi-puzzle",
             menu_type: "extensions"
         }
     ],

diff --git a/src/renderer/store/modules/WindowFactory.js b/src/renderer/store/modules/WindowFactory.js
@@ -55,6 +55,7 @@ const mutations = {
         if(state.elements.length > index && state.elements[index].id === id) state.elements.splice(index, 1);
     },
     resetPluginWindows(state) {
+        //Filter out plugin windows and keep native windows
         state.elements = state.elements.filter(w => !w.is_plugin);
     }
 }