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

List:       kde-commits
Subject:    kdebase/kcontrol/locale
From:       Waldo Bastian <bastian () kde ! org>
Date:       2005-03-20 20:34:23
Message-ID: 20050320203423.7543E16F7D () office ! kde ! org
[Download RAW message or body]

CVS commit by waba: 

Use "country or region"


  M +14 -9     kcmlocale.cpp   1.117
  M +1 -1      toplevel.cpp   1.60


--- kdebase/kcontrol/locale/kcmlocale.cpp  #1.116:1.117
@@ -48,10 +48,9 @@ KLocaleConfig::KLocaleConfig(KLocale *lo
     m_locale(locale)
 {
-  QGridLayout *lay = new QGridLayout(this, 3, 2,
+  QGridLayout *lay = new QGridLayout(this, 3, 3,
                                      KDialog::marginHint(),
                                      KDialog::spacingHint());
-  lay->setAutoAdd(TRUE);
 
-  m_labCountry = new QLabel(this, I18N_NOOP("Country:"));
+  m_labCountry = new QLabel(this, I18N_NOOP("Country or region:"));
   m_comboCountry = new KLanguageButton( this );
   m_labCountry->setBuddy(m_comboCountry);
@@ -61,11 +60,10 @@ KLocaleConfig::KLocaleConfig(KLocale *lo
   m_labLang = new QLabel(this, I18N_NOOP("Languages:"));
   m_labLang->setAlignment( AlignTop );
-  QHBox *hb = new QHBox(this);
-  hb->setSpacing(KDialog::spacingHint());
-  m_languages = new QListBox(hb);
+
+  m_languages = new QListBox(this);
   connect(m_languages, SIGNAL(selectionChanged()),
           SLOT(slotCheckButtons()));
 
-  QWidget * vb = new QWidget(hb);
+  QWidget * vb = new QWidget(this);
   QVBoxLayout * boxlay = new QVBoxLayout(vb, 0, KDialog::spacingHint());
   m_addLanguage = new KLanguageButton(QString::null, vb, I18N_NOOP("Add Language"));
@@ -92,7 +90,14 @@ KLocaleConfig::KLocaleConfig(KLocale *lo
   //cb->insertStringList( KGlobal::charsets()->descriptiveEncodingNames() );
 
+  lay->addMultiCellWidget(m_labCountry, 0, 0, 0, 1);
+  lay->addWidget(m_comboCountry, 0, 2);
+  lay->addWidget(m_labLang, 1, 0);
+  lay->addWidget(m_languages, 1, 1);
+  lay->addWidget(vb, 1, 2);
+
   lay->setRowStretch(2, 5);
 
   lay->setColStretch(1, 1);
+  lay->setColStretch(2, 1);
 }
 
@@ -397,5 +402,5 @@ void KLocaleConfig::slotTranslate()
   QToolTip::add(m_comboCountry, m_locale->translate
         ( "This is where you live. KDE will use the defaults for "
-          "this country.") );
+          "this country or region.") );
   QToolTip::add(m_addLanguage, m_locale->translate
         ( "This will add a language to the list. If the language is already "
@@ -413,5 +418,5 @@ void KLocaleConfig::slotTranslate()
 
   str = m_locale->translate
-    ( "Here you can choose your country. The settings "
+    ( "Here you can choose your country or region. The settings "
       "for languages, numbers etc. will automatically switch to the "
       "corresponding values." );

--- kdebase/kcontrol/locale/toplevel.cpp  #1.59:1.60
@@ -213,5 +213,5 @@ void KLocaleApplication::defaults()
 QString KLocaleApplication::quickHelp() const
 {
-  return m_locale->translate("<h1>Country & Language</h1>\n"
+  return m_locale->translate("<h1>Country/Region & Language</h1>\n"
           "<p>From here you can configure language, numeric, and time \n"
           "settings for your particular region. In most cases it will be \n"


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