Revision: 6699
Author: ek.kato
Date: Sun Aug 8 21:09:35 2010
Log: * Merge r6689:6698 from trunk.
http://code.google.com/p/uim/source/detail?r=6699
Modified:
/branches/1.6
/branches/1.6/NEWS
/branches/1.6/doc/COMPATIBILITY
/branches/1.6/po/fr.po
/branches/1.6/po/ja.po
/branches/1.6/po/ko.po
/branches/1.6/qt4/candwin/uim-candwin-qt4.pro.in
/branches/1.6/qt4/chardict/bushuviewwidget.cpp
/branches/1.6/qt4/chardict/bushuviewwidget.h
/branches/1.6/qt4/chardict/chargridview.cpp
/branches/1.6/qt4/chardict/chargridview.h
/branches/1.6/qt4/chardict/qt4.cpp
/branches/1.6/qt4/chardict/qt4.h
/branches/1.6/qt4/chardict/uim-chardict-qt4.pro.in
/branches/1.6/qt4/chardict/unicodeviewwidget.cpp
/branches/1.6/qt4/chardict/unicodeviewwidget.h
/branches/1.6/qt4/edittest/edittest.pro
/branches/1.6/qt4/immodule/quiminputcontextplugin.pro.in
/branches/1.6/qt4/pref/keyeditformbase.ui
/branches/1.6/qt4/pref/olisteditformbase.ui
/branches/1.6/qt4/pref/qt4.cpp
/branches/1.6/qt4/pref/uim-pref-qt4.pro.in
/branches/1.6/qt4/switcher/uim-im-switcher-qt4.pro.in
/branches/1.6/qt4/toolbar/uim-toolbar-qt4.pro.in
=======================================
--- /branches/1.6/NEWS Wed Aug 4 08:30:24 2010
+++ /branches/1.6/NEWS Sun Aug 8 21:09:35 2010
@@ -1,3 +1,16 @@
+Overview of changes from 1.6.0-beta to 1.6.0
+============================================
+* Fixes
+ - Fix potential duplication of items in enabled-im-list
+
+ - uim-chardict-qt4
+ * Fix font settings
+
+* Others
+ - Qt4 bridge and tools
+ * Don't strip binaries
+
+
Overview of changes from 1.6.0-alpha to 1.6.0-beta
==================================================
* Fixes
=======================================
--- /branches/1.6/doc/COMPATIBILITY Tue Jul 27 22:15:26 2010
+++ /branches/1.6/doc/COMPATIBILITY Sun Aug 8 21:09:35 2010
@@ -69,7 +69,7 @@
Changes:
(changed) make-scm-pathname
Description:
- Change the return type as list for supporting multiple paths.
+ Change the return type as a list to support multiple paths.
------------------------------------------------------------------------------
Summary: New custom API to save custom variable.
Affects: Helper program developers
=======================================
--- /branches/1.6/po/fr.po Thu Aug 5 07:04:47 2010
+++ /branches/1.6/po/fr.po Sun Aug 8 21:09:35 2010
@@ -665,7 +665,7 @@
msgstr ""
#: ../qt4/pref/ui_keyeditformbase.h:113
-msgid "KeyEditDialog"
+msgid "Edit Keys"
msgstr ""
#: ../qt4/pref/ui_keyeditformbase.h:115
@@ -677,7 +677,7 @@
msgstr ""
#: ../qt4/pref/ui_olisteditformbase.h:108
-msgid "OListEditBase"
+msgid "Edit Ordered List"
msgstr ""
#: ../qt4/pref/ui_olisteditformbase.h:110
=======================================
--- /branches/1.6/po/ja.po Thu Aug 5 07:04:47 2010
+++ /branches/1.6/po/ja.po Sun Aug 8 21:09:35 2010
@@ -771,8 +771,8 @@
msgstr "起動時にこのダイアログを表示"
#: ../qt4/pref/ui_keyeditformbase.h:113
-msgid "KeyEditDialog"
-msgstr "キー編集ダイアログ"
+msgid "Edit Keys"
+msgstr "キーを編集"
#: ../qt4/pref/ui_keyeditformbase.h:115
msgid "Key Combination"
@@ -783,8 +783,8 @@
msgstr "削除"
#: ../qt4/pref/ui_olisteditformbase.h:108
-msgid "OListEditBase"
-msgstr "順序付きリスト編集"
+msgid "Edit Ordered List"
+msgstr "順序付きリストを編集"
#: ../qt4/pref/ui_olisteditformbase.h:110
msgid "Available Items"
=======================================
--- /branches/1.6/po/ko.po Thu Aug 5 07:04:47 2010
+++ /branches/1.6/po/ko.po Sun Aug 8 21:09:35 2010
@@ -676,7 +676,7 @@
msgstr "시작할 때 이 대화창을 표시"
#: ../qt4/pref/ui_keyeditformbase.h:113
-msgid "KeyEditDialog"
+msgid "Edit Keys"
msgstr ""
#: ../qt4/pref/ui_keyeditformbase.h:115
@@ -688,7 +688,7 @@
msgstr ""
#: ../qt4/pref/ui_olisteditformbase.h:108
-msgid "OListEditBase"
+msgid "Edit Ordered List"
msgstr ""
#: ../qt4/pref/ui_olisteditformbase.h:110
=======================================
--- /branches/1.6/qt4/candwin/uim-candwin-qt4.pro.in Tue Mar 2 23:14:47
2010
+++ /branches/1.6/qt4/candwin/uim-candwin-qt4.pro.in Sun Aug 8 21:09:35
2010
@@ -10,11 +10,15 @@
QMAKE_LIBDIR += @abs_top_builddir@/replace/.libs
LIBS += -lreplace -luim -luim-scm -luim-x-util @LIBINTL@
+QMAKE_CC = @CC@
QMAKE_CFLAGS_DEBUG += @CFLAGS@ @X_CFLAGS@
QMAKE_CFLAGS_RELEASE += @CFLAGS@ @X_CFLAGS@
+QMAKE_CXX = @CXX@
QMAKE_CXXFLAGS_DEBUG += @CXXFLAGS@ @X_CFLAGS@
QMAKE_CXXFLAGS_RELEASE += @CXXFLAGS@ @X_CFLAGS@
+QMAKE_STRIP =
+
# Input
HEADERS += @srcdir@/qt4.h
SOURCES += @srcdir@/qt4.cpp
=======================================
--- /branches/1.6/qt4/chardict/bushuviewwidget.cpp Sun Apr 4 20:35:54 2010
+++ /branches/1.6/qt4/chardict/bushuviewwidget.cpp Sun Aug 8 21:09:35 2010
@@ -175,7 +175,7 @@
}
}
-void BushuViewWidget::setFont( const QFont &font )
-{
- m_charGridView->setFont( font );
-}
+void BushuViewWidget::setCharFont( const QFont &font )
+{
+ m_charGridView->setCharFont( font );
+}
=======================================
--- /branches/1.6/qt4/chardict/bushuviewwidget.h Sun Apr 4 20:35:54 2010
+++ /branches/1.6/qt4/chardict/bushuviewwidget.h Sun Aug 8 21:09:35 2010
@@ -51,7 +51,7 @@
explicit BushuViewWidget( QWidget *parent = 0 );
~BushuViewWidget();
- void setFont( const QFont &font );
+ void setCharFont( const QFont &font );
protected:
void setupWidgets();
=======================================
--- /branches/1.6/qt4/chardict/chargridview.cpp Sun Apr 4 20:35:54 2010
+++ /branches/1.6/qt4/chardict/chargridview.cpp Sun Aug 8 21:09:35 2010
@@ -94,8 +94,9 @@
rowCount() * verticalHeader()->sectionSize( 0 ) );
}
-void CharGridView::setFont( const QFont &font )
-{
+void CharGridView::setCharFont( const QFont &font )
+{
+ setFont( font );
for ( int i = 0; i < rowCount(); i++)
{
for ( int j = 0; j < columnCount(); j++)
=======================================
--- /branches/1.6/qt4/chardict/chargridview.h Sun Apr 4 20:35:54 2010
+++ /branches/1.6/qt4/chardict/chargridview.h Sun Aug 8 21:09:35 2010
@@ -51,7 +51,7 @@
void setCharacters( const QStringList &charList );
virtual QSize sizeHint() const;
- void setFont( const QFont &font );
+ void setCharFont( const QFont &font );
protected:
virtual void resizeEvent( QResizeEvent * e );
=======================================
--- /branches/1.6/qt4/chardict/qt4.cpp Sun Jul 18 07:24:37 2010
+++ /branches/1.6/qt4/chardict/qt4.cpp Sun Aug 8 21:09:35 2010
@@ -73,6 +73,9 @@
QApplication a( argc, argv );
+ QCoreApplication::setOrganizationName( "uim" );
+ QCoreApplication::setApplicationName( "uim" );
+
KUimCharDict::Mode m = KUimCharDict::UNKNOWN;
for ( int i = 0; i < argc; i++ )
{
@@ -219,9 +222,9 @@
// button
m_fontselButton->setFont( font );
// bushu
- m_bushuView->setFont( font );
+ m_bushuView->setCharFont( font );
// unicode
- m_unicodeView->setFont( font );
+ m_unicodeView->setCharFont( font );
}
=======================================
--- /branches/1.6/qt4/chardict/qt4.h Sun Apr 4 20:35:54 2010
+++ /branches/1.6/qt4/chardict/qt4.h Sun Aug 8 21:09:35 2010
@@ -92,7 +92,7 @@
explicit CharDictViewBase( QWidget *parent = 0 )
: QWidget( parent ) {}
- virtual void setFont( const QFont &font ) = 0;
+ virtual void setCharFont( const QFont &font ) = 0;
signals:
void charSelected( const QString & );
=======================================
--- /branches/1.6/qt4/chardict/uim-chardict-qt4.pro.in Thu May 6 05:07:13
2010
+++ /branches/1.6/qt4/chardict/uim-chardict-qt4.pro.in Sun Aug 8 21:09:35
2010
@@ -10,11 +10,15 @@
QMAKE_LIBDIR += @abs_top_builddir@/replace/.libs
LIBS += -lreplace -luim -luim-scm -luim-x-util @LIBINTL@ @X11_LIBS@
+QMAKE_CC = @CC@
QMAKE_CFLAGS_DEBUG += @CFLAGS@ @X_CFLAGS@
QMAKE_CFLAGS_RELEASE += @CFLAGS@ @X_CFLAGS@
+QMAKE_CXX = @CXX@
QMAKE_CXXFLAGS_DEBUG += @CXXFLAGS@ @X_CFLAGS@
QMAKE_CXXFLAGS_RELEASE += @CXXFLAGS@ @X_CFLAGS@
+QMAKE_STRIP =
+
# Input
HEADERS += @srcdir@/bushuviewwidget.h \
@srcdir@/chargridview.h \
=======================================
--- /branches/1.6/qt4/chardict/unicodeviewwidget.cpp Sun Apr 4 20:35:54
2010
+++ /branches/1.6/qt4/chardict/unicodeviewwidget.cpp Sun Aug 8 21:09:35
2010
@@ -288,7 +288,7 @@
}
}
-void UnicodeViewWidget::setFont( const QFont &font )
-{
- m_charGridView->setFont( font );
-}
+void UnicodeViewWidget::setCharFont( const QFont &font )
+{
+ m_charGridView->setCharFont( font );
+}
=======================================
--- /branches/1.6/qt4/chardict/unicodeviewwidget.h Sun Apr 4 20:35:54 2010
+++ /branches/1.6/qt4/chardict/unicodeviewwidget.h Sun Aug 8 21:09:35 2010
@@ -53,7 +53,7 @@
explicit UnicodeViewWidget( QWidget *parent = 0 );
~UnicodeViewWidget();
- void setFont( const QFont &font );
+ void setCharFont( const QFont &font );
protected:
void setupWidgets();
=======================================
--- /branches/1.6/qt4/edittest/edittest.pro Thu Feb 25 14:55:44 2010
+++ /branches/1.6/qt4/edittest/edittest.pro Sun Aug 8 21:09:35 2010
@@ -8,5 +8,7 @@
INCLUDEPATH += .
CONFIG += qt warn_on debug
+QMAKE_STRIP =
+
# Input
SOURCES += main.cpp
=======================================
--- /branches/1.6/qt4/immodule/quiminputcontextplugin.pro.in Sun Jun 20
00:04:31 2010
+++ /branches/1.6/qt4/immodule/quiminputcontextplugin.pro.in Sun Aug 8
21:09:35 2010
@@ -16,11 +16,14 @@
QMAKE_LIBDIR += @abs_top_builddir@/uim/.libs
LIBS += -lreplace -luim -luim-scm -luim-x-util @X11_LIBS@
+QMAKE_CC = @CC@
QMAKE_CFLAGS_DEBUG += @CFLAGS@ @X_CFLAGS@
QMAKE_CFLAGS_RELEASE += @CFLAGS@ @X_CFLAGS@
+QMAKE_CXX = @CXX@
QMAKE_CXXFLAGS_DEBUG += @CXXFLAGS@ @X_CFLAGS@
QMAKE_CXXFLAGS_RELEASE += @CXXFLAGS@ @X_CFLAGS@
+QMAKE_STRIP =
# Input
HEADERS += @srcdir@/abstractcandidatewindow.h \
=======================================
--- /branches/1.6/qt4/pref/keyeditformbase.ui Fri Jul 23 17:12:33 2010
+++ /branches/1.6/qt4/pref/keyeditformbase.ui Sun Aug 8 21:09:35 2010
@@ -25,7 +25,7 @@
</sizepolicy>
</property>
<property name="windowTitle">
- <string>KeyEditDialog</string>
+ <string>Edit Keys</string>
</property>
<layout class="QGridLayout">
<item row="0" column="0">
=======================================
--- /branches/1.6/qt4/pref/olisteditformbase.ui Fri Jul 23 17:12:33 2010
+++ /branches/1.6/qt4/pref/olisteditformbase.ui Sun Aug 8 21:09:35 2010
@@ -25,7 +25,7 @@
</sizepolicy>
</property>
<property name="windowTitle">
- <string>OListEditBase</string>
+ <string>Edit Ordered List</string>
</property>
<layout class="QGridLayout">
<item row="0" column="0">
=======================================
--- /branches/1.6/qt4/pref/qt4.cpp Sun Apr 4 20:35:54 2010
+++ /branches/1.6/qt4/pref/qt4.cpp Sun Aug 8 21:09:35 2010
@@ -703,6 +703,9 @@
QApplication a( argc, argv );
+ QCoreApplication::setOrganizationName( "uim" );
+ QCoreApplication::setApplicationName( "uim" );
+
UimPrefDialog *dlg = new UimPrefDialog();
dlg->resize( DEFAULT_WINDOW_WIDTH, DEFAULT_WINDOW_HEIGHT );
dlg->show();
=======================================
--- /branches/1.6/qt4/pref/uim-pref-qt4.pro.in Sun Aug 1 17:30:14 2010
+++ /branches/1.6/qt4/pref/uim-pref-qt4.pro.in Sun Aug 8 21:09:35 2010
@@ -10,11 +10,14 @@
QMAKE_LIBDIR += @abs_top_builddir@/replace/.libs
LIBS += -lreplace -luim -luim-scm -luim-x-util -luim-custom
-luim-counted-init @LIBINTL@
+QMAKE_CC = @CC@
QMAKE_CFLAGS_DEBUG += @CFLAGS@ @X_CFLAGS@
QMAKE_CFLAGS_RELEASE += @CFLAGS@ @X_CFLAGS@
+QMAKE_CXX = @CXX@
QMAKE_CXXFLAGS_DEBUG += @CXXFLAGS@ @X_CFLAGS@
QMAKE_CXXFLAGS_RELEASE += @CXXFLAGS@ @X_CFLAGS@
+QMAKE_STRIP =
QMAKE_UIC = $$QMAKE_UIC -tr UIC_
# Input
=======================================
--- /branches/1.6/qt4/switcher/uim-im-switcher-qt4.pro.in Tue Jul 20
20:46:46 2010
+++ /branches/1.6/qt4/switcher/uim-im-switcher-qt4.pro.in Sun Aug 8
21:09:35 2010
@@ -10,11 +10,15 @@
QMAKE_LIBDIR += @abs_top_builddir@/replace/.libs
LIBS += -lreplace -luim -luim-scm -luim-custom @LIBINTL@
+QMAKE_CC = @CC@
QMAKE_CFLAGS_DEBUG += @CFLAGS@ @X_CFLAGS@
QMAKE_CFLAGS_RELEASE += @CFLAGS@ @X_CFLAGS@
+QMAKE_CXX = @CXX@
QMAKE_CXXFLAGS_DEBUG += @CXXFLAGS@ @X_CFLAGS@
QMAKE_CXXFLAGS_RELEASE += @CXXFLAGS@ @X_CFLAGS@
+QMAKE_STRIP =
+
# Input
HEADERS += @srcdir@/qt4.h
SOURCES += @srcdir@/qt4.cpp
=======================================
--- /branches/1.6/qt4/toolbar/uim-toolbar-qt4.pro.in Tue Mar 2 23:14:47
2010
+++ /branches/1.6/qt4/toolbar/uim-toolbar-qt4.pro.in Sun Aug 8 21:09:35
2010
@@ -10,11 +10,15 @@
QMAKE_LIBDIR += @abs_top_builddir@/replace/.libs
LIBS += -lreplace -luim -luim-scm -luim-x-util @LIBINTL@
+QMAKE_CC = @CC@
QMAKE_CFLAGS_DEBUG += @CFLAGS@ @X_CFLAGS@
QMAKE_CFLAGS_RELEASE += @CFLAGS@ @X_CFLAGS@
+QMAKE_CXX = @CXX@
QMAKE_CXXFLAGS_DEBUG += @CXXFLAGS@ @X_CFLAGS@
QMAKE_CXXFLAGS_RELEASE += @CXXFLAGS@ @X_CFLAGS@
+QMAKE_STRIP =
+
# Input
HEADERS += @srcdir@/common-quimhelpertoolbar.h \
@srcdir@/common-uimstateindicator.h \
