Fix naming: border_color -> border_style

Signed-off-by: Brianna Major <brianna.major@kitware.com>

Author: bnmajor

hexrdgui/masking/mask_border_style_picker.py

@@ -23,8 +23,8 @@ def __init__(self, original_color, original_style, original_width, parent=None):
         self.setup_connections()
 
     def setup_ui(self):
-        self.ui.border_color.setText(self.original_color)
-        self.ui.border_color.setStyleSheet('QPushButton {background-color: %s}' % self.original_color)
+        self.ui.border_style.setText(self.original_color)
+        self.ui.border_style.setStyleSheet('QPushButton {background-color: %s}' % self.original_color)
         self.ui.border_style.setCurrentText(self.original_style)
         self.ui.border_size.setValue(self.original_width)
 
@@ -33,7 +33,7 @@ def exec(self):
         return self.ui.exec()
 
     def setup_connections(self):
-        self.ui.border_color.clicked.connect(self.pick_color)
+        self.ui.border_style.clicked.connect(self.pick_color)
         self.ui.border_style.currentIndexChanged.connect(self.update_style)
         self.ui.border_size.valueChanged.connect(self.update_width)
         self.ui.button_box.rejected.connect(self.reject)
@@ -42,8 +42,8 @@ def pick_color(self):
         dialog = QColorDialog(QColor(self.original_color), self.ui)
         if dialog.exec():
             self.color = dialog.selectedColor().name()
-            self.ui.border_color.setText(self.color)
-            self.ui.border_color.setStyleSheet('QPushButton {background-color: %s}' % self.color)
+            self.ui.border_style.setText(self.color)
+            self.ui.border_style.setStyleSheet('QPushButton {background-color: %s}' % self.color)
 
     def update_style(self):
         self.style = self.ui.border_style.currentText()

hexrdgui/resources/ui/mask_border_style_picker.ui

@@ -36,12 +36,12 @@
          <string>Color:</string>
         </property>
         <property name="buddy">
-         <cstring>border_color</cstring>
+         <cstring>border_style</cstring>
         </property>
        </widget>
       </item>
       <item row="0" column="1">
-       <widget class="QPushButton" name="border_color">
+       <widget class="QPushButton" name="border_style">
         <property name="text">
          <string/>
         </property>
@@ -129,7 +129,7 @@
   </customwidget>
  </customwidgets>
  <tabstops>
-  <tabstop>border_color</tabstop>
+  <tabstop>border_style</tabstop>
   <tabstop>border_style</tabstop>
   <tabstop>border_size</tabstop>
  </tabstops>

hexrdgui/resources/ui/mask_manager_dialog.ui

@@ -190,9 +190,9 @@
       </widget>
      </item>
      <item>
-      <widget class="QPushButton" name="border_color">
+      <widget class="QPushButton" name="border_style">
        <property name="text">
-        <string>Border Color</string>
+        <string>Border Style</string>
        </property>
       </widget>
      </item>
@@ -245,7 +245,7 @@
   <tabstop>show_all_masks</tabstop>
   <tabstop>hide_all_boundaries</tabstop>
   <tabstop>show_all_boundaries</tabstop>
-  <tabstop>border_color</tabstop>
+  <tabstop>border_style</tabstop>
   <tabstop>presentation_selector</tabstop>
   <tabstop>export_selected</tabstop>
   <tabstop>remove_selected</tabstop>