From bf4cd552cbd64b7ec07dd999602ace7196c9a5f6 Mon Sep 17 00:00:00 2001 From: Kevin Wasserman Date: Wed, 15 Aug 2012 12:17:54 -0400 Subject: MSVC-generated updates to support ribbon UI Signed-off-by: Kevin Wasserman [kaduk@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(-) create mode 100644 src/windows/leash/res/homesmall.bmp create mode 100644 src/windows/leash/res/ribbon1.mfcribbon-ms (limited to 'src/windows/leash') diff --git a/src/windows/leash/Leash.rc b/src/windows/leash/Leash.rc index 1cfd3105e4..17e254e5a8 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 0000000000..ef481d31fd 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 0000000000..4572d13d2b --- /dev/null +++ b/src/windows/leash/res/ribbon1.mfcribbon-ms @@ -0,0 +1,2 @@ + +
1
RibbonBarTRUETRUETRUETRUEFALSEButton_MainID_BUTTON232813FALSEFALSE-1-1TRUECategory_MainCategory1ButtonID_APP_EXIT57665E&xitFALSEFALSE-1-1TRUEFALSEButton_Main_PanelID_APP_EXIT57665E&xitFALSEFALSE-1-1TRUETRUE300CategoryHomeIDB_HOMESMALL266IDB_HOMELARGE267Panel-1FALSEFALSEButtonID_INIT_TICKET32807Initialize TicketFALSETRUE22TRUEFALSEPanel-1FALSEFALSEButtonID_RENEW_TICKET32776Renew TicketFALSETRUE-13TRUEFALSEPanel-1FALSEFALSEButtonID_IMPORT_TICKET32806Import TicketFALSEFALSE44TRUEFALSE diff --git a/src/windows/leash/resource.h b/src/windows/leash/resource.h index 24249c99f6..49403b163a 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 -- cgit