Upgrade rose edit to Python 3 #2808

astroDimitrios · 2024-09-10T14:48:56Z

As discussed this change updates rose config-edit (or just rose edit) to Python 3 / Gtk3.

First commit having run 2to3 and Pygobject over the old code 6a49dd7
Same for the gtk dir 8bccdcf
Splash screen updates 20ade08
Popup fixes in the MenuWidget 807bc56
Fix macro menus ed0780e

All seems to function par some cosmetic bugs which are outlined in the Issues on my fork.

oliver-sanders · 2024-10-31T11:07:08Z

Wow!

oliver-sanders

Have made a first pass over the code, looking good.

There's 186 commits here! We could do with squashing these down a bit to make it a bit more manageable.

metomi/rose/gtk/dialog.py

metomi/rose/gtk/util.py

metomi/rose/config_editor/status.py

metomi/rose/gtk/splash.py

metomi/rose/etc/rose-config-edit/style.css

metomi/rose/resource.py

oliver-sanders · 2024-10-31T13:06:53Z

metomi/rose/config_editor/valuewidget/array/entry.py

+        val_array = []
+        # Prevent str without "" breaking the underlying Python syntax
+        for e in self.entries:
+            v = e.get_text()
+            if v in ("False", "True"): # Boolean
+                val_array.append(v)
+            elif (len(v) == 0) or (v[:1].isdigit()): # Empty or numeric
+                val_array.append(v)
+            elif not v.startswith('"'): # Str - add in leading and trailing "
+                val_array.append('"' + v + '"')
+                e.set_text('"' + v + '"')
+                e.set_position(len(v)+1)
+            elif (not v.endswith('"')) or (len(v) == 1): # Str - add in trailing "
+                val_array.append(v + '"')
+                e.set_text(v + '"')
+                e.set_position(len(v))
+            else:


@oliver-sanders, please go through this.

metomi/rose/config_editor/nav_panel_menu.py

metomi/rose/config_editor/__init__.py

…e config-edit and an alias for edit.

…rsion script on Rose 2019.

Move GUI image resources into package (#43) This means that they get included in the wheel file when the package is built, and they actually get found at runtime. Fixes #37

* Fixes window top level function call * Fixes accelerator connection * Adds empty input arg for visibility functions * Fixes 2 button press usage * Fixes text buffer call * Fixes use of text buffer in TextView * Fixes select_row code * Fixes flags including SENSITIVE * Fixes insert_action_group calls * Fixes calls to _set_cell_* * Fixes page tab names * Adds in 6th arg to BaseSummaryDataPanel function for visibility functions

* Fixes inspect module calls * Fixes dict key access

Fix array widget bug which forced widgets to scroll off screen when adding an array element

* Menu button init fix in gtk/util.py. * Fix window default icon list. * Replaces Dialog Question stock id

…..HORIZONTAL), and padding option added

Feature/33 separator (#42) * 33 vertical padding added to widgets for a 'soft' distinction * Vertical padding removed, line distinctions added using css styling Removes top and bottom border from main page window

…arrays

* Removed 'Run Suite...' Button * Removed Launch Suite Control _GUI from the 'Tools' dropdown, but Launch Suite Control GUI still exists in the files, need to investigate what this controls in the GUI * Remove 'Launch Suite Control GUI' button with no icon * Removed 'View Output' Button from taskbar * removed comments related to 'View Output' Button * Removed all 'Run Suite' functionality from the 'Tools' dropdown menu * Removed remaining comments related to Run Suite * 'View Output' removed from 'Tools' dropdown menu

Fixes issue with duplicate ns sorting app 10

If either section or option in the namespace (ns) are None then this doesn't sort properly with other values. This change ensures None is converted to a string to compare with normal string section/option values.

Fixes invisible text in the stash diag panel

…text "Search"

…se-edit Removes tests for Python 3.7

…le for Rose 2.0 Removes the extra rose config-edit section from the rose api docs and prevented the splash-screen entry points getting into the docs

… rose help

oliver-sanders · 2024-12-10T14:42:50Z

There are some flaky tests lurking in the battery at the moment (nothing to do with this PR), the following Mac OS failures can be ignored:

02-360day-cycling
13-app-arch-cmd-out
30-app-arch-opt-source

oliver-sanders

Sorry for the delay, back looking at this...

Have tested this out on Mac OS using conda install gtk3 pygobject, worked a charm. Much, much easier to install than the old version 🚀

Anyway looking good 👍

I did find some issues during testing, a couple of tracebacks and some minor things (some of which might just go on the issue tracker for another day)....

1) The "file" sections don't seem to be working:

I did hit this issue when I tried to open any of the file sections:

2) The right-click menu for "duplicate" items is too narrow and has broken icons

Example: demo-meta/10-duplicate/namelist/strawberry icecream

Spotted one minor thing with "duplicate" items (see example in the demo metadata), where the right click menu opened too narrow to display the whole text:

The icons seem to be scrambled too.

3) Multi-line text fields raise traceback when edited

Example: demo-meta/01-types/namelist/manytypes/my_raw_with_newlines

4) Focusing on a long text box causes horizontal scrolling

Example: demo-meta/01-types/namelist/many types/my_char

Before clicking on the text box:

After clicking on the text box (Rose 2019 didn't scroll horizontally in this situation):

5) char types get quotes added when focused

Example: demo-meta/01-types/namelist/many types/my_char_array

Before I click on the text box, there are no quote symbols in it. After I click in the text box, quote symbols appear:

(left: this PR, right: deployed Rose 2019)

I need to double check this one as I have some vague memory that we changed something to do with the quotes for char types at some point...

6) Scrolls to the top of the page when warnings are raised on field change

Example: demo-meta/01-types/namelist/many types/my_int_range

Before changing the value from 2->3 (by pressing the increment button):

After pressing the increment button (scrolls to the top of the page):

7) Raw strings don't change appearance when env vars are present

Example: demo-meta/01-types/namelist/many types/my_raw

(left: this PR, right: deployed Rose 2019)

The field used to go purple to show that an environment variable is present. This is useful information for the user as some checks cannot be performed when env vars are present.

8) Bug fixed: adding an item to a char array caused a crash

Example: demo-meta/01-types/namelist/many types/my_repeat_char_array

I spotted one bug in the old GUI that has been fixed on this branch 👏, thanks! Adding an item to the array caused a crash!

9) Clicking anywhere in my_repeat_real_array causes it to be flagged as an error

Example: demo-meta/01-types/namelist/many types/my_real_repeat_array

10) Widget changed for multiple select

Example: demo-meta/01-types/namelist/many types/my_values_lots_toggle

Used to be a dropdown, now it's a radio button list.

oliver-sanders added this to the 2.4.0 milestone Sep 11, 2024

oliver-sanders added the UI label Sep 11, 2024

oliver-sanders assigned astroDimitrios Sep 11, 2024

astroDimitrios marked this pull request as ready for review October 29, 2024 15:58

oliver-sanders self-requested a review October 31, 2024 11:06

oliver-sanders reviewed Oct 31, 2024

View reviewed changes

jfrost-mo mentioned this pull request Oct 31, 2024

Add James Frost to contributors #2823

Merged

astroDimitrios force-pushed the feature/rose-config-py3 branch 3 times, most recently from 5684ff9 to 4cf6267 Compare November 27, 2024 13:11

J-J-Abram force-pushed the feature/rose-config-py3 branch from d7fb376 to 07cd350 Compare November 27, 2024 15:36

astroDimitrios force-pushed the feature/rose-config-py3 branch from 5684ff9 to 2dddf66 Compare November 27, 2024 16:37

astroDimitrios added 4 commits November 27, 2024 16:44

Remove dead_ends for config-edit and edit. Add in entry point for ros…

da547eb

…e config-edit and an alias for edit.

Add config_editor dir created by running 2to3 and the pygobject conve…

6a49dd7

…rsion script on Rose 2019.

Convert imports and usage from rose. to metomi.rose.

9b87d7b

Convert missed files to gtk3 and add gtk rose dir.

8bccdcf

astroDimitrios force-pushed the feature/rose-config-py3 branch from 2dddf66 to c7c5cb4 Compare November 27, 2024 16:45

astroDimitrios and others added 12 commits November 27, 2024 17:00

Adds image resources for the gui.

d487df3

Move GUI image resources into package (#43) This means that they get included in the wheel file when the package is built, and they actually get found at runtime. Fixes #37

Updates Pango parse_markup and underline usage

7df4f16

Python 2 to 3 fixes

319fe41

* Fixes inspect module calls * Fixes dict key access

Updates scrollbar code.

6d44bfc

Fix array widget bug which forced widgets to scroll off screen when adding an array element

Fixes Icons for buttons, windows and Icon IDs

37eab9b

* Menu button init fix in gtk/util.py. * Fix window default icon list. * Replaces Dialog Question stock id

Fixes the Rose Gui splash screen

20ade08

Gtk.VBox changed to GtkBox(...VERTICAL), Gtk.HBox changed to GtkBox(.…

58781a3

…..HORIZONTAL), and padding option added

Removes hard coded styling and replaces with css

f1bc4e0

Feature/33 separator (#42) * 33 vertical padding added to widgets for a 'soft' distinction * Vertical padding removed, line distinctions added using css styling Removes top and bottom border from main page window

Fixes widget size related calls

4dee168

Fixes pack_start calls

d3bcd55

Removes Gtk.Arrow usage

2a68a90

astroDimitrios added 3 commits November 27, 2024 17:18

Fixes log level for plain text messages

40197b5

Imports submodules in the valuewidget array __init__ file

2682083

Fixes the maths in the array widget calculating the row for multirow …

7d20ddc

…arrays

astroDimitrios force-pushed the feature/rose-config-py3 branch 2 times, most recently from c5a6ee7 to edd7db0 Compare November 27, 2024 17:54

astroDimitrios requested a review from oliver-sanders November 27, 2024 18:05

oliver-sanders modified the milestones: 2.4.0, 2.5.0 Dec 3, 2024

J-J-Abram and others added 19 commits December 10, 2024 14:14

Fixes credit/about dialog

df8aa9b

Fixes sort calls removing cmp usage

b88d04f

Fixes issue with duplicate ns sorting app 10

Fixes macro button and submenu

c3c4861

Fix to deal with comparison of NoneTypes and strings

c7d7e0c

If either section or option in the namespace (ns) are None then this doesn't sort properly with other values. This change ensures None is converted to a string to compare with normal string section/option values.

Removing all references to pygtk (#41)

8c4278d

Fixes popup() calls to GTK3 equivalents

acaf04e

Fixes to the UM stash panel

de676dd

Fixes invisible text in the stash diag panel

Update importlib code when importing custom widgets in resource.py

8af1bdf

Change search box from an Entry to a SearchEntry box and add default …

3acecb9

…text "Search"

Add pygobject as a rose-edit dependency for install (#35)

3223b2c

Re-enable plotting of Metadata graphs

9f7f17a

Tutorial username file updated to GTK3 and Python3 (#45)

e068eac

Update setter functions to fix python list formatting (#46)

5049f43

Black formats the gui code and limits line length

59cecf7

Fixes MyPy error in data.py where the exc variable was being overwritten

77da834

Updates the test workflow to install the required dependencies for ro…

57f183b

…se-edit Removes tests for Python 3.7

Removes references in the README and the docs to no GUI being availab…

5cb82db

…le for Rose 2.0 Removes the extra rose config-edit section from the rose api docs and prevented the splash-screen entry points getting into the docs

Prevents the launch-splash-screen internal cli being shown when using…

f345292

… rose help

astroDimitrios force-pushed the feature/rose-config-py3 branch from 8d1aef1 to f345292 Compare December 10, 2024 14:15

oliver-sanders reviewed Jan 6, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Upgrade rose edit to Python 3 #2808

Upgrade rose edit to Python 3 #2808

astroDimitrios commented Sep 10, 2024 •

edited

Loading

oliver-sanders commented Oct 31, 2024

oliver-sanders left a comment

oliver-sanders Oct 31, 2024

oliver-sanders commented Dec 10, 2024

oliver-sanders left a comment •

edited

Loading

Upgrade rose edit to Python 3 #2808

Are you sure you want to change the base?

Upgrade rose edit to Python 3 #2808

Conversation

astroDimitrios commented Sep 10, 2024 • edited Loading

oliver-sanders commented Oct 31, 2024

oliver-sanders left a comment

Choose a reason for hiding this comment

oliver-sanders Oct 31, 2024

Choose a reason for hiding this comment

oliver-sanders commented Dec 10, 2024

oliver-sanders left a comment • edited Loading

Choose a reason for hiding this comment

1) The "file" sections don't seem to be working:

2) The right-click menu for "duplicate" items is too narrow and has broken icons

3) Multi-line text fields raise traceback when edited

4) Focusing on a long text box causes horizontal scrolling

5) char types get quotes added when focused

6) Scrolls to the top of the page when warnings are raised on field change

7) Raw strings don't change appearance when env vars are present

8) Bug fixed: adding an item to a char array caused a crash

9) Clicking anywhere in my_repeat_real_array causes it to be flagged as an error

10) Widget changed for multiple select

astroDimitrios commented Sep 10, 2024 •

edited

Loading

oliver-sanders left a comment •

edited

Loading