OS2 World Community Forum

OS/2, eCS & ArcaOS - Technical => Applications => Topic started by: Martin Iturbide on November 30, 2023, 06:31:04 am

Title: DSSaver and XWP
Post by: Martin Iturbide on November 30, 2023, 06:31:04 am
Hello.

It seems that the Doodle Screen Saver settings page does not respect the XWP font size.
I was thinking to open a ticket. Any suggestions about it?

Regards
Title: Re: Re: XWP v1.0.16
Post by: Dave Yeo on November 30, 2023, 07:53:55 am
Try this msg file, had to zip it to post.
Replace the current X:\SYS\apps\DSSaver\Lang\ss_en.msg with the one in the zip and test. Note that this is only for the properties and I simply commented out the hard coded 9.Warpsans, Doodle originally hard coded Helvetica and I changed it to Warpsans. All the other languages and module languages would need the same change.
Edit: Might need to restart the Desktop to use the updated msg file, not sure so try it by closing and opening the properties first.
Title: Re: Re: XWP v1.0.16
Post by: Rich Walsh on November 30, 2023, 09:23:34 pm
Try this msg file, had to zip it to post.
Replace the current X:\SYS\apps\DSSaver\Lang\ss_en.msg with the one in the zip and test. Note that this is only for the properties and I simply commented out the hard coded 9.Warpsans,

Thank you, Dave!!  The DSS pages were a concern when getting XWP "Text Size" going - I'm glad to see the fix is so easy. Now, can we get together and rearrange a few things so those pages aren't so crazy-big?
Title: Re: Re: XWP v1.0.16
Post by: Dave Yeo on December 01, 2023, 01:46:32 am
Thank you, Dave!!  The DSS pages were a concern when getting XWP "Text Size" going - I'm glad to see the fix is so easy. Now, can we get together and rearrange a few things so those pages aren't so crazy-big?

Actually it is simpler then I first thought as it is only the WPS msg files (one for each language) that need changing. Not sure why Doodle hard coded the font.
Open to suggestions on making those pages smaller.
Title: Re: Re: XWP v1.0.16
Post by: Alfredo Fernández Díaz on December 07, 2023, 09:18:50 pm
Actually it is simpler then I first thought as it is only the WPS msg files (one for each language) that need changing. Not sure why Doodle hard coded the font.
Confirmed. I just replaced "9.WarpSans" with "" in all ss_es.txt PG*_FONT strings, and the DSS notebook tabs resize along with everything else now. (Edit: Re: the hard-coded font it might be related to DBCS support IIRC.)

Is Comet Cursor on XWorkplace, AMouse, or is old IBM code that can not be updated?
None. It is old IBM code that is easy to update (; this is the comet cursor tab using a larger font:
(http://WPComet.png)
Title: Re: Re: XWP v1.0.16
Post by: Dave Yeo on December 07, 2023, 11:32:20 pm
Actually it is simpler then I first thought as it is only the WPS msg files (one for each language) that need changing. Not sure why Doodle hard coded the font.
Confirmed. I just replaced "9.WarpSans" with "" in all ss_es.txt PG*_FONT strings, and the DSS notebook tabs resize along with everything else now. (Edit: Re: the hard-coded font it might be related to DBCS support IIRC.)

Yea, at the bottom of the txt files is, (now commented out)
Code: [Select]
// Font to use (for DBCS support)
// MOD_0007="9.WarpSans";
Which without access to a DBCS system, I'm not sure about.
Here's all the language stuff for the properties notebook, note that I started upgrading the help again, will need translating, diff enclosed. I've already removed the 9.Warpsans from the language files.
To create a msg file, "msgc.exe ss_es.txt" for example.
Title: Re: Re: XWP v1.0.16
Post by: Alfredo Fernández Díaz on December 08, 2023, 08:53:03 pm
Yea, at the bottom of the txt files is, (now commented out)
Code: [Select]
// Font to use (for DBCS support)
// MOD_0007="9.WarpSans";
Which without access to a DBCS system, I'm not sure about.
Current ArcaOS 5.1 beta has a Traditional Chinese version, which is the only DBCS translation currently available for DSS. I could check myself, but I can't read Chinese and I'm not familiar with the code so I would not even know what to look at, or whether the font stuff is working.
Title: Re: Re: XWP v1.0.16
Post by: Alex Taylor on December 09, 2023, 02:26:12 am
FTR, hard coding "9.WarpSans" as a font for DBCS systems makes no sense whatsoever and I can't imagine any useful thing that doing so could ever have accomplished.

FWIW, if there's something I can usefully test on a DBCS system (TW or otherwise), let me know.
Title: Re: Re: XWP v1.0.16
Post by: Dave Yeo on December 09, 2023, 04:54:04 am
FTR, hard coding "9.WarpSans" as a font for DBCS systems makes no sense whatsoever and I can't imagine any useful thing that doing so could ever have accomplished.

FWIW, if there's something I can usefully test on a DBCS system (TW or otherwise), let me know.

Well, what happens if a SBCS locale such as en_CA is dropped on an object such as the screensavers properties page, on a DBCS system?
I know doing it the other way results in still showing English on pages 1 and 2 and some of the modules on page 3 with the rest showing various characters. Perhaps bad translation? Perhaps you could check on a DBCS system how zh_TW looks.
Notice the Cairo Clock is missing the glyphs to display the month as well with zh_TW on a Canadian system, perhaps should be using a different font there, or somehow it could be like the POSIX locale, currently displays 23/12/08 instead of, for en_CA, Fri Dec 08, 2023.
Edit: BTW, zh_TW has 10.System Proportional Combined hard coded
Title: Re: Re: XWP v1.0.16
Post by: Alfredo Fernández Díaz on December 09, 2023, 10:54:31 pm
Dave, in the process of splitting your quotes to reply, a couple of things slipped away:

Open to suggestions on making those pages smaller.

To me, the two quickest and most obvious suggestions would be:

-For General parameters, change

[ ] Screen saving enabled
Start saver after [nn] minute(s) of inactivity

to

[ ] Launch automatically after [nn] minute(s) of inactivity

or something similar, and

-In the Modules page, the description MLE is always half-empty or emptier, so shrink it vertically to that size and put it on top of the preview window, and put them both on the right column, with a stretched modules list on the left.

Just my two cents.

[...] I started upgrading the help again, will need translating, diff enclosed.

Please give me a heads up when it's done, to update the translation.

Edit: suppressed special chars that activated unwanted HTML above : /
Title: Re: Re: XWP v1.0.16
Post by: Dave Yeo on December 10, 2023, 04:55:14 am
Martin, could you split the screensaver stuff into a separate topic? Continuing discussion on the topic would be off topic here.
Title: Re: DSSaver and XWP
Post by: Martin Iturbide on December 10, 2023, 05:47:30 am
Hi Dave.  I tried to split it the best I can.

Regards
Title: Re: DSSaver and XWP
Post by: Dave Yeo on December 10, 2023, 06:12:58 am
Thanks Martin, seems good.
Title: Re: Re: XWP v1.0.16
Post by: Rich Walsh on December 10, 2023, 05:35:23 pm
can we get together and rearrange a few things so those pages aren't so crazy-big?

Here's what I would propose (and I'm willing to do the work to implement it if you wish):

Page 1 would be the current "General Settings" above and the "DPMS Settings" below (minus the excessive space between the checkboxes).

Page 2 would be "Password Protection". Note that this grouping by itself is nearly as tall as the tallest current n/b page (the View pages).

Page 3 would be the same contents just rearranged. Currently it's organized vertically but it would work better if it were layed-out horizontally: listbox and preview window side-by-side at the top, with the module info below. There are several possibilities for the locations of the checkbox and buttons, but it's hard to say what would look best until the major pieces are in place.

I think we'd probably agree that the whole "Module Information" group is far too large. The static text (now moved to the left of the MLE) could be condensed by removing the word "module". The "Supports password protection" line might be removed since every module supports it. Then too, you don't need the word "Description" - it's fairly obvious. And, of course, the MLE should be reduced to 3 or 4 lines max.

On the whole, I think this page's height could be made the same as the proposed Password page without looking at all cramped.The one thing I'd caution you against is feeling constrained by the way things are now. Just because the original author did something a particular way doesn't mean he did it _well_ - if he had, we wouldn't be having this discussion.
Title: Re: DSSaver and XWP
Post by: Dave Yeo on December 10, 2023, 08:09:25 pm
Sounds like a good plan, I'd add getting rid of the DPMS Standby and Suspend States, they don't make sense in an LCD world as LCD's only support Off. If someone has a CRT monitor and cares, they can downgrade.
The big problem is page one, which likely organically grew as things like password support was added, and we have this,
Code: [Select]
SOM_Scope BOOL SOMLINK wpssdesktopM_wpclsQuerySettingsPageSize(M_WPSSDesktop *somSelf, PSIZEL pSizl)
{
  BOOL rc;

  // Query default settings page size from parent
  rc = parent_wpclsQuerySettingsPageSize(somSelf, pSizl);
  if (rc)
  {
    // Modify the minimum height, if needed!
    // This 180 Dialog Units height seems to be okay in most cases.
    // (empirically...)
    if (pSizl->cy < 210)
      pSizl->cy = 210;
  }

  return rc;
}

I changed the 180 to 210 to get the whole of page one to show, it seems to be the only hard coded size. Lots of code that seems to rearrange things as the size of the Properties changes.
For the description box, wonder how it looks in Chinese?
I definitely don't have the skill or understanding to implement the changes, especially the SOM stuff. WPSSdesktop.c is over 5000 lines.
Played with the Universal Resource Editor last night trying to rearrange page 3, none of my changes seemed to take and the preview window must be coded.
Still need to push my latest changes, seems that my Github token doesn't work for OS2World repositories. I'll figure something out tonight, the wife wants to go to town today.
Title: Re: DSSaver and XWP
Post by: Dave Yeo on December 11, 2023, 04:58:05 am
https://github.com/dryeo/UTIL-WPS-Doodle-Screen-Saver/tree/25pre (https://github.com/dryeo/UTIL-WPS-Doodle-Screen-Saver/tree/25pre) has my latest commits. Some are likely useless and some are for my environment and also to attempt to quiet problems with line endings.
Edit: I do have the permissions to merge into the main OS2World branch and was going to but it looked like it would go to the master branch so put it off.
Title: Re: DSSaver and XWP
Post by: Martin Iturbide on December 17, 2023, 01:53:15 pm
Hi Dave.

I got this "Issue" from: https://github.com/OS2World/UTIL-WPS-Doodle-Screen-Saver/issues/5
It says to update some russian documentation files from DSSaver from Yurii.

I think there are fine, but I don't know the right location on the repository to locate them.

Regards
Title: Re: DSSaver and XWP
Post by: Dave Yeo on December 17, 2023, 05:37:47 pm
Hi Martin, I will commit them, just waiting to find out how Yurri wants the author set and see if I can make the default in moving text locale friendly.
Title: Re: DSSaver and XWP
Post by: Alfredo Fernández Díaz on December 22, 2023, 01:52:46 pm
Another area where DSS does not respect font settings, and uses its own instead, is its secondary dialogs to configure modules. No font settings in *.msg sources, though.

I tried to extract dialog resources and doff the presentation parameters (10.System Proportional, good for designing, seemingly what gets used live) from a couple of DLLs but not to avail. I also see the string "12.System Proportional" in the DLLs, which is not in the resources. Real work with the sources needed. Or I was in too much of a rush ; )
Title: Re: DSSaver and XWP
Post by: Dave Yeo on December 22, 2023, 04:40:51 pm
Seems most of the modules have this in their RC files,
Code: [Select]
PRESPARAMS PP_FONTNAMESIZE, "10.System Proportional"
PRESPARAMS PP_USER, "12.System Proportional"

In the password stuff and the configure dialog. Have to play with the Universal Resource Editor (URE).
Title: Re: DSSaver and XWP
Post by: Rich Walsh on December 22, 2023, 05:54:02 pm
Seems most of the modules have this in their RC files,
Code: [Select]
PRESPARAMS PP_FONTNAMESIZE, "10.System Proportional"
PRESPARAMS PP_USER, "12.System Proportional"

In the password stuff and the configure dialog. Have to play with the Universal Resource Editor (URE).

This is a job for a text editor, not a dialog editor. If you open the .RC file for each module, you'll find dialog templates like this one: Edit: but you already knew this
Code: [Select]
    DIALOG "Password protection", DLG_PASSWORDPROTECTION, 85, 62, 160, 45,
                FS_NOBYTEALIGN | FS_DLGBORDER | WS_CLIPSIBLINGS | WS_SAVEBITS,
                FCF_TITLEBAR | FCF_SYSMENU | FCF_CLOSEBUTTON
    PRESPARAMS PP_FOREGROUNDCOLORINDEX, CLR_BLACK
    PRESPARAMS PP_FONTNAMESIZE, "10.System Proportional"
    PRESPARAMS PP_USER, "10.System Proportional"
    BEGIN

Just remove the lines for PP_FONTNAMESIZE and PP_USER, save the file, and you're done.

Speaking of done... I'm almost done with the redesign of DSS's Desktop Properties pages. Each one is now a fixed size that fits the default dimensions of a Properties notebook. As a by-product of this effort, I was also able to lop off 1000 lines of code from the source - but it's still a bloated pig at a "mere" 4500 lines. Honestly, I've never seen so much effort expended on so little results. Another 1000-1500 lines could easily disappear and no one would ever notice...

BTW... Dave, could you PM me with your email address so I can send you some stuff?
Title: Re: DSSaver and XWP
Post by: Dave Yeo on December 22, 2023, 07:22:30 pm
This is a job for a text editor, not a dialog editor. If you open the .RC file for each module, you'll find dialog templates like this one: Edit: but you already knew this
Code: [Select]
    DIALOG "Password protection", DLG_PASSWORDPROTECTION, 85, 62, 160, 45,
                FS_NOBYTEALIGN | FS_DLGBORDER | WS_CLIPSIBLINGS | WS_SAVEBITS,
                FCF_TITLEBAR | FCF_SYSMENU | FCF_CLOSEBUTTON
    PRESPARAMS PP_FOREGROUNDCOLORINDEX, CLR_BLACK
    PRESPARAMS PP_FONTNAMESIZE, "10.System Proportional"
    PRESPARAMS PP_USER, "10.System Proportional"
    BEGIN

Just remove the lines for PP_FONTNAMESIZE and PP_USER, save the file, and you're done.

Tried commenting those lines out, rc.exe was not happy. What does seem to work is removing the font size, s/10.System Proportional/System Proportional/g.
Have to consider changing the System Proportional to WarpSans as well. There's also buttons that need the same treatment.
Title: Re: DSSaver and XWP
Post by: Rich Walsh on December 23, 2023, 02:13:19 am
Just remove the lines for PP_FONTNAMESIZE and PP_USER, save the file, and you're done.

Tried commenting those lines out, rc.exe was not happy. What does seem to work is removing the font size, s/10.System Proportional/System Proportional/g.
Have to consider changing the System Proportional to WarpSans as well. There's also buttons that need the same treatment.

I'm sorry to be difficult but none of the above is the correct way to handle this.

RC should accept /* */ comments but if it doesn't for some reason, just delete them as suggested (you can always have git revert any change). Further, generating defective entries just to get something kinda-maybe working is not helping your cause. Nor is substituting one hard-coded font for another when the goal of this exercise is to have dialogs comply with the user's choice of font & size.

Without those fonts entries, the dialog will use whatever font & size you've chosen - either because it has  inherited them from the dialog that created it (which is the way it should be), or because Styler has forced them to be system-compliant (turn off Styler's dialog enhancements to check).

Honestly, there's no need for any experimentation here - how this stuff works is fully known. If it doesn't work as it should, hacks and workarounds will only get in the way of finding the _real_ problem.
Title: Re: DSSaver and XWP
Post by: Dave Yeo on December 23, 2023, 03:47:27 am
OK, seems I screwed up the commenting :) I'll delete all the lines representing fonts in the rc files and test.
Title: Re: DSSaver and XWP
Post by: Dave Yeo on December 23, 2023, 03:53:50 am
Should the "PRESPARAMS PP_FOREGROUNDCOLORINDEX, CLR_BLACK" lines also be deleted?
Title: Re: DSSaver and XWP
Post by: Rich Walsh on December 23, 2023, 04:42:11 am
Should the "PRESPARAMS PP_FOREGROUNDCOLORINDEX, CLR_BLACK" lines also be deleted?

No, that just gives you black text rather than that wierd dark blue IBM liked.

I should be able to send you a late beta of my changes tomorrow. Attached is a screenshot of the rearranged Page 3. It's still big but all the pages fit the system-default notebook size.
Title: Re: DSSaver and XWP
Post by: Alfredo Fernández Díaz on December 23, 2023, 11:18:52 am
Seems most of the modules have this in their RC files,
Code: [Select]
PRESPARAMS PP_FONTNAMESIZE, "10.System Proportional"
PRESPARAMS PP_USER, "12.System Proportional"
Exactly, and fonts definitely change in each dialog when getting rid of both. My first try was to just extract the resources and I bumped into a problem with RDC that resulted in an unreadable PP_USER PRESPARAMS line which I kept ;(

Attached is a screenshot of the rearranged Page 3. It's still big but all the pages fit the system-default notebook size.
With this layout, I think the original "Selected module information" groupbox would be even more useful than it was to interpret how the controls inside worked together (especially without a "Description" label for the now displaced MLE).

Also, controls pretty much fill up all available space, so putting all of them in a single groupbox that merely replicates the whole tab page seems unnecessary.
Title: Re: DSSaver and XWP
Post by: Alex Taylor on December 23, 2023, 02:24:42 pm
Should the "PRESPARAMS PP_FOREGROUNDCOLORINDEX, CLR_BLACK" lines also be deleted?

What Rich said. However, I generally prefer to use scheme colours instead of fixed colours.  For example, replacing the above with
PRESPARAMS PP_FOREGROUNDCOLORINDEX, SYSCLR_WINDOWTEXT
will result in the current scheme's window-text colour (which is normally black) being used.

Beware, however, that the stupid IBM Dialog Editor will revert it to CLR_BLACK if you use it to edit and save the dialog. :/
Title: Re: DSSaver and XWP
Post by: Dave Yeo on December 23, 2023, 04:18:55 pm
Should the "PRESPARAMS PP_FOREGROUNDCOLORINDEX, CLR_BLACK" lines also be deleted?

What Rich said. However, I generally prefer to use scheme colours instead of fixed colours.  For example, replacing the above with
PRESPARAMS PP_FOREGROUNDCOLORINDEX, SYSCLR_WINDOWTEXT
will result in the current scheme's window-text colour (which is normally black) being used.

OK, I was wondering about the scheme colours. Good to know, though there are 2 places blue is used, configuring Pretty Clock and IFS in Motion. Probably look OK without the blue.
Quote
Beware, however, that the stupid IBM Dialog Editor will revert it to CLR_BLACK if you use it to edit and save the dialog. :/

Yes, I've noticed some stupidity with the URE along those lines.
Title: Re: DSSaver and XWP
Post by: Dave Yeo on February 21, 2024, 06:58:52 pm
Latest screensaver at ftp://dry@ftp.os2voice.org/dssaver_v25_19_02_2024.exe (http://ftp://dry@ftp.os2voice.org/dssaver_v25_19_02_2024.exe), password your email address.
This has a bunch of various fixes, thanks to Rich for many and Alfredo for help updates and help with the wic.
Hopefully close to done besides more translations.
You may want to adjust the Desktop Properties size to look better, best to do it with the Modules tab open.
Title: Re: DSSaver and XWP
Post by: David Graser on February 26, 2024, 03:56:55 pm
Latest screensaver at ftp://dry@ftp.os2voice.org/dssaver_v25_19_02_2024.exe (http://ftp://dry@ftp.os2voice.org/dssaver_v25_19_02_2024.exe), password your email address.
This has a bunch of various fixes, thanks to Rich for many and Alfredo for help updates and help with the wic.
Hopefully close to done besides more translations.
You may want to adjust the Desktop Properties size to look better, best to do it with the Modules tab open.

Dave, this link does not work, at least for me.
Title: Re: DSSaver and XWP
Post by: Andi B. on February 26, 2024, 04:23:01 pm
Try this - ftp://dry@ftp.os2voice.org/dssaver_v25_19_02_2024.exe (copy paste this text to the address bar or you ftp client).

The forum software, or whatever, makes http://ftp//dry@ftp.os2voice.org/dssaver_v25_19_02_2024.exe out of the link in your reply which if course is wrong. You'll see this wrong link when you hover over with the mouse in the status bar of Seamonkey.
Title: Re: DSSaver and XWP
Post by: David Graser on February 26, 2024, 08:20:01 pm
Thanks Andi! That worked.
Title: Re: DSSaver and XWP
Post by: Martin Iturbide on February 26, 2024, 08:26:38 pm
Try this - ftp://dry@ftp.os2voice.org/dssaver_v25_19_02_2024.exe (copy paste this text to the address bar or you ftp client).

I added it to : https://github.com/OS2World/UTIL-WPS-Doodle-Screen-Saver/releases

I will upload it to HobbesArchive tonight.

Regards
Title: Re: DSSaver and XWP
Post by: Dave Yeo on February 26, 2024, 09:09:52 pm
Try this - ftp://dry@ftp.os2voice.org/dssaver_v25_19_02_2024.exe (copy paste this text to the address bar or you ftp client).

I added it to : https://github.com/OS2World/UTIL-WPS-Doodle-Screen-Saver/releases

I will upload it to HobbesArchive tonight.

Regards

You released a pre-release as a release before the code was committed. I've now merged  25pre into the OS2World repository. Unluckily I can't see a way to remove a release.
I did it this way as my token doesn't allow me to push to OS2World, so fork, work, do a pull request and pull.
If you upload it to HobbesArchive, mention it is a pre-release, I'm hoping for more translations before actual release.
Title: Re: DSSaver and XWP
Post by: Martin Iturbide on February 26, 2024, 09:39:30 pm
Try this - ftp://dry@ftp.os2voice.org/dssaver_v25_19_02_2024.exe (copy paste this text to the address bar or you ftp client).

I added it to : https://github.com/OS2World/UTIL-WPS-Doodle-Screen-Saver/releases

I will upload it to HobbesArchive tonight.

Regards

You released a pre-release as a release before the code was committed. I've now merged  25pre into the OS2World repository. Unluckily I can't see a way to remove a release.
I did it this way as my token doesn't allow me to push to OS2World, so fork, work, do a pull request and pull.
If you upload it to HobbesArchive, mention it is a pre-release, I'm hoping for more translations before actual release.

Hello Dave.

I changed it to Pre-Release.
But I'm confused with the github token stuff. Let me know if I can do something for you to have full access to keep working with it.
As far as I see your role is "admin" on that repo.

Regards
Title: Re: DSSaver and XWP
Post by: Dave Yeo on February 26, 2024, 10:20:45 pm
Hi Martin, thanks for changing it.
Token or temporary password to allow pushing over HTTPS doesn't work on OS2World. You had the same problem, how did you fix it?
Title: Re: DSSaver and XWP
Post by: Martin Iturbide on February 27, 2024, 01:23:55 pm
You had the same problem, how did you fix it?

Hello. I haven't fixed yet, I can not upload code from git.exe in ArcaOS.
In Windows I had been using Github Desktop to upload code and Github forced my account to have two-factor authentication (2FA) with a phone app (Microsoft Authenticator).

But I'm still struggling with git.exe under OS/2 and the tokens.

Regards
Title: Re: DSSaver and XWP
Post by: Dave Yeo on February 27, 2024, 07:56:11 pm
Yes, they have me doing 2FA authentication as well, sure would have been a bitch  few years back when I had no cell service.
The create a fork and then do a pull into OS2World seems to work as a work around.
Title: Re: DSSaver and XWP
Post by: Martin Iturbide on March 03, 2024, 02:36:56 pm
Hello Dave

On a related subject. Do you think you can inspect this open screen saver modules and see how hard or easy may be to turn it into DSS modules?
- https://github.com/OS2World/APP-SCREENSAVER-Ssaver_Modules
Just for fun, maybe something can look nice.

Regards