Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix various typos #692

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -582,7 +582,7 @@ highlights are:
- Simple Drag & Drop user interface.
- Load data from file.
- Connect to live streaming of data.
- Save the visualization layout and configurations to re-use them later.
- Save the visualization layout and configurations to reuse them later.
- Fast OpenGL visualization.
- Can handle thousands of timeseries and millions of data points.
- Transform your data using a simple editor: derivative, moving average, integral, etc…
Expand Down
2 changes: 1 addition & 1 deletion doc/user-guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -847,7 +847,7 @@ When an entire area is closed, the default behavior is to hide the dock widgets

It is possible to globally lock features of all dock widgets to "freeze" the
current workspace layout. That means, you can now lock your workspace
to avoid accidentally dragging a docked view. When locking was't possible,
to avoid accidentally dragging a docked view. When locking wasn't possible,
users had to manually dock it back to the desired place after each accidental
undock.

Expand Down
8 changes: 4 additions & 4 deletions src/DockAreaWidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ struct DockAreaWidgetPrivate
DockAreaWidgetPrivate(CDockAreaWidget* _public);

/**
* Convencience function to ease components factory access
* Convenience function to ease components factory access
*/
QSharedPointer<ads::CDockComponentsFactory> componentsFactory() const
{
Expand Down Expand Up @@ -379,10 +379,10 @@ void DockAreaWidgetPrivate::updateTitleBarButtonStates()

if (_this->isAutoHide())
{
if (CDockManager::testAutoHideConfigFlag(CDockManager::AutoHideHasCloseButton))
{
if (CDockManager::testAutoHideConfigFlag(CDockManager::AutoHideHasCloseButton))
{
TitleBar->button(TitleBarButtonClose)->setEnabled(
_this->features().testFlag(CDockWidget::DockWidgetClosable));
_this->features().testFlag(CDockWidget::DockWidgetClosable));
Comment on lines -382 to +385
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

github auto-fixed the ^M line end here.

}
}
else
Expand Down
2 changes: 1 addition & 1 deletion src/DockComponentsFactory.h
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ class ADS_EXPORT CDockComponentsFactory

/**
* This returns the default dock components factory instance.
* If no components factory is assigned to a specifc dock manager, this
* If no components factory is assigned to a specific dock manager, this
* global factory instance will be used.
*/
static QSharedPointer<ads::CDockComponentsFactory> factory();
Expand Down
2 changes: 1 addition & 1 deletion src/DockManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -555,7 +555,7 @@ CDockManager::~CDockManager()
{
if (!area || area->dockManager() != this) continue;

// QPointer delete safety - just in case some dock wigdet in destruction
// QPointer delete safety - just in case some dock widget in destruction
// deletes another related/twin or child dock widget.
std::vector<QPointer<QWidget>> deleteWidgets;
for ( auto widget : area->dockWidgets() )
Expand Down
2 changes: 1 addition & 1 deletion src/ads_globals.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ QString detectWindowManagerX11()
}
if(sup_windows.length() == 0)
{
ADS_PRINT("Failed to get the supporting window on non EWMH comform WM.");
ADS_PRINT("Failed to get the supporting window on non EWMH conform WM.");
return "UNKNOWN";
}
support_win = sup_windows[0];
Expand Down
2 changes: 1 addition & 1 deletion src/ads_globals.h
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ SideBarLocation toSideBarLocation(DockWidgetArea Area);


/**
* Returns true for the top or bottom side bar ansd false for the
* Returns true for the top or bottom side bar and false for the
* left and right side bar
*/
bool isHorizontalSideBarLocation(SideBarLocation Location);
Expand Down