anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-02 05:55:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Switch on CT in comparison result

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35326 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Pavel Sanda 2010-09-08 15:09:10 +00:00
parent 59a2c46ae9
commit 22434db502
2 changed files with 80 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/frontends/qt4/GuiCompare.cpp
View File

@ -62,6 +62,7 @@ GuiCompare::GuiCompare(GuiView & lv)
this, SLOT(changeAdaptor())); this, SLOT(changeAdaptor()));
newSettingsRB->setChecked(true); newSettingsRB->setChecked(true);
trackingCB->setChecked(true);
closePB->setCursor(Qt::ArrowCursor); closePB->setCursor(Qt::ArrowCursor);
@ -220,6 +221,10 @@ void GuiCompare::finished(bool aborted)
if (dest_buffer_) { if (dest_buffer_) {
dispatch(FuncRequest(LFUN_BUFFER_SWITCH, dispatch(FuncRequest(LFUN_BUFFER_SWITCH,
dest_buffer_->absFileName())); dest_buffer_->absFileName()));
if (trackingCB->isChecked()) {
dispatch(FuncRequest(LFUN_CHANGES_OUTPUT));
dispatch(FuncRequest(LFUN_CHANGES_TRACK));
}
} }
statusBar->showMessage(qt_("Finished"), 5000); statusBar->showMessage(qt_("Finished"), 5000);
} }

27
src/frontends/qt4/ui/CompareUi.ui
View File

@ -6,7 +6,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>450</width> <width>450</width>
<height>246</height> <height>294</height>
</rect> </rect>
</property> </property>
<property name="windowTitle" > <property name="windowTitle" >
@ -26,7 +26,7 @@
<item row="1" column="0" > <item row="1" column="0" >
<widget class="QComboBox" name="newFileCB" > <widget class="QComboBox" name="newFileCB" >
<property name="sizePolicy" > <property name="sizePolicy" >
<sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@ -59,7 +59,7 @@
<item row="3" column="0" > <item row="3" column="0" >
<widget class="QComboBox" name="oldFileCB" > <widget class="QComboBox" name="oldFileCB" >
<property name="sizePolicy" > <property name="sizePolicy" >
<sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@ -82,7 +82,7 @@
<item row="4" column="0" > <item row="4" column="0" >
<widget class="QGroupBox" name="groupBox" > <widget class="QGroupBox" name="groupBox" >
<property name="sizePolicy" > <property name="sizePolicy" >
<sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@ -108,7 +108,7 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="5" column="0" colspan="2"> <item row="6" column="0" colspan="2" >
<widget class="QProgressBar" name="progressBar" > <widget class="QProgressBar" name="progressBar" >
<property name="value" > <property name="value" >
<number>24</number> <number>24</number>
@ -118,7 +118,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="6" column="0" colspan="2"> <item row="8" column="0" colspan="2" >
<layout class="QHBoxLayout" > <layout class="QHBoxLayout" >
<item> <item>
<spacer> <spacer>
@ -164,9 +164,22 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="7" column="0" colspan="2"> <item row="9" column="0" colspan="2" >
<widget class="QStatusBar" name="statusBar" /> <widget class="QStatusBar" name="statusBar" />
</item> </item>
<item row="5" column="0" >
<widget class="QCheckBox" name="trackingCB" >
<property name="toolTip" >
<string>Turns on the change tracking and showing changes in LaTeX output for the resulting document</string>
</property>
<property name="text" >
<string>Enable &amp;change tracking features in the output</string>
</property>
<property name="checked" >
<bool>false</bool>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
<includes> <includes>