Changeset 1005
- Timestamp:
- 10/06/08 10:01:08 (2 months ago)
- Files:
-
- trunk/src/checkout.cpp (modified) (1 diff)
- trunk/src/fileselector.cpp (modified) (4 diffs)
- trunk/src/forms/qsvn.ui (modified) (12 diffs)
- trunk/src/images/actionadd.png (deleted)
- trunk/src/images/actionadd.svg (moved) (moved from trunk/src/images/svg/actionadd.svg) (1 prop)
- trunk/src/images/actionaddlocal.png (deleted)
- trunk/src/images/actionaddlocal.svg (moved) (moved from trunk/src/images/svg/actionaddlocal.svg) (1 prop)
- trunk/src/images/actioncheckout.png (deleted)
- trunk/src/images/actioncheckout.svg (moved) (moved from trunk/src/images/svg/actioncheckout.svg) (1 prop)
- trunk/src/images/actioncommit.png (deleted)
- trunk/src/images/actioncommit.svg (moved) (moved from trunk/src/images/svg/actioncommit.svg) (1 prop)
- trunk/src/images/actiondelete.png (deleted)
- trunk/src/images/actiondelete.svg (moved) (moved from trunk/src/images/svg/actiondelete.svg) (1 prop)
- trunk/src/images/actiondeletelocal.png (deleted)
- trunk/src/images/actiondeletelocal.svg (moved) (moved from trunk/src/images/svg/actiondeletelocal.svg) (1 prop)
- trunk/src/images/actionrevert.png (deleted)
- trunk/src/images/actionrevert.svg (moved) (moved from trunk/src/images/svg/actionrevert.svg) (1 prop)
- trunk/src/images/actionupdate.png (deleted)
- trunk/src/images/actionupdate.svg (moved) (moved from trunk/src/images/svg/actionupdate.svg) (1 prop)
- trunk/src/qsvn.qrc (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/src/checkout.cpp
r945 r1005 32 32 { 33 33 setupUi(this); 34 setWindowIcon(QIcon(":/images/actioncheckout. png"));34 setWindowIcon(QIcon(":/images/actioncheckout.svg")); 35 35 Config::instance()->restoreWidget(this); 36 36 trunk/src/fileselector.cpp
r987 r1005 89 89 break; 90 90 case SvnClient::SvnAdd: 91 setWindowIcon(QIcon(":/images/actionaddlocal. png"));91 setWindowIcon(QIcon(":/images/actionaddlocal.svg")); 92 92 groupBoxLogMessage->setVisible(false); 93 93 treeViewFiles->setFocus(Qt::MouseFocusReason); 94 94 break; 95 95 case SvnClient::SvnCommit: 96 setWindowIcon(QIcon(":/images/actioncommit. png"));96 setWindowIcon(QIcon(":/images/actioncommit.svg")); 97 97 comboLogHistory->addItems(Config::instance()->getStringList("logHistory")); 98 98 comboLogHistory->insertItem(0, ""); … … 102 102 break; 103 103 case SvnClient::SvnDelete: 104 setWindowIcon(QIcon(":/images/actiondeletelocal. png"));104 setWindowIcon(QIcon(":/images/actiondeletelocal.svg")); 105 105 groupBoxLogMessage->setVisible(false); 106 106 treeViewFiles->setFocus(Qt::MouseFocusReason); 107 107 break; 108 108 case SvnClient::SvnRevert: 109 setWindowIcon(QIcon(":/images/actionrevert. png"));109 setWindowIcon(QIcon(":/images/actionrevert.svg")); 110 110 groupBoxLogMessage->setVisible(false); 111 111 treeViewFiles->setFocus(Qt::MouseFocusReason); 112 112 break; 113 113 case SvnClient::RemoveFromDisk: 114 setWindowIcon(QIcon(":/images/actiondeletelocal. png"));114 setWindowIcon(QIcon(":/images/actiondeletelocal.svg")); 115 115 groupBoxLogMessage->setVisible(false); 116 116 treeViewFiles->setFocus(Qt::MouseFocusReason); … … 133 133 contextMenu->addAction(actionRevert); 134 134 contextMenu->addAction(actionResolved); 135 actionRevert->setIcon(QIcon(":/images/actionrevert. png"));135 actionRevert->setIcon(QIcon(":/images/actionrevert.svg")); 136 136 } 137 137 if ((m_svnAction == SvnClient::SvnCommit) || … … 151 151 this, 152 152 SLOT(on_actionDiff_triggered())); 153 connect(m_statusEntriesModel, SIGNAL(beginUpdate()), 153 connect(m_statusEntriesModel, SIGNAL(beginUpdate()), 154 154 this, SLOT(on_FsWatcherBeginUpdate())); 155 155 connect(m_statusEntriesModel, SIGNAL(endUpdate()), trunk/src/forms/qsvn.ui
r995 r1005 14 14 </property> 15 15 <widget class="QWidget" name="centralWidget" > 16 <property name="geometry" > 17 <rect> 18 <x>0</x> 19 <y>62</y> 20 <width>457</width> 21 <height>217</height> 22 </rect> 23 </property> 16 24 <layout class="QGridLayout" > 17 25 <property name="margin" > … … 88 96 <y>0</y> 89 97 <width>457</width> 90 <height> 21</height>98 <height>31</height> 91 99 </rect> 92 100 </property> … … 152 160 </widget> 153 161 <widget class="QToolBar" name="toolBarWorkingCopy" > 162 <property name="geometry" > 163 <rect> 164 <x>0</x> 165 <y>31</y> 166 <width>69</width> 167 <height>31</height> 168 </rect> 169 </property> 154 170 <property name="minimumSize" > 155 171 <size> … … 177 193 </widget> 178 194 <widget class="QToolBar" name="toolBarModify" > 195 <property name="geometry" > 196 <rect> 197 <x>69</x> 198 <y>31</y> 199 <width>153</width> 200 <height>31</height> 201 </rect> 202 </property> 179 203 <property name="orientation" > 180 204 <enum>Qt::Horizontal</enum> … … 200 224 </widget> 201 225 <widget class="QToolBar" name="toolBarAction" > 226 <property name="geometry" > 227 <rect> 228 <x>222</x> 229 <y>31</y> 230 <width>235</width> 231 <height>31</height> 232 </rect> 233 </property> 202 234 <property name="orientation" > 203 235 <enum>Qt::Horizontal</enum> … … 225 257 <property name="icon" > 226 258 <iconset resource="../qsvn.qrc" > 227 <normaloff>:/images/actionadd. png</normaloff>:/images/actionadd.png</iconset>259 <normaloff>:/images/actionadd.svg</normaloff>:/images/actionadd.svg</iconset> 228 260 </property> 229 261 <property name="text" > … … 248 280 <property name="icon" > 249 281 <iconset resource="../qsvn.qrc" > 250 <normaloff>:/images/actioncheckout. png</normaloff>:/images/actioncheckout.png</iconset>282 <normaloff>:/images/actioncheckout.svg</normaloff>:/images/actioncheckout.svg</iconset> 251 283 </property> 252 284 <property name="text" > … … 260 292 <property name="icon" > 261 293 <iconset resource="../qsvn.qrc" > 262 <normaloff>:/images/actionupdate. png</normaloff>:/images/actionupdate.png</iconset>294 <normaloff>:/images/actionupdate.svg</normaloff>:/images/actionupdate.svg</iconset> 263 295 </property> 264 296 <property name="text" > … … 269 301 <property name="icon" > 270 302 <iconset resource="../qsvn.qrc" > 271 <normaloff>:/images/actioncommit. png</normaloff>:/images/actioncommit.png</iconset>303 <normaloff>:/images/actioncommit.svg</normaloff>:/images/actioncommit.svg</iconset> 272 304 </property> 273 305 <property name="text" > … … 278 310 <property name="icon" > 279 311 <iconset resource="../qsvn.qrc" > 280 <normaloff>:/images/actionaddlocal. png</normaloff>:/images/actionaddlocal.png</iconset>312 <normaloff>:/images/actionaddlocal.svg</normaloff>:/images/actionaddlocal.svg</iconset> 281 313 </property> 282 314 <property name="text" > … … 287 319 <property name="icon" > 288 320 <iconset resource="../qsvn.qrc" > 289 <normaloff>:/images/actiondeletelocal. png</normaloff>:/images/actiondeletelocal.png</iconset>321 <normaloff>:/images/actiondeletelocal.svg</normaloff>:/images/actiondeletelocal.svg</iconset> 290 322 </property> 291 323 <property name="text" > … … 296 328 <property name="icon" > 297 329 <iconset resource="../qsvn.qrc" > 298 <normaloff>:/images/actionrevert. png</normaloff>:/images/actionrevert.png</iconset>330 <normaloff>:/images/actionrevert.svg</normaloff>:/images/actionrevert.svg</iconset> 299 331 </property> 300 332 <property name="text" > trunk/src/images/actionadd.svg
- Property svn:mergeinfo set
trunk/src/images/actionaddlocal.svg
- Property svn:mergeinfo set
trunk/src/images/actioncheckout.svg
- Property svn:mergeinfo set
trunk/src/images/actioncommit.svg
- Property svn:mergeinfo set
trunk/src/images/actiondelete.svg
- Property svn:mergeinfo set
trunk/src/images/actiondeletelocal.svg
- Property svn:mergeinfo set
trunk/src/images/actionrevert.svg
- Property svn:mergeinfo set
trunk/src/images/actionupdate.svg
- Property svn:mergeinfo set
trunk/src/qsvn.qrc
r720 r1005 1 <!DOCTYPE RCC><RCC version="1.0"> 2 <qresource> 1 <RCC> 2 <qresource> 3 <file>images/actionadd.svg</file> 4 <file>images/actionaddlocal.svg</file> 5 <file>images/actioncheckout.svg</file> 6 <file>images/actioncommit.svg</file> 7 <file>images/actiondelete.svg</file> 8 <file>images/actiondeletelocal.svg</file> 9 <file>images/actionrevert.svg</file> 10 <file>images/actionupdate.svg</file> 3 11 <file>images/qsvn.png</file> 4 12 <file>images/folder.png</file> 5 13 <file>images/unknownfolder.png</file> 6 7 14 <file>images/file.png</file> 8 15 <file>images/addedfile.png</file> … … 11 18 <file>images/modifiedfile.png</file> 12 19 <file>images/unknownfile.png</file> 13 14 <file>images/actioncheckout.png</file>15 <file>images/actionadd.png</file>16 <file>images/actionaddlocal.png</file>17 <file>images/actioncommit.png</file>18 <file>images/actiondelete.png</file>19 <file>images/actiondeletelocal.png</file>20 <file>images/actionrevert.png</file>21 <file>images/actionupdate.png</file>22 23 20 <file>images/actionstop.png</file> 24 </qresource>21 </qresource> 25 22 </RCC>
