diff options
| author | sk94 <eszkadev@gmail.com> | 2014-05-20 19:47:50 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-05-21 07:46:34 -0500 |
| commit | 5690def7c8e8c1d875b4f9bed4dea712d99480d8 (patch) | |
| tree | 2eddb56425026dcdf8d5177bd384835e97ff5102 /desktop/source/deployment/gui/dp_gui.hrc | |
| parent | 2bbcf97eb35b98da33f3aaba67cd7abc1a265c69 (diff) | |
RID_DLG_UPDATE conversion to .ui
Conflicts:
desktop/source/deployment/gui/descedit.hxx
Change-Id: Icf9ee3081b468f99833d1e38182887ad1da6f675
Reviewed-on: https://gerrit.libreoffice.org/9417
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'desktop/source/deployment/gui/dp_gui.hrc')
| -rw-r--r-- | desktop/source/deployment/gui/dp_gui.hrc | 53 |
1 files changed, 18 insertions, 35 deletions
diff --git a/desktop/source/deployment/gui/dp_gui.hrc b/desktop/source/deployment/gui/dp_gui.hrc index 1ef23bc3ff07..b6a8ca55ddb4 100644 --- a/desktop/source/deployment/gui/dp_gui.hrc +++ b/desktop/source/deployment/gui/dp_gui.hrc @@ -67,41 +67,24 @@ #define RID_STR_WARNINGBOX_VERSION_GREATER_DIFFERENT_NAMES (RID_DEPLOYMENT_GUI_START + 8) #define RID_WARNINGBOX_INSTALL_EXTENSION (RID_DEPLOYMENT_GUI_START + 9) -#define RID_DLG_UPDATE (RID_DEPLOYMENT_GUI_START + 10) - -#define RID_DLG_UPDATE_CHECKING 1 -#define RID_DLG_UPDATE_THROBBER 2 -#define RID_DLG_UPDATE_UPDATE 3 -#define RID_DLG_UPDATE_UPDATES 4 -#define RID_DLG_UPDATE_ALL 5 -#define RID_DLG_UPDATE_DESCRIPTION 6 -#define RID_DLG_UPDATE_DESCRIPTIONS 7 -#define RID_DLG_UPDATE_LINE 8 -#define RID_DLG_UPDATE_HELP 9 -#define RID_DLG_UPDATE_OK 10 -#define RID_DLG_UPDATE_CLOSE 11 -#define RID_DLG_UPDATE_NORMALALERT 12 -#define RID_DLG_UPDATE_ERROR 14 -#define RID_DLG_UPDATE_NONE 15 -#define RID_DLG_UPDATE_NOINSTALLABLE 16 -#define RID_DLG_UPDATE_FAILURE 17 -#define RID_DLG_UPDATE_UNKNOWNERROR 18 -#define RID_DLG_UPDATE_NODESCRIPTION 19 -#define RID_DLG_UPDATE_NOINSTALL 20 -#define RID_DLG_UPDATE_NODEPENDENCY 21 -#define RID_DLG_UPDATE_NODEPENDENCY_CUR_VER 22 -#define RID_DLG_UPDATE_BROWSERBASED 25 -#define RID_DLG_UPDATE_PUBLISHER_LABEL 26 -#define RID_DLG_UPDATE_PUBLISHER_LINK 27 -#define RID_DLG_UPDATE_RELEASENOTES_LABEL 28 -#define RID_DLG_UPDATE_RELEASENOTES_LINK 29 -#define RID_DLG_UPDATE_VERSION 31 -#define RID_DLG_UPDATE_IGNORE 32 -#define RID_DLG_UPDATE_ENABLE 33 -#define RID_DLG_UPDATE_IGNORE_ALL 34 -#define RID_DLG_UPDATE_IGNORED_UPDATE 35 - -#define RID_DLG_UPDATEINSTALL (RID_DEPLOYMENT_GUI_START + 20) +#define RID_DLG_UPDATE_NORMALALERT (RID_DEPLOYMENT_GUI_START + 11) +#define RID_DLG_UPDATE_ERROR (RID_DEPLOYMENT_GUI_START + 12) +#define RID_DLG_UPDATE_NONE (RID_DEPLOYMENT_GUI_START + 13) +#define RID_DLG_UPDATE_NOINSTALLABLE (RID_DEPLOYMENT_GUI_START + 14) +#define RID_DLG_UPDATE_FAILURE (RID_DEPLOYMENT_GUI_START + 15) +#define RID_DLG_UPDATE_UNKNOWNERROR (RID_DEPLOYMENT_GUI_START + 16) +#define RID_DLG_UPDATE_NODESCRIPTION (RID_DEPLOYMENT_GUI_START + 17) +#define RID_DLG_UPDATE_NOINSTALL (RID_DEPLOYMENT_GUI_START + 18) +#define RID_DLG_UPDATE_NODEPENDENCY (RID_DEPLOYMENT_GUI_START + 19) +#define RID_DLG_UPDATE_NODEPENDENCY_CUR_VER (RID_DEPLOYMENT_GUI_START + 20) +#define RID_DLG_UPDATE_BROWSERBASED (RID_DEPLOYMENT_GUI_START + 21) +#define RID_DLG_UPDATE_VERSION (RID_DEPLOYMENT_GUI_START + 22) +#define RID_DLG_UPDATE_IGNORE (RID_DEPLOYMENT_GUI_START + 23) +#define RID_DLG_UPDATE_ENABLE (RID_DEPLOYMENT_GUI_START + 24) +#define RID_DLG_UPDATE_IGNORE_ALL (RID_DEPLOYMENT_GUI_START + 25) +#define RID_DLG_UPDATE_IGNORED_UPDATE (RID_DEPLOYMENT_GUI_START + 36) + +#define RID_DLG_UPDATEINSTALL (RID_DEPLOYMENT_GUI_START + 37) #define RID_IMG_WARNING (RID_DEPLOYMENT_GUI_START+56) #define RID_IMG_LOCKED (RID_DEPLOYMENT_GUI_START+58) |