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

List:       kde-commits
Subject:    playground/office/kmymoney/kmymoney/views
From:       Alvaro Soliverez <asoliverez () gmail ! com>
Date:       2010-05-01 15:16:06
Message-ID: 20100501151606.EB57FAC8AA () svn ! kde ! org
[Download RAW message or body]

SVN commit 1121521 by asoliverez:

More work on acoount slots. There is still more work to be done.

 M  +57 -5     kaccountsview.cpp  
 M  +7 -1      kaccountsview.h  
 M  +2 -2      kmymoneyview.cpp  


--- trunk/playground/office/kmymoney/kmymoney/views/kaccountsview.cpp \
#1121520:1121521 @@ -108,10 +108,18 @@
   connect(m_collapseButton, SIGNAL(clicked()), m_accountTree, SLOT(collapseAll()));
   connect(m_expandButton, SIGNAL(clicked()), m_accountTree, SLOT(expandAll()));
 
-  connect(m_assetsList, SIGNAL(selectionChanged(QListWidgetItem*)), this, \
                SLOT(slotSelectIcon(QListWidgetItem*)));
-  connect(m_assetsList, SIGNAL(rightButtonClicked(QListWidgetItem*, const QPoint&)), \
                this, SLOT(slotOpenContext(QListWidgetItem*)));
-  connect(m_assetsList, SIGNAL(executed(QListWidgetItem*)), this, \
SLOT(slotOpenObject(QListWidgetItem*))); +  connect(m_assetsList, \
SIGNAL(itemSelectionChanged()), this, SLOT(slotAssetsSelectIcon())); +  \
connect(m_assetsList, SIGNAL(customContextMenuRequested(const QPoint&)), this, \
SLOT(slotAssetsOpenContextMenu(const QPoint&))); +  connect(m_assetsList, \
SIGNAL(itemDoubleClicked(QListWidgetItem*)), this, \
SLOT(slotOpenObject(QListWidgetItem*)));  
+  connect(m_liabilitiesList, SIGNAL(itemSelectionChanged()), this, \
SLOT(slotLiabilitiesSelectIcon())); +  connect(m_liabilitiesList, \
SIGNAL(customContextMenuRequested(const QPoint&)), this, \
SLOT(slotLiabilitiesOpenContextMenu(const QPoint&))); +  connect(m_liabilitiesList, \
SIGNAL(itemDoubleClicked(QListWidgetItem*)), this, \
SLOT(slotOpenObject(QListWidgetItem*))); +
+  connect(m_equitiesList, SIGNAL(itemSelectionChanged()), this, \
SLOT(slotEquitiesSelectIcon())); +  connect(m_equitiesList, \
SIGNAL(customContextMenuRequested(const QPoint&)), this, \
SLOT(slotEquitiesOpenContextMenu(const QPoint&))); +  connect(m_equitiesList, \
SIGNAL(itemDoubleClicked(QListWidgetItem*)), this, \
SLOT(slotOpenObject(QListWidgetItem*))); +
   connect(MyMoneyFile::instance(), SIGNAL(dataChanged()), this, \
SLOT(slotLoadAccounts()));  connect(m_collapseButton, SIGNAL(clicked()), this, \
SLOT(slotExpandCollapse()));  connect(m_expandButton, SIGNAL(clicked()), this, \
SLOT(slotExpandCollapse())); @@ -399,17 +407,61 @@
     return m_equitiesList->currentItem();
 }
 
+void KAccountsView::slotAssetsSelectIcon()
+{
+  QList<QListWidgetItem*> selectedItems = m_assetsList->selectedItems();
+  if(selectedItems.at(0)) {
+    slotSelectIcon(selectedItems.at(0));
+  }
+}
+
+void KAccountsView::slotLiabilitiesSelectIcon()
+{
+  QList<QListWidgetItem*> selectedItems = m_liabilitiesList->selectedItems();
+  if(selectedItems.at(0)) {
+    slotSelectIcon(selectedItems.at(0));
+  }
+}
+
+void KAccountsView::slotEquitiesSelectIcon()
+{
+  QList<QListWidgetItem*> selectedItems = m_equitiesList->selectedItems();
+  if(selectedItems.at(0)) {
+    slotSelectIcon(selectedItems.at(0));
+  }
+}
+
 void KAccountsView::slotSelectIcon(QListWidgetItem* item)
 {
   emit selectObject((item->data(Qt::UserRole)).value<MyMoneyAccount>());
 }
 
-void KAccountsView::slotOpenContext(QListWidgetItem* item)
+void KAccountsView::slotAssetsOpenContextMenu(const QPoint& point)
 {
+QListWidgetItem* item = m_assetsList->itemAt(point);
   if (item)
-    emit openContextMenu((item->data(Qt::UserRole)).value<MyMoneyAccount>());
+    slotOpenContextMenu((item->data(Qt::UserRole)).value<MyMoneyAccount>());
 }
 
+void KAccountsView::slotLiabilitiesOpenContextMenu(const QPoint& point)
+{
+QListWidgetItem* item = m_liabilitiesList->itemAt(point);
+  if (item)
+    slotOpenContextMenu((item->data(Qt::UserRole)).value<MyMoneyAccount>());
+}
+
+void KAccountsView::slotEquitiesOpenContextMenu(const QPoint& point)
+{
+QListWidgetItem* item = m_equitiesList->itemAt(point);
+  if (item)
+    slotOpenContextMenu((item->data(Qt::UserRole)).value<MyMoneyAccount>());
+}
+
+void KAccountsView::slotOpenContextMenu(MyMoneyAccount account)
+{
+  emit openContextMenu(account);
+}
+
 void KAccountsView::slotOpenObject(QListWidgetItem* item)
 {
   if (item)
--- trunk/playground/office/kmymoney/kmymoney/views/kaccountsview.h #1121520:1121521
@@ -113,7 +113,13 @@
   void slotNetWorthChanged(const MyMoneyMoney &);
   void slotTabCurrentChanged(QWidget*);
   void slotSelectIcon(QListWidgetItem* item);
-  void slotOpenContext(QListWidgetItem* item);
+  void slotOpenContextMenu(MyMoneyAccount account);
+  void slotAssetsSelectIcon(void);
+  void slotAssetsOpenContextMenu(const QPoint& point);
+  void slotLiabilitiesSelectIcon(void);
+  void slotLiabilitiesOpenContextMenu(const QPoint& point);
+  void slotEquitiesSelectIcon(void);
+  void slotEquitiesOpenContextMenu(const QPoint& point);
   void slotOpenObject(QListWidgetItem* item);
   void slotExpandCollapse(void);
   void slotUnusedIncomeExpenseAccountHidden(void);
--- trunk/playground/office/kmymoney/kmymoney/views/kmymoneyview.cpp #1121520:1121521
@@ -168,8 +168,8 @@
   connect(m_accountsView, SIGNAL(openContextMenu(const MyMoneyObject&)), kmymoney, \
SLOT(slotShowAccountContextMenu(const MyMoneyObject&)));  connect(m_accountsView, \
SIGNAL(openObject(const MyMoneyObject&)), kmymoney, SLOT(slotAccountOpen(const \
MyMoneyObject&)));  connect(m_accountsView, SIGNAL(reparent(const MyMoneyAccount&, \
const MyMoneyAccount&)), kmymoney, SLOT(slotReparentAccount(const MyMoneyAccount&, \
                const MyMoneyAccount&)));
-  connect(this, SIGNAL(kmmFilePlugin(unsigned int)), m_accountsView, \
                SLOT(slotUpdateIconPos(unsigned int)));
-  connect(this, SIGNAL(reconciliationStarts(const MyMoneyAccount&, const QDate&, \
const MyMoneyMoney&)), m_accountsView, SLOT(slotReconcileAccount(const \
MyMoneyAccount&, const QDate&, const MyMoneyMoney&))); +  //connect(this, \
SIGNAL(kmmFilePlugin(unsigned int)), m_accountsView, SLOT(slotUpdateIconPos(unsigned \
int))); +  //connect(this, SIGNAL(reconciliationStarts(const MyMoneyAccount&, const \
QDate&, const MyMoneyMoney&)), m_accountsView, SLOT(slotReconcileAccount(const \
MyMoneyAccount&, const QDate&, const MyMoneyMoney&)));  
   // Page 3
   m_scheduledView = new KScheduledView();


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