Ui glitches

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35313 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/qt4/GuiCompareHistory.cpp b/src/frontends/qt4/GuiCompareHistory.cpp
index b8d26ecd042283feb87932373d38c695b53013ee..711cd51dcbaea2f21ec40dd70a909c03f32285ba 100644 (file)
--- a/src/frontends/qt4/GuiCompareHistory.cpp
+++ b/src/frontends/qt4/GuiCompareHistory.cpp
@@ -95,8 +95,11 @@ void GuiCompareHistory::selectBetweenrev()
 void GuiCompareHistory::enableControls()
 {
        bool rb = revbackRB->isChecked();
+       oldL->setEnabled(!rb);
+       newL->setEnabled(!rb);
        rev1SB->setEnabled(!rb);
        rev2SB->setEnabled(!rb);
+       rev2SB->setEnabled(!rb);
        betweenrevRB->setChecked(!rb);
        revbackSB->setEnabled(rb);
 }

diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp
index 39516872dd94e45d2fd746a215215b1fc97d3b5c..c89561e7a834c49f51039621bc2dda5234ba5008 100644 (file)
--- a/src/frontends/qt4/GuiView.cpp
+++ b/src/frontends/qt4/GuiView.cpp
@@ -2687,7 +2687,7 @@ void GuiView::dispatchVC(FuncRequest const & cmd)
                                break;
                }
 
-               LYXERR(Debug::LYXVC, "Launching comparison for fetched revisions: " <<
+               LYXERR(Debug::LYXVC, "Launching comparison for fetched revisions:\n" <<
                                        f1 << "\n"  << f2 << "\n" );
                string par = "compare run " + f1 + " " + f2;
                lyx::dispatch(FuncRequest(LFUN_DIALOG_SHOW, par));

diff --git a/src/frontends/qt4/ui/CompareHistoryUi.ui b/src/frontends/qt4/ui/CompareHistoryUi.ui
index 019a06695693ca95868a73d8054a279f69e675f2..190817cf1b29af2cbf053525bb584c2613c9bede 100644 (file)
--- a/src/frontends/qt4/ui/CompareHistoryUi.ui
+++ b/src/frontends/qt4/ui/CompareHistoryUi.ui
@@ -5,8 +5,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>356</width>
-    <height>172</height>
+    <width>375</width>
+    <height>162</height>
    </rect>
   </property>
   <property name="windowTitle" >
@@ -84,6 +84,19 @@
           </property>
          </widget>
         </item>
+        <item>
+         <widget class="QLabel" name="oldL" >
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="Preferred" hsizetype="Minimum" >
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="text" >
+           <string>Old:</string>
+          </property>
+         </widget>
+        </item>
         <item>
          <widget class="QSpinBox" name="rev1SB" >
           <property name="sizePolicy" >
@@ -106,6 +119,19 @@
           </property>
          </widget>
         </item>
+        <item>
+         <widget class="QLabel" name="newL" >
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="Preferred" hsizetype="Minimum" >
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="text" >
+           <string>New:</string>
+          </property>
+         </widget>
+        </item>
         <item>
          <widget class="QSpinBox" name="rev2SB" >
           <property name="sizePolicy" >