Skip to content

Commit 6c6e033

Browse files
Merge branch 'ci-dev'
2 parents d55387d + bf9560f commit 6c6e033

File tree

2 files changed

+16
-15
lines changed

2 files changed

+16
-15
lines changed

.github/workflows/linux-builds.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
name: linux-builds
22

3-
on: [push]
3+
on:
4+
push:
5+
workflow_dispatch:
46

57
jobs:
68
build_ubuntu_2204_cmake:

README.md

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
[![License: LGPL v2.1](https://img.shields.io/badge/License-LGPL%20v2.1-blue.svg)](gnu-lgpl-v2.1.md)
99
[![Build status](https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System/workflows/linux-builds/badge.svg)](https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System/actions?query=workflow%3Alinux-builds)
1010
[![Build status](https://ci.appveyor.com/api/projects/status/qcfb3cy932jw9mpy/branch/master?svg=true)](https://ci.appveyor.com/project/githubuser0xFFFF/qt-advanced-docking-system/branch/master)
11+
[![windows-builds](https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System/actions/workflows/windows-cmake.yml/badge.svg?branch=master)](https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System/actions/workflows/windows-cmake.yml)
1112
[![GitHub contributors](https://img.shields.io/github/contributors/githubuser0xFFFF/Qt-Advanced-Docking-System?color=ffdf00)](https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System/graphs/contributors)
1213

1314
Qt Advanced Docking System lets you create customizable layouts using a full
@@ -16,13 +17,13 @@ integrated development environments (IDEs) such as Visual Studio.
1617

1718
- [What's new...](https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System/releases/latest)
1819
- [Documentation](doc/user-guide.md)
19-
- Original Repository: https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System
20+
- Original Repository: [https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System](https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System)
2021

2122
[![Video Advanced Docking](doc/advanced-docking_video.png)](https://www.youtube.com/watch?v=7pdNfafg3Qc)
2223

2324
## New and Noteworthy
2425

25-
Release [4.1](https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System/releases/latest) significantly improves the Auto-Hide functionality and also brings improvements
26+
Release [4.1](https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System/releases/latest) significantly improves the Auto-Hide functionality and also brings improvements
2627
for Drag and Drop of dock widgets into dock area tabs. These are the highlights of the new version:
2728

2829
#### Drag & Drop to Auto-Hide
@@ -57,7 +58,7 @@ That means, you can drag them to a different border or sidebar:
5758

5859
#### Auto-Hide Tab Sorting
5960

60-
You can drag Auto-Hide tabs to a new position in the current sidebar
61+
You can drag Auto-Hide tabs to a new position in the current sidebar
6162
to sort them:
6263

6364
![Auo-Hide sort tabs](doc/AutoHide_Sort_Tabs.gif)
@@ -81,7 +82,7 @@ sidebar:
8182
#### Dock Area Tab Insert Order
8283

8384
And last but not least the new version also improves the docking of widgets
84-
into the tabs of a Dock area. Just as with Auto-Hide tabs, you can now determine the position at which a tab is inserted by moving the mouse over an already existing tab (insertion before the tab) or behind the last tab
85+
into the tabs of a Dock area. Just as with Auto-Hide tabs, you can now determine the position at which a tab is inserted by moving the mouse over an already existing tab (insertion before the tab) or behind the last tab
8586
(appending):
8687

8788
![Dock area tab insert order](doc/DockArea_Tab_Insertion_Order.gif)
@@ -218,7 +219,7 @@ into floating windows is supported.
218219

219220
### Grouped dragging
220221

221-
When dragging the titlebar of a dock, all the tabs that are tabbed with it are
222+
When dragging the titlebar of a dock, all the tabs that are tabbed with it are
222223
going to be dragged. So you can move complete groups of tabbed widgets into
223224
a floating widget or from one dock area to another one.
224225

@@ -231,7 +232,7 @@ a floating widget or from one dock area to another one.
231232
A perspective defines the set and layout of dock windows in the main
232233
window. You can save the current layout of the dockmanager into a named
233234
perspective to make your own custom perspective. Later you can simply
234-
select a perspective from the perspective list to quickly switch the complete
235+
select a perspective from the perspective list to quickly switch the complete
235236
main window layout.
236237

237238
![Perspective](doc/perspectives.gif)
@@ -253,6 +254,7 @@ If this flag is cleared, the widget resizing is deferred until the mouse button
253254
In contrast to the standard Qt docking system, docking with the ADS works more like a drag & drop operation. That means, the dragged dock widget or dock area is not undocked immediately. Instead, a drag preview widget is created and dragged around to indicate the future position of the dock widget or dock area. The actual dock operation is only executed when the mouse button is released. That makes it possible, to cancel an active drag operation with the escape key.
254255

255256
The drag preview widget can be configured by a number of global dock manager flags:
257+
256258
- `DragPreviewIsDynamic`: if this flag is enabled, the preview will be adjusted dynamically to the drop area
257259
- `DragPreviewShowsContentPixmap`: the created drag preview window shows a static copy of the content of the dock widget / dock are that is dragged
258260
- `DragPreviewHasWindowFrame`: this flag configures if the drag preview is frameless like a QRubberBand or looks like a real window
@@ -322,7 +324,7 @@ pip install PySide6-QtAds
322324
```
323325

324326
Sample code is available [here](https://github.com/mborgerson/Qt-Advanced-Docking-System/tree/pyside6/examples). To run the samples, you'll also need to install latest qtpy
325-
from source (pip install https://github.com/spyder-ide/qtpy/archive/refs/heads/master.zip).
327+
from source (pip install <https://github.com/spyder-ide/qtpy/archive/refs/heads/master.zip>).
326328
The PySide6 bindings were contributed by:
327329

328330
- [mborgerson](https://github.com/mborgerson)
@@ -346,7 +348,6 @@ The PyQt6 bindings were contributed by:
346348

347349
Please file PyQt6Ads-specific issues at [pyapp-kit/PyQt6Ads](https://github.com/pyapp-kit/PyQt6Ads).
348350

349-
350351
### PyQt5
351352

352353
A package is available via [conda-forge](https://github.com/conda-forge/pyqtads-feedstock).
@@ -370,21 +371,19 @@ The library supports **Qt5** and **Qt6**.
370371

371372
### Windows
372373

373-
Windows 10 [![Build status](https://ci.appveyor.com/api/projects/status/qcfb3cy932jw9mpy/branch/master?svg=true)](https://ci.appveyor.com/project/githubuser0xFFFF/qt-advanced-docking-system/branch/master)
374+
Windows 10 / 11 [![Build status](https://ci.appveyor.com/api/projects/status/qcfb3cy932jw9mpy/branch/master?svg=true)](https://ci.appveyor.com/project/githubuser0xFFFF/qt-advanced-docking-system/branch/master)
375+
[![windows-builds](https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System/actions/workflows/windows-cmake.yml/badge.svg?branch=master)](https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System/actions/workflows/windows-cmake.yml)
374376

375377
The library was developed on and for Windows. It is used in a commercial Windows application and is therefore constantly tested.
376378

377379
### macOS
378380

379-
macOS [![Build Status](https://travis-ci.org/githubuser0xFFFF/Qt-Advanced-Docking-System.svg?branch=master)](https://travis-ci.org/githubuser0xFFFF/Qt-Advanced-Docking-System)
380-
381381
The application can be compiled for macOS. A user reported, that the library works on macOS. If have not tested it.
382382

383383
![Advanced Docking on macOS](doc/macos.png)
384384

385385
### Linux
386386

387-
[![Build Status](https://travis-ci.org/githubuser0xFFFF/Qt-Advanced-Docking-System.svg?branch=master)](https://travis-ci.org/githubuser0xFFFF/Qt-Advanced-Docking-System)
388387
[![Build status](https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System/workflows/linux-builds/badge.svg)](https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System/actions?query=workflow%3Alinux-builds)
389388

390389
Unfortunately, there is no such thing as a Linux operating system. Linux is a heterogeneous environment with a variety of different distributions. So it is not possible to support "Linux" like it is possible for Windows. It is only possible to support and test a small subset of Linux distributions. The library can be compiled for and has been developed and tested with some Linux distributions. Depending on the used window manager or compositor, dock widgets
@@ -613,7 +612,7 @@ highlights are:
613612
614613
### [Notepad Next](https://github.com/dail8859/NotepadNext)
615614
616-
Notepad Next is a cross-platform reimplementation of Notepad++ that uses the
615+
Notepad Next is a cross-platform reimplementation of Notepad++ that uses the
617616
Advanced Docking System to arrange the open source files on the screen.
618617
619618
[read more...](https://github.com/dail8859/NotepadNext)
@@ -676,7 +675,7 @@ The Automotive Data and Time-Triggered Framework was designed as a Rapid Prototy
676675
- Recording of vehicle data for visualisation
677676
- Simulation of complex scenarios in SIL/HIL test environments
678677
679-
The software features time-based processing of multiple data streams and graphical editing of dynamic filter graphs. It also includes an SDK for custom plug-ins and reusable components, as well as components for data visualization in both 2D and 3D. This is was the
678+
The software features time-based processing of multiple data streams and graphical editing of dynamic filter graphs. It also includes an SDK for custom plug-ins and reusable components, as well as components for data visualization in both 2D and 3D. This is was the
680679
[manual](https://support.digitalwerk.net/adtf/v3/adtf_html/page_adtf_xsystem_plugin.html)
681680
says about the switch to Qt Advanced Docking:
682681

0 commit comments

Comments
 (0)