Skip to content

Commit 7ec7e8a

Browse files
committed
Rename all rime action icon to avoid wrong icon being used.
When a icon them only provides fcitx-rime icon or fcitx icon, based on XDG fallback, fcitx-rime-* icon will be fallback to fcitx-rime, or even fcitx. An example in real world is breeze that doesn't have fcitx-rime-im icon. Which make kimpanel shows two identical fcitx-rime icon.
1 parent fceee1b commit 7ec7e8a

31 files changed

+17
-17
lines changed

data/48x48/apps/fcitx-rime-deploy.png

-1
This file was deleted.

data/48x48/apps/fcitx-rime-disable.png

-1
This file was deleted.

data/48x48/apps/fcitx-rime-im.png

-1
This file was deleted.

data/48x48/apps/fcitx-rime-latin.png

-1
This file was deleted.

data/48x48/apps/fcitx-rime-sync.png

-1
This file was deleted.

data/48x48/apps/fcitx_rime_deploy.png

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
org.fcitx.Fcitx5.fcitx_rime_deploy.png
+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
org.fcitx.Fcitx5.fcitx_rime_disable.png

data/48x48/apps/fcitx_rime_im.png

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
org.fcitx.Fcitx5.fcitx_rime_im.png

data/48x48/apps/fcitx_rime_latin.png

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
org.fcitx.Fcitx5.fcitx_rime_latin.png

data/48x48/apps/fcitx_rime_sync.png

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
org.fcitx.Fcitx5.fcitx_rime_sync.png

data/scalable/apps/fcitx-rime-deploy.svg

-1
This file was deleted.

data/scalable/apps/fcitx-rime-disable.svg

-1
This file was deleted.

data/scalable/apps/fcitx-rime-im.svg

-1
This file was deleted.

data/scalable/apps/fcitx-rime-latin.svg

-1
This file was deleted.

data/scalable/apps/fcitx-rime-sync.svg

-1
This file was deleted.
+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
org.fcitx.Fcitx5.fcitx_rime_deploy.svg
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
org.fcitx.Fcitx5.fcitx_rime_disable.svg

data/scalable/apps/fcitx_rime_im.svg

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
org.fcitx.Fcitx5.fcitx_rime_im.svg
+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
org.fcitx.Fcitx5.fcitx_rime_latin.svg
+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
org.fcitx.Fcitx5.fcitx_rime_sync.svg

src/rimeengine.cpp

+7-7
Original file line numberDiff line numberDiff line change
@@ -140,9 +140,9 @@ class IMAction : public Action {
140140
});
141141
}
142142
if (isDisabled) {
143-
return "fcitx-rime-disabled";
143+
return "fcitx_rime_disabled";
144144
}
145-
return "";
145+
return "fcitx_rime_im";
146146
}
147147

148148
private:
@@ -310,7 +310,7 @@ RimeEngine::RimeEngine(Instance *instance)
310310
separatorAction_.setSeparator(true);
311311
instance_->userInterfaceManager().registerAction("fcitx-rime-separator",
312312
&separatorAction_);
313-
deployAction_.setIcon("fcitx-rime-deploy");
313+
deployAction_.setIcon("fcitx_rime_deploy");
314314
deployAction_.setShortText(_("Deploy"));
315315
deployAction_.connect<SimpleAction::Activated>([this](InputContext *ic) {
316316
deploy();
@@ -322,7 +322,7 @@ RimeEngine::RimeEngine(Instance *instance)
322322
instance_->userInterfaceManager().registerAction("fcitx-rime-deploy",
323323
&deployAction_);
324324

325-
syncAction_.setIcon("fcitx-rime-sync");
325+
syncAction_.setIcon("fcitx_rime_sync");
326326
syncAction_.setShortText(_("Synchronize"));
327327

328328
syncAction_.connect<SimpleAction::Activated>([this](InputContext *ic) {
@@ -648,7 +648,7 @@ void RimeEngine::notify(RimeSessionId session, const std::string &messageType,
648648
int timeout = 3000;
649649
if (messageType == "deploy") {
650650
tipId = "fcitx-rime-deploy";
651-
icon = "fcitx-rime-deploy";
651+
icon = "fcitx_rime_deploy";
652652
if (messageValue == "start") {
653653
message = _("Rime is under maintenance. It may take a few "
654654
"seconds. Please wait until it is finished...");
@@ -735,9 +735,9 @@ std::string RimeEngine::subModeIconImpl(const InputMethodEntry &,
735735
if (state) {
736736
state->getStatus([&result](const RimeStatus &status) {
737737
if (status.is_disabled) {
738-
result = "fcitx-rime-disable";
738+
result = "fcitx_rime_disable";
739739
} else if (status.is_ascii_mode) {
740-
result = "fcitx-rime-latin";
740+
result = "fcitx_rime_latin";
741741
} else {
742742
result = "fcitx-rime";
743743
}

0 commit comments

Comments
 (0)