Commit: fd4e4aa4fc5a2b2b5f965fca4e2ddd7d4e9b09cb - uim (git)

A multilingual input method framework

Commit MetaInfo

• Revisão: fd4e4aa4fc5a2b2b5f965fca4e2ddd7d4e9b09cb (tree)
• Hora: 2014-04-19 16:54:22
• Autor: shitamo <shitamo@user...>
• Commiter: shitamo

Mensagem de Log

toolbar
configurable command

Mudança Sumário

• modified: gtk2/toolbar/common-gtk.c

Diff

--- a/gtk2/toolbar/common-gtk.c
+++ b/gtk2/toolbar/common-gtk.c
@@ -76,8 +76,9 @@ struct _CommandEntry {
   const gchar *desc;
   const gchar *label;
   const gchar *icon;
-  const gchar *command;
+  gchar *command;
   const gchar *custom_button_show_symbol;
+  const gchar *custom_button_command_symbol;
   uim_bool show_button;
 };
 
@@ -93,6 +94,7 @@ static struct _CommandEntry command_entry[] = {
     "uim-im-switcher-gtk",
 #endif
     "toolbar-show-switcher-button?",
+    NULL,
     UIM_FALSE
   },
 
@@ -106,6 +108,7 @@ static struct _CommandEntry command_entry[] = {
     "uim-pref-gtk",
 #endif
     "toolbar-show-pref-button?",
+    "toolbar-pref-command",
     UIM_FALSE
   },
 
@@ -119,6 +122,7 @@ static struct _CommandEntry command_entry[] = {
     "uim-dict-gtk",
 #endif
     "toolbar-show-dict-button?",
+    "toolbar-dict-command",
     UIM_FALSE
   },
 
@@ -132,6 +136,7 @@ static struct _CommandEntry command_entry[] = {
     "uim-input-pad-ja",
 #endif
     "toolbar-show-input-pad-button?",
+    "toolbar-input-pad-command",
     UIM_FALSE
   },
 
@@ -145,6 +150,7 @@ static struct _CommandEntry command_entry[] = {
 #endif
     "uim-tomoe-gtk",
     "toolbar-show-handwriting-input-pad-button?",
+    "toolbar-handwriting-input-pad-command",
     UIM_FALSE
   },
 
@@ -154,6 +160,7 @@ static struct _CommandEntry command_entry[] = {
     GTK_STOCK_HELP,
     "uim-help",
     "toolbar-show-help-button?",
+    "toolbar-help-command",
     UIM_FALSE
   }
 };
@@ -912,9 +919,16 @@ helper_toolbar_check_custom()
 {
   guint i;
 
-  for (i = 0; i < command_entry_len; i++)
+  for (i = 0; i < command_entry_len; i++) {
     command_entry[i].show_button =
       uim_scm_symbol_value_bool(command_entry[i].custom_button_show_symbol);
+    if (command_entry[i].custom_button_command_symbol) {
+      if (uim_scm_symbol_value_str(command_entry[i].custom_button_command_symbol)) {
+        command_entry[i].command = 
+          uim_scm_symbol_value_str(command_entry[i].custom_button_command_symbol);
+      }
+    }
+  }
 
   with_dark_bg =
     uim_scm_symbol_value_bool("toolbar-icon-for-dark-background?");