From 1089dcc00f7ec88116d6d7a3042289c7aa5eba8e Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 13 Sep 2012 19:47:32 +0200 Subject: mysql-workbench 5.2.43 --- mysql-workbench-5.2.43-noautocc.patch | 94 +++++++++++++++++++++++++++++++++++ 1 file changed, 94 insertions(+) create mode 100644 mysql-workbench-5.2.43-noautocc.patch (limited to 'mysql-workbench-5.2.43-noautocc.patch') diff --git a/mysql-workbench-5.2.43-noautocc.patch b/mysql-workbench-5.2.43-noautocc.patch new file mode 100644 index 0000000..8b95913 --- /dev/null +++ b/mysql-workbench-5.2.43-noautocc.patch @@ -0,0 +1,94 @@ +diff -up mysql-workbench-gpl-5.2.43-src/backend/wbprivate/sqlide/wb_context_sqlide.cpp.noautocc mysql-workbench-gpl-5.2.43-src/backend/wbprivate/sqlide/wb_context_sqlide.cpp +--- mysql-workbench-gpl-5.2.43-src/backend/wbprivate/sqlide/wb_context_sqlide.cpp.noautocc 2012-09-11 17:47:00.000000000 +0200 ++++ mysql-workbench-gpl-5.2.43-src/backend/wbprivate/sqlide/wb_context_sqlide.cpp 2012-09-13 18:21:55.207851256 +0200 +@@ -485,7 +485,11 @@ static bool validate_save_edits(wb::WBCo + + static bool validate_list_members(wb::WBContextSQLIDE *sqlide) + { ++#if 0 + return sqlide->get_grt_manager()->get_app_option_int("DbSqlEditor:CodeCompletionEnabled") != 0; ++#else ++ return false; ++#endif + } + + //-------------------------------------------------------------------------------------------------- +diff -up mysql-workbench-gpl-5.2.43-src/backend/wbprivate/sqlide/wb_sql_editor_form.cpp.noautocc mysql-workbench-gpl-5.2.43-src/backend/wbprivate/sqlide/wb_sql_editor_form.cpp +--- mysql-workbench-gpl-5.2.43-src/backend/wbprivate/sqlide/wb_sql_editor_form.cpp.noautocc 2012-09-13 18:21:55.186851187 +0200 ++++ mysql-workbench-gpl-5.2.43-src/backend/wbprivate/sqlide/wb_sql_editor_form.cpp 2012-09-13 18:21:55.209851264 +0200 +@@ -902,6 +902,7 @@ grt::StringRef SqlEditorForm::do_connect + model->catalog(catalog); + } + ++#if 0 + if (_grtm->get_app_option_int("DbSqlEditor:CodeCompletionEnabled") == 1) + { + std::string cache_dir = _grtm->get_user_datadir() + "/cache/"; +@@ -921,6 +922,7 @@ grt::StringRef SqlEditorForm::do_connect + } + } + else ++#endif + log_debug("Code completion is disabled, so no name cache is created\n"); + + return grt::StringRef(); +diff -up mysql-workbench-gpl-5.2.43-src/backend/wbprivate/workbench/wb_context.cpp.noautocc mysql-workbench-gpl-5.2.43-src/backend/wbprivate/workbench/wb_context.cpp +--- mysql-workbench-gpl-5.2.43-src/backend/wbprivate/workbench/wb_context.cpp.noautocc 2012-09-11 17:47:19.000000000 +0200 ++++ mysql-workbench-gpl-5.2.43-src/backend/wbprivate/workbench/wb_context.cpp 2012-09-13 18:23:03.409093906 +0200 +@@ -1555,7 +1555,7 @@ void WBContext::set_default_options(grt: + set_default(options, "SqlEditor::SyntaxCheck::MaxErrCount", 100); + + // DB SQL editor +- options.gset("DbSqlEditor:CodeCompletionEnabled", 1); ++ options.gset("DbSqlEditor:CodeCompletionEnabled", 0); + options.gset("DbSqlEditor:AutoStartCodeCompletion", 0); // enable back when it works better + options.gset("DbSqlEditor:ProgressStatusUpdateInterval", 500); // in ms + options.gset("DbSqlEditor:KeepAliveInterval", 600); // in seconds +diff -up mysql-workbench-gpl-5.2.43-src/backend/wbpublic/sqlide/sql_editor_be.cpp.noautocc mysql-workbench-gpl-5.2.43-src/backend/wbpublic/sqlide/sql_editor_be.cpp +--- mysql-workbench-gpl-5.2.43-src/backend/wbpublic/sqlide/sql_editor_be.cpp.noautocc 2012-09-11 17:47:17.000000000 +0200 ++++ mysql-workbench-gpl-5.2.43-src/backend/wbpublic/sqlide/sql_editor_be.cpp 2012-09-13 18:21:55.212851274 +0200 +@@ -889,14 +889,22 @@ void Sql_editor::set_sql_check_enabled(b + + bool Sql_editor::code_completion_enabled() + { ++#if 0 + return d->_grtm->get_app_option_int("DbSqlEditor:CodeCompletionEnabled") == 1; ++#else ++ return false; ++#endif + } + + //-------------------------------------------------------------------------------------------------- + + bool Sql_editor::auto_start_code_completion() + { ++#if 0 + return d->_grtm->get_app_option_int("DbSqlEditor:AutoStartCodeCompletion") == 1; ++#else ++ return false; ++#endif + } + + //-------------------------------------------------------------------------------------------------- +diff -up mysql-workbench-gpl-5.2.43-src/frontend/common/preferences_form.cpp.noautocc mysql-workbench-gpl-5.2.43-src/frontend/common/preferences_form.cpp +--- mysql-workbench-gpl-5.2.43-src/frontend/common/preferences_form.cpp.noautocc 2012-09-11 17:47:11.000000000 +0200 ++++ mysql-workbench-gpl-5.2.43-src/frontend/common/preferences_form.cpp 2012-09-13 18:21:55.213851277 +0200 +@@ -618,6 +618,10 @@ void PreferencesForm::create_sqlide_page + + // Code completion settings is a horizontal box with two check boxes. + { ++ // Hack: force value to 0 ++ _wbui->set_wb_options_value(_model_id, "DbSqlEditor:CodeCompletionEnabled", "0", grt::IntegerType); ++ _wbui->set_wb_options_value(_model_id, "DbSqlEditor:AutoStartCodeCompletion", "0", grt::IntegerType); ++ + mforms::Box *cc_box = mforms::manage(new mforms::Box(true)); + vbox->add(cc_box, false); + mforms::CheckBox *auto_start_check = new_checkbox_option("DbSqlEditor:AutoStartCodeCompletion"); +@@ -629,6 +633,7 @@ void PreferencesForm::create_sqlide_page + check->set_text(_("Enable Code Completion in Editors")); + check->set_tooltip(_( + "If enabled SQL editors display a code completion list when pressing the defined hotkey")); ++ check->set_enabled(false); // Hack disable this checkbox + cc_box->add(check, false); + + // Set initial enabled state of the auto-cc checkbox depending on whether -- cgit