Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: lawsie/guizero
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1.6.0
Choose a base ref
...
head repository: lawsie/guizero
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
  • 3 commits
  • 4 files changed
  • 5 contributors

Commits on Jan 10, 2025

  1. Fix broken image (#516)

    lawsie authored Jan 10, 2025
    Copy the full SHA
    4aeebee View commit details

Commits on Mar 4, 2025

  1. Fix error in Window docs (#520)

    * add set box borders example
    
    * #492 Fixed in docs-src ONLY - please regen docs
    
    * Add pyproject.toml #495
    
    * Docs style update
    
    * Add `step` to Slider, + tests + docs (#511)
    
    * Remove deprecated PIL method
    
    * Update dev instructions and add requirements.txt
    
    * Add missing text properties to text derived widgets and containers (weight, slant, underline & overstrike) (#506)
    
    * feat: add weight to Text derived widgets
    
    * test: add tests for Texts
    
    * docs: update docs for Text
    
    * feat: add weight to Drawing.text
    
    * test: add weight and color tests for Drawing.text
    
    * docs: add weight to Drawing.text
    
    * test: move weight_text_test into text_test
    
    * feat: add slant to Text derived widgets
    
    * test: fix tests for weight and add slant
    
    * docs: update for weight and slant
    
    * feat: add underline and overstrike to Text derived widgets
    
    * test: add tests for underline and overstrike
    
    * refactor: cast font properties into a tuple when passing to _set_tk_config
    
    * docs: update docs for underline and overstrike
    
    * fix: change weight to bold booleans and slant to italic booleans
    
    ---------
    
    Co-authored-by: Laura Sach <laura.sach@raspberrypi.org>
    
    * Bump version
    
    * Generate docs via mkdocs gh-deploy instead
    
    * Change docs and add changelog
    
    * remove DS_Store files
    
    * Change version to 1.6.0
    
    * Change version no in pyproject.toml too
    
    * Edit changelog
    
    * Move mkdocs.yml into main folder so it can be deployed
    
    * Fix broken image
    
    * Make even with master (#519)
    
    * Add slider increment, add bold etc text, change deployment method and move docs to gh-deploy (#514)
    
    * add set box borders example
    
    * #492 Fixed in docs-src ONLY - please regen docs
    
    * Add pyproject.toml #495
    
    * Docs style update
    
    * Add `step` to Slider, + tests + docs (#511)
    
    * Remove deprecated PIL method
    
    * Update dev instructions and add requirements.txt
    
    * Add missing text properties to text derived widgets and containers (weight, slant, underline & overstrike) (#506)
    
    * feat: add weight to Text derived widgets
    
    * test: add tests for Texts
    
    * docs: update docs for Text
    
    * feat: add weight to Drawing.text
    
    * test: add weight and color tests for Drawing.text
    
    * docs: add weight to Drawing.text
    
    * test: move weight_text_test into text_test
    
    * feat: add slant to Text derived widgets
    
    * test: fix tests for weight and add slant
    
    * docs: update for weight and slant
    
    * feat: add underline and overstrike to Text derived widgets
    
    * test: add tests for underline and overstrike
    
    * refactor: cast font properties into a tuple when passing to _set_tk_config
    
    * docs: update docs for underline and overstrike
    
    * fix: change weight to bold booleans and slant to italic booleans
    
    ---------
    
    Co-authored-by: Laura Sach <laura.sach@raspberrypi.org>
    
    * Bump version
    
    * Generate docs via mkdocs gh-deploy instead
    
    * Change docs and add changelog
    
    * remove DS_Store files
    
    * Change version to 1.6.0
    
    * Change version no in pyproject.toml too
    
    * Edit changelog
    
    ---------
    
    Co-authored-by: Martin O'Hanlon <martin.ohanlon@neo4j.com>
    Co-authored-by: james-pcdr <107222062+james-pcdr@users.noreply.github.com>
    Co-authored-by: Blindstars <96452556+Blindstars@users.noreply.github.com>
    
    * Fix broken image (#516)
    
    ---------
    
    Co-authored-by: Martin O'Hanlon <martin.ohanlon@neo4j.com>
    Co-authored-by: james-pcdr <107222062+james-pcdr@users.noreply.github.com>
    Co-authored-by: Blindstars <96452556+Blindstars@users.noreply.github.com>
    
    * Fix broken docs
    
    ---------
    
    Co-authored-by: Martin O'Hanlon <martin.ohanlon@neo4j.com>
    Co-authored-by: james-pcdr <107222062+james-pcdr@users.noreply.github.com>
    Co-authored-by: Blindstars <96452556+Blindstars@users.noreply.github.com>
    4 people authored Mar 4, 2025
    Copy the full SHA
    75948da View commit details
  2. Copy the full SHA
    4e608da View commit details
Showing with 54 additions and 8 deletions.
  1. +1 −1 README.md
  2. +1 −1 docs/deployment.md
  3. +6 −6 docs/window.md
  4. +46 −0 mkdocs.yml
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@

It is designed to allow new learners to quickly and easily create GUIs for their programs.

![Have a go with guizero and see what you can create](docs-src/docs/images/have-a-go.png)
![Have a go with guizero and see what you can create](docs/images/have-a-go.png)

```python
from guizero import App, Text, PushButton
2 changes: 1 addition & 1 deletion docs/deployment.md
Original file line number Diff line number Diff line change
@@ -37,7 +37,7 @@ twine upload dist/* --skip-existing
Build:

```
cd guizero/docs
cd guizero
mkdocs build
```

12 changes: 6 additions & 6 deletions docs/window.md
Original file line number Diff line number Diff line change
@@ -112,7 +112,7 @@ Create an `Window` object by calling the `Window()` constructor. You should give
```python
from guizero import App, Window
app = App(title="My app", height=300, width=200)
window = Window(app, title = "2nd Window", height=300, width=200)
window = Window(app, title="A new Window", height=300, width=200)
app.display()
```

@@ -124,13 +124,13 @@ app.display()
from guizero import App, Window, PushButton

def open_window():
window_2.show()
window.show()

app = App(title="My app", height=300, width=200)
window = Window(app, title = "2nd Window", height=300, width=200)
window.hide()
button = PushButton(app, text="Show second window", command=open_window)

open_button(app, text="open 2nd window", command=open_window)
window = Window(app, title="A new Window", height=300, width=200)
window.hide()

app.display()
```
@@ -139,5 +139,5 @@ If you want a `Window` to become the main window and stop all other windows resp

```python
def open_window():
window_2.show(wait = True)
window.show(wait=True)
```
46 changes: 46 additions & 0 deletions mkdocs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
site_name: guizero
theme:
name: 'litera'
extra_css: [extra.css]
nav:
- About: about.md
- Installation: index.md
- Using guizero:
- Getting started: start.md
- Using Widgets: usingwidgets.md
- Commands: commands.md
- Multiple windows: multiple_windows.md
- Layouts: layout.md
- Pop-ups: alerts.md
- Sizes: size.md
- Colors: colors.md
- Images: images.md
- Loops and sleeping: blocking.md
- Events: events.md
- Using tkinter: usingtk.md
- Getting help: gettinghelp.md
- Widgets:
- Overview: widgetoverview.md
- App: app.md
- Box: box.md
- ButtonGroup: buttongroup.md
- CheckBox: checkbox.md
- Combo: combo.md
- Drawing: drawing.md
- ListBox: listbox.md
- MenuBar: menubar.md
- Picture: picture.md
- PushButton: pushbutton.md
- Slider: slider.md
- Text: text.md
- TextBox: textbox.md
- TitleBox: titlebox.md
- Waffle: waffle.md
- Window: window.md
- Recipes: recipes.md
- Book : book.md
- Contributing:
- Notes: contributing.md
- Developing: development.md
- Deploying: deployment.md
- Change log: changelog.md