Workspace sidebar #5189
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -92,6 +92,9 @@ void Settings::loadDefault() { | |
| this->sidebarWidth = 150; | ||
| this->sidebarNumberingStyle = SidebarNumberingStyle::DEFAULT; | ||
|
|
||
| this->workspaceWidth = 200; | ||
| this->showWorkspace = false; | ||
|
|
||
| this->showToolbar = true; | ||
| this->selectedToolbar = DEFAULT_TOOLBAR; | ||
|
|
||
|
|
@@ -246,6 +249,7 @@ auto Settings::loadViewMode(ViewModeId mode) -> bool { | |
| menubarVisible = viewMode.showMenubar; | ||
| showToolbar = viewMode.showToolbar; | ||
| showSidebar = viewMode.showSidebar; | ||
| showWorkspace = viewMode.showWorkspace; | ||
| this->activeViewMode = mode; | ||
| return true; | ||
| } | ||
|
|
@@ -410,6 +414,10 @@ void Settings::parseItem(xmlDocPtr doc, xmlNodePtr cur) { | |
| this->maximized = xmlStrcmp(value, reinterpret_cast<const xmlChar*>("true")) == 0; | ||
| } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("showToolbar")) == 0) { | ||
| this->showToolbar = xmlStrcmp(value, reinterpret_cast<const xmlChar*>("true")) == 0; | ||
| } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("showWorkspace")) == 0) { | ||
| this->showWorkspace = xmlStrcmp(value, reinterpret_cast<const xmlChar*>("true")) == 0; | ||
| } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("workspaceWidth")) == 0) { | ||
| this->workspaceWidth = std::max<int>(g_ascii_strtoll(reinterpret_cast<const char*>(value), nullptr, 10), 50); | ||
| } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("filepathShownInTitlebar")) == 0) { | ||
| this->filepathShownInTitlebar = xmlStrcmp(value, reinterpret_cast<const xmlChar*>("true")) == 0; | ||
| } else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("pageNumberShownInTitlebar")) == 0) { | ||
|
|
@@ -972,6 +980,9 @@ void Settings::save() { | |
|
|
||
| SAVE_BOOL_PROP(showToolbar); | ||
|
|
||
| SAVE_BOOL_PROP(showWorkspace); | ||
| SAVE_INT_PROP(workspaceWidth); | ||
|
|
||
| SAVE_BOOL_PROP(showSidebar); | ||
| SAVE_INT_PROP(sidebarWidth); | ||
| xmlNode = saveProperty("sidebarNumberingStyle", static_cast<int>(sidebarNumberingStyle), root); | ||
|
|
@@ -1950,6 +1961,17 @@ void Settings::setSidebarVisible(bool visible) { | |
| save(); | ||
| } | ||
|
|
||
| auto Settings::isWorkspaceVisible() const -> bool { return this->showWorkspace; } | ||
|
|
||
| void Settings::setWorkspaceVisible(bool visible) { | ||
| if (this->showWorkspace == visible) { | ||
| return; | ||
| } | ||
| this->showWorkspace = visible; | ||
| save(); | ||
| } | ||
|
|
||
|
|
||
| auto Settings::isToolbarVisible() const -> bool { return this->showToolbar; } | ||
|
|
||
| void Settings::setToolbarVisible(bool visible) { | ||
|
|
@@ -1960,6 +1982,18 @@ void Settings::setToolbarVisible(bool visible) { | |
| save(); | ||
| } | ||
|
|
||
| auto Settings::getWorkspaceWidth() const -> int { return this->workspaceWidth; } | ||
|
|
||
| void Settings::setWorkspaceWidth(int width) { | ||
| width = std::max(width, 50); | ||
|
|
||
| if (this->workspaceWidth == width) { | ||
| return; | ||
| } | ||
| this->workspaceWidth = width; | ||
| save(); | ||
| } | ||
|
|
||
| auto Settings::getSidebarWidth() const -> int { return this->sidebarWidth; } | ||
|
|
||
| void Settings::setSidebarWidth(int width) { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -216,9 +216,15 @@ class Settings { | |
| bool isSidebarVisible() const; | ||
| void setSidebarVisible(bool visible); | ||
|
|
||
| bool isWorkspaceVisible() const; | ||
| void setWorkspaceVisible(bool visible); | ||
|
|
||
| bool isToolbarVisible() const; | ||
| void setToolbarVisible(bool visible); | ||
|
|
||
| int getWorkspaceWidth() const; | ||
| void setWorkspaceWidth(int width); | ||
|
|
||
| int getSidebarWidth() const; | ||
| void setSidebarWidth(int width); | ||
|
|
||
|
|
@@ -630,7 +636,17 @@ class Settings { | |
| bool showSidebar{}; | ||
|
|
||
| /** | ||
| * If the workspace sidebar is visible | ||
| */ | ||
| bool showWorkspace{}; | ||
|
|
||
| /** | ||
| * The Width of the Workspace | ||
| */ | ||
| int workspaceWidth{}; | ||
|
|
||
| /** | ||
| * If the toolbar is visible | ||
| */ | ||
| bool showToolbar{}; | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,18 @@ | ||
| #include "ViewModes.h" | ||
|
|
||
| #include <iostream> | ||
|
|
||
| #include "util/StringUtils.h" | ||
|
|
||
| auto ViewMode::operator==(const ViewMode& other) const -> bool { | ||
| return (this->goFullscreen == other.goFullscreen) && (this->showMenubar == other.showMenubar) && | ||
| (this->showToolbar == other.showToolbar) && (this->showSidebar == other.showSidebar) && | ||
| (this->showWorkspace == other.showWorkspace); | ||
| } | ||
|
|
||
| struct ViewMode settingsStringToViewMode(std::string viewModeString) { | ||
| struct ViewMode viewMode; | ||
| for (const std::string& attr: StringUtils::split(viewModeString, ',')) { | ||
| if (attr.compare(ATTR_GO_FULLSCREEN) == 0) { | ||
| viewMode.goFullscreen = true; | ||
| } else if (attr.compare(ATTR_SHOW_MENUBAR) == 0) { | ||
|
|
@@ -19,17 +21,22 @@ struct ViewMode settingsStringToViewMode(std::string viewModeString) { | |
| viewMode.showToolbar = true; | ||
| } else if (attr.compare(ATTR_SHOW_SIDEBAR) == 0) { | ||
| viewMode.showSidebar = true; | ||
| } else if (attr.compare(ATTR_SHOW_WORKSPACE) == 0) { | ||
| viewMode.showWorkspace = true; | ||
| } | ||
| } | ||
| return viewMode; | ||
| } | ||
|
|
||
| const std::string viewModeToSettingsString(struct ViewMode viewMode) { | ||
| if (!(viewMode.goFullscreen || viewMode.showMenubar || viewMode.showToolbar || viewMode.showSidebar || | ||
| viewMode.showWorkspace)) { | ||
| return ""; | ||
| } | ||
| return ((viewMode.goFullscreen ? "," + static_cast<std::string>(ATTR_GO_FULLSCREEN) : "") + | ||
| (viewMode.showMenubar ? "," + static_cast<std::string>(ATTR_SHOW_MENUBAR) : "") + | ||
| (viewMode.showToolbar ? "," + static_cast<std::string>(ATTR_SHOW_TOOLBAR) : "") + | ||
| (viewMode.showSidebar ? "," + static_cast<std::string>(ATTR_SHOW_SIDEBAR) : "") + | ||
| (viewMode.showWorkspace ? "," + static_cast<std::string>(ATTR_SHOW_WORKSPACE) : "")) | ||
| .erase(0, 1); | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do not use raw pointers for owned resources, instead use std::unique_ptr.