Diffstat (limited to 'noncore/settings/aqpkg/mainwin.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/settings/aqpkg/mainwin.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/noncore/settings/aqpkg/mainwin.cpp b/noncore/settings/aqpkg/mainwin.cpp index 45a6663..42093cf 100644 --- a/noncore/settings/aqpkg/mainwin.cpp +++ b/noncore/settings/aqpkg/mainwin.cpp | |||
@@ -1007,16 +1007,21 @@ InstallData *MainWindow :: dealWithItem( QCheckListItem *item ) | |||
1007 | newitem->option = "I"; | 1007 | newitem->option = "I"; |
1008 | newitem->packageName = name; | 1008 | newitem->packageName = name; |
1009 | return newitem; | 1009 | return newitem; |
1010 | } | 1010 | } |
1011 | else | 1011 | else |
1012 | { | 1012 | { |
1013 | InstallData *newitem = new InstallData(); | 1013 | InstallData *newitem = new InstallData(); |
1014 | newitem->option = "D"; | 1014 | newitem->option = "D"; |
1015 | |||
1016 | // If local file, remove using package name, not filename | ||
1017 | if ( p->isPackageStoredLocally() ) | ||
1018 | name = item->text(); | ||
1019 | |||
1015 | if ( !p->isPackageStoredLocally() ) | 1020 | if ( !p->isPackageStoredLocally() ) |
1016 | newitem->packageName = p->getInstalledPackageName(); | 1021 | newitem->packageName = p->getInstalledPackageName(); |
1017 | else | 1022 | else |
1018 | newitem->packageName = name; | 1023 | newitem->packageName = name; |
1019 | 1024 | ||
1020 | if ( p->getInstalledTo() ) | 1025 | if ( p->getInstalledTo() ) |
1021 | { | 1026 | { |
1022 | newitem->destination = p->getInstalledTo(); | 1027 | newitem->destination = p->getInstalledTo(); |
@@ -1036,16 +1041,20 @@ InstallData *MainWindow :: dealWithItem( QCheckListItem *item ) | |||
1036 | if ( val == -2 ) | 1041 | if ( val == -2 ) |
1037 | { | 1042 | { |
1038 | // Error - should handle | 1043 | // Error - should handle |
1039 | } | 1044 | } |
1040 | else if ( val == -1 ) | 1045 | else if ( val == -1 ) |
1041 | { | 1046 | { |
1042 | // Version available is older - remove only | 1047 | // Version available is older - remove only |
1043 | newitem->option = "D"; | 1048 | newitem->option = "D"; |
1049 | |||
1050 | // If local file, remove using package name, not filename | ||
1051 | if ( p->isPackageStoredLocally() ) | ||
1052 | name = item->text(); | ||
1044 | } | 1053 | } |
1045 | else | 1054 | else |
1046 | { | 1055 | { |
1047 | QString caption; | 1056 | QString caption; |
1048 | QString text; | 1057 | QString text; |
1049 | QString secondButton; | 1058 | QString secondButton; |
1050 | QString secondOption; | 1059 | QString secondOption; |
1051 | if ( val == 0 ) | 1060 | if ( val == 0 ) |
@@ -1075,16 +1084,19 @@ InstallData *MainWindow :: dealWithItem( QCheckListItem *item ) | |||
1075 | switch( dlg.exec() ) | 1084 | switch( dlg.exec() ) |
1076 | { | 1085 | { |
1077 | case 0: // Cancel | 1086 | case 0: // Cancel |
1078 | delete newitem; | 1087 | delete newitem; |
1079 | return 0x0; | 1088 | return 0x0; |
1080 | break; | 1089 | break; |
1081 | case 1: // Remove | 1090 | case 1: // Remove |
1082 | newitem->option = "D"; | 1091 | newitem->option = "D"; |
1092 | // If local file, remove using package name, not filename | ||
1093 | if ( p->isPackageStoredLocally() ) | ||
1094 | name = item->text(); | ||
1083 | break; | 1095 | break; |
1084 | case 2: // Reinstall or Upgrade | 1096 | case 2: // Reinstall or Upgrade |
1085 | newitem->option = secondOption; | 1097 | newitem->option = secondOption; |
1086 | break; | 1098 | break; |
1087 | } | 1099 | } |
1088 | } | 1100 | } |
1089 | else | 1101 | else |
1090 | { | 1102 | { |