Opened 14 years ago

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

Download all attachments as: .zip

Change History (48)

by humdinger, 14 years ago

Attachment: case-add-ons.diff added

for add-ons

by humdinger, 14 years ago

Attachment: case-audio-drivers.diff added

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

by humdinger, 14 years ago

Attachment: case-print-drivers.diff added

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

by humdinger, 14 years ago

Attachment: case-debuganalyzer.diff added

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

by humdinger, 14 years ago

Attachment: case-preferences.diff added

for all preferences

by humdinger, 14 years ago

Attachment: case-server+kits.diff added

for servers and kits (save Tracker)

by humdinger, 14 years ago

Attachment: case-tracker.diff added

for Tracker

by humdinger, 14 years ago

Attachment: case-misc.diff added

the rest

by humdinger, 14 years ago

Attachment: case-file-list.txt added

list of all touched files

by humdinger, 14 years ago

Attachment: case-apps.diff added

for all applications

comment:1 by pulkomandy, 14 years ago

case-preferences was committed in hrev34767.

comment:2 by bonefish, 14 years ago

DebugAnalyzer patch applied in hrev34771.

comment:3 by humdinger, 14 years ago

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.

by humdinger, 14 years ago

Attachment: case-apps-UPDATED.diff added

Updated case-apps.diff

comment:4 by stippi, 14 years ago

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 by humdinger, 14 years ago

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 by humdinger, 14 years ago

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 by stippi, 14 years ago

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 by stippi, 14 years ago

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 by anevilyak, 14 years ago

Agreed.

comment:10 by humdinger, 14 years ago

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!

by humdinger, 14 years ago

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

comment:11 by pulkomandy, 14 years ago

I just fixed the preferences in hrev34939 :)

comment:12 by stippi, 14 years ago

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

comment:13 by stippi, 14 years ago

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

comment:14 by stippi, 14 years ago

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 by stippi, 14 years ago

Yes -> Yet

comment:16 by stippi, 14 years ago

Resolution: fixed
Status: in-progressclosed

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

comment:17 by stippi, 14 years ago

Resolution: fixed
Status: closedreopened

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

comment:18 by stippi, 14 years ago

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

comment:19 by stippi, 14 years ago

Resolution: fixed
Status: reopenedclosed

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

Thanks a lot for this monumental work, Humdinger!

comment:20 by humdinger, 14 years ago

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

comment:21 by stippi, 14 years ago

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 by humdinger, 14 years ago

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 by stippi, 14 years ago

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 by diver, 14 years ago

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

comment:26 by diver, 14 years ago

Resolution: fixed
Status: closedreopened

comment:27 by humdinger, 14 years ago

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 by anevilyak, 14 years ago

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 by humdinger, 14 years ago

Bingo! :)

comment:30 by diver, 14 years ago

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 by diver, 14 years ago

Resolution: fixed
Status: closedreopened

Ping :-)

by diver, 14 years ago

Attachment: InfoWindow.diff added

rename "Link To" to "Link to"

comment:32 by diver, 14 years ago

patch: 01

comment:33 by humdinger, 14 years ago

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

comment:34 by humdinger, 14 years ago

patch: 10

comment:35 by waddlesplash, 6 years ago

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.