add nextSchemaOption

mokapsing · Apr 3, 2024 · ad15daf · ad15daf
1 parent 68fc613
commit ad15daf
Show file tree

Hide file tree

Showing 16 changed files with 106 additions and 14 deletions.
diff --git a/po/ca.po b/po/ca.po
@@ -60,10 +60,14 @@ msgstr ""
 msgid "Half Shape is enabled."
 msgstr ""
 
-#: src/rimestate.cpp:67 src/rimeengine.cpp:822
+#: src/rimestate.cpp:67 src/rimeengine.cpp:828
 msgid "Latin Mode"
 msgstr ""
 
+#: src/rimeengine.cpp:858
+msgid "Next Schema"
+msgstr ""
+
 #: src/rimeengine.h:77
 msgid "Load available plugins automatically"
 msgstr ""

diff --git a/po/da.po b/po/da.po
@@ -59,10 +59,14 @@ msgstr ""
 msgid "Half Shape is enabled."
 msgstr ""
 
-#: src/rimestate.cpp:67 src/rimeengine.cpp:822
+#: src/rimestate.cpp:67 src/rimeengine.cpp:828
 msgid "Latin Mode"
 msgstr "Latinsk tilstand"
 
+#: src/rimeengine.cpp:858
+msgid "Next Schema"
+msgstr ""
+
 #: src/rimeengine.h:77
 msgid "Load available plugins automatically"
 msgstr ""

diff --git a/po/de.po b/po/de.po
@@ -61,10 +61,14 @@ msgstr ""
 msgid "Half Shape is enabled."
 msgstr ""
 
-#: src/rimestate.cpp:67 src/rimeengine.cpp:822
+#: src/rimestate.cpp:67 src/rimeengine.cpp:828
 msgid "Latin Mode"
 msgstr "Lateinischer Modus"
 
+#: src/rimeengine.cpp:858
+msgid "Next Schema"
+msgstr ""
+
 #: src/rimeengine.h:77
 msgid "Load available plugins automatically"
 msgstr ""

diff --git a/po/fcitx5-rime.pot b/po/fcitx5-rime.pot
@@ -55,10 +55,14 @@ msgstr ""
 msgid "Half Shape is enabled."
 msgstr ""
 
-#: src/rimestate.cpp:67 src/rimeengine.cpp:822
+#: src/rimestate.cpp:67 src/rimeengine.cpp:828
 msgid "Latin Mode"
 msgstr ""
 
+#: src/rimeengine.cpp:858
+msgid "Next Schema"
+msgstr ""
+
 #: src/rimeengine.h:77
 msgid "Load available plugins automatically"
 msgstr ""

diff --git a/po/he.po b/po/he.po
@@ -65,6 +65,10 @@ msgstr ""
 msgid "Latin Mode"
 msgstr ""
 
+#: src/rimeengine.cpp:858
+msgid "Next Schema"
+msgstr ""
+
 #: src/rimeengine.h:78
 msgid "Load available plugins automatically"
 msgstr ""

diff --git a/po/ja.po b/po/ja.po
@@ -62,10 +62,14 @@ msgstr "全角は有効です。"
 msgid "Half Shape is enabled."
 msgstr "半角は有効です。"
 
-#: src/rimestate.cpp:67 src/rimeengine.cpp:822
+#: src/rimestate.cpp:67 src/rimeengine.cpp:828
 msgid "Latin Mode"
 msgstr "ラテンモード"
 
+#: src/rimeengine.cpp:858
+msgid "Next Schema"
+msgstr ""
+
 #: src/rimeengine.h:77
 msgid "Load available plugins automatically"
 msgstr "利用可能なプラグインを自動的にロードする"

diff --git a/po/ko.po b/po/ko.po
@@ -60,10 +60,14 @@ msgstr "전각이 활성화되었습니다."
 msgid "Half Shape is enabled."
 msgstr "반각이 활성화되었습니다."
 
-#: src/rimestate.cpp:67 src/rimeengine.cpp:822
+#: src/rimestate.cpp:67 src/rimeengine.cpp:828
 msgid "Latin Mode"
 msgstr "로마자 모드"
 
+#: src/rimeengine.cpp:858
+msgid "Next Schema"
+msgstr ""
+
 #: src/rimeengine.h:77
 msgid "Load available plugins automatically"
 msgstr "사용 가능한 플러그인 자동으로 불러오기"

diff --git a/po/ru.po b/po/ru.po
@@ -63,10 +63,14 @@ msgstr "Полноширинная форма включена."
 msgid "Half Shape is enabled."
 msgstr "Полуширинная форма включена."
 
-#: src/rimestate.cpp:67 src/rimeengine.cpp:822
+#: src/rimestate.cpp:67 src/rimeengine.cpp:828
 msgid "Latin Mode"
 msgstr "Режим Латиницы"
 
+#: src/rimeengine.cpp:858
+msgid "Next Schema"
+msgstr ""
+
 #: src/rimeengine.h:77
 msgid "Load available plugins automatically"
 msgstr "Автоматически загружать доступные плагины"

diff --git a/po/tr.po b/po/tr.po
@@ -60,10 +60,14 @@ msgstr ""
 msgid "Half Shape is enabled."
 msgstr ""
 
-#: src/rimestate.cpp:67 src/rimeengine.cpp:822
+#: src/rimestate.cpp:67 src/rimeengine.cpp:828
 msgid "Latin Mode"
 msgstr "Latin Modu"
 
+#: src/rimeengine.cpp:858
+msgid "Next Schema"
+msgstr ""
+
 #: src/rimeengine.h:77
 msgid "Load available plugins automatically"
 msgstr "Kullanılabilir eklentileri otomatikmen yükle"

diff --git a/po/vi.po b/po/vi.po
@@ -59,10 +59,14 @@ msgstr ""
 msgid "Half Shape is enabled."
 msgstr ""
 
-#: src/rimestate.cpp:67 src/rimeengine.cpp:822
+#: src/rimestate.cpp:67 src/rimeengine.cpp:828
 msgid "Latin Mode"
 msgstr ""
 
+#: src/rimeengine.cpp:858
+msgid "Next Schema"
+msgstr ""
+
 #: src/rimeengine.h:77
 msgid "Load available plugins automatically"
 msgstr ""

diff --git a/po/zh_CN.po b/po/zh_CN.po
@@ -61,10 +61,14 @@ msgstr "已启用全角字符。 "
 msgid "Half Shape is enabled."
 msgstr "已启用半角字符。"
 
-#: src/rimestate.cpp:67 src/rimeengine.cpp:822
+#: src/rimestate.cpp:67 src/rimeengine.cpp:828
 msgid "Latin Mode"
 msgstr "英文模式"
 
+#: src/rimeengine.cpp:858
+msgid "Next Schema"
+msgstr "下一个方案"
+
 #: src/rimeengine.h:77
 msgid "Load available plugins automatically"
 msgstr "自动加载可用插件"

diff --git a/po/zh_TW.po b/po/zh_TW.po
@@ -65,10 +65,14 @@ msgstr "已啟用全形字符。"
 msgid "Half Shape is enabled."
 msgstr "已啟用半形字符。"
 
-#: src/rimestate.cpp:67 src/rimeengine.cpp:822
+#: src/rimestate.cpp:67 src/rimeengine.cpp:828
 msgid "Latin Mode"
 msgstr "羅馬拼音模式"
 
+#: src/rimeengine.cpp:858
+msgid "Next Schema"
+msgstr "下一个方案"
+
 #: src/rimeengine.h:77
 msgid "Load available plugins automatically"
 msgstr "自動載入可用插件"

diff --git a/src/rimeengine.cpp b/src/rimeengine.cpp
@@ -849,9 +849,22 @@ void RimeEngine::updateSchemaMenu() {
             instance_->userInterfaceManager().registerAction(&schemaAction);
             schemaMenu_.insertAction(&separatorAction_, &schemaAction);
             updateActionsForSchema(schemaId);
-            schemas_.insert(schemaId);
+            schemas_.push_back(schemaId);
         }
         api_->free_schema_list(&list);
+
+        schemActions_.emplace_back();
+        auto &schemaAction = schemActions_.back();
+        schemaAction.setShortText(_("Next Schema"));
+        schemaAction.connect<SimpleAction::Activated>(
+            [this](InputContext *ic) {
+                auto state = ic->propertyFor(&factory_);
+                blockNotificationFor(30000);
+                state->switchNextSchema();
+                imAction_->update(ic);
+            });
+        instance_->userInterfaceManager().registerAction(&schemaAction);
+        schemaMenu_.insertAction(&separatorAction_, &schemaAction);
     }
 }
 

diff --git a/src/rimeengine.h b/src/rimeengine.h
@@ -184,7 +184,7 @@ class RimeEngine final : public InputMethodEngineV2 {
 
     FCITX_ADDON_DEPENDENCY_LOADER(notifications, instance_->addonManager());
 
-    std::unordered_set<std::string> schemas_;
+    std::vector<std::string> schemas_;
     std::list<SimpleAction> schemActions_;
     std::unordered_map<std::string,
                        std::list<std::unique_ptr<RimeOptionAction>>>

diff --git a/src/rimestate.cpp b/src/rimestate.cpp
@@ -120,6 +120,36 @@ void RimeState::selectSchema(const std::string &schema) {
     api->select_schema(session(), schema.data());
 }
 
+void RimeState::switchNextSchema() {
+    std::string currentSchemaId;
+    std::string targetSchemaId;
+    const auto& schemas = engine_->schemas();
+    auto api = engine_->api();
+    if (api->is_maintenance_mode()) {
+        return;
+    }
+    getStatus([&currentSchemaId](const RimeStatus &status) {
+        currentSchemaId = status.schema_id ? status.schema_id : "";
+    });
+    if (currentSchemaId.empty()) {
+        return;
+    }
+    targetSchemaId = *schemas.begin();
+    if (!schemas.empty()) {
+        auto it = std::find(schemas.begin(), schemas.end(), currentSchemaId);
+	if (it != schemas.end() && std::next(it) != schemas.end()) {
+            targetSchemaId = *std::next(it);
+        }
+    }
+    if (targetSchemaId.empty()) {
+        return;
+    }
+    engine_->blockNotificationFor(30000);
+    api->set_option(session(), RIME_ASCII_MODE, false);
+    api->select_schema(session(), targetSchemaId.data());
+    return;
+}
+
 void RimeState::keyEvent(KeyEvent &event) {
     auto api = engine_->api();
     if (api->is_maintenance_mode()) {
@@ -388,7 +418,7 @@ void RimeState::restore() {
     if (savedCurrentSchema_.empty()) {
         return;
     }
-    if (!engine_->schemas().count(savedCurrentSchema_)) {
+    if (!std::count(engine_->schemas().begin(), engine_->schemas().end(), savedCurrentSchema_)) {
         return;
     }
 

diff --git a/src/rimestate.h b/src/rimestate.h
@@ -39,6 +39,7 @@ class RimeState : public InputContextProperty {
     std::string subModeLabel();
     void toggleLatinMode();
     void setLatinMode(bool latin);
+    void switchNextSchema();
     void selectSchema(const std::string &schemaId);
     RimeSessionId session(bool requestNewSession = true);