[Uml-devel] CVS: kdesdk/umbrello/umbrello/dialogs diagrampropertiespage.ui,1.1,1.2 umlviewdialog.cpp,1.6,1.7

[kde at office.kde.org]

Update of /home/kde/kdesdk/umbrello/umbrello/dialogs
In directory office:/tmp/cvs-serv30377/dialogs

Modified Files:
	diagrampropertiespage.ui umlviewdialog.cpp 
Log Message:
Canvas is now resized dynamically when widgets are dragged to or away from it's edge.
Replaced canvas size boxes in Diagram Properties dialogue with zoom.


Index: diagrampropertiespage.ui
===================================================================
RCS file: /home/kde/kdesdk/umbrello/umbrello/dialogs/diagrampropertiespage.ui,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- diagrampropertiespage.ui	31 Jan 2003 00:12:28 -0000	1.1
+++ diagrampropertiespage.ui	2 Feb 2003 20:51:07 -0000	1.2
@@ -147,53 +147,26 @@
                                 <cstring>TextLabel4</cstring>
                             </property>
                             <property name="text">
-                                <string>Width</string>
+                                <string>Zoom</string>
                             </property>
                         </widget>
                         <widget class="QSpinBox">
                             <property name="name">
-                                <cstring>width</cstring>
+                                <cstring>zoom</cstring>
                             </property>
                             <property name="sizePolicy">
                                 <sizepolicy>
-                                    <hsizetype>7</hsizetype>
+                                    <hsizetype>0</hsizetype>
                                     <vsizetype>0</vsizetype>
                                     <horstretch>0</horstretch>
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
                             <property name="maxValue">
-                                <number>5000</number>
-                            </property>
-                            <property name="minValue">
                                 <number>500</number>
                             </property>
-                        </widget>
-                        <widget class="QLabel">
-                            <property name="name">
-                                <cstring>TextLabel5</cstring>
-                            </property>
-                            <property name="text">
-                                <string>Height</string>
-                            </property>
-                        </widget>
-                        <widget class="QSpinBox">
-                            <property name="name">
-                                <cstring>height</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>7</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="maxValue">
-                                <number>5000</number>
-                            </property>
                             <property name="minValue">
-                                <number>500</number>
+                                <number>10</number>
                             </property>
                         </widget>
                     </hbox>

Index: umlviewdialog.cpp
===================================================================
RCS file: /home/kde/kdesdk/umbrello/umbrello/dialogs/umlviewdialog.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- umlviewdialog.cpp	1 Feb 2003 22:39:06 -0000	1.6
+++ umlviewdialog.cpp	2 Feb 2003 20:51:07 -0000	1.7
@@ -61,8 +61,7 @@
 	m_diagramProperties = new DiagramPropertiesPage(page);
 
 	m_diagramProperties->diagramName->setText( m_pView->getName() );
-	m_diagramProperties->width->setValue(m_pView->canvas()->width());
-	m_diagramProperties->height->setValue(m_pView->canvas()->height());
+	m_diagramProperties->zoom->setValue(m_pView->currentZoom());
 
 	m_diagramProperties->showGrid->setChecked(m_pView -> getShowSnapGrid());
 	m_diagramProperties->snapToGrid->setChecked(m_pView-> getSnapToGrid());
@@ -114,21 +113,7 @@
 		case General:
 			{
 			checkName();
-			// resizing a canvas is a very expensive operation, so we first
-			// check if the size has changed
-			int w = m_diagramProperties->width->value();
-			int h = m_diagramProperties->height->value();
-			if (( w != m_pView->canvas()->width()) || ( h != m_pView->canvas()->height()) ) {
-				//the input fields in the dialog page are set to only allow reasonable values
-				//but we check here again just to be on the safe side. 500 < size < 5000
-				if(h<500) h = 500;
-				if(h>5000) h = 5000;
-				if(w<500) w = 500;
-				if(w>5000) w = 5000;
-				m_pView->setCanvasSize(w,h);
-			}
-			m_diagramProperties->width->setValue( m_pView->canvas()->width() );
-			m_diagramProperties->height->setValue( m_pView->canvas()->height() );
+			m_pView->setZoom( m_diagramProperties->zoom->value() );
 			m_pView->setDoc( m_diagramProperties->documentation->text() );
 			m_pView->setSnapX( m_diagramProperties->gridSpaceX->value() );
 			m_pView->setSnapY( m_diagramProperties->gridSpaceY->value() );