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

- App now uses aliases instead of icon filenames

Browse Source 
- Removed unused actionViewStash





FossilOrigin-Name: 999f57bd1e05e99c67a921c09f782da170ae827c
This commit is contained in:
kostas 2015-05-22 20:18:08 +00:00
parent 73e230db6a
commit 6a67423d31
7 changed files with 247 additions and 256 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
manifest
View File

@ -1,5 +1,5 @@
C Maintain\sthe\sworkspace\sstate\seven\swhen\srefreshing
D 2015-05-17T16:43:55.245
C -\sApp\snow\suses\saliases\sinstead\sof\sicon\sfilenames\n-\sRemoved\sunused\sactionViewStash\n\n\n\n
D 2015-05-22T20:18:08.661
F .travis.yml 77966888a81c4ceee1fcc79bce842c9667ad8a35
F debian/changelog eb4304dfcb6bb66850ec740838090eb50ce1249b
F debian/compat b6abd567fa79cbe0196d093a067271361dc6ca8b
@ -183,7 +183,7 @@ F rsrc/icons/Zoom-01.png 67ca532922e9166325c5c75fce1ca3fbb0d2b6a6
F rsrc/icons/fuel.icns 81e535004b62db801a02f3e15d0a33afc9d4070b
F rsrc/icons/fuel.ico eb529ab3332a17b9302ef3e851db5b9ebce2a038
F rsrc/icons/fuel.png 40daf53b7f6bdcdd0d6aa5ef433d078ec5ea4342
F rsrc/resources.qrc 4098be128fd6c045db933d041fe8844b14643a6f
F rsrc/resources.qrc 3864cdcf37e8e746380d33988efacd5c95c6e384
F src/BrowserWidget.cpp 8b8f545cdff4a4188edc698a1b4777f5df46f056
F src/BrowserWidget.h 764d66aa9a93b890298bd0301097739cb4e16597
F src/CloneDialog.cpp 4fc5aa8146ac63ba6ba7341b1635b3025819d708
@ -200,7 +200,7 @@ F src/Fossil.cpp ca7ad24622e1fc1a03c92d7ae9b51afc17f7c09c
F src/Fossil.h d65a7461d213bcc30f08724d3306c6ee00843217
F src/LoggedProcess.cpp 2a1e5c94bc1e57c8984563e66c210e43a14dc60c
F src/LoggedProcess.h 85df7c635c807a5a0e8c4763f17a0752aaff7261
F src/MainWindow.cpp a354f84278c1a59c385eaff73c3c8cea6cab6f0b
F src/MainWindow.cpp 0c4e30a60fe3a0ab882495fc79172993e34b2a22
F src/MainWindow.h f2141839cccb3941df9ed7288588f2de3a5c8179
F src/RevisionDialog.cpp 51065c65a07c118dd1a7363da4a55a135d1c6c9c
F src/RevisionDialog.h b718c3009342eaabad39c8a11a253a4e4fef7a73
@ -215,14 +215,14 @@ F src/Workspace.h d6649a3ae1cd0fbad55237030313e85530417271
F src/main.cpp d8c65ea5e54102e4989fef9fd8cfd4f13ef8a8f0
F tools/git-push.sh 62cc58434cae5b7bcd6bd9d4cce8b08739f31cd7 x
F tools/pack.sh d7f38a498c4e9327fecd6a6e5ac27be270d43008 x
F ui/BrowserWidget.ui 5ad98b13773afadb20a1a2c22148aaebe5dbd95d
F ui/BrowserWidget.ui 994ad9ea0e9f5815d6b1a27acc2f6f39164c507f
F ui/CloneDialog.ui 4886e7d4f258ea8b852b5eefc860396e35145712
F ui/CommitDialog.ui 6200f6cabdcf40a20812e811be28e0793f82516f
F ui/FileActionDialog.ui 89bb4dc2d0b8adcd41adcb11ec65f2028a09a12d
F ui/MainWindow.ui a35d624f5643b56d0c6f13c4b3eb30bd2d77206c
F ui/MainWindow.ui 7f11c2ca1c3e371c71db27ae0fe6ad3758e6b5e1
F ui/RevisionDialog.ui 27c3b98c665fec014a50cbf3352c0627f75e68cd
F ui/SettingsDialog.ui 2b7c2870e0054b0f4106f495d85d02c0b814df8b
P 502ce5e1b68dd97da3b9a779e5683d2f1ddcb61c
R 02b904e8c4daad9d4def2ef7d9cea429
F ui/SettingsDialog.ui 5aafd8784268ea7cd828330d4673500b8f38d6db
P 0eef20c8eb990a24b214a25b630b2786fee010d7
R 21435a9740da4d31c0bef8b2f954d654
U kostas
Z d1ccd1d3dcbc5bb7805478bf9b9cb4e5
Z e16a627a5e5c7286e58debb37a03c1db

2
manifest.uuid
View File

@ -1 +1 @@
0eef20c8eb990a24b214a25b630b2786fee010d7
999f57bd1e05e99c67a921c09f782da170ae827c

325
rsrc/resources.qrc
View File

@ -1,163 +1,166 @@
<RCC>
<qresource prefix="/icons">
<file>icons/Address Book-01.png</file>
<file>icons/Adobe Illustrator CS3 Document-01.png</file>
<file>icons/Adobe PDF Document-01.png</file>
<file>icons/Adobe Photoshop CS3 Document-01.png</file>
<file>icons/Battery-01.png</file>
<file>icons/Binoculars-01.png</file>
<file>icons/Book-01.png</file>
<file>icons/Briefcase-01.png</file>
<file>icons/Button Add-01.png</file>
<file>icons/Button Blank Blue-01.png</file>
<file>icons/Button Blank Gray-01.png</file>
<file>icons/Button Blank Green-01.png</file>
<file>icons/Button Blank Red-01.png</file>
<file>icons/Button Blank Yellow-01.png</file>
<file>icons/Button Cancel-01.png</file>
<file>icons/Button Close-01.png</file>
<file>icons/Button Delete-01.png</file>
<file>icons/Button Download-01.png</file>
<file>icons/Button Favorite-01.png</file>
<file>icons/Button Forward-01.png</file>
<file>icons/Button Help-01.png</file>
<file>icons/Button Info-01.png</file>
<file>icons/Button Log Off-01.png</file>
<file>icons/Button Next-01.png</file>
<file>icons/Button Pause-01.png</file>
<file>icons/Button Play-01.png</file>
<file>icons/Button Previous-01.png</file>
<file>icons/Button Refresh-01.png</file>
<file>icons/Button Reload-01.png</file>
<file>icons/Button Reminder-01.png</file>
<file>icons/Button Rewind-01.png</file>
<file>icons/Button Talk Balloon-01.png</file>
<file>icons/Button Turn Off-01.png</file>
<file>icons/Button Turn On-01.png</file>
<file>icons/Button Upload-01.png</file>
<file>icons/Button Warning-01.png</file>
<file>icons/Calculator-01.png</file>
<file>icons/Calendar Blue-01.png</file>
<file>icons/Calendar Green-01.png</file>
<file>icons/Calendar Red-01.png</file>
<file>icons/Clipboard-01.png</file>
<file>icons/Clipboard Paste-01.png</file>
<file>icons/Clock-01.png</file>
<file>icons/Coin-01.png</file>
<file>icons/Compressed File RAR-01.png</file>
<file>icons/Compressed File SIT-01.png</file>
<file>icons/Compressed File Zip-01.png</file>
<file>icons/Computer Monitor-01.png</file>
<file>icons/Computer Network-01.png</file>
<file>icons/Document-01.png</file>
<file>icons/Document Attach-01.png</file>
<file>icons/Document Blank-01.png</file>
<file>icons/Document Chart-01.png</file>
<file>icons/Document Copy-01.png</file>
<file>icons/Document Flow Chart-01.png</file>
<file>icons/Document Gant Chart-01.png</file>
<file>icons/Document Help-01.png</file>
<file>icons/Document Line Chart-01.png</file>
<file>icons/Document Microsoft Excel-01.png</file>
<file>icons/Document Microsoft PowerPoint-01.png</file>
<file>icons/Document Microsoft Word-01.png</file>
<file>icons/Document Organization Chart-01.png</file>
<file>icons/Document Preview-01.png</file>
<file>icons/Document-Revert-icon.png</file>
<file>icons/Document Text-01.png</file>
<file>icons/Edit Document-01.png</file>
<file>icons/Email-01.png</file>
<file>icons/Email Attachment-01.png</file>
<file>icons/Email Delete-01.png</file>
<file>icons/Email Download-01.png</file>
<file>icons/Email Forward-01.png</file>
<file>icons/Email Inbox-01.png</file>
<file>icons/Email Reply-01.png</file>
<file>icons/File Audio-01.png</file>
<file>icons/File Audio AIFF-01.png</file>
<file>icons/File Audio MP3-01.png</file>
<file>icons/File Audio WAV-01.png</file>
<file>icons/File Audio WMA-01.png</file>
<file>icons/File Delete-01.png</file>
<file>icons/File History-01.png</file>
<file>icons/File New-01.png</file>
<file>icons/File Open-01.png</file>
<file>icons/File Video 3GP-01.png</file>
<file>icons/File Video-01.png</file>
<file>icons/File Video AVI-01.png</file>
<file>icons/File Video MOV-01.png</file>
<file>icons/File Video MPEG-01.png</file>
<file>icons/File Video WMV-01.png</file>
<file>icons/Folder-01.png</file>
<file>icons/Folder Add-01.png</file>
<file>icons/Folder Compressed-01.png</file>
<file>icons/Folder Delete-01.png</file>
<file>icons/Folder Explorer-01.png</file>
<file>icons/Folder Generic Blue-01.png</file>
<file>icons/Folder Generic Green-01.png</file>
<file>icons/Folder Generic Red-01.png</file>
<file>icons/Folder Generic Silver-01.png</file>
<file>icons/Folder Open-01.png</file>
<file>icons/Folder RAR-01.png</file>
<file>icons/Games-01.png</file>
<file>icons/Gear-01.png</file>
<file>icons/Highlighter Blue-01.png</file>
<file>icons/Highlighter Green-01.png</file>
<file>icons/Highlighter Yellow-01.png</file>
<file>icons/Image BMP-01.png</file>
<file>icons/Image GIF-01.png</file>
<file>icons/Image JPEG-01.png</file>
<file>icons/Image PNG-01.png</file>
<file>icons/Image TIFF-01.png</file>
<file>icons/Lock Lock-01.png</file>
<file>icons/Lock Unlock-01.png</file>
<file>icons/My Documents-01.png</file>
<file>icons/My Ebooks-01.png</file>
<file>icons/My Music-01.png</file>
<file>icons/My Pictures.png</file>
<file>icons/My Videos-01.png</file>
<file>icons/My Websites-01.png</file>
<file>icons/Network Firewall-01.png</file>
<file>icons/Network MAC-01.png</file>
<file>icons/Network PC-01.png</file>
<file>icons/Network Refresh-01.png</file>
<file>icons/Pen Blue-01.png</file>
<file>icons/Pen Green-01.png</file>
<file>icons/Pen Red-01.png</file>
<file>icons/Save-01.png</file>
<file>icons/Text Edit.png</file>
<file>icons/USB-01.png</file>
<file>icons/User Administrator Blue-01.png</file>
<file>icons/User Administrator Green-01.png</file>
<file>icons/User Administrator Red-01.png</file>
<file>icons/User Chat-01.png</file>
<file>icons/User Clients-01.png</file>
<file>icons/User Coat Blue-01.png</file>
<file>icons/User Coat Green-01.png</file>
<file>icons/User Coat Red-01.png</file>
<file>icons/User Executive Blue-01.png</file>
<file>icons/User Executive Green-01.png</file>
<file>icons/User Executive Red-01.png</file>
<file>icons/User Group-01.png</file>
<file>icons/User Preppy Blue-01.png</file>
<file>icons/User Preppy Green-01.png</file>
<file>icons/User Preppy Red-01.png</file>
<file>icons/Web HTML-01.png</file>
<file>icons/Web XML-01.png</file>
<file>icons/Window-01.png</file>
<file>icons/Window Refresh-01.png</file>
<file>icons/Windows-01.png</file>
<file>icons/Windows Cascade-01.png</file>
<file>icons/Zoom-01.png</file>
<file>icons/Zoom In-01.png</file>
<file>icons/Zoom Out-01.png</file>
</qresource>
<qresource prefix="/intl">
<file>intl/el_GR.qm</file>
<file>intl/de_DE.qm</file>
<file>intl/es_ES.qm</file>
<file>intl/fr_FR.qm</file>
<file>intl/ru_RU.qm</file>
<file>intl/pt_PT.qm</file>
</qresource>
<qresource prefix="/icons">
<file>icons/Address Book-01.png</file>
<file>icons/Adobe Illustrator CS3 Document-01.png</file>
<file>icons/Adobe PDF Document-01.png</file>
<file>icons/Adobe Photoshop CS3 Document-01.png</file>
<file alias="icon-application">icons/Battery-01.png</file>
<file>icons/Binoculars-01.png</file>
<file alias="icon-item-tag">icons/Book-01.png</file>
<file>icons/Briefcase-01.png</file>
<file alias="icon-item-added">icons/Button Add-01.png</file>
<file>icons/Button Blank Blue-01.png</file>
<file alias="icon-item-unknown">icons/Button Blank Gray-01.png</file>
<file alias="icon-item-unchanged">icons/Button Blank Green-01.png</file>
<file alias="icon-item-conflicted">icons/Button Blank Red-01.png</file>
<file alias="icon-item-edited">icons/Button Blank Yellow-01.png</file>
<file>icons/Button Cancel-01.png</file>
<file alias="icon-item-deleted">icons/Button Close-01.png</file>
<file alias="icon-action-tag-delete">icons/Button Close-01.png</file>
<file alias="icon-action-stop">icons/Button Close-01.png</file>
<file>icons/Button Delete-01.png</file>
<file alias="icon-action-pull">icons/Button Download-01.png</file>
<file>icons/Button Favorite-01.png</file>
<file>icons/Button Forward-01.png</file>
<file alias="icon-item-missing">icons/Button Help-01.png</file>
<file>icons/Button Info-01.png</file>
<file>icons/Button Log Off-01.png</file>
<file alias="icon-action-next">icons/Button Next-01.png</file>
<file>icons/Button Pause-01.png</file>
<file alias="icon-action-update">icons/Button Play-01.png</file>
<file alias="icon-action-previous">icons/Button Previous-01.png</file>
<file alias="icon-action-refresh">icons/Button Refresh-01.png</file>
<file alias="icon-action-undo">icons/Button Reload-01.png</file>
<file alias="icon-item-renamed">icons/Button Reload-01.png</file>
<file>icons/Button Reminder-01.png</file>
<file alias="icon-action-revert">icons/Button Rewind-01.png</file>
<file>icons/Button Talk Balloon-01.png</file>
<file alias="icon-action-quit">icons/Button Turn Off-01.png</file>
<file>icons/Button Turn On-01.png</file>
<file alias="icon-action-push">icons/Button Upload-01.png</file>
<file>icons/Button Warning-01.png</file>
<file>icons/Calculator-01.png</file>
<file>icons/Calendar Blue-01.png</file>
<file>icons/Calendar Green-01.png</file>
<file>icons/Calendar Red-01.png</file>
<file>icons/Clipboard-01.png</file>
<file>icons/Clipboard Paste-01.png</file>
<file alias="icon-action-timeline">icons/Clock-01.png</file>
<file>icons/Coin-01.png</file>
<file>icons/Compressed File RAR-01.png</file>
<file>icons/Compressed File SIT-01.png</file>
<file>icons/Compressed File Zip-01.png</file>
<file>icons/Computer Monitor-01.png</file>
<file>icons/Computer Network-01.png</file>
<file alias="icon-item-file">icons/Document-01.png</file>
<file>icons/Document Attach-01.png</file>
<file alias="icon-action-repo-new">icons/Document Blank-01.png</file>
<file>icons/Document Chart-01.png</file>
<file alias="icon-item-diff">icons/Document Copy-01.png</file>
<file alias="icon-action-merge">icons/Document Flow Chart-01.png</file>
<file>icons/Document Gant Chart-01.png</file>
<file>icons/Document Help-01.png</file>
<file>icons/Document Line Chart-01.png</file>
<file>icons/Document Microsoft Excel-01.png</file>
<file>icons/Document Microsoft PowerPoint-01.png</file>
<file>icons/Document Microsoft Word-01.png</file>
<file alias="icon-item-branch">icons/Document Organization Chart-01.png</file>
<file>icons/Document Preview-01.png</file>
<file alias="icon-item-revert">icons/Document-Revert-icon.png</file>
<file>icons/Document Text-01.png</file>
<file>icons/Edit Document-01.png</file>
<file>icons/Email-01.png</file>
<file>icons/Email Attachment-01.png</file>
<file>icons/Email Delete-01.png</file>
<file>icons/Email Download-01.png</file>
<file>icons/Email Forward-01.png</file>
<file>icons/Email Inbox-01.png</file>
<file>icons/Email Reply-01.png</file>
<file>icons/File Audio-01.png</file>
<file>icons/File Audio AIFF-01.png</file>
<file>icons/File Audio MP3-01.png</file>
<file>icons/File Audio WAV-01.png</file>
<file>icons/File Audio WMA-01.png</file>
<file alias="icon-item-delete">icons/File Delete-01.png</file>
<file alias="icon-item-history">icons/File History-01.png</file>
<file alias="icon-item-add">icons/File New-01.png</file>
<file alias="icon-item-rename">icons/File Open-01.png</file>
<file>icons/File Video 3GP-01.png</file>
<file>icons/File Video-01.png</file>
<file>icons/File Video AVI-01.png</file>
<file>icons/File Video MOV-01.png</file>
<file>icons/File Video MPEG-01.png</file>
<file>icons/File Video WMV-01.png</file>
<file alias="icon-item-folder">icons/Folder-01.png</file>
<file alias="icon-action-stash-new">icons/Folder Add-01.png</file>
<file alias="icon-action-stash-apply">icons/Folder Compressed-01.png</file>
<file alias="icon-action-stash-delete">icons/Folder Delete-01.png</file>
<file alias="icon-action-stash-diff">icons/Folder Explorer-01.png</file>
<file>icons/Folder Generic Blue-01.png</file>
<file>icons/Folder Generic Green-01.png</file>
<file>icons/Folder Generic Red-01.png</file>
<file>icons/Folder Generic Silver-01.png</file>
<file alias="icon-action-folder-rename">icons/Folder Open-01.png</file>
<file>icons/Folder RAR-01.png</file>
<file>icons/Games-01.png</file>
<file alias="icon-action-settings">icons/Gear-01.png</file>
<file>icons/Highlighter Blue-01.png</file>
<file>icons/Highlighter Green-01.png</file>
<file alias="icon-action-tag-new">icons/Highlighter Yellow-01.png</file>
<file>icons/Image BMP-01.png</file>
<file>icons/Image GIF-01.png</file>
<file>icons/Image JPEG-01.png</file>
<file>icons/Image PNG-01.png</file>
<file>icons/Image TIFF-01.png</file>
<file>icons/Lock Lock-01.png</file>
<file>icons/Lock Unlock-01.png</file>
<file alias="icon-action-repo-open">icons/My Documents-01.png</file>
<file>icons/My Ebooks-01.png</file>
<file>icons/My Music-01.png</file>
<file>icons/My Pictures.png</file>
<file>icons/My Videos-01.png</file>
<file alias="icon-action-repo-clone">icons/My Websites-01.png</file>
<file>icons/Network Firewall-01.png</file>
<file alias="icon-webview">icons/Network MAC-01.png</file>
<file alias="icon-item-remote" >icons/Network PC-01.png</file>
<file>icons/Network Refresh-01.png</file>
<file>icons/Pen Blue-01.png</file>
<file>icons/Pen Green-01.png</file>
<file>icons/Pen Red-01.png</file>
<file alias="icon-action-commit">icons/Save-01.png</file>
<file alias="icon-clear-log">icons/Text Edit.png</file>
<file>icons/USB-01.png</file>
<file>icons/User Administrator Blue-01.png</file>
<file>icons/User Administrator Green-01.png</file>
<file>icons/User Administrator Red-01.png</file>
<file>icons/User Chat-01.png</file>
<file>icons/User Clients-01.png</file>
<file>icons/User Coat Blue-01.png</file>
<file>icons/User Coat Green-01.png</file>
<file>icons/User Coat Red-01.png</file>
<file>icons/User Executive Blue-01.png</file>
<file>icons/User Executive Green-01.png</file>
<file>icons/User Executive Red-01.png</file>
<file>icons/User Group-01.png</file>
<file>icons/User Preppy Blue-01.png</file>
<file>icons/User Preppy Green-01.png</file>
<file>icons/User Preppy Red-01.png</file>
<file>icons/Web HTML-01.png</file>
<file>icons/Web XML-01.png</file>
<file>icons/Window-01.png</file>
<file>icons/Window Refresh-01.png</file>
<file>icons/Windows-01.png</file>
<file>icons/Windows Cascade-01.png</file>
<file>icons/Zoom-01.png</file>
<file>icons/Zoom In-01.png</file>
<file>icons/Zoom Out-01.png</file>
</qresource>
<qresource prefix="/intl">
<file>intl/el_GR.qm</file>
<file>intl/de_DE.qm</file>
<file>intl/es_ES.qm</file>
<file>intl/fr_FR.qm</file>
<file>intl/ru_RU.qm</file>
<file>intl/pt_PT.qm</file>
</qresource>
</RCC>

40
src/MainWindow.cpp
View File

@ -711,7 +711,7 @@ void MainWindow::updateWorkspaceView()
// Clear content except headers
getWorkspace().getTreeModel().removeRows(0, getWorkspace().getTreeModel().rowCount());
QStandardItem *workspace = new QStandardItem(getInternalIcon(":icons/icons/Folder-01.png"), tr("Files") );
QStandardItem *workspace = new QStandardItem(getInternalIcon(":icons/icon-item-folder"), tr("Files") );
workspace->setData(WorkspaceItem(WorkspaceItem::TYPE_WORKSPACE, ""), ROLE_WORKSPACE_ITEM);
workspace->setEditable(false);
@ -724,7 +724,7 @@ void MainWindow::updateWorkspaceView()
if(dir.isEmpty())
continue;
addPathToTree(*workspace, dir, getInternalIcon(":icons/icons/Folder-01.png"));
addPathToTree(*workspace, dir, getInternalIcon(":icons/icon-item-folder"));
}
// Expand root folder
@ -732,13 +732,13 @@ void MainWindow::updateWorkspaceView()
}
// Branches
QStandardItem *branches = new QStandardItem(getInternalIcon(":icons/icons/Document Organization Chart-01.png"), "Branches");
QStandardItem *branches = new QStandardItem(getInternalIcon(":icons/icon-item-branch"), "Branches");
branches->setData(WorkspaceItem(WorkspaceItem::TYPE_BRANCHES, ""), ROLE_WORKSPACE_ITEM);
branches->setEditable(false);
getWorkspace().getTreeModel().appendRow(branches);
foreach(const QString &branch_name, getWorkspace().getBranches())
{
QStandardItem *branch = new QStandardItem(getInternalIcon(":icons/icons/Document Organization Chart-01.png"), branch_name);
QStandardItem *branch = new QStandardItem(getInternalIcon(":icons/icon-item-branch"), branch_name);
branch->setData(WorkspaceItem(WorkspaceItem::TYPE_BRANCH, branch_name), ROLE_WORKSPACE_ITEM);
bool active = fossil().getCurrentTags().contains(branch_name);
@ -752,7 +752,7 @@ void MainWindow::updateWorkspaceView()
}
// Tags
QStandardItem *tags = new QStandardItem(getInternalIcon(":icons/icons/Book-01.png"), "Tags");
QStandardItem *tags = new QStandardItem(getInternalIcon(":icons/icon-item-tag"), "Tags");
tags->setData(WorkspaceItem(WorkspaceItem::TYPE_TAGS, ""), ROLE_WORKSPACE_ITEM);
tags->setEditable(false);
getWorkspace().getTreeModel().appendRow(tags);
@ -761,7 +761,7 @@ void MainWindow::updateWorkspaceView()
const QString &tag_name = it.key();
QStandardItem *tag = new QStandardItem(getInternalIcon(":icons/icons/Book-01.png"), tag_name);
QStandardItem *tag = new QStandardItem(getInternalIcon(":icons/icon-item-tag"), tag_name);
tag->setData(WorkspaceItem(WorkspaceItem::TYPE_TAG, tag_name), ROLE_WORKSPACE_ITEM);
bool active = fossil().getCurrentTags().contains(tag_name);
@ -774,27 +774,28 @@ void MainWindow::updateWorkspaceView()
tags->appendRow(tag);
}
// FIXME: Unique Icon name
// Stashes
QStandardItem *stashes = new QStandardItem(getInternalIcon(":icons/icons/My Documents-01.png"), "Stashes");
QStandardItem *stashes = new QStandardItem(getInternalIcon(":icons/icon-action-repo-open"), "Stashes");
stashes->setData(WorkspaceItem(WorkspaceItem::TYPE_STASHES, ""), ROLE_WORKSPACE_ITEM);
stashes->setEditable(false);
getWorkspace().getTreeModel().appendRow(stashes);
for(stashmap_t::const_iterator it= getWorkspace().getStashes().begin(); it!=getWorkspace().getStashes().end(); ++it)
{
QStandardItem *stash = new QStandardItem(getInternalIcon(":icons/icons/My Documents-01.png"), it.key());
QStandardItem *stash = new QStandardItem(getInternalIcon(":icons/icon-action-repo-open"), it.key());
stash->setData(WorkspaceItem(WorkspaceItem::TYPE_STASH, it.value()), ROLE_WORKSPACE_ITEM);
stashes->appendRow(stash);
}
#if 0 // Unimplemented for now
// Remotes
QStandardItem *remotes = new QStandardItem(getInternalIcon(":icons/icons/Network PC-01.png"), "Remotes");
QStandardItem *remotes = new QStandardItem(getInternalIcon(":icons/icon-item-remote"), "Remotes");
remotes->setData(WorkspaceItem(WorkspaceItem::TYPE_REMOTES, ""), ROLE_WORKSPACE_ITEM);
remotes->setEditable(false);
getWorkspace().getDirModel().appendRow(remotes);
// Settings
QStandardItem *settings = new QStandardItem(getInternalIcon(":icons/icons/Gear-01.png"), "Settings");
QStandardItem *settings = new QStandardItem(getInternalIcon(":icons/icon-action-settings"), "Settings");
settings->setData(WorkspaceItem(WorkspaceItem::TYPE_SETTINGS, ""), ROLE_WORKSPACE_ITEM);
settings->setEditable(false);
getWorkspace().getDirModel().appendRow(settings);
@ -832,14 +833,14 @@ void MainWindow::updateFileView()
struct { WorkspaceFile::Type type; QString text; const char *icon; }
stats[] =
{
{ WorkspaceFile::TYPE_EDITTED, tr("Edited"), ":icons/icons/Button Blank Yellow-01.png" },
{ WorkspaceFile::TYPE_UNCHANGED, tr("Unchanged"), ":icons/icons/Button Blank Green-01.png" },
{ WorkspaceFile::TYPE_ADDED, tr("Added"), ":icons/icons/Button Add-01.png" },
{ WorkspaceFile::TYPE_DELETED, tr("Deleted"), ":icons/icons/Button Close-01.png" },
{ WorkspaceFile::TYPE_RENAMED, tr("Renamed"), ":icons/icons/Button Reload-01.png" },
{ WorkspaceFile::TYPE_MISSING, tr("Missing"), ":icons/icons/Button Help-01.png" },
{ WorkspaceFile::TYPE_CONFLICTED, tr("Conflicted"), ":icons/icons/Button Blank Red-01.png" },
{ WorkspaceFile::TYPE_MERGED, tr("Merged"), ":icons/icons/Button Blank Yellow-01.png" },
{ WorkspaceFile::TYPE_EDITTED, tr("Edited"), ":icons/icon-item-edited" },
{ WorkspaceFile::TYPE_UNCHANGED, tr("Unchanged"), ":icons/icon-item-unchanged" },
{ WorkspaceFile::TYPE_ADDED, tr("Added"), ":icons/icon-item-added" },
{ WorkspaceFile::TYPE_DELETED, tr("Deleted"), ":icons/icon-item-deleted" },
{ WorkspaceFile::TYPE_RENAMED, tr("Renamed"), ":icons/icon-item-renamed" },
{ WorkspaceFile::TYPE_MISSING, tr("Missing"), ":icons/icon-item-missing" },
{ WorkspaceFile::TYPE_CONFLICTED, tr("Conflicted"), ":icons/icon-item-conflicted" },
{ WorkspaceFile::TYPE_MERGED, tr("Merged"), ":icons/icon-item-edited" },
};
bool display_path = viewMode==VIEWMODE_LIST || selectedDirs.count() > 1;
@ -865,7 +866,7 @@ void MainWindow::updateFileView()
// Status Column
const QString *status_text = &status_unknown;
const char *status_icon_path= ":icons/icons/Button Blank Gray-01.png"; // Default icon
const char *status_icon_path= ":icons/icon-item-unknown"; // Default icon
for(size_t t=0; t<COUNTOF(stats); ++t)
{
@ -1048,7 +1049,6 @@ void MainWindow::updateSettings()
store->setValue("ViewUnchanged", ui->actionViewUnchanged->isChecked());
store->setValue("ViewIgnored", ui->actionViewIgnored->isChecked());
store->setValue("ViewAsList", ui->actionViewAsList->isChecked());
store->setValue("ViewStash", ui->actionViewStash->isChecked());
}
//------------------------------------------------------------------------------

19
ui/BrowserWidget.ui
View File

@ -14,7 +14,16 @@
<property name="spacing">
<number>0</number>
</property>
<property name="margin">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
@ -44,7 +53,7 @@
<action name="actionBrowserBack">
<property name="icon">
<iconset resource="../rsrc/resources.qrc">
<normaloff>:/icons/icons/Button Previous-01.png</normaloff>:/icons/icons/Button Previous-01.png</iconset>
<normaloff>:/icons/icon-action-previous</normaloff>:/icons/icon-action-previous</iconset>
</property>
<property name="text">
<string>Back</string>
@ -56,7 +65,7 @@
<action name="actionBrowserForward">
<property name="icon">
<iconset resource="../rsrc/resources.qrc">
<normaloff>:/icons/icons/Button Next-01.png</normaloff>:/icons/icons/Button Next-01.png</iconset>
<normaloff>:/icons/icon-action-next</normaloff>:/icons/icon-action-next</iconset>
</property>
<property name="text">
<string>Forward</string>
@ -68,7 +77,7 @@
<action name="actionBrowserRefresh">
<property name="icon">
<iconset resource="../rsrc/resources.qrc">
<normaloff>:/icons/icons/Button Refresh-01.png</normaloff>:/icons/icons/Button Refresh-01.png</iconset>
<normaloff>:/icons/icon-action-refresh</normaloff>:/icons/icon-action-refresh</iconset>
</property>
<property name="text">
<string>Refresh</string>
@ -80,7 +89,7 @@
<action name="actionBrowserStop">
<property name="icon">
<iconset resource="../rsrc/resources.qrc">
<normaloff>:/icons/icons/Button Close-01.png</normaloff>:/icons/icons/Button Close-01.png</iconset>
<normaloff>:/icons/icon-action-stop</normaloff>:/icons/icon-action-stop</iconset>
</property>
<property name="text">
<string>Stop</string>

85
ui/MainWindow.ui
View File

@ -18,7 +18,7 @@
</property>
<property name="windowIcon">
<iconset resource="../rsrc/resources.qrc">
<normaloff>:/icons/icons/Battery-01.png</normaloff>:/icons/icons/Battery-01.png</iconset>
<normaloff>:/icons/icon-application</normaloff>:/icons/icon-application</iconset>
</property>
<property name="unifiedTitleAndToolBarOnMac">
<bool>true</bool>
@ -318,7 +318,7 @@
<action name="actionRefresh">
<property name="icon">
<iconset resource="../rsrc/resources.qrc">
<normaloff>:/icons/icons/Button Refresh-01.png</normaloff>:/icons/icons/Button Refresh-01.png</iconset>
<normaloff>:/icons/icon-action-refresh</normaloff>:/icons/icon-action-refresh</iconset>
</property>
<property name="text">
<string>Refresh</string>
@ -336,7 +336,7 @@
<action name="actionCommit">
<property name="icon">
<iconset resource="../rsrc/resources.qrc">
<normaloff>:/icons/icons/Save-01.png</normaloff>:/icons/icons/Save-01.png</iconset>
<normaloff>:/icons/icon-action-commit</normaloff>:/icons/icon-action-commit</iconset>
</property>
<property name="text">
<string>Commit</string>
@ -354,7 +354,7 @@
<action name="actionDiff">
<property name="icon">
<iconset resource="../rsrc/resources.qrc">
<normaloff>:/icons/icons/Document Copy-01.png</normaloff>:/icons/icons/Document Copy-01.png</iconset>
<normaloff>:/icons/icon-item-diff</normaloff>:/icons/icon-item-diff</iconset>
</property>
<property name="text">
<string>Diff</string>
@ -372,7 +372,7 @@
<action name="actionAdd">
<property name="icon">
<iconset resource="../rsrc/resources.qrc">
<normaloff>:/icons/icons/File New-01.png</normaloff>:/icons/icons/File New-01.png</iconset>
<normaloff>:/icons/icon-item-add</normaloff>:/icons/icon-item-add</iconset>
</property>
<property name="text">
<string>Add</string>
@ -390,7 +390,7 @@
<action name="actionDelete">
<property name="icon">
<iconset resource="../rsrc/resources.qrc">
<normaloff>:/icons/icons/File Delete-01.png</normaloff>:/icons/icons/File Delete-01.png</iconset>
<normaloff>:/icons/icon-item-delete</normaloff>:/icons/icon-item-delete</iconset>
</property>
<property name="text">
<string>Delete</string>
@ -408,7 +408,7 @@
<action name="actionNewRepository">
<property name="icon">
<iconset resource="../rsrc/resources.qrc">
<normaloff>:/icons/icons/Document Blank-01.png</normaloff>:/icons/icons/Document Blank-01.png</iconset>
<normaloff>:/icons/icon-action-repo-new</normaloff>:/icons/icon-action-repo-new</iconset>
</property>
<property name="text">
<string>&amp;New...</string>
@ -426,7 +426,7 @@
<action name="actionOpenRepository">
<property name="icon">
<iconset resource="../rsrc/resources.qrc">
<normaloff>:/icons/icons/My Documents-01.png</normaloff>:/icons/icons/My Documents-01.png</iconset>
<normaloff>:/icons/icon-action-repo-open</normaloff>:/icons/icon-action-repo-open</iconset>
</property>
<property name="text">
<string>&amp;Open...</string>
@ -458,7 +458,7 @@
<action name="actionCloneRepository">
<property name="icon">
<iconset resource="../rsrc/resources.qrc">
<normaloff>:/icons/icons/My Websites-01.png</normaloff>:/icons/icons/My Websites-01.png</iconset>
<normaloff>:/icons/icon-action-repo-clone</normaloff>:/icons/icon-action-repo-clone</iconset>
</property>
<property name="text">
<string>C&amp;lone...</string>
@ -470,7 +470,7 @@
<action name="actionPush">
<property name="icon">
<iconset resource="../rsrc/resources.qrc">
<normaloff>:/icons/icons/Button Upload-01.png</normaloff>:/icons/icons/Button Upload-01.png</iconset>
<normaloff>:/icons/icon-action-push</normaloff>:/icons/icon-action-push</iconset>
</property>
<property name="text">
<string>Push</string>
@ -488,7 +488,7 @@
<action name="actionPull">
<property name="icon">
<iconset resource="../rsrc/resources.qrc">
<normaloff>:/icons/icons/Button Download-01.png</normaloff>:/icons/icons/Button Download-01.png</iconset>
<normaloff>:/icons/icon-action-pull</normaloff>:/icons/icon-action-pull</iconset>
</property>
<property name="text">
<string>Pull</string>
@ -506,7 +506,7 @@
<action name="actionRename">
<property name="icon">
<iconset resource="../rsrc/resources.qrc">
<normaloff>:/icons/icons/File Open-01.png</normaloff>:/icons/icons/File Open-01.png</iconset>
<normaloff>:/icons/icon-item-rename</normaloff>:/icons/icon-item-rename</iconset>
</property>
<property name="text">
<string>Rename</string>
@ -524,7 +524,7 @@
<action name="actionQuit">
<property name="icon">
<iconset resource="../rsrc/resources.qrc">
<normaloff>:/icons/icons/Button Turn Off-01.png</normaloff>:/icons/icons/Button Turn Off-01.png</iconset>
<normaloff>:/icons/icon-action-quit</normaloff>:/icons/icon-action-quit</iconset>
</property>
<property name="text">
<string>&amp;Quit</string>
@ -545,7 +545,7 @@
<action name="actionHistory">
<property name="icon">
<iconset resource="../rsrc/resources.qrc">
<normaloff>:/icons/icons/File History-01.png</normaloff>:/icons/icons/File History-01.png</iconset>
<normaloff>:/icons/icon-item-history</normaloff>:/icons/icon-item-history</iconset>
</property>
<property name="text">
<string>History</string>
@ -566,7 +566,7 @@
</property>
<property name="icon">
<iconset resource="../rsrc/resources.qrc">
<normaloff>:/icons/icons/Network MAC-01.png</normaloff>:/icons/icons/Network MAC-01.png</iconset>
<normaloff>:/icons/icon-webview</normaloff>:/icons/icon-webview</iconset>
</property>
<property name="text">
<string>Fossil UI</string>
@ -581,7 +581,7 @@
<action name="actionRevert">
<property name="icon">
<iconset resource="../rsrc/resources.qrc">
<normaloff>:/icons/icons/Document-Revert-icon.png</normaloff>:/icons/icons/Document-Revert-icon.png</iconset>
<normaloff>:/icons/icon-item-revert</normaloff>:/icons/icon-item-revert</iconset>
</property>
<property name="text">
<string>Revert</string>
@ -596,7 +596,7 @@
<action name="actionClearLog">
<property name="icon">
<iconset resource="../rsrc/resources.qrc">
<normaloff>:/icons/icons/Text Edit.png</normaloff>:/icons/icons/Text Edit.png</iconset>
<normaloff>:/icons/icon-clear-log</normaloff>:/icons/icon-clear-log</iconset>
</property>
<property name="text">
<string>Clear Log</string>
@ -611,7 +611,7 @@
<action name="actionTimeline">
<property name="icon">
<iconset resource="../rsrc/resources.qrc">
<normaloff>:/icons/icons/Clock-01.png</normaloff>:/icons/icons/Clock-01.png</iconset>
<normaloff>:/icons/icon-action-timeline</normaloff>:/icons/icon-action-timeline</iconset>
</property>
<property name="text">
<string>Timeline</string>
@ -626,7 +626,7 @@
<action name="actionOpenFile">
<property name="icon">
<iconset resource="../rsrc/resources.qrc">
<normaloff>:/icons/icons/Document-01.png</normaloff>:/icons/icons/Document-01.png</iconset>
<normaloff>:/icons/icon-item-file</normaloff>:/icons/icon-item-file</iconset>
</property>
<property name="text">
<string>Open File</string>
@ -644,7 +644,7 @@
<action name="actionOpenContaining">
<property name="icon">
<iconset resource="../rsrc/resources.qrc">
<normaloff>:/icons/icons/Folder-01.png</normaloff>:/icons/icons/Folder-01.png</iconset>
<normaloff>:/icons/icon-item-folder</normaloff>:/icons/icon-item-folder</iconset>
</property>
<property name="text">
<string>Open Containing</string>
@ -662,7 +662,7 @@
<action name="actionUndo">
<property name="icon">
<iconset resource="../rsrc/resources.qrc">
<normaloff>:/icons/icons/Button Reload-01.png</normaloff>:/icons/icons/Button Reload-01.png</iconset>
<normaloff>:/icons/icon-action-undo</normaloff>:/icons/icon-action-undo</iconset>
</property>
<property name="text">
<string>Undo</string>
@ -680,7 +680,7 @@
<action name="actionAbout">
<property name="icon">
<iconset resource="../rsrc/resources.qrc">
<normaloff>:/icons/icons/Battery-01.png</normaloff>:/icons/icons/Battery-01.png</iconset>
<normaloff>:/icons/icon-application</normaloff>:/icons/icon-application</iconset>
</property>
<property name="text">
<string>&amp;About...</string>
@ -695,7 +695,7 @@
<action name="actionUpdate">
<property name="icon">
<iconset resource="../rsrc/resources.qrc">
<normaloff>:/icons/icons/Button Play-01.png</normaloff>:/icons/icons/Button Play-01.png</iconset>
<normaloff>:/icons/icon-action-update</normaloff>:/icons/icon-action-update</iconset>
</property>
<property name="text">
<string>Update</string>
@ -713,7 +713,7 @@
<action name="actionSettings">
<property name="icon">
<iconset resource="../rsrc/resources.qrc">
<normaloff>:/icons/icons/Gear-01.png</normaloff>:/icons/icons/Gear-01.png</iconset>
<normaloff>:/icons/icon-action-settings</normaloff>:/icons/icon-action-settings</iconset>
</property>
<property name="text">
<string>&amp;Preferences...</string>
@ -801,7 +801,7 @@
<action name="actionOpenFolder">
<property name="icon">
<iconset resource="../rsrc/resources.qrc">
<normaloff>:/icons/icons/Folder-01.png</normaloff>:/icons/icons/Folder-01.png</iconset>
<normaloff>:/icons/icon-item-folder</normaloff>:/icons/icon-item-folder</iconset>
</property>
<property name="text">
<string>Open Folder</string>
@ -816,7 +816,7 @@
<action name="actionRenameFolder">
<property name="icon">
<iconset resource="../rsrc/resources.qrc">
<normaloff>:/icons/icons/Folder Open-01.png</normaloff>:/icons/icons/Folder Open-01.png</iconset>
<normaloff>:/icons/icon-action-folder-rename</normaloff>:/icons/icon-action-folder-rename</iconset>
</property>
<property name="text">
<string>Rename Folder</string>
@ -831,7 +831,7 @@
<action name="actionNewStash">
<property name="icon">
<iconset resource="../rsrc/resources.qrc">
<normaloff>:/icons/icons/Folder Add-01.png</normaloff>:/icons/icons/Folder Add-01.png</iconset>
<normaloff>:/icons/icon-action-stash-new</normaloff>:/icons/icon-action-stash-new</iconset>
</property>
<property name="text">
<string>Stash changes</string>
@ -843,7 +843,7 @@
<action name="actionApplyStash">
<property name="icon">
<iconset resource="../rsrc/resources.qrc">
<normaloff>:/icons/icons/Folder Open-01.png</normaloff>:/icons/icons/Folder Open-01.png</iconset>
<normaloff>:/icons/icon-action-stash-apply</normaloff>:/icons/icon-action-stash-apply</iconset>
</property>
<property name="text">
<string>Apply Stash</string>
@ -855,27 +855,10 @@
<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 Stashed Changes</string>
</property>
<property name="toolTip">
<string>View Stashed Changes</string>
</property>
<property name="statusTip">
<string>Show the list of stashed changes</string>
</property>
</action>
<action name="actionDeleteStash">
<property name="icon">
<iconset resource="../rsrc/resources.qrc">
<normaloff>:/icons/icons/Folder Delete-01.png</normaloff>:/icons/icons/Folder Delete-01.png</iconset>
<normaloff>:/icons/icon-action-stash-delete</normaloff>:/icons/icon-action-stash-delete</iconset>
</property>
<property name="text">
<string>Delete Stash</string>
@ -884,7 +867,7 @@
<action name="actionDiffStash">
<property name="icon">
<iconset resource="../rsrc/resources.qrc">
<normaloff>:/icons/icons/Folder Explorer-01.png</normaloff>:/icons/icons/Folder Explorer-01.png</iconset>
<normaloff>:/icons/icon-action-stash-diff</normaloff>:/icons/icon-action-stash-diff</iconset>
</property>
<property name="text">
<string>Diff Stash</string>
@ -893,7 +876,7 @@
<action name="actionNewTag">
<property name="icon">
<iconset resource="../rsrc/resources.qrc">
<normaloff>:/icons/icons/Highlighter Yellow-01.png</normaloff>:/icons/icons/Highlighter Yellow-01.png</iconset>
<normaloff>:/icons/icon-action-tag-new</normaloff>:/icons/icon-action-tag-new</iconset>
</property>
<property name="text">
<string>New Tag</string>
@ -905,7 +888,7 @@
<action name="actionDeleteTag">
<property name="icon">
<iconset resource="../rsrc/resources.qrc">
<normaloff>:/icons/icons/Button Close-01.png</normaloff>:/icons/icons/Button Close-01.png</iconset>
<normaloff>:/icons/icon-action-tag-delete</normaloff>:/icons/icon-action-tag-delete</iconset>
</property>
<property name="text">
<string>Delete Tag</string>
@ -917,7 +900,7 @@
<action name="actionNewBranch">
<property name="icon">
<iconset resource="../rsrc/resources.qrc">
<normaloff>:/icons/icons/Document Organization Chart-01.png</normaloff>:/icons/icons/Document Organization Chart-01.png</iconset>
<normaloff>:/icons/icon-item-branch</normaloff>:/icons/icon-item-branch</iconset>
</property>
<property name="text">
<string>New Branch</string>
@ -929,7 +912,7 @@
<action name="actionMergeBranch">
<property name="icon">
<iconset resource="../rsrc/resources.qrc">
<normaloff>:/icons/icons/Document Flow Chart-01.png</normaloff>:/icons/icons/Document Flow Chart-01.png</iconset>
<normaloff>:/icons/icon-action-merge</normaloff>:/icons/icon-action-merge</iconset>
</property>
<property name="text">
<string>Merge Branch</string>

12
ui/SettingsDialog.ui
View File

@ -16,6 +16,10 @@
<property name="windowTitle">
<string>Settings</string>
</property>
<property name="windowIcon">
<iconset resource="../rsrc/resources.qrc">
<normaloff>:/icons/icon-application</normaloff>:/icons/icon-application</iconset>
</property>
<property name="modal">
<bool>true</bool>
</property>
@ -26,10 +30,6 @@
<number>0</number>
</property>
<widget class="QWidget" name="tabApp">
<attribute name="icon">
<iconset resource="../rsrc/resources.qrc">
<normaloff>:/icons/icons/Battery-01.png</normaloff>:/icons/icons/Battery-01.png</iconset>
</attribute>
<attribute name="title">
<string>Application</string>
</attribute>
@ -304,10 +304,6 @@
</layout>
</widget>
<widget class="QWidget" name="tabRepo">
<attribute name="icon">
<iconset resource="../rsrc/resources.qrc">
<normaloff>:/icons/icons/Book-01.png</normaloff>:/icons/icons/Book-01.png</iconset>
</attribute>
<attribute name="title">
<string>Repository</string>
</attribute>