More QDialogButtonBox transformation

GuiDelimiter through GuiIndex

See #11003

diff --git a/src/frontends/qt4/GuiDelimiter.cpp b/src/frontends/qt4/GuiDelimiter.cpp
index 683168c38a41c87f528aea61593ac7efa4379cb1..8dc97ffe17bdf186d1aeb3214a8b975032546fdf 100644 (file)
--- a/src/frontends/qt4/GuiDelimiter.cpp
+++ b/src/frontends/qt4/GuiDelimiter.cpp
@@ -185,7 +185,7 @@ GuiDelimiter::GuiDelimiter(GuiView & lv)
 {
        setupUi(this);
 
-       connect(closePB, SIGNAL(clicked()), this, SLOT(accept()));
+       connect(buttonBox, SIGNAL(rejected()), this, SLOT(accept()));
 
        setFocusProxy(leftLW);
 
@@ -333,7 +333,25 @@ void GuiDelimiter::updateTeXCode(int size)
 }
 
 
-void GuiDelimiter::on_insertPB_clicked()
+void  GuiDelimiter::on_buttonBox_clicked(QAbstractButton * button)
+{
+       switch (buttonBox->standardButton(button)) {
+       case QDialogButtonBox::Apply:
+               insert();
+               break;
+       case QDialogButtonBox::Ok:
+               insert();
+       // fall through
+       case QDialogButtonBox::Cancel:
+               accept();
+               break;
+       default:
+               break;
+       }
+}
+
+
+void GuiDelimiter::insert()
 {
        if (sizeCO->currentIndex() == 0)
                dispatch(FuncRequest(LFUN_MATH_DELIM, tex_code_));
@@ -342,6 +360,7 @@ void GuiDelimiter::on_insertPB_clicked()
                command = support::subst(command, from_ascii(" "), from_ascii("\" \""));
                dispatch(FuncRequest(LFUN_MATH_BIGDELIM, command));
        }
+       buttonBox->button(QDialogButtonBox::Cancel)->setText(qt_("Close"));
 }
 
 
@@ -356,7 +375,7 @@ void GuiDelimiter::on_leftLW_itemActivated(QListWidgetItem *)
        // do not auto-apply if !matchCB->isChecked()
        if (!matchCB->isChecked())
                return;
-       on_insertPB_clicked();
+       insert();
        accept();
 }
 
@@ -366,7 +385,7 @@ void GuiDelimiter::on_rightLW_itemActivated(QListWidgetItem *)
        // do not auto-apply if !matchCB->isChecked()
        if (!matchCB->isChecked())
                return;
-       on_insertPB_clicked();
+       insert();
        accept();
 }
 

diff --git a/src/frontends/qt4/GuiDelimiter.h b/src/frontends/qt4/GuiDelimiter.h
index 7bd6ee610be5775e1dfde3f62ed8d36c85e17fcd..3d44e224b05471a734f9a41a448ae944ded4918c 100644 (file)
--- a/src/frontends/qt4/GuiDelimiter.h
+++ b/src/frontends/qt4/GuiDelimiter.h
@@ -34,12 +34,13 @@ public:
        bool isBufferDependent() const { return true; }
 
 public Q_SLOTS:
+       void on_buttonBox_clicked(QAbstractButton * button);
        void on_leftLW_itemActivated(QListWidgetItem *);
        void on_rightLW_itemActivated(QListWidgetItem *);
        void on_leftLW_currentRowChanged(int);
        void on_rightLW_currentRowChanged(int);
        void on_matchCB_stateChanged(int);
-       void on_insertPB_clicked();
+       void insert();
        void on_swapPB_clicked();
        void on_sizeCO_activated(int);
 

diff --git a/src/frontends/qt4/GuiDocument.cpp b/src/frontends/qt4/GuiDocument.cpp
index 70d6d617f35d79fce89238d349c8a9f2849dd3e0..d60385b041dd98d5bda834874fb4264347b5851a 100644 (file)
--- a/src/frontends/qt4/GuiDocument.cpp
+++ b/src/frontends/qt4/GuiDocument.cpp
@@ -765,20 +765,18 @@ GuiDocument::GuiDocument(GuiView & lv)
 {
        setupUi(this);
 
-       connect(okPB, SIGNAL(clicked()), this, SLOT(slotOK()));
-       connect(applyPB, SIGNAL(clicked()), this, SLOT(slotApply()));
-       connect(closePB, SIGNAL(clicked()), this, SLOT(slotClose()));
-       connect(restorePB, SIGNAL(clicked()), this, SLOT(slotRestore()));
+       connect(buttonBox, SIGNAL(clicked(QAbstractButton *)),
+               this, SLOT(slotButtonBox(QAbstractButton *)));
 
        connect(savePB, SIGNAL(clicked()), this, SLOT(saveDefaultClicked()));
        connect(defaultPB, SIGNAL(clicked()), this, SLOT(useDefaultsClicked()));
 
        // Manage the restore, ok, apply, restore and cancel/close buttons
        bc().setPolicy(ButtonPolicy::NoRepeatedApplyReadOnlyPolicy);
-       bc().setOK(okPB);
-       bc().setApply(applyPB);
-       bc().setCancel(closePB);
-       bc().setRestore(restorePB);
+       bc().setOK(buttonBox->button(QDialogButtonBox::Ok));
+       bc().setApply(buttonBox->button(QDialogButtonBox::Apply));
+       bc().setCancel(buttonBox->button(QDialogButtonBox::Cancel));
+       bc().setRestore(buttonBox->button(QDialogButtonBox::Reset));
 
 
        // text layout
@@ -1692,6 +1690,28 @@ void GuiDocument::slotOK()
 }
 
 
+void GuiDocument::slotButtonBox(QAbstractButton * button)
+{
+       switch (buttonBox->standardButton(button)) {
+       case QDialogButtonBox::Ok:
+               slotOK();
+               break;
+       case QDialogButtonBox::Apply:
+               slotApply();
+               break;
+       case QDialogButtonBox::Cancel:
+               slotClose();
+               break;
+       case QDialogButtonBox::Reset:
+       case QDialogButtonBox::RestoreDefaults:
+               slotRestore();
+               break;
+       default:
+               break;
+       }
+}
+
+
 void GuiDocument::includeonlyClicked(QTreeWidgetItem * item, int)
 {
        if (item == 0)
@@ -2521,7 +2541,7 @@ void GuiDocument::classChanged()
                return;
        string const classname = fromqstr(latexModule->classCO->getData(idx));
 
-       if (applyPB->isEnabled()) {
+       if (buttonBox->button(QDialogButtonBox::Apply)->isEnabled()) {
                int const ret = Alert::prompt(_("Unapplied changes"),
                                _("Some changes in the dialog were not yet applied.\n"
                                "If you do not apply now, they will be lost after this action."),
@@ -2823,7 +2843,8 @@ void GuiDocument::modulesChanged()
 {
        modulesToParams(bp_);
 
-       if (applyPB->isEnabled() && (nonModuleChanged_ || shellescapeChanged_)) {
+       if (buttonBox->button(QDialogButtonBox::Apply)->isEnabled()
+           && (nonModuleChanged_ || shellescapeChanged_)) {
                int const ret = Alert::prompt(_("Unapplied changes"),
                                _("Some changes in the dialog were not yet applied.\n"
                                "If you do not apply now, they will be lost after this action."),
@@ -4294,7 +4315,7 @@ void GuiDocument::updateContents()
 
 void GuiDocument::useClassDefaults()
 {
-       if (applyPB->isEnabled()) {
+       if (buttonBox->button(QDialogButtonBox::Apply)->isEnabled()) {
                int const ret = Alert::prompt(_("Unapplied changes"),
                                _("Some changes in the dialog were not yet applied.\n"
                                  "If you do not apply now, they will be lost after this action."),

diff --git a/src/frontends/qt4/GuiDocument.h b/src/frontends/qt4/GuiDocument.h
index dd51bac8c4b8fbe99fecac1f999f5f2ea0e0605e..8812ff91c4e440a2fa536dc7749144b5b0943e39 100644 (file)
--- a/src/frontends/qt4/GuiDocument.h
+++ b/src/frontends/qt4/GuiDocument.h
@@ -94,6 +94,7 @@ public Q_SLOTS:
        void slotOK();
        // Apply button clicked
        void slotApply();
+       void slotButtonBox(QAbstractButton *);
 
 private Q_SLOTS:
        void updateNumbering();

diff --git a/src/frontends/qt4/GuiErrorList.cpp b/src/frontends/qt4/GuiErrorList.cpp
index 3ab716acb16792df12e7e441ccaa750b8e132cab..0b625ccd519bf5ad2a73fca67919a165d0973b5e 100644 (file)
--- a/src/frontends/qt4/GuiErrorList.cpp
+++ b/src/frontends/qt4/GuiErrorList.cpp
@@ -62,8 +62,8 @@ GuiErrorList::GuiErrorList(GuiView & lv)
 {
        setupUi(this);
 
-       connect(closePB, SIGNAL(clicked()),
-               this, SLOT(slotClose()));
+       connect(buttonBox, SIGNAL(clicked(QAbstractButton *)),
+                       this, SLOT(slotButtonBox(QAbstractButton *)));
        connect(viewLogPB, SIGNAL(clicked()),
                this, SLOT(viewLog()));
        connect(showAnywayPB, SIGNAL(clicked()),
@@ -72,7 +72,7 @@ GuiErrorList::GuiErrorList(GuiView & lv)
                this, SLOT(select()));
 
        bc().setPolicy(ButtonPolicy::OkCancelPolicy);
-       bc().setCancel(closePB);
+       bc().setCancel(buttonBox->button(QDialogButtonBox::Cancel));
 }
 
 

diff --git a/src/frontends/qt4/GuiExternal.cpp b/src/frontends/qt4/GuiExternal.cpp
index 87005fe9d2523af3a9261385f76e3b3fd934e138..7be6be0954a69e49f330522003ee9bf7b00fc34d 100644 (file)
--- a/src/frontends/qt4/GuiExternal.cpp
+++ b/src/frontends/qt4/GuiExternal.cpp
@@ -88,9 +88,8 @@ GuiExternal::GuiExternal(GuiView & lv)
 {
        setupUi(this);
 
-       connect(okPB, SIGNAL(clicked()), this, SLOT(slotOK()));
-       connect(applyPB, SIGNAL(clicked()), this, SLOT(slotApply()));
-       connect(closePB, SIGNAL(clicked()), this, SLOT(slotClose()));
+       connect(buttonBox, SIGNAL(clicked(QAbstractButton *)),
+                       this, SLOT(slotButtonBox(QAbstractButton *)));
 
        /*
        connect(displayGB, SIGNAL(toggled(bool)),
@@ -159,9 +158,9 @@ GuiExternal::GuiExternal(GuiView & lv)
 
        bc().setPolicy(ButtonPolicy::NoRepeatedApplyReadOnlyPolicy);
 
-       bc().setOK(okPB);
-       bc().setApply(applyPB);
-       bc().setCancel(closePB);
+       bc().setOK(buttonBox->button(QDialogButtonBox::Ok));
+       bc().setApply(buttonBox->button(QDialogButtonBox::Apply));
+       bc().setCancel(buttonBox->button(QDialogButtonBox::Cancel));
 
        bc().addReadOnly(fileED);
        bc().addReadOnly(browsePB);

diff --git a/src/frontends/qt4/GuiGraphics.cpp b/src/frontends/qt4/GuiGraphics.cpp
index 3c6bd21376cba1497794d6d96ad8c391d954db9c..b6bbaeac3fb13860c7a7049a4b0b01ec7c378af7 100644 (file)
--- a/src/frontends/qt4/GuiGraphics.cpp
+++ b/src/frontends/qt4/GuiGraphics.cpp
@@ -115,10 +115,8 @@ GuiGraphics::GuiGraphics(GuiView & lv)
        setupUi(this);
 
        //main buttons
-       connect(okPB, SIGNAL(clicked()), this, SLOT(slotOK()));
-       connect(applyPB, SIGNAL(clicked()), this, SLOT(slotApply()));
-       connect(closePB, SIGNAL(clicked()), this, SLOT(slotClose()));
-       connect(restorePB, SIGNAL(clicked()), this, SLOT(slotRestore()));
+       connect(buttonBox, SIGNAL(clicked(QAbstractButton *)),
+                       this, SLOT(slotButtonBox(QAbstractButton *)));
 
        //graphics pane
        connect(filename, SIGNAL(textChanged(const QString &)),
@@ -212,10 +210,10 @@ GuiGraphics::GuiGraphics(GuiView & lv)
        displayscale->setValidator(new QIntValidator(displayscale));
 
        bc().setPolicy(ButtonPolicy::NoRepeatedApplyReadOnlyPolicy);
-       bc().setOK(okPB);
-       bc().setApply(applyPB);
-       bc().setRestore(restorePB);
-       bc().setCancel(closePB);
+       bc().setOK(buttonBox->button(QDialogButtonBox::Ok));
+       bc().setApply(buttonBox->button(QDialogButtonBox::Apply));
+       bc().setCancel(buttonBox->button(QDialogButtonBox::Cancel));
+       bc().setRestore(buttonBox->button(QDialogButtonBox::Reset));
 
        bc().addReadOnly(latexoptions);
        bc().addReadOnly(filenameL);

diff --git a/src/frontends/qt4/GuiInclude.cpp b/src/frontends/qt4/GuiInclude.cpp
index 36fb9a07f7b2e55c8809d9a343ce467747a9459a..43f71d73441a2f392cd1ee72ddd683fa01e2dc36 100644 (file)
--- a/src/frontends/qt4/GuiInclude.cpp
+++ b/src/frontends/qt4/GuiInclude.cpp
@@ -51,8 +51,8 @@ GuiInclude::GuiInclude(GuiView & lv)
 {
        setupUi(this);
 
-       connect(okPB, SIGNAL(clicked()), this, SLOT(slotOK()));
-       connect(closePB, SIGNAL(clicked()), this, SLOT(slotClose()));
+       connect(buttonBox, SIGNAL(clicked(QAbstractButton *)),
+               this, SLOT(slotButtonBox(QAbstractButton *)));
 
        connect(visiblespaceCB, SIGNAL(clicked()), this, SLOT(change_adaptor()));
        connect(filenameED, SIGNAL(textChanged(const QString &)),
@@ -73,8 +73,8 @@ GuiInclude::GuiInclude(GuiView & lv)
        setFocusProxy(filenameED);
 
        bc().setPolicy(ButtonPolicy::OkApplyCancelReadOnlyPolicy);
-       bc().setOK(okPB);
-       bc().setCancel(closePB);
+       bc().setOK(buttonBox->button(QDialogButtonBox::Ok));
+       bc().setCancel(buttonBox->button(QDialogButtonBox::Cancel));
        bc().addReadOnly(filenameED);
        bc().addReadOnly(browsePB);
        bc().addReadOnly(visiblespaceCB);
@@ -157,7 +157,7 @@ void GuiInclude::typeChanged(int v)
        //see this thread
        //  http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg118471.html
        //for the reason this is here.
-       okPB->setDefault(true);
+       buttonBox->button(QDialogButtonBox::Ok)->setDefault(true);
 }
 
 

diff --git a/src/frontends/qt4/GuiIndex.cpp b/src/frontends/qt4/GuiIndex.cpp
index aec568e0b06d48d75239264bc2b612cc2a4bdec5..7800bad2d456a18c48708697907b4d58d84f063a 100644 (file)
--- a/src/frontends/qt4/GuiIndex.cpp
+++ b/src/frontends/qt4/GuiIndex.cpp
@@ -35,13 +35,13 @@ GuiIndex::GuiIndex(GuiView & lv)
 {
        setupUi(this);
 
-       connect(okPB, SIGNAL(clicked()), this, SLOT(slotOK()));
-       connect(cancelPB, SIGNAL(clicked()), this, SLOT(slotClose()));
+       connect(buttonBox, SIGNAL(clicked(QAbstractButton *)),
+               this, SLOT(slotButtonBox(QAbstractButton *)));
        connect(indicesCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
 
        bc().setPolicy(ButtonPolicy::NoRepeatedApplyReadOnlyPolicy);
-       bc().setOK(okPB);
-       bc().setCancel(cancelPB);
+       bc().setOK(buttonBox->button(QDialogButtonBox::Ok));
+       bc().setCancel(buttonBox->button(QDialogButtonBox::Cancel));
 }
 
 

diff --git a/src/frontends/qt4/ui/DelimiterUi.ui b/src/frontends/qt4/ui/DelimiterUi.ui
index 96cdc4968ca65824210a93ff6827177f3d62b023..1e58c452b8c5a0f53f57714b38b0ab92ad3aa01c 100644 (file)
--- a/src/frontends/qt4/ui/DelimiterUi.ui
+++ b/src/frontends/qt4/ui/DelimiterUi.ui
@@ -56,31 +56,9 @@
         </spacer>
        </item>
        <item>
-        <widget class="QPushButton" name="insertPB">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="toolTip">
-          <string>Insert the delimiters</string>
-         </property>
-         <property name="text">
-          <string>&amp;Insert</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QPushButton" name="closePB">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="text">
-          <string>&amp;Close</string>
+        <widget class="QDialogButtonBox" name="buttonBox">
+         <property name="standardButtons">
+          <set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
          </property>
         </widget>
        </item>
@@ -275,8 +253,6 @@
  <layoutdefault spacing="6" margin="9"/>
  <tabstops>
   <tabstop>sizeCO</tabstop>
-  <tabstop>insertPB</tabstop>
-  <tabstop>closePB</tabstop>
  </tabstops>
  <includes>
   <include location="local">qt_i18n.h</include>

diff --git a/src/frontends/qt4/ui/DocumentUi.ui b/src/frontends/qt4/ui/DocumentUi.ui
index 3a7b4c9ef637c88f27c4e775e5a982283479ec5a..fc7d3f29f0d571689ce1bcb6e39038859f80805b 100644 (file)
--- a/src/frontends/qt4/ui/DocumentUi.ui
+++ b/src/frontends/qt4/ui/DocumentUi.ui
@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>DocumentUi</class>
- <widget class="QDialog" name="DocumentUi" >
-  <property name="geometry" >
+ <widget class="QDialog" name="DocumentUi">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
@@ -9,140 +10,118 @@
     <height>169</height>
    </rect>
   </property>
-  <property name="sizePolicy" >
-   <sizepolicy>
-    <hsizetype>1</hsizetype>
-    <vsizetype>1</vsizetype>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string/>
   </property>
-  <property name="sizeGripEnabled" >
+  <property name="sizeGripEnabled">
    <bool>true</bool>
   </property>
-  <layout class="QGridLayout" >
-   <property name="margin" >
+  <layout class="QGridLayout">
+   <property name="leftMargin">
     <number>9</number>
    </property>
-   <property name="spacing" >
+   <property name="topMargin">
+    <number>9</number>
+   </property>
+   <property name="rightMargin">
+    <number>9</number>
+   </property>
+   <property name="bottomMargin">
+    <number>9</number>
+   </property>
+   <property name="spacing">
     <number>6</number>
    </property>
-   <item row="2" column="0" >
-    <layout class="QHBoxLayout" >
-     <property name="margin" >
+   <item row="2" column="0">
+    <layout class="QHBoxLayout">
+     <property name="spacing">
+      <number>6</number>
+     </property>
+     <property name="leftMargin">
       <number>0</number>
      </property>
-     <property name="spacing" >
-      <number>6</number>
+     <property name="topMargin">
+      <number>0</number>
+     </property>
+     <property name="rightMargin">
+      <number>0</number>
+     </property>
+     <property name="bottomMargin">
+      <number>0</number>
      </property>
      <item>
-      <widget class="QPushButton" name="restorePB" >
-       <property name="text" >
-        <string>&amp;Restore</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <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>
-      <widget class="QPushButton" name="okPB" >
-       <property name="text" >
-        <string>&amp;OK</string>
-       </property>
-       <property name="default" >
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="applyPB" >
-       <property name="text" >
-        <string>&amp;Apply</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="closePB" >
-       <property name="text" >
-        <string>&amp;Cancel</string>
-       </property>
-       <property name="autoDefault" >
-        <bool>false</bool>
+      <widget class="QDialogButtonBox" name="buttonBox">
+       <property name="standardButtons">
+        <set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok|QDialogButtonBox::Reset</set>
        </property>
       </widget>
      </item>
     </layout>
    </item>
-   <item row="1" column="0" >
-    <layout class="QHBoxLayout" >
-     <property name="margin" >
+   <item row="1" column="0">
+    <layout class="QHBoxLayout">
+     <property name="spacing">
+      <number>6</number>
+     </property>
+     <property name="leftMargin">
       <number>0</number>
      </property>
-     <property name="spacing" >
-      <number>6</number>
+     <property name="topMargin">
+      <number>0</number>
+     </property>
+     <property name="rightMargin">
+      <number>0</number>
+     </property>
+     <property name="bottomMargin">
+      <number>0</number>
      </property>
      <item>
-      <widget class="QPushButton" name="defaultPB" >
-       <property name="sizePolicy" >
-        <sizepolicy>
-         <hsizetype>3</hsizetype>
-         <vsizetype>0</vsizetype>
+      <widget class="QPushButton" name="defaultPB">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
-       <property name="toolTip" >
+       <property name="toolTip">
         <string>Reset to the default settings for the document class</string>
        </property>
-       <property name="text" >
+       <property name="text">
         <string>Use Class Defaults</string>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QPushButton" name="savePB" >
-       <property name="sizePolicy" >
-        <sizepolicy>
-         <hsizetype>3</hsizetype>
-         <vsizetype>0</vsizetype>
+      <widget class="QPushButton" name="savePB">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
-       <property name="toolTip" >
+       <property name="toolTip">
         <string>Save settings as LyX's default document settings</string>
        </property>
-       <property name="text" >
+       <property name="text">
         <string>Save as Document Defaults</string>
        </property>
       </widget>
      </item>
      <item>
       <spacer>
-       <property name="orientation" >
+       <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
-       <property name="sizeType" >
+       <property name="sizeType">
         <enum>QSizePolicy::Expanding</enum>
        </property>
-       <property name="sizeHint" >
+       <property name="sizeHint" stdset="0">
         <size>
          <width>20</width>
          <height>20</height>
@@ -152,8 +131,8 @@
      </item>
     </layout>
    </item>
-   <item row="0" column="0" >
-    <widget class="lyx::frontend::PanelStack" native="1" name="docPS" />
+   <item row="0" column="0">
+    <widget class="lyx::frontend::PanelStack" name="docPS" native="true"/>
    </item>
   </layout>
  </widget>
@@ -169,13 +148,9 @@
   <tabstop>docPS</tabstop>
   <tabstop>defaultPB</tabstop>
   <tabstop>savePB</tabstop>
-  <tabstop>restorePB</tabstop>
-  <tabstop>okPB</tabstop>
-  <tabstop>applyPB</tabstop>
-  <tabstop>closePB</tabstop>
  </tabstops>
  <includes>
-  <include location="local" >qt_i18n.h</include>
+  <include location="local">qt_i18n.h</include>
  </includes>
  <resources/>
  <connections/>

diff --git a/src/frontends/qt4/ui/ErrorListUi.ui b/src/frontends/qt4/ui/ErrorListUi.ui
index ffbdd383c9bf8badca3f3f7d3eb5052f327b7414..af88139a9bec4e2c62f310ebeb56707a278544d0 100644 (file)
--- a/src/frontends/qt4/ui/ErrorListUi.ui
+++ b/src/frontends/qt4/ui/ErrorListUi.ui
@@ -1,75 +1,93 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>ErrorListUi</class>
- <widget class="QDialog" name="ErrorListUi" >
-  <property name="geometry" >
+ <widget class="QDialog" name="ErrorListUi">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>274</width>
+    <width>447</width>
     <height>422</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string/>
   </property>
-  <property name="sizeGripEnabled" >
+  <property name="sizeGripEnabled">
    <bool>true</bool>
   </property>
-  <layout class="QGridLayout" >
-   <property name="margin" >
+  <layout class="QGridLayout">
+   <property name="leftMargin">
     <number>9</number>
    </property>
-   <property name="spacing" >
+   <property name="topMargin">
+    <number>9</number>
+   </property>
+   <property name="rightMargin">
+    <number>9</number>
+   </property>
+   <property name="bottomMargin">
+    <number>9</number>
+   </property>
+   <property name="spacing">
     <number>6</number>
    </property>
-   <item row="3" column="0" colspan="4" >
-    <widget class="QTextBrowser" name="descriptionTB" >
-     <property name="sizePolicy" >
-      <sizepolicy>
-       <hsizetype>3</hsizetype>
-       <vsizetype>0</vsizetype>
+   <item row="1" column="0" colspan="5">
+    <widget class="QListWidget" name="errorsLW">
+     <property name="toolTip">
+      <string>Selecting an error will show the error message in the panel below and the cursor will jump to the location in the document where the error occurred.</string>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="0" colspan="5">
+    <widget class="QTextBrowser" name="descriptionTB">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
-     <property name="toolTip" >
+     <property name="toolTip">
       <string>For more information, refer to the complete log.</string>
      </property>
     </widget>
    </item>
-   <item row="0" column="0" colspan="2" >
-    <widget class="QLabel" name="errorsLabel" >
-     <property name="text" >
+   <item row="2" column="0" colspan="2">
+    <widget class="QLabel" name="descriptionLabel">
+     <property name="text">
+      <string>Description:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="0" colspan="2">
+    <widget class="QLabel" name="errorsLabel">
+     <property name="text">
       <string>&amp;Errors:</string>
      </property>
-     <property name="buddy" >
+     <property name="buddy">
       <cstring>errorsLW</cstring>
      </property>
     </widget>
    </item>
-   <item row="2" column="0" colspan="2" >
-    <widget class="QLabel" name="descriptionLabel" >
-     <property name="text" >
-      <string>Description:</string>
+   <item row="4" column="0">
+    <widget class="QPushButton" name="viewLogPB">
+     <property name="toolTip">
+      <string>Open the LaTeX Log File dialog</string>
      </property>
-    </widget>
-   </item>
-   <item row="4" column="3" >
-    <widget class="QPushButton" name="closePB" >
-     <property name="text" >
-      <string>&amp;Close</string>
+     <property name="text">
+      <string>View Complete &amp;Log...</string>
      </property>
     </widget>
    </item>
-   <item row="4" column="2" >
+   <item row="4" column="2">
     <spacer>
-     <property name="orientation" >
+     <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
-     <property name="sizeType" >
+     <property name="sizeType">
       <enum>QSizePolicy::Expanding</enum>
      </property>
-     <property name="sizeHint" >
+     <property name="sizeHint" stdset="0">
       <size>
        <width>121</width>
        <height>30</height>
@@ -77,30 +95,20 @@
      </property>
     </spacer>
    </item>
-   <item row="4" column="0" >
-    <widget class="QPushButton" name="viewLogPB" >
-     <property name="toolTip" >
-      <string>Open the LaTeX Log File dialog</string>
+   <item row="4" column="1">
+    <widget class="QPushButton" name="showAnywayPB">
+     <property name="toolTip">
+      <string>Attempt to show the output even if there were compilation errors</string>
      </property>
-     <property name="text" >
-      <string>View Complete &amp;Log...</string>
-     </property>
-    </widget>
-   </item>
-   <item row="4" column="1" >
-    <widget class="QPushButton" name="showAnywayPB" >
-     <property name="toolTip" >
-       <string>Attempt to show the output even if there were compilation errors</string>
-     </property>
-     <property name="text" >
+     <property name="text">
       <string>Show Output &amp;Anyway</string>
      </property>
     </widget>
    </item>
-   <item row="1" column="0" colspan="4" >
-    <widget class="QListWidget" name="errorsLW" >
-     <property name="toolTip" >
-      <string>Selecting an error will show the error message in the panel below and the cursor will jump to the location in the document where the error occurred.</string>
+   <item row="4" column="3">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel</set>
      </property>
     </widget>
    </item>
@@ -109,10 +117,9 @@
  <tabstops>
   <tabstop>errorsLW</tabstop>
   <tabstop>descriptionTB</tabstop>
-  <tabstop>closePB</tabstop>
  </tabstops>
  <includes>
-  <include location="local" >qt_i18n.h</include>
+  <include location="local">qt_i18n.h</include>
  </includes>
  <resources/>
  <connections/>

diff --git a/src/frontends/qt4/ui/ExternalUi.ui b/src/frontends/qt4/ui/ExternalUi.ui
index 12967c5b12cc3d00902bb622001c353c8b582060..f760f11827050af0534f8db5f8ccf716b3486fbc 100644 (file)
--- a/src/frontends/qt4/ui/ExternalUi.ui
+++ b/src/frontends/qt4/ui/ExternalUi.ui
@@ -1,107 +1,135 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>ExternalUi</class>
- <widget class="QDialog" name="ExternalUi" >
-  <property name="geometry" >
+ <widget class="QDialog" name="ExternalUi">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>386</width>
-    <height>453</height>
+    <width>574</width>
+    <height>601</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string/>
   </property>
-  <property name="sizeGripEnabled" >
+  <property name="sizeGripEnabled">
    <bool>true</bool>
   </property>
-  <layout class="QGridLayout" >
-   <property name="margin" >
+  <layout class="QGridLayout">
+   <property name="leftMargin">
     <number>9</number>
    </property>
-   <property name="spacing" >
+   <property name="topMargin">
+    <number>9</number>
+   </property>
+   <property name="rightMargin">
+    <number>9</number>
+   </property>
+   <property name="bottomMargin">
+    <number>9</number>
+   </property>
+   <property name="spacing">
     <number>6</number>
    </property>
-   <item row="0" column="0" >
-    <widget class="QTabWidget" name="tab" >
-     <property name="toolTip" >
+   <item row="0" column="0">
+    <widget class="QTabWidget" name="tab">
+     <property name="toolTip">
       <string/>
      </property>
-     <property name="currentIndex" >
+     <property name="currentIndex">
       <number>0</number>
      </property>
-     <widget class="QWidget" name="filetab" >
-      <attribute name="title" >
+     <widget class="QWidget" name="filetab">
+      <attribute name="title">
        <string>F&amp;ile</string>
       </attribute>
-      <layout class="QGridLayout" >
-       <property name="margin" >
+      <layout class="QGridLayout">
+       <property name="leftMargin">
+        <number>9</number>
+       </property>
+       <property name="topMargin">
+        <number>9</number>
+       </property>
+       <property name="rightMargin">
+        <number>9</number>
+       </property>
+       <property name="bottomMargin">
         <number>9</number>
        </property>
-       <property name="spacing" >
+       <property name="spacing">
         <number>6</number>
        </property>
-       <item row="0" column="1" >
-        <widget class="QLineEdit" name="fileED" >
-         <property name="toolTip" >
+       <item row="0" column="1">
+        <widget class="QLineEdit" name="fileED">
+         <property name="toolTip">
           <string>Filename</string>
          </property>
         </widget>
        </item>
-       <item row="0" column="0" >
-        <widget class="QLabel" name="fileLA" >
-         <property name="toolTip" >
+       <item row="0" column="0">
+        <widget class="QLabel" name="fileLA">
+         <property name="toolTip">
           <string>Filename</string>
          </property>
-         <property name="text" >
+         <property name="text">
           <string>&amp;File:</string>
          </property>
-         <property name="buddy" >
+         <property name="buddy">
           <cstring>fileED</cstring>
          </property>
         </widget>
        </item>
-       <item row="0" column="2" >
-        <widget class="QPushButton" name="browsePB" >
-         <property name="toolTip" >
+       <item row="0" column="2">
+        <widget class="QPushButton" name="browsePB">
+         <property name="toolTip">
           <string>Select a file</string>
          </property>
-         <property name="text" >
+         <property name="text">
           <string>&amp;Browse...</string>
          </property>
         </widget>
        </item>
-       <item row="2" column="0" colspan="3" >
-        <widget class="QCheckBox" name="draftCB" >
-         <property name="text" >
+       <item row="2" column="0" colspan="3">
+        <widget class="QCheckBox" name="draftCB">
+         <property name="text">
           <string>&amp;Draft</string>
          </property>
         </widget>
        </item>
-       <item row="1" column="0" colspan="3" >
-        <widget class="QGroupBox" name="GroupBox3" >
-         <property name="title" >
+       <item row="1" column="0" colspan="3">
+        <widget class="QGroupBox" name="GroupBox3">
+         <property name="title">
           <string>&amp;Template</string>
          </property>
-         <layout class="QGridLayout" >
-          <property name="margin" >
+         <layout class="QGridLayout">
+          <property name="leftMargin">
            <number>9</number>
           </property>
-          <property name="spacing" >
+          <property name="topMargin">
+           <number>9</number>
+          </property>
+          <property name="rightMargin">
+           <number>9</number>
+          </property>
+          <property name="bottomMargin">
+           <number>9</number>
+          </property>
+          <property name="spacing">
            <number>6</number>
           </property>
-          <item row="1" column="0" colspan="2" >
-           <widget class="QTextBrowser" name="externalTB" />
+          <item row="1" column="0" colspan="2">
+           <widget class="QTextBrowser" name="externalTB"/>
           </item>
-          <item row="0" column="1" >
+          <item row="0" column="1">
            <spacer>
-            <property name="orientation" >
+            <property name="orientation">
              <enum>Qt::Horizontal</enum>
             </property>
-            <property name="sizeType" >
+            <property name="sizeType">
              <enum>QSizePolicy::Preferred</enum>
             </property>
-            <property name="sizeHint" stdset="0" >
+            <property name="sizeHint" stdset="0">
              <size>
               <width>20</width>
               <height>20</height>
@@ -109,15 +137,15 @@
             </property>
            </spacer>
           </item>
-          <item row="0" column="0" >
-           <widget class="QComboBox" name="externalCO" >
-            <property name="sizePolicy" >
-             <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <item row="0" column="0">
+           <widget class="QComboBox" name="externalCO">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
-            <property name="toolTip" >
+            <property name="toolTip">
              <string>Available templates</string>
             </property>
            </widget>
@@ -127,57 +155,75 @@
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="lyxviewtab" >
-      <attribute name="title" >
+     <widget class="QWidget" name="lyxviewtab">
+      <attribute name="title">
        <string>LaTe&amp;X and LyX options</string>
       </attribute>
-      <layout class="QVBoxLayout" >
-       <property name="spacing" >
+      <layout class="QVBoxLayout">
+       <property name="spacing">
         <number>6</number>
        </property>
-       <property name="margin" >
+       <property name="leftMargin">
+        <number>9</number>
+       </property>
+       <property name="topMargin">
+        <number>9</number>
+       </property>
+       <property name="rightMargin">
+        <number>9</number>
+       </property>
+       <property name="bottomMargin">
         <number>9</number>
        </property>
        <item>
-        <widget class="QGroupBox" name="optionsGB" >
-         <property name="title" >
+        <widget class="QGroupBox" name="optionsGB">
+         <property name="title">
           <string>LaTeX Options</string>
          </property>
-         <property name="flat" >
+         <property name="flat">
           <bool>true</bool>
          </property>
-         <layout class="QGridLayout" >
-          <property name="margin" >
+         <layout class="QGridLayout">
+          <property name="leftMargin">
+           <number>9</number>
+          </property>
+          <property name="topMargin">
            <number>9</number>
           </property>
-          <property name="spacing" >
+          <property name="rightMargin">
+           <number>9</number>
+          </property>
+          <property name="bottomMargin">
+           <number>9</number>
+          </property>
+          <property name="spacing">
            <number>6</number>
           </property>
-          <item row="1" column="1" >
-           <widget class="QLineEdit" name="extraED" />
+          <item row="1" column="1">
+           <widget class="QLineEdit" name="extraED"/>
           </item>
-          <item row="0" column="1" >
-           <widget class="QLabel" name="optionLA" >
-            <property name="text" >
+          <item row="0" column="1">
+           <widget class="QLabel" name="optionLA">
+            <property name="text">
              <string>O&amp;ption:</string>
             </property>
-            <property name="buddy" >
+            <property name="buddy">
              <cstring>extraED</cstring>
             </property>
            </widget>
           </item>
-          <item row="1" column="0" >
-           <widget class="QComboBox" name="extraFormatCO" />
+          <item row="1" column="0">
+           <widget class="QComboBox" name="extraFormatCO"/>
           </item>
-          <item row="0" column="0" >
-           <widget class="QLabel" name="formatLA" >
-            <property name="text" >
-             <string>Forma&amp;t:</string>
+          <item row="0" column="0">
+           <widget class="QLabel" name="formatLA">
+            <property name="text">
+             <string>For&amp;mat:</string>
             </property>
-            <property name="textFormat" >
+            <property name="textFormat">
              <enum>Qt::AutoText</enum>
             </property>
-            <property name="buddy" >
+            <property name="buddy">
              <cstring>extraFormatCO</cstring>
             </property>
            </widget>
@@ -186,61 +232,70 @@
         </widget>
        </item>
        <item>
-        <widget class="QGroupBox" name="displayGB" >
-         <property name="toolTip" >
+        <widget class="QGroupBox" name="displayGB">
+         <property name="toolTip">
           <string>Enable LyX to preview this material; only if graphics previewing is not disabled at application level (see Preference dialog).</string>
          </property>
-         <property name="title" >
+         <property name="title">
           <string>&amp;Show in LyX</string>
          </property>
-         <property name="flat" >
+         <property name="flat">
           <bool>true</bool>
          </property>
-         <property name="checkable" >
+         <property name="checkable">
           <bool>true</bool>
          </property>
-         <layout class="QGridLayout" >
-          <property name="margin" >
+         <layout class="QGridLayout">
+          <property name="leftMargin">
+           <number>9</number>
+          </property>
+          <property name="topMargin">
+           <number>9</number>
+          </property>
+          <property name="rightMargin">
            <number>9</number>
           </property>
-          <property name="spacing" >
+          <property name="bottomMargin">
+           <number>9</number>
+          </property>
+          <property name="spacing">
            <number>6</number>
           </property>
-          <item row="0" column="0" >
-           <widget class="QLabel" name="scaleLA" >
-            <property name="toolTip" >
+          <item row="0" column="0">
+           <widget class="QLabel" name="scaleLA">
+            <property name="toolTip">
              <string>Percentage to scale by in LyX</string>
             </property>
-            <property name="text" >
+            <property name="text">
              <string>Sca&amp;le on Screen (%):</string>
             </property>
-            <property name="buddy" >
+            <property name="buddy">
              <cstring>displayscaleED</cstring>
             </property>
            </widget>
           </item>
-          <item row="0" column="1" >
-           <widget class="QLineEdit" name="displayscaleED" >
-            <property name="enabled" >
+          <item row="0" column="1">
+           <widget class="QLineEdit" name="displayscaleED">
+            <property name="enabled">
              <bool>true</bool>
             </property>
-            <property name="sizePolicy" >
-             <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
-            <property name="toolTip" >
+            <property name="toolTip">
              <string>Percentage to scale by in LyX</string>
             </property>
            </widget>
           </item>
-          <item row="0" column="2" >
+          <item row="0" column="2">
            <spacer>
-            <property name="orientation" >
+            <property name="orientation">
              <enum>Qt::Horizontal</enum>
             </property>
-            <property name="sizeHint" stdset="0" >
+            <property name="sizeHint" stdset="0">
              <size>
               <width>40</width>
               <height>20</height>
@@ -253,10 +308,10 @@
        </item>
        <item>
         <spacer>
-         <property name="orientation" >
+         <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
-         <property name="sizeHint" stdset="0" >
+         <property name="sizeHint" stdset="0">
           <size>
            <width>81</width>
            <height>196</height>
@@ -266,41 +321,59 @@
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="sizetab" >
-      <attribute name="title" >
+     <widget class="QWidget" name="sizetab">
+      <attribute name="title">
        <string>Si&amp;ze and Rotation</string>
       </attribute>
-      <layout class="QGridLayout" >
-       <property name="margin" >
+      <layout class="QGridLayout">
+       <property name="leftMargin">
+        <number>9</number>
+       </property>
+       <property name="topMargin">
+        <number>9</number>
+       </property>
+       <property name="rightMargin">
         <number>9</number>
        </property>
-       <property name="spacing" >
+       <property name="bottomMargin">
+        <number>9</number>
+       </property>
+       <property name="spacing">
         <number>6</number>
        </property>
-       <item row="1" column="0" >
-        <widget class="QGroupBox" name="rotationGB" >
-         <property name="title" >
+       <item row="1" column="0">
+        <widget class="QGroupBox" name="rotationGB">
+         <property name="title">
           <string>Rotate</string>
          </property>
-         <property name="flat" >
+         <property name="flat">
           <bool>true</bool>
          </property>
-         <layout class="QGridLayout" >
-          <property name="margin" >
+         <layout class="QGridLayout">
+          <property name="leftMargin">
            <number>9</number>
           </property>
-          <property name="spacing" >
+          <property name="topMargin">
+           <number>9</number>
+          </property>
+          <property name="rightMargin">
+           <number>9</number>
+          </property>
+          <property name="bottomMargin">
+           <number>9</number>
+          </property>
+          <property name="spacing">
            <number>6</number>
           </property>
-          <item row="0" column="1" >
+          <item row="0" column="1">
            <spacer>
-            <property name="orientation" >
+            <property name="orientation">
              <enum>Qt::Horizontal</enum>
             </property>
-            <property name="sizeType" >
+            <property name="sizeType">
              <enum>QSizePolicy::Expanding</enum>
             </property>
-            <property name="sizeHint" stdset="0" >
+            <property name="sizeHint" stdset="0">
              <size>
               <width>20</width>
               <height>20</height>
@@ -308,59 +381,68 @@
             </property>
            </spacer>
           </item>
-          <item row="0" column="0" >
-           <layout class="QGridLayout" >
-            <property name="margin" >
+          <item row="0" column="0">
+           <layout class="QGridLayout">
+            <property name="leftMargin">
              <number>0</number>
             </property>
-            <property name="spacing" >
+            <property name="topMargin">
+             <number>0</number>
+            </property>
+            <property name="rightMargin">
+             <number>0</number>
+            </property>
+            <property name="bottomMargin">
+             <number>0</number>
+            </property>
+            <property name="spacing">
              <number>6</number>
             </property>
-            <item row="0" column="1" >
-             <widget class="QLineEdit" name="angleED" >
-              <property name="sizePolicy" >
-               <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+            <item row="0" column="1">
+             <widget class="QLineEdit" name="angleED">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
                 <horstretch>0</horstretch>
                 <verstretch>0</verstretch>
                </sizepolicy>
               </property>
-              <property name="toolTip" >
+              <property name="toolTip">
                <string>Angle to rotate image by</string>
               </property>
-              <property name="text" >
+              <property name="text">
                <string/>
               </property>
              </widget>
             </item>
-            <item row="1" column="0" >
-             <widget class="QLabel" name="originLA" >
-              <property name="toolTip" >
+            <item row="1" column="0">
+             <widget class="QLabel" name="originLA">
+              <property name="toolTip">
                <string>The origin of the rotation</string>
               </property>
-              <property name="text" >
+              <property name="text">
                <string>Ori&amp;gin:</string>
               </property>
-              <property name="buddy" >
+              <property name="buddy">
                <cstring>originCO</cstring>
               </property>
              </widget>
             </item>
-            <item row="1" column="1" >
-             <widget class="QComboBox" name="originCO" >
-              <property name="toolTip" >
+            <item row="1" column="1">
+             <widget class="QComboBox" name="originCO">
+              <property name="toolTip">
                <string>The origin of the rotation</string>
               </property>
              </widget>
             </item>
-            <item row="0" column="0" >
-             <widget class="QLabel" name="angleLA" >
-              <property name="toolTip" >
+            <item row="0" column="0">
+             <widget class="QLabel" name="angleLA">
+              <property name="toolTip">
                <string>Angle to rotate image by</string>
               </property>
-              <property name="text" >
+              <property name="text">
                <string>A&amp;ngle:</string>
               </property>
-              <property name="buddy" >
+              <property name="buddy">
                <cstring>angleED</cstring>
               </property>
              </widget>
@@ -370,82 +452,91 @@
          </layout>
         </widget>
        </item>
-       <item row="0" column="0" >
-        <widget class="QGroupBox" name="scaleGB" >
-         <property name="title" >
+       <item row="0" column="0">
+        <widget class="QGroupBox" name="scaleGB">
+         <property name="title">
           <string>Scale</string>
          </property>
-         <property name="flat" >
+         <property name="flat">
           <bool>true</bool>
          </property>
-         <layout class="QGridLayout" >
-          <property name="margin" >
+         <layout class="QGridLayout">
+          <property name="leftMargin">
+           <number>9</number>
+          </property>
+          <property name="topMargin">
            <number>9</number>
           </property>
-          <property name="spacing" >
+          <property name="rightMargin">
+           <number>9</number>
+          </property>
+          <property name="bottomMargin">
+           <number>9</number>
+          </property>
+          <property name="spacing">
            <number>6</number>
           </property>
-          <item row="1" column="2" >
-           <widget class="lyx::frontend::LengthCombo" name="heightUnitCO" />
+          <item row="1" column="2">
+           <widget class="lyx::frontend::LengthCombo" name="heightUnitCO"/>
           </item>
-          <item row="0" column="2" >
-           <widget class="lyx::frontend::LengthCombo" name="widthUnitCO" />
+          <item row="0" column="2">
+           <widget class="lyx::frontend::LengthCombo" name="widthUnitCO"/>
           </item>
-          <item row="1" column="1" >
-           <widget class="QLineEdit" name="heightED" >
-            <property name="enabled" >
+          <item row="1" column="1">
+           <widget class="QLineEdit" name="heightED">
+            <property name="enabled">
              <bool>true</bool>
             </property>
-            <property name="toolTip" >
+            <property name="toolTip">
              <string>Height of image in output</string>
             </property>
            </widget>
           </item>
-          <item row="0" column="1" >
-           <widget class="QLineEdit" name="widthED" >
-            <property name="enabled" >
+          <item row="0" column="1">
+           <widget class="QLineEdit" name="widthED">
+            <property name="enabled">
              <bool>true</bool>
             </property>
-            <property name="toolTip" >
+            <property name="toolTip">
              <string>Width of image in output</string>
             </property>
            </widget>
           </item>
-          <item row="0" column="0" >
-           <widget class="QLabel" name="widthLA" >
-            <property name="enabled" >
+          <item row="0" column="0">
+           <widget class="QLabel" name="widthLA">
+            <property name="enabled">
              <bool>true</bool>
             </property>
-            <property name="text" >
+            <property name="text">
              <string>&amp;Width:</string>
             </property>
-            <property name="buddy" >
+            <property name="buddy">
              <cstring>widthED</cstring>
             </property>
            </widget>
           </item>
-          <item row="2" column="1" colspan="2" >
-           <widget class="QCheckBox" name="aspectratioCB" >
-            <property name="enabled" >
+          <item row="2" column="1" colspan="2">
+           <widget class="QCheckBox" name="aspectratioCB">
+            <property name="enabled">
              <bool>true</bool>
             </property>
-            <property name="toolTip" >
+            <property name="toolTip">
              <string>Maintain aspect ratio with largest dimension</string>
             </property>
-            <property name="text" >
+            <property name="text">
              <string>&amp;Maintain aspect ratio</string>
             </property>
            </widget>
           </item>
-          <item row="1" column="0" >
-           <widget class="QLabel" name="heightLA" >
-            <property name="enabled" >
+          <item row="1" column="0">
+           <widget class="QLabel" name="heightLA">
+            <property name="enabled">
              <bool>true</bool>
             </property>
-            <property name="text" >
+            <property name="text">
              <string>&amp;Height:</string>
             </property>
-            <property name="buddy" >
+            <property name="buddy">
              <cstring>heightED</cstring>
             </property>
            </widget>
@@ -453,84 +544,93 @@
          </layout>
         </widget>
        </item>
-       <item row="2" column="0" >
-        <widget class="QGroupBox" name="cropGB" >
-         <property name="title" >
+       <item row="2" column="0">
+        <widget class="QGroupBox" name="cropGB">
+         <property name="title">
           <string>Crop</string>
          </property>
-         <property name="flat" >
+         <property name="flat">
           <bool>true</bool>
          </property>
-         <layout class="QGridLayout" >
-          <property name="margin" >
+         <layout class="QGridLayout">
+          <property name="leftMargin">
+           <number>9</number>
+          </property>
+          <property name="topMargin">
            <number>9</number>
           </property>
-          <property name="spacing" >
+          <property name="rightMargin">
+           <number>9</number>
+          </property>
+          <property name="bottomMargin">
+           <number>9</number>
+          </property>
+          <property name="spacing">
            <number>6</number>
           </property>
-          <item row="0" column="0" colspan="2" >
-           <widget class="QCheckBox" name="clipCB" >
-            <property name="toolTip" >
+          <item row="0" column="0" colspan="2">
+           <widget class="QCheckBox" name="clipCB">
+            <property name="toolTip">
              <string>Clip to bounding box values</string>
             </property>
-            <property name="text" >
+            <property name="text">
              <string>Clip to &amp;bounding box</string>
             </property>
            </widget>
           </item>
-          <item row="3" column="0" >
-           <widget class="QLabel" name="lbLA" >
-            <property name="text" >
-             <string>&amp;Left bottom:</string>
+          <item row="3" column="0">
+           <widget class="QLabel" name="lbLA">
+            <property name="text">
+             <string>Left botto&amp;m:</string>
             </property>
-            <property name="buddy" >
+            <property name="buddy">
              <cstring>xlED</cstring>
             </property>
            </widget>
           </item>
-          <item row="2" column="3" >
-           <widget class="QLineEdit" name="ytED" />
+          <item row="2" column="3">
+           <widget class="QLineEdit" name="ytED"/>
           </item>
-          <item row="1" column="1" >
-           <widget class="QLabel" name="xLA" >
-            <property name="text" >
+          <item row="1" column="1">
+           <widget class="QLabel" name="xLA">
+            <property name="text">
              <string>x</string>
             </property>
            </widget>
           </item>
-          <item row="2" column="0" >
-           <widget class="QLabel" name="rtLA" >
-            <property name="text" >
+          <item row="2" column="0">
+           <widget class="QLabel" name="rtLA">
+            <property name="text">
              <string>Right &amp;top:</string>
             </property>
-            <property name="buddy" >
+            <property name="buddy">
              <cstring>xrED</cstring>
             </property>
            </widget>
           </item>
-          <item row="0" column="3" >
-           <widget class="QPushButton" name="getbbPB" >
-            <property name="toolTip" >
+          <item row="0" column="3">
+           <widget class="QPushButton" name="getbbPB">
+            <property name="toolTip">
              <string>Get bounding box from the (EPS) file</string>
             </property>
-            <property name="text" >
+            <property name="text">
              <string>&amp;Get from File</string>
             </property>
            </widget>
           </item>
-          <item row="3" column="1" >
-           <widget class="QLineEdit" name="xlED" >
-            <property name="toolTip" >
+          <item row="3" column="1">
+           <widget class="QLineEdit" name="xlED">
+            <property name="toolTip">
              <string/>
             </property>
            </widget>
           </item>
-          <item row="0" column="2" >
+          <item row="0" column="2">
            <spacer>
-            <property name="orientation" >
+            <property name="orientation">
              <enum>Qt::Horizontal</enum>
             </property>
-            <property name="sizeHint" stdset="0" >
+            <property name="sizeHint" stdset="0">
              <size>
               <width>43</width>
               <height>18</height>
@@ -538,30 +638,30 @@
             </property>
            </spacer>
           </item>
-          <item row="3" column="3" >
-           <widget class="QLineEdit" name="ybED" />
+          <item row="3" column="3">
+           <widget class="QLineEdit" name="ybED"/>
           </item>
-          <item row="1" column="3" >
-           <widget class="QLabel" name="yLA" >
-            <property name="text" >
+          <item row="1" column="3">
+           <widget class="QLabel" name="yLA">
+            <property name="text">
              <string>y</string>
             </property>
            </widget>
           </item>
-          <item row="2" column="1" >
-           <widget class="QLineEdit" name="xrED" />
+          <item row="2" column="1">
+           <widget class="QLineEdit" name="xrED"/>
           </item>
-          <item row="2" column="2" >
-           <widget class="lyx::frontend::LengthCombo" name="xrUnitCO" />
+          <item row="2" column="2">
+           <widget class="lyx::frontend::LengthCombo" name="xrUnitCO"/>
           </item>
-          <item row="2" column="4" >
-           <widget class="lyx::frontend::LengthCombo" name="ytUnitCO" />
+          <item row="2" column="4">
+           <widget class="lyx::frontend::LengthCombo" name="ytUnitCO"/>
           </item>
-          <item row="3" column="2" >
-           <widget class="lyx::frontend::LengthCombo" name="xlUnitCO" />
+          <item row="3" column="2">
+           <widget class="lyx::frontend::LengthCombo" name="xlUnitCO"/>
           </item>
-          <item row="3" column="4" >
-           <widget class="lyx::frontend::LengthCombo" name="ybUnitCO" />
+          <item row="3" column="4">
+           <widget class="lyx::frontend::LengthCombo" name="ybUnitCO"/>
           </item>
          </layout>
         </widget>
@@ -570,60 +670,27 @@
      </widget>
     </widget>
    </item>
-   <item row="1" column="0" >
-    <layout class="QHBoxLayout" >
-     <property name="spacing" >
+   <item row="1" column="0">
+    <layout class="QHBoxLayout">
+     <property name="spacing">
       <number>6</number>
      </property>
-     <property name="margin" >
+     <property name="leftMargin">
+      <number>0</number>
+     </property>
+     <property name="topMargin">
+      <number>0</number>
+     </property>
+     <property name="rightMargin">
+      <number>0</number>
+     </property>
+     <property name="bottomMargin">
       <number>0</number>
      </property>
      <item>
-      <spacer>
-       <property name="orientation" >
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeType" >
-        <enum>QSizePolicy::Expanding</enum>
-       </property>
-       <property name="sizeHint" stdset="0" >
-        <size>
-         <width>20</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QPushButton" name="okPB" >
-       <property name="text" >
-        <string>&amp;OK</string>
-       </property>
-       <property name="default" >
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="applyPB" >
-       <property name="text" >
-        <string>&amp;Apply</string>
-       </property>
-       <property name="default" >
-        <bool>false</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="closePB" >
-       <property name="text" >
-        <string>&amp;Close</string>
-       </property>
-       <property name="autoDefault" >
-        <bool>false</bool>
-       </property>
-       <property name="default" >
-        <bool>false</bool>
+      <widget class="QDialogButtonBox" name="buttonBox">
+       <property name="standardButtons">
+        <set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
        </property>
       </widget>
      </item>
@@ -647,12 +714,9 @@
   <tabstop>draftCB</tabstop>
   <tabstop>angleED</tabstop>
   <tabstop>originCO</tabstop>
-  <tabstop>okPB</tabstop>
-  <tabstop>applyPB</tabstop>
-  <tabstop>closePB</tabstop>
  </tabstops>
  <includes>
-  <include location="local" >qt_i18n.h</include>
+  <include location="local">qt_i18n.h</include>
  </includes>
  <resources/>
  <connections/>

diff --git a/src/frontends/qt4/ui/GraphicsUi.ui b/src/frontends/qt4/ui/GraphicsUi.ui
index 83d0d0965b529b84173ca5c6bab50ff1e5c568e8..4525344265accdc4d69e6144a8e8a37ce4fa6838 100644 (file)
--- a/src/frontends/qt4/ui/GraphicsUi.ui
+++ b/src/frontends/qt4/ui/GraphicsUi.ui
@@ -387,7 +387,7 @@
           <item row="0" column="0" colspan="6">
            <widget class="QLabel" name="lbL">
             <property name="text">
-             <string>&amp;Left bottom:</string>
+             <string>Left botto&amp;m:</string>
             </property>
             <property name="buddy">
              <cstring>lbX</cstring>
@@ -739,79 +739,9 @@
       <number>0</number>
      </property>
      <item>
-      <widget class="QPushButton" name="restorePB">
-       <property name="text">
-        <string>&amp;Restore</string>
-       </property>
-       <property name="autoDefault">
-        <bool>false</bool>
-       </property>
-       <property name="default">
-        <bool>false</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer>
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeType">
-        <enum>QSizePolicy::MinimumExpanding</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>20</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QPushButton" name="okPB">
-       <property name="text">
-        <string>&amp;OK</string>
-       </property>
-       <property name="autoDefault">
-        <bool>true</bool>
-       </property>
-       <property name="default">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="applyPB">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="text">
-        <string>&amp;Apply</string>
-       </property>
-       <property name="autoDefault">
-        <bool>false</bool>
-       </property>
-       <property name="default">
-        <bool>false</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="closePB">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="text">
-        <string>Close</string>
-       </property>
-       <property name="autoDefault">
-        <bool>false</bool>
+      <widget class="QDialogButtonBox" name="buttonBox">
+       <property name="standardButtons">
+        <set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok|QDialogButtonBox::Reset</set>
        </property>
       </widget>
      </item>
@@ -842,10 +772,6 @@
   <tabstop>angle</tabstop>
   <tabstop>origin</tabstop>
   <tabstop>rotateOrderCB</tabstop>
-  <tabstop>restorePB</tabstop>
-  <tabstop>okPB</tabstop>
-  <tabstop>applyPB</tabstop>
-  <tabstop>closePB</tabstop>
   <tabstop>clip</tabstop>
   <tabstop>lbX</tabstop>
   <tabstop>lbXunit</tabstop>

diff --git a/src/frontends/qt4/ui/IncludeUi.ui b/src/frontends/qt4/ui/IncludeUi.ui
index 11a8f49d92627beed33b7b6d06c8838e58814c49..1a9a9be95f714586a3fbf3d070a3e8d54a7655ca 100644 (file)
--- a/src/frontends/qt4/ui/IncludeUi.ui
+++ b/src/frontends/qt4/ui/IncludeUi.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>363</width>
+    <width>369</width>
     <height>470</height>
    </rect>
   </property>
@@ -37,7 +37,7 @@
      </property>
     </widget>
    </item>
-   <item row="0" column="4">
+   <item row="0" column="3">
     <widget class="QPushButton" name="browsePB">
      <property name="toolTip">
       <string>Select a file</string>
@@ -47,17 +47,17 @@
      </property>
     </widget>
    </item>
-   <item row="1" column="0" colspan="2">
+   <item row="1" column="0" rowspan="2" colspan="2">
     <widget class="QLabel" name="TextLabel1">
      <property name="text">
-      <string>&amp;Include Type:</string>
+      <string>I&amp;nclude Type:</string>
      </property>
      <property name="buddy">
       <cstring>typeCO</cstring>
      </property>
     </widget>
    </item>
-   <item row="1" column="2">
+   <item row="1" column="2" rowspan="3">
     <widget class="QComboBox" name="typeCO">
      <item>
       <property name="text">
@@ -82,6 +82,16 @@
     </widget>
    </item>
    <item row="1" column="3">
+    <widget class="QPushButton" name="editPB">
+     <property name="toolTip">
+      <string>Edit the file</string>
+     </property>
+     <property name="text">
+      <string>&amp;Edit</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="3">
     <spacer>
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
@@ -97,17 +107,7 @@
      </property>
     </spacer>
    </item>
-   <item row="1" column="4">
-    <widget class="QPushButton" name="editPB">
-     <property name="toolTip">
-      <string>Edit the file</string>
-     </property>
-     <property name="text">
-      <string>&amp;Edit</string>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="0" colspan="5">
+   <item row="4" column="0" colspan="4">
     <layout class="QHBoxLayout">
      <property name="spacing">
       <number>6</number>
@@ -158,7 +158,7 @@
      </item>
     </layout>
    </item>
-   <item row="3" column="0" colspan="5">
+   <item row="5" column="0" colspan="4">
     <widget class="QGroupBox" name="listingsGB">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
@@ -302,63 +302,12 @@
      </layout>
     </widget>
    </item>
-   <item row="4" column="0" colspan="3">
-    <layout class="QHBoxLayout">
-     <property name="spacing">
-      <number>6</number>
-     </property>
-     <property name="leftMargin">
-      <number>0</number>
-     </property>
-     <property name="topMargin">
-      <number>0</number>
+   <item row="6" column="2" colspan="2">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
      </property>
-     <property name="rightMargin">
-      <number>0</number>
-     </property>
-     <property name="bottomMargin">
-      <number>0</number>
-     </property>
-     <item>
-      <spacer>
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeType">
-        <enum>QSizePolicy::Expanding</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>20</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QPushButton" name="okPB">
-       <property name="text">
-        <string>&amp;OK</string>
-       </property>
-       <property name="autoDefault">
-        <bool>true</bool>
-       </property>
-       <property name="default">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="closePB">
-       <property name="text">
-        <string>&amp;Close</string>
-       </property>
-       <property name="autoDefault">
-        <bool>false</bool>
-       </property>
-      </widget>
-     </item>
-    </layout>
+    </widget>
    </item>
   </layout>
  </widget>
@@ -373,8 +322,6 @@
   <tabstop>labelLE</tabstop>
   <tabstop>listingsTB</tabstop>
   <tabstop>listingsED</tabstop>
-  <tabstop>okPB</tabstop>
-  <tabstop>closePB</tabstop>
  </tabstops>
  <includes>
   <include location="local">qt_i18n.h</include>

diff --git a/src/frontends/qt4/ui/IndexUi.ui b/src/frontends/qt4/ui/IndexUi.ui
index 644cd75ecf6b8ff8ba511cb352ae46974606fee4..95c2a710146170c8af95fa83c758880df7071a82 100644 (file)
--- a/src/frontends/qt4/ui/IndexUi.ui
+++ b/src/frontends/qt4/ui/IndexUi.ui
@@ -1,84 +1,62 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>IndexUi</class>
- <widget class="QDialog" name="IndexUi" >
-  <property name="geometry" >
+ <widget class="QDialog" name="IndexUi">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>262</width>
-    <height>108</height>
+    <height>121</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string/>
   </property>
-  <property name="sizeGripEnabled" >
+  <property name="sizeGripEnabled">
    <bool>true</bool>
   </property>
-  <layout class="QGridLayout" >
-   <property name="margin" >
-    <number>9</number>
-   </property>
-   <property name="spacing" >
-    <number>6</number>
-   </property>
-   <item row="1" column="0" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeHint" >
-      <size>
-       <width>71</width>
-       <height>20</height>
-      </size>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0">
+    <layout class="QVBoxLayout">
+     <property name="spacing">
+      <number>6</number>
      </property>
-    </spacer>
-   </item>
-   <item row="1" column="1" >
-    <widget class="QPushButton" name="okPB" >
-     <property name="text" >
-      <string>&amp;OK</string>
+     <property name="leftMargin">
+      <number>0</number>
      </property>
-     <property name="default" >
-      <bool>false</bool>
+     <property name="topMargin">
+      <number>0</number>
      </property>
-    </widget>
-   </item>
-   <item row="0" column="0" colspan="3" >
-    <layout class="QVBoxLayout" >
-     <property name="margin" >
+     <property name="rightMargin">
       <number>0</number>
      </property>
-     <property name="spacing" >
-      <number>6</number>
+     <property name="bottomMargin">
+      <number>0</number>
      </property>
      <item>
-      <widget class="QLabel" name="indicesLA" >
-       <property name="text" >
-        <string>A&amp;vailable Indexes:</string>
+      <widget class="QLabel" name="indicesLA">
+       <property name="text">
+        <string>Available I&amp;ndexes:</string>
        </property>
-       <property name="buddy" >
+       <property name="buddy">
         <cstring>indicesCO</cstring>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QComboBox" name="indicesCO" >
-       <property name="toolTip" >
+      <widget class="QComboBox" name="indicesCO">
+       <property name="toolTip">
         <string>Select the index this entry should be listed in.</string>
        </property>
       </widget>
      </item>
     </layout>
    </item>
-   <item row="1" column="2" >
-    <widget class="QPushButton" name="cancelPB" >
-     <property name="text" >
-      <string>&amp;Cancel</string>
-     </property>
-     <property name="default" >
-      <bool>true</bool>
+   <item row="1" column="0">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
      </property>
     </widget>
    </item>
@@ -86,11 +64,9 @@
  </widget>
  <tabstops>
   <tabstop>indicesCO</tabstop>
-  <tabstop>okPB</tabstop>
-  <tabstop>cancelPB</tabstop>
  </tabstops>
  <includes>
-  <include location="local" >qt_i18n.h</include>
+  <include location="local">qt_i18n.h</include>
  </includes>
  <resources/>
  <connections/>