From 32841791ae9e32712c2a70ba895f3a9ba85c5c7f Mon Sep 17 00:00:00 2001 From: Ged Murphy Date: Fri, 31 Aug 2007 08:21:47 +0000 Subject: [PATCH] - report successful deletion - refresh service list upon creation svn path=/trunk/; revision=28691 --- .../base/applications/mscutils/servman/delete.c | 14 ++++++++++++++ .../applications/mscutils/servman/lang/bg-BG.rc | 1 + .../applications/mscutils/servman/lang/de-DE.rc | 1 + .../applications/mscutils/servman/lang/en-US.rc | 1 + .../applications/mscutils/servman/lang/fr-FR.rc | 1 + .../applications/mscutils/servman/lang/id-ID.rc | 1 + .../applications/mscutils/servman/lang/it-IT.rc | 1 + .../applications/mscutils/servman/lang/pl-PL.rc | 1 + .../applications/mscutils/servman/lang/ru-RU.rc | 1 + .../applications/mscutils/servman/lang/th-TH.rc | 3 ++- .../base/applications/mscutils/servman/mainwnd.c | 14 +++++++++----- .../base/applications/mscutils/servman/resource.h | 1 + 12 files changed, 34 insertions(+), 6 deletions(-) diff --git a/reactos/base/applications/mscutils/servman/delete.c b/reactos/base/applications/mscutils/servman/delete.c index 4c8d9ec25e2..9faa36714cf 100644 --- a/reactos/base/applications/mscutils/servman/delete.c +++ b/reactos/base/applications/mscutils/servman/delete.c @@ -29,6 +29,20 @@ DoDeleteService(PMAIN_WND_INFO Info, { if (DeleteService(hSc)) { + LPTSTR lpSuccess; + + /* report success to user */ + if (AllocAndLoadString(&lpSuccess, + hInstance, + IDS_DELETE_SUCCESS)) + { + DisplayString(lpSuccess); + + HeapFree(ProcessHeap, + 0, + lpSuccess); + } + bRet = TRUE; } diff --git a/reactos/base/applications/mscutils/servman/lang/bg-BG.rc b/reactos/base/applications/mscutils/servman/lang/bg-BG.rc index 56f72eea4d6..1195b16ab57 100644 --- a/reactos/base/applications/mscutils/servman/lang/bg-BG.rc +++ b/reactos/base/applications/mscutils/servman/lang/bg-BG.rc @@ -218,6 +218,7 @@ BEGIN IDS_PROGRESS_INFO_PAUSE "ReactOS is attempting to pause the following service" IDS_PROGRESS_INFO_RESUME "ReactOS is attempting to resume the following service" IDS_CREATE_SUCCESS "Услугата е успешно създадена" + IDS_DELETE_SUCCESS "Service Deleted Succesfully" IDS_CREATE_REQ "Полетата, отбелязани със \nзвездичка са неазадължителни" IDS_DELETE_STOP "Трябва ръчно да спрете услугата, преди да я изтриете!" END diff --git a/reactos/base/applications/mscutils/servman/lang/de-DE.rc b/reactos/base/applications/mscutils/servman/lang/de-DE.rc index 56e6f416a99..4409c7fe7b4 100644 --- a/reactos/base/applications/mscutils/servman/lang/de-DE.rc +++ b/reactos/base/applications/mscutils/servman/lang/de-DE.rc @@ -214,6 +214,7 @@ BEGIN IDS_PROGRESS_INFO_PAUSE "ReactOS is attempting to pause the following service" IDS_PROGRESS_INFO_RESUME "ReactOS is attempting to resume the following service" IDS_CREATE_SUCCESS "Dienst wurde erfolgreich erstellt" + IDS_DELETE_SUCCESS "Service Deleted Succesfully" IDS_CREATE_REQ "Mit einem Sternchen gekennzeichnete Felder sind erforderlich" IDS_DELETE_STOP "Sie mьssen den Dienst manuell beenden, bevor er gelцscht werden kann!" END diff --git a/reactos/base/applications/mscutils/servman/lang/en-US.rc b/reactos/base/applications/mscutils/servman/lang/en-US.rc index d26cbe121a4..b7b3bcaa983 100644 --- a/reactos/base/applications/mscutils/servman/lang/en-US.rc +++ b/reactos/base/applications/mscutils/servman/lang/en-US.rc @@ -214,6 +214,7 @@ BEGIN IDS_PROGRESS_INFO_PAUSE "ReactOS is attempting to pause the following service" IDS_PROGRESS_INFO_RESUME "ReactOS is attempting to resume the following service" IDS_CREATE_SUCCESS "Service Created Succesfully" + IDS_DELETE_SUCCESS "Service Deleted Succesfully" IDS_CREATE_REQ "Fields marked with an\nasterix are mandatory" IDS_DELETE_STOP "You must manually stop the service before deleting!" END diff --git a/reactos/base/applications/mscutils/servman/lang/fr-FR.rc b/reactos/base/applications/mscutils/servman/lang/fr-FR.rc index e0022cdb7b4..d741c58fb53 100644 --- a/reactos/base/applications/mscutils/servman/lang/fr-FR.rc +++ b/reactos/base/applications/mscutils/servman/lang/fr-FR.rc @@ -218,6 +218,7 @@ BEGIN IDS_PROGRESS_INFO_PAUSE "ReactOS essaye de suspendre le service suivant" IDS_PROGRESS_INFO_RESUME "ReactOS essaye de relancer le service suivant" IDS_CREATE_SUCCESS "Service crйй" + IDS_DELETE_SUCCESS "Service Deleted Succesfully" IDS_CREATE_REQ "Les champs marquйs d'une astйrisque\nasont obligatoires" IDS_DELETE_STOP "Vous devez arrкter le service avant de le supprimer!" END diff --git a/reactos/base/applications/mscutils/servman/lang/id-ID.rc b/reactos/base/applications/mscutils/servman/lang/id-ID.rc index 5ec80bd9871..7877912a3e1 100644 --- a/reactos/base/applications/mscutils/servman/lang/id-ID.rc +++ b/reactos/base/applications/mscutils/servman/lang/id-ID.rc @@ -214,6 +214,7 @@ BEGIN IDS_PROGRESS_INFO_PAUSE "ReactOS is attempting to pause the following service" IDS_PROGRESS_INFO_RESUME "ReactOS is attempting to resume the following service" IDS_CREATE_SUCCESS "Layanan Dibuat Dengan Sukses" + IDS_DELETE_SUCCESS "Service Deleted Succesfully" IDS_CREATE_REQ "Field yang ditandai dengan\nbintang adalah mandatori" IDS_DELETE_STOP "Anda harus menghentikan layanan sebelum menghapus!" END diff --git a/reactos/base/applications/mscutils/servman/lang/it-IT.rc b/reactos/base/applications/mscutils/servman/lang/it-IT.rc index 0156ecba15f..f799342622e 100644 --- a/reactos/base/applications/mscutils/servman/lang/it-IT.rc +++ b/reactos/base/applications/mscutils/servman/lang/it-IT.rc @@ -214,6 +214,7 @@ BEGIN IDS_PROGRESS_INFO_PAUSE "ReactOS is attempting to pause the following service" IDS_PROGRESS_INFO_RESUME "ReactOS is attempting to resume the following service" IDS_CREATE_SUCCESS "Servizio creato regolarmente" + IDS_DELETE_SUCCESS "Service Deleted Succesfully" IDS_CREATE_REQ "I campi marcati con un asterisco\nsono obbligatori" IDS_DELETE_STOP "Devi fermare il servizio prima di cancellare!" END diff --git a/reactos/base/applications/mscutils/servman/lang/pl-PL.rc b/reactos/base/applications/mscutils/servman/lang/pl-PL.rc index 139758fc2ae..df9b4a7e183 100644 --- a/reactos/base/applications/mscutils/servman/lang/pl-PL.rc +++ b/reactos/base/applications/mscutils/servman/lang/pl-PL.rc @@ -221,6 +221,7 @@ BEGIN IDS_PROGRESS_INFO_PAUSE "ReactOS is attempting to pause the following service" IDS_PROGRESS_INFO_RESUME "ReactOS is attempting to resume the following service" IDS_CREATE_SUCCESS "Usіuga utworzona pomyњlnie" + IDS_DELETE_SUCCESS "Service Deleted Succesfully" IDS_CREATE_REQ "Pole zaznaczone wraz z \ nasterix jest obowi№zkowy" IDS_DELETE_STOP "Musisz rкcznie zatrzymaж usіugк przed usuwaniem!" END diff --git a/reactos/base/applications/mscutils/servman/lang/ru-RU.rc b/reactos/base/applications/mscutils/servman/lang/ru-RU.rc index a5bb7acc734..fad34943429 100644 --- a/reactos/base/applications/mscutils/servman/lang/ru-RU.rc +++ b/reactos/base/applications/mscutils/servman/lang/ru-RU.rc @@ -213,6 +213,7 @@ BEGIN IDS_PROGRESS_INFO_PAUSE "ReactOS is attempting to pause the following service" IDS_PROGRESS_INFO_RESUME "ReactOS is attempting to resume the following service" IDS_CREATE_SUCCESS "Создание службы успешно завершено" + IDS_DELETE_SUCCESS "Service Deleted Succesfully" IDS_CREATE_REQ "* = обязательные поля" IDS_DELETE_STOP "Вы должны вручную остановить службу перед удалением!" END diff --git a/reactos/base/applications/mscutils/servman/lang/th-TH.rc b/reactos/base/applications/mscutils/servman/lang/th-TH.rc index 766db1c8b36..49d125bee62 100644 --- a/reactos/base/applications/mscutils/servman/lang/th-TH.rc +++ b/reactos/base/applications/mscutils/servman/lang/th-TH.rc @@ -3,7 +3,7 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: base/applications/mscutils/servman/lang/th-TH.rc * PURPOSE: Thai resources - * COPYRIGHT: Copyright 2007 Sumath Aowsakulsutthi + * TRANSLATOR: Sumath Aowsakulsutthi * */ @@ -223,6 +223,7 @@ BEGIN IDS_PROGRESS_INFO_PAUSE "ReactOS is attempting to pause the following service" IDS_PROGRESS_INFO_RESUME "ReactOS is attempting to resume the following service" IDS_CREATE_SUCCESS "Service Created Succesfully" + IDS_DELETE_SUCCESS "Service Deleted Succesfully" IDS_CREATE_REQ "Fields marked with an\nasterix are mandatory" IDS_DELETE_STOP "You must manually stop the service before deleting!" END diff --git a/reactos/base/applications/mscutils/servman/mainwnd.c b/reactos/base/applications/mscutils/servman/mainwnd.c index df05bc2ec91..bb4ca227dad 100644 --- a/reactos/base/applications/mscutils/servman/mainwnd.c +++ b/reactos/base/applications/mscutils/servman/mainwnd.c @@ -400,11 +400,15 @@ MainWndCommand(PMAIN_WND_INFO Info, case ID_CREATE: { - DialogBoxParam(hInstance, - MAKEINTRESOURCE(IDD_DLG_CREATE), - Info->hMainWnd, - (DLGPROC)CreateDialogProc, - (LPARAM)Info); + INT ret; + + ret = DialogBoxParam(hInstance, + MAKEINTRESOURCE(IDD_DLG_CREATE), + Info->hMainWnd, + (DLGPROC)CreateDialogProc, + (LPARAM)Info); + if (ret == IDOK) + RefreshServiceList(Info); SetFocus(Info->hListView); } diff --git a/reactos/base/applications/mscutils/servman/resource.h b/reactos/base/applications/mscutils/servman/resource.h index b5df91c4185..5970b5d4d93 100644 --- a/reactos/base/applications/mscutils/servman/resource.h +++ b/reactos/base/applications/mscutils/servman/resource.h @@ -162,6 +162,7 @@ #define IDC_DEL_NAME 9002 #define IDC_DEL_DESC 9003 #define IDS_DELETE_STOP 9010 +#define IDS_DELETE_SUCCESS 9011 /* progress bar */