Skip to content

Commit

Permalink
Fix for #7194, tabs partially shown for composer panels
Browse files Browse the repository at this point in the history 
- All newly designed panels reworked to ensure smallest reasonable width
  • Loading branch information
@dakcarto
dakcarto committed Mar 3, 2013
1 parent 34f3d50 commit 511177c
Show file tree
Hide file tree
Showing 10 changed files with 388 additions and 387 deletions.
24 changes: 12 additions & 12 deletions src/app/composer/qgscompositionwidget.cpp
View file
Expand Up @@ -117,18 +117,18 @@ void QgsCompositionWidget::createPaperEntries()
<< QgsCompositionPaper( tr( "B1 (707 x 1000 mm)" ), 707, 1000 )
<< QgsCompositionPaper( tr( "B0 (1000 x 1414 mm)" ), 1000, 1414 )
// North american formats
<< QgsCompositionPaper( tr( "Legal (8.5x14 inches)" ), 215.9, 355.6 )
<< QgsCompositionPaper( tr( "ANSI A (Letter; 8.5x11 inches)" ), 215.9, 279.4 )
<< QgsCompositionPaper( tr( "ANSI B (Tabloid; 11x17 inches)" ), 279.4, 431.8 )
<< QgsCompositionPaper( tr( "ANSI C (17x22 inches)" ), 431.8, 558.8 )
<< QgsCompositionPaper( tr( "ANSI D (22x34 inches)" ), 558.8, 863.6 )
<< QgsCompositionPaper( tr( "ANSI E (34x44 inches)" ), 863.6, 1117.6 )
<< QgsCompositionPaper( tr( "Arch A (9x12 inches)" ), 228.6, 304.8 )
<< QgsCompositionPaper( tr( "Arch B (12x18 inches)" ), 304.8, 457.2 )
<< QgsCompositionPaper( tr( "Arch C (18x24 inches)" ), 457.2, 609.6 )
<< QgsCompositionPaper( tr( "Arch D (24x36 inches)" ), 609.6, 914.4 )
<< QgsCompositionPaper( tr( "Arch E (36x48 inches)" ), 914.4, 1219.2 )
<< QgsCompositionPaper( tr( "Arch E1 (30x42 inches)" ), 762, 1066.8 )
<< QgsCompositionPaper( tr( "Legal (8.5x14 in)" ), 215.9, 355.6 )
<< QgsCompositionPaper( tr( "ANSI A (Letter; 8.5x11 in)" ), 215.9, 279.4 )
<< QgsCompositionPaper( tr( "ANSI B (Tabloid; 11x17 in)" ), 279.4, 431.8 )
<< QgsCompositionPaper( tr( "ANSI C (17x22 in)" ), 431.8, 558.8 )
<< QgsCompositionPaper( tr( "ANSI D (22x34 in)" ), 558.8, 863.6 )
<< QgsCompositionPaper( tr( "ANSI E (34x44 in)" ), 863.6, 1117.6 )
<< QgsCompositionPaper( tr( "Arch A (9x12 in)" ), 228.6, 304.8 )
<< QgsCompositionPaper( tr( "Arch B (12x18 in)" ), 304.8, 457.2 )
<< QgsCompositionPaper( tr( "Arch C (18x24 in)" ), 457.2, 609.6 )
<< QgsCompositionPaper( tr( "Arch D (24x36 in)" ), 609.6, 914.4 )
<< QgsCompositionPaper( tr( "Arch E (36x48 in)" ), 914.4, 1219.2 )
<< QgsCompositionPaper( tr( "Arch E1 (30x42 in)" ), 762, 1066.8 )
;
mPaperSizeComboBox->addItem( tr( "Custom" ) );

Expand Down
78 changes: 45 additions & 33 deletions src/ui/qgsatlascompositionwidgetbase.ui
View file
Expand Up @@ -17,7 +17,7 @@
</sizepolicy>
</property>
<property name="windowTitle">
<string>Form</string>
<string>Atlas Generation</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="spacing">
Expand Down Expand Up @@ -100,8 +100,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>431</width>
<height>546</height>
<width>416</width>
<height>562</height>
</rect>
</property>
<layout class="QVBoxLayout" name="mainLayout">
Expand Down Expand Up @@ -208,19 +208,22 @@
<property name="collapsed" stdset="0">
<bool>true</bool>
</property>
<layout class="QFormLayout" name="formLayout">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property>
<item row="0" column="0">
<widget class="QCheckBox" name="mAtlasSortFeatureCheckBox">
<property name="text">
<string>Sort by</string>
</property>
</widget>
</item>
<item row="0" column="1">
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QCheckBox" name="mAtlasSortFeatureCheckBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Sort by</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="mAtlasSortFeatureKeyComboBox"/>
</item>
Expand Down Expand Up @@ -304,14 +307,7 @@
<property name="collapsed" stdset="0">
<bool>false</bool>
</property>
<layout class="QFormLayout" name="formLayout_3">
<item row="1" column="0">
<widget class="QCheckBox" name="mAtlasFixedScaleCheckBox">
<property name="text">
<string>Fixed scale</string>
</property>
</widget>
</item>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
Expand All @@ -321,6 +317,12 @@
</item>
<item row="0" column="1">
<widget class="QSpinBox" name="mAtlasMarginSpinBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="suffix">
<string>%</string>
</property>
Expand All @@ -332,6 +334,13 @@
</property>
</widget>
</item>
<item row="1" column="0" colspan="2">
<widget class="QCheckBox" name="mAtlasFixedScaleCheckBox">
<property name="text">
<string>Fixed scale</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
Expand All @@ -352,16 +361,26 @@
<property name="collapsed" stdset="0">
<bool>false</bool>
</property>
<layout class="QFormLayout" name="formLayout_5">
<item row="0" column="0">
<layout class="QGridLayout" name="gridLayout_3">
<item row="2" column="0" colspan="2">
<widget class="QCheckBox" name="mAtlasSingleFileCheckBox">
<property name="text">
<string>Single file export when possible</string>
</property>
</widget>
</item>
<item row="0" column="0" colspan="2">
<widget class="QLabel" name="label_4">
<property name="text">
<string>Output filename expression</string>
</property>
</widget>
</item>
<item row="0" column="1">
<item row="1" column="0" colspan="2">
<layout class="QHBoxLayout" name="horizontalLayout_3">
<property name="leftMargin">
<number>12</number>
</property>
<item>
<widget class="QLineEdit" name="mAtlasFilenamePatternEdit"/>
</item>
Expand All @@ -374,13 +393,6 @@
</item>
</layout>
</item>
<item row="1" column="0" colspan="2">
<widget class="QCheckBox" name="mAtlasSingleFileCheckBox">
<property name="text">
<string>Single file export when possible</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
Expand Down
8 changes: 7 additions & 1 deletion src/ui/qgscomposerhtmlwidgetbase.ui
View file
Expand Up @@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
<string>HTML Frame</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="spacing">
Expand Down Expand Up @@ -74,6 +74,9 @@
<property name="text">
<string>URL</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item row="0" column="1">
Expand All @@ -95,6 +98,9 @@
<property name="text">
<string>Resize mode</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item row="2" column="1">
Expand Down
5 changes: 1 addition & 4 deletions src/ui/qgscomposeritemwidgetbase.ui
View file
Expand Up @@ -176,10 +176,7 @@
</widget>
</item>
<item row="0" column="0" rowspan="2">
<layout class="QFormLayout" name="formLayout">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property>
<layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="0">
<widget class="QLabel" name="mXLabel">
<property name="text">
Expand Down

0 comments on commit 511177c

Please sign in to comment.