xserver: Branch 'xorg-server-1.2-apple' - 2 commits
Jeremy Huddleston
jeremyhu at kemper.freedesktop.org
Mon Apr 21 19:06:18 PDT 2008
.gitignore | 2 ++
hw/xquartz/X11Controller.m | 30 ++++++++++++++++--------------
2 files changed, 18 insertions(+), 14 deletions(-)
New commits:
commit 14c6b837bb03bd0956f90882f550847f13d0ca09
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date: Sun Apr 20 22:18:45 2008 -0700
XQuartz: Fixed quit dialog to be more conforming with HIG.
diff --git a/hw/xquartz/X11Controller.m b/hw/xquartz/X11Controller.m
index 63853b5..0093a5a 100644
--- a/hw/xquartz/X11Controller.m
+++ b/hw/xquartz/X11Controller.m
@@ -692,24 +692,26 @@ objectValueForTableColumn:(NSTableColumn *)tableColumn row:(int)row
QuartzMessageServerThread (kXquartzControllerNotify, 1, AppleWMShowAll);
}
-- (NSApplicationTerminateReply) applicationShouldTerminate:sender
-{
- NSString *msg;
-
- if (can_quit || [X11App prefs_get_boolean:@PREFS_NO_QUIT_ALERT default:NO])
- return NSTerminateNow;
+- (NSApplicationTerminateReply) applicationShouldTerminate:sender {
+ NSString *msg;
+ NSString *title;
- /* Make sure we're frontmost. */
- [NSApp activateIgnoringOtherApps:YES];
+ if (can_quit || [X11App prefs_get_boolean:@PREFS_NO_QUIT_ALERT default:NO])
+ return NSTerminateNow;
- msg = NSLocalizedString (@"Are you sure you want to quit X11?\n\nIf you quit X11, any X11 applications you are running will stop immediately and you will lose any changes you have not saved.", @"Dialog when quitting");
+ /* Make sure we're frontmost. */
+ [NSApp activateIgnoringOtherApps:YES];
- /* FIXME: safe to run the alert in here? Or should we return Later
- and then run the alert on a timer? It seems to work here, so.. */
+ title = NSLocalizedString(@"Do you really want to quit X11?", @"Dialog title when quitting");
+ msg = NSLocalizedString(@"Any open X11 applications will stop immediately, and you will lose any unsaved changes.", @"Dialog when quitting");
+
+ /* FIXME: safe to run the alert in here? Or should we return Later
+ * and then run the alert on a timer? It seems to work here, so..
+ */
- return (NSRunAlertPanel (nil, msg, NSLocalizedString (@"Quit", @""),
- NSLocalizedString (@"Cancel", @""), nil)
- == NSAlertDefaultReturn) ? NSTerminateNow : NSTerminateCancel;
+ return (NSRunAlertPanel (title, msg, NSLocalizedString (@"Quit", @""),
+ NSLocalizedString (@"Cancel", @""), nil)
+ == NSAlertDefaultReturn) ? NSTerminateNow : NSTerminateCancel;
}
- (void) applicationWillTerminate:(NSNotification *)aNotification
commit 0a9a3bec2de8d1f442493e13cf9f039902a4928f
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date: Sun Apr 20 22:18:19 2008 -0700
.gitignore: Added Xquartz stuff
diff --git a/.gitignore b/.gitignore
index 2e60d58..b231585 100644
--- a/.gitignore
+++ b/.gitignore
@@ -275,6 +275,8 @@ hw/xprint/doc/Xprt.1x
hw/xprint/doc/Xprt.man
hw/xprint/dpmsstubs-wrapper.c
hw/xprint/miinitext-wrapper.c
+hw/xquartz/xpr/Xquartz
+hw/xquartz/xpr/Xquartz.1
include/dix-config.h
include/kdrive-config.h
include/xgl-config.h
More information about the xorg-commit
mailing list