anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-29 21:05:12 +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);
} }

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

@ -1,106 +1,106 @@
<ui version="4.0"> <ui version="4.0" >
<class>CompareUi</class> <class>CompareUi</class>
<widget class="QDialog" name="CompareUi"> <widget class="QDialog" name="CompareUi" >
<property name="geometry"> <property name="geometry" >
<rect> <rect>
<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" >
<string/> <string/>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout" >
<item row="0" column="0"> <item row="0" column="0" >
<widget class="QLabel" name="newFileLA"> <widget class="QLabel" name="newFileLA" >
<property name="text"> <property name="text" >
<string>&amp;New Document:</string> <string>&amp;New Document:</string>
</property> </property>
<property name="buddy"> <property name="buddy" >
<cstring>newFileCB</cstring> <cstring>newFileCB</cstring>
</property> </property>
</widget> </widget>
</item> </item>
<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>
</property> </property>
<property name="editable"> <property name="editable" >
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item row="1" column="1" >
<widget class="QPushButton" name="newFilePB"> <widget class="QPushButton" name="newFilePB" >
<property name="text"> <property name="text" >
<string>&amp;Browse...</string> <string>&amp;Browse...</string>
</property> </property>
<property name="autoDefault"> <property name="autoDefault" >
<bool>false</bool> <bool>false</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0"> <item row="2" column="0" >
<widget class="QLabel" name="oldFileLA"> <widget class="QLabel" name="oldFileLA" >
<property name="text"> <property name="text" >
<string>&amp;Old Document:</string> <string>&amp;Old Document:</string>
</property> </property>
<property name="buddy"> <property name="buddy" >
<cstring>oldFileCB</cstring> <cstring>oldFileCB</cstring>
</property> </property>
</widget> </widget>
</item> </item>
<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>
</property> </property>
<property name="editable"> <property name="editable" >
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="1"> <item row="3" column="1" >
<widget class="QPushButton" name="oldFilePB"> <widget class="QPushButton" name="oldFilePB" >
<property name="text"> <property name="text" >
<string>Bro&amp;wse...</string> <string>Bro&amp;wse...</string>
</property> </property>
<property name="autoDefault"> <property name="autoDefault" >
<bool>false</bool> <bool>false</bool>
</property> </property>
</widget> </widget>
</item> </item>
<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>
</property> </property>
<property name="title"> <property name="title" >
<string>Copy Document Settings from:</string> <string>Copy Document Settings from:</string>
</property> </property>
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout" >
<item> <item>
<widget class="QRadioButton" name="newSettingsRB"> <widget class="QRadioButton" name="newSettingsRB" >
<property name="text"> <property name="text" >
<string>N&amp;ew Document</string> <string>N&amp;ew Document</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QRadioButton" name="oldSettingsRB"> <widget class="QRadioButton" name="oldSettingsRB" >
<property name="text"> <property name="text" >
<string>Ol&amp;d Document</string> <string>Ol&amp;d Document</string>
</property> </property>
</widget> </widget>
@ -108,27 +108,27 @@
</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>
</property> </property>
<property name="orientation"> <property name="orientation" >
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</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>
<property name="orientation"> <property name="orientation" >
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeType"> <property name="sizeType" >
<enum>QSizePolicy::Expanding</enum> <enum>QSizePolicy::Expanding</enum>
</property> </property>
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0" >
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -137,40 +137,53 @@
</spacer> </spacer>
</item> </item>
<item> <item>
<widget class="QPushButton" name="okPB"> <widget class="QPushButton" name="okPB" >
<property name="toolTip"> <property name="toolTip" >
<string/> <string/>
</property> </property>
<property name="text"> <property name="text" >
<string>&amp;OK</string> <string>&amp;OK</string>
</property> </property>
<property name="default"> <property name="default" >
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QPushButton" name="closePB"> <widget class="QPushButton" name="closePB" >
<property name="text"> <property name="text" >
<string>&amp;Close</string> <string>&amp;Close</string>
</property> </property>
<property name="autoDefault"> <property name="autoDefault" >
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="default"> <property name="default" >
<bool>false</bool> <bool>false</bool>
</property> </property>
</widget> </widget>
</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 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> </item>
</layout> </layout>
</widget> </widget>
<includes> <includes>
<include location="local">qt_i18n.h</include> <include location="local" >qt_i18n.h</include>
</includes> </includes>
<resources/> <resources/>
<connections/> <connections/>