From: Kevin Wasserman Date: Fri, 15 Jun 2012 02:44:49 +0000 (-0400) Subject: Fix ribbon breakage X-Git-Tag: kfw-4.0-final~89 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b65e6b579e805654025a05ce3beb22c92709d4c5;p=thirdparty%2Fkrb5.git Fix ribbon breakage Controls were accidentally broken when moved Signed-off-by: Kevin Wasserman (cherry picked from commit ade099f5ee2febb23e4ece85a20377f2af0b94c2) ticket: 7271 status: resolved --- diff --git a/src/windows/leash/res/ribbon1.mfcribbon-ms b/src/windows/leash/res/ribbon1.mfcribbon-ms index 197900fdf3..785df23706 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 TicketFALSETRUE22TRUEFALSEButton&Renew TicketFALSETRUE33TRUEFALSEButton&Destroy TicketFALSETRUE11TRUEFALSEButton&Make DefaultFALSETRUE66TRUEFALSEPanelAdvanced-1FALSEFALSEButtonImport TicketsFALSEFALSE44TRUEFALSEButtonExport TicketsFALSEFALSE77TRUEFALSEPanel-1FALSEFALSEButton&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_CheckAutomatic Ticket &RenewalFALSEFALSE-1-1TRUEButton_CheckAutomatic Import TicketsFALSEFALSE-1-1TRUEButton_CheckExpiration &AlarmFALSEFALSE-1-1TRUEButton_CheckID_KILL_TIX_ONEXIT32785&Destroy Tickets on ExitFALSEFALSE-1-1TRUEButton_CheckID_UPPERCASE_REALM32787Allow &Mixed Case Realm NameFALSEFALSE-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 TicketFALSETRUE22TRUEFALSEButtonID_RENEW_TICKET32776&Renew TicketFALSETRUE33TRUEFALSEButtonID_DESTROY_TICKET32777&Destroy TicketFALSETRUE11TRUEFALSEButtonID_MAKE_DEFAULT32835&Make DefaultFALSETRUE66TRUEFALSEPanelAdvanced-1FALSEFALSEButtonID_IMPORT_TICKET32806Import TicketsFALSEFALSE44TRUEFALSEButtonID_EXPORT_TICKET32837Export TicketsFALSEFALSE77TRUEFALSEPanel-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_AUTO_RENEW32808Automatic Ticket &RenewalFALSEFALSE-1-1TRUEButton_CheckID_AUTO_IMPORT_TICKET32838Automatic Import TicketsFALSEFALSE-1-1TRUEButton_CheckID_LOW_TICKET_ALARM32798Expiration &AlarmFALSEFALSE-1-1TRUEButton_CheckID_KILL_TIX_ONEXIT32785&Destroy Tickets on ExitFALSEFALSE-1-1TRUEButton_CheckID_UPPERCASE_REALM32787Allow &Mixed Case Realm NameFALSEFALSE-1-1TRUE
diff --git a/src/windows/leash/resource.h b/src/windows/leash/resource.h index 730d34e9b5..982088aa58 100644 --- a/src/windows/leash/resource.h +++ b/src/windows/leash/resource.h @@ -340,9 +340,9 @@ #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 +#define ID_AUTO_IMPORT_TICKETS 32840 // Next default values for new objects // @@ -350,7 +350,7 @@ #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_3D_CONTROLS 1 #define _APS_NEXT_RESOURCE_VALUE 269 -#define _APS_NEXT_COMMAND_VALUE 32839 +#define _APS_NEXT_COMMAND_VALUE 32841 #define _APS_NEXT_CONTROL_VALUE 1209 #define _APS_NEXT_SYMED_VALUE 101 #endif