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

Upgrade rose edit to Python 3 #2808

Open
wants to merge 186 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
186 commits
Select commit Hold shift + click to select a range
07b3627
Remove dead_ends for config-edit and edit. Add in entry point for ros…
astroDimitrios Aug 2, 2024
d5f9cc1
Add config_editor dir created by running 2to3 and the pygobject conve…
astroDimitrios Aug 2, 2024
ff78b16
Convert imports and usage from rose. to metomi.rose.
astroDimitrios Aug 2, 2024
b243093
Fix double word metomi in main.py and __init__.py imports
astroDimitrios Aug 2, 2024
cb129de
Convert missed files to gtk3 and add gtk rose dir.
astroDimitrios Aug 2, 2024
d790df9
Add gtk dir.
astroDimitrios Aug 5, 2024
5f56ae4
Add Gdk import.
astroDimitrios Aug 5, 2024
5b1242f
Change import rose to import metomi.rose
astroDimitrios Aug 5, 2024
24ad9eb
Add GdkPixbuf imports.
astroDimitrios Aug 5, 2024
d69e2a2
Remove the cylc engine imports.
astroDimitrios Aug 5, 2024
2400426
Fix rose import and remove gtk version check.
astroDimitrios Aug 5, 2024
07bf1f3
Add image files for the gui.
astroDimitrios Aug 5, 2024
67ee157
Update resource locations in main.py for rose.
astroDimitrios Aug 7, 2024
f41fd83
Update usage of Pango parse_markup().
astroDimitrios Aug 7, 2024
63b97da
Update vbox code in gtk/dialog.py.
astroDimitrios Aug 7, 2024
d676af6
Change window top level function call.
astroDimitrios Aug 7, 2024
e157798
Update dialog.py scrollbar code.
astroDimitrios Aug 7, 2024
6f2c906
Update pango parse_markup() in gtk/util.py.
astroDimitrios Aug 7, 2024
1ae1551
Update icons and use of Pixbuf.
astroDimitrios Aug 7, 2024
dc12b2a
Update splash.py communicate function.
astroDimitrios Aug 7, 2024
9cb36f7
Add padding to pack_start for hor Box in gtk/util.py.
astroDimitrios Aug 7, 2024
090ccff
Correct Gtk import.
astroDimitrios Aug 7, 2024
c7334c0
Menu button init fix in gtk/util.py.
astroDimitrios Aug 7, 2024
81b40bd
Image menu item fix in gtk/util.py.
astroDimitrios Aug 7, 2024
947ee80
Remove pos keyword var in call to self.uimanager.insert_action_group
astroDimitrios Aug 7, 2024
7b76445
Alter connect_group to connect.
astroDimitrios Aug 7, 2024
7e558c2
Remove extra TreeViewColumn.pack_start() call args.
astroDimitrios Aug 7, 2024
2e3b3ee
Convert xpm to png as xpm loading is now off by default in Gdk Pixbuf.
astroDimitrios Aug 7, 2024
023888a
Fix .sort() with key from custom cmp function.
astroDimitrios Aug 7, 2024
d534772
Add padding to more pack_start() calls.
astroDimitrios Aug 7, 2024
63a9950
Remove xpm reference and replace with png.
astroDimitrios Aug 7, 2024
b663930
Remove styling temporarily.
astroDimitrios Aug 7, 2024
a1fc94e
Fix window default icon list.
astroDimitrios Aug 7, 2024
0b7ee7e
Fix more pack_start() padding calls.
astroDimitrios Aug 7, 2024
c2ab3d4
Fix subprocess communicate in splash.py.
astroDimitrios Aug 8, 2024
dda60f4
Open splash as a separate rose command / process.
astroDimitrios Aug 8, 2024
b251cc3
Set splash screen gravity.
astroDimitrios Aug 8, 2024
6ca2fce
Fix Image new_from_file_call.
astroDimitrios Aug 8, 2024
e944c11
Remove cmp and positional arg from sort.
astroDimitrios Aug 9, 2024
3962815
Remove sort positional arg in menu.py.
astroDimitrios Aug 9, 2024
49bd8f3
Remove cmp from util.py.
astroDimitrios Aug 9, 2024
6aa4697
Add data empty input arg for the get_should_show visibility function.
astroDimitrios Aug 9, 2024
a6952c9
Fix data_helper sort with positional arg.
astroDimitrios Aug 9, 2024
8a9e94a
Fix _get_should_show call.
astroDimitrios Aug 9, 2024
b1ae274
Remove spurious print and fix sort().
astroDimitrios Aug 9, 2024
20e6b70
Update splash screen communication.
astroDimitrios Aug 9, 2024
6d97c26
Gtk.VBox changed to GtkBox(...VERTICAL) and padding option added to a…
J-J-Abram Aug 12, 2024
6794e89
Gtk.HBox changed to GtkBox(...HORIZONTAL) and padding option added to…
J-J-Abram Aug 12, 2024
b50536f
Replacing all remaining instances of VBox and HBox throughout directo…
J-J-Abram Aug 12, 2024
ddf535b
Merge pull request #3 from astroDimitrios/feature/VBox_HBox-removal
astroDimitrios Aug 12, 2024
e4b7774
Update splash screen code so that it closes properly.
astroDimitrios Aug 12, 2024
277eb0a
Merge branch 'feature/rose-config-py3' of github.com:astroDimitrios/r…
astroDimitrios Aug 12, 2024
459cc02
replacing instances of cmp() and updating .sort() to .sort(key=...), …
J-J-Abram Aug 12, 2024
7342cf8
Merge branch 'feature/rose-config-py3' into feature/cmp_replace
astroDimitrios Aug 12, 2024
e5190db
Merge pull request #4 from astroDimitrios/feature/cmp_replace
astroDimitrios Aug 12, 2024
6c3454a
Add padding to pack_start calls.
astroDimitrios Aug 12, 2024
5f8f678
Fix colour of vidget.
astroDimitrios Aug 12, 2024
81e0cd9
Remove colour info and set via css.
astroDimitrios Aug 12, 2024
8878674
Add padding to pack_start and pack_end
astroDimitrios Aug 12, 2024
9ce9c7c
Remove style / colour code
astroDimitrios Aug 12, 2024
8700c23
Fix get_size etc code for widgets
astroDimitrios Aug 12, 2024
9998a4e
Add padding to pack_start
astroDimitrios Aug 12, 2024
5953037
TreeView pack_start args fix
astroDimitrios Aug 12, 2024
60cc0b5
Fix more pack_start calls
astroDimitrios Aug 12, 2024
5fa01e2
Temp fix for select_row
astroDimitrios Aug 12, 2024
76a49dc
Replace size_request call
astroDimitrios Aug 12, 2024
f84aab1
Add in 6th arg BaseSummaryDataPanel function
astroDimitrios Aug 12, 2024
612dced
Fix more pack_start
astroDimitrios Aug 12, 2024
5e285d6
Fix pack start
astroDimitrios Aug 12, 2024
2778235
Import python_list correctly and fix padding in pack_start
astroDimitrios Aug 12, 2024
1a19718
Remove more colour info
astroDimitrios Aug 12, 2024
900ea49
Pango underline fix
astroDimitrios Aug 12, 2024
bae2cd7
Remove Gtk.Arrow
astroDimitrios Aug 13, 2024
6c849e1
Fix use of text buffer in TextView
astroDimitrios Aug 13, 2024
8b6f38e
Fix style
astroDimitrios Aug 13, 2024
69057ea
Fix Pango attribute code in the keywidget
astroDimitrios Aug 13, 2024
b161bfc
Fix pack_start
astroDimitrios Aug 13, 2024
6c32af5
Change rose. to metomi.rose.
astroDimitrios Aug 13, 2024
fb8e5dd
Formatting fix
astroDimitrios Aug 13, 2024
ebc9b82
Change rose. to metomi.rose.
astroDimitrios Aug 13, 2024
ec446b8
Fix 2 button press
astroDimitrios Aug 13, 2024
3786208
Fix text buffer call
astroDimitrios Aug 13, 2024
94a5670
Remove size_request()
astroDimitrios Aug 13, 2024
ea67837
Fix flags including SENSITIVE
astroDimitrios Aug 13, 2024
fd56615
Fix scrollbar adjustment
astroDimitrios Aug 13, 2024
72c8b36
Fix sort in util.py
astroDimitrios Aug 13, 2024
b00ad0d
Fix popup call in MenuWidget
astroDimitrios Aug 13, 2024
a1705c2
Fix insert_action_group call in MenuWidget
astroDimitrios Aug 13, 2024
079d0e4
Fix console pack_start calls
astroDimitrios Aug 14, 2024
b01ee3e
Fix sort
astroDimitrios Aug 14, 2024
e74e03c
Fix get child focus attribute
astroDimitrios Aug 14, 2024
c01e447
Fix sort
astroDimitrios Aug 14, 2024
bd9fb56
Fix log level for plain text message
astroDimitrios Aug 14, 2024
71f24cc
#11 Feature/button removal
J-J-Abram Aug 14, 2024
c258858
Fix import
astroDimitrios Aug 14, 2024
b107e6a
Fix get focus child calls
astroDimitrios Aug 14, 2024
9abd3a7
Fix rose import
astroDimitrios Aug 14, 2024
b50b4cd
Import submodules
astroDimitrios Aug 14, 2024
4b9b2a4
Fix pack_start calls
astroDimitrios Aug 14, 2024
7866c29
Fix calls to _set_cell_*
astroDimitrios Aug 14, 2024
ae8c813
Fix pack_start
astroDimitrios Aug 14, 2024
ba2d88a
Fix maths in widget
astroDimitrios Aug 14, 2024
5c82d7b
Merge branch 'feature/rose-config-py3' of github.com:astroDimitrios/r…
astroDimitrios Aug 14, 2024
9f32ce0
Fix keywidget VBox
astroDimitrios Aug 15, 2024
7a778aa
Remove ImageMenuItem
astroDimitrios Aug 15, 2024
e0aa5aa
Remove ImageMenuItem
astroDimitrios Aug 16, 2024
a0fa0fa
Fix credit/about dialog
astroDimitrios Aug 19, 2024
3d32fe9
Fix insert_action_group() calls
astroDimitrios Aug 19, 2024
4fac5cf
Fix launch menu popup in page.py
astroDimitrios Aug 19, 2024
649f177
Fix insert_action_group() call
astroDimitrios Aug 19, 2024
2019895
Fix .sort call
astroDimitrios Aug 19, 2024
e2c25cd
Set styling for the page tabs
astroDimitrios Aug 19, 2024
8b6f2a7
Fix Pango underlining
astroDimitrios Aug 19, 2024
8746e9b
Fix pack_start call
astroDimitrios Aug 19, 2024
bb711cb
Fix get_focus_child call
astroDimitrios Aug 19, 2024
a3eb8e6
#16 Fix orientation of boxes that used to be VBox()
J-J-Abram Aug 19, 2024
192111c
Fix sort() call
astroDimitrios Aug 19, 2024
b99b3e3
Fix get_focus_child() call
astroDimitrios Aug 19, 2024
1c80c07
Fix .popup call
astroDimitrios Aug 19, 2024
a645b48
Fix issue with duplicate ns sorting app 10
astroDimitrios Aug 19, 2024
fd87f1e
Fix accelerator connection
astroDimitrios Aug 19, 2024
dc62ff0
Fix get_upper etc calls
astroDimitrios Aug 19, 2024
6304b44
Fix get_upper etc calls
astroDimitrios Aug 19, 2024
aef9762
Fix pack start call
astroDimitrios Aug 19, 2024
b231a7d
Fix page tab names
astroDimitrios Aug 19, 2024
04cba40
Fix dict key access
astroDimitrios Aug 19, 2024
e53ee80
Use size var for size of Icon not hard coded value
astroDimitrios Aug 19, 2024
83704f2
Fix pack_start call
astroDimitrios Aug 19, 2024
dabf4a7
Fix sort call
astroDimitrios Aug 19, 2024
166c826
Fix inspect module calls
astroDimitrios Aug 19, 2024
fd94c2f
Fix pack start calls
astroDimitrios Aug 19, 2024
0e9dd14
Fix use of size_request()
astroDimitrios Aug 19, 2024
93c3dd2
Remove top and bottom border from main page window
astroDimitrios Aug 20, 2024
c9f1774
Replace Dialog Question stock id
astroDimitrios Aug 27, 2024
f7bd1d0
Fix macro button and submenu
astroDimitrios Aug 27, 2024
7607701
Fix to deal with comparison of NoneTypes and strings - None for secti…
astroDimitrios Aug 27, 2024
9a7328b
Fix for internal link focusing
astroDimitrios Aug 27, 2024
da29ebe
Fix sort argument
astroDimitrios Aug 27, 2024
f9bc0b5
Fix dialog icon in top menu bar
astroDimitrios Aug 27, 2024
4c20af7
Fix rose-gtk icons for CustomButtons
astroDimitrios Aug 27, 2024
b1a1dfa
Fix incorrect Image code
astroDimitrios Aug 27, 2024
0845409
Fix sort() calls
astroDimitrios Aug 27, 2024
7205e68
Remove cylc code
astroDimitrios Aug 27, 2024
727abde
Remove min pygtk version code
astroDimitrios Aug 27, 2024
8c9cb02
#20 All references to popup() changed to gtk_menu_popup_at_widget
J-J-Abram Sep 10, 2024
e0363ec
Fix popup at widget calls
astroDimitrios Sep 23, 2024
f4bd9d3
Fix gravity arguments for popup widget calls
astroDimitrios Sep 23, 2024
20c47e1
Fix pack start calls
astroDimitrios Sep 23, 2024
8b1fec0
Fix popup at widget call by importing Gdk for the gravity arguments
astroDimitrios Sep 23, 2024
0a04977
Fix invisible package menu text on the UM stash summary data panel
astroDimitrios Sep 23, 2024
1080e35
Add extra arg to visibility related functions in stash.py
astroDimitrios Sep 23, 2024
5c7a1d1
Fix pack start calls
astroDimitrios Sep 23, 2024
bf35334
Fix invisible text in stash_add / add stashdiagnosticspanel
astroDimitrios Sep 23, 2024
7ac2218
Fix incorrect call to 2 button press event
astroDimitrios Sep 23, 2024
03e943d
Fix popup at widget gravity arguments
astroDimitrios Sep 23, 2024
ad0b127
Remove accidental comment in summary_data.py
astroDimitrios Sep 23, 2024
25ef8b4
Remove entry box coral colour for Oliver
astroDimitrios Sep 23, 2024
75771a3
Update importlib code when importing custom widgets in resource.py
astroDimitrios Sep 23, 2024
8df60a4
Change search box from an Entry to a SearchEntry box and add default …
astroDimitrios Sep 24, 2024
f2bfd21
Add pygobject as a rose-edit dependency for install (#35)
astroDimitrios Sep 25, 2024
aa545d8
Removing all references to pygtk (#41)
J-J-Abram Sep 25, 2024
f08916b
Feature/33 separator (#42)
J-J-Abram Sep 27, 2024
ab74d43
Move GUI image resources into package (#43)
jfrost-mo Sep 27, 2024
8350739
turorial username file updated to gtk3 and python3 (#45)
J-J-Abram Oct 3, 2024
a24f04a
Re-enable plotting of Metadata graphs
astroDimitrios Oct 17, 2024
d1462c9
Merge branch 'feature/rose-config-py3' of github.com:astroDimitrios/r…
astroDimitrios Oct 17, 2024
aee6d9c
Update css comment for making widgets distinct from each other with a…
astroDimitrios Oct 17, 2024
4043694
Update setter functions to fix python list formatting (#46)
J-J-Abram Oct 17, 2024
7363a43
Fix array widget bug which forced widgets to scroll off screen when a…
astroDimitrios Oct 17, 2024
cc41819
Merge branch 'feature/rose-config-py3' of github.com:astroDimitrios/r…
astroDimitrios Oct 17, 2024
dd96cd9
Merge branch 'metomi:master' into feature/rose-config-py3
astroDimitrios Oct 17, 2024
ea2db96
Black format the gui code
astroDimitrios Oct 22, 2024
1e4a17d
Merge branch 'feature/rose-config-py3' of github.com:astroDimitrios/r…
astroDimitrios Oct 22, 2024
fbfc775
Fix line length issues
astroDimitrios Oct 22, 2024
e60987e
Change ambiguous variable name l
astroDimitrios Oct 29, 2024
627f0aa
Add noqa comment on Gtk import to set INTERACTIVE_ENABLED
astroDimitrios Oct 29, 2024
38c158f
Remove unused imports
astroDimitrios Oct 29, 2024
03f657c
Fix undefined name radio_button issue flake8 F821
astroDimitrios Oct 29, 2024
59740e3
Removing instances of 'SuiteRunner' for flake8 undefined name F821 ch…
J-J-Abram Oct 29, 2024
1b887d7
Addressing half of the flake8 issues in config_editor (#49)
J-J-Abram Oct 29, 2024
955d492
Fix flake8 issues
astroDimitrios Oct 29, 2024
0f32917
Merge branch 'feature/rose-config-py3' of github.com:astroDimitrios/r…
astroDimitrios Oct 29, 2024
7292832
Add noqa comment for line length errors when importing from metomi.ro…
astroDimitrios Oct 29, 2024
5f72b76
Remove reference to no GUI in the README
astroDimitrios Oct 29, 2024
18dd61f
Remove no Rose 2 GUI warning in the Sphinx docs
astroDimitrios Oct 29, 2024
867c159
Fix flake8 errors in resource.py and reporter.py
astroDimitrios Oct 29, 2024
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ etc/opt
doc
venv
metomi_rose.egg-info
build
dist
node_modules

Expand Down
18 changes: 9 additions & 9 deletions ACKNOWLEDGEMENT.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
Licences for non-Rose works included in this distribution can be
found in the licences/ directory.

etc/images/rose-icon.png,
etc/images/rose-icon.svg,
etc/images/rose-icon-trim.png,
etc/images/rose-icon-trim.svg,
etc/images/rose-logo.png,
etc/images/rosie-icon.png,
etc/images/rosie-icon.svg,
etc/images/rosie-icon-trim.png,
etc/images/rosie-icon-trim.svg,
metomi/rose/etc/images/rose-icon.png,
metomi/rose/etc/images/rose-icon.svg,
metomi/rose/etc/images/rose-icon-trim.png,
metomi/rose/etc/images/rose-icon-trim.svg,
metomi/rose/etc/images/rose-logo.png,
metomi/rose/etc/images/rosie-icon.png,
metomi/rose/etc/images/rosie-icon.svg,
metomi/rose/etc/images/rosie-icon-trim.png,
metomi/rose/etc/images/rosie-icon-trim.svg,
metomi/rose/etc/rose-all/etc/images/icon.png,
metomi/rose/etc/rose-meta/rose-all/etc/images/icon.png
* These icons are all derived from the public domain image at
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Rose: a framework for managing and running meteorological suites.
#### Rose 2

- Python 3
- No GUIs
- PyGObject GUI
- Web-based GUIs will follow in later Rose 2 releases
- `master` branch in the source code

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ values=1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21
description=A variable with 5 values (& value-titles) using radiobuttons
value-titles=A title, B title, C title, D title, E title
values='a', 'b', 'c', 'd', 'e'
widget[rose-config-edit]=rose.config_editor.valuewidget.radiobuttons.RadioButtonsValueWidget
widget[rose-config-edit]=metomi.rose.config_editor.valuewidget.radiobuttons.RadioButtonsValueWidget

[namelist:nl2]
duplicate=true
Expand All @@ -194,7 +194,7 @@ values=4

[namelist:table_nl]
description=A page containing a custom table layout
widget[rose-config-edit]=rose.config_editor.pagewidget.table.PageArrayTable
widget[rose-config-edit]=metomi.rose.config_editor.pagewidget.table.PageArrayTable

[namelist:table_nl=my_boolean_array]
description=A boolean array of length 5
Expand Down
Loading
Loading