Set minimum width for composition and item properties panels in composer

dakcarto · dakcarto · commit 48bd860b93ef · 2013-03-02T22:35:13.000-07:00
diff --git a/src/app/composer/qgscomposer.cpp b/src/app/composer/qgscomposer.cpp
@@ -281,12 +281,16 @@ QgsComposer::QgsComposer( QgisApp *qgis, const QString& title )
   mComposition->setParent( mView );
   mView->setComposition( mComposition );
 
+  int minDockWidth( 335 );
+
   setTabPosition( Qt::AllDockWidgetAreas, QTabWidget::North );
   mGeneralDock = new QDockWidget( tr( "Composition" ), this );
   mGeneralDock->setObjectName( "CompositionDock" );
+  mGeneralDock->setMinimumWidth( minDockWidth );
   mPanelMenu->addAction( mGeneralDock->toggleViewAction() );
   mItemDock = new QDockWidget( tr( "Item Properties" ), this );
   mItemDock->setObjectName( "ItemDock" );
+  mItemDock->setMinimumWidth( minDockWidth );
   mPanelMenu->addAction( mItemDock->toggleViewAction() );
   mUndoDock = new QDockWidget( tr( "Command history" ), this );
   mUndoDock->setObjectName( "CommandDock" );
diff --git a/src/app/composer/qgscomposermapwidget.cpp b/src/app/composer/qgscomposermapwidget.cpp
@@ -73,6 +73,9 @@ QgsComposerMapWidget::QgsComposerMapWidget( QgsComposerMap* composerMap ): QWidg
   mFrameStyleComboBox->insertItem( 0, tr( "No frame" ) );
   mFrameStyleComboBox->insertItem( 1, tr( "Zebra" ) );
 
+  connect( mGridCheckBox, SIGNAL( toggled( bool ) ),
+           mDrawAnnotationCheckableGroupBox, SLOT( setEnabled( bool ) ) );
+
   if ( composerMap )
   {
     connect( composerMap, SIGNAL( itemChanged() ), this, SLOT( setGuiElementValues() ) );
diff --git a/src/ui/qgscomposermapwidgetbase.ui b/src/ui/qgscomposermapwidgetbase.ui
@@ -54,9 +54,9 @@
       <property name="geometry">
        <rect>
         <x>0</x>
-        <y>-215</y>
-        <width>440</width>
-        <height>1303</height>
+        <y>0</y>
+        <width>439</width>
+        <height>1277</height>
        </rect>
       </property>
       <property name="sizePolicy">
@@ -446,7 +446,7 @@
           <item row="7" column="0" colspan="2">
            <widget class="QgsCollapsibleGroupBoxBasic" name="mDrawAnnotationCheckableGroupBox">
             <property name="enabled">
-             <bool>true</bool>
+             <bool>false</bool>
             </property>
             <property name="title">
              <string>Draw coordinates</string>
diff --git a/src/ui/qgscompositionbase.ui b/src/ui/qgscompositionbase.ui
@@ -59,11 +59,8 @@
         <property name="enabled">
          <bool>true</bool>
         </property>
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
+        <property name="sizeAdjustPolicy">
+         <enum>QComboBox::AdjustToMinimumContentsLength</enum>
         </property>
        </widget>
       </item>
diff --git a/src/ui/qgscompositionwidgetbase.ui b/src/ui/qgscompositionwidgetbase.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>391</width>
+    <width>294</width>
     <height>787</height>
    </rect>
   </property>
@@ -64,8 +64,8 @@
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>389</width>
-        <height>765</height>
+        <width>292</width>
+        <height>764</height>
        </rect>
       </property>
       <layout class="QVBoxLayout" name="verticalLayout_2">

Original file line number	Diff line number	Diff line change
`@@ -73,6 +73,9 @@ QgsComposerMapWidget::QgsComposerMapWidget( QgsComposerMap* composerMap ): QWidg`
`73`	`73`	`mFrameStyleComboBox->insertItem( 0, tr( "No frame" ) );`
`74`	`74`	`mFrameStyleComboBox->insertItem( 1, tr( "Zebra" ) );`
`75`	`75`
	`76`	`+ connect( mGridCheckBox, SIGNAL( toggled( bool ) ),`
	`77`	`+ mDrawAnnotationCheckableGroupBox, SLOT( setEnabled( bool ) ) );`
	`78`	`+`
`76`	`79`	`if ( composerMap )`
`77`	`80`	`{`
`78`	`81`	`connect( composerMap, SIGNAL( itemChanged() ), this, SLOT( setGuiElementValues() ) );`