ws cleanup

[lyx.git] / src / frontends / gnome / FormIndex.C

diff --git a/src/frontends/gnome/FormIndex.C b/src/frontends/gnome/FormIndex.C
index d0749801f23979f392bd4123e82c4338f678048f..5392c43fbb4109757d2d5c29979058030a56a914 100644 (file)
--- a/src/frontends/gnome/FormIndex.C
+++ b/src/frontends/gnome/FormIndex.C
@@ -1,6 +1,5 @@
-// -*- C++ -*-
 /* This file is part of
- * ====================================================== 
+ * ======================================================
  *
  *           LyX, The Document Processor
  *
@@ -22,14 +21,7 @@
 #include "LyXView.h"
 #include "buffer.h"
 #include "lyxfunc.h"
-
-#include "gettext.h"
-#include "Dialogs.h"
-#include "FormIndex.h"
-#include "LyXView.h"
-#include "buffer.h"
 #include "form_index.h"
-#include "lyxfunc.h"
 
 #include <gtk--/label.h>
 #include <gtk--/box.h>
@@ -42,11 +34,16 @@
 #include "mainapp.h"
 extern GLyxAppWin * mainAppWin;
 
+namespace {
+
 // configuration keys
-static string const CONF_ENTRY("FormIndex_entry");
+string const CONF_ENTRY("FormIndex_entry");
+
+} // namespace anon
+
 
 FormIndex::FormIndex(LyXView * lv, Dialogs * d)
-       : lv_(lv), d_(d), inset_(0), u_(0), h_(0), ih_(0), dialog_(NULL)
+       : lv_(lv), d_(d), inset_(0), u_(0), h_(0), ih_(0), dialog_(0)
 {
   // let the dialog be shown
   // These are permanent connections so we won't bother
@@ -63,19 +60,19 @@ FormIndex::~FormIndex()
 
 void FormIndex::showInset( InsetCommand * const inset )
 {
-  if( dialog_!=NULL || inset == 0 ) return;
-  
+  if( dialog_!=0 || inset == 0 ) return;
+
   inset_ = inset;
-  ih_ = inset_->hide.connect(slot(this, &FormIndex::hide));
-  
+  ih_ = inset_->hideDialog.connect(slot(this, &FormIndex::hide));
+
   params = inset->params();
   show();
 }
 
 void FormIndex::createInset( string const & arg )
 {
-  if( dialog_!=NULL ) return;
-  
+  if( dialog_!=0 ) return;
+
   params.setFromString( arg );
   show();
 }
@@ -85,17 +82,17 @@ void FormIndex::show()
   if (!dialog_)
     {
       using namespace Gtk::Box_Helpers;
-      
-      Gtk::Label * label = manage( new Gtk::Label(N_("Keyword")) );
+
+      Gtk::Label * label = manage( new Gtk::Label(_("Keyword")) );
       Gtk::Box * mbox = manage( new Gtk::HBox() );
       Gtk::ButtonBox * bbox = manage( new Gtk::HButtonBox() );
       Gtk::Separator * sep = manage( new Gtk::VSeparator() );
 
       keyword_ = manage( new Gnome::Entry() );
-      
+
       b_ok = Gtk::wrap( GTK_BUTTON( gnome_stock_button(GNOME_STOCK_BUTTON_OK) ) );
       b_cancel = Gtk::wrap( GTK_BUTTON( gnome_stock_button(GNOME_STOCK_BUTTON_CANCEL) ) );
-      
+
       // set up spacing
       mbox->set_spacing(2);
       bbox->set_spacing(4);
@@ -104,7 +101,7 @@ void FormIndex::show()
       keyword_->set_max_saved(10);
       keyword_->load_history();
       keyword_->set_use_arrows_always(true);
-      
+
       // packing
       bbox->children().push_back(Element(*b_ok, false, false));
       bbox->children().push_back(Element(*b_cancel, false, false));
@@ -116,7 +113,7 @@ void FormIndex::show()
 
       // packing dialog to main window
       dialog_ = mbox;
-      mainAppWin->add_action(*dialog_, N_(" Index "));
+      mainAppWin->add_action(*dialog_, _(" Index "));
 
       // setting focus
       GTK_WIDGET_SET_FLAGS (GTK_WIDGET(keyword_->get_entry()->gtkobj()), GTK_CAN_DEFAULT);
@@ -131,20 +128,26 @@ void FormIndex::show()
 
       dialog_->destroy.connect(slot(this, &FormIndex::free));
 
-      u_ = d_->updateBufferDependent.connect(slot(this, &FormIndex::update));
+      u_ = d_->updateBufferDependent.connect(slot(this, &FormIndex::updateSlot));
       h_ = d_->hideBufferDependent.connect(slot(this, &FormIndex::hide));
 
-      update();  // make sure its up-to-date
+      updateSlot();  // make sure its up-to-date
     }
 }
-      
-void FormIndex::update()
+
+void FormIndex::updateSlot(bool switched)
 {
-  if (dialog_ != NULL &&
+  if (switched)
+    {
+      hide();
+      return;
+    }
+
+  if (dialog_ != 0 &&
       lv_->view()->available())
     {
       keyword_->get_entry()->set_text(params.getContents().c_str());
-  
+
       bool sens = (!(lv_->buffer()->isReadonly()));
 
       keyword_->set_sensitive(sens);
@@ -154,14 +157,14 @@ void FormIndex::update()
 
 void FormIndex::hide()
 {
-  if (dialog_!=NULL) mainAppWin->remove_action();
+  if (dialog_!=0) mainAppWin->remove_action();
 }
 
 void FormIndex::free()
 {
-  if (dialog_!=NULL)
+  if (dialog_!=0)
     {
-      dialog_ = NULL;
+      dialog_ = 0;
       u_.disconnect();
       h_.disconnect();
       inset_ = 0;
@@ -196,4 +199,3 @@ void FormIndex::apply()
   // hide the dialog
   hide();
 }
-