diff --git a/frontend/src/assets/toolbar/proteinselect.png b/frontend/src/assets/toolbar/proteinselect.png
new file mode 100644
index 00000000..38039dc4
Binary files /dev/null and b/frontend/src/assets/toolbar/proteinselect.png differ
diff --git a/frontend/src/components/term_graph/TermToolBar.vue b/frontend/src/components/term_graph/TermToolBar.vue
index eb5bed92..cfa1ff52 100644
--- a/frontend/src/components/term_graph/TermToolBar.vue
+++ b/frontend/src/components/term_graph/TermToolBar.vue
@@ -65,13 +65,13 @@
-
-
diff --git a/frontend/src/components/toolbar/DEValue.vue b/frontend/src/components/toolbar/modules/DEValue.vue
similarity index 100%
rename from frontend/src/components/toolbar/DEValue.vue
rename to frontend/src/components/toolbar/modules/DEValue.vue
diff --git a/frontend/src/components/toolbar/EdgeOpacity.vue b/frontend/src/components/toolbar/modules/EdgeOpacity.vue
similarity index 100%
rename from frontend/src/components/toolbar/EdgeOpacity.vue
rename to frontend/src/components/toolbar/modules/EdgeOpacity.vue
diff --git a/frontend/src/components/toolbar/ExportGraph.vue b/frontend/src/components/toolbar/modules/ExportGraph.vue
similarity index 91%
rename from frontend/src/components/toolbar/ExportGraph.vue
rename to frontend/src/components/toolbar/modules/ExportGraph.vue
index 70ba4358..e88a6307 100644
--- a/frontend/src/components/toolbar/ExportGraph.vue
+++ b/frontend/src/components/toolbar/modules/ExportGraph.vue
@@ -1,6 +1,6 @@
-
Save Network...
+ Export graph as .js
diff --git a/frontend/src/components/toolbar/ExportScreen.vue b/frontend/src/components/toolbar/modules/ExportScreen.vue
similarity index 59%
rename from frontend/src/components/toolbar/ExportScreen.vue
rename to frontend/src/components/toolbar/modules/ExportScreen.vue
index 354ab793..044bacb0 100644
--- a/frontend/src/components/toolbar/ExportScreen.vue
+++ b/frontend/src/components/toolbar/modules/ExportScreen.vue
@@ -1,9 +1,9 @@
-
Save PNG (White)
- Save PNG (Black)
- Save SVG (White)
- Save SVG (Black)
+ Save graph as
+
diff --git a/frontend/src/components/toolbar/NodeLabelSelect.vue b/frontend/src/components/toolbar/modules/NodeLabelSelect.vue
similarity index 87%
rename from frontend/src/components/toolbar/NodeLabelSelect.vue
rename to frontend/src/components/toolbar/modules/NodeLabelSelect.vue
index 1ed49662..22f6f5a7 100644
--- a/frontend/src/components/toolbar/NodeLabelSelect.vue
+++ b/frontend/src/components/toolbar/modules/NodeLabelSelect.vue
@@ -1,6 +1,6 @@
-
Reset Label...
+ Reset Label...
diff --git a/frontend/src/components/toolbar/ProteinList.vue b/frontend/src/components/toolbar/modules/ProteinList.vue
similarity index 70%
rename from frontend/src/components/toolbar/ProteinList.vue
rename to frontend/src/components/toolbar/modules/ProteinList.vue
index 3c573fb1..2aa504f3 100644
--- a/frontend/src/components/toolbar/ProteinList.vue
+++ b/frontend/src/components/toolbar/modules/ProteinList.vue
@@ -1,6 +1,19 @@
@@ -9,7 +22,7 @@
export default {
name: 'ProteinList',
props: [''],
- emits: ['status_changed'],
+ emits: ['protein_active_changed'],
data() {
return {
}
@@ -56,8 +69,8 @@ export default {
document.onmousemove = null;
}
},
- visible_list(){
- this.$emit("status_changed", true);
+ unactive_proteinlist(){
+ this.$emit("protein_active_changed", false);
}
},
mounted(){
diff --git a/frontend/src/components/toolbar/SelectionList.vue b/frontend/src/components/toolbar/modules/SelectionList.vue
similarity index 100%
rename from frontend/src/components/toolbar/SelectionList.vue
rename to frontend/src/components/toolbar/modules/SelectionList.vue
diff --git a/frontend/src/components/toolbar/SelectionWindow.vue b/frontend/src/components/toolbar/modules/SelectionWindow.vue
similarity index 100%
rename from frontend/src/components/toolbar/SelectionWindow.vue
rename to frontend/src/components/toolbar/modules/SelectionWindow.vue
diff --git a/frontend/src/components/toolbar/windows/MenuWindow.vue b/frontend/src/components/toolbar/windows/MenuWindow.vue
new file mode 100644
index 00000000..c48eb079
--- /dev/null
+++ b/frontend/src/components/toolbar/windows/MenuWindow.vue
@@ -0,0 +1,104 @@
+
+
+
+
+
+
+
+
+
diff --git a/frontend/src/style.css b/frontend/src/style.css
index 2db14466..00b44d7e 100644
--- a/frontend/src/style.css
+++ b/frontend/src/style.css
@@ -1756,19 +1756,6 @@ display: none;
margin: 40px 0 0 0;
}
-.tool-item {
- padding: 5px;
-}
-.tool-item li {
- list-style-type: none;
-}
-.tool-item li:hover {
- background-color: white;
- color: black;
- border-radius: 20px;
- cursor: pointer;
-}
-
.boundary {
border-radius: 20px;
background: rgba(255, 255, 255, 0.5);
diff --git a/frontend/src/views/ProteinView.vue b/frontend/src/views/ProteinView.vue
index da3b443b..58f7941b 100644
--- a/frontend/src/views/ProteinView.vue
+++ b/frontend/src/views/ProteinView.vue
@@ -41,13 +41,11 @@
>
-
-
-
-