From e87c9d8497b570b59d471404dada098bb20a0b40 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 15 Nov 2012 20:49:14 +0000 Subject: drop old help ids not in use anymore Change-Id: I3acf29ac52a51e688fb41e2c978f458170cd9b12 --- desktop/UI_deployment.mk | 2 +- desktop/source/deployment/gui/dp_gui_dialog2.cxx | 2 +- desktop/source/inc/helpid.hrc | 5 - desktop/uiconfig/ui/ExtensionManager.ui | 304 ----------------------- desktop/uiconfig/ui/extensionmanager.ui | 304 +++++++++++++++++++++++ desktop/util/hidother.src | 5 - 6 files changed, 306 insertions(+), 316 deletions(-) delete mode 100644 desktop/uiconfig/ui/ExtensionManager.ui create mode 100644 desktop/uiconfig/ui/extensionmanager.ui (limited to 'desktop') diff --git a/desktop/UI_deployment.mk b/desktop/UI_deployment.mk index c06e91fe29b7..4aeb42c73d35 100644 --- a/desktop/UI_deployment.mk +++ b/desktop/UI_deployment.mk @@ -10,7 +10,7 @@ $(eval $(call gb_UI_UI,desktop)) $(eval $(call gb_UI_add_uifiles,desktop,\ - desktop/uiconfig/ui/ExtensionManager \ + desktop/uiconfig/ui/extensionmanager \ )) # vim: set noet sw=4 ts=4: diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx index 25e7c7607380..e5d284d1d5d0 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx @@ -701,7 +701,7 @@ void DialogHelper::PostUserEvent( const Link& rLink, void* pCaller ) // ExtMgrDialog //------------------------------------------------------------------------------ ExtMgrDialog::ExtMgrDialog(Window *pParent, TheExtensionManager *pManager) - : ModelessDialog(pParent, "ExtensionManagerDialog", "desktop/ui/ExtensionManager.ui") + : ModelessDialog(pParent, "ExtensionManagerDialog", "desktop/ui/extensionmanager.ui") , DialogHelper(pManager->getContext(), (Dialog*) this) , m_sAddPackages(getResourceString(RID_STR_ADD_PACKAGES)) , m_bHasProgress(false) diff --git a/desktop/source/inc/helpid.hrc b/desktop/source/inc/helpid.hrc index 768c57334388..11a91029a379 100644 --- a/desktop/source/inc/helpid.hrc +++ b/desktop/source/inc/helpid.hrc @@ -19,11 +19,6 @@ #ifndef INCLUDED_DESKTOP_HELPID_HRC #define INCLUDED_DESKTOP_HELPID_HRC -#define HID_PACKAGE_MANAGER_TREELISTBOX "DESKTOP_HID_PACKAGE_MANAGER_TREELISTBOX" -#define HID_PACKAGE_MANAGER_PROGRESS "DESKTOP_HID_PACKAGE_MANAGER_PROGRESS" -#define HID_PACKAGE_MANAGER_PROGRESS_CANCEL "DESKTOP_HID_PACKAGE_MANAGER_PROGRESS_CANCEL" -#define HID_PACKAGE_MANAGER_MENU_ITEM "DESKTOP_HID_PACKAGE_MANAGER_MENU_ITEM" - #define HID_FIRSTSTART_PREV "DESKTOP_HID_FIRSTSTART_PREV" #define HID_FIRSTSTART_NEXT "DESKTOP_HID_FIRSTSTART_NEXT" #define HID_FIRSTSTART_CANCEL "DESKTOP_HID_FIRSTSTART_CANCEL" diff --git a/desktop/uiconfig/ui/ExtensionManager.ui b/desktop/uiconfig/ui/ExtensionManager.ui deleted file mode 100644 index fc336970779a..000000000000 --- a/desktop/uiconfig/ui/ExtensionManager.ui +++ /dev/null @@ -1,304 +0,0 @@ - - - - - False - 5 - Extension Manager - dialog - - - False - vertical - 2 - - - False - end - - - gtk-help - False - True - True - True - False - True - - - False - True - 0 - True - - - - - Add... - False - True - True - True - True - True - False - - - False - True - 1 - - - - - Check for updates... - False - True - True - True - False - - - False - True - 2 - - - - - gtk-close - False - True - True - True - False - True - - - False - True - 3 - - - - - False - True - end - 0 - - - - - True - False - vertical - 10 - - - 600 - 320 - True - False - - - True - True - 0 - - - - - True - False - 0 - none - - - True - False - True - True - 1 - 12 - - - True - False - center - True - True - 12 - - - Shared - False - True - True - False - center - False - 0 - True - True - - - 1 - 0 - 1 - 1 - - - - - User - False - True - True - False - start - False - 0 - True - True - - - 2 - 0 - 1 - 1 - - - - - Installation - False - True - True - False - end - False - 0 - True - True - - - 0 - 0 - 1 - 1 - - - - - - - - - True - False - Type of Extension - - - - - - - - False - True - 1 - - - - - True - False - 6 - - - False - True - 50 - Adding %EXTENSION_NAME - - - 1 - 0 - 1 - 1 - - - - - gtk-cancel - False - True - True - True - False - True - - - 3 - 0 - 1 - 1 - - - - - False - True - True - - - 2 - 0 - 1 - 1 - - - - - Get more extensions online... - False - True - True - True - True - False - none - 0 - - - 0 - 0 - 1 - 1 - - - - - False - True - 2 - - - - - True - True - 1 - - - - - - help - add - update - close - - - diff --git a/desktop/uiconfig/ui/extensionmanager.ui b/desktop/uiconfig/ui/extensionmanager.ui new file mode 100644 index 000000000000..fc336970779a --- /dev/null +++ b/desktop/uiconfig/ui/extensionmanager.ui @@ -0,0 +1,304 @@ + + + + + False + 5 + Extension Manager + dialog + + + False + vertical + 2 + + + False + end + + + gtk-help + False + True + True + True + False + True + + + False + True + 0 + True + + + + + Add... + False + True + True + True + True + True + False + + + False + True + 1 + + + + + Check for updates... + False + True + True + True + False + + + False + True + 2 + + + + + gtk-close + False + True + True + True + False + True + + + False + True + 3 + + + + + False + True + end + 0 + + + + + True + False + vertical + 10 + + + 600 + 320 + True + False + + + True + True + 0 + + + + + True + False + 0 + none + + + True + False + True + True + 1 + 12 + + + True + False + center + True + True + 12 + + + Shared + False + True + True + False + center + False + 0 + True + True + + + 1 + 0 + 1 + 1 + + + + + User + False + True + True + False + start + False + 0 + True + True + + + 2 + 0 + 1 + 1 + + + + + Installation + False + True + True + False + end + False + 0 + True + True + + + 0 + 0 + 1 + 1 + + + + + + + + + True + False + Type of Extension + + + + + + + + False + True + 1 + + + + + True + False + 6 + + + False + True + 50 + Adding %EXTENSION_NAME + + + 1 + 0 + 1 + 1 + + + + + gtk-cancel + False + True + True + True + False + True + + + 3 + 0 + 1 + 1 + + + + + False + True + True + + + 2 + 0 + 1 + 1 + + + + + Get more extensions online... + False + True + True + True + True + False + none + 0 + + + 0 + 0 + 1 + 1 + + + + + False + True + 2 + + + + + True + True + 1 + + + + + + help + add + update + close + + + diff --git a/desktop/util/hidother.src b/desktop/util/hidother.src index f2607b08789a..0885f9a75901 100644 --- a/desktop/util/hidother.src +++ b/desktop/util/hidother.src @@ -18,11 +18,6 @@ #include "../source/inc/helpid.hrc" -hidspecial HID_PACKAGE_MANAGER_MENU_ITEM { HelpID = HID_PACKAGE_MANAGER_MENU_ITEM; }; -hidspecial HID_PACKAGE_MANAGER_TREELISTBOX { HelpID = HID_PACKAGE_MANAGER_TREELISTBOX; }; -hidspecial HID_PACKAGE_MANAGER_PROGRESS { HelpID = HID_PACKAGE_MANAGER_PROGRESS; }; -hidspecial HID_PACKAGE_MANAGER_PROGRESS_CANCEL { HelpID = HID_PACKAGE_MANAGER_PROGRESS_CANCEL; }; - hidspecial HID_PACKAGE_MANAGER_UPD_REQ { HelpID = HID_PACKAGE_MANAGER_UPD_REQ; }; hidspecial HID_FIRSTSTART_PREV { HelpId = HID_FIRSTSTART_PREV;}; -- cgit