diff --git a/manifest b/manifest
index 604f63e..699eec1 100644
--- a/manifest
+++ b/manifest
@@ -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
diff --git a/manifest.uuid b/manifest.uuid
index f57960f..62f8a5d 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0eef20c8eb990a24b214a25b630b2786fee010d7
\ No newline at end of file
+999f57bd1e05e99c67a921c09f782da170ae827c
\ No newline at end of file
diff --git a/rsrc/resources.qrc b/rsrc/resources.qrc
index 8c17330..b0ea5fe 100644
--- a/rsrc/resources.qrc
+++ b/rsrc/resources.qrc
@@ -1,163 +1,166 @@
-
- icons/Address Book-01.png
- icons/Adobe Illustrator CS3 Document-01.png
- icons/Adobe PDF Document-01.png
- icons/Adobe Photoshop CS3 Document-01.png
- icons/Battery-01.png
- icons/Binoculars-01.png
- icons/Book-01.png
- icons/Briefcase-01.png
- icons/Button Add-01.png
- icons/Button Blank Blue-01.png
- icons/Button Blank Gray-01.png
- icons/Button Blank Green-01.png
- icons/Button Blank Red-01.png
- icons/Button Blank Yellow-01.png
- icons/Button Cancel-01.png
- icons/Button Close-01.png
- icons/Button Delete-01.png
- icons/Button Download-01.png
- icons/Button Favorite-01.png
- icons/Button Forward-01.png
- icons/Button Help-01.png
- icons/Button Info-01.png
- icons/Button Log Off-01.png
- icons/Button Next-01.png
- icons/Button Pause-01.png
- icons/Button Play-01.png
- icons/Button Previous-01.png
- icons/Button Refresh-01.png
- icons/Button Reload-01.png
- icons/Button Reminder-01.png
- icons/Button Rewind-01.png
- icons/Button Talk Balloon-01.png
- icons/Button Turn Off-01.png
- icons/Button Turn On-01.png
- icons/Button Upload-01.png
- icons/Button Warning-01.png
- icons/Calculator-01.png
- icons/Calendar Blue-01.png
- icons/Calendar Green-01.png
- icons/Calendar Red-01.png
- icons/Clipboard-01.png
- icons/Clipboard Paste-01.png
- icons/Clock-01.png
- icons/Coin-01.png
- icons/Compressed File RAR-01.png
- icons/Compressed File SIT-01.png
- icons/Compressed File Zip-01.png
- icons/Computer Monitor-01.png
- icons/Computer Network-01.png
- icons/Document-01.png
- icons/Document Attach-01.png
- icons/Document Blank-01.png
- icons/Document Chart-01.png
- icons/Document Copy-01.png
- icons/Document Flow Chart-01.png
- icons/Document Gant Chart-01.png
- icons/Document Help-01.png
- icons/Document Line Chart-01.png
- icons/Document Microsoft Excel-01.png
- icons/Document Microsoft PowerPoint-01.png
- icons/Document Microsoft Word-01.png
- icons/Document Organization Chart-01.png
- icons/Document Preview-01.png
- icons/Document-Revert-icon.png
- icons/Document Text-01.png
- icons/Edit Document-01.png
- icons/Email-01.png
- icons/Email Attachment-01.png
- icons/Email Delete-01.png
- icons/Email Download-01.png
- icons/Email Forward-01.png
- icons/Email Inbox-01.png
- icons/Email Reply-01.png
- icons/File Audio-01.png
- icons/File Audio AIFF-01.png
- icons/File Audio MP3-01.png
- icons/File Audio WAV-01.png
- icons/File Audio WMA-01.png
- icons/File Delete-01.png
- icons/File History-01.png
- icons/File New-01.png
- icons/File Open-01.png
- icons/File Video 3GP-01.png
- icons/File Video-01.png
- icons/File Video AVI-01.png
- icons/File Video MOV-01.png
- icons/File Video MPEG-01.png
- icons/File Video WMV-01.png
- icons/Folder-01.png
- icons/Folder Add-01.png
- icons/Folder Compressed-01.png
- icons/Folder Delete-01.png
- icons/Folder Explorer-01.png
- icons/Folder Generic Blue-01.png
- icons/Folder Generic Green-01.png
- icons/Folder Generic Red-01.png
- icons/Folder Generic Silver-01.png
- icons/Folder Open-01.png
- icons/Folder RAR-01.png
- icons/Games-01.png
- icons/Gear-01.png
- icons/Highlighter Blue-01.png
- icons/Highlighter Green-01.png
- icons/Highlighter Yellow-01.png
- icons/Image BMP-01.png
- icons/Image GIF-01.png
- icons/Image JPEG-01.png
- icons/Image PNG-01.png
- icons/Image TIFF-01.png
- icons/Lock Lock-01.png
- icons/Lock Unlock-01.png
- icons/My Documents-01.png
- icons/My Ebooks-01.png
- icons/My Music-01.png
- icons/My Pictures.png
- icons/My Videos-01.png
- icons/My Websites-01.png
- icons/Network Firewall-01.png
- icons/Network MAC-01.png
- icons/Network PC-01.png
- icons/Network Refresh-01.png
- icons/Pen Blue-01.png
- icons/Pen Green-01.png
- icons/Pen Red-01.png
- icons/Save-01.png
- icons/Text Edit.png
- icons/USB-01.png
- icons/User Administrator Blue-01.png
- icons/User Administrator Green-01.png
- icons/User Administrator Red-01.png
- icons/User Chat-01.png
- icons/User Clients-01.png
- icons/User Coat Blue-01.png
- icons/User Coat Green-01.png
- icons/User Coat Red-01.png
- icons/User Executive Blue-01.png
- icons/User Executive Green-01.png
- icons/User Executive Red-01.png
- icons/User Group-01.png
- icons/User Preppy Blue-01.png
- icons/User Preppy Green-01.png
- icons/User Preppy Red-01.png
- icons/Web HTML-01.png
- icons/Web XML-01.png
- icons/Window-01.png
- icons/Window Refresh-01.png
- icons/Windows-01.png
- icons/Windows Cascade-01.png
- icons/Zoom-01.png
- icons/Zoom In-01.png
- icons/Zoom Out-01.png
-
-
- intl/el_GR.qm
- intl/de_DE.qm
- intl/es_ES.qm
- intl/fr_FR.qm
- intl/ru_RU.qm
- intl/pt_PT.qm
-
+
+ icons/Address Book-01.png
+ icons/Adobe Illustrator CS3 Document-01.png
+ icons/Adobe PDF Document-01.png
+ icons/Adobe Photoshop CS3 Document-01.png
+ icons/Battery-01.png
+ icons/Binoculars-01.png
+ icons/Book-01.png
+ icons/Briefcase-01.png
+ icons/Button Add-01.png
+ icons/Button Blank Blue-01.png
+ icons/Button Blank Gray-01.png
+ icons/Button Blank Green-01.png
+ icons/Button Blank Red-01.png
+ icons/Button Blank Yellow-01.png
+ icons/Button Cancel-01.png
+ icons/Button Close-01.png
+ icons/Button Close-01.png
+ icons/Button Close-01.png
+ icons/Button Delete-01.png
+ icons/Button Download-01.png
+ icons/Button Favorite-01.png
+ icons/Button Forward-01.png
+ icons/Button Help-01.png
+ icons/Button Info-01.png
+ icons/Button Log Off-01.png
+ icons/Button Next-01.png
+ icons/Button Pause-01.png
+ icons/Button Play-01.png
+ icons/Button Previous-01.png
+ icons/Button Refresh-01.png
+ icons/Button Reload-01.png
+ icons/Button Reload-01.png
+ icons/Button Reminder-01.png
+ icons/Button Rewind-01.png
+ icons/Button Talk Balloon-01.png
+ icons/Button Turn Off-01.png
+ icons/Button Turn On-01.png
+ icons/Button Upload-01.png
+ icons/Button Warning-01.png
+ icons/Calculator-01.png
+ icons/Calendar Blue-01.png
+ icons/Calendar Green-01.png
+ icons/Calendar Red-01.png
+ icons/Clipboard-01.png
+ icons/Clipboard Paste-01.png
+ icons/Clock-01.png
+ icons/Coin-01.png
+ icons/Compressed File RAR-01.png
+ icons/Compressed File SIT-01.png
+ icons/Compressed File Zip-01.png
+ icons/Computer Monitor-01.png
+ icons/Computer Network-01.png
+ icons/Document-01.png
+ icons/Document Attach-01.png
+ icons/Document Blank-01.png
+ icons/Document Chart-01.png
+ icons/Document Copy-01.png
+ icons/Document Flow Chart-01.png
+ icons/Document Gant Chart-01.png
+ icons/Document Help-01.png
+ icons/Document Line Chart-01.png
+ icons/Document Microsoft Excel-01.png
+ icons/Document Microsoft PowerPoint-01.png
+ icons/Document Microsoft Word-01.png
+ icons/Document Organization Chart-01.png
+ icons/Document Preview-01.png
+ icons/Document-Revert-icon.png
+ icons/Document Text-01.png
+ icons/Edit Document-01.png
+ icons/Email-01.png
+ icons/Email Attachment-01.png
+ icons/Email Delete-01.png
+ icons/Email Download-01.png
+ icons/Email Forward-01.png
+ icons/Email Inbox-01.png
+ icons/Email Reply-01.png
+ icons/File Audio-01.png
+ icons/File Audio AIFF-01.png
+ icons/File Audio MP3-01.png
+ icons/File Audio WAV-01.png
+ icons/File Audio WMA-01.png
+ icons/File Delete-01.png
+ icons/File History-01.png
+ icons/File New-01.png
+ icons/File Open-01.png
+ icons/File Video 3GP-01.png
+ icons/File Video-01.png
+ icons/File Video AVI-01.png
+ icons/File Video MOV-01.png
+ icons/File Video MPEG-01.png
+ icons/File Video WMV-01.png
+ icons/Folder-01.png
+ icons/Folder Add-01.png
+ icons/Folder Compressed-01.png
+ icons/Folder Delete-01.png
+ icons/Folder Explorer-01.png
+ icons/Folder Generic Blue-01.png
+ icons/Folder Generic Green-01.png
+ icons/Folder Generic Red-01.png
+ icons/Folder Generic Silver-01.png
+ icons/Folder Open-01.png
+ icons/Folder RAR-01.png
+ icons/Games-01.png
+ icons/Gear-01.png
+ icons/Highlighter Blue-01.png
+ icons/Highlighter Green-01.png
+ icons/Highlighter Yellow-01.png
+ icons/Image BMP-01.png
+ icons/Image GIF-01.png
+ icons/Image JPEG-01.png
+ icons/Image PNG-01.png
+ icons/Image TIFF-01.png
+ icons/Lock Lock-01.png
+ icons/Lock Unlock-01.png
+ icons/My Documents-01.png
+ icons/My Ebooks-01.png
+ icons/My Music-01.png
+ icons/My Pictures.png
+ icons/My Videos-01.png
+ icons/My Websites-01.png
+ icons/Network Firewall-01.png
+ icons/Network MAC-01.png
+ icons/Network PC-01.png
+ icons/Network Refresh-01.png
+ icons/Pen Blue-01.png
+ icons/Pen Green-01.png
+ icons/Pen Red-01.png
+ icons/Save-01.png
+ icons/Text Edit.png
+ icons/USB-01.png
+ icons/User Administrator Blue-01.png
+ icons/User Administrator Green-01.png
+ icons/User Administrator Red-01.png
+ icons/User Chat-01.png
+ icons/User Clients-01.png
+ icons/User Coat Blue-01.png
+ icons/User Coat Green-01.png
+ icons/User Coat Red-01.png
+ icons/User Executive Blue-01.png
+ icons/User Executive Green-01.png
+ icons/User Executive Red-01.png
+ icons/User Group-01.png
+ icons/User Preppy Blue-01.png
+ icons/User Preppy Green-01.png
+ icons/User Preppy Red-01.png
+ icons/Web HTML-01.png
+ icons/Web XML-01.png
+ icons/Window-01.png
+ icons/Window Refresh-01.png
+ icons/Windows-01.png
+ icons/Windows Cascade-01.png
+ icons/Zoom-01.png
+ icons/Zoom In-01.png
+ icons/Zoom Out-01.png
+
+
+ intl/el_GR.qm
+ intl/de_DE.qm
+ intl/es_ES.qm
+ intl/fr_FR.qm
+ intl/ru_RU.qm
+ intl/pt_PT.qm
+
diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index 52f50dd..3607ae8 100644
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -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; tsetValue("ViewUnchanged", ui->actionViewUnchanged->isChecked());
store->setValue("ViewIgnored", ui->actionViewIgnored->isChecked());
store->setValue("ViewAsList", ui->actionViewAsList->isChecked());
- store->setValue("ViewStash", ui->actionViewStash->isChecked());
}
//------------------------------------------------------------------------------
diff --git a/ui/BrowserWidget.ui b/ui/BrowserWidget.ui
index c651f9f..6ef556c 100644
--- a/ui/BrowserWidget.ui
+++ b/ui/BrowserWidget.ui
@@ -14,7 +14,16 @@
0
-
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
0
-
@@ -44,7 +53,7 @@
- :/icons/icons/Button Previous-01.png:/icons/icons/Button Previous-01.png
+ :/icons/icon-action-previous:/icons/icon-action-previous
Back
@@ -56,7 +65,7 @@
- :/icons/icons/Button Next-01.png:/icons/icons/Button Next-01.png
+ :/icons/icon-action-next:/icons/icon-action-next
Forward
@@ -68,7 +77,7 @@
- :/icons/icons/Button Refresh-01.png:/icons/icons/Button Refresh-01.png
+ :/icons/icon-action-refresh:/icons/icon-action-refresh
Refresh
@@ -80,7 +89,7 @@
- :/icons/icons/Button Close-01.png:/icons/icons/Button Close-01.png
+ :/icons/icon-action-stop:/icons/icon-action-stop
Stop
diff --git a/ui/MainWindow.ui b/ui/MainWindow.ui
index 61f80f5..14f6590 100644
--- a/ui/MainWindow.ui
+++ b/ui/MainWindow.ui
@@ -18,7 +18,7 @@
- :/icons/icons/Battery-01.png:/icons/icons/Battery-01.png
+ :/icons/icon-application:/icons/icon-application
true
@@ -318,7 +318,7 @@
- :/icons/icons/Button Refresh-01.png:/icons/icons/Button Refresh-01.png
+ :/icons/icon-action-refresh:/icons/icon-action-refresh
Refresh
@@ -336,7 +336,7 @@
- :/icons/icons/Save-01.png:/icons/icons/Save-01.png
+ :/icons/icon-action-commit:/icons/icon-action-commit
Commit
@@ -354,7 +354,7 @@
- :/icons/icons/Document Copy-01.png:/icons/icons/Document Copy-01.png
+ :/icons/icon-item-diff:/icons/icon-item-diff
Diff
@@ -372,7 +372,7 @@
- :/icons/icons/File New-01.png:/icons/icons/File New-01.png
+ :/icons/icon-item-add:/icons/icon-item-add
Add
@@ -390,7 +390,7 @@
- :/icons/icons/File Delete-01.png:/icons/icons/File Delete-01.png
+ :/icons/icon-item-delete:/icons/icon-item-delete
Delete
@@ -408,7 +408,7 @@
- :/icons/icons/Document Blank-01.png:/icons/icons/Document Blank-01.png
+ :/icons/icon-action-repo-new:/icons/icon-action-repo-new
&New...
@@ -426,7 +426,7 @@
- :/icons/icons/My Documents-01.png:/icons/icons/My Documents-01.png
+ :/icons/icon-action-repo-open:/icons/icon-action-repo-open
&Open...
@@ -458,7 +458,7 @@
- :/icons/icons/My Websites-01.png:/icons/icons/My Websites-01.png
+ :/icons/icon-action-repo-clone:/icons/icon-action-repo-clone
C&lone...
@@ -470,7 +470,7 @@
- :/icons/icons/Button Upload-01.png:/icons/icons/Button Upload-01.png
+ :/icons/icon-action-push:/icons/icon-action-push
Push
@@ -488,7 +488,7 @@
- :/icons/icons/Button Download-01.png:/icons/icons/Button Download-01.png
+ :/icons/icon-action-pull:/icons/icon-action-pull
Pull
@@ -506,7 +506,7 @@
- :/icons/icons/File Open-01.png:/icons/icons/File Open-01.png
+ :/icons/icon-item-rename:/icons/icon-item-rename
Rename
@@ -524,7 +524,7 @@
- :/icons/icons/Button Turn Off-01.png:/icons/icons/Button Turn Off-01.png
+ :/icons/icon-action-quit:/icons/icon-action-quit
&Quit
@@ -545,7 +545,7 @@
- :/icons/icons/File History-01.png:/icons/icons/File History-01.png
+ :/icons/icon-item-history:/icons/icon-item-history
History
@@ -566,7 +566,7 @@
- :/icons/icons/Network MAC-01.png:/icons/icons/Network MAC-01.png
+ :/icons/icon-webview:/icons/icon-webview
Fossil UI
@@ -581,7 +581,7 @@
- :/icons/icons/Document-Revert-icon.png:/icons/icons/Document-Revert-icon.png
+ :/icons/icon-item-revert:/icons/icon-item-revert
Revert
@@ -596,7 +596,7 @@
- :/icons/icons/Text Edit.png:/icons/icons/Text Edit.png
+ :/icons/icon-clear-log:/icons/icon-clear-log
Clear Log
@@ -611,7 +611,7 @@
- :/icons/icons/Clock-01.png:/icons/icons/Clock-01.png
+ :/icons/icon-action-timeline:/icons/icon-action-timeline
Timeline
@@ -626,7 +626,7 @@
- :/icons/icons/Document-01.png:/icons/icons/Document-01.png
+ :/icons/icon-item-file:/icons/icon-item-file
Open File
@@ -644,7 +644,7 @@
- :/icons/icons/Folder-01.png:/icons/icons/Folder-01.png
+ :/icons/icon-item-folder:/icons/icon-item-folder
Open Containing
@@ -662,7 +662,7 @@
- :/icons/icons/Button Reload-01.png:/icons/icons/Button Reload-01.png
+ :/icons/icon-action-undo:/icons/icon-action-undo
Undo
@@ -680,7 +680,7 @@
- :/icons/icons/Battery-01.png:/icons/icons/Battery-01.png
+ :/icons/icon-application:/icons/icon-application
&About...
@@ -695,7 +695,7 @@
- :/icons/icons/Button Play-01.png:/icons/icons/Button Play-01.png
+ :/icons/icon-action-update:/icons/icon-action-update
Update
@@ -713,7 +713,7 @@
- :/icons/icons/Gear-01.png:/icons/icons/Gear-01.png
+ :/icons/icon-action-settings:/icons/icon-action-settings
&Preferences...
@@ -801,7 +801,7 @@
- :/icons/icons/Folder-01.png:/icons/icons/Folder-01.png
+ :/icons/icon-item-folder:/icons/icon-item-folder
Open Folder
@@ -816,7 +816,7 @@
- :/icons/icons/Folder Open-01.png:/icons/icons/Folder Open-01.png
+ :/icons/icon-action-folder-rename:/icons/icon-action-folder-rename
Rename Folder
@@ -831,7 +831,7 @@
- :/icons/icons/Folder Add-01.png:/icons/icons/Folder Add-01.png
+ :/icons/icon-action-stash-new:/icons/icon-action-stash-new
Stash changes
@@ -843,7 +843,7 @@
- :/icons/icons/Folder Open-01.png:/icons/icons/Folder Open-01.png
+ :/icons/icon-action-stash-apply:/icons/icon-action-stash-apply
Apply Stash
@@ -855,27 +855,10 @@
Apply stashed changes
-
-
- true
-
-
- &Stashed Changes
-
-
- View Stashed Changes
-
-
- View Stashed Changes
-
-
- Show the list of stashed changes
-
-
- :/icons/icons/Folder Delete-01.png:/icons/icons/Folder Delete-01.png
+ :/icons/icon-action-stash-delete:/icons/icon-action-stash-delete
Delete Stash
@@ -884,7 +867,7 @@
- :/icons/icons/Folder Explorer-01.png:/icons/icons/Folder Explorer-01.png
+ :/icons/icon-action-stash-diff:/icons/icon-action-stash-diff
Diff Stash
@@ -893,7 +876,7 @@
- :/icons/icons/Highlighter Yellow-01.png:/icons/icons/Highlighter Yellow-01.png
+ :/icons/icon-action-tag-new:/icons/icon-action-tag-new
New Tag
@@ -905,7 +888,7 @@
- :/icons/icons/Button Close-01.png:/icons/icons/Button Close-01.png
+ :/icons/icon-action-tag-delete:/icons/icon-action-tag-delete
Delete Tag
@@ -917,7 +900,7 @@
- :/icons/icons/Document Organization Chart-01.png:/icons/icons/Document Organization Chart-01.png
+ :/icons/icon-item-branch:/icons/icon-item-branch
New Branch
@@ -929,7 +912,7 @@
- :/icons/icons/Document Flow Chart-01.png:/icons/icons/Document Flow Chart-01.png
+ :/icons/icon-action-merge:/icons/icon-action-merge
Merge Branch
diff --git a/ui/SettingsDialog.ui b/ui/SettingsDialog.ui
index 0117ecc..1696517 100644
--- a/ui/SettingsDialog.ui
+++ b/ui/SettingsDialog.ui
@@ -16,6 +16,10 @@
Settings
+
+
+ :/icons/icon-application:/icons/icon-application
+
true
@@ -26,10 +30,6 @@
0
-
-
- :/icons/icons/Battery-01.png:/icons/icons/Battery-01.png
-
Application
@@ -304,10 +304,6 @@
-
-
- :/icons/icons/Book-01.png:/icons/icons/Book-01.png
-
Repository