Permalink
Browse files

Merge remote branch 'bdenne2/master'

Conflicts:
	mainwindow.ui
  • Loading branch information...
2 parents 85507c3 + 0e60f2b commit c93afb6f3886b79e2cc41285fd58da132276bd0b @hef hef committed Dec 2, 2010
@@ -32,5 +32,8 @@ void GitChangedStatusModel::update(QStringList files)
QRegExp rx("^(.\\S).*$"); // " M filname" "MM filename" "AM filename"
rx.setPatternSyntax(QRegExp::RegExp2);
*fileList = files.filter(rx);
+ QRegExp awesome("^...");
+ awesome.setPatternSyntax(QRegExp::RegExp2);
+ fileList->replaceInStrings( awesome, "" );
emit dataChanged( createIndex(0,0), createIndex( fileList->count() ,0 ) );
}
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="744.09448819"
+ height="1052.3622047"
+ id="svg2"
+ version="1.1"
+ inkscape:version="0.47 r22583"
+ sodipodi:docname="topArrow.svg"
+ inkscape:export-filename="/home/bry/code/cs440/gitit/images/topArrow15.png"
+ inkscape:export-xdpi="50"
+ inkscape:export-ydpi="50">
+ <defs
+ id="defs4">
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 526.18109 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="744.09448 : 526.18109 : 1"
+ inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+ id="perspective10" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="0.24748737"
+ inkscape:cx="1017.5699"
+ inkscape:cy="-11.487163"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:window-width="1920"
+ inkscape:window-height="1029"
+ inkscape:window-x="0"
+ inkscape:window-y="25"
+ inkscape:window-maximized="1" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1">
+ <path
+ style="fill:#000000;stroke:#000000;stroke-width:9.39562225px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 710.80383,613.9081 -95.31892,136.43878 0,-97.45626 -306.17596,0 0,-557.449891 -118.42654,0 0,-77.96502 179.08405,0 -5.7769,569.144631 245.51843,-3.89825 2.88848,-109.15104 98.20736,140.33705 z"
+ id="path2818"
+ sodipodi:nodetypes="cccccccccccc"
+ inkscape:export-xdpi="50"
+ inkscape:export-ydpi="50"
+ inkscape:export-filename="/home/bry/code/cs440/gitit/images/downArrow.png" />
+ </g>
+</svg>
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
@@ -183,53 +183,53 @@ p, li { white-space: pre-wrap; }
<widget class="QPushButton" name="pushButton_3">
<property name="geometry">
<rect>
- <x>150</x>
- <y>290</y>
- <width>93</width>
- <height>27</height>
+ <x>170</x>
+ <y>160</y>
+ <width>91</width>
+ <height>201</height>
</rect>
</property>
<property name="text">
- <string>----&gt;</string>
+ <string/>
</property>
- </widget>
- <widget class="QPushButton" name="pushButton_4">
- <property name="geometry">
- <rect>
- <x>250</x>
- <y>180</y>
- <width>93</width>
- <height>27</height>
- </rect>
+ <property name="icon">
+ <iconset>
+ <normaloff>:/images/downArrow.png</normaloff>:/images/downArrow.png</iconset>
</property>
- <property name="text">
- <string>UP ^</string>
+ <property name="iconSize">
+ <size>
+ <width>90</width>
+ <height>200</height>
+ </size>
+ </property>
+ <property name="flat">
+ <bool>true</bool>
</property>
</widget>
- <widget class="QPushButton" name="pushButton_5">
+ <widget class="QPushButton" name="pushButton_2">
<property name="geometry">
<rect>
- <x>350</x>
- <y>180</y>
- <width>93</width>
- <height>27</height>
+ <x>170</x>
+ <y>20</y>
+ <width>91</width>
+ <height>201</height>
</rect>
</property>
<property name="text">
- <string>Down v</string>
+ <string/>
</property>
- </widget>
- <widget class="QPushButton" name="pushButton_6">
- <property name="geometry">
- <rect>
- <x>420</x>
- <y>90</y>
- <width>93</width>
- <height>27</height>
- </rect>
+ <property name="icon">
+ <iconset>
+ <normaloff>:/images/topArrow15.png</normaloff>:/images/topArrow15.png</iconset>
</property>
- <property name="text">
- <string>----&gt;</string>
+ <property name="iconSize">
+ <size>
+ <width>90</width>
+ <height>200</height>
+ </size>
+ </property>
+ <property name="flat">
+ <bool>true</bool>
</property>
</widget>
</widget>
@@ -360,7 +360,7 @@ p, li { white-space: pre-wrap; }
<x>0</x>
<y>0</y>
<width>804</width>
- <height>22</height>
+ <height>25</height>
</rect>
</property>
<widget class="QMenu" name="menuFile">
View
@@ -5,5 +5,7 @@
<file>images/drawing.png</file>
<file>images/drawing2.png</file>
<file>images/closedBox27.png</file>
+ <file>images/topArrow15.png</file>
+ <file>images/downArrow.png</file>
</qresource>
</RCC>

0 comments on commit c93afb6

Please sign in to comment.