[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    koffice/karbon
From:       Jan Hambrecht <jaham () gmx ! net>
Date:       2010-01-11 23:12:27
Message-ID: 1263251547.491832.14694.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1073305 by jaham:

rework unit handling a little



 M  +0 -12     common/KarbonDocument.cpp  
 M  +2 -16     common/KarbonDocument.h  
 M  +8 -16     ui/KarbonPart.cpp  
 M  +0 -3      ui/KarbonPart.h  
 M  +1 -0      ui/dialogs/KarbonConfigureDialog.cpp  
 M  +1 -1      ui/widgets/KarbonCanvas.cpp  


--- trunk/koffice/karbon/common/KarbonDocument.cpp #1073304:1073305
@@ -61,7 +61,6 @@
 public:
     Private()
     : pageSize(0.0, 0.0)
-    , unit( KoUnit::Millimeter )
     , hasExternalDataCenterMap(false)
     {
         // Ask every shapefactory to populate the dataCenterMap
@@ -87,7 +86,6 @@
     QList<KoShape*> objects;     ///< The list of all object of the document.
     QList<KoShapeLayer*> layers; ///< The layers in this document.
 
-    KoUnit unit; ///< The unit.
     QMap<QString, KoDataCenter*> dataCenterMap;
     bool hasExternalDataCenterMap;
 };
@@ -286,16 +284,6 @@
     return d->objects;
 }
 
-KoUnit KarbonDocument::unit() const
-{
-    return d->unit;
-}
-
-void KarbonDocument::setUnit( KoUnit unit )
-{
-    d->unit = unit;
-}
-
 const QList<KoShapeLayer*> KarbonDocument::layers() const
 {
     return d->layers;
--- trunk/koffice/karbon/common/KarbonDocument.h #1073304:1073305
@@ -35,7 +35,6 @@
 #include <QRectF>
 
 #include <karboncommon_export.h>
-#include <KoUnit.h>
 #include <KoShapeLoadingContext.h>
 #include <KoGenStyle.h>
 #include <KoXmlReader.h>
@@ -76,20 +75,6 @@
     virtual ~KarbonDocument();
 
     /**
-     * Returns document unit.
-     *
-     * @return the document's unit
-     */
-    KoUnit unit() const;
-
-    /**
-     * Sets document unit.
-     *
-     * @param unit the new document unit
-     */
-    void setUnit( KoUnit unit );
-
-    /**
      * Checks if specified layer can be raised. 
      *
      * A layer can be raised if there is more than one layer and the specified layer
@@ -173,7 +158,7 @@
     bool loadOasis( const KoXmlElement &element, KoShapeLoadingContext &context );
     void loadOdfStyles( KoShapeLoadingContext & context );
     void saveOdfStyles( KoShapeSavingContext & context );
-    
+
     /**
     * Adds an object to the document.
     *
@@ -210,6 +195,7 @@
     void useExternalDataCenterMap( QMap<QString, KoDataCenter*> dataCenters );
 
     void addToDataCenterMap(const QString &key, KoDataCenter* dataCenter);
+
 private:
 
     class Private;
--- trunk/koffice/karbon/ui/KarbonPart.cpp #1073304:1073305
@@ -140,8 +140,6 @@
 {
     Q_UNUSED(widgetName);
 
-    connect( this, SIGNAL( unitChanged( const KoUnit& ) ), this, SLOT( updateUnit( const KoUnit& ) ) );
-
     setObjectName(name);
     setComponentData( KarbonFactory::componentData(), false );
     setTemplateType( "karbon_template" );
@@ -417,17 +415,19 @@
         setBackupFile( interfaceGroup.readEntry( "BackupFile", true ) );
     }
     int undos = 30;
+    QString defaultUnit = "cm";
+    if( KGlobal::locale()->measureSystem() == KLocale::Imperial )
+        defaultUnit = "in";
+
     if( config->hasGroup( "Misc" ) )
     {
         KConfigGroup miscGroup = config->group( "Misc" );
         undos = miscGroup.readEntry( "UndoRedo", -1 );
-        QString defaultUnit = "cm";
-
-        if( KGlobal::locale()->measureSystem() == KLocale::Imperial )
-            defaultUnit = "in";
-
-        setUnit(KoUnit::unit( miscGroup.readEntry( "Units", defaultUnit ) ) );
+        defaultUnit = miscGroup.readEntry( "Units", defaultUnit );
     }
+    undoStack()->setUndoLimit(undos);
+    setUnit(KoUnit::unit(defaultUnit));
+
     if( config->hasGroup( "Grid" ) )
     {
         KoGridData defGrid;
@@ -435,9 +435,6 @@
         qreal spacingX = gridGroup.readEntry<qreal>( "SpacingX", defGrid.gridX() );
         qreal spacingY = gridGroup.readEntry<qreal>( "SpacingY", defGrid.gridY() );
         gridData().setGrid( spacingX, spacingY );
-        //qreal snapX = gridGroup.readEntry<qreal>( "SnapX", defGrid.snapX() );
-        //qreal snapY = gridGroup.readEntry<qreal>( "SnapY", defGrid.snapY() );
-        //d->document.grid().setSnap( snapX, snapY );
         QColor color = gridGroup.readEntry( "Color", defGrid.gridColor() );
         gridData().setGridColor( color );
     }
@@ -527,10 +524,5 @@
     }
 }
 
-void KarbonPart::updateUnit( const KoUnit &unit )
-{
-    d->document.setUnit(unit);
-}
-
 #include "KarbonPart.moc"
 
--- trunk/koffice/karbon/ui/KarbonPart.h #1073304:1073305
@@ -118,9 +118,6 @@
     /// reimplemented from KoDocument
     virtual void openTemplate(const KUrl& url);
 
-    /// change the unit
-    void updateUnit( const KoUnit &unit );
-
 private:
     class Private;
     Private * const d;
--- trunk/koffice/karbon/ui/dialogs/KarbonConfigureDialog.cpp #1073304:1073305
@@ -78,6 +78,7 @@
     item->setIcon(KIcon(BarIcon("document-properties", KIconLoader::SizeMedium)));
 
     connect( this, SIGNAL( okClicked() ), this, SLOT( slotApply() ) );
+    connect(this, SIGNAL(applyClicked()), this, SLOT(slotApply()));
     connect( this, SIGNAL( defaultClicked() ), this, SLOT( slotDefault() ) );
 }
 
--- trunk/koffice/karbon/ui/widgets/KarbonCanvas.cpp #1073304:1073305
@@ -366,7 +366,7 @@
 }
 
 KoUnit KarbonCanvas::unit() const {
-    return d->document->unit();
+    return d->part->unit();
 }
 
 QPoint KarbonCanvas::documentOrigin() const
[prev in list] [next in list] [prev in thread] [next in thread]