]> git.lyx.org Git - lyx.git/blobdiff - src/frontends/gnome/FormCitation.C
Clean-up of the button controller.
[lyx.git] / src / frontends / gnome / FormCitation.C
index 6056cf68d046a76531658950be792944c07413da..62f2d2682780b52b2ad5c4b47d0be3f65a0344b4 100644 (file)
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 /* This file is part of
  * ====================================================== 
  *
 #include "buffer.h"
 #include "lyxfunc.h"
 #include "support/filetools.h"
-
-extern "C" {
-#include "diainsertcitation_interface.h"
-#include "support.h"
-}
+#include "support/LRegex.h"
 
 #include <gtk--/scrolledwindow.h>
 #include <gnome--/pixmap.h>
+#include <gtk--/label.h>
+#include <gtk--/box.h>
+#include <gtk--/buttonbox.h>
+#include <gnome--/entry.h>
+#include <gnome--/stock.h>
+#include <gtk--/separator.h>
+#include <libgnome/gnome-config.h>
+#include <gtk--/alignment.h>
+#include "pixbutton.h"
+
+// temporary solution for LyXView
+#include "mainapp.h"
+extern GLyxAppWin * mainAppWin;
 
 using std::vector;
 using std::pair;
@@ -40,40 +48,37 @@ using std::max;
 using std::min;
 using std::find;
 
-#ifdef SIGC_CXX_NAMESPACES
-using SigC::slot;
-using SigC::bind;
-#endif
+namespace {
 
-// gnome configuration file keys
-#define LOCAL_CONFIGURE_PREFIX "FormCitation"
+// configuration keys
+string const  LOCAL_CONFIGURE_PREFIX("FormCitation");
 
-#define CONF_DIALOG_WIDTH              "width"
-#define CONF_DIALOG_WIDTH_DEFAULT      "=550"
+string const  CONF_PANE_INFO("paneinfo");
+string const  CONF_PANE_INFO_DEFAULT("=300");
 
-#define CONF_DIALOG_HEIGTH             "heigth"
-#define CONF_DIALOG_HEIGTH_DEFAULT     "=550"
+string const  CONF_COLUMN("column");
+string const  CONF_COLUMN_DEFAULT("=50");
 
-#define CONF_PANE_INFO                 "paneinfo"
-#define CONF_PANE_INFO_DEFAULT         "=300"
+string const  CONF_REGEXP("regexp");
+string const  CONF_REGEXP_DEFAULT("=0");
 
-#define CONF_PANE_KEY                  "panekey"
-#define CONF_PANE_KEY_DEFAULT          "=225"
+string const CONF_SEARCH("FormCitation_search");
+string const CONF_TEXTAFTER("FormCitation_textafter");
 
-#define CONF_COLUMN                    "column"
-#define CONF_COLUMN_DEFAULT            "=50"
+} // namespace anon
 
 
 FormCitation::FormCitation(LyXView * lv, Dialogs * d)
-       : lv_(lv), d_(d), u_(0), h_(0), ih_(0), inset_(0), dialog_(NULL)
+  : lv_(lv), d_(d), inset_(0), u_(0), h_(0), ih_(0)
 {
   // let the dialog be shown
   // These are permanent connections so we won't bother
   // storing a copy because we won't be disconnecting.
-  d->showCitation.connect(slot(this, &FormCitation::showInset));
-  d->createCitation.connect(slot(this, &FormCitation::createInset));
-}
+  d->showCitation.connect(SigC::slot(this, &FormCitation::showInset));
+  d->createCitation.connect(SigC::slot(this, &FormCitation::createInset));
 
+  cleanupWidgets();
+}
 
 FormCitation::~FormCitation()
 {
@@ -82,31 +87,42 @@ FormCitation::~FormCitation()
 
 void FormCitation::showInset( InsetCommand * const inset )
 {
-  if( dialog_!=NULL || inset == 0 ) return;
+  if( dialog_!=0 || inset == 0 ) return;
   
   inset_ = inset;
-  ih_ = inset_->hide.connect(slot(this, &FormCitation::hide));
+  ih_ = inset_->hideDialog.connect(SigC::slot(this, &FormCitation::hide));
+
+  u_ = d_->updateBufferDependent.connect(SigC::slot(this, &FormCitation::updateSlot));
+  h_ = d_->hideBufferDependent.connect(SigC::slot(this, &FormCitation::hide));
   
   params = inset->params();
-  show();
+
+  if ( params.getContents().empty() ) showStageSearch();
+  else showStageAction();
 }
 
 
 void FormCitation::createInset( string const & arg )
 {
-  if( dialog_!=NULL ) return;
+  if( dialog_!=0 ) return;
+  
+  u_ = d_->updateBufferDependent.connect(SigC::slot(this, &FormCitation::updateSlot)); 
+  h_ = d_->hideBufferDependent.connect(SigC::slot(this, &FormCitation::hide));
   
   params.setFromString( arg );
-  show();
+  showStageSearch();
 }
 
-static
-void parseBibTeX(string data,
+
+namespace {
+
+void parseBibTeX(string const & dat,
                 string const & findkey,
                 string & keyvalue)
 {
   unsigned int i;
-
+  string data(dat);
+  
   keyvalue = "";
   
   for (i=0; i<data.length(); ++i)
@@ -121,7 +137,8 @@ void parseBibTeX(string data,
     {
       unsigned int keypos = min(data.find(' '), data.find('='));
       string key = lowercase( data.substr(0, keypos) );
-      string value, tmp;
+      string value;
+      string tmp;
       char enclosing;
       
       data = data.substr(keypos, data.length()-1);
@@ -191,119 +208,486 @@ void parseBibTeX(string data,
     }
 }
 
-void FormCitation::show()
+} // namespace anon
+
+
+void FormCitation::cleanupWidgets()
+{
+  dialog_ = 0;
+  b_ok = 0;
+  b_cancel = 0;
+  search_text_ = 0;
+  info_ = 0;
+  text_after_ = 0;
+  button_unselect_ = 0;
+  button_up_ = 0;
+  button_down_ = 0;
+  button_regexp_ = 0;
+  clist_selected_ = 0;
+  clist_bib_ = 0;
+  paned_info_ = 0;
+}
+
+
+void FormCitation::initWidgets()
+{
+  string const path = PACKAGE "/" + LOCAL_CONFIGURE_PREFIX;
+
+  if (search_text_ != 0)
+    {
+      search_text_->set_history_id(CONF_SEARCH);
+      search_text_->set_max_saved(10);
+      search_text_->load_history();
+      search_text_->set_use_arrows_always(true);
+    }
+
+  if (text_after_ != 0 )
+    {
+      text_after_->set_history_id(CONF_TEXTAFTER);
+      text_after_->set_max_saved(10);
+      text_after_->load_history();
+      text_after_->set_use_arrows_always(true);
+      text_after_->get_entry()->set_text(params.getOptions());
+    }
+
+  if (button_regexp_ != 0)
+    {
+      string w = path + "/" + CONF_REGEXP + CONF_REGEXP_DEFAULT;
+      button_regexp_->set_active( (gnome_config_get_int(w.c_str()) > 0) );
+    }
+
+  if (paned_info_ != 0)
+    {
+      string w = path + "/" + CONF_PANE_INFO + CONF_PANE_INFO_DEFAULT;
+      paned_info_->set_position( gnome_config_get_int(w.c_str()) );
+    }
+
+  if (clist_bib_ != 0)
+    {
+      // preferences
+      clist_bib_->column(0).set_visiblity(false);
+      clist_bib_->set_selection_mode(GTK_SELECTION_BROWSE);
+
+      // setting up sizes of columns
+      string w;
+      int sz = clist_bib_->columns().size();
+      for (int i = 0; i < sz; ++i)
+       {
+         w = path + "/" + CONF_COLUMN + "_" + tostr(i) + CONF_COLUMN_DEFAULT;
+         clist_bib_->column(i).set_width( gnome_config_get_int(w.c_str()) );
+       }
+      
+      // retrieving data
+      vector<pair<string,string> > blist = lv_->buffer()->getBibkeyList();
+
+      sz = blist.size();
+      for (int i = 0; i < sz; ++i )
+       {
+         bibkeys.push_back(blist[i].first);
+         bibkeysInfo.push_back(blist[i].second);
+       }
+      
+      blist.clear();      
+      
+      // updating list
+      search();
+
+      if (clist_bib_->rows().size() > 0)
+       {
+         clist_bib_->rows()[0].select();
+         selectionToggled(0, 0, 0, true, false);
+       }
+    }
+
+  if (clist_selected_ != 0)
+    {
+      clist_selected_->set_selection_mode(GTK_SELECTION_BROWSE);
+
+      // populating clist_selected_
+      vector<string> r;
+      string tmp, keys( params.getContents() );
+      keys = frontStrip( split(keys, tmp, ',') );
+      while( !tmp.empty() )
+       {
+         r.clear();
+         r.push_back(tmp);
+         clist_selected_->rows().push_back(r);
+         
+         keys = frontStrip( split(keys, tmp, ',') );
+       }
+
+      if (clist_selected_->rows().size() > 0)
+       {
+         clist_selected_->rows()[0].select();
+         selectionToggled(0, 0, 0, true, true);
+       }
+    }
+
+  updateButtons();
+}
+
+
+void FormCitation::storeWidgets()
+{
+  string const path = PACKAGE "/" + LOCAL_CONFIGURE_PREFIX;
+
+  if (search_text_ != 0) search_text_->save_history();
+
+  if (text_after_ != 0) text_after_->save_history();
+
+  if (button_regexp_ != 0)
+    {
+      string w = path + "/" + CONF_REGEXP;
+      gnome_config_set_int(w.c_str(), button_regexp_->get_active());
+    }
+
+  if (paned_info_ != 0) 
+    {
+      string w = path + "/" + CONF_PANE_INFO;
+      gnome_config_set_int(w.c_str(), paned_info_->width() - info_->width());
+    }
+
+  if (clist_bib_ != 0)
+    {
+      string w;
+      int const sz = clist_bib_->columns().size();
+      for (int i = 0; i < sz; ++i)
+       {
+         w = path + "/" + CONF_COLUMN + "_" + tostr(i);
+         gnome_config_set_int(w.c_str(), clist_bib_->get_column_width(i));
+       }
+    }
+
+  gnome_config_sync();
+}
+
+
+void FormCitation::showStageAction()
 {
   if (!dialog_)
     {
-      GtkWidget * pd = create_DiaInsertCitation();
-
-      dialog_ = Gtk::wrap(pd);
-      clist_selected_ = Gtk::wrap( GTK_CLIST( lookup_widget(pd, "clist_selected") ) );
-      info_ = Gtk::wrap( GNOME_LESS( lookup_widget(pd, "info") ) );
-      text_after_ = Gtk::wrap( GNOME_ENTRY( lookup_widget(pd, "text_after") ) );
-      search_text_ = Gtk::wrap( GNOME_ENTRY( lookup_widget(pd, "search_text") ) );
-       
-      button_select_ = Gtk::wrap( GTK_BUTTON( lookup_widget(pd, "button_select") ) );
-      button_unselect_ = Gtk::wrap( GTK_BUTTON( lookup_widget(pd, "button_unselect") ) );
-      button_up_ = Gtk::wrap( GTK_BUTTON( lookup_widget(pd, "button_up") ) );
-      button_down_ = Gtk::wrap( GTK_BUTTON( lookup_widget(pd, "button_down") ) );
-      button_search_ = Gtk::wrap( GTK_BUTTON( lookup_widget(pd, "button_search") ) );
-
-      paned_info_ = Gtk::wrap( GTK_PANED( lookup_widget(pd, "vpaned_info") ) );
-      paned_key_ = Gtk::wrap( GTK_PANED( lookup_widget(pd, "hpaned_key") ) );
-      box_keys_ =  Gtk::wrap( GTK_BOX( lookup_widget(pd, "vbox_keys") ) );
-
-      b_ok = Gtk::wrap( GTK_BUTTON( lookup_widget(pd, "button_ok") ) );
-      b_cancel = Gtk::wrap( GTK_BUTTON( lookup_widget(pd, "button_cancel") ) );
-
-      // constructing and packing CList
+      using namespace Gtk::Box_Helpers;
+
+      Gtk::Alignment * mbox = manage( new Gtk::Alignment(0.5, 0.5, 0, 0) );
+      Gtk::ButtonBox * bbox = manage( new Gtk::HButtonBox() );
+
+      string const addlabel = _("_Add new citation");
+      string const editlabel = _("_Edit/remove citation(s)");
+
+      Gnome::PixButton * b_add  = manage(new Gnome::PixButton(addlabel, GNOME_STOCK_PIXMAP_NEW));
+      Gnome::PixButton * b_edit = manage(new Gnome::PixButton(editlabel, GNOME_STOCK_PIXMAP_PROPERTIES));
+
+      b_cancel = Gtk::wrap( GTK_BUTTON( gnome_stock_button(GNOME_STOCK_BUTTON_CANCEL) ) );
+
+      // set up spacing
+      bbox->set_spacing(4);
+      bbox->set_layout(GTK_BUTTONBOX_SPREAD);
+      
+      bbox->children().push_back(Element(*b_add, false, false));
+      bbox->children().push_back(Element(*b_edit, false, false));
+      bbox->children().push_back(Element(*b_cancel, false, false));
+
+      mbox->add(*bbox);
+
+      // accelerators
+      Gtk::AccelGroup * accel = Gtk::AccelGroup::create();
+
+      b_add->add_accelerator("clicked", *accel, b_add->get_accelkey(), 0, GTK_ACCEL_VISIBLE);
+      b_edit->add_accelerator("clicked", *accel, b_edit->get_accelkey(), 0, GTK_ACCEL_VISIBLE);
+      
+      // packing dialog to main window
+      dialog_ = mbox;
+      mainAppWin->add_action(*dialog_, _(" Citation: Select action "), false, accel);
+
+      initWidgets();
+      
+      // setting focus
+      gtk_widget_grab_focus (GTK_WIDGET(b_add->gtkobj()));
+
+      // connecting signals
+      b_add->clicked.connect(slot(this, &FormCitation::moveFromActionToSearch));
+      b_edit->clicked.connect(slot(this, &FormCitation::moveFromActionToEdit));
+
+      b_cancel->clicked.connect(slot(mainAppWin, &GLyxAppWin::remove_action));
+
+      dialog_->destroy.connect(slot(this, &FormCitation::free));
+    }
+}
+
+
+void FormCitation::moveFromActionToSearch()
+{
+  // stores configuration and cleans all widgets
+  storeWidgets();
+  cleanupWidgets();
+  
+  // moves to stage "search"
+  mainAppWin->remove_action();
+  showStageSearch();
+}
+
+
+void FormCitation::moveFromActionToEdit()
+{
+  // stores configuration and cleans all widgets
+  storeWidgets();
+  cleanupWidgets();
+  
+  // moves to stage "edit"
+  mainAppWin->remove_action();
+  showStageEdit();
+}
+
+
+void FormCitation::showStageSearch()
+{
+  if (!dialog_)
+    {
+      using namespace Gtk::Box_Helpers;
+
+      Gtk::Box * mbox = manage( new Gtk::HBox() );
+      Gtk::ButtonBox * bbox = manage( new Gtk::HButtonBox() );
+      Gtk::Separator * sep = manage( new Gtk::VSeparator() );
+      
+      search_text_ = manage( new Gnome::Entry() );
+      
+      button_regexp_ = manage( new Gtk::CheckButton(_("Use Regular Expression")) );
+
+      b_ok = manage( new Gtk::Button(_("Search")) );
+      b_cancel = Gtk::wrap( GTK_BUTTON( gnome_stock_button(GNOME_STOCK_BUTTON_CANCEL) ) );
+      
+      // set up spacing
+      mbox->set_spacing(4);
+      bbox->set_spacing(4);
+
+      // packing
+      bbox->children().push_back(Element(*b_ok, false, false));
+      bbox->children().push_back(Element(*b_cancel, false, false));
+
+      mbox->children().push_back(Element(*search_text_, true, true));
+      mbox->children().push_back(Element(*button_regexp_, false, false));
+      mbox->children().push_back(Element(*sep, false, false));
+      mbox->children().push_back(Element(*bbox, false, false));
+
+      // packing dialog to main window
+      dialog_ = mbox;
+      mainAppWin->add_action(*dialog_, _(" Insert Citation: Enter keyword(s) or regular expression "));
+
+      initWidgets();
+      
+      // setting focus
+      GTK_WIDGET_SET_FLAGS (GTK_WIDGET(search_text_->get_entry()->gtkobj()), GTK_CAN_DEFAULT);
+      gtk_widget_grab_focus (GTK_WIDGET(search_text_->get_entry()->gtkobj()));
+      gtk_widget_grab_default (GTK_WIDGET(search_text_->get_entry()->gtkobj()));
+
+      // connecting signals
+      b_ok->clicked.connect(SigC::slot(this, &FormCitation::moveFromSearchToSelect));
+      search_text_->get_entry()->activate.connect(SigC::slot(this, &FormCitation::moveFromSearchToSelect));
+
+      b_cancel->clicked.connect(SigC::slot(mainAppWin, &GLyxAppWin::remove_action));
+      dialog_->destroy.connect(SigC::slot(this, &FormCitation::free));
+    }
+}
+
+void FormCitation::moveFromSearchToSelect()
+{
+  search_string_ = search_text_->get_entry()->get_text();
+  use_regexp_ = button_regexp_->get_active();
+
+  // stores configuration and cleans all widgets
+  storeWidgets();
+  cleanupWidgets();
+  
+  // moves to stage "select"
+  mainAppWin->remove_action();
+  showStageSelect();
+}
+
+void FormCitation::showStageSelect()
+{
+  if (!dialog_)
+    {
+      using namespace Gtk::Box_Helpers;
+
+      Gtk::Box * mbox = manage( new Gtk::VBox() );
+      Gtk::Box * tbox = manage( new Gtk::HBox() );
+      Gtk::ButtonBox * bbox = manage( new Gtk::HButtonBox() );
+      Gtk::Separator * sep = manage( new Gtk::HSeparator() );
+      Gtk::ScrolledWindow * sw = manage( new Gtk::ScrolledWindow() );
+
+      info_ = manage( new Gnome::Less() );
+      paned_info_ = manage( new Gtk::HPaned() );
+      text_after_ = 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) ) );
+
+      sw->set_policy(GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+
+      // constructing CList
       vector<string> colnames;
       colnames.push_back("INVISIBLE");
-      colnames.push_back(N_("Key"));
-      colnames.push_back(N_("Author(s)"));
-      colnames.push_back(N_("Title"));
-      colnames.push_back(N_("Year"));
-      colnames.push_back(N_("Journal"));
+      colnames.push_back(_("Key"));
+      colnames.push_back(_("Author(s)"));
+      colnames.push_back(_("Title"));
+      colnames.push_back(_("Year"));
+      colnames.push_back(_("Journal"));
       clist_bib_ = manage( new Gtk::CList(colnames) );
-      clist_bib_->column(0).set_visiblity(false);
+
+      bbox->set_layout(GTK_BUTTONBOX_END);
       
-      Gtk::ScrolledWindow * sw_ = Gtk::wrap( GTK_SCROLLED_WINDOW( lookup_widget(pd, "scrolledwindow_bib") ) );
-      sw_->add(*clist_bib_);
-
-      // populating buttons with icons
-      Gnome::Pixmap * p;
-      p = Gtk::wrap( GNOME_PIXMAP( gnome_stock_pixmap_widget(NULL, GNOME_STOCK_PIXMAP_BACK) ) ); 
-      button_select_->add(*p);
-      p = Gtk::wrap( GNOME_PIXMAP( gnome_stock_pixmap_widget(NULL, GNOME_STOCK_PIXMAP_TRASH) ) ); 
-      button_unselect_->add(*p);
-      p = Gtk::wrap( GNOME_PIXMAP( gnome_stock_pixmap_widget(NULL, GNOME_STOCK_PIXMAP_UP) ) ); 
-      button_up_->add(*p);
-      p = Gtk::wrap( GNOME_PIXMAP( gnome_stock_pixmap_widget(NULL, GNOME_STOCK_PIXMAP_DOWN) ) ); 
-      button_down_->add(*p);
+      // set up spacing
+      mbox->set_spacing(4);
+      bbox->set_spacing(4);
+      tbox->set_spacing(4);
+
+      // packing widgets
+      sw->add(*clist_bib_);
+      paned_info_->add1(*sw);
+      paned_info_->add2(*info_);
+
+      bbox->children().push_back(Element(*b_ok, false, false));
+      bbox->children().push_back(Element(*b_cancel, false, false));
+
+      tbox->children().push_back(Element(*manage(new Gtk::Label(_("Text after"))), false, false));
+      tbox->children().push_back(Element(*text_after_, true, true));
+      tbox->children().push_back(Element(*manage(new Gtk::VSeparator()), false, false));
+      tbox->children().push_back(Element(*bbox, false, false));
+
+      mbox->children().push_back(Element(*paned_info_,true,true));
+      mbox->children().push_back(Element(*sep, false, false));
+      mbox->children().push_back(Element(*tbox, false, false));
+      
+      // packing dialog to main window
+      dialog_ = mbox;
+      mainAppWin->add_action(*dialog_, _(" Insert Citation: Select citation "), true);
+
+      initWidgets();
       
+      // setting focus
+      GTK_WIDGET_SET_FLAGS (GTK_WIDGET(b_ok->gtkobj()), GTK_CAN_DEFAULT);
+      GTK_WIDGET_SET_FLAGS (GTK_WIDGET(b_cancel->gtkobj()), GTK_CAN_DEFAULT);
+      GTK_WIDGET_SET_FLAGS (GTK_WIDGET(clist_bib_->gtkobj()), GTK_CAN_DEFAULT);
+      gtk_widget_grab_focus (GTK_WIDGET(clist_bib_->gtkobj()));
+      gtk_widget_grab_default (GTK_WIDGET(b_ok->gtkobj()));
 
       // connecting signals
-      clist_bib_->click_column.connect(slot(this, &FormCitation::sortBibList));
+      b_ok->clicked.connect(SigC::slot(this, &FormCitation::applySelect));
+      text_after_->get_entry()->activate.connect(SigC::slot(this, &FormCitation::applySelect));
 
-      clist_selected_->select_row.connect(bind(slot(this, &FormCitation::selection_toggled),
-                                              true, true));
-      clist_bib_->select_row.connect(bind(slot(this, &FormCitation::selection_toggled),
+      b_cancel->clicked.connect(SigC::slot(mainAppWin, &GLyxAppWin::remove_action));
+
+      dialog_->destroy.connect(SigC::slot(this, &FormCitation::free));
+
+      clist_bib_->click_column.connect(SigC::slot(this, &FormCitation::sortBibList));
+      clist_bib_->select_row.connect(SigC::bind(SigC::slot(this, &FormCitation::selectionToggled),
                                          true, false));
-      clist_selected_->unselect_row.connect(bind(slot(this, &FormCitation::selection_toggled),
-                                                false, true));
-      clist_bib_->unselect_row.connect(bind(slot(this, &FormCitation::selection_toggled),
+      clist_bib_->unselect_row.connect(SigC::bind(SigC::slot(this, &FormCitation::selectionToggled),
                                            false, false));
+    }
+}
+
+void FormCitation::showStageEdit()
+{
+  if (!dialog_)
+    {
+      using namespace Gtk::Box_Helpers;
+
+      Gtk::Box * mbox = manage( new Gtk::VBox() );
+      Gtk::Box * tbox = manage( new Gtk::HBox() );
+      Gtk::Box * t2box = manage( new Gtk::HBox() );
+      Gtk::ButtonBox * bbox = manage( new Gtk::HButtonBox() );
+      Gtk::ButtonBox * actbbox = manage( new Gtk::VButtonBox() );
+      Gtk::ScrolledWindow * sw = manage( new Gtk::ScrolledWindow() );
+
+      vector<string> colnames;
+      colnames.push_back(" ");
+      clist_selected_ = manage( new Gtk::CList(colnames) );
+      clist_selected_->column_titles_hide();
+      
+      text_after_ = manage( new Gnome::Entry() );
       
-      button_select_->clicked.connect(slot(this, &FormCitation::newCitation));
-      button_unselect_->clicked.connect(slot(this, &FormCitation::removeCitation));
-      button_up_->clicked.connect(slot(this, &FormCitation::moveCitationUp));
-      button_down_->clicked.connect(slot(this, &FormCitation::moveCitationDown));
+      button_unselect_ = manage( new Gnome::PixButton( _("_Remove"), GNOME_STOCK_PIXMAP_TRASH ) );
+      button_up_ = manage( new Gnome::PixButton( _("_Up"), GNOME_STOCK_PIXMAP_UP ) );
+      button_down_ = manage( new Gnome::PixButton( _("_Down"), GNOME_STOCK_PIXMAP_DOWN ) );
+
+      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) ) );
+
+      sw->set_policy(GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
 
-      search_text_->get_entry()->activate.connect(slot(this, &FormCitation::search));
-      button_search_->clicked.connect(slot(this, &FormCitation::search));
+      bbox->set_layout(GTK_BUTTONBOX_END);
+      actbbox->set_layout(GTK_BUTTONBOX_START);
       
-      b_ok->clicked.connect(slot(this, &FormCitation::apply));
-      b_ok->clicked.connect(dialog_->destroy.slot());
-      b_cancel->clicked.connect(dialog_->destroy.slot());
-      dialog_->destroy.connect(slot(this, &FormCitation::free));
+      // set up spacing
+      mbox->set_spacing(4);
+      bbox->set_spacing(4);
+      actbbox->set_spacing(4);
+      tbox->set_spacing(4);
+      t2box->set_spacing(4);
+
+      // packing widgets
+      sw->add(*clist_selected_);
+
+      bbox->children().push_back(Element(*b_ok, false, false));
+      bbox->children().push_back(Element(*b_cancel, false, false));
+
+      actbbox->children().push_back(Element(*button_unselect_, false, false));
+      actbbox->children().push_back(Element(*button_up_, false, false));
+      actbbox->children().push_back(Element(*button_down_, false, false));
+
+      t2box->children().push_back(Element(*sw, true, true));
+      t2box->children().push_back(Element(*actbbox, false, false));
+
+      tbox->children().push_back(Element(*manage(new Gtk::Label(_("Text after"))), false, false));
+      tbox->children().push_back(Element(*text_after_, true, true));
+      tbox->children().push_back(Element(*manage(new Gtk::VSeparator()), false, false));
+      tbox->children().push_back(Element(*bbox, false, false));
+
+      mbox->children().push_back(Element(*t2box,true,true));
+      mbox->children().push_back(Element(*manage(new Gtk::HSeparator()), false, false));
+      mbox->children().push_back(Element(*tbox, false, false));
+      
+      // accelerators
+      Gtk::AccelGroup * accel = Gtk::AccelGroup::create();
 
-      u_ = d_->updateBufferDependent.connect(slot(this, &FormCitation::update));
-      h_ = d_->hideBufferDependent.connect(slot(this, &FormCitation::hide));
+      button_unselect_->add_accelerator("clicked", *accel, button_unselect_->get_accelkey(), 0, GTK_ACCEL_VISIBLE);
+      button_up_->add_accelerator("clicked", *accel, button_up_->get_accelkey(), 0, GTK_ACCEL_VISIBLE);
+      button_down_->add_accelerator("clicked", *accel, button_down_->get_accelkey(), 0, GTK_ACCEL_VISIBLE);
 
-      // setting sizes of the widgets
-      string path;
-      string w, h;
-      path  += PACKAGE "/" LOCAL_CONFIGURE_PREFIX;
-      w = path + "/" + CONF_DIALOG_WIDTH + CONF_DIALOG_WIDTH_DEFAULT;
-      h = path + "/" + CONF_DIALOG_HEIGTH + CONF_DIALOG_HEIGTH_DEFAULT;
-      dialog_->set_usize(gnome_config_get_int(w.c_str()),
-                        gnome_config_get_int(h.c_str()));
+      // packing dialog to main window
+      dialog_ = mbox;
+      mainAppWin->add_action(*dialog_, _(" Citation: Edit "), true, accel);
 
-      w = path + "/" + CONF_PANE_INFO + CONF_PANE_INFO_DEFAULT;
-      paned_info_->set_position( gnome_config_get_int(w.c_str()) );
+      initWidgets();
 
-      w = path + "/" + CONF_PANE_KEY + CONF_PANE_KEY_DEFAULT;
-      paned_key_->set_position( gnome_config_get_int(w.c_str()) );
+      // setting focus
+      GTK_WIDGET_SET_FLAGS (GTK_WIDGET(b_ok->gtkobj()), GTK_CAN_DEFAULT);
+      GTK_WIDGET_SET_FLAGS (GTK_WIDGET(b_cancel->gtkobj()), GTK_CAN_DEFAULT);
+      GTK_WIDGET_SET_FLAGS (GTK_WIDGET(clist_selected_->gtkobj()), GTK_CAN_DEFAULT);
+      gtk_widget_grab_focus (GTK_WIDGET(clist_selected_->gtkobj()));
+      gtk_widget_grab_default (GTK_WIDGET(b_ok->gtkobj()));
 
-      int i, sz;
-      for (i = 0, sz = clist_bib_->columns().size(); i < sz; ++i)
-       {
-         w = path + "/" + CONF_COLUMN + "_" + tostr(i) + CONF_COLUMN_DEFAULT;
-         clist_bib_->column(i).set_width( gnome_config_get_int(w.c_str()) );
-       }
-      
-      // ready to go...
-      if (!dialog_->is_visible()) dialog_->show_all();
+      // connecting signals
+      b_ok->clicked.connect(SigC::slot(this, &FormCitation::applyEdit));
+      text_after_->get_entry()->activate.connect(SigC::slot(this, &FormCitation::applyEdit));
 
-      update();  // make sure its up-to-date
-    }
-  else
-    {
-      Gdk_Window dialog_win(dialog_->get_window());
-      dialog_win.raise();
+      b_cancel->clicked.connect(SigC::slot(mainAppWin, &GLyxAppWin::remove_action));
+
+      dialog_->destroy.connect(SigC::slot(this, &FormCitation::free));
+
+      button_unselect_->clicked.connect(SigC::slot(this, &FormCitation::removeCitation));
+      button_up_->clicked.connect(SigC::slot(this, &FormCitation::moveCitationUp));
+      button_down_->clicked.connect(SigC::slot(this, &FormCitation::moveCitationDown));      
+
+      clist_selected_->select_row.connect(SigC::bind(SigC::slot(this, &FormCitation::selectionToggled),
+                                         true, true));
+      clist_selected_->unselect_row.connect(SigC::bind(SigC::slot(this, &FormCitation::selectionToggled),
+                                           false, true));
     }
 }
 
+
 void FormCitation::addItemToBibList(int i)
 {
   vector<string> r;
@@ -328,122 +712,70 @@ void FormCitation::addItemToBibList(int i)
   clist_bib_->rows().push_back(r);
 }
 
-void FormCitation::update()
-{
-  bibkeys.clear();
-  bibkeysInfo.clear();
-
-  clist_selected_->rows().clear();
-  clist_bib_->rows().clear();
-
-  // populating clist_bib_
-  clist_bib_->freeze();
-
-  vector<pair<string,string> > blist =
-    lv_->buffer()->getBibkeyList();
-
-  int i, sz;
-  for ( i = 0, sz = blist.size(); i < sz; ++i )
-    {
-      bibkeys.push_back(blist[i].first);
-      bibkeysInfo.push_back(blist[i].second);
-    }
-
-  blist.clear();
-
-  for ( i = 0, sz = bibkeys.size(); i < sz; ++i )
-    addItemToBibList(i);
 
-  clist_bib_->sort();
-  clist_bib_->thaw();
-  // clist_bib_: done
-
-  // populating clist_selected_
-  vector<string> r;
-  string tmp, keys( params.getContents() );
-  keys = frontStrip( split(keys, tmp, ',') );
-  while( !tmp.empty() )
+void FormCitation::updateButtons()
+{
+  if (button_unselect_ != 0) // => button_up_ and button_down_ are != 0
     {
-      r.clear();
-      r.push_back(tmp);
-      clist_selected_->rows().push_back(r);
-
-      keys = frontStrip( split(keys, tmp, ',') );
+      bool sens;
+
+      sens = (clist_selected_->selection().size()>0);
+      button_unselect_->set_sensitive(sens);
+      button_up_->set_sensitive(sens &&
+                               clist_selected_->selection()[0].get_row_num()>0);
+      button_down_->set_sensitive(sens &&
+                                 clist_selected_->selection()[0].get_row_num() <
+                                 clist_selected_->rows().size()-1);
     }
-  // clist_selected_: done
-
-  text_after_->get_entry()->set_text(params.getOptions());
-  
-  updateButtons();
 }
 
-void FormCitation::updateButtons()
+
+void FormCitation::updateSlot(bool buffchanged)
 {
-  bool sens;
-
-  sens = (clist_selected_->selection().size()>0);
-  button_unselect_->set_sensitive(sens);
-  button_up_->set_sensitive(sens &&
-                           clist_selected_->selection().operator[](0).get_row_num()>0);
-  button_down_->set_sensitive(sens &&
-                             clist_selected_->selection().operator[](0).get_row_num() <
-                             clist_selected_->rows().size()-1);
-
-  sens = (clist_bib_->selection().size()>0);
-  button_select_->set_sensitive( (clist_bib_->selection().size()>0) );
+  if (buffchanged) hide();
 }
 
-void FormCitation::selection_toggled(gint            row,
-                                    gint            ,//column,
-                                    GdkEvent        * ,//event,
-                                    bool selected,
-                                    bool citeselected)
+
+void FormCitation::selectionToggled(gint            row,
+                                   gint            ,//column,
+                                   GdkEvent        * ,//event,
+                                   bool selected,
+                                   bool citeselected)
 {
-  if (selected)
+  if (!citeselected)
     {
-      bool keyfound = false;
-      string info;
-      if (citeselected)
-       {
-         // lookup the record with the same key in bibkeys and show additional Info
-         int i;
-         int sz = bibkeys.size();
-         string key = clist_selected_->cell(row,0).get_text();
-         for (i=0; !keyfound && i<sz; ++i)
-           if (bibkeys[i] == key)
-             {
-               info = bibkeysInfo[i];
-               keyfound = true;
-             }   
-       }
-      else
+      if (selected)
        {
+         bool keyfound = false;
+         string info;
+         
          // the first column in clist_bib_ contains the index
          keyfound = true;
          info = bibkeysInfo[ strToInt(clist_bib_->cell(row,0).get_text()) ];
-       }
 
-      if (keyfound)
-       info_->show_string(info);
+         if (keyfound)
+           info_->show_string(info);
+         else
+           info_->show_string(_("--- No such key in the database ---"));
+       }
       else
-       info_->show_string(N_("--- No such key in the database ---"));
-    }
-  else
-    {
-      info_->show_string("");
+       {
+         info_->show_string("");
+       }
     }
+
   updateButtons();
 }
 
 void FormCitation::removeCitation()
 {
-  clist_selected_->rows().remove(clist_selected_->selection().operator[](0));
+  clist_selected_->rows().remove(clist_selected_->selection()[0]);
   updateButtons();
 }
 
 void FormCitation::moveCitationUp()
 {
-  int i = clist_selected_->selection().operator[](0).get_row_num();
+  int i = clist_selected_->selection()[0].get_row_num();
   clist_selected_->swap_rows( i-1, i );
   clist_selected_->row(i-1).select();
   updateButtons();
@@ -451,58 +783,23 @@ void FormCitation::moveCitationUp()
 
 void FormCitation::moveCitationDown()
 {
-  int i = clist_selected_->selection().operator[](0).get_row_num();
+  int i = clist_selected_->selection()[0].get_row_num();
   clist_selected_->swap_rows( i+1, i );
   clist_selected_->row(i+1).select();
   updateButtons();
 }
 
-void FormCitation::newCitation()
-{
-  // citation key is in the first column of clist_bib_ list
-  vector<string> r;
-  r.push_back( clist_bib_->selection().operator[](0).operator[](1).get_text() );
-  clist_selected_->rows().push_back(r);
-  clist_selected_->row( clist_selected_->rows().size()-1 ).select();
-  updateButtons();
-}
-
 void FormCitation::hide()
 {
-  if (dialog_!=NULL) dialog_->destroy();
+  if (dialog_!=0) mainAppWin->remove_action();
 }
 
 void FormCitation::free()
 {
-  if (dialog_!=NULL)
+  if (dialog_!=0)
     {
-      // storing configuration
-      string path;
-      string w, h;
-      path  = PACKAGE "/" LOCAL_CONFIGURE_PREFIX;
-      w = path + "/" + CONF_DIALOG_WIDTH;
-      h = path + "/" + CONF_DIALOG_HEIGTH;
-
-      gnome_config_set_int(w.c_str(), dialog_->width());
-      gnome_config_set_int(h.c_str(), dialog_->height());
-
-      w = path + "/" + CONF_PANE_INFO;
-      gnome_config_set_int(w.c_str(), paned_key_->height());
-
-      w = path + "/" + CONF_PANE_KEY;
-      gnome_config_set_int(w.c_str(), box_keys_->width());
-
-      int i, sz;
-      for (i = 0, sz = clist_bib_->columns().size(); i < sz; ++i)
-       {
-         w = path + "/" + CONF_COLUMN + "_" + tostr(i);
-         gnome_config_set_int(w.c_str(), clist_bib_->get_column_width(i));
-       }
-
-      gnome_config_sync();
-
       // cleaning up
-      dialog_ = NULL;
+      cleanupWidgets();
       u_.disconnect();
       h_.disconnect();
       inset_ = 0;
@@ -510,12 +807,50 @@ void FormCitation::free()
     }
 }
 
-void FormCitation::apply()
+void FormCitation::applySelect()
+{
+  if( lv_->buffer()->isReadonly() ) return;
+
+  string contents = frontStrip( strip(params.getContents()) );
+  if (!contents.empty()) contents += ", ";
+  
+  int sz = clist_bib_->selection().size();
+  for (int i=0; i < sz; ++i)
+    {
+      if (i > 0) contents += ", ";
+      contents += clist_bib_->selection()[i][1].get_text();
+    }
+  
+  params.setContents( contents );
+  params.setOptions( text_after_->get_entry()->get_text() );
+
+  if( inset_ != 0 )
+    {
+      // Only update if contents have changed
+      if( params != inset_->params() )
+       {
+         inset_->setParams( params );
+         lv_->view()->updateInset( inset_, true );
+       }
+    }
+  else
+    {
+      lv_->getLyXFunc()->Dispatch( LFUN_CITATION_INSERT,
+                                  params.getAsString() );
+    }
+
+  // close dialog
+  storeWidgets();
+  hide();
+}
+
+void FormCitation::applyEdit()
 {
   if( lv_->buffer()->isReadonly() ) return;
 
   string contents;
-  for( unsigned int i = 0; i < clist_selected_->rows().size(); ++i )
+  int const sz = clist_selected_->rows().size();
+  for( int i = 0; i < sz; ++i )
     {
       if (i > 0) contents += ", ";
       contents += clist_selected_->cell(i, 0).get_text();
@@ -536,8 +871,12 @@ void FormCitation::apply()
   else
     {
       lv_->getLyXFunc()->Dispatch( LFUN_CITATION_INSERT,
-                                  params.getAsString().c_str() );
+                                  params.getAsString() );
     }
+  
+  // close dialog
+  storeWidgets();
+  hide();
 }
 
 void FormCitation::sortBibList(gint col)
@@ -546,14 +885,50 @@ void FormCitation::sortBibList(gint col)
   clist_bib_->sort();
 }
 
-// looking for entries which contain all the words specified in search_text entry
 void FormCitation::search()
+{
+  if (use_regexp_) searchReg();
+  else searchSimple();
+}
+
+// looking for entries which match regexp
+void FormCitation::searchReg()
+{
+  string rexptxt(search_string_);
+  rexptxt = frontStrip( strip( rexptxt ) );
+  
+  LRegex reg(rexptxt);
+
+  // populating clist_bib_
+  clist_bib_->rows().clear();
+
+  clist_bib_->freeze();
+
+  int const sz = bibkeys.size();
+  bool additem;
+  for ( int i = 0; i < sz; ++i )
+    {
+      string const data = bibkeys[i] + bibkeysInfo[i];
+
+      if (rexptxt.empty()) additem = true;
+      else additem = (reg.exec(data).size() > 0);
+            
+      if ( additem ) addItemToBibList(i);
+    }
+
+  clist_bib_->sort();
+  clist_bib_->thaw();
+}
+
+// looking for entries which contain all the words specified in search_text entry
+void FormCitation::searchSimple()
 {
   vector<string> searchwords;
-  string tmp, stext( search_text_->get_entry()->get_text() );
+  string tmp;
+  string stext(search_string_);
   stext = frontStrip( strip( stext ) );
   stext = frontStrip( split(stext, tmp, ' ') );
-  while( !tmp.empty() )
+  while ( !tmp.empty() )
     {
       searchwords.push_back(tmp);
       stext = frontStrip( split(stext, tmp, ' ') );
@@ -564,25 +939,20 @@ void FormCitation::search()
 
   clist_bib_->freeze();
 
-  int i, sz;
-  bool additem;
-  for ( i = 0, sz = bibkeys.size(); i < sz; ++i )
-    {
-      string data = bibkeys[i] + bibkeysInfo[i];
+  int const sz = bibkeys.size();
+  for (int i = 0; i < sz; ++i) {
+      string const data = bibkeys[i] + bibkeysInfo[i];
 
-      additem = true;
+      bool additem = true;
 
-      int j, szs;
-      for (j = 0, szs = searchwords.size();
-          additem && j < szs; ++j )
-       if ( data.find(searchwords[j]) == string::npos )
-         additem = false;
-            
-      if ( additem ) addItemToBibList(i);
+      int const szs = searchwords.size();
+      for (int j = 0; additem && j < szs; ++j)
+             if (data.find(searchwords[j]) == string::npos)
+                     additem = false;
+      
+      if (additem) addItemToBibList(i);
     }
 
   clist_bib_->sort();
   clist_bib_->thaw();
-  // clist_bib_: done
-  updateButtons();
 }