Renamed tableView to fileTableView

Renamed treeView to workspaceTreeView
Renamed tableViewStash to stashTableView

FossilOrigin-Name: 54059126aee6bb232373c1f134cc07ea0a6f4cca

manifest

@@ -1,5 +1,5 @@
-C Renamed\sBridge\sto\sFossil
+C Renamed\stableView\sto\sfileTableView\nRenamed\streeView\sto\sworkspaceTreeView\nRenamed\stableViewStash\sto\sstashTableView
-D 2015-04-30T12:15:14.026
+D 2015-04-30T16:23:15.640
 F .travis.yml 77966888a81c4ceee1fcc79bce842c9667ad8a35
 F debian/changelog eb4304dfcb6bb66850ec740838090eb50ce1249b
 F debian/compat b6abd567fa79cbe0196d093a067271361dc6ca8b
@@ -196,12 +196,12 @@ F src/FileActionDialog.cpp fcaebf9986f789b3440d5390b3458ad5f86fe0c8
 F src/FileActionDialog.h 15db1650b3a13d70bc338371e4c033c66e3b79ce
 F src/FileTableView.cpp 5ddf8c391c9a3ac449ec61fb1db837b577afeec2
 F src/FileTableView.h 03e56d87c2d46411b9762b87f4d301619aaf18df
-F src/Fossil.cpp b54d136f05764535636da04bcc5f60b2eb97e5b6 w src/Bridge.cpp
+F src/Fossil.cpp b54d136f05764535636da04bcc5f60b2eb97e5b6
-F src/Fossil.h e46ec6cdb5c23a34176050fbd90e561ac87c07f9 w src/Bridge.h
+F src/Fossil.h e46ec6cdb5c23a34176050fbd90e561ac87c07f9
 F src/LoggedProcess.cpp 2a1e5c94bc1e57c8984563e66c210e43a14dc60c
 F src/LoggedProcess.h 85df7c635c807a5a0e8c4763f17a0752aaff7261
-F src/MainWindow.cpp f6ffb8c6d1283a812084094426d51a5ea601fa35
+F src/MainWindow.cpp cbd80ad8b9bf4c090a913181e4725646677c9c0c
-F src/MainWindow.h 970c7e42d07499a86b1f6cc5cbe3921e1fc1f9e3
+F src/MainWindow.h d8d376f2efbf47c7a0241bb574994dbcf92300fb
 F src/SettingsDialog.cpp a46cff5e5dd425e3dbdd15632abfd5829f5562b4
 F src/SettingsDialog.h 4e2790f581e991c744ae9f86580f1972b8c7ff43
 F src/Utils.cpp f78728e0817b1db23007ba0d2c5c26980ee7ebca
@@ -215,9 +215,9 @@ F ui/BrowserWidget.ui 5ad98b13773afadb20a1a2c22148aaebe5dbd95d
 F ui/CloneDialog.ui 4886e7d4f258ea8b852b5eefc860396e35145712
 F ui/CommitDialog.ui 6200f6cabdcf40a20812e811be28e0793f82516f
 F ui/FileActionDialog.ui 89bb4dc2d0b8adcd41adcb11ec65f2028a09a12d
-F ui/MainWindow.ui 8677f5c8bca5bf7561d5f64bfdd0cef5157c6ac7
+F ui/MainWindow.ui c02f609b7f3a33c9be5f420591466ae5e398a988
 F ui/SettingsDialog.ui 2b7c2870e0054b0f4106f495d85d02c0b814df8b
-P c7b15ab434e33f5b73833256e97e2fabed8f1451
+P 77abfe4126ef0adf7d0c70df7a2aac918bcc4128
-R ea2eae273fa42edf7d181d3dcc962763
+R ed2ea66d15f08ec954000571498b8a1b
 U kostas
-Z 9d3003eee2f50a485b1e0f3f2f9bf646
+Z 56e75383c99242a3ba759cdca74a3ed4

manifest.uuid

@@ -1 +1 @@
-77abfe4126ef0adf7d0c70df7a2aac918bcc4128
+54059126aee6bb232373c1f134cc07ea0a6f4cca

src/MainWindow.cpp

@@ -76,19 +76,19 @@ MainWindow::MainWindow(Settings &_settings, QWidget *parent, QString *workspaceP
 	QAction *separator = new QAction(this);
 	separator->setSeparator(true);
 
-	// TableView
+	// fileTableView
-	ui->tableView->setModel(&getWorkspace().getFileModel());
+	ui->fileTableView->setModel(&getWorkspace().getFileModel());
 
-	ui->tableView->addAction(ui->actionDiff);
+	ui->fileTableView->addAction(ui->actionDiff);
-	ui->tableView->addAction(ui->actionHistory);
+	ui->fileTableView->addAction(ui->actionHistory);
-	ui->tableView->addAction(ui->actionOpenFile);
+	ui->fileTableView->addAction(ui->actionOpenFile);
-	ui->tableView->addAction(ui->actionOpenContaining);
+	ui->fileTableView->addAction(ui->actionOpenContaining);
-	ui->tableView->addAction(separator);
+	ui->fileTableView->addAction(separator);
-	ui->tableView->addAction(ui->actionAdd);
+	ui->fileTableView->addAction(ui->actionAdd);
-	ui->tableView->addAction(ui->actionRevert);
+	ui->fileTableView->addAction(ui->actionRevert);
-	ui->tableView->addAction(ui->actionRename);
+	ui->fileTableView->addAction(ui->actionRename);
-	ui->tableView->addAction(ui->actionDelete);
+	ui->fileTableView->addAction(ui->actionDelete);
-	connect( ui->tableView,
+	connect( ui->fileTableView,
 		SIGNAL( dragOutEvent() ),
 		SLOT( onFileViewDragOut() ),
 		Qt::DirectConnection );
@@ -99,36 +99,36 @@ MainWindow::MainWindow(Settings &_settings, QWidget *parent, QString *workspaceP
 	getWorkspace().getFileModel().horizontalHeaderItem(COLUMN_STATUS)->setTextAlignment(Qt::AlignCenter);
 
 	// Needed on OSX as the preset value from the GUI editor is not always reflected
-	ui->tableView->horizontalHeader()->setDefaultAlignment(Qt::AlignLeft);
+	ui->fileTableView->horizontalHeader()->setDefaultAlignment(Qt::AlignLeft);
 #if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
-	ui->tableView->horizontalHeader()->setMovable(true);
+	ui->fileTableView->horizontalHeader()->setMovable(true);
 #else
-	ui->tableView->horizontalHeader()->setSectionsMovable(true);
+	ui->fileTableView->horizontalHeader()->setSectionsMovable(true);
 #endif
-	ui->tableView->horizontalHeader()->setStretchLastSection(true);
+	ui->fileTableView->horizontalHeader()->setStretchLastSection(true);
 
-	// TreeView
+	// workspaceTreeView
-	ui->treeView->setModel(&getWorkspace().getDirModel());
+	ui->workspaceTreeView->setModel(&getWorkspace().getDirModel());
-	connect( ui->treeView->selectionModel(),
+	connect( ui->workspaceTreeView->selectionModel(),
 		SIGNAL( selectionChanged(const QItemSelection &, const QItemSelection &) ),
-		SLOT( onTreeViewSelectionChanged(const QItemSelection &, const QItemSelection &) ),
+		SLOT( onWorkspaceTreeViewSelectionChanged(const QItemSelection &, const QItemSelection &) ),
 		Qt::DirectConnection );
 
-	ui->treeView->addAction(ui->actionCommit);
+	ui->workspaceTreeView->addAction(ui->actionCommit);
-	ui->treeView->addAction(ui->actionOpenFolder);
+	ui->workspaceTreeView->addAction(ui->actionOpenFolder);
-	ui->treeView->addAction(ui->actionAdd);
+	ui->workspaceTreeView->addAction(ui->actionAdd);
-	ui->treeView->addAction(ui->actionRevert);
+	ui->workspaceTreeView->addAction(ui->actionRevert);
-	ui->treeView->addAction(ui->actionDelete);
+	ui->workspaceTreeView->addAction(ui->actionDelete);
-	ui->treeView->addAction(separator);
+	ui->workspaceTreeView->addAction(separator);
-	ui->treeView->addAction(ui->actionRenameFolder);
+	ui->workspaceTreeView->addAction(ui->actionRenameFolder);
-	ui->treeView->addAction(ui->actionOpenFolder);
+	ui->workspaceTreeView->addAction(ui->actionOpenFolder);
 
 	// StashView
-	ui->tableViewStash->setModel(&getWorkspace().getStashModel());
+	ui->stashTableView->setModel(&getWorkspace().getStashModel());
-	ui->tableViewStash->addAction(ui->actionApplyStash);
+	ui->stashTableView->addAction(ui->actionApplyStash);
-	ui->tableViewStash->addAction(ui->actionDiffStash);
+	ui->stashTableView->addAction(ui->actionDiffStash);
-	ui->tableViewStash->addAction(ui->actionDeleteStash);
+	ui->stashTableView->addAction(ui->actionDeleteStash);
-	ui->tableViewStash->horizontalHeader()->setSortIndicatorShown(false);
+	ui->stashTableView->horizontalHeader()->setSortIndicatorShown(false);
 
 	// Recent Workspaces
 	// Locate a sequence of two separator actions in file menu
@@ -621,8 +621,8 @@ void MainWindow::updateDirView()
 
 		addPathToTree(*root, dir);
 	}
-	ui->treeView->expandToDepth(0);
+	ui->workspaceTreeView->expandToDepth(0);
-	ui->treeView->sortByColumn(0, Qt::AscendingOrder);
+	ui->workspaceTreeView->sortByColumn(0, Qt::AscendingOrder);
 }
 
 //------------------------------------------------------------------------------
@@ -697,7 +697,7 @@ void MainWindow::updateFileView()
 		++item_id;
 	}
 
-	ui->tableView->resizeRowsToContents();
+	ui->fileTableView->resizeRowsToContents();
 }
 
 //------------------------------------------------------------------------------
@@ -715,8 +715,8 @@ void MainWindow::updateStashView()
 		item->setToolTip(it.key());
 		getWorkspace().getStashModel().appendRow(item);
 	}
-	ui->tableViewStash->resizeColumnsToContents();
+	ui->stashTableView->resizeColumnsToContents();
-	ui->tableViewStash->resizeRowsToContents();
+	ui->stashTableView->resizeRowsToContents();
 }
 
 //------------------------------------------------------------------------------
@@ -773,14 +773,14 @@ void MainWindow::applySettings()
 		if(store->contains("Width"))
 		{
 			int width = store->value("Width").toInt();
-			ui->tableView->setColumnWidth(i, width);
+			ui->fileTableView->setColumnWidth(i, width);
 		}
 
 		if(store->contains("Index"))
 		{
 			int index = store->value("Index").toInt();
-			int cur_index = ui->tableView->horizontalHeader()->visualIndex(i);
+			int cur_index = ui->fileTableView->horizontalHeader()->visualIndex(i);
-			ui->tableView->horizontalHeader()->moveSection(cur_index, index);
+			ui->fileTableView->horizontalHeader()->moveSection(cur_index, index);
 		}
 
 	}
@@ -816,11 +816,11 @@ void MainWindow::applySettings()
 		ui->actionViewAsList->setChecked(store->value("ViewAsList").toBool());
 		viewMode = store->value("ViewAsList").toBool()? VIEWMODE_LIST : VIEWMODE_TREE;
 	}
-	ui->treeView->setVisible(viewMode == VIEWMODE_TREE);
+	ui->workspaceTreeView->setVisible(viewMode == VIEWMODE_TREE);
 
 	if(store->contains("ViewStash"))
 		ui->actionViewStash->setChecked(store->value("ViewStash").toBool());
-	ui->tableViewStash->setVisible(ui->actionViewStash->isChecked());
+	ui->stashTableView->setVisible(ui->actionViewStash->isChecked());
 
 }
 
@@ -845,8 +845,8 @@ void MainWindow::updateSettings()
 	for(int i=0; i<getWorkspace().getFileModel().columnCount(); ++i)
 	{
 		store->setArrayIndex(i);
-		store->setValue("Width", ui->tableView->columnWidth(i));
+		store->setValue("Width", ui->fileTableView->columnWidth(i));
-		int index = ui->tableView->horizontalHeader()->visualIndex(i);
+		int index = ui->fileTableView->horizontalHeader()->visualIndex(i);
 		store->setValue("Index", index);
 	}
 	store->endArray();
@@ -868,8 +868,8 @@ void MainWindow::selectRootDir()
 {
 	if(viewMode==VIEWMODE_TREE)
 	{
-		QModelIndex root_index = ui->treeView->model()->index(0, 0);
+		QModelIndex root_index = ui->workspaceTreeView->model()->index(0, 0);
-		ui->treeView->selectionModel()->select(root_index, QItemSelectionModel::Select);
+		ui->workspaceTreeView->selectionModel()->select(root_index, QItemSelectionModel::Select);
 	}
 }
 
@@ -894,7 +894,7 @@ void MainWindow::fossilBrowse(const QString &fossilUrl)
 //------------------------------------------------------------------------------
 void MainWindow::getSelectionFilenames(QStringList &filenames, int includeMask, bool allIfEmpty)
 {
-	if(QApplication::focusWidget() == ui->treeView)
+	if(QApplication::focusWidget() == ui->workspaceTreeView)
 		getDirViewSelection(filenames, includeMask, allIfEmpty);
 	else
 		getFileViewSelection(filenames, includeMask, allIfEmpty);
@@ -904,7 +904,7 @@ void MainWindow::getSelectionFilenames(QStringList &filenames, int includeMask,
 void MainWindow::getSelectionPaths(stringset_t &paths)
 {
 	// Determine the directories selected
-	QModelIndexList selection = ui->treeView->selectionModel()->selectedIndexes();
+	QModelIndexList selection = ui->workspaceTreeView->selectionModel()->selectedIndexes();
 	for(QModelIndexList::iterator mi_it = selection.begin(); mi_it!=selection.end(); ++mi_it)
 	{
 		const QModelIndex &mi = *mi_it;
@@ -933,7 +933,7 @@ void MainWindow::getDirViewSelection(QStringList &filenames, int includeMask, bo
 	// Determine the directories selected
 	stringset_t paths;
 
-	QModelIndexList selection = ui->treeView->selectionModel()->selectedIndexes();
+	QModelIndexList selection = ui->workspaceTreeView->selectionModel()->selectedIndexes();
 	if(!(selection.empty() && allIfEmpty))
 	{
 		getSelectionPaths(paths);
@@ -977,12 +977,12 @@ void MainWindow::getDirViewSelection(QStringList &filenames, int includeMask, bo
 //------------------------------------------------------------------------------
 void MainWindow::getFileViewSelection(QStringList &filenames, int includeMask, bool allIfEmpty)
 {
-	QModelIndexList selection = ui->tableView->selectionModel()->selectedIndexes();
+	QModelIndexList selection = ui->fileTableView->selectionModel()->selectedIndexes();
 	if(selection.empty() && allIfEmpty)
 	{
-		ui->tableView->selectAll();
+		ui->fileTableView->selectAll();
-		selection = ui->tableView->selectionModel()->selectedIndexes();
+		selection = ui->fileTableView->selectionModel()->selectedIndexes();
-		ui->tableView->clearSelection();
+		ui->fileTableView->clearSelection();
 	}
 
 	for(QModelIndexList::iterator mi_it = selection.begin(); mi_it!=selection.end(); ++mi_it)
@@ -1010,12 +1010,12 @@ void MainWindow::getFileViewSelection(QStringList &filenames, int includeMask, b
 //------------------------------------------------------------------------------
 void MainWindow::getStashViewSelection(QStringList &stashNames, bool allIfEmpty)
 {
-	QModelIndexList selection = ui->tableViewStash->selectionModel()->selectedIndexes();
+	QModelIndexList selection = ui->stashTableView->selectionModel()->selectedIndexes();
 	if(selection.empty() && allIfEmpty)
 	{
-		ui->tableViewStash->selectAll();
+		ui->stashTableView->selectAll();
-		selection = ui->tableViewStash->selectionModel()->selectedIndexes();
+		selection = ui->stashTableView->selectionModel()->selectedIndexes();
-		ui->tableViewStash->clearSelection();
+		ui->stashTableView->clearSelection();
 	}
 
 	for(QModelIndexList::iterator mi_it = selection.begin(); mi_it!=selection.end(); ++mi_it)
@@ -1103,7 +1103,7 @@ void MainWindow::on_actionHistory_triggered()
 }
 
 //------------------------------------------------------------------------------
-void MainWindow::on_tableView_doubleClicked(const QModelIndex &/*index*/)
+void MainWindow::on_fileTableView_doubleClicked(const QModelIndex &/*index*/)
 {
 	int action = settings.GetValue(FUEL_SETTING_FILE_DBLCLICK).toInt();
 	if(action==FILE_DLBCLICK_ACTION_DIFF)
@@ -1502,7 +1502,7 @@ void MainWindow::on_actionViewIgnored_triggered()
 void MainWindow::on_actionViewAsList_triggered()
 {
 	viewMode =  ui->actionViewAsList->isChecked() ? VIEWMODE_LIST : VIEWMODE_TREE;
-	ui->treeView->setVisible(viewMode == VIEWMODE_TREE);
+	ui->workspaceTreeView->setVisible(viewMode == VIEWMODE_TREE);
 	updateFileView();
 }
 
@@ -1514,9 +1514,9 @@ QString MainWindow::getFossilHttpAddress()
 }
 
 //------------------------------------------------------------------------------
-void MainWindow::onTreeViewSelectionChanged(const QItemSelection &/*selected*/, const QItemSelection &/*deselected*/)
+void MainWindow::onWorkspaceTreeViewSelectionChanged(const QItemSelection &/*selected*/, const QItemSelection &/*deselected*/)
 {
-	QModelIndexList selection = ui->treeView->selectionModel()->selectedIndexes();
+	QModelIndexList selection = ui->workspaceTreeView->selectionModel()->selectedIndexes();
 	int num_selected = selection.count();
 
 	// Do not modify the selection if nothing is selected
@@ -1538,17 +1538,17 @@ void MainWindow::onTreeViewSelectionChanged(const QItemSelection &/*selected*/,
 //------------------------------------------------------------------------------
 void MainWindow::on_actionOpenFolder_triggered()
 {
-	const QItemSelection &selection =  ui->treeView->selectionModel()->selection();
+	const QItemSelection &selection =  ui->workspaceTreeView->selectionModel()->selection();
 
 	if(selection.indexes().count()!=1)
 		return;
 
 	QModelIndex index = selection.indexes().at(0);
-	on_treeView_doubleClicked(index);
+	on_workspaceTreeView_doubleClicked(index);
 }
 
 //------------------------------------------------------------------------------
-void MainWindow::on_treeView_doubleClicked(const QModelIndex &index)
+void MainWindow::on_workspaceTreeView_doubleClicked(const QModelIndex &index)
 {
 	QString target = getWorkspace().getDirModel().data(index, REPODIRMODEL_ROLE_PATH).toString();
 	target = getCurrentWorkspace() + PATH_SEPARATOR + target;
@@ -1730,7 +1730,7 @@ QMenu * MainWindow::createPopupMenu()
 //------------------------------------------------------------------------------
 void MainWindow::on_actionViewStash_triggered()
 {
-	ui->tableViewStash->setVisible(ui->actionViewStash->isChecked());
+	ui->stashTableView->setVisible(ui->actionViewStash->isChecked());
 }
 
 //------------------------------------------------------------------------------
@@ -1886,13 +1886,13 @@ void MainWindow::on_textBrowser_customContextMenuRequested(const QPoint &pos)
 }
 
 //------------------------------------------------------------------------------
-void MainWindow::on_tableView_customContextMenuRequested(const QPoint &pos)
+void MainWindow::on_fileTableView_customContextMenuRequested(const QPoint &pos)
 {
 	QPoint gpos = QCursor::pos();
 #ifdef Q_OS_WIN
 	if(qApp->keyboardModifiers() & Qt::SHIFT)
 	{
-		ui->tableView->selectionModel()->select(ui->tableView->indexAt(pos), QItemSelectionModel::ClearAndSelect|QItemSelectionModel::Rows);
+		ui->fileTableView->selectionModel()->select(ui->fileTableView->indexAt(pos), QItemSelectionModel::ClearAndSelect|QItemSelectionModel::Rows);
 		QStringList fnames;
 		getSelectionFilenames(fnames);
 
@@ -1910,7 +1910,7 @@ void MainWindow::on_tableView_customContextMenuRequested(const QPoint &pos)
 #endif
 	{
 		QMenu *menu = new QMenu(this);
-		menu->addActions(ui->tableView->actions());
+		menu->addActions(ui->fileTableView->actions());
 		menu->popup(gpos);
 	}
 

src/MainWindow.h

@@ -67,7 +67,7 @@ private slots:
 	// Manual slots.
 	// Use a different naming scheme to prevent warnings from Qt's automatic signaling
 	void onOpenRecent();
-	void onTreeViewSelectionChanged(const class QItemSelection &selected, const class QItemSelection &deselected);
+	void onWorkspaceTreeViewSelectionChanged(const class QItemSelection &selected, const class QItemSelection &deselected);
 	void onFileViewDragOut();
 	void onAbort();
 
@@ -79,8 +79,8 @@ private slots:
 	void on_actionTimeline_triggered();
 	void on_actionHistory_triggered();
 	void on_actionClearLog_triggered();
-	void on_tableView_doubleClicked(const QModelIndex &index);
+	void on_fileTableView_doubleClicked(const QModelIndex &index);
-	void on_treeView_doubleClicked(const QModelIndex &index);
+	void on_workspaceTreeView_doubleClicked(const QModelIndex &index);
 	void on_actionOpenFile_triggered();
 	void on_actionPush_triggered();
 	void on_actionPull_triggered();
@@ -111,7 +111,7 @@ private slots:
 	void on_actionDeleteStash_triggered();
 	void on_actionDiffStash_triggered();
 	void on_textBrowser_customContextMenuRequested(const QPoint &pos);
-	void on_tableView_customContextMenuRequested(const QPoint &pos);
+	void on_fileTableView_customContextMenuRequested(const QPoint &pos);
 
 private:
 	class MainWinUICallback : public UICallback

ui/MainWindow.ui

@@ -17,7 +17,7 @@
    <string>Fuel</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="../rsrc/resources.qrc">
+   <iconset>
     <normaloff>:/icons/icons/Battery-01.png</normaloff>:/icons/icons/Battery-01.png</iconset>
   </property>
   <property name="unifiedTitleAndToolBarOnMac">
@@ -58,7 +58,7 @@
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
-       <widget class="QTreeView" name="treeView">
+       <widget class="QTreeView" name="workspaceTreeView">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
           <horstretch>20</horstretch>
@@ -87,7 +87,7 @@
          <bool>false</bool>
         </attribute>
        </widget>
-       <widget class="FileTableView" name="tableView">
+       <widget class="FileTableView" name="fileTableView">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
           <horstretch>80</horstretch>
@@ -140,7 +140,7 @@
          <number>30</number>
         </attribute>
        </widget>
-       <widget class="QTableView" name="tableViewStash">
+       <widget class="QTableView" name="stashTableView">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
           <horstretch>20</horstretch>
@@ -356,7 +356,7 @@
   <widget class="QStatusBar" name="statusBar"/>
   <action name="actionRefresh">
    <property name="icon">
-    <iconset resource="../rsrc/resources.qrc">
+    <iconset>
      <normaloff>:/icons/icons/Button Refresh-01.png</normaloff>:/icons/icons/Button Refresh-01.png</iconset>
    </property>
    <property name="text">
@@ -374,7 +374,7 @@
   </action>
   <action name="actionCommit">
    <property name="icon">
-    <iconset resource="../rsrc/resources.qrc">
+    <iconset>
      <normaloff>:/icons/icons/Save-01.png</normaloff>:/icons/icons/Save-01.png</iconset>
    </property>
    <property name="text">
@@ -392,7 +392,7 @@
   </action>
   <action name="actionDiff">
    <property name="icon">
-    <iconset resource="../rsrc/resources.qrc">
+    <iconset>
      <normaloff>:/icons/icons/Document Copy-01.png</normaloff>:/icons/icons/Document Copy-01.png</iconset>
    </property>
    <property name="text">
@@ -410,7 +410,7 @@
   </action>
   <action name="actionAdd">
    <property name="icon">
-    <iconset resource="../rsrc/resources.qrc">
+    <iconset>
      <normaloff>:/icons/icons/File New-01.png</normaloff>:/icons/icons/File New-01.png</iconset>
    </property>
    <property name="text">
@@ -428,7 +428,7 @@
   </action>
   <action name="actionDelete">
    <property name="icon">
-    <iconset resource="../rsrc/resources.qrc">
+    <iconset>
      <normaloff>:/icons/icons/File Delete-01.png</normaloff>:/icons/icons/File Delete-01.png</iconset>
    </property>
    <property name="text">
@@ -446,7 +446,7 @@
   </action>
   <action name="actionNewRepository">
    <property name="icon">
-    <iconset resource="../rsrc/resources.qrc">
+    <iconset>
      <normaloff>:/icons/icons/Document Blank-01.png</normaloff>:/icons/icons/Document Blank-01.png</iconset>
    </property>
    <property name="text">
@@ -464,7 +464,7 @@
   </action>
   <action name="actionOpenRepository">
    <property name="icon">
-    <iconset resource="../rsrc/resources.qrc">
+    <iconset>
      <normaloff>:/icons/icons/My Documents-01.png</normaloff>:/icons/icons/My Documents-01.png</iconset>
    </property>
    <property name="text">
@@ -496,7 +496,7 @@
   </action>
   <action name="actionCloneRepository">
    <property name="icon">
-    <iconset resource="../rsrc/resources.qrc">
+    <iconset>
      <normaloff>:/icons/icons/My Websites-01.png</normaloff>:/icons/icons/My Websites-01.png</iconset>
    </property>
    <property name="text">
@@ -508,7 +508,7 @@
   </action>
   <action name="actionPush">
    <property name="icon">
-    <iconset resource="../rsrc/resources.qrc">
+    <iconset>
      <normaloff>:/icons/icons/Button Upload-01.png</normaloff>:/icons/icons/Button Upload-01.png</iconset>
    </property>
    <property name="text">
@@ -526,7 +526,7 @@
   </action>
   <action name="actionPull">
    <property name="icon">
-    <iconset resource="../rsrc/resources.qrc">
+    <iconset>
      <normaloff>:/icons/icons/Button Download-01.png</normaloff>:/icons/icons/Button Download-01.png</iconset>
    </property>
    <property name="text">
@@ -544,7 +544,7 @@
   </action>
   <action name="actionRename">
    <property name="icon">
-    <iconset resource="../rsrc/resources.qrc">
+    <iconset>
      <normaloff>:/icons/icons/File Open-01.png</normaloff>:/icons/icons/File Open-01.png</iconset>
    </property>
    <property name="text">
@@ -562,7 +562,7 @@
   </action>
   <action name="actionQuit">
    <property name="icon">
-    <iconset resource="../rsrc/resources.qrc">
+    <iconset>
      <normaloff>:/icons/icons/Button Turn Off-01.png</normaloff>:/icons/icons/Button Turn Off-01.png</iconset>
    </property>
    <property name="text">
@@ -583,7 +583,7 @@
   </action>
   <action name="actionHistory">
    <property name="icon">
-    <iconset resource="../rsrc/resources.qrc">
+    <iconset>
      <normaloff>:/icons/icons/File History-01.png</normaloff>:/icons/icons/File History-01.png</iconset>
    </property>
    <property name="text">
@@ -604,7 +604,7 @@
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset resource="../rsrc/resources.qrc">
+    <iconset>
      <normaloff>:/icons/icons/Network MAC-01.png</normaloff>:/icons/icons/Network MAC-01.png</iconset>
    </property>
    <property name="text">
@@ -619,7 +619,7 @@
   </action>
   <action name="actionRevert">
    <property name="icon">
-    <iconset resource="../rsrc/resources.qrc">
+    <iconset>
      <normaloff>:/icons/icons/Document-Revert-icon.png</normaloff>:/icons/icons/Document-Revert-icon.png</iconset>
    </property>
    <property name="text">
@@ -634,7 +634,7 @@
   </action>
   <action name="actionClearLog">
    <property name="icon">
-    <iconset resource="../rsrc/resources.qrc">
+    <iconset>
      <normaloff>:/icons/icons/Text Edit.png</normaloff>:/icons/icons/Text Edit.png</iconset>
    </property>
    <property name="text">
@@ -649,7 +649,7 @@
   </action>
   <action name="actionTimeline">
    <property name="icon">
-    <iconset resource="../rsrc/resources.qrc">
+    <iconset>
      <normaloff>:/icons/icons/Clock-01.png</normaloff>:/icons/icons/Clock-01.png</iconset>
    </property>
    <property name="text">
@@ -664,7 +664,7 @@
   </action>
   <action name="actionOpenFile">
    <property name="icon">
-    <iconset resource="../rsrc/resources.qrc">
+    <iconset>
      <normaloff>:/icons/icons/Document-01.png</normaloff>:/icons/icons/Document-01.png</iconset>
    </property>
    <property name="text">
@@ -682,7 +682,7 @@
   </action>
   <action name="actionOpenContaining">
    <property name="icon">
-    <iconset resource="../rsrc/resources.qrc">
+    <iconset>
      <normaloff>:/icons/icons/Folder-01.png</normaloff>:/icons/icons/Folder-01.png</iconset>
    </property>
    <property name="text">
@@ -700,7 +700,7 @@
   </action>
   <action name="actionUndo">
    <property name="icon">
-    <iconset resource="../rsrc/resources.qrc">
+    <iconset>
      <normaloff>:/icons/icons/Button Reload-01.png</normaloff>:/icons/icons/Button Reload-01.png</iconset>
    </property>
    <property name="text">
@@ -718,7 +718,7 @@
   </action>
   <action name="actionAbout">
    <property name="icon">
-    <iconset resource="../rsrc/resources.qrc">
+    <iconset>
      <normaloff>:/icons/icons/Battery-01.png</normaloff>:/icons/icons/Battery-01.png</iconset>
    </property>
    <property name="text">
@@ -733,7 +733,7 @@
   </action>
   <action name="actionUpdate">
    <property name="icon">
-    <iconset resource="../rsrc/resources.qrc">
+    <iconset>
      <normaloff>:/icons/icons/Button Play-01.png</normaloff>:/icons/icons/Button Play-01.png</iconset>
    </property>
    <property name="text">
@@ -751,7 +751,7 @@
   </action>
   <action name="actionSettings">
    <property name="icon">
-    <iconset resource="../rsrc/resources.qrc">
+    <iconset>
      <normaloff>:/icons/icons/Gear-01.png</normaloff>:/icons/icons/Gear-01.png</iconset>
    </property>
    <property name="text">
@@ -839,7 +839,7 @@
   </action>
   <action name="actionOpenFolder">
    <property name="icon">
-    <iconset resource="../rsrc/resources.qrc">
+    <iconset>
      <normaloff>:/icons/icons/Folder-01.png</normaloff>:/icons/icons/Folder-01.png</iconset>
    </property>
    <property name="text">
@@ -854,7 +854,7 @@
   </action>
   <action name="actionRenameFolder">
    <property name="icon">
-    <iconset resource="../rsrc/resources.qrc">
+    <iconset>
      <normaloff>:/icons/icons/Folder Open-01.png</normaloff>:/icons/icons/Folder Open-01.png</iconset>
    </property>
    <property name="text">
@@ -869,7 +869,7 @@
   </action>
   <action name="actionNewStash">
    <property name="icon">
-    <iconset resource="../rsrc/resources.qrc">
+    <iconset>
      <normaloff>:/icons/icons/Folder Add-01.png</normaloff>:/icons/icons/Folder Add-01.png</iconset>
    </property>
    <property name="text">
@@ -881,7 +881,7 @@
   </action>
   <action name="actionApplyStash">
    <property name="icon">
-    <iconset resource="../rsrc/resources.qrc">
+    <iconset>
      <normaloff>:/icons/icons/Folder Open-01.png</normaloff>:/icons/icons/Folder Open-01.png</iconset>
    </property>
    <property name="text">
@@ -913,7 +913,7 @@
   </action>
   <action name="actionDeleteStash">
    <property name="icon">
-    <iconset resource="../rsrc/resources.qrc">
+    <iconset>
      <normaloff>:/icons/icons/Folder Delete-01.png</normaloff>:/icons/icons/Folder Delete-01.png</iconset>
    </property>
    <property name="text">
@@ -922,7 +922,7 @@
   </action>
   <action name="actionDiffStash">
    <property name="icon">
-    <iconset resource="../rsrc/resources.qrc">
+    <iconset>
      <normaloff>:/icons/icons/Folder Explorer-01.png</normaloff>:/icons/icons/Folder Explorer-01.png</iconset>
    </property>
    <property name="text">
@@ -944,8 +944,6 @@
    <container>1</container>
   </customwidget>
  </customwidgets>
- <resources>
+ <resources/>
-  <include location="../rsrc/resources.qrc"/>
- </resources>
  <connections/>
 </ui>