AnotherFoxGuy/fuel-scm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

OSX UI consistency fixes

Browse Source 
FossilOrigin-Name: c5f9a9d87d22a61c1ffaa5c0fb893cf5dad3a08d
This commit is contained in:
kostas
2011-10-23 06:11:27 +00:00
parent 4dfa5d2d23
commit c9175a990f
3 changed files with 387 additions and 363 deletions
Download Patch File Download Diff File Expand all files Collapse all files

736
SettingsDialog.ui
View File

@ -1,356 +1,380 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0"> <ui version="4.0">
<class>SettingsDialog</class> <class>SettingsDialog</class>
<widget class="QDialog" name="SettingsDialog"> <widget class="QDialog" name="SettingsDialog">
<property name="windowModality"> <property name="windowModality">
<enum>Qt::WindowModal</enum> <enum>Qt::WindowModal</enum>
</property> </property>
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>528</width> <width>560</width>
<height>239</height> <height>300</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Settings</string> <string>Settings</string>
</property> </property>
<property name="modal"> <property name="modal">
<bool>true</bool> <bool>true</bool>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<item> <item>
<widget class="QTabWidget" name="tabWidget"> <widget class="QTabWidget" name="tabWidget">
<property name="currentIndex"> <property name="currentIndex">
<number>0</number> <number>0</number>
</property> </property>
<widget class="QWidget" name="tabApp"> <widget class="QWidget" name="tabApp">
<attribute name="icon"> <attribute name="icon">
<iconset resource="resources.qrc"> <iconset resource="resources.qrc">
<normaloff>:/icons/icons/Battery-01.png</normaloff>:/icons/icons/Battery-01.png</iconset> <normaloff>:/icons/icons/Battery-01.png</normaloff>:/icons/icons/Battery-01.png</iconset>
</attribute> </attribute>
<attribute name="title"> <attribute name="title">
<string>Application</string> <string>Application</string>
</attribute> </attribute>
<layout class="QFormLayout" name="formLayout"> <layout class="QFormLayout" name="formLayout">
<item row="0" column="0"> <property name="fieldGrowthPolicy">
<widget class="QLabel" name="label"> <enum>QFormLayout::ExpandingFieldsGrow</enum>
<property name="minimumSize"> </property>
<size> <property name="labelAlignment">
<width>100</width> <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
<height>0</height> </property>
</size> <item row="0" column="0">
</property> <widget class="QLabel" name="label">
<property name="text"> <property name="minimumSize">
<string>Fossil Path</string> <size>
</property> <width>100</width>
</widget> <height>0</height>
</item> </size>
<item row="0" column="1"> </property>
<layout class="QHBoxLayout" name="horizontalLayout_8"> <property name="text">
<item> <string>Fossil Path</string>
<widget class="QLineEdit" name="lineFossilPath"> </property>
<property name="toolTip"> </widget>
<string>Path to the fossil executable. Leave blank to use the default fossil</string> </item>
</property> <item row="0" column="1">
</widget> <layout class="QHBoxLayout" name="horizontalLayout_8">
</item> <item>
<item> <widget class="QLineEdit" name="lineFossilPath">
<widget class="QPushButton" name="btnSelectFossil"> <property name="toolTip">
<property name="sizePolicy"> <string>Path to the fossil executable. Leave blank to use the default fossil</string>
<sizepolicy hsizetype="Fixed" vsizetype="Fixed"> </property>
<horstretch>0</horstretch> </widget>
<verstretch>0</verstretch> </item>
</sizepolicy> <item>
</property> <widget class="QPushButton" name="btnSelectFossil">
<property name="maximumSize"> <property name="sizePolicy">
<size> <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<width>30</width> <horstretch>0</horstretch>
<height>16777215</height> <verstretch>0</verstretch>
</size> </sizepolicy>
</property> </property>
<property name="text"> <property name="maximumSize">
<string>...</string> <size>
</property> <width>24</width>
</widget> <height>24</height>
</item> </size>
</layout> </property>
</item> <property name="text">
<item row="1" column="0"> <string>...</string>
<widget class="QLabel" name="label_2"> </property>
<property name="minimumSize"> </widget>
<size> </item>
<width>100</width> </layout>
<height>0</height> </item>
</size> <item row="1" column="0">
</property> <widget class="QLabel" name="label_2">
<property name="text"> <property name="minimumSize">
<string>Graphical Diff </string> <size>
</property> <width>100</width>
</widget> <height>0</height>
</item> </size>
<item row="1" column="1"> </property>
<layout class="QHBoxLayout" name="horizontalLayout_9"> <property name="text">
<item> <string>Graphical Diff </string>
<widget class="QLineEdit" name="lineGDiffCommand"> </property>
<property name="toolTip"> </widget>
<string>Path to graphical diff tool</string> </item>
</property> <item row="1" column="1">
</widget> <layout class="QHBoxLayout" name="horizontalLayout_9">
</item> <item>
<item> <widget class="QLineEdit" name="lineGDiffCommand">
<widget class="QPushButton" name="btnSelectFossilGDiff"> <property name="toolTip">
<property name="sizePolicy"> <string>Path to graphical diff tool</string>
<sizepolicy hsizetype="Fixed" vsizetype="Fixed"> </property>
<horstretch>0</horstretch> </widget>
<verstretch>0</verstretch> </item>
</sizepolicy> <item>
</property> <widget class="QPushButton" name="btnSelectFossilGDiff">
<property name="maximumSize"> <property name="sizePolicy">
<size> <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<width>30</width> <horstretch>0</horstretch>
<height>16777215</height> <verstretch>0</verstretch>
</size> </sizepolicy>
</property> </property>
<property name="text"> <property name="maximumSize">
<string>...</string> <size>
</property> <width>24</width>
</widget> <height>24</height>
</item> </size>
</layout> </property>
</item> <property name="text">
<item row="2" column="0"> <string>...</string>
<widget class="QLabel" name="label_3"> </property>
<property name="minimumSize"> </widget>
<size> </item>
<width>100</width> </layout>
<height>0</height> </item>
</size> <item row="2" column="0">
</property> <widget class="QLabel" name="label_3">
<property name="text"> <property name="minimumSize">
<string>Graphical Merge</string> <size>
</property> <width>100</width>
</widget> <height>0</height>
</item> </size>
<item row="2" column="1"> </property>
<layout class="QHBoxLayout" name="horizontalLayout_10"> <property name="text">
<item> <string>Graphical Merge</string>
<widget class="QLineEdit" name="lineGMergeCommand"> </property>
<property name="toolTip"> </widget>
<string>Path to the graphical merge tool</string> </item>
</property> <item row="2" column="1">
</widget> <layout class="QHBoxLayout" name="horizontalLayout_10">
</item> <item>
<item> <widget class="QLineEdit" name="lineGMergeCommand">
<widget class="QPushButton" name="btnSelectGMerge"> <property name="toolTip">
<property name="sizePolicy"> <string>Path to the graphical merge tool</string>
<sizepolicy hsizetype="Fixed" vsizetype="Fixed"> </property>
<horstretch>0</horstretch> </widget>
<verstretch>0</verstretch> </item>
</sizepolicy> <item>
</property> <widget class="QPushButton" name="btnSelectGMerge">
<property name="maximumSize"> <property name="sizePolicy">
<size> <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<width>30</width> <horstretch>0</horstretch>
<height>16777215</height> <verstretch>0</verstretch>
</size> </sizepolicy>
</property> </property>
<property name="text"> <property name="maximumSize">
<string>...</string> <size>
</property> <width>24</width>
</widget> <height>24</height>
</item> </size>
</layout> </property>
</item> <property name="text">
<item row="3" column="0"> <string>...</string>
<widget class="QLabel" name="label_6"> </property>
<property name="minimumSize"> </widget>
<size> </item>
<width>100</width> </layout>
<height>0</height> </item>
</size> <item row="3" column="0">
</property> <widget class="QLabel" name="label_6">
<property name="text"> <property name="minimumSize">
<string>Commit Messages</string> <size>
</property> <width>100</width>
</widget> <height>0</height>
</item> </size>
<item row="3" column="1"> </property>
<widget class="QPushButton" name="btnClearMessageHistory"> <property name="text">
<property name="toolTip"> <string>Commit Messages</string>
<string>Clear the commit message history</string> </property>
</property> </widget>
<property name="text"> </item>
<string>Clear</string> <item row="3" column="1">
</property> <widget class="QPushButton" name="btnClearMessageHistory">
</widget> <property name="sizePolicy">
</item> <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<item row="4" column="0"> <horstretch>0</horstretch>
<widget class="QLabel" name="label_8"> <verstretch>0</verstretch>
<property name="minimumSize"> </sizepolicy>
<size> </property>
<width>100</width> <property name="toolTip">
<height>0</height> <string>Clear the commit message history</string>
</size> </property>
</property> <property name="text">
<property name="text"> <string>Clear</string>
<string>Double-click Action</string> </property>
</property> </widget>
</widget> </item>
</item> <item row="4" column="0">
<item row="4" column="1"> <widget class="QLabel" name="label_8">
<widget class="QComboBox" name="cmbDoubleClickAction"> <property name="minimumSize">
<property name="toolTip"> <size>
<string>Action to perfom when double-clicking a file</string> <width>100</width>
</property> <height>0</height>
<property name="currentIndex"> </size>
<number>-1</number> </property>
</property> <property name="text">
</widget> <string>Double-click Action</string>
</item> </property>
</layout> </widget>
</widget> </item>
<widget class="QWidget" name="tabRepo"> <item row="4" column="1">
<attribute name="icon"> <widget class="QComboBox" name="cmbDoubleClickAction">
<iconset resource="resources.qrc"> <property name="sizePolicy">
<normaloff>:/icons/icons/Book-01.png</normaloff>:/icons/icons/Book-01.png</iconset> <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
</attribute> <horstretch>0</horstretch>
<attribute name="title"> <verstretch>0</verstretch>
<string>Repository</string> </sizepolicy>
</attribute> </property>
<layout class="QFormLayout" name="formLayout_2"> <property name="toolTip">
<item row="0" column="0"> <string>Action to perfom when double-clicking a file</string>
<widget class="QLabel" name="label_5"> </property>
<property name="minimumSize"> <property name="currentIndex">
<size> <number>-1</number>
<width>100</width> </property>
<height>0</height> </widget>
</size> </item>
</property> </layout>
<property name="text"> </widget>
<string>Remote Url</string> <widget class="QWidget" name="tabRepo">
</property> <attribute name="icon">
</widget> <iconset resource="resources.qrc">
</item> <normaloff>:/icons/icons/Book-01.png</normaloff>:/icons/icons/Book-01.png</iconset>
<item row="0" column="1"> </attribute>
<widget class="QLineEdit" name="lineRemoteURL"> <attribute name="title">
<property name="minimumSize"> <string>Repository</string>
<size> </attribute>
<width>0</width> <layout class="QFormLayout" name="formLayout_2">
<height>0</height> <property name="fieldGrowthPolicy">
</size> <enum>QFormLayout::ExpandingFieldsGrow</enum>
</property> </property>
<property name="toolTip"> <property name="labelAlignment">
<string>The remote url used to push/pull changes. <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
URL style user names and passwords are also supported. </property>
For example http://username:password@server.com/fossil</string> <item row="0" column="0">
</property> <widget class="QLabel" name="label_5">
</widget> <property name="minimumSize">
</item> <size>
<item row="1" column="0"> <width>100</width>
<widget class="QLabel" name="label_4"> <height>0</height>
<property name="minimumSize"> </size>
<size> </property>
<width>100</width> <property name="text">
<height>0</height> <string>Remote Url</string>
</size> </property>
</property> </widget>
<property name="text"> </item>
<string>Ignore List</string> <item row="0" column="1">
</property> <widget class="QLineEdit" name="lineRemoteURL">
</widget> <property name="minimumSize">
</item> <size>
<item row="1" column="1"> <width>0</width>
<widget class="QLineEdit" name="lineIgnore"> <height>0</height>
<property name="minimumSize"> </size>
<size> </property>
<width>0</width> <property name="toolTip">
<height>0</height> <string>The remote url used to push/pull changes.
</size> URL style user names and passwords are also supported.
</property> For example http://username:password@server.com/fossil</string>
<property name="toolTip"> </property>
<string>A comma separated list of glob-style file/path patterns ignored in fossil file operations</string> </widget>
</property> </item>
</widget> <item row="1" column="0">
</item> <widget class="QLabel" name="label_4">
<item row="2" column="0"> <property name="minimumSize">
<widget class="QLabel" name="label_7"> <size>
<property name="minimumSize"> <width>100</width>
<size> <height>0</height>
<width>100</width> </size>
<height>0</height> </property>
</size> <property name="text">
</property> <string>Ignore List</string>
<property name="text"> </property>
<string>Ignore CR/NL</string> </widget>
</property> </item>
</widget> <item row="1" column="1">
</item> <widget class="QLineEdit" name="lineIgnore">
<item row="2" column="1"> <property name="minimumSize">
<widget class="QLineEdit" name="lineIgnoreCRNL"> <size>
<property name="minimumSize"> <width>0</width>
<size> <height>0</height>
<width>0</width> </size>
<height>0</height> </property>
</size> <property name="toolTip">
</property> <string>A comma separated list of glob-style file/path patterns ignored in fossil file operations</string>
<property name="toolTip"> </property>
<string>A comma separated list of glob-style file patterns to exclude from fossil's CR/NL consistency checking</string> </widget>
</property> </item>
</widget> <item row="2" column="0">
</item> <widget class="QLabel" name="label_7">
</layout> <property name="minimumSize">
</widget> <size>
</widget> <width>100</width>
</item> <height>0</height>
<item> </size>
<widget class="QDialogButtonBox" name="buttonBox"> </property>
<property name="orientation"> <property name="text">
<enum>Qt::Horizontal</enum> <string>Ignore CR/NL</string>
</property> </property>
<property name="standardButtons"> </widget>
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> </item>
</property> <item row="2" column="1">
</widget> <widget class="QLineEdit" name="lineIgnoreCRNL">
</item> <property name="minimumSize">
</layout> <size>
</widget> <width>0</width>
<resources> <height>0</height>
<include location="resources.qrc"/> </size>
</resources> </property>
<connections> <property name="toolTip">
<connection> <string>A comma separated list of glob-style file patterns to exclude from fossil's CR/NL consistency checking</string>
<sender>buttonBox</sender> </property>
<signal>accepted()</signal> </widget>
<receiver>SettingsDialog</receiver> </item>
<slot>accept()</slot> </layout>
<hints> </widget>
<hint type="sourcelabel"> </widget>
<x>248</x> </item>
<y>254</y> <item>
</hint> <widget class="QDialogButtonBox" name="buttonBox">
<hint type="destinationlabel"> <property name="orientation">
<x>157</x> <enum>Qt::Horizontal</enum>
<y>274</y> </property>
</hint> <property name="standardButtons">
</hints> <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</connection> </property>
<connection> </widget>
<sender>buttonBox</sender> </item>
<signal>rejected()</signal> </layout>
<receiver>SettingsDialog</receiver> </widget>
<slot>reject()</slot> <resources>
<hints> <include location="resources.qrc"/>
<hint type="sourcelabel"> </resources>
<x>316</x> <connections>
<y>260</y> <connection>
</hint> <sender>buttonBox</sender>
<hint type="destinationlabel"> <signal>accepted()</signal>
<x>286</x> <receiver>SettingsDialog</receiver>
<y>274</y> <slot>accept()</slot>
</hint> <hints>
</hints> <hint type="sourcelabel">
</connection> <x>248</x>
</connections> <y>254</y>
</ui> </hint>
<hint type="destinationlabel">
<x>157</x>
<y>274</y>
</hint>
</hints>
</connection>
<connection>
<sender>buttonBox</sender>
<signal>rejected()</signal>
<receiver>SettingsDialog</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
<x>316</x>
<y>260</y>
</hint>
<hint type="destinationlabel">
<x>286</x>
<y>274</y>
</hint>
</hints>
</connection>
</connections>
</ui>

12
manifest
View File

@ -1,5 +1,5 @@
C Fixed\sissue\swith\sfossil\s1.2.0\swhere\sa\snew\stype\sof\suser\squery\s(yes\sto\sall/no)\scaused\sFuel\sto\shang\nUpped\sversion\sto\s0.9.5\nMinor\sGUI\sTweaks C OSX\sUI\sconsistency\sfixes
D 2011-10-22T15:03:48.488 D 2011-10-23T06:11:27.653
F CommitDialog.cpp bc05504be08d9ffe2b24d341a18e37035e1941b7 F CommitDialog.cpp bc05504be08d9ffe2b24d341a18e37035e1941b7
F CommitDialog.h 65a7238dcdd41b578536a0b0ac2a65f2e7f23c9a F CommitDialog.h 65a7238dcdd41b578536a0b0ac2a65f2e7f23c9a
F CommitDialog.ui 5067623f6af6f5a42c87df903278e383e945e154 F CommitDialog.ui 5067623f6af6f5a42c87df903278e383e945e154
@ -11,7 +11,7 @@ F MainWindow.h 643f13d4b5615c51c38b164768bf62258ccb94b1
F MainWindow.ui 0afb7d2a8e9ce2cff2966295f9eefaed01f1ed51 F MainWindow.ui 0afb7d2a8e9ce2cff2966295f9eefaed01f1ed51
F SettingsDialog.cpp e1fad18cc020d08b82c6d35dc94f6624deec9a3b F SettingsDialog.cpp e1fad18cc020d08b82c6d35dc94f6624deec9a3b
F SettingsDialog.h f5da6cab4ccc82e2eb78ec835fb849c4c104d6cc F SettingsDialog.h f5da6cab4ccc82e2eb78ec835fb849c4c104d6cc
F SettingsDialog.ui 778aaf233b8ac3ddac7dcfecc2fca7bd8ca5be1a F SettingsDialog.ui 8964629ea80c61971c0601624c84d1927902b1fd
F Utils.cpp 2587d8073d6c2c1da49622c387cc457a0081f7b5 F Utils.cpp 2587d8073d6c2c1da49622c387cc457a0081f7b5
F Utils.h a71d82474747466f4c225128d26a703b510230d4 F Utils.h a71d82474747466f4c225128d26a703b510230d4
F fuel.pro 3dc8e31fde8137143dea0ae44a81eb6733d86168 F fuel.pro 3dc8e31fde8137143dea0ae44a81eb6733d86168
@ -174,7 +174,7 @@ F installer/fuel.iss 13b6a938bcdf273cbd3649d2549887baa1577214
F installer/license.txt 4cc77b90af91e615a64ae04893fdffa7939db84c F installer/license.txt 4cc77b90af91e615a64ae04893fdffa7939db84c
F main.cpp 46bf5ddc90fca01c9ef2e8e3d14b4d32217945dd F main.cpp 46bf5ddc90fca01c9ef2e8e3d14b4d32217945dd
F resources.qrc e98383ed205f4e37100c60057e0129c3b86dea53 F resources.qrc e98383ed205f4e37100c60057e0129c3b86dea53
P af6bd9ca628ed1fe33819ac18706ed2bcabc79d2 P d7d817fe47606c591cc03e8d71e744d187bca5d7
R 9f76f7cb520c390eaafad0ef9a9d36d5 R 543606082cda2c82860978b7faa03dd3
U kostas U kostas
Z bf67ad5420324215cd78ba9fd7ee459a Z 27b4fa1c78748861491b64c86e84922e

2
manifest.uuid
View File

@ -1 +1 @@
d7d817fe47606c591cc03e8d71e744d187bca5d7 c5f9a9d87d22a61c1ffaa5c0fb893cf5dad3a08d