Opened 9 years ago

Closed 10 months ago

#5169 closed enhancement (fixed)

Sentence casing the GUI (patch)

Reported by: humdinger Owned by: stippi
Priority: normal Milestone: R1
Component: User Interface Version: R1/Development
Keywords: Cc:
Blocked By: Blocking:
Has a Patch: no Platform: All

Description

This is hrev34761.

As discussed in Checking consistency of used strings on the mailing list, here are the patches for using sentence case (i.e. natural English) in Haiku's GUI.

I broke it down into several smaller diffs:

case-add-ons.diff - for add-ons
case-apps.diff - for all applications (save debuganalyzer)
case-audio-drivers.diff - for audio drivers that appear to publish strings used in the GUI
case-print-drivers.diff - for print drivers that appear to publish strings used in the GUI
case-debuganalyzer.diff - since I couldn't compile that one, I had to do it "blind". Maybe Ingo can look over it...
case-preferences.diff - for all preferences
case-server+kits.diff - for servers and kits (save Tracker)
case-tracker.diff - for Tracker
case-misc.diff - the rest

Especially the more low level stuff like drivers and servers/kits should be checked before committing. I tried my best not to break anything and only change strings used in the GUI, but...
Along the way I also corrected what little mistakes I encountered, like changing "Ok" to "OK" or improving text slightly here and there. Nothing major.

For every file I touched, I updated the header information by either extending the year to 2009 or adding "Copyright 2009, Haiku, Inc. All rights reserved." where possible. The latter, I did also for things under Be's sample code and OpenTracker license. I hope that's OK, otherwise I can revise the patches.

Finally, attached is a list of all touched files: case-file-list.txt

Attachments (13)

case-add-ons.diff (58.8 KB) - added by humdinger 9 years ago.
for add-ons
case-audio-drivers.diff (30.2 KB) - added by humdinger 9 years ago.
for audio drivers that appear to publish strings used in the GUI
case-print-drivers.diff (7.0 KB) - added by humdinger 9 years ago.
for print drivers that appear to publish strings used in the GUI
case-debuganalyzer.diff (6.2 KB) - added by humdinger 9 years ago.
since I couldn't compile that one, I had to do it "blind"
case-preferences.diff (32.3 KB) - added by humdinger 9 years ago.
for all preferences
case-server+kits.diff (41.2 KB) - added by humdinger 9 years ago.
for servers and kits (save Tracker)
case-tracker.diff (58.2 KB) - added by humdinger 9 years ago.
for Tracker
case-misc.diff (28.9 KB) - added by humdinger 9 years ago.
the rest
case-file-list.txt (13.6 KB) - added by humdinger 9 years ago.
list of all touched files
case-apps.diff (292.0 KB) - added by humdinger 9 years ago.
for all applications
case-apps-UPDATED.diff (290.9 KB) - added by humdinger 9 years ago.
Updated case-apps.diff
case-diff_copyright-changes.zip (116.4 KB) - added by humdinger 9 years ago.
Removed changes to copyright headers if it wasn't by Haiku, Inc. already
InfoWindow.diff (521 bytes) - added by diver 9 years ago.
rename "Link To" to "Link to"

Download all attachments as: .zip

Change History (48)

Changed 9 years ago by humdinger

Attachment: case-add-ons.diff added

for add-ons

Changed 9 years ago by humdinger

Attachment: case-audio-drivers.diff added

for audio drivers that appear to publish strings used in the GUI

Changed 9 years ago by humdinger

Attachment: case-print-drivers.diff added

for print drivers that appear to publish strings used in the GUI

Changed 9 years ago by humdinger

Attachment: case-debuganalyzer.diff added

since I couldn't compile that one, I had to do it "blind"

Changed 9 years ago by humdinger

Attachment: case-preferences.diff added

for all preferences

Changed 9 years ago by humdinger

Attachment: case-server+kits.diff added

for servers and kits (save Tracker)

Changed 9 years ago by humdinger

Attachment: case-tracker.diff added

for Tracker

Changed 9 years ago by humdinger

Attachment: case-misc.diff added

the rest

Changed 9 years ago by humdinger

Attachment: case-file-list.txt added

list of all touched files

Changed 9 years ago by humdinger

Attachment: case-apps.diff added

for all applications

comment:1 Changed 9 years ago by pulkomandy

case-preferences was committed in hrev34767.

comment:2 Changed 9 years ago by bonefish

DebugAnalyzer patch applied in hrev34771.

comment:3 Changed 9 years ago by humdinger

I think I've messed up some things in DriveSetup. I mistakenly renamed e.g. "Intel Partition Map" to "Intel partition map". I just wanted for initialize a partition and couldn't, while another clean Haiku installation did work.

These are the the erroneous diffs, I think:

@@ -801,9 +801,9 @@
 
 	// allow BFS only, since our parameter string
 	// construction only handles BFS at the moment
-	if (diskSystemName != "Be File System"
-		&& diskSystemName != "Intel Partition Map"
-		&& diskSystemName != "Intel Extended Partition") {
+	if (diskSystemName != "Be file system"
+		&& diskSystemName != "Intel partition map"
+		&& diskSystemName != "Intel extended partition") {
 		_DisplayPartitionError("Don't know how to construct parameters "
 			"for this file system.");
 		return;
@@ -819,14 +819,14 @@
 
 	BString name;
 	BString parameters;
-	if (diskSystemName == "Be File System") {
+	if (diskSystemName == "Be file system") {
 		InitParamsPanel* panel = new InitParamsPanel(this, diskSystemName,
 			partition);
 		if (panel->Go(name, parameters) == GO_CANCELED)
 			return;
-	} else if (diskSystemName == "Intel Partition Map") {
+	} else if (diskSystemName == "Intel partition map") {
 		// TODO: parameters?
-	} else if (diskSystemName == "Intel Extended Partition") {
+	} else if (diskSystemName == "Intel extended partition") {
 		// TODO: parameters?
 	}

Sorry about that.

I attached an updated version: case-apps-UPDATED.diff. Please use that instead.

Changed 9 years ago by humdinger

Attachment: case-apps-UPDATED.diff added

Updated case-apps.diff

comment:4 Changed 9 years ago by stippi

I've tried applying the patch, but something is fishy: I get an error message "patch: malformed patch at line 2508: Index: src/apps/cortex/MediaRoutingView/MediaRoutingView.cpp". I've looked at the line and tried to mess around a bit with it to see what's wrong, but I can't figure it out.

comment:5 Changed 9 years ago by humdinger

So it's not just me... I had similar errors when I had it all in one big diff. I couldn't see what the heck was supposed to be wrong. I ended up simply splitting the patch at that point. Applying the now two patches worked! No idea what that's supposed to mean...

comment:6 Changed 9 years ago by humdinger

Is there anything I can do to encourage committing these patches?
BTW, Michael Pfeiffer mentioned that the case-print-drivers.diff looks OK.

comment:7 Changed 9 years ago by stippi

Status: newin-progress

Oh, misunderstanding on my part... I was waiting for the split up patches, but re-reading what you wrote, it is clear that I am supposed to simply split up the patch.

comment:8 Changed 9 years ago by stippi

Ok, looking through the patches, one thing that is a bit of a problem is that you extended the copyright of individual people. I don't think that is the correct procedure. In the case where copyright is assigned to Haiku Inc, it is correct, but not when individual people are listed, even if only one person. Changing the case of strings does not constitute enough of a change to gain copyright yourself, if I am not mistaken, so I would think the correct thing would be to leave the copyright time spans as they are. What do others think?

comment:9 Changed 9 years ago by anevilyak

Agreed.

comment:10 Changed 9 years ago by humdinger

OK, I added a new attachment with the diffs where I removed any changes to the copyright header if it wasn't by Haiku, Inc. before. I zipped it up this time, because it's getting a bit crowded in this ticket's attachment section...

The debuganalyzer-patch has already been committed by Ingo, but didn't include any changed copyright headers anyway. I don't know how to deal with the preferences-patch that has also been committed already in hrev34767.

Thanks for looking into it!

Changed 9 years ago by humdinger

Removed changes to copyright headers if it wasn't by Haiku, Inc. already

comment:11 Changed 9 years ago by pulkomandy

I just fixed the preferences in hrev34939 :)

comment:12 Changed 9 years ago by stippi

case-misc.diff (from the .zip) applied in hrev35043.

comment:13 Changed 9 years ago by stippi

case-server+kits.diff (from the .zip) applied in hrev35044.

comment:14 Changed 9 years ago by stippi

Something is wrong with case-audio-drivers.diff. You made the patch against hrev34761 and supposedly all my files that would be touched by the patch are at this revision. Yes the patch does not apply cleanly.

comment:15 Changed 9 years ago by stippi

Yes -> Yet

comment:16 Changed 9 years ago by stippi

Resolution: fixed
Status: in-progressclosed

Applied case-audio-drivers.diff with some manual tweaking in hrev35045.

comment:17 Changed 9 years ago by stippi

Resolution: fixed
Status: closedreopened

Applied case-add-ons.diff (from the .zip) in hrev35046.

comment:18 Changed 9 years ago by stippi

Applied case-tracker.diff (from the .zip) in hrev30547 and hrev35048.

comment:19 Changed 9 years ago by stippi

Resolution: fixed
Status: reopenedclosed

Applied case-apps-UPDATED.diff (from the .zip) in hrev35049.

Thanks a lot for this monumental work, Humdinger!

comment:20 Changed 9 years ago by humdinger

Thanks for looking over it all and improving it where necessary. Sorry not everything applied cleanly for sometimes mysterious reasons...

comment:21 Changed 9 years ago by stippi

BTW, I changed some occurances back where you changed BMenuField lables from "Label" to "Label:" or even "Label: ". IMHO it is not elegant. It is clear that the menu field label is a "label", so I feel the additional ":" is visual clutter. Adding a space after the label is even more wrong, since there is already spacing enforced by the control itself. I think this should be added to the HIG, but maybe it needs discussion.

comment:22 Changed 9 years ago by humdinger

Besides in I-O-M I couldn't find any label for a pop-up menu or textcontrol without a ":". I only had a very quick lokk, however. Since they are so ubiquitous, I don't feel they are cluttering things that much (or at all, actually).
I think I only added a space after a ":" when the rest of the GUI in that app did the same. IIRC that was in the Bluetooth prefs. I agree that is bad style, but I didn't want to potentially mess up the visuals by having different spacing.

comment:24 Changed 9 years ago by stippi

If "Query" is to be a name, then it should be capitalized. "Resize to Fit" would be the only bug in the list above.

comment:25 Changed 9 years ago by diver

Ok, please fix "Resize to Fit" then. I'll reopen this ticket for the time being.

comment:26 Changed 9 years ago by diver

Resolution: fixed
Status: closedreopened

comment:27 Changed 9 years ago by humdinger

Resolution: fixed
Status: reopenedclosed

Corrected "Resize to fix" with hrev38334. Thanks for reporting, though I am not sure where the string is actually used. It doesn't seem to be the query result window as that already used the correct spelling...

comment:28 Changed 9 years ago by anevilyak

It's probably used if you right click in a spot in the window without having an item selected, from a brief glance at least.

comment:29 Changed 9 years ago by humdinger

Bingo! :)

comment:30 Changed 9 years ago by diver

One more word http://dev.haiku-os.org/browser/haiku/trunk/src/kits/tracker/InfoWindow.cpp#L1778 ("Link To:") which breaks width of this string in translated tracker, which was found due to a bug in HTA parser.

comment:31 Changed 9 years ago by diver

Resolution: fixed
Status: closedreopened

Ping :-)

Changed 9 years ago by diver

Attachment: InfoWindow.diff added

rename "Link To" to "Link to"

comment:32 Changed 9 years ago by diver

Has a Patch: set

comment:33 Changed 9 years ago by humdinger

Applied in hrev38621. Sorry for the delay. I leave the ticket open for similar reports/patches.

comment:34 Changed 9 years ago by humdinger

Has a Patch: unset

comment:35 Changed 10 months ago by waddlesplash

Resolution: fixed
Status: reopenedclosed

It's been 8 years; further problems deserve a separate ticket. Closing as fixed.

Note: See TracTickets for help on using tickets.