theslinux-buildsystem branch uim-vi updated d6f888e New patch files 300* to clean up toolbar/systray
- From: git@xxxxxxxxxxxxxxxxxxxx
- To: theslinux-phantom@xxxxxxxxxxxxx
- Date: Sun, 18 Aug 2013 08:59:20 -0700
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "theslinux-buildsystem".
The branch, uim-vi has been updated
via d6f888efc2b0b4c25283356a552e3ef8970ee1d4 (commit)
from 957584ad78a75592cee1af5baa717923ee9543dc (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit d6f888efc2b0b4c25283356a552e3ef8970ee1d4
Author: Ky-Anh Huynh <kyanh@xxxxxxxxxxxxx>
Date: Sun Aug 18 22:57:02 2013 +0700
New patch files 300* to clean up toolbar/systray
The purpose is to remove the 2nd icon on the systray, that helps
to have a bigger/viewable systray icon, and to remove some unused
items from right menu (activated when user :right-click on systray)
-----------------------------------------------------------------------
Summary of changes:
...-some-Japanese-supports-from-toolbar.menu.patch | 57 +++++++++++++++++
uim-vi/3002-Remove-state-icon-on-systray.patch | 72 ++++++++++++++++++++++
uim-vi/PKGBUILD | 5 +-
3 files changed, 133 insertions(+), 1 deletion(-)
create mode 100644
uim-vi/3001-Remove-some-Japanese-supports-from-toolbar.menu.patch
create mode 100644 uim-vi/3002-Remove-state-icon-on-systray.patch
diff --git a/uim-vi/3001-Remove-some-Japanese-supports-from-toolbar.menu.patch
b/uim-vi/3001-Remove-some-Japanese-supports-from-toolbar.menu.patch
new file mode 100644
index 0000000..67e60b2
--- /dev/null
+++ b/uim-vi/3001-Remove-some-Japanese-supports-from-toolbar.menu.patch
@@ -0,0 +1,57 @@
+From 63a79a81097717f6bbb5e362aaf2839c2797f480 Mon Sep 17 00:00:00 2001
+From: Ky-Anh Huynh <kyanh@xxxxxxxxxxxxx>
+Date: Sun, 18 Aug 2013 22:04:21 +0700
+Subject: [PATCH 3001/3002] Remove some Japanese supports from :toolbar.menu
+
+They are:
+* Japanese dictionary editor
+* Handwriting input pad
+
+The configuration directives disable support for them, so they
+actually do not work when user select them from the menu.
+
+We use :UIM_VI_NO_CLEAN_UP to disable the items. To turn them
+on, you need to define that macro at the configuration time
+---
+ uim-vi/src/uim-1.8.5/gtk2/toolbar/common-gtk.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/uim-vi/src/uim-1.8.5/gtk2/toolbar/common-gtk.c
b/uim-vi/src/uim-1.8.5/gtk2/toolbar/common-gtk.c
+index 177bb3b..2d2a97f 100644
+--- a/uim-vi/src/uim-1.8.5/gtk2/toolbar/common-gtk.c
++++ b/uim-vi/src/uim-1.8.5/gtk2/toolbar/common-gtk.c
+@@ -109,6 +109,7 @@ static struct _CommandEntry command_entry[] = {
+ UIM_FALSE
+ },
+
++#ifdef UIM_VI_NO_CLEAN_UP
+ {
+ N_("Japanese dictionary editor"),
+ NULL,
+@@ -121,6 +122,7 @@ static struct _CommandEntry command_entry[] = {
+ "toolbar-show-dict-button?",
+ UIM_FALSE
+ },
++#endif
+
+ {
+ N_("Input pad"),
+@@ -135,6 +137,7 @@ static struct _CommandEntry command_entry[] = {
+ UIM_FALSE
+ },
+
++#ifdef UIM_VI_NO_CLEAN_UP
+ {
+ N_("Handwriting input pad"),
+ "H",
+@@ -147,6 +150,7 @@ static struct _CommandEntry command_entry[] = {
+ "toolbar-show-handwriting-input-pad-button?",
+ UIM_FALSE
+ },
++#endif
+
+ {
+ N_("Help"),
+--
+1.8.3
+
diff --git a/uim-vi/3002-Remove-state-icon-on-systray.patch
b/uim-vi/3002-Remove-state-icon-on-systray.patch
new file mode 100644
index 0000000..5ea873c
--- /dev/null
+++ b/uim-vi/3002-Remove-state-icon-on-systray.patch
@@ -0,0 +1,72 @@
+From cc1d56c1f4c63645f9682db6634c77e72b810f47 Mon Sep 17 00:00:00 2001
+From: Ky-Anh Huynh <kyanh@xxxxxxxxxxxxx>
+Date: Sun, 18 Aug 2013 22:46:54 +0700
+Subject: [PATCH 3002/3002] Remove :state icon on systray
+
+The systray has two groups (aka :branches) of icons on systray.
+One is to list all IMs, the other is to indicate the state of the
+current IM (on, off, or direct_input). There may be some other
+group but I do not know.
+
+Because we tell :uim to switch to :direct_input as an alternative
+of :toggle action, we do not really need a second icon to show
+the same thing. We just remove them, and this will make the icon
+bigger/viewable on the systray. The combination "^ Alt \" is
+still valid: it can be used to switch :telex <-> :vni. Note that
+some user option may make new feature buggy. Also note that we
+only test this feature on :Gtk2, but :Gtk3 should work, too.
+
+I spent my two days (sat & sun) to figure out how I can patch.
+I first thought there are some Gtk code that creates two groups.
+Unfortunately that is completely wrong. The :toolbar reads the
+instructions from :uim_fd (file descriptor that contains control
+messages), and parses the messages to create buttons and icons
+for the systray. See (helper_toolbar_prop_list_update). That
+is why you see lines that use (strcmp) to check if the current
+message/line wants to create a :branch (:group) or :leaf (icon)
+---
+ uim-vi/src/uim-1.8.5/gtk2/toolbar/common-gtk.c | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/uim-vi/src/uim-1.8.5/gtk2/toolbar/common-gtk.c
b/uim-vi/src/uim-1.8.5/gtk2/toolbar/common-gtk.c
+index 2d2a97f..30bdf7a 100644
+--- a/uim-vi/src/uim-1.8.5/gtk2/toolbar/common-gtk.c
++++ b/uim-vi/src/uim-1.8.5/gtk2/toolbar/common-gtk.c
+@@ -781,6 +781,10 @@ helper_toolbar_prop_list_update(GtkWidget *widget, gchar
**lines)
+ indication_id = cols[1];
+ iconic_label = safe_gettext(cols[2]);
+ tooltip_str = safe_gettext(cols[3]);
++ if (strcmp("direct_input", indication_id)
++ && strcmp("on", indication_id)
++ && strcmp("off", indication_id))
++ {
+ button = prop_button_create(widget,
+ indication_id, iconic_label, tooltip_str);
+ append_prop_button(widget, button);
+@@ -789,6 +793,7 @@ helper_toolbar_prop_list_update(GtkWidget *widget, gchar
**lines)
+ || g_str_has_suffix(indication_id, "_direct"))) {
+ is_hidden = TRUE;
+ }
++ }
+ } else if (!strcmp("leaf", cols[0]) && has_n_strs(cols, 7)) {
+ indication_id = cols[1];
+ iconic_label = safe_gettext(cols[2]);
+@@ -796,10 +801,15 @@ helper_toolbar_prop_list_update(GtkWidget *widget, gchar
**lines)
+ tooltip_str = safe_gettext(cols[4]);
+ action_id = cols[5];
+ is_selected = cols[6];
++ if (strcmp("direct_input", indication_id)
++ && strcmp("on", indication_id)
++ && strcmp("off", indication_id))
++ {
+ prop_button_append_menu(button,
+ indication_id, label, tooltip_str, action_id,
+ is_selected);
+ }
++ }
+ g_strfreev(cols);
+ }
+ }
+--
+1.8.3
+
diff --git a/uim-vi/PKGBUILD b/uim-vi/PKGBUILD
index 09f3b56..c2956eb 100644
--- a/uim-vi/PKGBUILD
+++ b/uim-vi/PKGBUILD
@@ -24,6 +24,8 @@ source=(
"1001-config.-to-set-default-mode-for-generic-IM.patch"
"2001-Hide-show-candidate-window-via-generic-option.patch"
"2002-m17nlib-now-requires-generic-custom.patch"
+ "3001-Remove-some-Japanese-supports-from-toolbar.menu.patch"
+ "3002-Remove-state-icon-on-systray.patch"
"http://uim.googlecode.com/files/uim-${pkgver}.tar.gz";
"https://raw.github.com/TheSLinux-forks/myquartz-scim2uim/v1.1.0/bin/scim2uim.awk";)
@@ -61,8 +63,9 @@ build() {
for _f_patch in ${srcdir}/000[1-5]*.patch \
${srcdir}/1001-*.patch \
${srcdir}/200[1-2]-*.patch \
+ ${srcdir}/300[1-2]-*.patch \
; do
- patch -Np4 < "$_f_patch"
+ patch -l -Np4 < "$_f_patch"
done
./autogen.sh
hooks/post-receive
--
theslinux-buildsystem
--
Purpose: Store commits, feeds from other projects
Post: mailto:theslinux-phantom@xxxxxxxxxxxxx
Archive, Gmane: http://theslinux.org/lists/phantom/
Subscribe: mailto:theslinux-phantom-request@xxxxxxxxxxxxx?Subject=subscribe
Unsubscribe: mailto:theslinux-phantom-request@xxxxxxxxxxxxx?Subject=unsubscribe
Other information: http://theslinux.org/lists (vi) or
http://theslinux.org/lists/en (en)
Support: mailto:theslinux-questions@xxxxxxxxxxxxx
Other related posts:
- » theslinux-buildsystem branch uim-vi updated d6f888e New patch files 300* to clean up toolbar/systray - git
