Quota unit is not supported now

svn path=/branches/work/akonadi-ports/kdepim/; revision=1075043

configuredialog.cpp

@@ -4041,10 +4041,6 @@ MiscPageFolderTab::MiscPageFolderTab( QWidget * parent )
   connect( mMMTab.mEmptyTrashCheck, SIGNAL( stateChanged( int ) ),
            this, SLOT( slotEmitChanged( void ) ) );
 
-  //TODO: 4.3 Change the strings in mQuotaCmbBox into something better.
-  connect( mMMTab.mQuotaCmbBox, SIGNAL( activated( int )  ),
-           this, SLOT( slotEmitChanged( void ) ) );
-
 }
 
 void MiscPage::FolderTab::doLoadFromGlobalSettings()
@@ -4056,7 +4052,6 @@ void MiscPage::FolderTab::doLoadFromGlobalSettings()
   mMMTab.mDelayedMarkAsRead->setChecked( GlobalSettings::self()->delayedMarkAsRead() );
   mMMTab.mDelayedMarkTime->setValue( GlobalSettings::self()->delayedMarkTime() );
   mMMTab.mShowPopupAfterDnD->setChecked( GlobalSettings::self()->showPopupAfterDnD() );
-  mMMTab.mQuotaCmbBox->setCurrentIndex( GlobalSettings::self()->quotaUnit() );
 }
 
 void MiscPage::FolderTab::doLoadOther()
@@ -4088,7 +4083,6 @@ void MiscPage::FolderTab::save()
   GlobalSettings::self()->setShowPopupAfterDnD( mMMTab.mShowPopupAfterDnD->isChecked() );
   GlobalSettings::self()->setExcludeImportantMailFromExpiry(
         mMMTab.mExcludeImportantFromExpiry->isChecked() );
-  GlobalSettings::self()->setQuotaUnit( mMMTab.mQuotaCmbBox->currentIndex() );
 }
 
 QString MiscPage::InviteTab::helpAnchor() const

kmail.kcfg.cmake

@@ -139,16 +139,6 @@
         <label>The threshold for when to warn the user that a folder is nearing its quota limit.</label>
          <default>85</default>
       </entry>
-      <entry name="QuotaUnit"  type="Enum">
-        <label></label>
-        <whatsthis></whatsthis>
-        <choices>
-          <choice name="KB"/>
-          <choice name="MB"/>
-          <choice name="GB"/>
-        </choices>
-        <default>MB</default>
-      </entry>
     </group>
 <!-- General -->
 

ui/miscpagemaintab.ui

@@ -173,41 +173,6 @@ p, li { white-space: pre-wrap; }
        </property>
       </widget>
      </item>
-     <item row="9" column="0">
-      <widget class="QLabel" name="mQuotaLabel">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-         <horstretch>1</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="text">
-        <string>&amp;Quota units:</string>
-       </property>
-       <property name="buddy">
-        <cstring>mQuotaCmbBox</cstring>
-       </property>
-      </widget>
-     </item>
-     <item row="9" column="1">
-      <widget class="KComboBox" name="mQuotaCmbBox">
-       <item>
-        <property name="text">
-         <string>KB</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>MB</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>GB</string>
-        </property>
-       </item>
-      </widget>
-     </item>
      <item row="7" column="1">
       <widget class="KMail::FolderRequester" name="mOnStartupOpenFolder" native="true"/>
      </item>