[Goodies-commits] r5296 - in xfmpc/trunk: . src

[Mike Massonnet]

Author: mmassonnet
Date: 2008-08-24 16:20:19 +0000 (Sun, 24 Aug 2008)
New Revision: 5296

Modified:
   xfmpc/trunk/configure.in.in
   xfmpc/trunk/src/dbbrowser.c
Log:
Add funky colors on a failed search in the database

* configure.in.in:
  - Add configure flag --enable-funky-colors
* src/dbbrowser.c:
  - Highlight the search entry if the query failed
  - Highlight also the background if build with --enable-funky-colors

Modified: xfmpc/trunk/configure.in.in
===================================================================
--- xfmpc/trunk/configure.in.in	2008-08-24 15:28:45 UTC (rev 5295)
+++ xfmpc/trunk/configure.in.in	2008-08-24 16:20:19 UTC (rev 5296)
@@ -10,7 +10,7 @@
 dnl ***************************
 m4_define([xfmpc_version_major], [0])
 m4_define([xfmpc_version_minor], [0])
-m4_define([xfmpc_version_micro], [6])
+m4_define([xfmpc_version_micro], [7])
 m4_define([xfmpc_version_build], [r at REVISION@])
 m4_define([xfmpc_version_tag], [svn]) # leave empty for release
 m4_define([xfmpc_version], [xfmpc_version_major().xfmpc_version_minor().xfmpc_version_micro()ifelse(xfmpc_version_tag(), [svn], [xfmpc_version_tag()-xfmpc_version_build()], [xfmpc_version_tag()])])
@@ -69,6 +69,17 @@
 dnl ***********************************
 XDT_FEATURE_DEBUG()
 
+dnl *********************************
+dnl *** Check for configure flags ***
+dnl *********************************
+AC_ARG_ENABLE([funky-colors],
+	      [AC_HELP_STRING([--enable-funky-colors], [Build with more funky colors])],
+	      [enable_funkycolors=$enableval],
+	      [enable_funkycolors=no])
+if test "x$enable_funkycolors" = "xyes" ; then
+	AC_DEFINE([MORE_FUNKY_COLOR_ON_SEARCH_ENTRY], [1], [""])
+fi
+
 AC_OUTPUT([
 Makefile
 src/Makefile
@@ -82,5 +93,6 @@
 echo "Build Configuration:"
 echo
 echo "* Debug Support:    $enable_debug"
+echo "* Funky Colors:     $enable_funkycolors"
 echo
 

Modified: xfmpc/trunk/src/dbbrowser.c
===================================================================
--- xfmpc/trunk/src/dbbrowser.c	2008-08-24 15:28:45 UTC (rev 5295)
+++ xfmpc/trunk/src/dbbrowser.c	2008-08-24 16:20:19 UTC (rev 5296)
@@ -372,6 +372,8 @@
   gchar                    *filename;
   gchar                    *basename;
   gint                      i = 0;
+  static gboolean           no_result, no_result_buf;
+  GdkColor                  color = {0, 0xFFFF, 0x6666, 0x6666};
 
   if (G_UNLIKELY (!xfmpc_mpdclient_is_connected (dbbrowser->mpdclient)))
     return;
@@ -387,12 +389,37 @@
       i++;
     }
 
+  /* check the rightness of the query and then play with the colors */
+  no_result_buf = no_result;
   if (i == 0)
+    no_result = TRUE;
+  else if (no_result)
+    no_result = FALSE;
+
+  if (no_result != no_result_buf)
     {
-      /* TODO display a message that the query returned "no result"?
-       * set the entry background in red? */
-      g_message ("change query bad query");
+#ifdef MORE_FUNKY_COLOR_ON_SEARCH_ENTRY
+      gtk_widget_modify_base (priv->search_entry, GTK_STATE_NORMAL, no_result ? &color : NULL);
+#endif
+      gtk_widget_modify_bg (priv->search_entry, GTK_STATE_NORMAL, no_result ? &color : NULL);
+      gtk_widget_modify_bg (priv->search_entry, GTK_STATE_SELECTED, no_result ? &color : NULL);
     }
+  if (i == 0)
+    {
+#ifdef MORE_FUNKY_COLOR_ON_SEARCH_ENTRY
+      gtk_widget_modify_base (priv->search_entry, GTK_STATE_NORMAL, &color);
+#endif
+      gtk_widget_modify_bg (priv->search_entry, GTK_STATE_NORMAL, &color);
+      gtk_widget_modify_bg (priv->search_entry, GTK_STATE_SELECTED, &color);
+    }
+  else if (no_result)
+    {
+#ifdef MORE_FUNKY_COLOR_ON_SEARCH_ENTRY
+      gtk_widget_modify_base (priv->search_entry, GTK_STATE_NORMAL, NULL);
+#endif
+      gtk_widget_modify_bg (priv->search_entry, GTK_STATE_NORMAL, NULL);
+      gtk_widget_modify_bg (priv->search_entry, GTK_STATE_SELECTED, NULL);
+    }
 }
 
 
@@ -512,6 +539,13 @@
     {
       priv->is_searching = FALSE;
       xfmpc_dbbrowser_reload (dbbrowser);
+
+      /* revert possible previous applied color */
+#ifdef MORE_FUNKY_COLOR_ON_SEARCH_ENTRY
+      gtk_widget_modify_base (priv->search_entry, GTK_STATE_NORMAL, NULL);
+#endif
+      gtk_widget_modify_bg (priv->search_entry, GTK_STATE_NORMAL, NULL);
+      gtk_widget_modify_bg (priv->search_entry, GTK_STATE_SELECTED, NULL);
       return;
     }