ynkmr/Sourcetrail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ui: Added shortcuts for navigating to next and previous reference in code view

Browse Source 
* Added new class QtCodeNavigator between QtCodeView and QtCodeFileList that handles active ids and navigation
* Pass all files as initially collapsed to code view and decide in QtCodeNavigator which ones show content
* Rewrote requesting of active snippet display to top down approach
* Display other locations focused when active location changes
* Show corresponding edges when navigating references
This commit is contained in:
Eberhard Graether
2016-08-09 13:29:14 +02:00
parent 210c5b1245
commit d0a063a3b6
32 changed files with 1037 additions and 599 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib_gui/qt/element/QtCodeFile.h
+8 -15
View File
@@ -19,7 +19,7 @@
class QLabel;
class QPushButton;
class QtCodeFileList;
class QtCodeNavigator;
class QtCodeSnippet;
class QVBoxLayout;
class TokenLocationFile;
@@ -31,7 +31,7 @@ class QtCodeFile
Q_OBJECT
public:
QtCodeFile(const FilePath& filePath, QtCodeFileList* parent);
QtCodeFile(const FilePath& filePath, QtCodeNavigator* navigator);
virtual ~QtCodeFile();
void setModificationTime(TimePoint modificationTime);
@@ -39,20 +39,15 @@ public:
const FilePath& getFilePath() const;
std::string getFileName() const;
const std::vector<Id>& getActiveTokenIds() const;
const std::vector<Id>& getActiveLocalSymbolIds() const;
const std::vector<Id>& getFocusedTokenIds() const;
std::vector<std::string> getErrorMessages() const;
bool hasErrors() const;
QtCodeSnippet* addCodeSnippet(const CodeSnippetParams& params);
QtCodeSnippet* insertCodeSnippet(const CodeSnippetParams& params);
QtCodeSnippet* findFirstActiveSnippet() const;
QtCodeSnippet* getSnippetForLocationId(Id locationId) const;
QtCodeSnippet* getFileSnippet() const;
bool isCollapsedActiveFile() const;
bool isCollapsed() const;
void requestContent() const;
void updateContent();
void setLocationFile(std::shared_ptr<TokenLocationFile> locationFile, int refCount);
@@ -61,9 +56,7 @@ public:
void setSnippets();
void setMaximized();
void requestSnippets() const;
bool hasSnippets() const;
void updateSnippets();
uint getScrollToLine() const;
@@ -88,7 +81,7 @@ private:
QtThreadedFunctor<> m_updateTitleBarFunctor;
QtCodeFileList* m_parent;
QtCodeNavigator* m_navigator;
QPushButton* m_titleBar;
QPushButton* m_title;
@@ -106,7 +99,7 @@ private:
TimePoint m_modificationTime;
std::shared_ptr<TokenLocationFile> m_locationFile;
mutable bool m_snippetsRequested;
mutable bool m_contentRequested;
uint m_scrollToLine;
};