Skip to content

Commit

Permalink
Remove some reset buttons
Browse files Browse the repository at this point in the history
  • Loading branch information
@sjackso
sjackso committed Aug 5, 2019
1 parent cac3504 commit 54cb176
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 56 deletions.
3 changes: 1 addition & 2 deletions src/athena/mainwindow.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ def __init__( self, ui_filepath=default_ui_path ):
self.actionOpen.triggered.connect( self.selectAndAddFileToGeomList )
self.actionAddScaffold.triggered.connect( self.selectAndAddScaffoldFile )
self.actionResetViewerOptions.triggered.connect( self.resetDisplayOptions )
self.resetDisplayButton.clicked.connect( self.resetDisplayOptions )
self.actionResetCamera.triggered.connect( self.geomView.resetCamera )


# action groups cannot be set up in Qt Designer, so do that here
Expand All @@ -317,7 +317,6 @@ def __init__( self, ui_filepath=default_ui_path ):
self.camMotionButtonGroup.addButton( self.zoomButton )
self.camMotionButtonGroup.buttonClicked.connect( self.selectCameraTool )

self.resetCameraButton.clicked.connect( self.geomView.resetCamera )

# On Windows, flat some QGroupBox's ... it looks better there,
# but worse on OSX.
Expand Down
62 changes: 8 additions & 54 deletions ui/AthenaMainWindow.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
</property>
<item>
<widget class="QWidget" name="inputSidebar" native="true">
<layout class="QVBoxLayout" name="inputSidebarLayout" stretch="0,0,0,0,0,0,0">
<layout class="QVBoxLayout" name="inputSidebarLayout" stretch="0,0,0,0,0,0">
<property name="spacing">
<number>10</number>
</property>
Expand Down Expand Up @@ -798,32 +798,6 @@ Direction</string>
</property>
</spacer>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_17">
<property name="spacing">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<item>
<widget class="QPushButton" name="resetDisplayButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="text">
<string>Reset Display</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QGroupBox" name="showResultsBox">
<property name="sizePolicy">
Expand Down Expand Up @@ -1112,32 +1086,6 @@ Direction</string>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_18">
<property name="spacing">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<item>
<widget class="QPushButton" name="resetCameraButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="text">
<string>Reset Camera</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</item>
Expand Down Expand Up @@ -1409,7 +1357,7 @@ Direction</string>
<x>0</x>
<y>0</y>
<width>176</width>
<height>117</height>
<height>69</height>
</rect>
</property>
<property name="sizePolicy">
Expand Down Expand Up @@ -1830,6 +1778,7 @@ Direction</string>
<bool>false</bool>
</property>
<addaction name="actionResetViewerOptions"/>
<addaction name="actionResetCamera"/>
<addaction name="separator"/>
<addaction name="actionOverlayResults"/>
<addaction name="actionSeparateResults"/>
Expand Down Expand Up @@ -1943,6 +1892,11 @@ Direction</string>
<string>New Session</string>
</property>
</action>
<action name="actionResetCamera">
<property name="text">
<string>Reset Camera</string>
</property>
</action>
</widget>
<customwidgets>
<customwidget>
Expand Down

0 comments on commit 54cb176

Please sign in to comment.