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

Added support for stashes

Browse Source 
Generalized the commit dialog to support stashes
Parameters are now quoted in the log if necessary
Fixed another issue with the folderview show/hide logic
Various minor ui tweaks

FossilOrigin-Name: ce70efe67a1fe0087cc6d3aa79757a5011c57db2
This commit is contained in:
kostas
2012-04-15 06:56:51 +00:00
parent 022db4d4e9
commit 0ea4fd9831
8 changed files with 460 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

152
MainWindow.ui
View File

@ -32,7 +32,7 @@
</property>
<widget class="QSplitter" name="splitter">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>80</verstretch>
</sizepolicy>
@ -42,7 +42,7 @@
</property>
<widget class="QTreeView" name="treeView">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<sizepolicy hsizetype="Preferred" vsizetype="Expanding">
<horstretch>20</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@ -65,6 +65,9 @@
<attribute name="headerVisible">
<bool>false</bool>
</attribute>
<attribute name="headerShowSortIndicator" stdset="0">
<bool>false</bool>
</attribute>
</widget>
<widget class="QTableView" name="tableView">
<property name="sizePolicy">
@ -94,9 +97,15 @@
<property name="wordWrap">
<bool>false</bool>
</property>
<attribute name="horizontalHeaderHighlightSections">
<bool>false</bool>
</attribute>
<attribute name="horizontalHeaderMinimumSectionSize">
<number>20</number>
</attribute>
<attribute name="horizontalHeaderShowSortIndicator" stdset="0">
<bool>false</bool>
</attribute>
<attribute name="verticalHeaderVisible">
<bool>false</bool>
</attribute>
@ -104,6 +113,44 @@
<number>30</number>
</attribute>
</widget>
<widget class="QTableView" name="tableViewStash">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Expanding">
<horstretch>20</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="contextMenuPolicy">
<enum>Qt::ActionsContextMenu</enum>
</property>
<property name="editTriggers">
<set>QAbstractItemView::NoEditTriggers</set>
</property>
<property name="alternatingRowColors">
<bool>true</bool>
</property>
<property name="selectionBehavior">
<enum>QAbstractItemView::SelectRows</enum>
</property>
<property name="showGrid">
<bool>false</bool>
</property>
<property name="sortingEnabled">
<bool>true</bool>
</property>
<property name="wordWrap">
<bool>false</bool>
</property>
<attribute name="horizontalHeaderHighlightSections">
<bool>false</bool>
</attribute>
<attribute name="horizontalHeaderStretchLastSection">
<bool>true</bool>
</attribute>
<attribute name="verticalHeaderVisible">
<bool>false</bool>
</attribute>
</widget>
</widget>
<widget class="QTextBrowser" name="textBrowser">
<property name="sizePolicy">
@ -128,7 +175,7 @@
</property>
<widget class="QMenu" name="menuFile">
<property name="title">
<string>File</string>
<string>&amp;File</string>
</property>
<addaction name="actionNewRepository"/>
<addaction name="actionOpenRepository"/>
@ -141,19 +188,21 @@
</widget>
<widget class="QMenu" name="menuHelp">
<property name="title">
<string>Help</string>
<string>&amp;Help</string>
</property>
<addaction name="actionAbout"/>
</widget>
<widget class="QMenu" name="menuView">
<property name="title">
<string>View</string>
<string>&amp;View</string>
</property>
<addaction name="actionViewModified"/>
<addaction name="actionViewUnchanged"/>
<addaction name="actionViewUnknown"/>
<addaction name="actionViewIgnored"/>
<addaction name="separator"/>
<addaction name="actionViewStash"/>
<addaction name="separator"/>
<addaction name="actionViewAsList"/>
</widget>
<addaction name="menuFile"/>
@ -199,6 +248,8 @@
<addaction name="actionRevert"/>
<addaction name="actionDelete"/>
<addaction name="separator"/>
<addaction name="actionNewStash"/>
<addaction name="separator"/>
<addaction name="actionDiff"/>
<addaction name="actionHistory"/>
<addaction name="separator"/>
@ -305,7 +356,7 @@
<normaloff>:/icons/icons/Document Blank-01.png</normaloff>:/icons/icons/Document Blank-01.png</iconset>
</property>
<property name="text">
<string>New...</string>
<string>&amp;New...</string>
</property>
<property name="toolTip">
<string>Make a new Fossil repository</string>
@ -323,7 +374,7 @@
<normaloff>:/icons/icons/My Documents-01.png</normaloff>:/icons/icons/My Documents-01.png</iconset>
</property>
<property name="text">
<string>Open...</string>
<string>&amp;Open...</string>
</property>
<property name="toolTip">
<string>Open a Fossil repository or workspace folder</string>
@ -340,7 +391,7 @@
</action>
<action name="actionCloseRepository">
<property name="text">
<string>Close</string>
<string>&amp;Close</string>
</property>
<property name="toolTip">
<string>Close the current workspace</string>
@ -418,7 +469,7 @@
<normaloff>:/icons/icons/Button Turn Off-01.png</normaloff>:/icons/icons/Button Turn Off-01.png</iconset>
</property>
<property name="text">
<string>Quit</string>
<string>&amp;Quit</string>
</property>
<property name="statusTip">
<string>Quit</string>
@ -532,7 +583,7 @@
<action name="actionOpenContaining">
<property name="icon">
<iconset resource="resources.qrc">
<normaloff>:/icons/icons/My Documents-01.png</normaloff>:/icons/icons/My Documents-01.png</iconset>
<normaloff>:/icons/icons/Folder-01.png</normaloff>:/icons/icons/Folder-01.png</iconset>
</property>
<property name="text">
<string>Open Containing</string>
@ -571,7 +622,7 @@
<normaloff>:/icons/icons/Battery-01.png</normaloff>:/icons/icons/Battery-01.png</iconset>
</property>
<property name="text">
<string>About...</string>
<string>&amp;About...</string>
</property>
<property name="statusTip">
<string>About Fuel</string>
@ -601,7 +652,7 @@
<normaloff>:/icons/icons/Gear-01.png</normaloff>:/icons/icons/Gear-01.png</iconset>
</property>
<property name="text">
<string>Preferences...</string>
<string>&amp;Preferences...</string>
</property>
<property name="toolTip">
<string>Fuel Preferences</string>
@ -618,7 +669,7 @@
<bool>true</bool>
</property>
<property name="text">
<string>Modified</string>
<string>&amp;Modified</string>
</property>
<property name="statusTip">
<string>Show modifed files</string>
@ -632,7 +683,7 @@
<bool>true</bool>
</property>
<property name="text">
<string>Unchanged</string>
<string>&amp;Unchanged</string>
</property>
<property name="statusTip">
<string>Show unchanged files</string>
@ -646,7 +697,7 @@
<bool>true</bool>
</property>
<property name="text">
<string>Unknown</string>
<string>Un&amp;known</string>
</property>
<property name="statusTip">
<string>Show unknown files</string>
@ -657,7 +708,7 @@
<bool>true</bool>
</property>
<property name="text">
<string>Ignored</string>
<string>&amp;Ignored</string>
</property>
<property name="statusTip">
<string>Show ignored files</string>
@ -668,7 +719,13 @@
<bool>true</bool>
</property>
<property name="text">
<string>View as List</string>
<string>File &amp;List</string>
</property>
<property name="iconText">
<string>View as files as a list</string>
</property>
<property name="toolTip">
<string>View as files as a list</string>
</property>
<property name="statusTip">
<string>View the workspace as a list of files</string>
@ -677,7 +734,7 @@
<action name="actionOpenFolder">
<property name="icon">
<iconset resource="resources.qrc">
<normaloff>:/icons/icons/My Documents-01.png</normaloff>:/icons/icons/My Documents-01.png</iconset>
<normaloff>:/icons/icons/Folder-01.png</normaloff>:/icons/icons/Folder-01.png</iconset>
</property>
<property name="text">
<string>Open Folder</string>
@ -704,6 +761,65 @@
<string>Rename the selected folder</string>
</property>
</action>
<action name="actionNewStash">
<property name="icon">
<iconset resource="resources.qrc">
<normaloff>:/icons/icons/Folder Add-01.png</normaloff>:/icons/icons/Folder Add-01.png</iconset>
</property>
<property name="text">
<string>Stash changes</string>
</property>
<property name="statusTip">
<string>Show the stash</string>
</property>
</action>
<action name="actionApplyStash">
<property name="icon">
<iconset resource="resources.qrc">
<normaloff>:/icons/icons/Folder Open-01.png</normaloff>:/icons/icons/Folder Open-01.png</iconset>
</property>
<property name="text">
<string>Apply Stash</string>
</property>
<property name="iconText">
<string>Apply stashed changes</string>
</property>
<property name="toolTip">
<string>Apply stashed changes</string>
</property>
</action>
<action name="actionViewStash">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>&amp;Stashed Changes</string>
</property>
<property name="iconText">
<string>View the Stash</string>
</property>
<property name="toolTip">
<string>Show the list of stashed changes</string>
</property>
</action>
<action name="actionDeleteStash">
<property name="icon">
<iconset resource="resources.qrc">
<normaloff>:/icons/icons/Folder Delete-01.png</normaloff>:/icons/icons/Folder Delete-01.png</iconset>
</property>
<property name="text">
<string>Delete Stash</string>
</property>
</action>
<action name="actionDiffStash">
<property name="icon">
<iconset resource="resources.qrc">
<normaloff>:/icons/icons/Folder Explorer-01.png</normaloff>:/icons/icons/Folder Explorer-01.png</iconset>
</property>
<property name="text">
<string>Diff Stash</string>
</property>
</action>
</widget>
<layoutdefault spacing="6" margin="11"/>
<resources>