[uim] r6424 committed - * Merge r6153 from trunk.

[codesite-noreply]

Revision: 6424
Author: nogu.dev
Date: Sun Jun  6 06:53:28 2010
Log: * Merge r6153 from trunk.
http://code.google.com/p/uim/source/detail?r=6424
Modified:
 /branches/1.5/configure.ac
 /branches/1.5/qt4/toolbar/common-quimhelpertoolbar.cpp

=======================================
--- /branches/1.5/configure.ac  Thu May 27 19:03:07 2010
+++ /branches/1.5/configure.ac  Sun Jun  6 06:53:28 2010
@@ -1213,8 +1213,8 @@
     AC_SUBST(UIM_QT_LDFLAGS)
 fi

-AC_PATH_PROGS(KDE_CONFIG, [kde-config kde4-config], [no])
-if test "x$use_qt" = "xyes" || test "x$use_qt4" = "xyes"; then
+AC_PATH_PROG(KDE_CONFIG, [kde-config], [no])
+if test "x$use_qt" = "xyes"; then
     if test "x$KDE_CONFIG" != "xno"; then
        KDE_ICONDIR=`$KDE_CONFIG --expandvars --install icon`
     fi
@@ -1295,6 +1295,15 @@
     use_applet_kde4="no"
 fi
 AC_PATH_PROG(KDE4_CONFIG, [kde4-config], [no])
+if test "x$use_qt4" = "xyes"; then
+    if test "x$KDE4_CONFIG" != "xno"; then
+        KDE4_ICONDIR=`$KDE4_CONFIG --expandvars --install icon`
+    fi
+    if test -z "$KDE4_ICONDIR"; then
+        KDE4_ICONDIR="$prefix/share/icons"
+    fi
+    AC_DEFINE_UNQUOTED(KDE4_ICONDIR, "$KDE4_ICONDIR", [kde4 icon  
directory])
+fi
 if test "x$use_applet_kde4" = "xyes" && test "x$KDE4_CONFIG" = "xno"; then
     AC_MSG_WARN([no kde4-config found])
     use_applet_kde4="no"
=======================================
--- /branches/1.5/qt4/toolbar/common-quimhelpertoolbar.cpp	Sun Apr  4  
20:39:49 2010
+++ /branches/1.5/qt4/toolbar/common-quimhelpertoolbar.cpp	Sun Jun  6  
06:53:28 2010
@@ -46,7 +46,7 @@
 #include "qtgettext.h"

 static const QString ICONDIR = UIM_PIXMAPSDIR;
-static const QString ACTION_ICONDIR =  
KDE_ICONDIR "/crystalsvg/16x16/actions";
+static const QString ACTION_ICONDIR = KDE4_ICONDIR "/oxygen/16x16/actions";

 QUimHelperToolbar::QUimHelperToolbar( QWidget *parent, bool isApplet )
     : QFrame( parent )
@@ -64,10 +64,10 @@
     QPixmap swicon = QPixmap( ICONDIR + "/im_switcher.png" );
     QPixmap preficon = QPixmap( ACTION_ICONDIR + "/configure.png");
     QPixmap dicticon = QPixmap( ICONDIR + "/uim-dict.png");
-    QPixmap padicon = QPixmap( ACTION_ICONDIR + "/text_bold.png");
-    QPixmap handicon = QPixmap( ACTION_ICONDIR + "/edit.png");
-    QPixmap helpicon = QPixmap( ACTION_ICONDIR + "/help.png");
-    QPixmap exiticon = QPixmap( ACTION_ICONDIR + "/exit.png");
+    QPixmap padicon = QPixmap( ACTION_ICONDIR + "/format-text-bold.png");
+    QPixmap handicon = QPixmap( ACTION_ICONDIR + "/document-edit.png");
+    QPixmap helpicon = QPixmap( ACTION_ICONDIR + "/help-contents.png");
+    QPixmap exiticon = QPixmap( ACTION_ICONDIR + "/window-close.png");
     QImage swimage = swicon.toImage();
     QImage prefimage = preficon.toImage();
     QImage dictimage = dicticon.toImage();