Showing with 23 additions and 17 deletions.
  1. +1 −1 CMakeLists.txt
  2. +22 −16 src/ui/qgsoptionsbase.ui
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ SET(CPACK_PACKAGE_VERSION_MAJOR "1")
SET(CPACK_PACKAGE_VERSION_MINOR "8")
SET(CPACK_PACKAGE_VERSION_PATCH "0")
SET(COMPLETE_VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH})
SET(RELEASE_NAME "master")
SET(RELEASE_NAME "Lisboa")
SET(PROJECT_VERSION ${COMPLETE_VERSION})
PROJECT(qgis${PROJECT_VERSION})
IF (APPLE)
Expand Down
38 changes: 22 additions & 16 deletions src/ui/qgsoptionsbase.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>809</width>
<height>778</height>
<width>787</width>
<height>831</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout">
Expand Down Expand Up @@ -726,8 +726,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>809</width>
<height>778</height>
<width>803</width>
<height>763</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_8">
Expand Down Expand Up @@ -900,8 +900,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>809</width>
<height>778</height>
<width>803</width>
<height>763</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_4">
Expand Down Expand Up @@ -1186,8 +1186,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>809</width>
<height>778</height>
<width>803</width>
<height>763</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_10">
Expand Down Expand Up @@ -1251,8 +1251,14 @@
<string>Digitizing</string>
</attribute>
<layout class="QGridLayout" name="gridLayout_14">
<property name="margin">
<number>0</number>
</property>
<item row="0" column="0">
<widget class="QScrollArea" name="scrollArea_5">
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<property name="widgetResizable">
<bool>true</bool>
</property>
Expand All @@ -1261,8 +1267,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>795</width>
<height>764</height>
<width>803</width>
<height>763</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_13">
Expand Down Expand Up @@ -1637,8 +1643,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>809</width>
<height>778</height>
<width>803</width>
<height>763</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_15">
Expand Down Expand Up @@ -1811,8 +1817,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>809</width>
<height>778</height>
<width>803</width>
<height>763</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_17">
Expand Down Expand Up @@ -1908,8 +1914,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>809</width>
<height>778</height>
<width>803</width>
<height>763</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_20">
Expand Down