From 253f83c3ef88fb38f59dc34f6072124bef2127c7 Mon Sep 17 00:00:00 2001
From: daniellimws <weesoong.lim@gmail.com>
Date: Tue, 13 Mar 2018 23:54:11 +0800
Subject: [PATCH] UI: Remove semantic search button and rename instruction
 search button

Semantic search has never worked since the very start.
Plan to combine #4, #21 and #86 with the general search functionality.
---
 ropa/gui/gui.py  |  6 +-----
 ropa/ui/scene.ui | 19 ++-----------------
 2 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/ropa/gui/gui.py b/ropa/gui/gui.py
index 40938f0..05e7d17 100644
--- a/ropa/gui/gui.py
+++ b/ropa/gui/gui.py
@@ -98,17 +98,13 @@ def _init_list_widgets(self):
 
     def _init_buttons(self):
         instructions_button_widget = self.findChild(qg.QPushButton,
-                                                    'searchInstructions')
+                                                    'search')
         self.instructions_button = IBController(self,
                                                 instructions_button_widget)
         poppopret_button_widget = self.findChild(qg.QPushButton,
                                                  'searchPopPopRet')
         self.poppopret_button = PBController(self,
                                              poppopret_button_widget)
-        semantics_button_widget = self.findChild(qg.QPushButton,
-                                                 'searchSemantics')
-        self.semantics_button = SBController(self,
-                                             semantics_button_widget)
 
     def _init_text_inputs(self):
         filter_input = self.findChild(qg.QLineEdit, 'searchBar')
diff --git a/ropa/ui/scene.ui b/ropa/ui/scene.ui
index 1a9d32b..fb3bc89 100644
--- a/ropa/ui/scene.ui
+++ b/ropa/ui/scene.ui
@@ -171,14 +171,14 @@
         <item>
          <layout class="QHBoxLayout" name="searchButtons">
           <item>
-           <widget class="QPushButton" name="searchInstructions">
+           <widget class="QPushButton" name="search">
             <property name="font">
              <font>
               <pointsize>9</pointsize>
              </font>
             </property>
             <property name="text">
-             <string>Instructions</string>
+             <string>Search</string>
             </property>
             <property name="checked">
              <bool>false</bool>
@@ -203,21 +203,6 @@
             </property>
            </widget>
           </item>
-          <item>
-           <widget class="QPushButton" name="searchSemantics">
-            <property name="font">
-             <font>
-              <pointsize>9</pointsize>
-             </font>
-            </property>
-            <property name="text">
-             <string>Semantics</string>
-            </property>
-            <property name="autoRepeat">
-             <bool>false</bool>
-            </property>
-           </widget>
-          </item>
          </layout>
         </item>
         <item>