Skip to content

Commit 4c36fa3

Browse files
pengfeixxpengfeixx
committed
fix(ui): unify compat mode uninstall success message with normal mode
Compatible mode uninstall now shows "Uninstalled successfully" instead of "%2 has been successfully uninstalled from %1 compatibility mode", consistent with normal mode behavior. 兼容模式卸载成功提示统一为"卸载成功"，不再显示冗余的rootfs 和包名信息。 Log: 统一兼容模式卸载成功提示文本 PMS: BUG-362441 Influence: 兼容模式卸载成功提示更简洁，与普通模式一致。
1 parent a8782ed commit 4c36fa3

49 files changed

Lines changed: 1341 additions & 1409 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/deb-installer/view/pages/singleinstallpage.cpp‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -941,12 +941,8 @@ void SingleInstallPage::slotWorkerFinished()
941941
if (m_inCompatibleMode) {
942942
m_backButton->setVisible(false);
943943
m_btnsLayout->setAlignment(m_doneButton, Qt::AlignCenter);
944-
m_tipsLabel->setTextAndTips(tr("%2 has been successfully uninstalled from %1 compatibility mode")
945-
.arg(m_rootfsOsName)
946-
.arg(m_pkgNameDescription));
947-
} else {
948-
m_tipsLabel->setTextAndTips(tr("Uninstalled successfully"));
949944
}
945+
m_tipsLabel->setTextAndTips(tr("Uninstalled successfully"));
950946

951947
m_tipsLabel->setCustomDPalette(DPalette::TextWarning);
952948
}

‎translations/deepin-deb-installer.ts‎

Lines changed: 27 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -492,15 +492,15 @@
492492
<context>
493493
<name>SingleInstallPage</name>
494494
<message>
495-
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="1007"/>
495+
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="1003"/>
496496
<source>Collapse</source>
497497
<translation>Collapse</translation>
498498
</message>
499499
<message>
500500
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="394"/>
501-
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="1155"/>
502-
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="1207"/>
503-
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="1439"/>
501+
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="1151"/>
502+
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="1203"/>
503+
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="1435"/>
504504
<source>Reinstall</source>
505505
<translation>Reinstall</translation>
506506
</message>
@@ -516,30 +516,30 @@
516516
<translation type="unfinished"></translation>
517517
</message>
518518
<message>
519-
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="1212"/>
520-
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="1444"/>
519+
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="1208"/>
520+
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="1440"/>
521521
<source>Later version installed: %1</source>
522522
<translation>Later version installed: %1</translation>
523523
</message>
524524
<message>
525-
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="1213"/>
526-
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="1445"/>
525+
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="1209"/>
526+
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="1441"/>
527527
<source>Downgrade</source>
528528
<translation>Downgrade</translation>
529529
</message>
530530
<message>
531-
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="1218"/>
532-
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="1450"/>
531+
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="1214"/>
532+
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="1446"/>
533533
<source>Earlier version installed: %1</source>
534534
<translation>Earlier version installed: %1</translation>
535535
</message>
536536
<message>
537-
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="1337"/>
537+
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="1333"/>
538538
<source>Installing dependencies: %1</source>
539539
<translation>Installing dependencies: %1</translation>
540540
</message>
541541
<message>
542-
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="1500"/>
542+
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="1496"/>
543543
<source>Failed to install %1</source>
544544
<translation>Failed to install %1</translation>
545545
</message>
@@ -550,7 +550,7 @@
550550
</message>
551551
<message>
552552
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="386"/>
553-
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="1244"/>
553+
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="1240"/>
554554
<source>Install</source>
555555
<comment>button</comment>
556556
<translation>Install</translation>
@@ -563,7 +563,7 @@
563563
</message>
564564
<message>
565565
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="398"/>
566-
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="989"/>
566+
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="985"/>
567567
<source>OK</source>
568568
<comment>button</comment>
569569
<translation>OK</translation>
@@ -608,56 +608,51 @@
608608
<translation>Installed successfully</translation>
609609
</message>
610610
<message>
611-
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="944"/>
612-
<source>%2 has been successfully uninstalled from %1 compatibility mode</source>
613-
<translation type="unfinished"></translation>
614-
</message>
615-
<message>
616-
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="948"/>
611+
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="945"/>
617612
<source>Uninstalled successfully</source>
618613
<translation>Uninstalled successfully</translation>
619614
</message>
620615
<message>
621-
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="975"/>
616+
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="971"/>
622617
<source>Uninstall Failed</source>
623618
<translation>Uninstall Failed</translation>
624619
</message>
625620
<message>
626-
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="1042"/>
621+
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="1038"/>
627622
<source>Install %1 will remove: </source>
628623
<translation type="unfinished"></translation>
629624
</message>
630625
<message>
631-
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="1063"/>
626+
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="1059"/>
632627
<source>Dependencies in the repository</source>
633628
<translation>Dependencies in the repository</translation>
634629
</message>
635630
<message>
636-
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="1070"/>
631+
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="1066"/>
637632
<source>Missing dependencies</source>
638633
<translation>Missing dependencies</translation>
639634
</message>
640635
<message>
641-
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="1147"/>
636+
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="1143"/>
642637
<source>Compatible Install</source>
643638
<translation type="unfinished"></translation>
644639
</message>
645640
<message>
646-
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="1149"/>
641+
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="1145"/>
647642
<source>Cancel</source>
648643
<comment>button</comment>
649644
<translation type="unfinished">Cancel</translation>
650645
</message>
651646
<message>
652-
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="1219"/>
653-
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="1451"/>
647+
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="1215"/>
648+
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="1447"/>
654649
<source>Update</source>
655650
<comment>button</comment>
656651
<translation>Update</translation>
657652
</message>
658653
<message>
659-
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="995"/>
660-
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="1506"/>
654+
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="991"/>
655+
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="1502"/>
661656
<source>Invalid digital signature</source>
662657
<translation type="unfinished">Invalid digital signature</translation>
663658
</message>
@@ -667,8 +662,8 @@
667662
<translation>Name: </translation>
668663
</message>
669664
<message>
670-
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="1206"/>
671-
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="1438"/>
665+
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="1202"/>
666+
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="1434"/>
672667
<source>Same version installed</source>
673668
<translation>Same version installed</translation>
674669
</message>

‎translations/deepin-deb-installer_am_ET.ts‎

Lines changed: 28 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -480,15 +480,15 @@
480480
<context>
481481
<name>SingleInstallPage</name>
482482
<message>
483-
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="1007"/>
483+
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="1003"/>
484484
<source>Collapse</source>
485485
<translation>ማሳነሻ</translation>
486486
</message>
487487
<message>
488488
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="394"/>
489-
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="1155"/>
490-
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="1207"/>
491-
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="1439"/>
489+
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="1151"/>
490+
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="1203"/>
491+
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="1435"/>
492492
<source>Reinstall</source>
493493
<translation>እንደገና መግጠሚያ</translation>
494494
</message>
@@ -504,30 +504,30 @@
504504
<translation type="unfinished"></translation>
505505
</message>
506506
<message>
507-
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="1212"/>
508-
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="1444"/>
507+
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="1208"/>
508+
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="1440"/>
509509
<source>Later version installed: %1</source>
510510
<translation>በኔ ያስገቡ አይነት ምልክት: %1</translation>
511511
</message>
512512
<message>
513-
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="1213"/>
514-
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="1445"/>
513+
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="1209"/>
514+
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="1441"/>
515515
<source>Downgrade</source>
516516
<translation>በፊት ያስገቡ</translation>
517517
</message>
518518
<message>
519-
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="1218"/>
520-
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="1450"/>
519+
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="1214"/>
520+
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="1446"/>
521521
<source>Earlier version installed: %1</source>
522522
<translation>በፊት ያስገቡ አይነት ምልክት: %1</translation>
523523
</message>
524524
<message>
525-
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="1337"/>
525+
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="1333"/>
526526
<source>Installing dependencies: %1</source>
527527
<translation>ማስወገድ አይነት ምልክቶች ም: %1</translation>
528528
</message>
529529
<message>
530-
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="1500"/>
530+
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="1496"/>
531531
<source>Failed to install %1</source>
532532
<translation>የ%1 የመстанов መጥ vä</translation>
533533
</message>
@@ -538,7 +538,7 @@
538538
</message>
539539
<message>
540540
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="386"/>
541-
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="1244"/>
541+
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="1240"/>
542542
<source>Install</source>
543543
<comment>button</comment>
544544
<translation>መግጠሚያ</translation>
@@ -551,7 +551,7 @@
551551
</message>
552552
<message>
553553
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="398"/>
554-
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="989"/>
554+
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="985"/>
555555
<source>OK</source>
556556
<comment>button</comment>
557557
<translation>እሺ</translation>
@@ -604,56 +604,55 @@
604604
<translation>ተሳክቶ ተገጥሟል</translation>
605605
</message>
606606
<message>
607-
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="944"/>
608607
<source>%2 has been successfully uninstalled from %1 compatibility mode</source>
609-
<translation>የ%2 የ%1 የሞድ ምረጥ የተመመ የተሳካ</translation>
608+
<translation type="vanished">የ%2 የ%1 የሞድ ምረጥ የተመመ የተሳካ</translation>
610609
</message>
611610
<message>
612-
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="948"/>
611+
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="945"/>
613612
<source>Uninstalled successfully</source>
614613
<translation>ተሳክቶ ጠፍቷል</translation>
615614
</message>
616615
<message>
617-
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="975"/>
616+
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="971"/>
618617
<source>Uninstall Failed</source>
619618
<translation>ማጥፋት አልተቻለም</translation>
620619
</message>
621620
<message>
622-
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="1042"/>
621+
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="1038"/>
623622
<source>Install %1 will remove: </source>
624623
<translation>የ%1 የመстанов ምም ይሰር: </translation>
625624
</message>
626625
<message>
627-
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="1063"/>
626+
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="1059"/>
628627
<source>Dependencies in the repository</source>
629628
<translation>የመነሳ ምም የተመዘገበ የምር unserialize</translation>
630629
</message>
631630
<message>
632-
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="1070"/>
631+
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="1066"/>
633632
<source>Missing dependencies</source>
634633
<translation>የመነሳ ምም የሌለ</translation>
635634
</message>
636635
<message>
637-
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="1147"/>
636+
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="1143"/>
638637
<source>Compatible Install</source>
639638
<translation type="unfinished"></translation>
640639
</message>
641640
<message>
642-
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="1149"/>
641+
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="1145"/>
643642
<source>Cancel</source>
644643
<comment>button</comment>
645644
<translation type="unfinished">መሰረዣ</translation>
646645
</message>
647646
<message>
648-
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="1219"/>
649-
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="1451"/>
647+
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="1215"/>
648+
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="1447"/>
650649
<source>Update</source>
651650
<comment>button</comment>
652651
<translation>አዘዝ</translation>
653652
</message>
654653
<message>
655-
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="995"/>
656-
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="1506"/>
654+
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="991"/>
655+
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="1502"/>
657656
<source>Invalid digital signature</source>
658657
<translation>የዲጅታል ምም የሌለ ባለስ</translation>
659658
</message>
@@ -663,8 +662,8 @@
663662
<translation>ስም: </translation>
664663
</message>
665664
<message>
666-
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="1206"/>
667-
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="1438"/>
665+
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="1202"/>
666+
<location filename="../src/deb-installer/view/pages/singleinstallpage.cpp" line="1434"/>
668667
<source>Same version installed</source>
669668
<translation>ተመሳሳይ እትም ተገጥሟል</translation>
670669
</message>

0 commit comments

Comments
 (0)