6eb27fac | 2014-10-12 17:48:25 | Timothy Pearson |
Bring stop, lock, exit, and run icons into XDG compliance |
||
M kmymoney2/dialogs/kaccountselectdlg.cpp M kmymoney2/kmymoney2.cpp M kmymoney2/widgets/registersearchline.cpp |
||
diff --git a/kmymoney2/dialogs/kaccountselectdlg.cpp b/kmymoney2/dialogs/kaccountselectdlg.cpp index 5638498..eb902d7 100644 --- a/kmymoney2/dialogs/kaccountselectdlg.cpp +++ b/kmymoney2/dialogs/kaccountselectdlg.cpp @@ -75,7 +75,7 @@ m_qbuttonOk->setGuiItem(KStdGuiItem::ok()); KGuiItem abortButtenItem( i18n("&Abort" ), - TQIconSet(il->loadIcon("stop", TDEIcon::Small, TDEIcon::SizeSmall)), + TQIconSet(il->loadIcon("process-stop", TDEIcon::Small, TDEIcon::SizeSmall)), i18n("Abort the import operation and dismiss all changes"), i18n("Use this to abort the import. Your financial data will be in the state before you started the QIF import.")); m_kButtonAbort->setGuiItem(abortButtenItem); diff --git a/kmymoney2/kmymoney2.cpp b/kmymoney2/kmymoney2.cpp index fad3f89..1b0bfd0 100644 --- a/kmymoney2/kmymoney2.cpp +++ b/kmymoney2/kmymoney2.cpp @@ -426,7 +426,7 @@ new TDEAction(i18n("Delete transaction", "Delete"), "delete", 0, TQT_TQOBJECT(this), TQT_SLOT(slotTransactionsDelete()), actionCollection(), "transaction_delete"); new TDEAction(i18n("Duplicate transaction", "Duplicate"), "editcopy", 0, TQT_TQOBJECT(this), TQT_SLOT(slotTransactionDuplicate()), actionCollection(), "transaction_duplicate"); - new TDEAction(i18n("Button text for match transaction", "Match"), "stop", 0, TQT_TQOBJECT(this), TQT_SLOT(slotTransactionMatch()), actionCollection(), "transaction_match"); + new TDEAction(i18n("Button text for match transaction", "Match"), "process-stop", 0, TQT_TQOBJECT(this), TQT_SLOT(slotTransactionMatch()), actionCollection(), "transaction_match"); new TDEAction(i18n("Accept 'imported' and 'matched' transaction", "Accept"), "apply", 0, TQT_TQOBJECT(this), TQT_SLOT(slotTransactionsAccept()), actionCollection(), "transaction_accept"); new TDEAction(i18n("Toggle reconciliation flag", "Toggle"), 0, TDEShortcut("Ctrl+Space"), TQT_TQOBJECT(this), TQT_SLOT(slotToggleReconciliationFlag()), actionCollection(), "transaction_mark_toggle"); @@ -5338,7 +5338,7 @@ if(matchedCount != 0) { action("transaction_match")->setEnabled(true); action("transaction_match")->setText(i18n("Button text for unmatch transaction", "Unmatch")); - action("transaction_match")->setIcon("stop"); + action("transaction_match")->setIcon("process-stop"); } if(m_selectedTransactions.count() > 1) { diff --git a/kmymoney2/widgets/registersearchline.cpp b/kmymoney2/widgets/registersearchline.cpp index 7236b70..3380f63 100644 --- a/kmymoney2/widgets/registersearchline.cpp +++ b/kmymoney2/widgets/registersearchline.cpp @@ -76,7 +76,7 @@ d->combo = new TQComboBox(parentWidget()); // don't change the order of the following lines unless updating // the case labels in RegisterSearchLine::itemMatches() at the same time - d->combo->insertItem(SmallIcon("run"), i18n("Any status")); + d->combo->insertItem(SmallIcon("system-run"), i18n("Any status")); d->combo->insertItem(SmallIcon("fileimport"), i18n("Imported")); d->combo->insertItem(SmallIcon("connect_creating"), i18n("Matched")); d->combo->insertItem(SmallIcon("attention"), i18n("Erroneous")); |
||
a54593cb | 2014-10-12 17:53:48 | Timothy Pearson |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/kmymoney |
||
M cmake |
||
diff --git a/cmake b/cmake index 0d5ca8b..08c6f54 160000 --- a/cmake +++ b/cmake -Subproject commit 0d5ca8bebbb638b05f1d11537ce41fcf73d10ac9 +Subproject commit 08c6f54d6f80554caa671847417cf04326adb63c |