Akatsuki-Misaki/dde-dock
1
0
Fork 0
mirror of https://github.com/linuxdeepin/dde-dock.git synced 2025-06-04 17:33:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "update translation and fix app can't uninstall"

Browse Source
This commit is contained in:
mr.asianwang 2015-09-29 11:25:45 +08:00 committed by Deepin Code Review
commit edb6b1748d
3 changed files with 33 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dde-dock-trash-plugin/dialogs/cleartrashdialog.cpp
View File

@ -9,13 +9,15 @@ ClearTrashDialog::ClearTrashDialog(QWidget *parent):
{
QString icon = ":/images/skin/dialogs/images/user-trash-full.png";
QString message = tr("Are you sure to clear items in trash?");
QString message = tr("Are you sure to empty trash?");
QString tipMessage = tr("This action cannot be restored");
QStringList buttons;
buttons << tr("Cancel") << tr("Clear");
QStringList buttons, buttonTexts;
buttons << "Cancel" << "Empty";
buttonTexts << tr("Cancel") << tr("Empty");
initUI(icon, message, tipMessage, buttons, buttons);
moveCenter();
getButtonsGroup()->button(1)->setFocus();
setButtonTexts(buttonTexts);
}
void ClearTrashDialog::handleKeyEnter(){

10
dde-dock-trash-plugin/dialogs/confirmuninstalldialog.cpp
View File

@ -7,13 +7,15 @@
ConfirmUninstallDialog::ConfirmUninstallDialog(QWidget *parent) : DBaseDialog(parent)
{
QString icon = ":/images/skin/dialogs/images/user-trash-full.png";
QString message = tr("Are you sure to uninstall this application?");
QString tipMessage = tr("This action cannot be restored");
QStringList buttons;
buttons << tr("Cancel") << tr("Ok");
QString message = "Are you sure to uninstall this application?";
QString tipMessage = tr("All dependencies will be removed together");
QStringList buttons, buttonTexts;
buttons << "Cancel" << "Confirm";
buttonTexts << tr("Cancel") << tr("Confirm");
initUI(icon, message, tipMessage, buttons, buttons);
moveCenter();
getButtonsGroup()->button(1)->setFocus();
setButtonTexts(buttonTexts);
}
void ConfirmUninstallDialog::handleKeyEnter(){

44
dde-dock-trash-plugin/mainitem.cpp
View File

@ -81,29 +81,29 @@ void MainItem::dropEvent(QDropEvent *event)
if (event->source())
return;
QStringList formats = event->mimeData()->formats();
if (formats.indexOf("_DEEPIN_DND") != -1 && formats.indexOf("text/plain") != -1)//Application
{
QString jsonStr = QString(event->mimeData()->data("_DEEPIN_DND")).split("uninstall").last().trimmed();
if (event->mimeData()->formats().indexOf("RequestDock") != -1){ //from desktop or launcher
QJsonObject dataObj = QJsonDocument::fromJson(event->mimeData()->data("RequestDock")).object();
if (!dataObj.isEmpty()){
QString appKey = dataObj.value("appKey").toString();
QString appName = dataObj.value("appName").toString();
if (appKey.isEmpty())
return;
event->ignore();
//Tim at both ends of the string is added to a character SOH (start of heading)
jsonStr = jsonStr.mid(1,jsonStr.length() - 2);
QJsonObject dataObj = QJsonDocument::fromJson(jsonStr.trimmed().toUtf8()).object();
if (dataObj.isEmpty())
return;
ConfirmUninstallDialog *dialog = new ConfirmUninstallDialog;
QString message = tr("Are you sure to uninstall \"%1\"").arg(dataObj.value("name").toString());
dialog->setMessage(message);
dialog->setIcon(getThemeIconPath(dataObj.value("icon").toString()));
connect(dialog, &ConfirmUninstallDialog::buttonClicked, [=](int key){
dialog->deleteLater();
if (key == 1){
qWarning() << "Uninstall application:" << dataObj.value("id").toString();
m_launcher->RequestUninstall(dataObj.value("id").toString(), true);
}
});
dialog->exec();
ConfirmUninstallDialog *dialog = new ConfirmUninstallDialog;
//TODO: need real icon name
dialog->setIcon(getThemeIconPath(appKey));
QString message = tr("Are you sure to uninstall %1?").arg(appName);
dialog->setMessage(message);
connect(dialog, &ConfirmUninstallDialog::buttonClicked, [=](int key){
dialog->deleteLater();
if (key == 1){
qWarning() << "Uninstall application:" << appKey << appName;
m_launcher->RequestUninstall(appKey, true);
}
});
dialog->exec();
}
}
else//File or Dirctory
{