| 6173a1d5 | 2014-10-13 20:09:58 | Timothy Pearson |
Bring mail_forward, mail_new, mail_replyall, mail_reply, mail_send, player_pause, player_play, player_stop, player_rew, player_fwd, player_start, player_end, rotate_ccw, rotate_cw, window_fullscreen, window_nofullscreen, window_new, viewmagfit, viewmag+, viewmag1, and viewmag- icons into XDG compliance |
||
|
M kmymoney2/dialogs/kenterscheduledlg.cpp M kmymoney2/kmymoney2.cpp M kmymoney2/views/kaccountsview.cpp M kmymoney2/views/kcategoriesview.cpp M kmymoney2/views/khomeview.cpp M kmymoney2/widgets/kmymoneybriefschedule.cpp |
||
diff --git a/kmymoney2/dialogs/kenterscheduledlg.cpp b/kmymoney2/dialogs/kenterscheduledlg.cpp
index 430578d..06a0d42 100644
--- a/kmymoney2/dialogs/kenterscheduledlg.cpp
+++ b/kmymoney2/dialogs/kenterscheduledlg.cpp
@@ -69,7 +69,7 @@
d->m_schedule = schedule;
d->m_extendedReturnCode = KMyMoneyUtils::Enter;
buttonOk->setIconSet(TDEGlobal::iconLoader()->loadIconSet("key_enter", TDEIcon::NoGroup, TDEIcon::SizeSmall, true));
- buttonSkip->setIconSet(TDEGlobal::iconLoader()->loadIconSet("player_fwd", TDEIcon::NoGroup, TDEIcon::SizeSmall, true));
+ buttonSkip->setIconSet(TDEGlobal::iconLoader()->loadIconSet("media-seek-forward", TDEIcon::NoGroup, TDEIcon::SizeSmall, true));
buttonCancel->setGuiItem(KStdGuiItem::cancel());
buttonHelp->setGuiItem(KStdGuiItem::help());
buttonIgnore->setHidden(true);
diff --git a/kmymoney2/kmymoney2.cpp b/kmymoney2/kmymoney2.cpp
index 6ad40be..1785256 100644
--- a/kmymoney2/kmymoney2.cpp
+++ b/kmymoney2/kmymoney2.cpp
@@ -357,8 +357,8 @@
// note : action "category_new" is included in this menu but defined below
new TDEAction(i18n("Open ledger"), "ledger", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAccountOpen()), actionCollection(), "account_open");
new TDEAction(i18n("Reconcile..."), "reconcile", TDEShortcut("Ctrl+Shift+R"), TQT_TQOBJECT(this), TQT_SLOT(slotAccountReconcileStart()), actionCollection(), "account_reconcile");
- new TDEAction(i18n("Finish reconciliation", "Finish"), "player_end", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAccountReconcileFinish()), actionCollection(), "account_reconcile_finish");
- new TDEAction(i18n("Postpone reconciliation", "Postpone"), "player_pause", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAccountReconcilePostpone()), actionCollection(), "account_reconcile_postpone");
+ new TDEAction(i18n("Finish reconciliation", "Finish"), "media-skip-forward", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAccountReconcileFinish()), actionCollection(), "account_reconcile_finish");
+ new TDEAction(i18n("Postpone reconciliation", "Postpone"), "media-playback-pause", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAccountReconcilePostpone()), actionCollection(), "account_reconcile_postpone");
new TDEAction(i18n("Edit account..."), "edit", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAccountEdit()), actionCollection(), "account_edit");
new TDEAction(i18n("Delete account..."), "delete", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAccountDelete()), actionCollection(), "account_delete");
new TDEAction(i18n("Close account"), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAccountClose()), actionCollection(), "account_close");
@@ -452,7 +452,7 @@
new TDEAction(i18n("Delete scheduled transaction..."), "delete", 0, TQT_TQOBJECT(this), TQT_SLOT(slotScheduleDelete()), actionCollection(), "schedule_delete");
new TDEAction(i18n("Duplicate scheduled transaction"), "edit-copy", 0, TQT_TQOBJECT(this), TQT_SLOT(slotScheduleDuplicate()), actionCollection(), "schedule_duplicate");
new TDEAction(i18n("Enter next transaction..."), "key_enter", 0, TQT_TQOBJECT(this), TQT_SLOT(slotScheduleEnter()), actionCollection(), "schedule_enter");
- new TDEAction(i18n("Skip next transaction..."), "player_fwd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotScheduleSkip()), actionCollection(), "schedule_skip");
+ new TDEAction(i18n("Skip next transaction..."), "media-seek-forward", 0, TQT_TQOBJECT(this), TQT_SLOT(slotScheduleSkip()), actionCollection(), "schedule_skip");
new TDEAction(i18n("New payee"), "document-new", 0, TQT_TQOBJECT(this), TQT_SLOT(slotPayeeNew()), actionCollection(), "payee_new");
new TDEAction(i18n("Rename payee"), "edit", 0, TQT_TQOBJECT(this), TQT_SIGNAL(payeeRename()), actionCollection(), "payee_rename");
diff --git a/kmymoney2/views/kaccountsview.cpp b/kmymoney2/views/kaccountsview.cpp
index e2ac90b..24d60f2 100644
--- a/kmymoney2/views/kaccountsview.cpp
+++ b/kmymoney2/views/kaccountsview.cpp
@@ -84,11 +84,11 @@
// setup icons for collapse and expand button
TDEIconLoader *ic = TDEGlobal::iconLoader();
KGuiItem collapseGuiItem("",
- TQIconSet(ic->loadIcon("viewmag-", TDEIcon::Small, TDEIcon::SizeSmall)),
+ TQIconSet(ic->loadIcon("zoom-out", TDEIcon::Small, TDEIcon::SizeSmall)),
TQString(),
TQString());
KGuiItem expandGuiItem("",
- TQIconSet(ic->loadIcon("viewmag+", TDEIcon::Small, TDEIcon::SizeSmall)),
+ TQIconSet(ic->loadIcon("zoom-in", TDEIcon::Small, TDEIcon::SizeSmall)),
TQString(),
TQString());
m_collapseButton->setGuiItem(collapseGuiItem);
diff --git a/kmymoney2/views/kcategoriesview.cpp b/kmymoney2/views/kcategoriesview.cpp
index f431576..6f16f93 100644
--- a/kmymoney2/views/kcategoriesview.cpp
+++ b/kmymoney2/views/kcategoriesview.cpp
@@ -63,11 +63,11 @@
// setup icons for collapse and expand button
TDEIconLoader *ic = TDEGlobal::iconLoader();
KGuiItem collapseGuiItem("",
- TQIconSet(ic->loadIcon("viewmag-", TDEIcon::Small, TDEIcon::SizeSmall)),
+ TQIconSet(ic->loadIcon("zoom-out", TDEIcon::Small, TDEIcon::SizeSmall)),
TQString(),
TQString());
KGuiItem expandGuiItem("",
- TQIconSet(ic->loadIcon("viewmag+", TDEIcon::Small, TDEIcon::SizeSmall)),
+ TQIconSet(ic->loadIcon("zoom-in", TDEIcon::Small, TDEIcon::SizeSmall)),
TQString(),
TQString());
m_collapseButton->setGuiItem(collapseGuiItem);
diff --git a/kmymoney2/views/khomeview.cpp b/kmymoney2/views/khomeview.cpp
index 8c0ba14..4ffb626 100644
--- a/kmymoney2/views/khomeview.cpp
+++ b/kmymoney2/views/khomeview.cpp
@@ -642,7 +642,7 @@
TQString pathEnter, pathSkip;
TDEGlobal::iconLoader()->loadIcon("key_enter", TDEIcon::Small, TDEIcon::SizeSmall, TDEIcon::DefaultState, &pathEnter);
- TDEGlobal::iconLoader()->loadIcon("player_fwd", TDEIcon::Small, TDEIcon::SizeSmall, TDEIcon::DefaultState, &pathSkip);
+ TDEGlobal::iconLoader()->loadIcon("media-seek-forward", TDEIcon::Small, TDEIcon::SizeSmall, TDEIcon::DefaultState, &pathSkip);
//show payment date
tmp = TQString("<td>") +
diff --git a/kmymoney2/widgets/kmymoneybriefschedule.cpp b/kmymoney2/widgets/kmymoneybriefschedule.cpp
index ff75732..5b182a5 100644
--- a/kmymoney2/widgets/kmymoneybriefschedule.cpp
+++ b/kmymoney2/widgets/kmymoneybriefschedule.cpp
@@ -57,7 +57,7 @@
connect(m_buttonEnter, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEnterClicked()));
KGuiItem skipGuiItem( i18n("&Skip"),
- TQIconSet(ic->loadIcon("player_fwd", TDEIcon::Small, TDEIcon::SizeSmall)),
+ TQIconSet(ic->loadIcon("media-seek-forward", TDEIcon::Small, TDEIcon::SizeSmall)),
i18n("Skip this transaction"),
i18n("Use this button to skip this transaction"));
m_skipButton->setGuiItem(skipGuiItem);
|
||
| e930e13e | 2014-10-13 20:10:51 | Timothy Pearson |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/kmymoney |
||
|
M cmake |
||
diff --git a/cmake b/cmake index 08c6f54..47d7755 160000 --- a/cmake +++ b/cmake -Subproject commit 08c6f54d6f80554caa671847417cf04326adb63c +Subproject commit 47d775518c382c77f663a70bb23fad93e6810090 |
||