itdominator
/
SWBF2-Classic-Msh-Viewer
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'developement_1' of git.rwth-aachen.de:carstenf/OpenGL into developement_1 

# Conflicts:
#	QtMeshViewer/Header/MainWindow.h
#	QtMeshViewer/Source/MainWindow.cpp
This commit is contained in:
Anakin 2017-06-20 11:45:15 +02:00
parent 44732057b6 2d34492517
commit 68387fe7a7
2 changed files with 604 additions and 593 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
QtMeshViewer/Form Files/MainWindow.ui
View File

@ -73,10 +73,21 @@
<item> <item>
<layout class="QVBoxLayout" name="verticalLayout_2"> <layout class="QVBoxLayout" name="verticalLayout_2">
<item> <item>
<widget class="QComboBox" name="dirDropDownList"/> <widget class="QComboBox" name="dirDropDownList">
<property name="focusPolicy">
<enum>Qt::ClickFocus</enum>
</property>
</widget>
</item> </item>
<item> <item>
<widget class="QListWidget" name="fileListWidget"/> <widget class="QTreeWidget" name="fileTreeWidget">
<property name="autoExpandDelay">
<number>0</number>
</property>
<property name="headerHidden">
<bool>true</bool>
</property>
</widget>
</item> </item>
</layout> </layout>
</item> </item>

2
QtMeshViewer/Form Files/SettingsWindow.ui
View File

@ -6,7 +6,7 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>503</width> <width>584</width>
<height>645</height> <height>645</height>
</rect> </rect>
</property> </property>