Diffstat (limited to 'noncore/settings/aqpkg/mainwin.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/settings/aqpkg/mainwin.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/noncore/settings/aqpkg/mainwin.cpp b/noncore/settings/aqpkg/mainwin.cpp index 0efa1e0..45a6663 100644 --- a/noncore/settings/aqpkg/mainwin.cpp +++ b/noncore/settings/aqpkg/mainwin.cpp | |||
@@ -1045,43 +1045,41 @@ InstallData *MainWindow :: dealWithItem( QCheckListItem *item ) | |||
1045 | else | 1045 | else |
1046 | { | 1046 | { |
1047 | QString caption; | 1047 | QString caption; |
1048 | QString text; | 1048 | QString text; |
1049 | QString secondButton; | 1049 | QString secondButton; |
1050 | QString secondOption; | 1050 | QString secondOption; |
1051 | if ( val == 0 ) | 1051 | if ( val == 0 ) |
1052 | { | 1052 | { |
1053 | // Version available is the same - option to remove or reinstall | 1053 | // Version available is the same - option to remove or reinstall |
1054 | caption = tr( "Do you wish to remove or reinstall\n%1?" ); | 1054 | caption = tr( "Do you wish to remove or reinstall\n%1?" ); |
1055 | text = tr( "Remove or ReInstall" ); | 1055 | text = tr( "Remove or ReInstall" ); |
1056 | secondButton = tr( "ReInstall" ); | 1056 | secondButton = tr( "ReInstall" ); |
1057 | secondOption = tr( "R" ); | 1057 | secondOption = "R"; // Internal action code, do not translate |
1058 | } | 1058 | } |
1059 | else if ( val == 1 ) | 1059 | else if ( val == 1 ) |
1060 | { | 1060 | { |
1061 | // Version available is newer - option to remove or upgrade | 1061 | // Version available is newer - option to remove or upgrade |
1062 | caption = tr( "Do you wish to remove or upgrade\n%1?" ); | 1062 | caption = tr( "Do you wish to remove or upgrade\n%1?" ); |
1063 | text = tr( "Remove or Upgrade" ); | 1063 | text = tr( "Remove or Upgrade" ); |
1064 | secondButton = tr( "Upgrade" ); | 1064 | secondButton = tr( "Upgrade" ); |
1065 | secondOption = tr( "U" ); | 1065 | secondOption = "U"; // Internal action code, do not translate |
1066 | } | 1066 | } |
1067 | 1067 | ||
1068 | // Sticky option not implemented yet, but will eventually allow | 1068 | // Sticky option not implemented yet, but will eventually allow |
1069 | // the user to say something like 'remove all' | 1069 | // the user to say something like 'remove all' |
1070 | if ( stickyOption == "" ) | 1070 | if ( stickyOption == "" ) |
1071 | { | 1071 | { |
1072 | QString msgtext; | 1072 | QString msgtext; |
1073 | msgtext = caption.arg( ( const char * )name ); | 1073 | msgtext = caption.arg( ( const char * )name ); |
1074 | // switch( QMessageBox::information( this, text, | ||
1075 | // msgtext, tr( "Remove" ), secondButton ) ) | ||
1076 | QuestionDlg dlg( text, msgtext, secondButton ); | 1074 | QuestionDlg dlg( text, msgtext, secondButton ); |
1077 | switch( dlg.exec() ) | 1075 | switch( dlg.exec() ) |
1078 | { | 1076 | { |
1079 | case 0: // Cancel | 1077 | case 0: // Cancel |
1080 | delete newitem; | 1078 | delete newitem; |
1081 | return 0x0; | 1079 | return 0x0; |
1082 | break; | 1080 | break; |
1083 | case 1: // Remove | 1081 | case 1: // Remove |
1084 | newitem->option = "D"; | 1082 | newitem->option = "D"; |
1085 | break; | 1083 | break; |
1086 | case 2: // Reinstall or Upgrade | 1084 | case 2: // Reinstall or Upgrade |
1087 | newitem->option = secondOption; | 1085 | newitem->option = secondOption; |