Fix estimated transaction edit persistence - keep recurring link and set reconciled flag

1 files changed, 216 insertions, 105 deletions

diff --git a/cashflow.ui b/cashflow.ui
index c69afdb..7f35845 100644
--- a/cashflow.ui
+++ b/cashflow.ui
@@ -20,111 +20,184 @@
       <property name="title">
        <string>Date Range</string>
       </property>
-      <layout class="QHBoxLayout" name="horizontalLayout">
+      <layout class="QVBoxLayout" name="verticalLayout_2">
        <item>
-        <widget class="QLabel" name="label">
-         <property name="text">
-          <string>From:</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QDateEdit" name="dateFromEdit">
-         <property name="calendarPopup">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QLabel" name="label_2">
-         <property name="text">
-          <string>To:</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QDateEdit" name="dateToEdit">
-         <property name="calendarPopup">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QLabel" name="label_14">
-         <property name="text">
-          <string>Period:</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QComboBox" name="periodCombo">
+        <layout class="QHBoxLayout" name="horizontalLayout">
          <item>
-          <property name="text">
-           <string>Daily</string>
-          </property>
+          <widget class="QLabel" name="label">
+           <property name="text">
+            <string>From:</string>
+           </property>
+          </widget>
          </item>
          <item>
-          <property name="text">
-           <string>Weekly</string>
-          </property>
+          <widget class="QDateEdit" name="dateFromEdit">
+           <property name="calendarPopup">
+            <bool>true</bool>
+           </property>
+          </widget>
          </item>
          <item>
-          <property name="text">
-           <string>Monthly</string>
-          </property>
+          <widget class="QLabel" name="label_2">
+           <property name="text">
+            <string>To:</string>
+           </property>
+          </widget>
          </item>
          <item>
-          <property name="text">
-           <string>Quarterly</string>
-          </property>
+          <widget class="QDateEdit" name="dateToEdit">
+           <property name="calendarPopup">
+            <bool>true</bool>
+           </property>
+          </widget>
          </item>
-        </widget>
-       </item>
-       <item>
-        <widget class="QLabel" name="label_15">
-         <property name="text">
-          <string>Account:</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QComboBox" name="accountFilterCombo">
          <item>
-          <property name="text">
-           <string>All Accounts</string>
-          </property>
+          <widget class="QLabel" name="label_14">
+           <property name="text">
+            <string>Period:</string>
+           </property>
+          </widget>
          </item>
-        </widget>
-       </item>
-       <item>
-        <widget class="QCheckBox" name="showAccountBalancesCheck">
-         <property name="text">
-          <string>Show Account Balances</string>
-         </property>
-         <property name="checked">
-          <bool>false</bool>
-         </property>
-        </widget>
+         <item>
+          <widget class="QComboBox" name="periodCombo">
+           <item>
+            <property name="text">
+             <string>Daily</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>Weekly</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>Monthly</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>Quarterly</string>
+            </property>
+           </item>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLabel" name="label_15">
+           <property name="text">
+            <string>Account:</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QComboBox" name="accountFilterCombo">
+           <item>
+            <property name="text">
+             <string>All Accounts</string>
+            </property>
+           </item>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLabel" name="label_16">
+           <property name="text">
+            <string>Recurring:</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QComboBox" name="recurringFilterCombo">
+           <item>
+            <property name="text">
+             <string>All Transactions</string>
+            </property>
+           </item>
+          </widget>
+         </item>
+         <item>
+          <widget class="QCheckBox" name="showAccountBalancesCheck">
+           <property name="text">
+            <string>Show Account Balances</string>
+           </property>
+           <property name="checked">
+            <bool>false</bool>
+           </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>
        </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>
+        <layout class="QHBoxLayout" name="horizontalLayout_search">
+         <item>
+          <widget class="QLabel" name="label_search">
+           <property name="text">
+            <string>Search:</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLineEdit" name="searchEdit">
+           <property name="placeholderText">
+            <string>Filter transactions...</string>
+           </property>
+           <property name="clearButtonEnabled">
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QPushButton" name="collapseAllBtn">
+           <property name="text">
+            <string>Collapse All</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QPushButton" name="expandAllBtn">
+           <property name="text">
+            <string>Expand All</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <spacer name="horizontalSpacer_2">
+           <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>
        </item>
-       <item>
-        <widget class="QLabel" name="startBalanceLabel">
-         <property name="text">
-          <string>Starting Balance: $0.00</string>
-         </property>
-         <property name="styleSheet">
+      </layout>
+     </widget>
+    </item>
+    <item>
+     <layout class="QHBoxLayout" name="horizontalLayout_balance">
+      <item>
+       <widget class="QLabel" name="startBalanceLabel">
+        <property name="text">
+         <string>Starting Balance: $0.00</string>
+        </property>
+        <property name="styleSheet">
           <string notr="true">font-weight: bold; font-size: 12pt;</string>
          </property>
         </widget>
@@ -140,7 +213,6 @@
         </widget>
        </item>
       </layout>
-     </widget>
     </item>
     <item>
      <widget class="QTabWidget" name="tabWidget">
@@ -366,6 +438,9 @@
           <property name="selectionBehavior">
            <enum>QAbstractItemView::SelectRows</enum>
           </property>
+          <property name="sortingEnabled">
+           <bool>true</bool>
+          </property>
          </widget>
         </item>
         <item>
@@ -435,13 +510,30 @@
             </widget>
            </item>
            <item row="1" column="2">
+            <widget class="QLabel" name="label_enddate">
+             <property name="text">
+              <string>End Date:</string>
+             </property>
+            </widget>
+           </item>
+           <item row="1" column="3">
+            <widget class="QDateEdit" name="recurringEndDateEdit">
+             <property name="calendarPopup">
+              <bool>true</bool>
+             </property>
+             <property name="specialValueText">
+              <string>Never</string>
+             </property>
+            </widget>
+           </item>
+           <item row="2" column="0">
             <widget class="QLabel" name="label_11">
              <property name="text">
               <string>Amount:</string>
              </property>
             </widget>
            </item>
-           <item row="1" column="3">
+           <item row="2" column="1">
             <widget class="QDoubleSpinBox" name="recurringAmountSpin">
              <property name="buttonSymbols">
               <enum>QAbstractSpinBox::NoButtons</enum>
@@ -460,42 +552,42 @@
              </property>
             </widget>
            </item>
-           <item row="2" column="0">
-            <widget class="QLabel" name="label_12">
+           <item row="2" column="2">
+            <widget class="QLabel" name="label_category">
              <property name="text">
-              <string>Account:</string>
+              <string>Category:</string>
              </property>
             </widget>
            </item>
-           <item row="2" column="1">
-            <widget class="QComboBox" name="recurringAccountCombo">
+           <item row="2" column="3">
+            <widget class="QComboBox" name="recurringCategoryCombo">
              <property name="editable">
               <bool>true</bool>
              </property>
             </widget>
            </item>
-           <item row="2" column="2">
-            <widget class="QLabel" name="label_17">
+           <item row="3" column="0">
+            <widget class="QLabel" name="label_12">
              <property name="text">
-              <string>Category:</string>
+              <string>Account:</string>
              </property>
             </widget>
            </item>
-           <item row="2" column="3">
-            <widget class="QComboBox" name="recurringCategoryCombo">
+           <item row="3" column="1">
+            <widget class="QComboBox" name="recurringAccountCombo">
              <property name="editable">
               <bool>true</bool>
              </property>
             </widget>
            </item>
-           <item row="3" column="0">
+           <item row="3" column="2">
             <widget class="QLabel" name="label_13">
              <property name="text">
               <string>Description:</string>
              </property>
             </widget>
            </item>
-           <item row="3" column="1" colspan="3">
+           <item row="3" column="3">
             <widget class="QLineEdit" name="recurringDescriptionEdit"/>
            </item>
            <item row="4" column="0" colspan="2">
@@ -557,6 +649,9 @@
     </property>
     <addaction name="actionNew"/>
     <addaction name="actionOpen"/>
+    <addaction name="actionSaveAs"/>
+    <addaction name="separator"/>
+    <addaction name="actionExportCSV"/>
     <addaction name="separator"/>
     <addaction name="actionQuit"/>
    </widget>
@@ -602,6 +697,22 @@
     <string>Ctrl+,</string>
    </property>
   </action>
+  <action name="actionSaveAs">
+   <property name="text">
+    <string>Save As...</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+Shift+S</string>
+   </property>
+  </action>
+  <action name="actionExportCSV">
+   <property name="text">
+    <string>Export to CSV...</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+E</string>
+   </property>
+  </action>
  </widget>
  <resources/>
  <connections/>