pkgsrc/inputmethod/mozc-server/patches/patch-gui_config__dialog_config__dialog.cc
ryoon 28e7ffff7a Update to 1.11.1522.102
* Use renderer for ibus-mozc, new candidates window.

Changelog:
r171 2013-08-28 1.11.1522.102

    FIX: Safari crashes when surrounding text is requested.
    FIX: Mode symbol on the mode indicator is not rendered on Windows.
    FIX: Caret position is not updated after commit in WPF's TextBox on Windows.
    FIX: UI is not placed at proper position when HiDPI is enabled on Windows 8.1
    FIX: GDI handles are not destroyed when classic theme is selected on Windows.
    FIX: Fails to connect to mozc_renderer from explorer.exe on Windows.
    Enable Touch-optimized on-screen keyboard on Windows 8+.
    Enable a developer to configure ibus-mozc path and/or ibus-mozc icon path at build time for GNU/Linux build. See the build instruction about how to customize them. ( Issue 41 )
    Add Session command for ConvertPrevPage and ConvertNextPage ( Issue 188 )
    Remove ibus-mozc-chewing (Issue 194)
    Remove ibus-mozc-pinyin (Issue 194)
2013-09-07 18:42:14 +00:00

66 lines
2.2 KiB
C++

$NetBSD: patch-gui_config__dialog_config__dialog.cc,v 1.3 2013/09/07 18:42:14 ryoon Exp $
--- gui/config_dialog/config_dialog.cc.orig 2013-08-28 05:26:26.000000000 +0000
+++ gui/config_dialog/config_dialog.cc
@@ -97,21 +97,21 @@ ConfigDialog::ConfigDialog()
setWindowTitle(tr("Mozc Preferences"));
#endif // OS_MACOSX
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_NETBSD)
miscDefaultIMEWidget->setVisible(false);
miscAdministrationWidget->setVisible(false);
miscStartupWidget->setVisible(false);
-#endif // OS_LINUX
+#endif // OS_LINUX || OS_NETBSD
#ifdef NO_LOGGING
// disable logging options
miscLoggingWidget->setVisible(false);
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_NETBSD)
// The last "misc" tab has no valid configs on Linux
const int kMiscTabIndex = 6;
configDialogTabWidget->removeTab(kMiscTabIndex);
-#endif // OS_LINUX
+#endif // OS_LINUX || OS_NETBSD
#endif // NO_LOGGING
#ifndef ENABLE_CLOUD_SYNC
@@ -347,7 +347,7 @@ ConfigDialog::ConfigDialog()
dictionaryPreloadingAndUACLabel->setVisible(false);
#endif // OS_WIN
-#ifdef OS_LINUX
+#if defined(OS_LINUX) || defined(OS_NETBSD)
// On Linux, disable all fields for UsageStats
usageStatsLabel->setEnabled(false);
usageStatsLabel->setVisible(false);
@@ -357,7 +357,7 @@ ConfigDialog::ConfigDialog()
usageStatsMessage->setVisible(false);
usageStatsCheckBox->setEnabled(false);
usageStatsCheckBox->setVisible(false);
-#endif // OS_LINUX
+#endif // OS_LINUX || OS_NETBSD
webUsageDictionaryCheckBox->setVisible(false);
editWebServiceEntryButton->setVisible(false);
@@ -460,7 +460,7 @@ bool ConfigDialog::Update() {
}
-#if defined(OS_WIN) || defined(OS_LINUX)
+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_NETBSD)
if ((initial_preedit_method_ !=
static_cast<int>(config.preedit_method())) ||
(initial_use_keyboard_to_change_preedit_method_ !=
@@ -472,7 +472,7 @@ bool ConfigDialog::Update() {
initial_use_keyboard_to_change_preedit_method_ =
config.use_keyboard_to_change_preedit_method();
}
-#endif // OS_WIN or OS_LINUX
+#endif // OS_WIN, OS_LINUX or OS_NETBSD
#ifdef OS_WIN
if (initial_use_mode_indicator_ != config.use_mode_indicator()) {