NiceGit renamed to CuteGit. Crash is fixed

NiceGit.pro → CuteGit.pro

@@ -1,5 +1,7 @@
 QT += qml quick widgets concurrent
 
+TARGET = CuteGit
+
 TEMPLATE = app
 
 LIBS += -lgit2

README.md

@@ -1,2 +1,2 @@
-# NiceGit
+# CuteGit
 

githandler.cpp

@@ -53,27 +53,28 @@ GitHandler::~GitHandler()
     git_libgit2_shutdown();
 }
 
-GitRepository *GitHandler::open(const QUrl &url)
+void GitHandler::open(const QUrl &url, bool activate)
 {
     if(url.isLocalFile()) {
-        return open(url.toLocalFile());
+        open(url.toLocalFile(), activate);
     }
-    return nullptr;
 }
 
-GitRepository *GitHandler::open(const QString &path)
+void GitHandler::open(const QString &path, bool activate)
 {
     qDebug() << "path" << path;
     git_buf root = {0,0,0};
     if(git_repository_discover(&root, path.toUtf8().data(), 0, NULL) != 0) {
         qDebug() << lastError();
-        return nullptr;
+        return;
     }
 
     GitRepository* repo = new GitRepository(QString::fromUtf8(root.ptr, root.size));
     Settings::instance()->add(repo);
     m_repositories->addRepository(repo);
-    return repo;
+    if(activate) {
+        setActiveRepo(repo);
+    }
 }
 
 void GitHandler::activateRepository(int i)
@@ -109,14 +110,12 @@ void GitHandler::setActiveRepo(GitRepository* repo)
 
 
     ColorHandler::instance().updateColors(m_activeRepo);
-    m_constantHead = m_activeRepo->head();
+//    m_constantHead = m_activeRepo->head(); // TODO
     m_console->setRepository(m_activeRepo);
-    connect(m_activeRepo, &GitRepository::branchesChanged, this, &GitHandler::updateModels);
     updateModels();
 
     m_activeRepoWatcher->addPath(m_activeRepo->root());
 
-    qDebug() << "Active repo index: " << m_repositories->indexOf(m_activeRepo);
     m_repositories->setActiveRepositoryIndex(m_repositories->indexOf(m_activeRepo));
     activeRepoChanged(m_activeRepo);
 
@@ -243,28 +242,30 @@ CommitGraph* GitHandler::updateGraph(const GitOid &head, const BranchContainer &
 
 void GitHandler::onGraphReady()
 {
+    m_commits->deleteLater();
+    m_commits = nullptr;
+    emit commitsChanged(m_commits);
+
     m_graph->deleteLater();
-    m_graph = m_graphTask.result();
+    m_graph = nullptr;
     emit graphChanged(m_graph);
 
+    m_graph = m_graphTask.result();
     m_commits = CommitModel::fromGraph(m_graph);
+
+    emit graphChanged(m_graph);
     emit commitsChanged(m_commits);
 }
 
 void GitHandler::loadCachedRepos()
 {
     QString activeRepo = Settings::instance()->loadLastRepo();
-    GitRepository* lastRepo = nullptr;
 
     QStringList cachedRepos;
     Settings::instance()->load(cachedRepos);
 
     foreach (QString repoPath, cachedRepos) {
-        GitRepository* repo = open(repoPath);
-        if(repo->id() == activeRepo) {
-            lastRepo = repo;
-        }
+        open(repoPath, false);
     }
-
-    setActiveRepo(lastRepo);
+//    m_repositories->ac(m_repositories->indexOf(m_activeRepo));
 }

githandler.h

@@ -31,8 +31,8 @@ class GitHandler : public QObject
 public:
     GitHandler();
     virtual ~GitHandler();
-    Q_INVOKABLE GitRepository *open(const QString &path);
-    Q_INVOKABLE GitRepository *open(const QUrl &url);
+    Q_INVOKABLE void open(const QString &path, bool activate = false);
+    Q_INVOKABLE void open(const QUrl &url, bool activate = false);
     Q_INVOKABLE void activateRepository(int i);
 
     Q_INVOKABLE void diff(GitCommit* a, GitCommit* b);
@@ -128,10 +128,11 @@ private:
     TagListModel* m_tagList;
     QFileSystemWatcher* m_activeRepoWatcher;
     GitConsole* m_console;
-    GitOid m_constantHead;
     QFutureWatcher<GitDiff*> m_diffTask;
     QFutureWatcher<CommitGraph*> m_graphTask;
     bool m_isBusy;
+
+    //    GitOid m_constantHead; //TODO:
 };
 
 #endif // GITHANDLER_H

gitrepository.cpp

@@ -33,6 +33,7 @@ GitRepository::GitRepository(const QString& root) : QObject(nullptr)
 
 GitRepository::~GitRepository()
 {
+    qDebug() << "GitRepository::~GitRepository";
     close();
 }
 

main.cpp

@@ -31,23 +31,23 @@ int main(int argc, char *argv[])
     QFontDatabase::addApplicationFont(":/fonts/Inconsolata.otf");
     QQuickView view;
 
-    qmlRegisterUncreatableType<GitOid>("org.semlanik.nicegit", 1, 0, "GitOid", "Owned only by GitHandler");
-    qmlRegisterUncreatableType<CommitModel>("org.semlanik.nicegit", 1, 0, "CommitModel", "Owned only by GitHandler");
-    qmlRegisterUncreatableType<CommitGraph>("org.semlanik.nicegit", 1, 0, "CommitGraph", "Owned only by GitHandler");
-    qmlRegisterUncreatableType<GraphPoint>("org.semlanik.nicegit", 1, 0, "GraphPoint", "Owned only by GitHandler");
-    qmlRegisterUncreatableType<RepositoryModel>("org.semlanik.nicegit", 1, 0, "RepositoryModel", "Owned only by GitHandler");
-    qmlRegisterUncreatableType<GitRepository>("org.semlanik.nicegit", 1, 0, "GitRepository", "Owned only by GitHandler");
-    qmlRegisterUncreatableType<GitBranch>("org.semlanik.nicegit", 1, 0, "GitBranch", "Owned only by GitHandler");
-    qmlRegisterUncreatableType<GitHandler>("org.semlanik.nicegit", 1, 0, "GitHandler", "Global for qml");
-    qmlRegisterUncreatableType<GitTag>("org.semlanik.nicegit", 1, 0, "GitTag", "Global for qml");
-    qmlRegisterUncreatableType<GitDiff>("org.semlanik.nicegit", 1, 0, "GitDiff", "Global for qml");
-    qmlRegisterUncreatableType<GitCommit>("org.semlanik.nicegit", 1, 0, "GitCommit", "Global for qml");
-    qmlRegisterUncreatableType<GraphListModel>("org.semlanik.nicegit", 1, 0, "GraphListModel", "Owned only by GitHandler");
-    qmlRegisterUncreatableType<BranchListModel>("org.semlanik.nicegit", 1, 0, "BranchListModel", "Owned only by GitHandler");
-    qmlRegisterUncreatableType<TagListModel>("org.semlanik.nicegit", 1, 0, "TagListModel", "Owned only by GitHandler");
-    qmlRegisterUncreatableType<GitConsole>("org.semlanik.nicegit", 1, 0, "GitConsole", "Owned only by GitHandler");
-    qmlRegisterUncreatableType<DiffModel>("org.semlanik.nicegit", 1, 0, "DiffModel", "Owned only by GitHandler");
-    qmlRegisterSingletonType<TooltipViewModel>("org.semlanik.nicegit", 1, 0,"TooltipViewModel",
+    qmlRegisterUncreatableType<GitOid>("org.semlanik.cutegit", 1, 0, "GitOid", "Owned only by GitHandler");
+    qmlRegisterUncreatableType<CommitModel>("org.semlanik.cutegit", 1, 0, "CommitModel", "Owned only by GitHandler");
+    qmlRegisterUncreatableType<CommitGraph>("org.semlanik.cutegit", 1, 0, "CommitGraph", "Owned only by GitHandler");
+    qmlRegisterUncreatableType<GraphPoint>("org.semlanik.cutegit", 1, 0, "GraphPoint", "Owned only by GitHandler");
+    qmlRegisterUncreatableType<RepositoryModel>("org.semlanik.cutegit", 1, 0, "RepositoryModel", "Owned only by GitHandler");
+    qmlRegisterUncreatableType<GitRepository>("org.semlanik.cutegit", 1, 0, "GitRepository", "Owned only by GitHandler");
+    qmlRegisterUncreatableType<GitBranch>("org.semlanik.cutegit", 1, 0, "GitBranch", "Owned only by GitHandler");
+    qmlRegisterUncreatableType<GitHandler>("org.semlanik.cutegit", 1, 0, "GitHandler", "Global for qml");
+    qmlRegisterUncreatableType<GitTag>("org.semlanik.cutegit", 1, 0, "GitTag", "Global for qml");
+    qmlRegisterUncreatableType<GitDiff>("org.semlanik.cutegit", 1, 0, "GitDiff", "Global for qml");
+    qmlRegisterUncreatableType<GitCommit>("org.semlanik.cutegit", 1, 0, "GitCommit", "Global for qml");
+    qmlRegisterUncreatableType<GraphListModel>("org.semlanik.cutegit", 1, 0, "GraphListModel", "Owned only by GitHandler");
+    qmlRegisterUncreatableType<BranchListModel>("org.semlanik.cutegit", 1, 0, "BranchListModel", "Owned only by GitHandler");
+    qmlRegisterUncreatableType<TagListModel>("org.semlanik.cutegit", 1, 0, "TagListModel", "Owned only by GitHandler");
+    qmlRegisterUncreatableType<GitConsole>("org.semlanik.cutegit", 1, 0, "GitConsole", "Owned only by GitHandler");
+    qmlRegisterUncreatableType<DiffModel>("org.semlanik.cutegit", 1, 0, "DiffModel", "Owned only by GitHandler");
+    qmlRegisterSingletonType<TooltipViewModel>("org.semlanik.cutegit", 1, 0,"TooltipViewModel",
                                                [](QQmlEngine *engine, QJSEngine *scriptEngine) -> QObject*
     {
         Q_UNUSED(engine)

qml/CommitPlane.qml

@@ -1,6 +1,6 @@
 import QtQuick 2.0
 import QtQuick.Controls 1.4
-import org.semlanik.nicegit 1.0
+import org.semlanik.cutegit 1.0
 
 Item {
     id: root

qml/DiffFiles.qml

@@ -1,7 +1,7 @@
 import QtQuick 2.0
 import QtGraphicalEffects 1.0
 
-import org.semlanik.nicegit 1.0
+import org.semlanik.cutegit 1.0
 
 ListView {
     id: root

qml/GraphAnnotation.qml

@@ -1,6 +1,6 @@
 import QtQuick 2.0
 import QtQuick.Controls 1.4
-import org.semlanik.nicegit 1.0
+import org.semlanik.cutegit 1.0
 
 Item {
     id: root

qml/MainView.qml

@@ -1,6 +1,6 @@
 import QtQuick 2.0
 import QtQuick.Controls 1.4
-import org.semlanik.nicegit 1.0
+import org.semlanik.cutegit 1.0
 
 FocusScope {
     id: root

qml/Tooltip.qml

@@ -1,5 +1,5 @@
 import QtQuick 2.0
-import org.semlanik.nicegit 1.0
+import org.semlanik.cutegit 1.0
 
 Rectangle {
     id: root

qml/TopBar.qml

@@ -82,7 +82,7 @@ Item {
         selectFolder: true
         selectMultiple: false
         onAccepted: {
-            _handler.setActiveRepo(_handler.open(repoOpenDialog.fileUrl))
+            _handler.open(repoOpenDialog.fileUrl, true)
         }
     }
 
@@ -104,7 +104,7 @@ Item {
                 textFormat: Text.RichText
                 text:"<p><b>CuteGit</b> is free opensource software. You're free to use and modify it in terms of GPLv3 license.<br/>" +
                      "You can support project by contributing your ideas and code to CuteGit repository.</p>" +
-                     "<p><b>Autor:</b> Alexey Edelev aka semlanik</p>"
+                     "<p><b>Author:</b> Alexey Edelev aka semlanik</p>"
             }
         }
     }

settings.cpp

@@ -13,7 +13,7 @@ namespace {
 
 Settings::Settings() : QObject()
   ,m_settings("org.semlanik",
-              "NiceGit")
+              "CuteGit")
 {
 }