2.0.0

Update version

Update install script

Update icon name

README.md

@@ -125,9 +125,9 @@ if you use X it could be done in .xprofile
 
 kime install several .desktop file that you can run
 
-| `kime-xim` | `kime-wayland` | `kime-window` |
+| `kime-xim` | `kime-wayland` | `kime-indicator` |
 |------------|----------------|---------------|
-| for xim    | for wayland    | for hanja, emoji, indicator |
+| for xim    | for wayland    | for tray icon |
 
 if you use DE consider add these servers as your start application
 

docs/CHANGELOG.md

@@ -4,6 +4,12 @@
 
 ### Breaking
 
+### Improve
+
+## 2.0.0
+
+### Breaking
+
 * Include english layouts [#347](https://github.com/Riey/kime/issues/347)
 * Now change InputCategory clear preedit state
 * Let select hanja, emoji in preedit string

res/kime-indicator.desktop

@@ -0,0 +1,10 @@
+[Desktop Entry]
+Exec=/usr/bin/kime-indicator
+Name=kime indicator server
+Name[ko]=kime indicator 서버
+Comment=Start kime indicator server
+Type=Application
+Terminal=false
+StartupNotify=true
+NoDisplay=true
+Icon=kime-han-black

res/kime-wayland.desktop

@@ -7,4 +7,4 @@ Type=Application
 Terminal=false
 StartupNotify=true
 NoDisplay=true
-Icon=/usr/share/kime/icons/kime-han-black-64x64.png
+Icon=kime-han-black

res/kime-xim.desktop

@@ -7,4 +7,4 @@ Type=Application
 Terminal=false
 StartupNotify=true
 NoDisplay=true
-Icon=/usr/share/kime/icons/kime-han-black-64x64.png
+Icon=kime-han-black

scripts/control.in

@@ -6,4 +6,3 @@ Homepage: https://github.com/Riey/kime
 Section: utils
 Priority: optional
 Architecture: %ARCH%
-Depends: libcairo2, libxcb1

scripts/install.sh

@@ -25,8 +25,8 @@ if [ -z "$KIME_CONFIG_DIR" ]; then
     KIME_CONFIG_DIR=etc/xdg/kime
 fi
 
-if [ -z "$KIME_DATA_DIR" ]; then
-    KIME_DATA_DIR=usr/share/kime
+if [ -z "$KIME_ICON_DIR" ]; then
+    KIME_ICON_DIR=usr/share/icons
 fi
 
 if [ -z "$KIME_APP_DIR" ]; then
@@ -81,7 +81,7 @@ fi
 
 install -Dm644 $KIME_OUT/default_config.yaml -T "$PREFIX/$KIME_CONFIG_DIR/config.yaml"
 install -Dm644 $KIME_OUT/*.desktop -t "$PREFIX/$KIME_APP_DIR"
-install -Dm644 $KIME_OUT/icons/* -t "$PREFIX/$KIME_DATA_DIR/icons"
+install -Dm644 $KIME_OUT/icons/64x64/*.png -t "$PREFIX/$KIME_ICON_DIR/hicolor/64x64/apps"
 install -Dm755 $KIME_OUT/libkime_engine.so -t "$PREFIX/$KIME_LIB_DIR"
 
 install_if libkime-gtk2.so 755 -T "$KIME_GTK2_DIR/im-kime.so"

src/CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.13.0)
 
-project(kime VERSION 1.3.1)
+project(kime VERSION 2.0.0)
 
 option(USE_SYSTEM_ENGINE "Use system engine file" OFF)
 option(ENABLE_GTK2 "Enable GTK2 immodule" OFF)

src/engine/core/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "kime-engine-core"
-version = "1.0.0"
+version = "2.0.0"
 authors = ["Riey <[email protected]>"]
 edition = "2018"
 license = "GPL-3.0"

src/tools/indicator/src/main.rs

@@ -49,7 +49,7 @@ impl ksni::Tray for KimeTray {
 impl KimeTray {
     pub fn new() -> Self {
         Self {
-            icon_name: "kime-eng-black",
+            icon_name: "kime-latin-black",
         }
     }
     pub fn update_with_bytes(&mut self, bytes: &[u8]) {
@@ -75,12 +75,12 @@ impl KimeTray {
 
         self.icon_name = match category {
             InputCategory::Latin => match color {
-                IconColor::Black => "kime-eng-black",
-                IconColor::White => "kime-eng-white",
+                IconColor::Black => "kime-latin-black",
+                IconColor::White => "kime-latin-white",
             },
             InputCategory::Hangul => match color {
-                IconColor::Black => "kime-han-black",
-                IconColor::White => "kime-han-white",
+                IconColor::Black => "kime-hangul-black",
+                IconColor::White => "kime-hangul-white",
             },
         }
     }
@@ -91,7 +91,7 @@ fn indicator_server(file_path: &Path) -> Result<()> {
     let handle = service.handle();
     service.spawn();
 
-    std::fs::remove_file(file_path)?;
+    std::fs::remove_file(file_path).ok();
 
     let listener = UnixListener::bind(file_path)?;