diff --git a/manifest b/manifest index 48c0646..7ad4468 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Cleanups -D 2015-05-03T14:52:59.139 +C Renamed\sREPODIRMODEL_ROLE_PATH\sto\s\nRenamed\sTreeViewItem\sto\sWorkspaceItem\n +D 2015-05-03T15:27:24.382 F .travis.yml 77966888a81c4ceee1fcc79bce842c9667ad8a35 F debian/changelog eb4304dfcb6bb66850ec740838090eb50ce1249b F debian/compat b6abd567fa79cbe0196d093a067271361dc6ca8b @@ -200,7 +200,7 @@ F src/Fossil.cpp f27b97eaf068275a0e8558dd2b739f9c7b61774a F src/Fossil.h f9b49ed930af2159f97a86ce0f6da821a0b0819e F src/LoggedProcess.cpp 2a1e5c94bc1e57c8984563e66c210e43a14dc60c F src/LoggedProcess.h 85df7c635c807a5a0e8c4763f17a0752aaff7261 -F src/MainWindow.cpp bf2fb9a33bd5e3b3018d6eebcce0dcdd6817f38e +F src/MainWindow.cpp 0ac9252f14037dc8eb0533c51eec6d81b87c2705 F src/MainWindow.h e6797adc543fd07a117a4eacc202fb166ec6665a F src/RevisionDialog.cpp 51065c65a07c118dd1a7363da4a55a135d1c6c9c F src/RevisionDialog.h b718c3009342eaabad39c8a11a253a4e4fef7a73 @@ -220,7 +220,7 @@ F ui/FileActionDialog.ui 89bb4dc2d0b8adcd41adcb11ec65f2028a09a12d F ui/MainWindow.ui d4fc7971a0717677adb1be0bb88502dfcb92f5c4 F ui/RevisionDialog.ui 27c3b98c665fec014a50cbf3352c0627f75e68cd F ui/SettingsDialog.ui 2b7c2870e0054b0f4106f495d85d02c0b814df8b -P 9704609d5e9ccbadfce2ed96e74893f97e453e0f -R 504f4c50865a254bc523ba40c7e39978 +P c179d505cea29fe7e6b9c1b149bbd46eb6a0b009 +R f645ada195980983be970129e402fce2 U kostas -Z 5d7c10b74310a360858f5d60d0e3715c +Z af9364389f462e204ab5f0db7259e8f2 diff --git a/manifest.uuid b/manifest.uuid index 0964e5b..4174e03 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -c179d505cea29fe7e6b9c1b149bbd46eb6a0b009 \ No newline at end of file +07f3a4f2e0f2a67172434d4336bec1dea1fc5856 \ No newline at end of file diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp index 706368e..0463717 100644 --- a/src/MainWindow.cpp +++ b/src/MainWindow.cpp @@ -39,10 +39,10 @@ enum enum { - REPODIRMODEL_ROLE_PATH = Qt::UserRole+1 + ROLE_WORKSPACE_ITEM = Qt::UserRole+1 }; -struct TreeViewItem +struct WorkspaceItem { enum { @@ -59,17 +59,17 @@ struct TreeViewItem TYPE_SETTINGS }; - TreeViewItem() + WorkspaceItem() : Type(TYPE_UNKNOWN) { } - TreeViewItem(int type, const QString &value) + WorkspaceItem(int type, const QString &value) : Type(type), Value(value) { } - TreeViewItem(const TreeViewItem &other) + WorkspaceItem(const WorkspaceItem &other) { Type = other.Type; Value = other.Value; @@ -83,7 +83,7 @@ struct TreeViewItem return QVariant::fromValue(*this); } }; -Q_DECLARE_METATYPE(TreeViewItem) +Q_DECLARE_METATYPE(WorkspaceItem) /////////////////////////////////////////////////////////////////////////////// @@ -650,7 +650,7 @@ static void addPathToTree(QStandardItem &root, const QString &path) if(!found) // Generate it { QStandardItem *child = new QStandardItem(QIcon(":icons/icons/Folder-01.png"), dir); - child->setData(TreeViewItem(TreeViewItem::TYPE_FOLDER, fullpath), REPODIRMODEL_ROLE_PATH); + child->setData(WorkspaceItem(WorkspaceItem::TYPE_FOLDER, fullpath), ROLE_WORKSPACE_ITEM); parent->appendRow(child); parent = child; } @@ -669,7 +669,7 @@ void MainWindow::updateWorkspaceView() getWorkspace().getDirModel().setHorizontalHeaderLabels(header); QStandardItem *workspace = new QStandardItem(QIcon(":icons/icons/Folder-01.png"), tr("Files") ); - workspace->setData(TreeViewItem(TreeViewItem::TYPE_WORKSPACE, ""), REPODIRMODEL_ROLE_PATH); + workspace->setData(WorkspaceItem(WorkspaceItem::TYPE_WORKSPACE, ""), ROLE_WORKSPACE_ITEM); workspace->setEditable(false); getWorkspace().getDirModel().appendRow(workspace); @@ -687,50 +687,50 @@ void MainWindow::updateWorkspaceView() // Branches QStandardItem *branches = new QStandardItem(QIcon(":icons/icons/Document Organization Chart-01.png"), "Branches"); - branches->setData(TreeViewItem(TreeViewItem::TYPE_BRANCHES, ""), REPODIRMODEL_ROLE_PATH); + branches->setData(WorkspaceItem(WorkspaceItem::TYPE_BRANCHES, ""), ROLE_WORKSPACE_ITEM); branches->setEditable(false); getWorkspace().getDirModel().appendRow(branches); foreach(const QString &branch_name, getWorkspace().getBranches()) { QStandardItem *branch = new QStandardItem(QIcon(":icons/icons/Document Organization Chart-01.png"), branch_name); - branch->setData(TreeViewItem(TreeViewItem::TYPE_BRANCH, branch_name), REPODIRMODEL_ROLE_PATH); + branch->setData(WorkspaceItem(WorkspaceItem::TYPE_BRANCH, branch_name), ROLE_WORKSPACE_ITEM); branches->appendRow(branch); } // Tags QStandardItem *tags = new QStandardItem(QIcon(":icons/icons/Book-01.png"), "Tags"); - tags->setData(TreeViewItem(TreeViewItem::TYPE_TAGS, ""), REPODIRMODEL_ROLE_PATH); + tags->setData(WorkspaceItem(WorkspaceItem::TYPE_TAGS, ""), ROLE_WORKSPACE_ITEM); tags->setEditable(false); getWorkspace().getDirModel().appendRow(tags); for(QStringMap::const_iterator it=getWorkspace().getTags().begin(); it!=getWorkspace().getTags().end(); ++it) { const QString &tag_name = it.key(); QStandardItem *tag = new QStandardItem(QIcon(":icons/icons/Book-01.png"), tag_name); - tag->setData(TreeViewItem(TreeViewItem::TYPE_TAG, tag_name), REPODIRMODEL_ROLE_PATH); + tag->setData(WorkspaceItem(WorkspaceItem::TYPE_TAG, tag_name), ROLE_WORKSPACE_ITEM); tags->appendRow(tag); } // Stashes QStandardItem *stashes = new QStandardItem(QIcon(":icons/icons/My Documents-01.png"), "Stashes"); - stashes->setData(TreeViewItem(TreeViewItem::TYPE_STASHES, ""), REPODIRMODEL_ROLE_PATH); + stashes->setData(WorkspaceItem(WorkspaceItem::TYPE_STASHES, ""), ROLE_WORKSPACE_ITEM); stashes->setEditable(false); getWorkspace().getDirModel().appendRow(stashes); for(stashmap_t::const_iterator it= getWorkspace().getStashes().begin(); it!=getWorkspace().getStashes().end(); ++it) { QStandardItem *stash = new QStandardItem(QIcon(":icons/icons/My Documents-01.png"), it.key()); - stash->setData(TreeViewItem(TreeViewItem::TYPE_STASH, it.value()), REPODIRMODEL_ROLE_PATH); + stash->setData(WorkspaceItem(WorkspaceItem::TYPE_STASH, it.value()), ROLE_WORKSPACE_ITEM); stashes->appendRow(stash); } // Remotes QStandardItem *remotes = new QStandardItem(QIcon(":icons/icons/Network PC-01.png"), "Remotes"); - remotes->setData(TreeViewItem(TreeViewItem::TYPE_REMOTES, ""), REPODIRMODEL_ROLE_PATH); + remotes->setData(WorkspaceItem(WorkspaceItem::TYPE_REMOTES, ""), ROLE_WORKSPACE_ITEM); remotes->setEditable(false); getWorkspace().getDirModel().appendRow(remotes); // Settings QStandardItem *settings = new QStandardItem(QIcon(":icons/icons/Gear-01.png"), "Settings"); - settings->setData(TreeViewItem(TreeViewItem::TYPE_SETTINGS, ""), REPODIRMODEL_ROLE_PATH); + settings->setData(WorkspaceItem(WorkspaceItem::TYPE_SETTINGS, ""), ROLE_WORKSPACE_ITEM); settings->setEditable(false); getWorkspace().getDirModel().appendRow(settings); @@ -999,11 +999,11 @@ void MainWindow::getSelectionPaths(stringset_t &paths) QModelIndexList selection = ui->workspaceTreeView->selectionModel()->selectedIndexes(); foreach(const QModelIndex &mi, selection) { - QVariant data = mi.model()->data(mi, REPODIRMODEL_ROLE_PATH); + QVariant data = mi.model()->data(mi, ROLE_WORKSPACE_ITEM); Q_ASSERT(data.isValid()); - TreeViewItem tv = data.value(); - if(tv.Type != TreeViewItem::TYPE_FOLDER) + WorkspaceItem tv = data.value(); + if(tv.Type != WorkspaceItem::TYPE_FOLDER) continue; paths.insert(tv.Value); @@ -1111,11 +1111,11 @@ void MainWindow::getSelectionStashes(QStringList &stashNames) foreach(const QModelIndex &mi, selection) { - QVariant data = mi.model()->data(mi, REPODIRMODEL_ROLE_PATH); + QVariant data = mi.model()->data(mi, ROLE_WORKSPACE_ITEM); Q_ASSERT(data.isValid()); - TreeViewItem tv = data.value(); + WorkspaceItem tv = data.value(); - if(tv.Type != TreeViewItem::TYPE_STASH) + if(tv.Type != WorkspaceItem::TYPE_STASH) continue; QString name = mi.model()->data(mi, Qt::DisplayRole).toString(); @@ -1643,15 +1643,15 @@ void MainWindow::onWorkspaceTreeViewSelectionChanged(const QItemSelection &/*sel foreach(const QModelIndex &id, indices) { - QVariant data = id.model()->data(id, REPODIRMODEL_ROLE_PATH); + QVariant data = id.model()->data(id, ROLE_WORKSPACE_ITEM); Q_ASSERT(data.isValid()); - TreeViewItem tv = data.value(); + WorkspaceItem tv = data.value(); - if(tv.Type == TreeViewItem::TYPE_FOLDER || tv.Type == TreeViewItem::TYPE_WORKSPACE) + if(tv.Type == WorkspaceItem::TYPE_FOLDER || tv.Type == WorkspaceItem::TYPE_WORKSPACE) new_dirs.insert(tv.Value); - else if(tv.Type == TreeViewItem::TYPE_TAG) + else if(tv.Type == WorkspaceItem::TYPE_TAG) selectedTags.append(tv.Value); - else if(tv.Type == TreeViewItem::TYPE_BRANCH) + else if(tv.Type == WorkspaceItem::TYPE_BRANCH) selectedBranches.append(tv.Value); } @@ -1678,11 +1678,11 @@ void MainWindow::on_actionOpenFolder_triggered() //------------------------------------------------------------------------------ void MainWindow::on_workspaceTreeView_doubleClicked(const QModelIndex &index) { - QVariant data = index.model()->data(index, REPODIRMODEL_ROLE_PATH); + QVariant data = index.model()->data(index, ROLE_WORKSPACE_ITEM); Q_ASSERT(data.isValid()); - TreeViewItem tv = data.value(); + WorkspaceItem tv = data.value(); - if(tv.Type!=TreeViewItem::TYPE_FOLDER && tv.Type!=TreeViewItem::TYPE_WORKSPACE) + if(tv.Type!=WorkspaceItem::TYPE_FOLDER && tv.Type!=WorkspaceItem::TYPE_WORKSPACE) return; QString target = getCurrentWorkspace() + PATH_SEPARATOR + tv.Value; @@ -2059,17 +2059,17 @@ void MainWindow::on_workspaceTreeView_customContextMenuRequested(const QPoint &) // Get first selected item const QModelIndex &mi = indices.first(); - QVariant data = getWorkspace().getDirModel().data(mi, REPODIRMODEL_ROLE_PATH); + QVariant data = getWorkspace().getDirModel().data(mi, ROLE_WORKSPACE_ITEM); Q_ASSERT(data.isValid()); - TreeViewItem tv = data.value(); + WorkspaceItem tv = data.value(); - if(tv.Type == TreeViewItem::TYPE_FOLDER || tv.Type == TreeViewItem::TYPE_WORKSPACE) + if(tv.Type == WorkspaceItem::TYPE_FOLDER || tv.Type == WorkspaceItem::TYPE_WORKSPACE) menu = menuWorkspace; - else if (tv.Type == TreeViewItem::TYPE_STASH || tv.Type == TreeViewItem::TYPE_STASHES) + else if (tv.Type == WorkspaceItem::TYPE_STASH || tv.Type == WorkspaceItem::TYPE_STASHES) menu = menuStashes; - else if (tv.Type == TreeViewItem::TYPE_TAG || tv.Type == TreeViewItem::TYPE_TAGS) + else if (tv.Type == WorkspaceItem::TYPE_TAG || tv.Type == WorkspaceItem::TYPE_TAGS) menu = menuTags; - else if (tv.Type == TreeViewItem::TYPE_BRANCH || tv.Type == TreeViewItem::TYPE_BRANCHES) + else if (tv.Type == WorkspaceItem::TYPE_BRANCH || tv.Type == WorkspaceItem::TYPE_BRANCHES) menu = menuBranches; if(menu)