diff --git a/manifest b/manifest index a585f40..f23c18c 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Display\sa\ssystem\sicon\sfor\sa\scustom\sactions\nRefactored\sIcon\scache\nRefactored\scustom\scommand\sspawning\n -D 2015-07-11T12:12:17.094 +C Renamed\sgetInternal*Icon\sto\sgetCached*Icon\n +D 2015-07-11T12:17:46.873 F .travis.yml 77966888a81c4ceee1fcc79bce842c9667ad8a35 F debian/changelog eb4304dfcb6bb66850ec740838090eb50ce1249b F debian/compat b6abd567fa79cbe0196d093a067271361dc6ca8b @@ -224,8 +224,8 @@ F src/FslSettingsDialog.cpp 2531d3709f0eab66651671e3edead2ca720d07d5 F src/FslSettingsDialog.h dfe2a61884a55a74cbb9206b6f6b482b979725e7 F src/LoggedProcess.cpp 2a1e5c94bc1e57c8984563e66c210e43a14dc60c F src/LoggedProcess.h 85df7c635c807a5a0e8c4763f17a0752aaff7261 -F src/MainWindow.cpp 6261d26a6220f04bff642d1a0f522d2dd29c4baf -F src/MainWindow.h 87dbc88db94f1cd8914641527fa09bee76e865b5 +F src/MainWindow.cpp 5b9aaf13c863814de6bfd76200808d2a9be0cae7 +F src/MainWindow.h 7bbf19b176b9b17d9e9502eb23027a78b3e3580f F src/RemoteDialog.cpp 8540cc5e2e41c4127ed8a028d84691604fa6ecac F src/RemoteDialog.h 5e0438c2bd7c79b1bb44bfbd58c2181b544a9e5d F src/RevisionDialog.cpp e58c4f8a704f00addebb15d521b76620fdafda79 @@ -252,7 +252,7 @@ F ui/MainWindow.ui 10181826a25056ed5aba2b23a7d110159be7c043 F ui/RemoteDialog.ui 95a4750d972ed8c49bb10b95db91ff16cfe2dd0b F ui/RevisionDialog.ui 27c3b98c665fec014a50cbf3352c0627f75e68cd F ui/SettingsDialog.ui 47b9a31e28ad523f14a1c4cd361270b6babbdf7d -P cca2042b901945b1079faedaa7339578f6192a3f -R f3b000d69b50c8a107ec105ff2cabbca +P 2dabf7d89cfa79d1ce278c7b083761be5f54a691 +R 1d29730ba350aed8b0bb0e7477d90a0d U kostas -Z c422a488a81d98221d9e129ef1baf4fc +Z b1b509e0940c157cd4bc7cc1c1ac2ae6 diff --git a/manifest.uuid b/manifest.uuid index 18223a6..3191d12 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -2dabf7d89cfa79d1ce278c7b083761be5f54a691 \ No newline at end of file +874b5aa93906b7576998002fce08046d12b65d22 \ No newline at end of file diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp index 791154d..5d44ba0 100644 --- a/src/MainWindow.cpp +++ b/src/MainWindow.cpp @@ -814,7 +814,7 @@ void MainWindow::updateWorkspaceView() // Clear content except headers getWorkspace().getTreeModel().removeRows(0, getWorkspace().getTreeModel().rowCount()); - QStandardItem *workspace = new QStandardItem(getInternalIcon(":icons/icon-item-folder"), tr("Files") ); + QStandardItem *workspace = new QStandardItem(getCachedIcon(":icons/icon-item-folder"), tr("Files") ); workspace->setData(WorkspaceItem(WorkspaceItem::TYPE_WORKSPACE, ""), ROLE_WORKSPACE_ITEM); workspace->setEditable(false); @@ -831,10 +831,10 @@ void MainWindow::updateWorkspaceView() continue; addPathToTree(*workspace, dir, - getInternalIcon(":icons/icon-item-folder"), - getInternalIcon(":icons/icon-item-folder-unchanged"), - getInternalIcon(":icons/icon-item-folder-modified"), - getInternalIcon(":icons/icon-item-folder-unknown"), + getCachedIcon(":icons/icon-item-folder"), + getCachedIcon(":icons/icon-item-folder-unchanged"), + getCachedIcon(":icons/icon-item-folder-modified"), + getCachedIcon(":icons/icon-item-folder-unknown"), getWorkspace().getPathState()); } @@ -843,13 +843,13 @@ void MainWindow::updateWorkspaceView() } // Branches - QStandardItem *branches = new QStandardItem(getInternalIcon(":icons/icon-item-branch"), tr("Branches")); + QStandardItem *branches = new QStandardItem(getCachedIcon(":icons/icon-item-branch"), tr("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/icon-item-branch"), branch_name); + QStandardItem *branch = new QStandardItem(getCachedIcon(":icons/icon-item-branch"), branch_name); branch->setData(WorkspaceItem(WorkspaceItem::TYPE_BRANCH, branch_name), ROLE_WORKSPACE_ITEM); bool active = fossil().getCurrentTags().contains(branch_name); @@ -863,7 +863,7 @@ void MainWindow::updateWorkspaceView() } // Tags - QStandardItem *tags = new QStandardItem(getInternalIcon(":icons/icon-item-tag"), tr("Tags")); + QStandardItem *tags = new QStandardItem(getCachedIcon(":icons/icon-item-tag"), tr("Tags")); tags->setData(WorkspaceItem(WorkspaceItem::TYPE_TAGS, ""), ROLE_WORKSPACE_ITEM); tags->setEditable(false); getWorkspace().getTreeModel().appendRow(tags); @@ -871,7 +871,7 @@ void MainWindow::updateWorkspaceView() { const QString &tag_name = it.key(); - QStandardItem *tag = new QStandardItem(getInternalIcon(":icons/icon-item-tag"), tag_name); + QStandardItem *tag = new QStandardItem(getCachedIcon(":icons/icon-item-tag"), tag_name); tag->setData(WorkspaceItem(WorkspaceItem::TYPE_TAG, tag_name), ROLE_WORKSPACE_ITEM); bool active = fossil().getCurrentTags().contains(tag_name); @@ -885,25 +885,25 @@ void MainWindow::updateWorkspaceView() } // Stashes - QStandardItem *stashes = new QStandardItem(getInternalIcon(":icons/icon-action-repo-open"), tr("Stashes")); + QStandardItem *stashes = new QStandardItem(getCachedIcon(":icons/icon-action-repo-open"), tr("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/icon-action-repo-open"), it.key()); + QStandardItem *stash = new QStandardItem(getCachedIcon(":icons/icon-action-repo-open"), it.key()); stash->setData(WorkspaceItem(WorkspaceItem::TYPE_STASH, it.value()), ROLE_WORKSPACE_ITEM); stashes->appendRow(stash); } // Remotes - QStandardItem *remotes = new QStandardItem(getInternalIcon(":icons/icon-item-remote"), tr("Remotes")); + QStandardItem *remotes = new QStandardItem(getCachedIcon(":icons/icon-item-remote"), tr("Remotes")); remotes->setData(WorkspaceItem(WorkspaceItem::TYPE_REMOTES, ""), ROLE_WORKSPACE_ITEM); remotes->setEditable(false); getWorkspace().getTreeModel().appendRow(remotes); for(remote_map_t::const_iterator it=getWorkspace().getRemotes().begin(); it!=getWorkspace().getRemotes().end(); ++it) { - QStandardItem *remote_item = new QStandardItem(getInternalIcon(":icons/icon-item-remote"), it->name); + QStandardItem *remote_item = new QStandardItem(getCachedIcon(":icons/icon-item-remote"), it->name); remote_item->setData(WorkspaceItem(WorkspaceItem::TYPE_REMOTE, it->url.toString()), ROLE_WORKSPACE_ITEM); remote_item->setToolTip(UrlToStringDisplay(it->url)); @@ -995,13 +995,13 @@ void MainWindow::updateFileView() } } - QStandardItem *status = new QStandardItem(getInternalIcon(status_icon_path), *status_text); + QStandardItem *status = new QStandardItem(getCachedIcon(status_icon_path), *status_text); status->setToolTip(*status_text); getWorkspace().getFileModel().setItem(item_id, COLUMN_STATUS, status); QFileInfo finfo = e.getFileInfo(); - const QIcon *icon = &getInternalFileIcon(finfo); + const QIcon *icon = &getCachedFileIcon(finfo); QStandardItem *filename_item = 0; getWorkspace().getFileModel().setItem(item_id, COLUMN_PATH, new QStandardItem(path)); @@ -2108,7 +2108,7 @@ QMenu * MainWindow::createPopupMenu() } //------------------------------------------------------------------------------ -const QIcon &MainWindow::getInternalIcon(const char* name) +const QIcon &MainWindow::getCachedIcon(const char* name) { if(!iconCache.contains(name)) iconCache.insert(name, QIcon(name)); @@ -2117,7 +2117,7 @@ const QIcon &MainWindow::getInternalIcon(const char* name) } //------------------------------------------------------------------------------ -const QIcon &MainWindow::getInternalFileIcon(const QFileInfo &finfo) +const QIcon &MainWindow::getCachedFileIcon(const QFileInfo &finfo) { QString icon_type = iconProvider.type(finfo); @@ -2837,7 +2837,7 @@ void MainWindow::updateCustomActions() SplitCommandLine(cust_act.Command, cmd, extra_params); QFileInfo fi(cmd); if(fi.isFile()) - action->setIcon(getInternalFileIcon(fi)); + action->setIcon(getCachedFileIcon(fi)); if(cust_act.IsActive(ACTION_CONTEXT_FILES)) { diff --git a/src/MainWindow.h b/src/MainWindow.h index 0a8bf21..b65bc10 100644 --- a/src/MainWindow.h +++ b/src/MainWindow.h @@ -61,8 +61,8 @@ private: void dropEvent(class QDropEvent *event); void setBusy(bool busy); virtual QMenu *createPopupMenu(); - const QIcon& getInternalIcon(const char *name); - const QIcon& getInternalFileIcon(const QFileInfo &finfo); + const QIcon& getCachedIcon(const char *name); + const QIcon& getCachedFileIcon(const QFileInfo &finfo); enum ViewMode {