mirror of
https://git.freebsd.org/ports.git
synced 2025-06-19 03:30:32 -04:00
6dc4e42629
- Add patch for automatic column width in query browser [2] PR: [1] 132352 Submitted by: [1] Henry Hu <henry.hu.sh@gmail.com> [2] Joerg Wunsch <j@uriah.heep.sax.de> (via private e-mail) Patch from: [1] http://bugs.mysql.com/bug.php?id=30055 [2] http://bugs.mysql.com/bug.php?id=11461
45 lines
2.1 KiB
Text
45 lines
2.1 KiB
Text
--- query-browser/source/linux/MQResultSetView.cc~ 2007-04-27 14:46:09.000000000 +0200
|
|
+++ query-browser/source/linux/MQResultSetView.cc 2009-01-04 20:59:03.000000000 +0100
|
|
@@ -474,7 +474,29 @@
|
|
PIXCACHE->load("field_overlay_view.png"),
|
|
PIXCACHE->load("field_overlay_null.png"));
|
|
rend->set_blob_icon(PIXCACHE->load("blob_icon.png"));
|
|
- rend->set_max_text_width(prefs.max_blob_length);
|
|
+ if (prefs.max_blob_length == 0)
|
|
+ {
|
|
+ unsigned int w = 1;
|
|
+
|
|
+ if (result->columns[i].column_type == MYX_RSCT_TEXT)
|
|
+ for (unsigned int j = 0; j < result->rows_num; j++)
|
|
+ {
|
|
+ gchar *gcp;
|
|
+ gssize nbytes = result->rows[j].fields[i].value_length;
|
|
+
|
|
+ if ((gcp = g_utf8_strchr(result->rows[j].fields[i].value,
|
|
+ nbytes, g_utf8_get_char("\n"))) != NULL)
|
|
+ nbytes = gcp - result->rows[j].fields[i].value;
|
|
+ glong this_len = g_utf8_strlen(result->rows[j].fields[i].value, nbytes);
|
|
+ if (this_len > w)
|
|
+ w = this_len;
|
|
+ }
|
|
+ rend->set_max_text_width(w);
|
|
+ }
|
|
+ else
|
|
+ {
|
|
+ rend->set_max_text_width(prefs.max_blob_length);
|
|
+ }
|
|
rend->property_column()= i;
|
|
rend->set_delegate(this);
|
|
|
|
--- query-browser/res/linux/qb_preferences.glade~ 2006-05-16 03:04:19.000000000 +0200
|
|
+++ query-browser/res/linux/qb_preferences.glade 2009-01-02 19:14:04.000000000 +0100
|
|
@@ -116,7 +116,8 @@
|
|
<widget class="GtkLabel" id="label35">
|
|
<property name="visible">True</property>
|
|
<property name="label" translatable="yes"><small>BLOB/text columns in resultsets will be truncated
|
|
-to this size for display.</small></property>
|
|
+to this size for display. Value 0 means automatic
|
|
+column width (i.e., width of largest value).</small></property>
|
|
<property name="use_underline">False</property>
|
|
<property name="use_markup">True</property>
|
|
<property name="justify">GTK_JUSTIFY_LEFT</property>
|