From 1e08043e67b07203944e6162ba8b9c93da89390d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Spitzm=C3=BCller?= <spitz@lyx.org>
Date: Tue, 2 Dec 2008 08:46:59 +0000
Subject: [PATCH] Add button to rescan the list of bib/bst files from within
 the dialogs.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27761 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/frontends/qt4/GuiBibtex.cpp     |  11 ++
 src/frontends/qt4/GuiBibtex.h       |   1 +
 src/frontends/qt4/ui/BibtexAddUi.ui | 112 ++++++------
 src/frontends/qt4/ui/BibtexUi.ui    | 274 ++++++++++++++--------------
 4 files changed, 211 insertions(+), 187 deletions(-)

diff --git a/src/frontends/qt4/GuiBibtex.cpp b/src/frontends/qt4/GuiBibtex.cpp
index 881c669edc..ff0a03e272 100644
--- a/src/frontends/qt4/GuiBibtex.cpp
+++ b/src/frontends/qt4/GuiBibtex.cpp
@@ -79,6 +79,8 @@ GuiBibtex::GuiBibtex(GuiView & lv)
 		this, SLOT(change_adaptor()));
 	connect(addBibPB, SIGNAL(clicked()),
 		this, SLOT(addPressed()));
+	connect(rescanPB, SIGNAL(clicked()),
+		this, SLOT(rescanClicked()));
 
 	add_ = new GuiBibtexAddDialog(this);
 	add_bc_.setPolicy(ButtonPolicy::OkCancelPolicy);
@@ -92,6 +94,8 @@ GuiBibtex::GuiBibtex(GuiView & lv)
 		this, SLOT(addDatabase()));
 	connect(add_->addPB, SIGNAL(clicked()),
 		add_, SLOT(accept()));
+	connect(add_->rescanPB, SIGNAL(clicked()),
+		this, SLOT(rescanClicked()));
 	connect(add_->bibLW, SIGNAL(itemActivated(QListWidgetItem *)),
 		this, SLOT(addDatabase()));
 	connect(add_->bibLW, SIGNAL(itemActivated(QListWidgetItem *)),
@@ -264,6 +268,13 @@ void GuiBibtex::downPressed()
 }
 
 
+void GuiBibtex::rescanClicked()
+{
+	rescanBibStyles();
+	updateContents();
+}
+
+
 void GuiBibtex::databaseChanged()
 {
 	bool readOnly = isBufferReadonly();
diff --git a/src/frontends/qt4/GuiBibtex.h b/src/frontends/qt4/GuiBibtex.h
index e9b6a16ee3..3ce3ada32d 100644
--- a/src/frontends/qt4/GuiBibtex.h
+++ b/src/frontends/qt4/GuiBibtex.h
@@ -54,6 +54,7 @@ private Q_SLOTS:
 	void databaseChanged();
 	void availableChanged();
 	void bibEDChanged();
+	void rescanClicked();
 
 private:
 	///
diff --git a/src/frontends/qt4/ui/BibtexAddUi.ui b/src/frontends/qt4/ui/BibtexAddUi.ui
index b9bbaca9ae..4b7353eb45 100644
--- a/src/frontends/qt4/ui/BibtexAddUi.ui
+++ b/src/frontends/qt4/ui/BibtexAddUi.ui
@@ -1,7 +1,4 @@
 <ui version="4.0" >
- <author></author>
- <comment></comment>
- <exportmacro></exportmacro>
  <class>BibtexAddUi</class>
  <widget class="QDialog" name="BibtexAddUi" >
   <property name="geometry" >
@@ -33,14 +30,61 @@
    <property name="spacing" >
     <number>6</number>
    </property>
-   <item row="0" column="0" colspan="2" >
-    <widget class="QListWidget" name="bibLW" >
-     <property name="selectionMode" >
-      <enum>QAbstractItemView::ExtendedSelection</enum>
+   <item row="2" column="2" >
+    <widget class="QPushButton" name="rescanPB" >
+     <property name="toolTip" >
+      <string>Scan for new databases and styles</string>
+     </property>
+     <property name="text" >
+      <string>&amp;Rescan</string>
      </property>
     </widget>
    </item>
-   <item row="3" column="0" colspan="2" >
+   <item row="2" column="0" >
+    <widget class="QPushButton" name="browsePB" >
+     <property name="text" >
+      <string>&amp;Browse...</string>
+     </property>
+     <property name="autoDefault" >
+      <bool>false</bool>
+     </property>
+     <property name="default" >
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="1" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeType" >
+      <enum>QSizePolicy::Expanding</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>21</width>
+       <height>29</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="1" column="0" colspan="3" >
+    <widget class="QLineEdit" name="bibED" >
+     <property name="sizePolicy" >
+      <sizepolicy>
+       <hsizetype>7</hsizetype>
+       <vsizetype>0</vsizetype>
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="toolTip" >
+      <string>Enter BibTeX database name</string>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="0" colspan="3" >
     <layout class="QHBoxLayout" >
      <property name="margin" >
       <number>0</number>
@@ -89,56 +133,15 @@
      </item>
     </layout>
    </item>
-   <item row="2" column="1" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeType" >
-      <enum>QSizePolicy::Expanding</enum>
-     </property>
-     <property name="sizeHint" >
-      <size>
-       <width>20</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="1" column="0" colspan="2" >
-    <widget class="QLineEdit" name="bibED" >
-     <property name="sizePolicy" >
-      <sizepolicy>
-       <hsizetype>7</hsizetype>
-       <vsizetype>0</vsizetype>
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="toolTip" >
-      <string>Enter BibTeX database name</string>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="0" >
-    <widget class="QPushButton" name="browsePB" >
-     <property name="text" >
-      <string>&amp;Browse...</string>
-     </property>
-     <property name="autoDefault" >
-      <bool>false</bool>
-     </property>
-     <property name="default" >
-      <bool>true</bool>
+   <item row="0" column="0" colspan="3" >
+    <widget class="QListWidget" name="bibLW" >
+     <property name="selectionMode" >
+      <enum>QAbstractItemView::ExtendedSelection</enum>
      </property>
     </widget>
    </item>
   </layout>
  </widget>
- <pixmapfunction></pixmapfunction>
- <includes>
-  <include location="local" >qt_i18n.h</include>
- </includes>
  <tabstops>
   <tabstop>bibLW</tabstop>
   <tabstop>bibED</tabstop>
@@ -146,6 +149,9 @@
   <tabstop>addPB</tabstop>
   <tabstop>closePB</tabstop>
  </tabstops>
+ <includes>
+  <include location="local" >qt_i18n.h</include>
+ </includes>
  <resources/>
  <connections/>
 </ui>
diff --git a/src/frontends/qt4/ui/BibtexUi.ui b/src/frontends/qt4/ui/BibtexUi.ui
index 21f72c4733..ebcd369f24 100644
--- a/src/frontends/qt4/ui/BibtexUi.ui
+++ b/src/frontends/qt4/ui/BibtexUi.ui
@@ -1,7 +1,4 @@
 <ui version="4.0" >
- <author></author>
- <comment></comment>
- <exportmacro></exportmacro>
  <class>BibtexUi</class>
  <widget class="QDialog" name="BibtexUi" >
   <property name="geometry" >
@@ -9,7 +6,7 @@
     <x>0</x>
     <y>0</y>
     <width>352</width>
-    <height>313</height>
+    <height>334</height>
    </rect>
   </property>
   <property name="windowTitle" >
@@ -25,20 +22,102 @@
    <property name="spacing" >
     <number>6</number>
    </property>
-   <item rowspan="5" row="1" column="0" colspan="2" >
+   <item rowspan="2" row="9" column="2" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeType" >
+      <enum>QSizePolicy::Expanding</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>20</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item rowspan="6" row="1" column="0" colspan="2" >
     <widget class="QListWidget" name="databaseLW" />
    </item>
-   <item row="9" column="0" colspan="2" >
-    <widget class="QCheckBox" name="bibtocCB" >
+   <item rowspan="2" row="6" column="2" >
+    <widget class="QPushButton" name="rescanPB" >
      <property name="toolTip" >
-      <string>Add bibliography to the table of contents</string>
+      <string>Scan for new databases and styles</string>
      </property>
      <property name="text" >
-      <string>Add bibliography to &amp;TOC</string>
+      <string>&amp;Rescan</string>
      </property>
     </widget>
    </item>
-   <item row="8" column="0" >
+   <item row="5" column="2" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeType" >
+      <enum>QSizePolicy::Expanding</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>77</width>
+       <height>16</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="7" column="0" colspan="2" >
+    <widget class="QLabel" name="styleLA" >
+     <property name="sizePolicy" >
+      <sizepolicy>
+       <hsizetype>1</hsizetype>
+       <vsizetype>0</vsizetype>
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="toolTip" >
+      <string>The BibTeX style</string>
+     </property>
+     <property name="text" >
+      <string>St&amp;yle</string>
+     </property>
+     <property name="buddy" >
+      <cstring>styleCB</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="8" column="2" >
+    <widget class="QPushButton" name="stylePB" >
+     <property name="toolTip" >
+      <string>Choose a style file</string>
+     </property>
+     <property name="text" >
+      <string>&amp;Browse...</string>
+     </property>
+     <property name="autoDefault" >
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="8" column="0" colspan="2" >
+    <widget class="QComboBox" name="styleCB" >
+     <property name="toolTip" >
+      <string>Choose a style file</string>
+     </property>
+     <property name="editable" >
+      <bool>true</bool>
+     </property>
+     <property name="autoCompletion" >
+      <bool>true</bool>
+     </property>
+     <property name="duplicatesEnabled" >
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="9" column="0" >
     <widget class="QLabel" name="btPrintLA" >
      <property name="sizePolicy" >
       <sizepolicy>
@@ -59,7 +138,7 @@
      </property>
     </widget>
    </item>
-   <item row="8" column="1" >
+   <item row="9" column="1" >
     <widget class="QComboBox" name="btPrintCO" >
      <property name="toolTip" >
       <string>This bibliography section contains...</string>
@@ -81,112 +160,17 @@
      </item>
     </widget>
    </item>
-   <item rowspan="2" row="8" column="2" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeType" >
-      <enum>QSizePolicy::Expanding</enum>
-     </property>
-     <property name="sizeHint" >
-      <size>
-       <width>20</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="7" column="2" >
-    <widget class="QPushButton" name="stylePB" >
+   <item row="10" column="0" colspan="2" >
+    <widget class="QCheckBox" name="bibtocCB" >
      <property name="toolTip" >
-      <string>Choose a style file</string>
+      <string>Add bibliography to the table of contents</string>
      </property>
      <property name="text" >
-      <string>&amp;Browse...</string>
-     </property>
-     <property name="autoDefault" >
-      <bool>false</bool>
+      <string>Add bibliography to &amp;TOC</string>
      </property>
     </widget>
    </item>
-   <item row="7" column="0" colspan="2" >
-    <widget class="QComboBox" name="styleCB" >
-     <property name="toolTip" >
-      <string>Choose a style file</string>
-     </property>
-     <property name="editable" >
-      <bool>true</bool>
-     </property>
-     <property name="autoCompletion" >
-      <bool>true</bool>
-     </property>
-     <property name="duplicatesEnabled" >
-      <bool>false</bool>
-     </property>
-    </widget>
-   </item>
-   <item rowspan="2" row="5" column="2" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeType" >
-      <enum>QSizePolicy::Expanding</enum>
-     </property>
-     <property name="sizeHint" >
-      <size>
-       <width>20</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="2" column="2" >
-    <widget class="QPushButton" name="deletePB" >
-     <property name="toolTip" >
-      <string>Remove the selected database</string>
-     </property>
-     <property name="text" >
-      <string>&amp;Delete</string>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="2" >
-    <widget class="QPushButton" name="addBibPB" >
-     <property name="toolTip" >
-      <string>Add a BibTeX database file</string>
-     </property>
-     <property name="text" >
-      <string>&amp;Add...</string>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="0" colspan="3" >
-    <widget class="QLabel" name="databaseLA" >
-     <property name="sizePolicy" >
-      <sizepolicy>
-       <hsizetype>1</hsizetype>
-       <vsizetype>0</vsizetype>
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="toolTip" >
-      <string>BibTeX database to use</string>
-     </property>
-     <property name="text" >
-      <string>Databa&amp;ses</string>
-     </property>
-     <property name="alignment" >
-      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
-     </property>
-     <property name="buddy" >
-      <cstring>databaseLW</cstring>
-     </property>
-    </widget>
-   </item>
-   <item row="10" column="0" colspan="3" >
+   <item row="11" column="0" colspan="3" >
     <layout class="QHBoxLayout" >
      <property name="margin" >
       <number>0</number>
@@ -235,24 +219,13 @@
      </item>
     </layout>
    </item>
-   <item row="6" column="0" colspan="2" >
-    <widget class="QLabel" name="styleLA" >
-     <property name="sizePolicy" >
-      <sizepolicy>
-       <hsizetype>1</hsizetype>
-       <vsizetype>0</vsizetype>
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
+   <item row="4" column="2" >
+    <widget class="QPushButton" name="downPB" >
      <property name="toolTip" >
-      <string>The BibTeX style</string>
+      <string>Move the selected database downwards in the list</string>
      </property>
      <property name="text" >
-      <string>St&amp;yle</string>
-     </property>
-     <property name="buddy" >
-      <cstring>styleCB</cstring>
+      <string>Do&amp;wn</string>
      </property>
     </widget>
    </item>
@@ -266,22 +239,52 @@
      </property>
     </widget>
    </item>
-   <item row="4" column="2" >
-    <widget class="QPushButton" name="downPB" >
+   <item row="0" column="0" colspan="3" >
+    <widget class="QLabel" name="databaseLA" >
+     <property name="sizePolicy" >
+      <sizepolicy>
+       <hsizetype>1</hsizetype>
+       <vsizetype>0</vsizetype>
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
      <property name="toolTip" >
-      <string>Move the selected database downwards in the list</string>
+      <string>BibTeX database to use</string>
      </property>
      <property name="text" >
-      <string>Do&amp;wn</string>
+      <string>Databa&amp;ses</string>
+     </property>
+     <property name="alignment" >
+      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+     </property>
+     <property name="buddy" >
+      <cstring>databaseLW</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="2" >
+    <widget class="QPushButton" name="addBibPB" >
+     <property name="toolTip" >
+      <string>Add a BibTeX database file</string>
+     </property>
+     <property name="text" >
+      <string>&amp;Add...</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="2" >
+    <widget class="QPushButton" name="deletePB" >
+     <property name="toolTip" >
+      <string>Remove the selected database</string>
+     </property>
+     <property name="text" >
+      <string>&amp;Delete</string>
      </property>
     </widget>
    </item>
   </layout>
  </widget>
- <pixmapfunction></pixmapfunction>
- <includes>
-  <include location="local" >qt_i18n.h</include>
- </includes>
  <tabstops>
   <tabstop>addBibPB</tabstop>
   <tabstop>deletePB</tabstop>
@@ -292,6 +295,9 @@
   <tabstop>okPB</tabstop>
   <tabstop>closePB</tabstop>
  </tabstops>
+ <includes>
+  <include location="local" >qt_i18n.h</include>
+ </includes>
  <resources/>
  <connections/>
 </ui>