diff --git a/kmymoney/dialogs/settings/ksettingsregister.ui b/kmymoney/dialogs/settings/ksettingsregister.ui
index 358c81d4b..da3a1cea4 100644
--- a/kmymoney/dialogs/settings/ksettingsregister.ui
+++ b/kmymoney/dialogs/settings/ksettingsregister.ui
@@ -1,554 +1,596 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>KSettingsRegister</class>
  <widget class="QWidget" name="KSettingsRegister">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>632</width>
-    <height>500</height>
+    <height>512</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Register settings</string>
   </property>
   <layout class="QVBoxLayout">
    <item>
     <widget class="QTabWidget" name="tab">
      <property name="currentIndex">
-      <number>2</number>
+      <number>0</number>
      </property>
      <widget class="QWidget" name="tab1">
       <attribute name="title">
        <string comment="@title The way in which items will be displayed">Display</string>
       </attribute>
       <layout class="QVBoxLayout">
        <item>
         <widget class="QCheckBox" name="kcfg_ShowGrid">
          <property name="text">
           <string>Show a grid in the register</string>
          </property>
          <property name="shortcut">
           <string/>
          </property>
         </widget>
        </item>
        <item>
         <widget class="QCheckBox" name="kcfg_ShowRegisterDetailed">
          <property name="text">
           <string>Show all register entries in full detail</string>
          </property>
          <property name="shortcut">
           <string/>
          </property>
         </widget>
        </item>
        <item>
         <widget class="QCheckBox" name="kcfg_LedgerLens">
          <property name="whatsThis">
           <string>Using the ledger lens shows the details for the transaction that has focus in the ledger. Usually, when using the transaction form, only a one line summary is displayed for each transaction as the details are shown in the form.</string>
          </property>
          <property name="text">
           <string>Use the ledger lens</string>
          </property>
          <property name="shortcut">
           <string/>
          </property>
         </widget>
        </item>
        <item>
         <widget class="QCheckBox" name="kcfg_TransactionForm">
          <property name="text">
           <string>Show transaction form</string>
          </property>
         </widget>
        </item>
        <item>
         <widget class="QCheckBox" name="kcfg_AlwaysShowNrField">
          <property name="text">
           <string>Always show a No. field</string>
          </property>
          <property name="shortcut">
           <string/>
          </property>
         </widget>
        </item>
        <item>
         <widget class="QCheckBox" name="kcfg_ShowFancyMarker">
          <property name="whatsThis">
           <string>Draws a larger header above each group of transactions. The grouping depends on the current sort order.</string>
          </property>
          <property name="text">
           <string>Show group header between transactions</string>
          </property>
          <property name="shortcut">
           <string/>
          </property>
         </widget>
        </item>
        <item>
         <widget class="QCheckBox" name="kcfg_ShowFiscalMarker">
          <property name="text">
           <string>Show header for the previous and current fiscal year</string>
          </property>
         </widget>
        </item>
        <item>
         <widget class="QCheckBox" name="kcfg_ShowPlannedScheduleDates">
          <property name="whatsThis">
           <string>If a planned transaction is overdue, today's date is used by default as the posting date. With this option, the originally planned date is used instead.</string>
          </property>
          <property name="text">
           <string>Display overdue schedules with planned date</string>
          </property>
         </widget>
        </item>
        <item>
         <spacer name="spacer6">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeType">
           <enum>QSizePolicy::Expanding</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
            <height>40</height>
           </size>
          </property>
         </spacer>
        </item>
       </layout>
      </widget>
      <widget class="QWidget" name="sorting">
       <attribute name="title">
        <string>Sorting</string>
       </attribute>
       <layout class="QVBoxLayout">
        <item>
         <widget class="QTabWidget" name="tabWidget3">
          <widget class="QWidget" name="tab3">
           <attribute name="title">
            <string>Normal view</string>
           </attribute>
           <layout class="QHBoxLayout">
            <item>
             <widget class="KLineEdit" name="kcfg_sortNormalView"/>
            </item>
            <item>
             <widget class="TransactionSortOption" name="m_sortNormalView" native="true"/>
            </item>
           </layout>
          </widget>
          <widget class="QWidget" name="tab4">
           <attribute name="title">
            <string>Reconciliation view</string>
           </attribute>
           <layout class="QHBoxLayout">
            <item>
             <widget class="KLineEdit" name="kcfg_sortReconcileView"/>
            </item>
            <item>
             <widget class="TransactionSortOption" name="m_sortReconcileView" native="true"/>
            </item>
           </layout>
          </widget>
          <widget class="QWidget" name="TabPage">
           <attribute name="title">
            <string>Search view</string>
           </attribute>
           <layout class="QHBoxLayout">
            <item>
             <widget class="KLineEdit" name="kcfg_sortSearchView"/>
            </item>
            <item>
             <widget class="TransactionSortOption" name="m_sortSearchView" native="true"/>
            </item>
           </layout>
          </widget>
         </widget>
        </item>
        <item>
         <widget class="QLabel" name="qLabel2">
          <property name="text">
           <string>Use the &lt;i&gt;left&lt;/i&gt; and &lt;i&gt;right&lt;/i&gt; buttons to add and remove sort options. Use the &lt;i&gt;up&lt;/i&gt; and &lt;i&gt;down&lt;/i&gt; buttons to modify the sort order. Double-Click a selected entry to toggle the sort order between &lt;i&gt;ascending&lt;/i&gt; and &lt;i&gt;descending&lt;/i&gt;.</string>
          </property>
          <property name="wordWrap">
           <bool>true</bool>
          </property>
         </widget>
        </item>
       </layout>
      </widget>
      <widget class="QWidget" name="TabPage1">
       <attribute name="title">
        <string>Data entry</string>
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_2">
        <item>
         <widget class="QCheckBox" name="kcfg_CopyTypeToNr">
          <property name="text">
           <string>Insert transaction type into No. field for new transactions</string>
          </property>
         </widget>
        </item>
        <item>
         <widget class="QCheckBox" name="kcfg_AutoIncCheckNumber">
          <property name="text">
           <string>Auto increment check number</string>
          </property>
          <property name="shortcut">
           <string/>
          </property>
         </widget>
        </item>
        <item>
         <widget class="QCheckBox" name="kcfg_FocusChangeIsEnter">
          <property name="text">
           <string>Keep changes when selecting a different transaction/split</string>
          </property>
         </widget>
        </item>
        <item>
         <widget class="QCheckBox" name="kcfg_EnterMovesBetweenFields">
          <property name="text">
           <string>Use Enter to move between fields</string>
          </property>
          <property name="shortcut">
           <string/>
          </property>
         </widget>
        </item>
        <item>
         <widget class="QCheckBox" name="kcfg_stringMatchFromStart">
          <property name="whatsThis">
           <string>Mark this option, if you always want to match names e.g. for payees from the start. If unset, any substring is matched.</string>
          </property>
          <property name="text">
           <string>Match names from start</string>
          </property>
         </widget>
        </item>
        <item>
         <widget class="QCheckBox" name="kcfg_AutoReconciliation">
          <property name="whatsThis">
           <string>After entering the reconciliation data automatically detect the transactions that match that data (in some cases it might be not possible to do that).</string>
          </property>
          <property name="text">
           <string>Automatic reconciliation</string>
          </property>
          <property name="shortcut">
           <string/>
          </property>
         </widget>
        </item>
        <item>
-        <layout class="QHBoxLayout">
-         <item>
+        <layout class="QGridLayout" name="gridLayout">
+         <item row="0" column="0">
+          <widget class="QLabel" name="textLabel2_1">
+           <property name="text">
+            <string>Initial cursor position within the date field</string>
+           </property>
+          </widget>
+         </item>
+         <item row="0" column="1">
+          <widget class="QComboBox" name="kcfg_initialDateFieldCursorPosition">
+           <item>
+            <property name="text">
+             <string>Day</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>Month</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>Year</string>
+            </property>
+           </item>
+          </widget>
+         </item>
+         <item row="0" column="2">
+          <spacer name="spacer16">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeType">
+            <enum>QSizePolicy::Expanding</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>31</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+         <item row="1" column="0">
           <widget class="QLabel" name="textLabel2_2">
            <property name="text">
             <string>Default reconciliation state</string>
            </property>
            <property name="wordWrap">
             <bool>false</bool>
            </property>
           </widget>
          </item>
-         <item>
+         <item row="1" column="1">
           <widget class="KComboBox" name="kcfg_defaultReconciliationState">
            <property name="toolTip">
             <string>Default reconciliation state for transactions entered during reconciliation of an account</string>
            </property>
            <item>
             <property name="text">
              <string>Not reconciled</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string comment="@item reconciliation status">Cleared</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>Reconciled</string>
             </property>
            </item>
           </widget>
          </item>
-         <item>
+         <item row="1" column="2">
           <spacer name="spacer15">
            <property name="orientation">
             <enum>Qt::Horizontal</enum>
            </property>
            <property name="sizeType">
             <enum>QSizePolicy::Expanding</enum>
            </property>
            <property name="sizeHint" stdset="0">
             <size>
              <width>31</width>
              <height>20</height>
             </size>
            </property>
           </spacer>
          </item>
         </layout>
        </item>
        <item>
         <widget class="QGroupBox" name="kcfg_AutoFillTransaction">
          <property name="title">
           <string>Autofill</string>
          </property>
          <property name="selectedId" stdset="0">
           <number>-1</number>
          </property>
          <layout class="QVBoxLayout" name="verticalLayout">
           <item>
            <widget class="QRadioButton" name="radioButton1">
             <property name="whatsThis">
              <string>Do not auto-fill transaction data at all.</string>
             </property>
             <property name="text">
              <string>No Autofill</string>
             </property>
            </widget>
           </item>
           <item>
            <widget class="QRadioButton" name="radioButton2">
             <property name="whatsThis">
              <string>Collect all transactions for the given payee. Treat all transactions that refer to the same category and have an amount with +/- X % as identical. If more than one transaction is found, a list of them is presented to the user.
 
 Selecting 0% will list all transactions.</string>
             </property>
             <property name="text">
              <string>Same transaction if amount differs less than percentage set below</string>
             </property>
             <property name="shortcut">
              <string/>
             </property>
             <property name="checked">
              <bool>true</bool>
             </property>
            </widget>
           </item>
           <item>
            <widget class="QRadioButton" name="radioButton3">
             <property name="whatsThis">
              <string>The data of the last transaction assigned to the category used most often for this payee is autofilled into the transaction editor.</string>
             </property>
             <property name="text">
              <string>With previously most often used transaction for the payee</string>
             </property>
            </widget>
           </item>
          </layout>
         </widget>
        </item>
        <item>
         <widget class="QWidget" name="percentageWidget" native="true">
          <layout class="QHBoxLayout" name="horizontalLayout">
           <property name="leftMargin">
            <number>0</number>
           </property>
           <property name="rightMargin">
            <number>0</number>
           </property>
           <item>
            <widget class="QLabel" name="label">
             <property name="text">
              <string>Same transaction if amount differs less than </string>
             </property>
            </widget>
           </item>
           <item>
            <widget class="QSpinBox" name="kcfg_AutoFillDifference">
             <property name="whatsThis">
              <string>Two transactions are usually treated identical for autofill, if they refer the same accounts. They are treated as different transactions though, when their amount varies by more than the percentage given here.</string>
             </property>
             <property name="suffix">
              <string>%</string>
             </property>
             <property name="maximum">
              <number>100</number>
             </property>
             <property name="value">
              <number>10</number>
             </property>
            </widget>
           </item>
           <item>
            <spacer name="horizontalSpacer">
             <property name="orientation">
              <enum>Qt::Horizontal</enum>
             </property>
             <property name="sizeHint" stdset="0">
              <size>
               <width>40</width>
               <height>20</height>
              </size>
             </property>
            </spacer>
           </item>
          </layout>
         </widget>
        </item>
        <item>
         <widget class="QCheckBox" name="kcfg_AutoFillUseMemos">
          <property name="whatsThis">
           <string>If this option is checked the memos from the previous transaction will be used otherwise the memos will not be considered when the transaction is autofilled.</string>
          </property>
          <property name="text">
           <string>Use memos from previous transaction</string>
          </property>
          <property name="shortcut">
           <string/>
          </property>
         </widget>
        </item>
        <item>
         <spacer name="spacer4">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeType">
           <enum>QSizePolicy::Expanding</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
            <height>20</height>
           </size>
          </property>
         </spacer>
        </item>
       </layout>
      </widget>
      <widget class="QWidget" name="TabPage2">
       <attribute name="title">
        <string>Import</string>
       </attribute>
       <layout class="QVBoxLayout">
        <item>
         <layout class="QHBoxLayout">
          <item>
           <widget class="QLabel" name="textLabel1_2">
            <property name="text">
             <string>Match transactions within days</string>
            </property>
            <property name="wordWrap">
             <bool>false</bool>
            </property>
           </widget>
          </item>
          <item>
           <widget class="QSpinBox" name="kcfg_matchInterval">
            <property name="whatsThis">
             <string>Search for matching transactions within the range of the posting date of the imported transaction +/- the number of given days.</string>
            </property>
            <property name="buttonSymbols">
             <enum>QAbstractSpinBox::UpDownArrows</enum>
            </property>
            <property name="minimum">
             <number>0</number>
            </property>
            <property name="maximum">
             <number>99</number>
            </property>
            <property name="value">
             <number>4</number>
            </property>
           </widget>
          </item>
          <item>
           <spacer name="spacer13">
            <property name="orientation">
             <enum>Qt::Horizontal</enum>
            </property>
            <property name="sizeType">
             <enum>QSizePolicy::Expanding</enum>
            </property>
            <property name="sizeHint" stdset="0">
             <size>
              <width>61</width>
              <height>20</height>
             </size>
            </property>
           </spacer>
          </item>
         </layout>
        </item>
        <item>
         <widget class="QCheckBox" name="kcfg_askForPayeeCategory">
          <property name="whatsThis">
           <string>Whenever a new payee is detected during import of a statement, the user will be asked to assign a default category for this user when this option is selected.</string>
          </property>
          <property name="text">
           <string>Ask for a new payee's default category</string>
          </property>
          <property name="shortcut">
           <string/>
          </property>
         </widget>
        </item>
        <item>
         <spacer name="spacer14">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeType">
           <enum>QSizePolicy::Expanding</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
            <height>60</height>
           </size>
          </property>
         </spacer>
        </item>
       </layout>
      </widget>
     </widget>
    </item>
   </layout>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>
   <customwidget>
    <class>KComboBox</class>
    <extends>QComboBox</extends>
    <header>kcombobox.h</header>
   </customwidget>
   <customwidget>
    <class>KLineEdit</class>
    <extends>QLineEdit</extends>
    <header>klineedit.h</header>
   </customwidget>
   <customwidget>
    <class>TransactionSortOption</class>
    <extends>QWidget</extends>
    <header>transactionsortoption.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections>
   <connection>
    <sender>radioButton2</sender>
    <signal>toggled(bool)</signal>
    <receiver>percentageWidget</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
      <x>147</x>
      <y>323</y>
     </hint>
     <hint type="destinationlabel">
      <x>171</x>
      <y>378</y>
     </hint>
    </hints>
   </connection>
  </connections>
 </ui>
diff --git a/kmymoney/settings/kmymoney.kcfg b/kmymoney/settings/kmymoney.kcfg
index dddb670b3..3662c5add 100644
--- a/kmymoney/settings/kmymoney.kcfg
+++ b/kmymoney/settings/kmymoney.kcfg
@@ -1,455 +1,464 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <kcfg xmlns="http://www.kde.org/standards/kcfg/1.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
     http://www.kde.org/standards/kcfg/1.0/kcfg.xsd">
  <kcfgfile name="kmymoney/kmymoneyrc"/>
  <group name="General Options">
   <entry name="AlwaysShowNrField" type="Bool">
    <label>Always show a No. field in transaction form</label>
    <default>false</default>
   </entry>
   <entry name="AutoFillTransaction" type="Int">
    <label>Auto fill with previous transaction data</label>
    <default>1</default>
   </entry>
   <entry name="AutoFillDifference" type="Int">
     <label>Treat two transactions as identical, if amount differs by less than</label>
     <default>10</default>
   </entry>
   <entry name="AutoFillUseMemos" type="Bool">
     <label>When auto fill with previous transaction data use the memos</label>
     <default>true</default>
   </entry>
   <entry name="AutoIncCheckNumber" type="Bool">
    <label>Auto increment check number</label>
    <default>true</default>
   </entry>
   <entry name="AutoSaveFile" type="Bool">
    <label>Autosave file periodically</label>
    <default>false</default>
   </entry>
   <entry name="AutoReconciliation" type="Bool">
    <label>Automatically find which transactions match the given reconciliation data</label>
    <default>false</default>
   </entry>
   <entry name="AutoBackupCopies" type="Int">
    <label>Number of backup files to keep</label>
    <default>10</default>
    <min>0</min>
    <max>20</max>
   </entry>
   <entry name="AutoSavePeriod" type="Int">
    <label>Autosave interval in minutes</label>
    <default>10</default>
    <min>0</min>
    <max>60</max>
   </entry>
   <entry name="AutoSaveOnClose" type="Bool">
    <label>Autosave file upon close</label>
    <default>false</default>
   </entry>
   <entry name="CheckSchedule" type="Bool">
    <label>Check schedules upon startup</label>
    <default>false</default>
   </entry>
   <entry name="CheckSchedulePreview" type="Int">
    <label>Enter transactions this number of days in advance</label>
    <default>0</default>
    <min>0</min>
    <max>999</max>
   </entry>
   <entry name="ExternalCalculator" type="String">
    <label>Name of external calculator program</label>
   </entry>
   <entry name="HolidayRegion" type="String">
    <label>Name of region used for non-processing days</label>
    <default>(None)</default>
   </entry>
   <entry name="SchedulePreview" type="Int">
    <label>Number of days to preview schedules in ledger</label>
    <default>0</default>
    <min>0</min>
    <max>999</max>
   </entry>
   <entry name="CopyTypeToNr" type="Bool">
    <label>Insert transaction type into No. field for new transactions</label>
    <default>false</default>
   </entry>
   <entry name="FocusChangeIsEnter" type="Bool">
    <label>Keep changes when selecting a different transaction/split</label>
    <default>false</default>
   </entry>
   <entry name="EnterMovesBetweenFields" type="Bool">
    <label>Using the Enter key moves between the fields</label>
    <default>false</default>
   </entry>
   <entry name="LedgerLens" type="Bool">
    <label>Use the ledger lens</label>
    <default>false</default>
   </entry>
   <entry name="PriceHistoryUpdate" type="Bool">
    <label>Update price history</label>
    <default>true</default>
   </entry>
   <entry name="TransactionForm" type="Bool">
    <label>Show transaction form</label>
    <default>true</default>
   </entry>
   <entry name="StartLastViewSelected" type="Int">
    <label>Start with last selected view or homepage</label>
    <default>0</default>
   </entry>
   <entry name="LastViewSelected" type="Int">
    <label>The last selected view</label>
    <default>0</default>
   </entry>
   <entry name="WriteDataEncrypted" type="Bool">
    <label>Use GPG to encrypt data file</label>
    <default>false</default>
   </entry>
   <entry name="EncryptRecover" type="Bool">
    <label>Also encrypt against recover key</label>
    <default>false</default>
   </entry>
   <entry name="GpgRecipient" type="String">
    <label>GPG User ID (deprecated)</label>
   </entry>
   <entry name="GpgRecipientList" type="StringList">
    <label>GPG User ID</label>
   </entry>
   <entry name="ExpertMode" type="Bool">
    <label>Run in expert (accountant) mode</label>
    <default>false</default>
   </entry>
   <entry name="ShowSplash" type="Bool">
    <label>Show splash screen during startup</label>
    <default>true</default>
   </entry>
   <entry name="syncLedgerInvestment" type="Bool">
    <label>Synchronize account in ledger and investment view</label>
    <default>true</default>
   </entry>
   <entry name="viewType" type="Int">
    <label>The type of the KMyMoney view</label>
    <default>0</default>
   </entry>
   <entry name="firstTimeRun" type="Bool">
    <label>First time switch to start new user wizard</label>
    <default>true</default>
   </entry>
   <entry name="showTitleBar" type="Bool">
    <label>Show title bar on each view</label>
    <default>true</default>
   </entry>
   <entry name="stringMatchFromStart" type="Bool">
    <label>Match strings in auto-completion only from the first letter on. A substring behind the first letter is not found.</label>
    <default>false</default>
   </entry>
   <entry name="stdTransactionFormTabOrder" type="String">
    <label>Tab order of edit widgets in transaction form</label>
    <default>account,cashflow,payee,category,tag,memo,number,date,amount,state</default>
   </entry>
   <entry name="stdTransactionRegisterTabOrder" type="String">
    <label>Tab order of edit widgets in register</label>
    <default>number,date,payee,category,tag,memo,payment,deposit,state</default>
   </entry>
  </group>
  <group name="Homepage Options">
   <entry name="ItemList" type="String">
   <label>Order of items on homepage</label>
   <default>8,1,2,3,4,5,6,7,-9,10</default>
   </entry>
   <entry name="ZoomFactor" type="Double">
    <label>Zoom factor used for home view HTML page</label>
    <default>1.00</default>
   </entry>
   <entry name="RememberZoomFactor" type="Bool">
    <label>Remember (manually adjusted) zoom factor in home view on program end.</label>
    <default>true</default>
   </entry>
   <entry name="ShowLimitInfo" type="Bool">
    <label>Show account limit information on the Homepage</label>
    <default>true</default>
   </entry>
   <entry name="ShowBalanceStatusOfOnlineAccounts" type="Bool">
    <label>Show balance status on the Homepage for accounts where data imports include balance information.</label>
    <default>false</default>
   </entry>
   <entry name="ShowCountOfUnmarkedTransactions" type="Bool">
    <label>Show number of not marked transactions per account on the Homepage [!M]</label>
    <default>false</default>
   </entry>
   <entry name="ShowCountOfClearedTransactions" type="Bool">
    <label>Show number of cleared transactions per account on the Homepage [C]</label>
    <default>false</default>
   </entry>
   <entry name="ShowCountOfNotReconciledTransactions" type="Bool">
    <label>Show number of not reconciled (not marked + cleared) transactions per account on the Homepage [!R]</label>
    <default>false</default>
   </entry>
   <entry name="ShowDateOfLastReconciliation" type="Bool">
    <label>Show date of last reconciliation on the Homepage</label>
    <default>false</default>
   </entry>
   <entry name="HideZeroBalanceLiabilities" type="Bool">
     <label>Hide zero balance liabilities on the Homepage</label>
     <default>false</default>
   </entry>
  </group>
  <group name="Color Options">
   <entry name="useCustomColors" type="Bool">
    <label>Use custom colors</label>
    <default>false</default>
   </entry>
   <entry name="transactionImportedColor" type="Color">
    <label>Background color for imported transactions</label>
    <default>255,255,0</default>
   </entry>
   <entry name="transactionMatchedColor" type="Color">
    <label>Background color for matched transactions</label>
    <default>152,251,152</default>
   </entry>
   <entry name="transactionErroneousColor" type="Color">
    <label>List color for erroneous transactions</label>
    <default>255,0,0</default>
   </entry>
   <entry name="missingConversionRateColor" type="Color">
    <label>List color for missing conversion rate</label>
    <default>0,0,255</default>
   </entry>
   <entry name="groupMarkerColor" type="Color">
    <label>Background color for group marker</label>
    <default>255,242,155</default>
   </entry>
   <entry name="fieldRequiredColor" type="Color">
    <label>Background color for required fields</label>
    <default>255,255,221</default>
   </entry>
  </group>
  <group name="List Options">
   <entry name="HideUnusedCategory" type="Bool">
    <label>Hide unused categories</label>
    <default>false</default>
   </entry>
   <entry name="HideClosedAccounts" type="Bool">
    <label>Hide closed accounts</label>
    <default>false</default>
   </entry>
   <entry name="ShowAllAccounts" type="Bool">
    <label>Show all accounts</label>
    <default>false</default>
   </entry>
   <entry name="ShowCategoriesInAccountsView" type="Bool">
    <label>Show categories in the accounts view</label>
    <default>false</default>
   </entry>
   <entry name="HideZeroBalanceEquities" type="Bool">
    <label>Hide zero balance equities</label>
    <default>false</default>
   </entry>
   <entry name="HideFinishedSchedules" type="Bool">
    <label>Hide finished schedules</label>
    <default>false</default>
   </entry>
   <entry name="HideReconciledTransactions" type="Bool">
    <label>Hide reconciled transactions</label>
    <default>false</default>
   </entry>
   <entry name="ShowRegisterDetailed" type="Bool">
    <label>Show all register entries in full detail</label>
    <default>false</default>
   </entry>
   <entry name="ShowPlannedScheduleDates" type="Bool">
    <label>Show schedules with planned date</label>
    <default>false</default>
   </entry>
   <entry name="ShowGrid" type="Bool">
    <label>Show a grid in the register</label>
    <default>true</default>
   </entry>
   <entry name="ShowFancyMarker" type="Bool">
    <label>Show fancy group markers</label>
    <default>true</default>
   </entry>
   <entry name="ShowFiscalMarker" type="Bool">
    <label>Show fancy markers for previous and current fiscal year</label>
    <default>true</default>
   </entry>
   <entry name="FiscalYearBegin" type="Int">
    <label>Starting month of the fiscal year</label>
    <default>0</default>
    <min>0</min>
    <max>11</max>
   </entry>
   <entry name="FiscalYearBeginDay" type="Int">
    <label>Starting day of the fiscal year</label>
    <default>1</default>
    <min>1</min>
    <max>28</max>
   </entry>
   <entry name="StartDate" type="DateTime">
    <label>Start date</label>
    <default>QDateTime::fromString("1900-01-01T00:00:00", Qt::ISODate)</default>
   </entry>
   <entry name="logPath" type="String">
    <label>Log file path</label>
   </entry>
   <entry name="logImportedStatements" type="Bool">
    <label>Log imported statements</label>
   </entry>
   <entry name="logOfxTransactions" type="Bool">
    <label>Log OFX transactions</label>
   </entry>
   <entry name="useSystemFont" type="Bool">
    <label>Use system font</label>
    <default>false</default>
   </entry>
   <entry name="listCellFont" type="Font">
    <label>Cell font</label>
   </entry>
   <entry name="listHeaderFont" type="Font">
    <label>Header font</label>
   </entry>
   <entry name="IconsTheme" type="String">
    <label>Icon theme</label>
    <default>system</default>
   </entry>
   <entry name="sortNormalView" type="String">
    <label>Sort order of register in normal view</label>
    <default>1,-9,-4</default>
   </entry>
   <entry name="sortReconcileView" type="String">
    <label>Sort order of register in normal view</label>
    <default>1,-4</default>
   </entry>
   <entry name="sortSearchView" type="String">
    <label>Sort order of register in search dialog</label>
    <default>1,-9,-4</default>
   </entry>
+  <entry name="initialDateFieldCursorPosition" type="Enum">
+   <label>Initial cursor position within the date field</label>
+   <default>Day</default>
+   <choices name="PositionType">
+     <choice name="Day"/>
+     <choice name="Month"/>
+     <choice name="Year"/>
+   </choices>
+  </entry>
   <entry name="defaultReconciliationState" type="Int">
    <label>Default reconciliation state for transactions entered during reconciliation</label>
    <default>0</default>
   </entry>
  </group>
  <group name="Import options">
   <entry name="matchInterval" type="Int">
    <label>Number of days (plus/minus) to search for matching transactions</label>
    <default>4</default>
   </entry>
   <entry name="askForPayeeCategory" type="Bool">
    <label>During import, ask for a new payee's default category</label>
    <default>false</default>
   </entry>
  </group>
  <group name="QIF Options">
   <entry name="qifCash" type="String">
    <label>additional names for cash account</label>
    <default>Bar</default>
   </entry>
   <entry name="qifBank" type="String">
    <label>additional names for checking account</label>
    <default>Banca,Banque</default>
   </entry>
   <entry name="qifCreditCard" type="String">
    <label>additional names for credit card account</label>
    <default>Kreditkarte</default>
   </entry>
   <entry name="qifAsset" type="String">
    <label>additional names for asset account</label>
    <default>And. Kto.</default>
   </entry>
   <entry name="qifOpeningBalance" type="String">
    <label>additional names for opening balance payee</label>
    <default>Eröffnungssaldo</default>
   </entry>
   <entry name="qifInvoice" type="String">
    <label>additional names for invoice accounts</label>
    <default>Rechnung</default>
   </entry>
  </group>
  <group name="Account View Settings">
   <entry name="showAccountsExpanded" type="Bool">
    <label>Show accounts view expanded when loaded</label>
    <default>false</default>
   </entry>
  </group>
  <group name="Chart Settings">
   <entry name="MaximumLegendItems" type="Int">
    <label>Maximum quantity of legend items to display on charts</label>
    <default>10</default>
    <min>0</min>
    <max>100</max>
   </entry>
   <entry name="LineWidth" type="Int">
    <label>Line width for diagrams, in pixels</label>
    <default>2</default>
    <min>0</min>
    <max>256</max>
   </entry>
   <entry name="ChartsPalette" type="Int">
    <label>The palette used to render charts</label>
    <default>2</default>
    <min>0</min>
    <max>2</max>
   </entry>
   <entry name="CssFileDefault" type="String">
    <label>Name of default CSS file</label>
    <default></default>
   </entry>
  </group>
  <!-- Keep the forecast options in this file for compatibility reasons -->
  <group name="Forecast Options">
   <entry name="forecastMethod" type="Int">
    <label>Method to calculate forecast</label>
    <default>0</default>
   </entry>
   <entry name="forecastDays" type="LongLong">
    <label>Days to forecast</label>
    <default>90</default>
    <min>1</min>
    <max>999</max>
   </entry>
   <entry name="forecastAccountCycle" type="LongLong">
    <label>Days of normal account cycle</label>
    <default>30</default>
    <min>1</min>
    <max>999</max>
   </entry>
   <entry name="forecastCycles" type="LongLong">
    <label>Number of historic cycles to use in forecast</label>
    <default>3</default>
    <min>1</min>
    <max>999</max>
   </entry>
   <entry name="beginForecastDay" type="LongLong">
    <label>Day of month to start forecast</label>
    <default>0</default>
    <min>0</min>
    <max>31</max>
   </entry>
   <entry name="historyMethod" type="Int">
    <label>Method to calculate history-based forecast</label>
    <default>1</default>
   </entry>
   <entry name="skipOpeningDate" type="Bool">
    <label>Skip opening date when fetching transactions</label>
    <default>true</default>
   </entry>
   <entry name="includeFutureTransactions" type="Bool">
    <label>Include future transaction when using Schedule Forecast</label>
    <default>true</default>
   </entry>
   <entry name="includeScheduledTransactions" type="Bool">
    <label>Include scheduled transactions when using Schedule Forecast</label>
    <default>true</default>
   </entry>
  </group>
  <!-- Keep the forecast options in this file for compatibility reasons -->
 </kcfg>
 <!--
   <entry name="" type="">
    <label>...</label>
    <default>...</default>
   </entry>
 -->
diff --git a/kmymoney/settings/kmymoneysettings.kcfgc b/kmymoney/settings/kmymoneysettings.kcfgc
index ffcf13884..ea5eef567 100644
--- a/kmymoney/settings/kmymoneysettings.kcfgc
+++ b/kmymoney/settings/kmymoneysettings.kcfgc
@@ -1,9 +1,10 @@
 File=kmymoney.kcfg
 ClassName=KMyMoneySettings
 Singleton=true
 Mutators=true
 MemberVariables=private
 IncludeFiles=\"kmm_settings_export.h\",\"kmymoneysettings_addon.h\"
 SourceIncludeFiles=\"kmymoneysettings_addons.cpp\"
 Visibility=KMM_SETTINGS_EXPORT
 CustomAdditions=true
+UseEnumTypes=true
diff --git a/kmymoney/widgets/kmymoneydateinput.cpp b/kmymoney/widgets/kmymoneydateinput.cpp
index 6ecd2679d..d34e926e5 100644
--- a/kmymoney/widgets/kmymoneydateinput.cpp
+++ b/kmymoney/widgets/kmymoneydateinput.cpp
@@ -1,389 +1,402 @@
 /*
  * Copyright 2000-2003  Michael Edwardes <mte@users.sourceforge.net>
  * Copyright 2001       Felix Rodriguez <frodriguez@users.sourceforge.net>
  * Copyright 2017-2018  Łukasz Wojniłowicz <lukasz.wojnilowicz@gmail.com>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
  * published by the Free Software Foundation; either version 2 of
  * the License, or (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "kmymoneydateinput.h"
+#include "kmymoneysettings.h"
 
 // ----------------------------------------------------------------------------
 // QT Includes
 
 #include <QPoint>
 #include <QApplication>
 #include <QDesktopWidget>
 #include <QTimer>
 #include <QLabel>
 #include <QKeyEvent>
 #include <QEvent>
 #include <QDateEdit>
 #include <QLineEdit>
 #include <QPushButton>
 #include <QIcon>
 #include <QVBoxLayout>
 
 // ----------------------------------------------------------------------------
 // KDE Includes
 
 #include <KLocalizedString>
 #include <KPassivePopup>
 #include <KDatePicker>
 
 // ----------------------------------------------------------------------------
 // Project Includes
 
 #include "icons/icons.h"
 
 using namespace Icons;
 
 namespace
 {
 const int DATE_POPUP_TIMEOUT = 1500;
 const QDate INVALID_DATE = QDate(1800, 1, 1);
 }
 
-KMyMoney::OldDateEdit::OldDateEdit(const QDate& date, QWidget* parent) :
-  QDateEdit(date, parent)
+KMyMoney::OldDateEdit::OldDateEdit(const QDate& date, QWidget* parent)
+  : QDateEdit(date, parent)
+  , m_initialSection(QDateTimeEdit::DaySection)
 {
 }
 
 void KMyMoney::OldDateEdit::keyPressEvent(QKeyEvent* k)
 {
   if ((lineEdit()->text().isEmpty() || lineEdit()->selectedText() == lineEdit()->text()) && QChar(k->key()).isDigit()) {
     // the line edit is empty which means that the date was cleared
     // or the whole text is selected and a digit character was entered
     // (the same meaning as clearing the date) - in this case set the date
     // to the current date and let the editor do the actual work
     setDate(QDate::currentDate());
-    setSelectedSection(QDateTimeEdit::DaySection); // start as when focused in if the date was cleared
+    setSelectedSection(m_initialSection); // start as when focused in if the date was cleared
   }
   QDateEdit::keyPressEvent(k);
 }
 
 void KMyMoney::OldDateEdit::focusInEvent(QFocusEvent * event)
 {
   QDateEdit::focusInEvent(event);
-  setSelectedSection(QDateTimeEdit::DaySection);
+  setSelectedSection(m_initialSection);
 }
 
 bool KMyMoney::OldDateEdit::event(QEvent* e)
 {
   // make sure that we keep the current date setting of a KMyMoneyDateInput object
   // across the QDateEdit::event(FocusOutEvent)
   bool rc;
 
   KMyMoneyDateInput* p = dynamic_cast<KMyMoneyDateInput*>(parentWidget());
   if (e->type() == QEvent::FocusOut && p) {
     QDate d = p->date();
     rc = QDateEdit::event(e);
     if (d.isValid())
       d = p->date();
     p->loadDate(d);
   } else {
     rc = QDateEdit::event(e);
   }
   return rc;
 }
 
 bool KMyMoney::OldDateEdit::focusNextPrevChild(bool next)
 {
   Q_UNUSED(next)
   return true;
 }
 
 struct KMyMoneyDateInput::Private {
-  QDateEdit *m_dateEdit;
+  KMyMoney::OldDateEdit *m_dateEdit;
   KDatePicker *m_datePicker;
   QDate m_date;
   QDate m_prevDate;
   Qt::AlignmentFlag m_qtalignment;
   QWidget *m_dateFrame;
   QPushButton *m_dateButton;
   KPassivePopup *m_datePopup;
 };
 
 KMyMoneyDateInput::KMyMoneyDateInput(QWidget *parent, Qt::AlignmentFlag flags)
     : QWidget(parent), d(new Private)
 {
   d->m_qtalignment = flags;
   d->m_date = QDate::currentDate();
 
   QHBoxLayout *dateInputLayout = new QHBoxLayout(this);
   dateInputLayout->setSpacing(0);
   dateInputLayout->setContentsMargins(0, 0, 0, 0);
   d->m_dateEdit = new KMyMoney::OldDateEdit(d->m_date, this);
   dateInputLayout->addWidget(d->m_dateEdit, 3);
   setFocusProxy(d->m_dateEdit);
   d->m_dateEdit->installEventFilter(this); // To get d->m_dateEdit's FocusIn/Out and some KeyPress events
 
   // we use INVALID_DATE as a special value for multi transaction editing
   d->m_dateEdit->setMinimumDate(INVALID_DATE);
   d->m_dateEdit->setSpecialValueText(QLatin1String(" "));
 
   d->m_datePopup = new KPassivePopup(d->m_dateEdit);
   d->m_datePopup->setObjectName("datePopup");
   d->m_datePopup->setTimeout(DATE_POPUP_TIMEOUT);
   d->m_datePopup->setView(new QLabel(QLocale().toString(d->m_date), d->m_datePopup));
 
   d->m_dateFrame = new QWidget(this);
   dateInputLayout->addWidget(d->m_dateFrame);
   QVBoxLayout *dateFrameVBoxLayout = new QVBoxLayout(d->m_dateFrame);
   dateFrameVBoxLayout->setMargin(0);
   dateFrameVBoxLayout->setContentsMargins(0, 0, 0, 0);
   d->m_dateFrame->setWindowFlags(Qt::Popup);
   d->m_dateFrame->hide();
 
   d->m_dateEdit->setDisplayFormat(QLocale().dateFormat(QLocale::ShortFormat));
+  switch(KMyMoneySettings::initialDateFieldCursorPosition()) {
+    case KMyMoneySettings::Day:
+      d->m_dateEdit->setInitialSection(QDateTimeEdit::DaySection);
+      break;
+    case KMyMoneySettings::Month:
+      d->m_dateEdit->setInitialSection(QDateTimeEdit::MonthSection);
+      break;
+    case KMyMoneySettings::Year:
+      d->m_dateEdit->setInitialSection(QDateTimeEdit::YearSection);
+      break;
+  }
 
   d->m_datePicker = new KDatePicker(d->m_date, d->m_dateFrame);
   dateFrameVBoxLayout->addWidget(d->m_datePicker);
   // Let the date picker have a close button (Added in 3.1)
   d->m_datePicker->setCloseButton(true);
 
   // the next line is a try to add an icon to the button
   d->m_dateButton = new QPushButton(Icons::get(Icon::ViewCalendarDay), QString(), this);
   dateInputLayout->addWidget(d->m_dateButton);
 
   connect(d->m_dateButton, &QAbstractButton::clicked, this, &KMyMoneyDateInput::toggleDatePicker);
   connect(d->m_dateEdit, &QDateTimeEdit::dateChanged, this, &KMyMoneyDateInput::slotDateChosenRef);
   connect(d->m_datePicker, &KDatePicker::dateSelected, this, &KMyMoneyDateInput::slotDateChosen);
   connect(d->m_datePicker, &KDatePicker::dateEntered, this, &KMyMoneyDateInput::slotDateChosen);
   connect(d->m_datePicker, &KDatePicker::dateSelected, d->m_dateFrame, &QWidget::hide);
 }
 
 void KMyMoneyDateInput::markAsBadDate(bool bad, const QColor& color)
 {
   // the next line knows a bit about the internals of QAbstractSpinBox
   QLineEdit* le = d->m_dateEdit->findChild<QLineEdit *>(); //krazy:exclude=qclasses
 
   if (le) {
     QPalette palette = this->palette();
     le->setPalette(palette);
     if (bad) {
       palette.setColor(foregroundRole(), color);
       le->setPalette(palette);
     }
   }
 }
 
 void KMyMoneyDateInput::showEvent(QShowEvent* event)
 {
   // don't forget the standard behaviour  ;-)
   QWidget::showEvent(event);
 
   // If the widget is shown, the size must be fixed a little later
   // to be appropriate. I saw this in some other places and the only
   // way to solve this problem is to postpone the setup of the size
   // to the time when the widget is on the screen.
   QTimer::singleShot(50, this, SLOT(fixSize()));
 }
 
 void KMyMoneyDateInput::fixSize()
 {
   // According to a hint in the documentation of KDatePicker::sizeHint()
   // 28 pixels should be added in each direction to obtain a better
   // display of the month button. I decided, (22,14) is good
   // enough and save some space on the screen (ipwizard)
   d->m_dateFrame->setFixedSize(d->m_datePicker->sizeHint() + QSize(22, 14));
 }
 
 KMyMoneyDateInput::~KMyMoneyDateInput()
 {
   delete d->m_dateFrame;
   delete d->m_datePopup;
   delete d;
 }
 
 void KMyMoneyDateInput::toggleDatePicker()
 {
   int w = d->m_dateFrame->width();
   int h = d->m_dateFrame->height();
 
   if (d->m_dateFrame->isVisible()) {
     d->m_dateFrame->hide();
   } else {
     QPoint tmpPoint = mapToGlobal(d->m_dateButton->geometry().bottomRight());
 
     // usually, the datepicker widget is shown underneath the d->m_dateEdit widget
     // if it does not fit on the screen, we show it above this widget
 
     if (tmpPoint.y() + h > QApplication::desktop()->height()) {
       tmpPoint.setY(tmpPoint.y() - h - d->m_dateButton->height());
     }
 
     if ((d->m_qtalignment == Qt::AlignRight && tmpPoint.x() + w <= QApplication::desktop()->width())
         || (tmpPoint.x() - w < 0)) {
       d->m_dateFrame->setGeometry(tmpPoint.x() - width(), tmpPoint.y(), w, h);
     } else {
       tmpPoint.setX(tmpPoint.x() - w);
       d->m_dateFrame->setGeometry(tmpPoint.x(), tmpPoint.y(), w, h);
     }
 
     if (d->m_date.isValid() && d->m_date != INVALID_DATE) {
       d->m_datePicker->setDate(d->m_date);
     } else {
       d->m_datePicker->setDate(QDate::currentDate());
     }
     d->m_dateFrame->show();
   }
 }
 
 
 /** Overriding QWidget::keyPressEvent
   *
   * increments/decrements the date upon +/- or Up/Down key input
   * sets the date to current date when the 'T' key is pressed
   */
 void KMyMoneyDateInput::keyPressEvent(QKeyEvent * k)
 {
   QKeySequence today(i18nc("Enter todays date into date input widget", "T"));
 
   auto adjustDateSection = [&](int offset) {
     switch(d->m_dateEdit->currentSection()) {
       case QDateTimeEdit::DaySection:
         slotDateChosen(d->m_date.addDays(offset));
         break;
       case QDateTimeEdit::MonthSection:
         slotDateChosen(d->m_date.addMonths(offset));
         break;
       case QDateTimeEdit::YearSection:
         slotDateChosen(d->m_date.addYears(offset));
         break;
       default:
         break;
     }
   };
 
   switch (k->key()) {
     case Qt::Key_Equal:
     case Qt::Key_Plus:
       adjustDateSection(1);
       k->accept();
       break;
 
     case Qt::Key_Minus:
       adjustDateSection(-1);
       k->accept();
       break;
 
     default:
       if (today == QKeySequence(k->key()) || k->key() == Qt::Key_T) {
         slotDateChosen(QDate::currentDate());
         k->accept();
       }
       break;
   }
   k->ignore(); // signal that the key event was not handled
 }
 
 /**
   * This function receives all events that are sent to focusWidget().
   * Some KeyPress events are intercepted and passed to keyPressEvent.
   * Otherwise they would be consumed by QDateEdit.
   */
 bool KMyMoneyDateInput::eventFilter(QObject *, QEvent *e)
 {
   if (e->type() == QEvent::FocusIn) {
 #ifndef Q_OS_MAC
     d->m_datePopup->show(mapToGlobal(QPoint(0, height())));
 #endif
     // select the date section, but we need to delay it a bit
   } else if (e->type() == QEvent::FocusOut) {
 #ifndef Q_OS_MAC
     d->m_datePopup->hide();
 #endif
   } else if (e->type() == QEvent::KeyPress) {
     if (QKeyEvent *k = dynamic_cast<QKeyEvent*>(e)) {
       keyPressEvent(k);
       if (k->isAccepted())
         return true; // signal that the key event was handled
     }
   }
 
   return false; // Don't filter the event
 }
 
 void KMyMoneyDateInput::slotDateChosenRef(const QDate& date)
 {
   if (date.isValid()) {
     emit dateChanged(date);
     d->m_date = date;
 
 #ifndef Q_OS_MAC
     QLabel *lbl = static_cast<QLabel*>(d->m_datePopup->view());
     lbl->setText(QLocale().toString(date));
     lbl->adjustSize();
     if (d->m_datePopup->isVisible() || hasFocus())
       d->m_datePopup->show(mapToGlobal(QPoint(0, height()))); // Repaint
 #endif
   }
 }
 
 void KMyMoneyDateInput::slotDateChosen(QDate date)
 {
   if (date.isValid()) {
     // the next line implies a call to slotDateChosenRef() above
     d->m_dateEdit->setDate(date);
   } else {
     d->m_dateEdit->setDate(INVALID_DATE);
   }
 }
 
 QDate KMyMoneyDateInput::date() const
 {
   QDate rc = d->m_dateEdit->date();
   if (rc == INVALID_DATE)
     rc = QDate();
   return rc;
 }
 
 void KMyMoneyDateInput::setDate(QDate date)
 {
   slotDateChosen(date);
 }
 
 void KMyMoneyDateInput::loadDate(const QDate& date)
 {
   d->m_date = d->m_prevDate = date;
 
   blockSignals(true);
   slotDateChosen(date);
   blockSignals(false);
 }
 
 void KMyMoneyDateInput::resetDate()
 {
   setDate(d->m_prevDate);
 }
 
 void KMyMoneyDateInput::setMaximumDate(const QDate& max)
 {
   d->m_dateEdit->setMaximumDate(max);
 }
 
 QWidget* KMyMoneyDateInput::focusWidget() const
 {
   QWidget* w = d->m_dateEdit;
   while (w->focusProxy())
     w = w->focusProxy();
   return w;
 }
 /*
 void KMyMoneyDateInput::setRange(const QDate & min, const QDate & max)
 {
   d->m_dateEdit->setDateRange(min, max);
 }
 */
diff --git a/kmymoney/widgets/kmymoneydateinput.h b/kmymoney/widgets/kmymoneydateinput.h
index 5f5fd751d..e1bfa37e6 100644
--- a/kmymoney/widgets/kmymoneydateinput.h
+++ b/kmymoney/widgets/kmymoneydateinput.h
@@ -1,153 +1,156 @@
 /*
  * Copyright 2000-2003  Michael Edwardes <mte@users.sourceforge.net>
  * Copyright 2001       Felix Rodriguez <frodriguez@users.sourceforge.net>
  * Copyright 2017-2018  Łukasz Wojniłowicz <lukasz.wojnilowicz@gmail.com>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
  * published by the Free Software Foundation; either version 2 of
  * the License, or (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef KMYMONEYDATEINPUT_H
 #define KMYMONEYDATEINPUT_H
 
 // ----------------------------------------------------------------------------
 // QT Includes
 
 #include <QWidget>
 #include <QDate>
 #include <QDateEdit>
 
 // ----------------------------------------------------------------------------
 // KDE Includes
 
 // ----------------------------------------------------------------------------
 // Project Includes
 
 #include "kmm_widgets_export.h"
 
 // Ideas neatly taken from korganizer
 // Respective authors are credited.
 // Some ideas/code have been borrowed from Calendar-0.13 (phoenix.bmedesign.com/~qt)
 
 namespace KMyMoney {
   /**
     * Provided to be able to catch the focusOut events before the contents gets changed
     */
   class OldDateEdit : public QDateEdit
   {
     Q_OBJECT
   public:
     explicit OldDateEdit(const QDate& date, QWidget* parent = nullptr);
+    void setInitialSection(Section section) { m_initialSection = section; }
 
   protected:
     /** if the date was cleared (a state which is not supported by QDateEdit)
       * make sure that a date can be entered again
       */
     void keyPressEvent(QKeyEvent* k) final override;
 
     /** reimplemented for internal reasons */
     bool event(QEvent* e) final override;
 
     /** reimplemented for internal reasons */
     bool focusNextPrevChild(bool next) final override;
 
     /** reimplemented for internal reasons */
     void focusInEvent(QFocusEvent *event) final override;
 
+  private:
+    QDateEdit::Section  m_initialSection;
   };
 }; // namespace
 
 /**
   * This class provides the general widget used for date selection
   * throughout the KMyMoney project. It provides an QDateEdit widget
   * which is based on an edit field with spin boxes and adds a QPushButton
   * to open a KDatePicker.
   */
 class KMM_WIDGETS_EXPORT KMyMoneyDateInput : public QWidget
 {
   Q_OBJECT
   Q_PROPERTY(QDate date READ date WRITE setDate STORED false)
 
 public:
   explicit KMyMoneyDateInput(QWidget* parent = nullptr, Qt::AlignmentFlag flags = Qt::AlignLeft);
   ~KMyMoneyDateInput();
 
   /**
     * Returns the selected date in the widget. If the widget is not
     * showing a date, a QDate() object is returned which has an invalid date.
     */
   QDate date() const;
 
   /**
     * Set the date shown in the widget to @a date. If @a date is invalid,
     * no text will be shown. The internal widget will use 1.1.1800 for this
     * special case, as the standard QDateEdit widget does not support an
     * invalid date as of Qt4 anymore, but we need it anyway for multi transaction
     * edit.
     */
   void setDate(QDate date);
 
   void setMaximumDate(const QDate& max);
 
   /**
     * Setup the widget with @a date. This date is stored internally and
     * can be reloaded using resetDate().
     *
     * @sa setDate, resetDate
     */
   void loadDate(const QDate& date);
 
   /**
     * Setup the widget with the date loaded using loadDate().
     *
     *  @sa loadDate
     */
   void resetDate();
 
   QWidget* focusWidget() const;
   void setRange(const QDate & min, const QDate & max);
   void markAsBadDate(bool bad = false, const QColor& = QColor());
 
 Q_SIGNALS:
   void dateChanged(const QDate& date);
 
 protected:
   /**
     * - increments/decrements the date upon +/- key input
     * - increments/decrements the date upon Up/Down key input
     * - sets the date to current date when the 'T' key is pressed.
     *   The actual key for this to happen might be overridden through
     *   an i18n package. The 'T'-key is always possible.
     */
   void keyPressEvent(QKeyEvent* k) override;
   void showEvent(QShowEvent* event) override;
 
   /** To intercept events sent to focusWidget() */
   bool eventFilter(QObject *o, QEvent *e) override;
 
 
 protected Q_SLOTS:
   void slotDateChosen(QDate date);
   void toggleDatePicker();
 
 private Q_SLOTS:
   void slotDateChosenRef(const QDate& date);
   void fixSize();
 
 private:
   struct Private;
   Private * const d;
 };
 
 #endif