uim

Fork

- add define-custom

toolbar
configurable command

Merge pull request #38 from rakuco/locale-include-qt4

qt4 immodule: Add missing <clocale> include

qt4 immodule: Add missing <clocale> include.

* qt4/immodule/plugin.cpp
- Stop relying on implicit includes that may not always work and
explicitly include <clocale> for the setlocale(3) call.

Set explicit left and right paddings of toolbar buttons.

* gtk2/toolbar/common-gtk.c
- (set_button_style): Set padding-left and padding-right
value. Add gint type argument.
- (button_create): Call set_button_style() for every toolbar.

Merge branch 'master' of github.com:uim/uim

Merge pull request #35 from e-kato/master

Add a workaround for gtk+ >= 3.7.8.

* Also cope with GTK+ 3.10.6.

* gtk2/immodule/uim-cand-win-gtk.c
- (uim_cand_win_gtk_layout) : Call
gtk_widget_queue_resize_no_redraw() after moving the window.
* gtk2/candwin/gtk.c
- (candwin_show_page) : Change calling
gtk_widget_queue_resize_no_redraw() there
- (uim_cand_win_gtk_layout) : from here.

* Use gtk_widget_queue_resize_no_redraw() instead.
* gtk2/candwin/gtk.c
* gtk2/immodule/uim-cand-win-gtk.c
- (uim_cand_win_gtk_layout) : Use
gtk_widget_queue_resize_no_redraw().

Add check for GtkTreeView.
* gtk2/immodule/uim-cand-win-gtk.c
- (uim_cand_win_gtk_layout) : Only call gtk_widget_queue_resize()
for GtkTreeView.

Add the workaround into uim-candwin-gtk3 too.
* gtk2/candwin/gtk.c
- (uim_cand_win_gtk_layout) : Explicitly call
gtk_widget_queue_resize() for cwin->view for recent GTK+3.

Add a workaround for gtk+ >= 3.7.8.

* gtk2/immodule/uim-cand-win-gtk.c
- (uim_cand_win_gtk_layout) : Explicitly call
gtk_widget_queue_resize() for cwin->view for recent GTK+3.

Fix a bug in byeoru menu

* scm/byeoru.scm
- call (byeoru-deactivate-candidate-selector) instead of
(im-deactivate-candidate-selector) so that
byeoru-context-cand-no and byeoru-context-menu-no are preserved

Make a minor change in byeoru.scm

* scm/byeoru.scm
- (byeoru-select-menu-or-symbol): a minor clean-up

Use gtk_widget_queue_draw() to redraw buttons.

* gtk2/candwin/horizontal-gtk.c
- (button_clicked, uim_cand_win_gtk_set_index):
Use gtk_widget_queue_draw() for redraw buttons instead of
gtk_widget_unmap() and gtk_widget_map()
because gtk_widget_unmap() and gtk_widget_map() are
only for use in widget implementations
and we can avoid warnings in GTK+3.
* gtk2/immodule/uim-cand-win-horizontal-gtk.c
- (button_clicked, uim_cand_win_horizontal_gtk_set_index):
Ditto.

Use GtkGrid instead of deprecated GtkTable.

* gtk2/candwin/horizontal-gtk.c
- (candidate_window_init, assign_cellbutton, update_table_button,
uim_cand_win_gtk_set_page, show_table):
Use GtkGrid instead of GtkTable.
* gtk2/immodule/uim-cand-win-horizontal-gtk.c
- (uim_cand_win_horizontal_gtk_init, assign_cellbutton
update_table_button, uim_cand_win_horizontal_gtk_set_page,
show_table):
Ditto.

Check the page number before freeing.

* fep/callbacks.c
- (make_page_strs): Check the page number before freeing the page string.

Remove duplicate code in common-gtk.c

* gtk2/toolbar/common-gtk.c
- (button_create): New function.
- (prop_button_create): Call button_create().
- (toolbar_new): Ditto.

Don't set GTK+ variables when GTK+ is disabled.

* configure.ac
- Don't set GTK_BINARY_VERSION GTK_LIBDIR
when GTK+2 feature is disabled.
- Don't set GTK3_BINARY_VERSION GTK3_LIBDIR
when GTK+3 feature is disabled.

Avoid build errors on Qt4 and Qt5.

* configure.ac
- Create Makefile.qmake after ${ac_abs_top_builddir} is set.

Fix indents in configure.ac.

* configure.ac
- Fix indents.

Fix indents in configure.ac.

* configure.ac
- Fix indents.

Rename variables.

* configure.ac
- Rename from APPLET_GNOME to GNOME_APPLET.
- Rename from APPLET_GNOME3 to GNOME3_APPLET.
- Rename from APPLET_KDE to KDE_APPLET.
- Rename from APPLET_KDE4 to KDE4_APPLET.
* gtk2/toolbar/Makefile.am
- Rename from APPLET_GNOME to GNOME_APPLET.
* gtk3/toolbar/Makefile.am
- Rename from APPLET_GNOME3 to GNOME3_APPLET.
* qt3/toolbar/Makefile.am
- Rename from APPLET_KDE to KDE_APPLET.
* qt4/toolbar/Makefile.am
- Rename from APPLET_KDE4 to KDE4_APPLET.

Fix a warning on KDE4 Plasma widget.

* qt4/toolbar/common-uimstateindicator.cpp
- (UimStateIndicator::propListUpdate):
Don't define display_time when PLASMA_APPLET_UIM is defined.

Refactor configure.ac.

* configure.ac
- Refactor.

Expand tabs to spaces in configure.ac.

* configure.ac
- Expand tabs to spaces.

Change ./configure help texts.

* configure.ac
- change help texts.

Refactor configure.ac

* configure.ac
- Refactor.
- Enable KDE4 plasma widget uim by default.

Use correct names.

* configure.ac
- Use correct names.

Close socket after uim-skk requests disconnection.

* uim/skk.c
- (close_skkserv): Close a socket after uim-skk requests
skkserv to disconnect (issue #32).