From 58441c9c61f332315c8b68dc63e352426a6d7707 Mon Sep 17 00:00:00 2001 From: Kevin Wasserman Date: Wed, 6 Jun 2012 21:17:21 -0400 Subject: KfW GUI -- add 'More' Panel 'Import Tickets', 'Export Tickets', and 'Forget Principals' buttons. Signed-off-by: Kevin Wasserman ticket: 7268 (new) queue: kfw target_version: 1.10.4 tags: pullup --- src/windows/leash/Leash.rc | 5 ++++- src/windows/leash/LeashView.cpp | 6 ++++++ src/windows/leash/LeashView.h | 1 + src/windows/leash/res/ribbon1.mfcribbon-ms | 2 +- src/windows/leash/resource.h | 6 +++++- 5 files changed, 17 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/windows/leash/Leash.rc b/src/windows/leash/Leash.rc index c1aa94ef64..accdd7e095 100644 --- a/src/windows/leash/Leash.rc +++ b/src/windows/leash/Leash.rc @@ -937,7 +937,7 @@ END STRINGTABLE BEGIN ID_PROPERTIES "Enables you to change settings" - ID_IMPORT_TICKET "Convert MS Windows credentials into tickets\n Import Ticket(s) " + ID_IMPORT_TICKET "import tickets from your Windows Logon Session.\n Import Tickets" ID_INIT_TICKET "Obtain a new ticket\n Get Ticket" ID_AUTO_RENEW "Automatically attempt to renew tickets.\n Automatic Ticket Renewal" ID_TIME_ISSUED "Display column showing when your tickets will expire.\n Issued" @@ -973,6 +973,7 @@ END STRINGTABLE BEGIN + ID_FORGET_PRINCIPALS "Clear the Principal history. This only affects autocompletion in the Get Tickets and Change Password dialogs.\n Forget Principals" ID_ENCRYPTION_TYPE "Display column showing the encryption type for your tickets and session keys.\n Encryption Type" ID_VALID_UNTIL "Display column showing when your tickets will expire.\n Valid Until" END @@ -981,6 +982,8 @@ STRINGTABLE BEGIN ID_MAKE_DEFAULT "Make the selected principal the default principal.\n Make Default" ID_IMPORT_TICKETS "Automatically import tickets from your Windows Logon Session.\n Import Tickets" + ID_EXPORT_TICKET "Export tickets to your Windows Logon Sesion.\n Export Tickets" + ID_AUTO_IMPORT_TICKET "Automatically import tickets from your Windows Logon Session.\n Automatic Import Tickets" END #endif // English (United States) resources diff --git a/src/windows/leash/LeashView.cpp b/src/windows/leash/LeashView.cpp index 1375d9fdc0..44daa0e011 100644 --- a/src/windows/leash/LeashView.cpp +++ b/src/windows/leash/LeashView.cpp @@ -115,6 +115,7 @@ BEGIN_MESSAGE_MAP(CLeashView, CListView) ON_NOTIFY_REFLECT(LVN_ITEMACTIVATE, &CLeashView::OnLvnItemActivate) ON_NOTIFY_REFLECT(LVN_KEYDOWN, &CLeashView::OnLvnKeydown) ON_NOTIFY_REFLECT(NM_CUSTOMDRAW, &CLeashView::OnNMCustomdraw) + ON_COMMAND(ID_FORGET_PRINCIPALS, &CLeashView::OnForgetPrincipals) END_MESSAGE_MAP() @@ -2917,3 +2918,8 @@ void CLeashView::OnNMCustomdraw(NMHDR *pNMHDR, LRESULT *pResult) break; } } + + +void CLeashView::OnForgetPrincipals() +{ +} diff --git a/src/windows/leash/LeashView.h b/src/windows/leash/LeashView.h index 307c36dda2..585d2075d3 100644 --- a/src/windows/leash/LeashView.h +++ b/src/windows/leash/LeashView.h @@ -351,6 +351,7 @@ public: afx_msg void OnLvnItemActivate(NMHDR *pNMHDR, LRESULT *pResult); afx_msg void OnLvnKeydown(NMHDR *pNMHDR, LRESULT *pResult); afx_msg void OnNMCustomdraw(NMHDR *pNMHDR, LRESULT *pResult); + afx_msg void OnForgetPrincipals(); }; /* diff --git a/src/windows/leash/res/ribbon1.mfcribbon-ms b/src/windows/leash/res/ribbon1.mfcribbon-ms index 2381637aad..cb79895298 100644 --- a/src/windows/leash/res/ribbon1.mfcribbon-ms +++ b/src/windows/leash/res/ribbon1.mfcribbon-ms @@ -1,2 +1,2 @@ -
1
RibbonBarTRUETRUETRUETRUEFALSEButton_MainID_BUTTON232813FALSEFALSE-1-1TRUEIDB_BITMAP2268Category_MainCategory1ButtonID_HELP_KERBEROS_32784&HelpFALSEFALSE-1-1TRUEFALSEButtonID_APP_ABOUT57664&AboutFALSEFALSE-1-1TRUEFALSEButtonID_APP_EXIT57665E&xitFALSEFALSE-1-1TRUEFALSEFALSE300CategoryHomeIDB_HOMESMALL266IDB_HOMELARGE267Panel-1FALSEFALSEButtonID_INIT_TICKET32807&Get TicketFALSETRUE22TRUEFALSEPanel-1FALSEFALSEButtonID_RENEW_TICKET32776&Renew TicketFALSETRUE-13TRUEFALSEPanel-1FALSEFALSEButtonID_DESTROY_TICKET32777&Destroy TicketFALSETRUE-11TRUEFALSEPanel-1FALSEFALSEButtonID_MAKE_DEFAULT32835&Make DefaultFALSEFALSE66TRUEFALSEPanel-1FALSEFALSEButtonID_CHANGE_PASSWORD32779&Change PasswordFALSEFALSE55TRUEFALSEPanelView-1FALSEFALSEButton_CheckID_TIME_ISSUED32810&IssuedFALSEFALSE-1-1TRUEButton_CheckID_RENEWABLE_UNTIL32811&Renewable UntilFALSEFALSE-1-1TRUEButton_CheckID_VALID_UNTIL32828&Valid UntilFALSEFALSE-1-1TRUEButton_CheckID_ENCRYPTION_TYPE32826&Encryption TypeFALSEFALSE-1-1TRUEButton_CheckID_SHOW_TICKET_FLAGS32812&FlagsFALSEFALSE-1-1TRUEPanelOptions-1FALSEFALSEButton_CheckID_KILL_TIX_ONEXIT32785&Destroy Tickets on ExitFALSEFALSE-1-1TRUEButton_CheckID_UPPERCASE_REALM32787Allow &Mixed Case Realm NameFALSEFALSE-1-1TRUEButton_CheckID_AUTO_RENEW32808Automatic Ticket &RenewalFALSEFALSE-1-1TRUEButton_CheckID_LOW_TICKET_ALARM32798Expiration &AlarmFALSEFALSE-1-1TRUEButton_CheckID_IMPORT_TICKETS32836Import TicketsFALSEFALSE-1-1TRUE +
1
RibbonBarTRUETRUETRUETRUEFALSEButton_MainID_BUTTON232813FALSEFALSE-1-1TRUEIDB_BITMAP2268Category_MainCategory1ButtonID_HELP_KERBEROS_32784&HelpFALSEFALSE-1-1TRUEFALSEButtonID_APP_ABOUT57664&AboutFALSEFALSE-1-1TRUEFALSEButtonID_APP_EXIT57665E&xitFALSEFALSE-1-1TRUEFALSEFALSE300CategoryHomeIDB_HOMESMALL266IDB_HOMELARGE267Panel-1FALSEFALSEButtonID_INIT_TICKET32807&Get TicketFALSETRUE22TRUEFALSEPanel-1FALSEFALSEButtonID_RENEW_TICKET32776&Renew TicketFALSETRUE33TRUEFALSEPanel-1FALSEFALSEButtonID_DESTROY_TICKET32777&Destroy TicketFALSETRUE11TRUEFALSEPanel-1FALSEFALSEButtonID_MAKE_DEFAULT32835&Make DefaultFALSEFALSE66TRUEFALSEPanel-1FALSEFALSEButtonID_CHANGE_PASSWORD32779&Change PasswordFALSEFALSE55TRUEFALSEPanelView-1FALSEFALSEButton_CheckID_TIME_ISSUED32810&IssuedFALSEFALSE-1-1TRUEButton_CheckID_RENEWABLE_UNTIL32811&Renewable UntilFALSEFALSE-1-1TRUEButton_CheckID_VALID_UNTIL32828&Valid UntilFALSEFALSE-1-1TRUEButton_CheckID_ENCRYPTION_TYPE32826&Encryption TypeFALSEFALSE-1-1TRUEButton_CheckID_SHOW_TICKET_FLAGS32812&FlagsFALSEFALSE-1-1TRUEPanelOptions-1FALSEFALSEButton_CheckID_KILL_TIX_ONEXIT32785&Destroy Tickets on ExitFALSEFALSE-1-1TRUEButton_CheckID_UPPERCASE_REALM32787Allow &Mixed Case Realm NameFALSEFALSE-1-1TRUEButton_CheckID_AUTO_RENEW32808Automatic Ticket &RenewalFALSEFALSE-1-1TRUEButton_CheckID_LOW_TICKET_ALARM32798Expiration &AlarmFALSEFALSE-1-1TRUEButton_CheckID_AUTO_IMPORT_TICKET32838Automatic Import TicketsFALSEFALSE-1-1TRUEPanelMore-1FALSEFALSEButtonID_IMPORT_TICKET32806Import TicketsFALSEFALSE44TRUEFALSEButtonID_EXPORT_TICKET32837Export TicketsFALSEFALSE77TRUEFALSEButtonID_FORGET_PRINCIPALS32818Forget PrincipalsFALSEFALSE88TRUEFALSE diff --git a/src/windows/leash/resource.h b/src/windows/leash/resource.h index 1a9ba61e06..730d34e9b5 100644 --- a/src/windows/leash/resource.h +++ b/src/windows/leash/resource.h @@ -334,11 +334,15 @@ #define ID_BUTTON2 32813 #define ID_BUTTON5 32816 #define ID_BUTTON4 32818 +#define ID_FORGET_PRINCIPALS 32818 #define ID_ENCRYPTION_TYPE 32826 #define ID_VALID_UNTIL 32828 #define ID_MAKE_DEFAULT 32835 #define ID_CHECK2 32836 #define ID_IMPORT_TICKETS 32836 +#define ID_BUTTON3 32837 +#define ID_EXPORT_TICKET 32837 +#define ID_AUTO_IMPORT_TICKET 32838 // Next default values for new objects // @@ -346,7 +350,7 @@ #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_3D_CONTROLS 1 #define _APS_NEXT_RESOURCE_VALUE 269 -#define _APS_NEXT_COMMAND_VALUE 32837 +#define _APS_NEXT_COMMAND_VALUE 32839 #define _APS_NEXT_CONTROL_VALUE 1209 #define _APS_NEXT_SYMED_VALUE 101 #endif -- cgit