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

List:       koffice-devel
Subject:    [Bug 61040] Units under misc defaults to KDE Country/Region setting
From:       Brad Hards <bradh () frogmouth ! net>
Date:       2004-05-16 3:26:22
Message-ID: 20040516032622.26021.qmail () ktown ! kde ! org
[Download RAW message or body]

------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.
      
http://bugs.kde.org/show_bug.cgi?id=61040      
bradh frogmouth net changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|NEW                         |RESOLVED
         Resolution|                            |FIXED



------- Additional Comments From bradh frogmouth net  2004-05-16 05:26 -------
CVS commit by bhards: 

Make KWord respect the locale settings for measurement system as set
in the Control Centre.

Previously you got centimetres by default - now you get centimetres
if you're in a Metric locale, and inches if you are in an Imperial
locale.

Peter Simonsson fixed Kivio, and I've previously done KPresenter,
KSpread, and Karbon. I don't see any use of measurement units for
Kugar, KChart, KDGantt, Kexi or KFormula; and Krita looks to be hard
wired into pixels. So that takes care of Bug 61040.

Thanks to David Faure, Nicholas Goutte, Peter Simonsson and Thomas
Zander for their input and assistance towards resolving this bug.

CCMAIL: 61040-done bugs kde org


  M +12 -3     kwdoc.cc   1.666


--- koffice/kword/kwdoc.cc  #1.665:1.666
 @ -131,8 +131,12  @ const int KWDocument::CURRENT_SYNTAX_VER
 KWDocument::KWDocument(QWidget *parentWidget, const char *widgetName, QObject* \
                parent, const char* name, bool singleViewMode )
     : KoDocument( parentWidget, widgetName, parent, name, singleViewMode ),
-      m_unit( KoUnit::U_CM ),
       m_urlIntern()
 {
     dcop = 0;
+    if (KGlobal::locale()->measureSystem() == KLocale::Imperial) {
+        m_unit = KoUnit::U_INCH;
+    } else {
+        m_unit = KoUnit::U_CM;
+    }
     m_pages = 1;
     m_loadingInfo = 0L;
 @ -530,4 +534,11  @ void KWDocument::initUnit()
     //load default unit setting - this is only used for new files (from templates) \
or empty files  KConfig *config = KWFactory::global()->config();
+
+    if (KGlobal::locale()->measureSystem() == KLocale::Imperial) {
+        m_unit = KoUnit::U_INCH;
+    } else {
+        m_unit = KoUnit::U_CM;
+    }
+
     if(config->hasGroup("Misc") )
     {
 @ -535,6 +546,4  @ void KWDocument::initUnit()
         if ( config->hasKey( "Units" ) )
             setUnit( KoUnit::unit( config->readEntry("Units") ) );
-        else
-            setUnit( KoUnit::U_CM );
         setDefaultColumnSpacing( config->readDoubleNumEntry("ColumnSpacing", 3.0) );
     }
_______________________________________________
koffice-devel mailing list
koffice-devel@mail.kde.org
https://mail.kde.org/mailman/listinfo/koffice-devel


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