Cygwin/X: Update resources file and About dialog
Use the configured vendor web address in the About dialog Update resources file: rework About dialog, use 'MS Shell Dlg 2' logical font for all dialogs, add ellipsis to exit option in tray menu as it (may) trigger another dialog. Get short vendor name from xwin-config.h, like other configuration data presented in the About dialog box, rather than creating the PROJECT_NAME define Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
This commit is contained in:
parent
881812438b
commit
34269a90ea
|
@ -1826,6 +1826,7 @@ AC_MSG_RESULT([$XWIN])
|
|||
if test "x$XWIN" = xyes; then
|
||||
PKG_CHECK_EXISTS($WINDOWSWMPROTO, [WINDOWSWM=yes], [WINDOWSWM=no])
|
||||
AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version])
|
||||
AC_DEFINE_UNQUOTED(__VENDORDWEBSUPPORT__, ["$VENDOR_WEB"], [Vendor web address for support])
|
||||
AC_CHECK_TOOL(WINDRES, windres)
|
||||
case $host_os in
|
||||
cygwin*)
|
||||
|
|
|
@ -151,7 +151,7 @@ XWin_DEPENDENCIES = $(XWIN_LIBS)
|
|||
XWin_LDADD = $(MULTIWINDOWEXTWM_LIBS) $(XWIN_LIBS) $(MAIN_LIB) $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) $(XWIN_SYS_LIBS)
|
||||
|
||||
.rc.o:
|
||||
$(WINDRES) --use-temp-file -i $< --input-format=rc -o $@ -O coff -DPROJECT_NAME=\"$(VENDOR_NAME_SHORT)\"
|
||||
$(WINDRES) --use-temp-file -i $< --input-format=rc -o $@ -O coff -I $(top_builddir)/include
|
||||
|
||||
XWin_LDFLAGS = -mwindows -static
|
||||
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
/*
|
||||
*Copyright (C) 2002-2004 Harold L Hunt II All Rights Reserved.
|
||||
*Copyright (C) 2008 Yaakov Selkowitz All Rights Reserved
|
||||
*
|
||||
*Permission is hereby granted, free of charge, to any person obtaining
|
||||
* a copy of this software and associated documentation files (the
|
||||
|
@ -20,39 +21,37 @@
|
|||
*CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
*WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
*
|
||||
*Except as contained in this notice, the name of Harold L Hunt II
|
||||
*Except as contained in this notice, the names of the authors
|
||||
*shall not be used in advertising or otherwise to promote the sale, use
|
||||
*or other dealings in this Software without prior written authorization
|
||||
*from Harold L Hunt II.
|
||||
*from the authors.
|
||||
*
|
||||
* Authors: Harold L Hunt II
|
||||
* Authors: Harold L Hunt II, Yaakov Selkowitz
|
||||
*/
|
||||
|
||||
#include "windows.h"
|
||||
#include <windows.h>
|
||||
#include "winresource.h"
|
||||
#include "xwin-config.h"
|
||||
#include "version-config.h"
|
||||
|
||||
/*
|
||||
* Dialogs
|
||||
*/
|
||||
|
||||
/* About */
|
||||
ABOUT_BOX DIALOGEX 32, 32, 240, 105
|
||||
ABOUT_BOX DIALOGEX 32, 32, 260, 105
|
||||
STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | WS_TABSTOP | DS_CENTERMOUSE
|
||||
CAPTION "About " PROJECT_NAME
|
||||
FONT 8, "MS Sans Serif"
|
||||
CAPTION "About " XVENDORNAMESHORT
|
||||
FONT 8, "MS Shell Dlg 2"
|
||||
BEGIN
|
||||
CONTROL PROJECT_NAME " Website", ID_ABOUT_WEBSITE, "Button",
|
||||
BS_OWNERDRAW | WS_TABSTOP, 30, 45, 75, 15
|
||||
CONTROL "Change Log", ID_ABOUT_CHANGELOG, "Button",
|
||||
BS_OWNERDRAW | WS_TABSTOP, 135, 45, 75, 15
|
||||
CONTROL "User's Guide", ID_ABOUT_UG, "Button",
|
||||
BS_OWNERDRAW | WS_TABSTOP, 30, 65, 75, 15
|
||||
CONTROL "FAQ", ID_ABOUT_FAQ, "Button",
|
||||
BS_OWNERDRAW | WS_TABSTOP, 135, 65, 75, 15
|
||||
|
||||
DEFPUSHBUTTON "&OK", IDOK, 95, 85, 50, 15
|
||||
|
||||
CTEXT PROJECT_NAME " X Server. Use the links below to learn more about the " PROJECT_NAME " project.", IDC_STATIC, 5, 5, 230, 35
|
||||
CONTROL IDI_XWIN, IDC_STATIC, "Static", SS_ICON, 8, 8, 32, 32
|
||||
LTEXT XVENDORNAMESHORT " X Server ", IDC_STATIC, 36, 8, 220, 8
|
||||
LTEXT VENDOR_MAN_VERSION, IDC_STATIC, 36, 18, 220, 8
|
||||
LTEXT BUILDERSTRING, IDC_STATIC, 36, 28, 220, 8
|
||||
LTEXT "This software is licensed under the terms of the MIT/X11 License.", IDC_STATIC, 36, 48, 220, 20
|
||||
CONTROL __VENDORDWEBSUPPORT__, ID_ABOUT_WEBSITE, "Button",
|
||||
BS_OWNERDRAW | WS_TABSTOP, 36, 68, 68, 8
|
||||
DEFPUSHBUTTON "&OK", IDOK, 105, 85, 50, 15
|
||||
END
|
||||
|
||||
|
||||
|
@ -60,13 +59,13 @@ END
|
|||
|
||||
DEPTH_CHANGE_BOX DIALOGEX 32, 32, 180, 100
|
||||
STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | DS_CENTERMOUSE
|
||||
FONT 8, "MS Sans Serif"
|
||||
CAPTION PROJECT_NAME
|
||||
FONT 8, "MS Shell Dlg 2"
|
||||
CAPTION XVENDORNAMESHORT
|
||||
BEGIN
|
||||
DEFPUSHBUTTON "Dismiss", IDOK, 66, 80, 50, 14
|
||||
CTEXT PROJECT_NAME, IDC_STATIC, 40, 12, 100, 8
|
||||
CTEXT XVENDORNAMESHORT, IDC_STATIC, 40, 12, 100, 8
|
||||
CTEXT "Disruptive screen configuration change.", IDC_STATIC, 7, 40, 166, 8
|
||||
CTEXT "Restore previous resolution to use " PROJECT_NAME ".", IDC_STATIC, 7, 52, 166, 8
|
||||
CTEXT "Restore previous resolution to use " XVENDORNAMESHORT ".", IDC_STATIC, 7, 52, 166, 8
|
||||
END
|
||||
|
||||
|
||||
|
@ -74,8 +73,8 @@ END
|
|||
|
||||
EXIT_DIALOG DIALOGEX 32, 32, 180, 78
|
||||
STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | WS_TABSTOP | DS_CENTERMOUSE
|
||||
FONT 8, "MS Sans Serif"
|
||||
CAPTION "Exit " PROJECT_NAME "?"
|
||||
FONT 8, "MS Shell Dlg 2"
|
||||
CAPTION "Exit " XVENDORNAMESHORT "?"
|
||||
BEGIN
|
||||
PUSHBUTTON "E&xit", IDOK, 55, 56, 30, 14
|
||||
DEFPUSHBUTTON "&Cancel", IDCANCEL, 95, 56, 30, 14
|
||||
|
@ -96,7 +95,7 @@ BEGIN
|
|||
MENUITEM "&Hide Root Window", ID_APP_HIDE_ROOT
|
||||
MENUITEM "&About...", ID_APP_ABOUT
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "E&xit", ID_APP_EXIT
|
||||
MENUITEM "E&xit...", ID_APP_EXIT
|
||||
END
|
||||
END
|
||||
|
||||
|
|
|
@ -705,7 +705,7 @@ winAboutDlgProc (HWND hwndDialog, UINT message,
|
|||
|
||||
case ID_ABOUT_WEBSITE:
|
||||
{
|
||||
const char * pszPath = "http://x.cygwin.com/";
|
||||
const char * pszPath = __VENDORDWEBSUPPORT__;
|
||||
int iReturn;
|
||||
|
||||
iReturn = ShellExecute (NULL,
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
/* Cygwin has /dev/windows for signaling new win32 messages */
|
||||
#undef HAS_DEVWINDOWS
|
||||
|
||||
/* Switch on debug messages */
|
||||
/* Switch on debug messages */
|
||||
#undef CYGDEBUG
|
||||
#undef CYGWINDOWING_DEBUG
|
||||
#undef CYGMULTIWINDOW_DEBUG
|
||||
|
@ -22,3 +22,9 @@
|
|||
|
||||
/* Do we require our own snprintf? */
|
||||
#undef NEED_SNPRINTF
|
||||
|
||||
/* Short vendor name */
|
||||
#undef XVENDORNAMESHORT
|
||||
|
||||
/* Vendor web address for support */
|
||||
#undef __VENDORDWEBSUPPORT__
|
||||
|
|
Loading…
Reference in New Issue