glom r1412 - in trunk: . glom/layout_item_dialogs glom/libglom

[arminb svn gnome org]

Author: arminb
Date: Tue Feb  5 15:53:50 2008
New Revision: 1412
URL: http://svn.gnome.org/viewvc/glom?rev=1412&view=rev

Log:
2008-02-05  Armin Burgmeier  <armin openismus com>

	* glom/libglom/connectionpool.cc: Fixed a 'non-void function does not
	return a value' warning in
	ConnectionPool::check_postgres_is_available_with_warning().

	* glom/layout_item_dialogs/dialog_buttonscript.cc: Use a monospace
	font for the python script text field. Coding is much more convenient
	with a monospace font.


Modified:
   trunk/ChangeLog
   trunk/glom/layout_item_dialogs/dialog_buttonscript.cc
   trunk/glom/libglom/connectionpool.cc

Modified: trunk/glom/layout_item_dialogs/dialog_buttonscript.cc
==============================================================================
--- trunk/glom/layout_item_dialogs/dialog_buttonscript.cc	(original)
+++ trunk/glom/layout_item_dialogs/dialog_buttonscript.cc	Tue Feb  5 15:53:50 2008
@@ -38,6 +38,9 @@
   refGlade->get_widget("button_test",  m_button_test);
 
   m_button_test->signal_clicked().connect( sigc::mem_fun(*this, &Dialog_ButtonScript::on_button_test) );
+
+  // Set a monospace font
+  m_text_view->modify_font(Pango::FontDescription("Monospace"));
   //on_foreach_connect(*this);
 
   //Dialog_Properties::set_modified(false);

Modified: trunk/glom/libglom/connectionpool.cc
==============================================================================
--- trunk/glom/libglom/connectionpool.cc	(original)
+++ trunk/glom/libglom/connectionpool.cc	Tue Feb  5 15:53:50 2008
@@ -1163,32 +1163,30 @@
     if(Bakery::App_WithDoc::file_exists(uri_binpath))
       return true;
   }
-  else
-  {
-    #ifdef DISTRO_SPECIFIC_POSTGRES_INSTALL_IMPLEMENTED
 
-    //Show message to the user about the broken installation:
-    //This is a packaging bug, but it would probably annoy packagers to mention that in the dialog:
-    Gtk::MessageDialog dialog(Bakery::App_Gtk::util_bold_message(_("Incomplete Glom Installation")), true /* use_markup */, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_NONE, true /* modal */);
-    dialog.set_secondary_text(_("Your installation of Glom is not complete, because PostgreSQL is not available on your system. PostgreSQL is needed for self-hosting of Glom databases.\n\nYou may now install PostgreSQL to complete the Glom installation."));
-    dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
-    dialog.add_button(_("Install PostgreSQL"), Gtk::RESPONSE_OK);
-    const int response = dialog.run();
-    if(response != Gtk::RESPONSE_OK)
-      return false; //Failure. Glom should now quit.
-    else
-      return install_postgres(&dialog);
+  #ifdef DISTRO_SPECIFIC_POSTGRES_INSTALL_IMPLEMENTED
 
-    #else  //DISTRO_SPECIFIC_POSTGRES_INSTALL_IMPLEMENTED
+  //Show message to the user about the broken installation:
+  //This is a packaging bug, but it would probably annoy packagers to mention that in the dialog:
+  Gtk::MessageDialog dialog(Bakery::App_Gtk::util_bold_message(_("Incomplete Glom Installation")), true /* use_markup */, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_NONE, true /* modal */);
+  dialog.set_secondary_text(_("Your installation of Glom is not complete, because PostgreSQL is not available on your system. PostgreSQL is needed for self-hosting of Glom databases.\n\nYou may now install PostgreSQL to complete the Glom installation."));
+  dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
+  dialog.add_button(_("Install PostgreSQL"), Gtk::RESPONSE_OK);
+  const int response = dialog.run();
+  if(response != Gtk::RESPONSE_OK)
+    return false; //Failure. Glom should now quit.
+  else
+    return install_postgres(&dialog);
 
-    //Show message to the user about the broken installation:
-    Gtk::MessageDialog dialog(Bakery::App_Gtk::util_bold_message(_("Incomplete Glom Installation")), true /* use_markup */, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_OK, true /* modal */);
-    dialog.set_secondary_text(_("Your installation of Glom is not complete, because PostgreSQL is not available on your system. PostgreSQL is needed for self-hosting of Glom databases.\n\nPlease report this bug to your vendor, or your system administrator so it can be corrected."));
-    dialog.run();
-    return false;
+  #else  //DISTRO_SPECIFIC_POSTGRES_INSTALL_IMPLEMENTED
 
-    #endif //DISTRO_SPECIFIC_POSTGRES_INSTALL_IMPLEMENTED
-  }
+  //Show message to the user about the broken installation:
+  Gtk::MessageDialog dialog(Bakery::App_Gtk::util_bold_message(_("Incomplete Glom Installation")), true /* use_markup */, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_OK, true /* modal */);
+  dialog.set_secondary_text(_("Your installation of Glom is not complete, because PostgreSQL is not available on your system. PostgreSQL is needed for self-hosting of Glom databases.\n\nPlease report this bug to your vendor, or your system administrator so it can be corrected."));
+  dialog.run();
+  return false;
+
+  #endif //DISTRO_SPECIFIC_POSTGRES_INSTALL_IMPLEMENTED
 }
 
 /** Try to install postgres on the distro, though this will require a distro-specific