krb5 commit: MSVC-generated updates to support ribbon UI
Benjamin Kaduk
kaduk at MIT.EDU
Fri Aug 24 12:24:08 EDT 2012
https://github.com/krb5/krb5/commit/bf4cd552cbd64b7ec07dd999602ace7196c9a5f6
commit bf4cd552cbd64b7ec07dd999602ace7196c9a5f6
Author: Kevin Wasserman <kevin.wasserman at painless-security.com>
Date: Wed Aug 15 12:17:54 2012 -0400
MSVC-generated updates to support ribbon UI
Signed-off-by: Kevin Wasserman <kevin.wasserman at painless-security.com>
[kaduk at mit.edu: manually tweak to remove gratuitious churn]
ticket: 7246 (new)
queue: kfw
target_version: 1.10.4
tags: pullup
src/windows/leash/Leash.rc | 24 ++++++++++++++++--------
src/windows/leash/res/homesmall.bmp | Bin 0 -> 11320 bytes
src/windows/leash/res/ribbon1.mfcribbon-ms | 2 ++
src/windows/leash/resource.h | 3 +++
4 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/src/windows/leash/Leash.rc b/src/windows/leash/Leash.rc
index 1cfd310..17e254e 100644
--- a/src/windows/leash/Leash.rc
+++ b/src/windows/leash/Leash.rc
@@ -13,13 +13,11 @@
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
+// English (United States) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
#pragma code_page(1252)
-#endif //_WIN32
#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
@@ -200,7 +198,7 @@ FONT 8, "MS Sans Serif"
BEGIN
CONTROL "Tree1",IDC_TREEVIEW,"SysTreeView32",TVS_HASBUTTONS |
TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP |
- WS_TABSTOP | 0x800,0,19,164,13
+ TVS_INFOTIP | WS_TABSTOP,0,19,164,13
LTEXT "Your Kerberos Tickets and AFS Tokens (Issued/Expires/[Renew]/Principal)",
IDC_LABEL_KERB_TICKETS,6,5,280,12
END
@@ -878,6 +876,16 @@ END
//
IDR_MAINFRAME BITMAP "res\\Leash_toolbar.bmp"
+IDB_HOMESMALL BITMAP "res\\homesmall.bmp"
+IDB_HOMELARGE BITMAP "res\\homelarge.bmp"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Ribbon
+//
+
+IDR_RIBBON1 RT_RIBBON_XML "res\\ribbon1.mfcribbon-ms"
+
/////////////////////////////////////////////////////////////////////////////
//
@@ -925,6 +933,9 @@ BEGIN
ID_IMPORT_TICKET "Convert MS Windows credentials into tickets/tokens\n Import Ticket(s) "
ID_INIT_TICKET "Activate all tickets/tokens\n Initialize Ticket(s) "
ID_AUTO_RENEW "Automatically attempt to renew tickets"
+ ID_TIME_ISSUED "Display ticket time issued column"
+ ID_RENEWABLE_UNTIL "Display ticket renewable until time column"
+ ID_SHOW_TICKET_FLAGS "Display ticket flags column"
END
STRINGTABLE
@@ -951,9 +962,6 @@ BEGIN
ID_OPTIONS_LOWTICKETALARMSOUND
"Turn alarm off or on, when ticket time is low"
ID_LOW_TICKET_ALARM "Turn alarm on or off, on low ticket(s)/token(s) times"
- ID_TIME_ISSUED "Display ticket time issued column"
- ID_RENEWABLE_UNTIL "Display ticket renewable until time column"
- ID_SHOW_TICKET_FLAGS "Display ticket flags column"
END
STRINGTABLE
@@ -962,7 +970,7 @@ BEGIN
ID_VALID_UNTIL "Display ticket valid until time column"
END
-#endif // English (U.S.) resources
+#endif // English (United States) resources
/////////////////////////////////////////////////////////////////////////////
diff --git a/src/windows/leash/res/homesmall.bmp b/src/windows/leash/res/homesmall.bmp
new file mode 100644
index 0000000..ef481d3
Binary files /dev/null and b/src/windows/leash/res/homesmall.bmp differ
diff --git a/src/windows/leash/res/ribbon1.mfcribbon-ms b/src/windows/leash/res/ribbon1.mfcribbon-ms
new file mode 100644
index 0000000..4572d13
--- /dev/null
+++ b/src/windows/leash/res/ribbon1.mfcribbon-ms
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<AFX_RIBBON><HEADER><VERSION>1</VERSION></HEADER><RIBBON_BAR><ELEMENT_NAME>RibbonBar</ELEMENT_NAME><ENABLE_TOOLTIPS>TRUE</ENABLE_TOOLTIPS><ENABLE_TOOLTIPS_DESCRIPTION>TRUE</ENABLE_TOOLTIPS_DESCRIPTION><ENABLE_KEYS>TRUE</ENABLE_KEYS><ENABLE_PRINTPREVIEW>TRUE</ENABLE_PRINTPREVIEW><ENABLE_DRAWUSINGFONT>FALSE</ENABLE_DRAWUSINGFONT><BUTTON_MAIN><ELEMENT_NAME>Button_Main</ELEMENT_NAME><ID><NAME>ID_BUTTON2</NAME><VALUE>32813</VALUE></ID><PALETTE_TOP>FALSE</PALETTE_TOP><ALWAYS_LARGE>FALSE</ALWAYS_LARGE><INDEX_SMALL>-1</INDEX_SMALL><INDEX_LARGE>-1</INDEX_LARGE><DEFAULT_COMMAND>TRUE</DEFAULT_COMMAND></BUTTON_MAIN><CATEGORY_MAIN><ELEMENT_NAME>Category_Main</ELEMENT_NAME><NAME>Category1</NAME><ELEMENTS><ELEMENT><ELEMENT_NAME>Button</ELEMENT_NAME><ID><NAME>ID_APP_EXIT</NAME><VALUE>57665</VALUE></ID><TEXT>E&xit</TEXT><PALETTE_TOP>FALSE</PALETTE_TOP><ALWAYS_LARGE>FALSE</ALWAYS_LARGE><INDEX_SMALL>-1</INDEX_SMALL><INDEX_LARGE>-1</INDEX_LARGE><DEFAULT_COMMAND>TRUE</DEFAULT_COMMAND><ALWAY!
S_DESCRIPTION>FALSE</ALWAYS_DESCRIPTION></ELEMENT><ELEMENT><ELEMENT_NAME>Button_Main_Panel</ELEMENT_NAME><ID><NAME>ID_APP_EXIT</NAME><VALUE>57665</VALUE></ID><TEXT>E&xit</TEXT><PALETTE_TOP>FALSE</PALETTE_TOP><ALWAYS_LARGE>FALSE</ALWAYS_LARGE><INDEX_SMALL>-1</INDEX_SMALL><INDEX_LARGE>-1</INDEX_LARGE><DEFAULT_COMMAND>TRUE</DEFAULT_COMMAND></ELEMENT></ELEMENTS><RECENT_FILE_LIST><ENABLE>TRUE</ENABLE><LABEL>Recent Documents</LABEL><WIDTH>300</WIDTH></RECENT_FILE_LIST></CATEGORY_MAIN><CATEGORIES><CATEGORY><ELEMENT_NAME>Category</ELEMENT_NAME><NAME>Home</NAME><IMAGE_SMALL><ID><NAME>IDB_HOMESMALL</NAME><VALUE>266</VALUE></ID></IMAGE_SMALL><IMAGE_LARGE><ID><NAME>IDB_HOMELARGE</NAME><VALUE>267</VALUE></ID></IMAGE_LARGE><PANELS><PANEL><ELEMENT_NAME>Panel</ELEMENT_NAME><INDEX>-1</INDEX><JUSTIFY_COLUMNS>FALSE</JUSTIFY_COLUMNS><CENTER_COLUMN_VERT>FALSE</CENTER_COLUMN_VERT><ELEMENTS><ELEMENT><ELEMENT_NAME>Button</ELEMENT_NAME><ID><NAME>ID_INIT_TICKET</NAME><VALUE>32807</VALUE></ID><TE!
XT>Initialize Ticket</TEXT><PALETTE_TOP>FALSE</PALETTE_TOP><AL!
WAYS_LAR
GE>TRUE</ALWAYS_LARGE><INDEX_SMALL>2</INDEX_SMALL><INDEX_LARGE>2</INDEX_LARGE><DEFAULT_COMMAND>TRUE</DEFAULT_COMMAND><ALWAYS_DESCRIPTION>FALSE</ALWAYS_DESCRIPTION></ELEMENT></ELEMENTS></PANEL><PANEL><ELEMENT_NAME>Panel</ELEMENT_NAME><INDEX>-1</INDEX><JUSTIFY_COLUMNS>FALSE</JUSTIFY_COLUMNS><CENTER_COLUMN_VERT>FALSE</CENTER_COLUMN_VERT><ELEMENTS><ELEMENT><ELEMENT_NAME>Button</ELEMENT_NAME><ID><NAME>ID_RENEW_TICKET</NAME><VALUE>32776</VALUE></ID><TEXT>Renew Ticket</TEXT><PALETTE_TOP>FALSE</PALETTE_TOP><ALWAYS_LARGE>TRUE</ALWAYS_LARGE><INDEX_SMALL>-1</INDEX_SMALL><INDEX_LARGE>3</INDEX_LARGE><DEFAULT_COMMAND>TRUE</DEFAULT_COMMAND><ALWAYS_DESCRIPTION>FALSE</ALWAYS_DESCRIPTION></ELEMENT></ELEMENTS></PANEL><PANEL><ELEMENT_NAME>Panel</ELEMENT_NAME><INDEX>-1</INDEX><JUSTIFY_COLUMNS>FALSE</JUSTIFY_COLUMNS><CENTER_COLUMN_VERT>FALSE</CENTER_COLUMN_VERT><ELEMENTS><ELEMENT><ELEMENT_NAME>Button</ELEMENT_NAME><ID><NAME>ID_IMPORT_TICKET</NAME><VALUE>32806</VALUE></ID><TEXT>Import Ticket</TEXT!
><PALETTE_TOP>FALSE</PALETTE_TOP><ALWAYS_LARGE>FALSE</ALWAYS_LARGE><INDEX_SMALL>4</INDEX_SMALL><INDEX_LARGE>4</INDEX_LARGE><DEFAULT_COMMAND>TRUE</DEFAULT_COMMAND><ALWAYS_DESCRIPTION>FALSE</ALWAYS_DESCRIPTION></ELEMENT></ELEMENTS></PANEL></PANELS></CATEGORY></CATEGORIES></RIBBON_BAR></AFX_RIBBON>
diff --git a/src/windows/leash/resource.h b/src/windows/leash/resource.h
index 24249c9..49403b1 100644
--- a/src/windows/leash/resource.h
+++ b/src/windows/leash/resource.h
@@ -87,6 +87,9 @@
#define IDI_LEASH_TICKET_ADDRESS 262
#define IDI_LEASH_TICKET_SESSION 263
#define IDI_LEASH_TICKET_ENCRYPTION 264
+#define IDR_RIBBON1 265
+#define IDB_HOMESMALL 266
+#define IDB_HOMELARGE 267
#define IDC_PROGRESS1 1000
#define IDC_TRACKBAR1 1001
#define IDC_TRACKBAR2 1002
More information about the cvs-krb5
mailing list