Ros-diffs

ros-diffs@reactos.org

10 participants
80994 discussions

[reactos] 07/09: [RAPPS] Recalculate the toolbar max buttons width when deleting the buttons (#6655)

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f23394986acd8f75dbbc5… commit f23394986acd8f75dbbc5693f1dd0ac008e02233 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Mar 22 21:55:43 2024 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Sep 18 12:31:48 2024 +0200 [RAPPS] Recalculate the toolbar max buttons width when deleting the buttons (#6655) Done so that the toolbar can display correctly the buttons, and their labels if possible, when resizing the RAPPS window. --- base/applications/rapps/appview.cpp | 20 +++++++++++++++----- base/applications/rapps/include/appview.h | 3 +++ 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/base/applications/rapps/appview.cpp b/base/applications/rapps/appview.cpp index 2dd08c2d7d3..e101416c94d 100644 --- a/base/applications/rapps/appview.cpp +++ b/base/applications/rapps/appview.cpp @@ -193,10 +193,8 @@ CMainToolbar::Create(HWND hwndParent) AddButtons(_countof(Buttons), Buttons); - /* Remember ideal width to use as a max width of buttons */ - SIZE size; - GetIdealSize(FALSE, &size); - m_dButtonsWidthMax = size.cx; + /* Remember the ideal width to use as a max width of buttons */ + UpdateMaxButtonsWidth(); return m_hWnd; } @@ -211,6 +209,14 @@ CMainToolbar::ShowButtonCaption(bool bShow) SendMessageW(TB_SETEXTENDEDSTYLE, 0, dCurrentExStyle | TBSTYLE_EX_MIXEDBUTTONS); } +void +CMainToolbar::UpdateMaxButtonsWidth() +{ + SIZE size; + GetIdealSize(FALSE, &size); + m_dButtonsWidthMax = size.cx; +} + DWORD CMainToolbar::GetMaxButtonsWidth() const { @@ -1553,8 +1559,12 @@ CApplicationView::ProcessWindowMessage( index = m_Toolbar->GetButtonInfo(ID_RESETDB, &info); if (index >= 0) m_Toolbar->DeleteButton(index); + + /* Update the ideal width to use as a max width of buttons */ + m_Toolbar->UpdateMaxButtonsWidth(); } + /* Resize the toolbar */ m_Toolbar->AutoSize(); RECT rTop; @@ -1793,7 +1803,7 @@ CApplicationView::OnSize(HWND hwnd, WPARAM wParam, LPARAM lParam) if (wParam == SIZE_MINIMIZED) return; - /* Size tool bar */ + /* Resize the toolbar */ m_Toolbar->AutoSize(); /* Automatically hide captions */ diff --git a/base/applications/rapps/include/appview.h b/base/applications/rapps/include/appview.h index 0c9aa29a733..c53a6e81954 100644 --- a/base/applications/rapps/include/appview.h +++ b/base/applications/rapps/include/appview.h @@ -297,6 +297,9 @@ class CMainToolbar : public CUiWindow<CToolbar<>> void ShowButtonCaption(bool bShow); + void + UpdateMaxButtonsWidth(); + DWORD GetMaxButtonsWidth() const; };

3 months, 3 weeks

[reactos] 06/09: [RAPPS] Build up a minimal UI for RAPPS started in AppWiz mode (#6655)

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9835ea27d27f1489b282b… commit 9835ea27d27f1489b282b03e5a52a694356874c7 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Mar 22 18:20:35 2024 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Sep 18 12:31:47 2024 +0200 [RAPPS] Build up a minimal UI for RAPPS started in AppWiz mode (#6655) - Only the "Installed/Applications/Updates" items are shown. - Delete the "Settings" item in the "File" menu. - Remove unnecessary toolbar buttons: ID_INSTALL, ID_CHECK_ALL, ID_RESETDB. - gui.cpp CMainWindow::ProcessWindowMessage(): Forbid the "Install" tree-view section to collapse. However, there is currently a bug in Wine's comctl32, which ignores the value returned from the TVN_ITEMEXPANDING notification handler to control the collapse/expansion behaviour. https://bugs.winehq.org/show_bug.cgi?id=53727 As a result, this feature doesn't work in ReactOS yet. --- base/applications/rapps/appview.cpp | 88 ++++++++++++++++++++++++++++++++++- base/applications/rapps/gui.cpp | 38 +++++++++++++-- base/applications/rapps/include/gui.h | 3 +- 3 files changed, 123 insertions(+), 6 deletions(-) diff --git a/base/applications/rapps/appview.cpp b/base/applications/rapps/appview.cpp index 11a6dfdb0a7..2dd08c2d7d3 100644 --- a/base/applications/rapps/appview.cpp +++ b/base/applications/rapps/appview.cpp @@ -16,6 +16,50 @@ using namespace Gdiplus; HICON g_hDefaultPackageIcon = NULL; static int g_DefaultPackageIconILIdx = I_IMAGENONE; +// **** Menu helpers **** + +BOOL +DeleteMenuEx( + _In_ HMENU hMenu, + _In_ UINT uPosition, + _In_ UINT uFlags) +{ + INT pos; + MENUITEMINFOW mii = { sizeof(mii), MIIM_FTYPE, 0 }; + bool bIsValidItem1, bIsValidItem2; + bool bIsSep1, bIsSep2; + + if (uFlags & MF_BYPOSITION) + pos = (INT)uPosition; + else + pos = ::GetMenuPosFromID(hMenu, uPosition); + if (pos < 0) + return FALSE; + + bIsValidItem1 = ((pos > 0) && ::GetMenuItemInfoW(hMenu, pos - 1, TRUE, &mii)); + bIsSep1 = bIsValidItem1 && !!(mii.fType & MFT_SEPARATOR); + + bIsValidItem2 = ::GetMenuItemInfoW(hMenu, pos + 1, TRUE, &mii); + bIsSep2 = bIsValidItem2 && !!(mii.fType & MFT_SEPARATOR); + + if (bIsSep1 && !bIsSep2 && !bIsValidItem2) + pos = pos - 1; // Delete separator only if pos+1 has no item + else if (!bIsSep1 && bIsSep2 && !bIsValidItem1) + pos = pos + 1; // Delete separator only if pos-1 has no item + else if (bIsSep1 && bIsSep2) + pos = pos + 1; + else + pos = -1; + + // Delete one of the separators if necessary + if (pos != -1) + ::DeleteMenu(hMenu, pos, MF_BYPOSITION); + + // Finally, delete the menu item itself. + return ::DeleteMenu(hMenu, uPosition, uFlags); +} +// **** Menu helpers **** + // **** CMainToolbar **** VOID @@ -1480,6 +1524,37 @@ CApplicationView::ProcessWindowMessage( bSuccess &= CreateListView(); bSuccess &= CreateAppInfoDisplay(); + /* APPWIZ-mode: Remove the unneeded menu items and toolbar buttons */ + if (m_MainWindow->m_bAppwizMode) + { + HMENU hMenu; + + /* Delete the "Settings" item in the "File" sub-menu */ + hMenu = ::GetSubMenu(m_MainWindow->GetMenu(), 0); + DeleteMenuEx(hMenu, ID_SETTINGS, MF_BYCOMMAND); + + /* Remove the menu items: ID_INSTALL, ID_RESETDB */ + hMenu = GetMenu(); + DeleteMenuEx(hMenu, ID_INSTALL, MF_BYCOMMAND); + DeleteMenuEx(hMenu, ID_RESETDB, MF_BYCOMMAND); + + /* Remove the toolbar buttons: + * ID_INSTALL, ID_CHECK_ALL, ID_RESETDB + * We only keep: + * ID_UNINSTALL, ID_MODIFY, ID_REFRESH */ + TBBUTTONINFO info = { sizeof(info), 0 }; + int index; + + index = m_Toolbar->GetButtonInfo(ID_INSTALL, &info); + if (index >= 0) m_Toolbar->DeleteButton(index); + + index = m_Toolbar->GetButtonInfo(ID_CHECK_ALL, &info); + if (index >= 0) m_Toolbar->DeleteButton(index); + + index = m_Toolbar->GetButtonInfo(ID_RESETDB, &info); + if (index >= 0) m_Toolbar->DeleteButton(index); + } + m_Toolbar->AutoSize(); RECT rTop; @@ -1927,26 +2002,35 @@ CApplicationView::SetDisplayAppType(APPLICATION_VIEW_TYPE AppType) switch (AppType) { case AppViewTypeInstalledApps: - EnableMenuItem(hMenu, ID_REGREMOVE, MF_ENABLED); + { EnableMenuItem(hMenu, ID_INSTALL, MF_GRAYED); EnableMenuItem(hMenu, ID_UNINSTALL, MF_ENABLED); EnableMenuItem(hMenu, ID_MODIFY, MF_ENABLED); + EnableMenuItem(hMenu, ID_REGREMOVE, MF_ENABLED); m_Toolbar->SendMessageW(TB_ENABLEBUTTON, ID_INSTALL, FALSE); m_Toolbar->SendMessageW(TB_ENABLEBUTTON, ID_UNINSTALL, TRUE); m_Toolbar->SendMessageW(TB_ENABLEBUTTON, ID_MODIFY, TRUE); + m_Toolbar->SendMessageW(TB_ENABLEBUTTON, ID_CHECK_ALL, FALSE); break; + } case AppViewTypeAvailableApps: - EnableMenuItem(hMenu, ID_REGREMOVE, MF_GRAYED); + { + // We shouldn't get there in APPWIZ-mode. + ATLASSERT(!m_MainWindow->m_bAppwizMode); + EnableMenuItem(hMenu, ID_INSTALL, MF_ENABLED); EnableMenuItem(hMenu, ID_UNINSTALL, MF_GRAYED); EnableMenuItem(hMenu, ID_MODIFY, MF_GRAYED); + EnableMenuItem(hMenu, ID_REGREMOVE, MF_GRAYED); m_Toolbar->SendMessageW(TB_ENABLEBUTTON, ID_INSTALL, TRUE); m_Toolbar->SendMessageW(TB_ENABLEBUTTON, ID_UNINSTALL, FALSE); m_Toolbar->SendMessageW(TB_ENABLEBUTTON, ID_MODIFY, FALSE); + m_Toolbar->SendMessageW(TB_ENABLEBUTTON, ID_CHECK_ALL, TRUE); break; + } } return TRUE; } diff --git a/base/applications/rapps/gui.cpp b/base/applications/rapps/gui.cpp index 02a9a2e03c4..1b7050583bd 100644 --- a/base/applications/rapps/gui.cpp +++ b/base/applications/rapps/gui.cpp @@ -82,7 +82,7 @@ CSideTreeView::~CSideTreeView() // **** CMainWindow **** -CMainWindow::CMainWindow(CAppDB *db, BOOL bAppwiz) : m_ClientPanel(NULL), m_Db(db), bAppwizMode(bAppwiz), SelectedEnumType(ENUM_ALL_INSTALLED) +CMainWindow::CMainWindow(CAppDB *db, BOOL bAppwiz) : m_ClientPanel(NULL), m_Db(db), m_bAppwizMode(bAppwiz), SelectedEnumType(ENUM_ALL_INSTALLED) { } @@ -100,6 +100,10 @@ CMainWindow::InitCategoriesList() m_TreeView->AddCategory(hRootItemInstalled, IDS_APPLICATIONS, IDI_APPS); m_TreeView->AddCategory(hRootItemInstalled, IDS_UPDATES, IDI_APPUPD); + // Do not show any other categories in APPWIZ-mode. + if (m_bAppwizMode) + goto Finish; + m_TreeView->AddCategory(TVI_ROOT, IDS_SELECTEDFORINST, IDI_SELECTEDFORINST); hRootItemAvailable = m_TreeView->AddCategory(TVI_ROOT, IDS_AVAILABLEFORINST, IDI_CATEGORY); @@ -120,10 +124,12 @@ CMainWindow::InitCategoriesList() m_TreeView->AddCategory(hRootItemAvailable, IDS_CAT_THEMES, IDI_CAT_THEMES); m_TreeView->AddCategory(hRootItemAvailable, IDS_CAT_OTHER, IDI_CAT_OTHER); +Finish: m_TreeView->SetImageList(); m_TreeView->Expand(hRootItemInstalled, TVE_EXPAND); - m_TreeView->Expand(hRootItemAvailable, TVE_EXPAND); - m_TreeView->SelectItem(bAppwizMode ? hRootItemInstalled : hRootItemAvailable); + if (!m_bAppwizMode) + m_TreeView->Expand(hRootItemAvailable, TVE_EXPAND); + m_TreeView->SelectItem(m_bAppwizMode ? hRootItemInstalled : hRootItemAvailable); } BOOL @@ -337,6 +343,22 @@ CMainWindow::ProcessWindowMessage(HWND hwnd, UINT Msg, WPARAM wParam, LPARAM lPa switch (data->code) { + case TVN_ITEMEXPANDING: + { + if (data->hwndFrom == m_TreeView->m_hWnd) + { + // APPWIZ-mode: forbid item collapse. + // FIXME: Prevent collapse (COMCTL32 is buggy) + // https://bugs.winehq.org/show_bug.cgi?id=53727 + if (m_bAppwizMode && (((LPNMTREEVIEW)lParam)->action & TVE_TOGGLE) == TVE_COLLAPSE) + { + theResult = TRUE; + return TRUE; // Handled + } + } + break; + } + case TVN_SELCHANGED: { if (data->hwndFrom == m_TreeView->m_hWnd) @@ -612,6 +634,13 @@ CMainWindow::AddApplicationsToView(CAtlList<CAppInfo *> &List) VOID CMainWindow::UpdateApplicationsList(AppsCategories EnumType, BOOL bReload, BOOL bCheckAvailable) { + // Only installed applications should be enumerated in APPWIZ-mode. + if (m_bAppwizMode && !IsInstalledEnum(EnumType)) + { + ATLASSERT(FALSE && "Should not be called in APPWIZ-mode"); + return; + } + bUpdating = TRUE; if (HCURSOR hCursor = LoadCursor(NULL, IDC_APPSTARTING)) @@ -650,6 +679,9 @@ CMainWindow::UpdateApplicationsList(AppsCategories EnumType, BOOL bReload, BOOL } else if (IsAvailableEnum(EnumType)) { + // We shouldn't get there in APPWIZ-mode. + ATLASSERT(!m_bAppwizMode); + if (bReload) m_Db->UpdateAvailable(); diff --git a/base/applications/rapps/include/gui.h b/base/applications/rapps/include/gui.h index cf6fc90859a..36ff852dde3 100644 --- a/base/applications/rapps/include/gui.h +++ b/base/applications/rapps/include/gui.h @@ -52,12 +52,13 @@ class CMainWindow : public CWindowImpl<CMainWindow, CWindow, CFrameWinTraits> CUiWindow<CStatusBar> *m_StatusBar = NULL; CApplicationView *m_ApplicationView = NULL; + friend class CApplicationView; CAppDB *m_Db; CAtlList<CAppInfo *> m_Selected; BOOL bUpdating = FALSE; - BOOL bAppwizMode; + BOOL m_bAppwizMode; HTREEITEM hRootItemInstalled; CStringW szSearchPattern;

3 months, 3 weeks

[reactos] 05/09: [RAPPS] Remove the IDR_APPLICATIONMENU menu (#6655)

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b1a34795007f087be84b8… commit b1a34795007f087be84b82e955c0dfc109ccb82a Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Mar 22 13:06:52 2024 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Sep 18 12:31:46 2024 +0200 [RAPPS] Remove the IDR_APPLICATIONMENU menu (#6655) It is redundant with the "Programs" one from the main menu. --- base/applications/rapps/appview.cpp | 5 +++-- base/applications/rapps/include/resource.h | 1 - base/applications/rapps/lang/bg-BG.rc | 16 ---------------- base/applications/rapps/lang/cs-CZ.rc | 16 ---------------- base/applications/rapps/lang/de-DE.rc | 16 ---------------- base/applications/rapps/lang/en-US.rc | 16 ---------------- base/applications/rapps/lang/es-ES.rc | 16 ---------------- base/applications/rapps/lang/et-EE.rc | 16 ---------------- base/applications/rapps/lang/fr-FR.rc | 16 ---------------- base/applications/rapps/lang/he-IL.rc | 16 ---------------- base/applications/rapps/lang/hu-HU.rc | 16 ---------------- base/applications/rapps/lang/id-ID.rc | 16 ---------------- base/applications/rapps/lang/it-IT.rc | 18 +----------------- base/applications/rapps/lang/ja-JP.rc | 20 ++------------------ base/applications/rapps/lang/no-NO.rc | 16 ---------------- base/applications/rapps/lang/pl-PL.rc | 16 ---------------- base/applications/rapps/lang/pt-BR.rc | 18 +----------------- base/applications/rapps/lang/pt-PT.rc | 16 ---------------- base/applications/rapps/lang/ro-RO.rc | 16 ---------------- base/applications/rapps/lang/ru-RU.rc | 16 ---------------- base/applications/rapps/lang/sk-SK.rc | 16 ---------------- base/applications/rapps/lang/sq-AL.rc | 16 ---------------- base/applications/rapps/lang/sv-SE.rc | 16 ---------------- base/applications/rapps/lang/tr-TR.rc | 16 ---------------- base/applications/rapps/lang/uk-UA.rc | 16 ---------------- base/applications/rapps/lang/zh-CN.rc | 16 ---------------- base/applications/rapps/lang/zh-HK.rc | 16 ---------------- base/applications/rapps/lang/zh-TW.rc | 16 ---------------- 28 files changed, 7 insertions(+), 423 deletions(-) diff --git a/base/applications/rapps/appview.cpp b/base/applications/rapps/appview.cpp index 76307acace6..11a6dfdb0a7 100644 --- a/base/applications/rapps/appview.cpp +++ b/base/applications/rapps/appview.cpp @@ -1907,9 +1907,10 @@ CApplicationView::Create(HWND hwndParent) { RECT r = {0, 0, 0, 0}; - HMENU menu = GetSubMenu(LoadMenuW(hInst, MAKEINTRESOURCEW(IDR_APPLICATIONMENU)), 0); + // Pick the "Programs" sub-menu for building the context menu. + HMENU hMenu = ::GetSubMenu(m_MainWindow->GetMenu(), 1); - return CWindowImpl::Create(hwndParent, r, L"", WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN | WS_CLIPSIBLINGS, 0, menu); + return CWindowImpl::Create(hwndParent, r, L"", WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN | WS_CLIPSIBLINGS, 0, hMenu); } BOOL diff --git a/base/applications/rapps/include/resource.h b/base/applications/rapps/include/resource.h index fe7f056b8cb..b18b1a8f13a 100644 --- a/base/applications/rapps/include/resource.h +++ b/base/applications/rapps/include/resource.h @@ -67,7 +67,6 @@ /* Menus */ #define IDR_MAINMENU 500 #define IDR_LINKMENU 501 -#define IDR_APPLICATIONMENU 502 /* Menu items */ #define ID_EXIT 550 diff --git a/base/applications/rapps/lang/bg-BG.rc b/base/applications/rapps/lang/bg-BG.rc index cee645c6a78..64188ba9a0c 100644 --- a/base/applications/rapps/lang/bg-BG.rc +++ b/base/applications/rapps/lang/bg-BG.rc @@ -43,22 +43,6 @@ BEGIN END END -IDR_APPLICATIONMENU MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "&Слагане\tCtrl+Enter", ID_INSTALL - MENUITEM "&Махане\tCtrl+Del", ID_UNINSTALL - MENUITEM "&Промяна", ID_MODIFY - MENUITEM SEPARATOR - MENUITEM "Пр&емахване от регистъра", ID_REGREMOVE - MENUITEM SEPARATOR - MENUITEM "О&пресняване\tF5", ID_REFRESH - MENUITEM SEPARATOR - MENUITEM "Update Data&base\tCtrl+F5", ID_RESETDB - END -END - IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 254, 265 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Настройки" diff --git a/base/applications/rapps/lang/cs-CZ.rc b/base/applications/rapps/lang/cs-CZ.rc index 3c48c0dab0b..a2052037e88 100644 --- a/base/applications/rapps/lang/cs-CZ.rc +++ b/base/applications/rapps/lang/cs-CZ.rc @@ -44,22 +44,6 @@ BEGIN END END -IDR_APPLICATIONMENU MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "&Instalovat\tCtrl+Enter", ID_INSTALL - MENUITEM "&Odinstalovat\tCtrl+Del", ID_UNINSTALL - MENUITEM "&Změnit", ID_MODIFY - MENUITEM SEPARATOR - MENUITEM "Odstranit z r&egistru", ID_REGREMOVE - MENUITEM SEPARATOR - MENUITEM "Ob&novit\tF5", ID_REFRESH - MENUITEM SEPARATOR - MENUITEM "Aktualizovat data&bázi\tCtrl+F5", ID_RESETDB - END -END - IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 265 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Nastavení" diff --git a/base/applications/rapps/lang/de-DE.rc b/base/applications/rapps/lang/de-DE.rc index b03152c053c..ecdb14d10bf 100644 --- a/base/applications/rapps/lang/de-DE.rc +++ b/base/applications/rapps/lang/de-DE.rc @@ -46,22 +46,6 @@ BEGIN END END -IDR_APPLICATIONMENU MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "&Installieren\tCtrl+Enter", ID_INSTALL - MENUITEM "&Deinstallieren\tCtrl+Del", ID_UNINSTALL - MENUITEM "Ä&ndern", ID_MODIFY - MENUITEM SEPARATOR - MENUITEM "Aus R&egistry entfernen", ID_REGREMOVE - MENUITEM SEPARATOR - MENUITEM "Aktualisie&ren\tF5", ID_REFRESH - MENUITEM SEPARATOR - MENUITEM "Daten&bank aktualisieren\tCtrl+F5", ID_RESETDB - END -END - IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 265 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Einstellungen" diff --git a/base/applications/rapps/lang/en-US.rc b/base/applications/rapps/lang/en-US.rc index 1f0af2d1106..3771af9f8c3 100644 --- a/base/applications/rapps/lang/en-US.rc +++ b/base/applications/rapps/lang/en-US.rc @@ -46,22 +46,6 @@ BEGIN END END -IDR_APPLICATIONMENU MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "&Install\tCtrl+Enter", ID_INSTALL - MENUITEM "&Uninstall\tCtrl+Del", ID_UNINSTALL - MENUITEM "&Modify", ID_MODIFY - MENUITEM SEPARATOR - MENUITEM "R&emove from Registry", ID_REGREMOVE - MENUITEM SEPARATOR - MENUITEM "&Refresh\tF5", ID_REFRESH - MENUITEM SEPARATOR - MENUITEM "Update Data&base\tCtrl+F5", ID_RESETDB - END -END - IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 265 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Settings" diff --git a/base/applications/rapps/lang/es-ES.rc b/base/applications/rapps/lang/es-ES.rc index 9655bf1c2c4..45155731f41 100644 --- a/base/applications/rapps/lang/es-ES.rc +++ b/base/applications/rapps/lang/es-ES.rc @@ -45,22 +45,6 @@ BEGIN END END -IDR_APPLICATIONMENU MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "&Instalar\tCtrl+Intro", ID_INSTALL - MENUITEM "&Desinstalar\tCtrl+Supr", ID_UNINSTALL - MENUITEM "&Modificar", ID_MODIFY - MENUITEM SEPARATOR - MENUITEM "&Eliminar del Registro", ID_REGREMOVE - MENUITEM SEPARATOR - MENUITEM "&Recargar\tF5", ID_REFRESH - MENUITEM SEPARATOR - MENUITEM "&Actualizar listado desde Internet\tCtrl+F5", ID_RESETDB - END -END - IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 265 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Ajustes" diff --git a/base/applications/rapps/lang/et-EE.rc b/base/applications/rapps/lang/et-EE.rc index 0342ce892f0..b5b13e3f2e8 100644 --- a/base/applications/rapps/lang/et-EE.rc +++ b/base/applications/rapps/lang/et-EE.rc @@ -43,22 +43,6 @@ BEGIN END END -IDR_APPLICATIONMENU MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "&Installi\tCtrl+Enter", ID_INSTALL - MENUITEM "&Desinstalli\tCtrl+Del", ID_UNINSTALL - MENUITEM "&Muuda", ID_MODIFY - MENUITEM SEPARATOR - MENUITEM "&Eemalda registrist", ID_REGREMOVE - MENUITEM SEPARATOR - MENUITEM "&Värskenda\tF5", ID_REFRESH - MENUITEM SEPARATOR - MENUITEM "Uuenda andme&baasi\tCtrl+F5", ID_RESETDB - END -END - IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 265 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Sätted" diff --git a/base/applications/rapps/lang/fr-FR.rc b/base/applications/rapps/lang/fr-FR.rc index 0369b803096..0689bc8a2e8 100644 --- a/base/applications/rapps/lang/fr-FR.rc +++ b/base/applications/rapps/lang/fr-FR.rc @@ -46,22 +46,6 @@ BEGIN END END -IDR_APPLICATIONMENU MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "&Installer\tCtrl+Entrée", ID_INSTALL - MENUITEM "&Désinstaller\tCtrl+Suppr", ID_UNINSTALL - MENUITEM "&Modifier", ID_MODIFY - MENUITEM SEPARATOR - MENUITEM "&Supprimer du registre", ID_REGREMOVE - MENUITEM SEPARATOR - MENUITEM "&Rafraîchir\tF5", ID_REFRESH - MENUITEM SEPARATOR - MENUITEM "Mettre à jour la &base\tCtrl+F5", ID_RESETDB - END -END - IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 265 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Configuration" diff --git a/base/applications/rapps/lang/he-IL.rc b/base/applications/rapps/lang/he-IL.rc index c63c0fe612d..7484f2851dd 100644 --- a/base/applications/rapps/lang/he-IL.rc +++ b/base/applications/rapps/lang/he-IL.rc @@ -45,22 +45,6 @@ BEGIN END END -IDR_APPLICATIONMENU MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "התקנה\tCtrl+Enter", ID_INSTALL - MENUITEM "הסרה\tCtrl+Del", ID_UNINSTALL - MENUITEM "שינוי", ID_MODIFY - MENUITEM SEPARATOR - MENUITEM "הסרה מהרשום", ID_REGREMOVE - MENUITEM SEPARATOR - MENUITEM "רענן\tF5", ID_REFRESH - MENUITEM SEPARATOR - MENUITEM "עדכון מסד נתונים\tCtrl+F5", ID_RESETDB - END -END - IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 265 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_LAYOUTRTL diff --git a/base/applications/rapps/lang/hu-HU.rc b/base/applications/rapps/lang/hu-HU.rc index 8ddad88d669..c363849ba5c 100644 --- a/base/applications/rapps/lang/hu-HU.rc +++ b/base/applications/rapps/lang/hu-HU.rc @@ -43,22 +43,6 @@ BEGIN END END -IDR_APPLICATIONMENU MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "Telep&ítés\tCtrl+Enter", ID_INSTALL - MENUITEM "Eltá&volítás\tCtrl+Del", ID_UNINSTALL - MENUITEM "&Módosítás", ID_MODIFY - MENUITEM SEPARATOR - MENUITEM "&Eltávolítás a registryből", ID_REGREMOVE - MENUITEM SEPARATOR - MENUITEM "F&rissítés\tF5", ID_REFRESH - MENUITEM SEPARATOR - MENUITEM "Adat&bázis frissítése\tCtrl+F5", ID_RESETDB - END -END - IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 265 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Beállítások" diff --git a/base/applications/rapps/lang/id-ID.rc b/base/applications/rapps/lang/id-ID.rc index 09e47eeb3b7..40c76f29bc5 100644 --- a/base/applications/rapps/lang/id-ID.rc +++ b/base/applications/rapps/lang/id-ID.rc @@ -43,22 +43,6 @@ BEGIN END END -IDR_APPLICATIONMENU MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "&Pasang\tCtrl+Enter", ID_INSTALL - MENUITEM "&Bongkar\tCtrl+Del", ID_UNINSTALL - MENUITEM "&Ubah", ID_MODIFY - MENUITEM SEPARATOR - MENUITEM "Hapus dari R&egistri", ID_REGREMOVE - MENUITEM SEPARATOR - MENUITEM "Sega&rkan\tF5", ID_REFRESH - MENUITEM SEPARATOR - MENUITEM "Perbarui Data&base\tCtrl+F5", ID_RESETDB - END -END - IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 265 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Pengaturan" diff --git a/base/applications/rapps/lang/it-IT.rc b/base/applications/rapps/lang/it-IT.rc index 0a96a880df6..3a070dddeb6 100644 --- a/base/applications/rapps/lang/it-IT.rc +++ b/base/applications/rapps/lang/it-IT.rc @@ -27,7 +27,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "&Aggiorna\tF5", ID_REFRESH MENUITEM SEPARATOR - MENUITEM "Aggiorna Data&base", ID_RESETDB + MENUITEM "Aggiorna Data&base\tCtrl+F5", ID_RESETDB END POPUP "?" BEGIN @@ -45,22 +45,6 @@ BEGIN END END -IDR_APPLICATIONMENU MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "&Installa\tCtrl+Enter", ID_INSTALL - MENUITEM "Rim&uovi\tCtrl+Del", ID_UNINSTALL - MENUITEM "&Modifica", ID_MODIFY - MENUITEM SEPARATOR - MENUITEM "Canc&ella dal registro", ID_REGREMOVE - MENUITEM SEPARATOR - MENUITEM "&Aggiorna\tF5", ID_REFRESH - MENUITEM SEPARATOR - MENUITEM "Aggiorna Data&base\tCtrl+F5", ID_RESETDB - END -END - IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 265 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Impostazioni" diff --git a/base/applications/rapps/lang/ja-JP.rc b/base/applications/rapps/lang/ja-JP.rc index 56d49dee106..9f27fe1e83f 100644 --- a/base/applications/rapps/lang/ja-JP.rc +++ b/base/applications/rapps/lang/ja-JP.rc @@ -23,9 +23,9 @@ BEGIN MENUITEM "アンインストール(&U)\tCtrl+Del", ID_UNINSTALL MENUITEM "変更(&M)", ID_MODIFY MENUITEM SEPARATOR - MENUITEM "レジストリから削除(&E)\tF5", ID_REGREMOVE + MENUITEM "レジストリから削除(&E)", ID_REGREMOVE MENUITEM SEPARATOR - MENUITEM "更新(&R)", ID_REFRESH + MENUITEM "更新(&R)\tF5", ID_REFRESH MENUITEM SEPARATOR MENUITEM "データベースの更新(&B)\tCtrl+F5", ID_RESETDB END @@ -45,22 +45,6 @@ BEGIN END END -IDR_APPLICATIONMENU MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "インストール(&I)\tCtrl+Enter", ID_INSTALL - MENUITEM "アンインストール(&U)\tCtrl+Del", ID_UNINSTALL - MENUITEM "変更(&M)", ID_MODIFY - MENUITEM SEPARATOR - MENUITEM "レジストリから削除(&E)\tF5", ID_REGREMOVE - MENUITEM SEPARATOR - MENUITEM "更新(&R)", ID_REFRESH - MENUITEM SEPARATOR - MENUITEM "データベースの更新(&B)\tCtrl+F5", ID_RESETDB - END -END - IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 265 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "設定" diff --git a/base/applications/rapps/lang/no-NO.rc b/base/applications/rapps/lang/no-NO.rc index 93acc280c95..cd0c697303e 100644 --- a/base/applications/rapps/lang/no-NO.rc +++ b/base/applications/rapps/lang/no-NO.rc @@ -43,22 +43,6 @@ BEGIN END END -IDR_APPLICATIONMENU MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "&Installere\tCtrl+Enter", ID_INSTALL - MENUITEM "&Avinstallere\tCtrl+Del", ID_UNINSTALL - MENUITEM "E&ndre", ID_MODIFY - MENUITEM SEPARATOR - MENUITEM "R&emove from Registry", ID_REGREMOVE - MENUITEM SEPARATOR - MENUITEM "Oppdate&r\tF5", ID_REFRESH - MENUITEM SEPARATOR - MENUITEM "Update Data&base\tCtrl+F5", ID_RESETDB - END -END - IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 265 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Settings" diff --git a/base/applications/rapps/lang/pl-PL.rc b/base/applications/rapps/lang/pl-PL.rc index 3bc806e1cea..a94ca836fa6 100644 --- a/base/applications/rapps/lang/pl-PL.rc +++ b/base/applications/rapps/lang/pl-PL.rc @@ -45,22 +45,6 @@ BEGIN END END -IDR_APPLICATIONMENU MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "&Instaluj\tCtrl+Enter", ID_INSTALL - MENUITEM "Odinstal&uj\tCtrl+Del", ID_UNINSTALL - MENUITEM "&Modyfikuj", ID_MODIFY - MENUITEM SEPARATOR - MENUITEM "Usuń z r&ejestru", ID_REGREMOVE - MENUITEM SEPARATOR - MENUITEM "&Odśwież\tF5", ID_REFRESH - MENUITEM SEPARATOR - MENUITEM "Aktualizuj &bazę programów\tCtrl+F5", ID_RESETDB - END -END - IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 265 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Ustawienia" diff --git a/base/applications/rapps/lang/pt-BR.rc b/base/applications/rapps/lang/pt-BR.rc index 6a7a285733a..5faeecb25ac 100644 --- a/base/applications/rapps/lang/pt-BR.rc +++ b/base/applications/rapps/lang/pt-BR.rc @@ -17,7 +17,7 @@ BEGIN END POPUP "&Programas" BEGIN - MENUITEM "I&nstalar\tCtrl+Enter", ID_INSTALL + MENUITEM "&Instalar\tCtrl+Enter", ID_INSTALL MENUITEM "&Desinstalar\tCtrl+Del", ID_UNINSTALL MENUITEM "&Modificar", ID_MODIFY MENUITEM SEPARATOR @@ -43,22 +43,6 @@ BEGIN END END -IDR_APPLICATIONMENU MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "&Instalar\tCtrl+Enter", ID_INSTALL - MENUITEM "&Desinstalar\tCtrl+Del", ID_UNINSTALL - MENUITEM "&Modificar", ID_MODIFY - MENUITEM SEPARATOR - MENUITEM "R&emover do Registro", ID_REGREMOVE - MENUITEM SEPARATOR - MENUITEM "Atualiza&r\tF5", ID_REFRESH - MENUITEM SEPARATOR - MENUITEM "Update Data&base\tCtrl+F5", ID_RESETDB - END -END - IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 265 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Configurações" diff --git a/base/applications/rapps/lang/pt-PT.rc b/base/applications/rapps/lang/pt-PT.rc index d96d4fa49ef..838404bd603 100644 --- a/base/applications/rapps/lang/pt-PT.rc +++ b/base/applications/rapps/lang/pt-PT.rc @@ -43,22 +43,6 @@ BEGIN END END -IDR_APPLICATIONMENU MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "&Instalar\tCtrl+Enter", ID_INSTALL - MENUITEM "&Desinstalar\tCtrl+Del", ID_UNINSTALL - MENUITEM "&Modificar", ID_MODIFY - MENUITEM SEPARATOR - MENUITEM "R&emover do Registo", ID_REGREMOVE - MENUITEM SEPARATOR - MENUITEM "Actualiza&r\tF5", ID_REFRESH - MENUITEM SEPARATOR - MENUITEM "Actualizar &Base de dados\tCtrl+F5", ID_RESETDB - END -END - IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 265 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Configurações" diff --git a/base/applications/rapps/lang/ro-RO.rc b/base/applications/rapps/lang/ro-RO.rc index 72ceab360fc..e3b82afc6ac 100644 --- a/base/applications/rapps/lang/ro-RO.rc +++ b/base/applications/rapps/lang/ro-RO.rc @@ -45,22 +45,6 @@ BEGIN END END -IDR_APPLICATIONMENU MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "&Instalare\tCtrl+Enter", ID_INSTALL - MENUITEM "&Dezinstalare\tCtrl+Del", ID_UNINSTALL - MENUITEM "&Modificare", ID_MODIFY - MENUITEM SEPARATOR - MENUITEM "&Eliminare din registru", ID_REGREMOVE - MENUITEM SEPARATOR - MENUITEM "Împ&rospătare\tF5", ID_REFRESH - MENUITEM SEPARATOR - MENUITEM "&Actualizare a bazei de date\tCtrl+F5", ID_RESETDB - END -END - IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 265 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Setări" diff --git a/base/applications/rapps/lang/ru-RU.rc b/base/applications/rapps/lang/ru-RU.rc index 1091958e29d..ab531a57c47 100644 --- a/base/applications/rapps/lang/ru-RU.rc +++ b/base/applications/rapps/lang/ru-RU.rc @@ -48,22 +48,6 @@ BEGIN END END -IDR_APPLICATIONMENU MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "У&становить\tCtrl+Enter", ID_INSTALL - MENUITEM "&Удалить\tCtrl+Del", ID_UNINSTALL - MENUITEM "&Изменить", ID_MODIFY - MENUITEM SEPARATOR - MENUITEM "У&далить из реестра", ID_REGREMOVE - MENUITEM SEPARATOR - MENUITEM "&Обновить\tF5", ID_REFRESH - MENUITEM SEPARATOR - MENUITEM "Обновить &базу данных\tCtrl+F5", ID_RESETDB - END -END - IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 265 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Параметры" diff --git a/base/applications/rapps/lang/sk-SK.rc b/base/applications/rapps/lang/sk-SK.rc index 4a6f5b59b09..bd85218ce8f 100644 --- a/base/applications/rapps/lang/sk-SK.rc +++ b/base/applications/rapps/lang/sk-SK.rc @@ -43,22 +43,6 @@ BEGIN END END -IDR_APPLICATIONMENU MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "&Inštalovať\tCtrl+Enter", ID_INSTALL - MENUITEM "O&dinštalovať\tCtrl+Del", ID_UNINSTALL - MENUITEM "Z&meniť", ID_MODIFY - MENUITEM SEPARATOR - MENUITEM "Odstrániť z R&egistrov", ID_REGREMOVE - MENUITEM SEPARATOR - MENUITEM "&Obnoviť\tF5", ID_REFRESH - MENUITEM SEPARATOR - MENUITEM "Update Data&base\tCtrl+F5", ID_RESETDB - END -END - IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 265 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Nastavenia" diff --git a/base/applications/rapps/lang/sq-AL.rc b/base/applications/rapps/lang/sq-AL.rc index 29221404bdd..4ffb5c7b8d1 100644 --- a/base/applications/rapps/lang/sq-AL.rc +++ b/base/applications/rapps/lang/sq-AL.rc @@ -43,22 +43,6 @@ BEGIN END END -IDR_APPLICATIONMENU MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "&Instalo\tCtrl+Enter", ID_INSTALL - MENUITEM "&Uninstall\tCtrl+Del", ID_UNINSTALL - MENUITEM "&Modifiko", ID_MODIFY - MENUITEM SEPARATOR - MENUITEM "Hiq nga R&egjistri", ID_REGREMOVE - MENUITEM SEPARATOR - MENUITEM "&Rifresko\tF5", ID_REFRESH - MENUITEM SEPARATOR - MENUITEM "Update Data&base\tCtrl+F5", ID_RESETDB - END -END - IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 265 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Konfigurime" diff --git a/base/applications/rapps/lang/sv-SE.rc b/base/applications/rapps/lang/sv-SE.rc index b8df31b5b57..ced598e23f7 100644 --- a/base/applications/rapps/lang/sv-SE.rc +++ b/base/applications/rapps/lang/sv-SE.rc @@ -43,22 +43,6 @@ BEGIN END END -IDR_APPLICATIONMENU MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "&Installera\tCtrl+Enter", ID_INSTALL - MENUITEM "&Avinstallera\tCtrl+Del", ID_UNINSTALL - MENUITEM "&Ändra", ID_MODIFY - MENUITEM SEPARATOR - MENUITEM "Ta bort från R&egistret", ID_REGREMOVE - MENUITEM SEPARATOR - MENUITEM "Uppdate&ra\tF5", ID_REFRESH - MENUITEM SEPARATOR - MENUITEM "Update Data&base\tCtrl+F5", ID_RESETDB - END -END - IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 265 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Inställningar" diff --git a/base/applications/rapps/lang/tr-TR.rc b/base/applications/rapps/lang/tr-TR.rc index 36436dbc80e..ddd0b4d9775 100644 --- a/base/applications/rapps/lang/tr-TR.rc +++ b/base/applications/rapps/lang/tr-TR.rc @@ -45,22 +45,6 @@ BEGIN END END -IDR_APPLICATIONMENU MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "&Kur\tCtrl+Enter", ID_INSTALL - MENUITEM "K&aldır\tCtrl+Del", ID_UNINSTALL - MENUITEM "&Değiştir", ID_MODIFY - MENUITEM SEPARATOR - MENUITEM "&Girdiyi Kayıt Defteri'nden Kaldır", ID_REGREMOVE - MENUITEM SEPARATOR - MENUITEM "&Yenile\tF5", ID_REFRESH - MENUITEM SEPARATOR - MENUITEM "Uygulama Veri Ta&banını Yenile\tCtrl+F5", ID_RESETDB - END -END - IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 265 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Ayarlar" diff --git a/base/applications/rapps/lang/uk-UA.rc b/base/applications/rapps/lang/uk-UA.rc index b0fa045c8a3..d43a7e746e9 100644 --- a/base/applications/rapps/lang/uk-UA.rc +++ b/base/applications/rapps/lang/uk-UA.rc @@ -46,22 +46,6 @@ BEGIN END END -IDR_APPLICATIONMENU MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "&Встановити\tCtrl+Enter", ID_INSTALL - MENUITEM "В&идалити\tCtrl+Del", ID_UNINSTALL - MENUITEM "&Змінити", ID_MODIFY - MENUITEM SEPARATOR - MENUITEM "Вида&лити з реєстру", ID_REGREMOVE - MENUITEM SEPARATOR - MENUITEM "&Оновити\tF5", ID_REFRESH - MENUITEM SEPARATOR - MENUITEM "Оновити список &програм\tCtrl+F5", ID_RESETDB - END -END - IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 265 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Налаштування" diff --git a/base/applications/rapps/lang/zh-CN.rc b/base/applications/rapps/lang/zh-CN.rc index dcbf2a42575..e2c09b22533 100644 --- a/base/applications/rapps/lang/zh-CN.rc +++ b/base/applications/rapps/lang/zh-CN.rc @@ -47,22 +47,6 @@ BEGIN END END -IDR_APPLICATIONMENU MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "安装(&I)\tCtrl+Enter", ID_INSTALL - MENUITEM "卸载(&U)\tCtrl+Del", ID_UNINSTALL - MENUITEM "修改(&M)", ID_MODIFY - MENUITEM SEPARATOR - MENUITEM "从注册表删除(&E)", ID_REGREMOVE - MENUITEM SEPARATOR - MENUITEM "刷新(&R)\tF5", ID_REFRESH - MENUITEM SEPARATOR - MENUITEM "更新数据库(&B)\tCtrl+F5", ID_RESETDB - END -END - IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 265 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "设置" diff --git a/base/applications/rapps/lang/zh-HK.rc b/base/applications/rapps/lang/zh-HK.rc index db9febe2394..44e44955f06 100644 --- a/base/applications/rapps/lang/zh-HK.rc +++ b/base/applications/rapps/lang/zh-HK.rc @@ -44,22 +44,6 @@ BEGIN END END -IDR_APPLICATIONMENU MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "安裝(&I)\tCtrl+Enter", ID_INSTALL - MENUITEM "解除安裝(&U)\tCtrl+Del", ID_UNINSTALL - MENUITEM "修改(&M)", ID_MODIFY - MENUITEM SEPARATOR - MENUITEM "從登錄檔刪除(&E)", ID_REGREMOVE - MENUITEM SEPARATOR - MENUITEM "重新整理(&R)\tF5", ID_REFRESH - MENUITEM SEPARATOR - MENUITEM "更新資料庫(&B)\tCtrl+F5", ID_RESETDB - END -END - IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 265 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "設定" diff --git a/base/applications/rapps/lang/zh-TW.rc b/base/applications/rapps/lang/zh-TW.rc index a53aa257086..8a4f7277802 100644 --- a/base/applications/rapps/lang/zh-TW.rc +++ b/base/applications/rapps/lang/zh-TW.rc @@ -44,22 +44,6 @@ BEGIN END END -IDR_APPLICATIONMENU MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "安裝(&I)\tCtrl+Enter", ID_INSTALL - MENUITEM "解除安裝(&U)\tCtrl+Del", ID_UNINSTALL - MENUITEM "修改(&M)", ID_MODIFY - MENUITEM SEPARATOR - MENUITEM "從登錄檔刪除(&E)", ID_REGREMOVE - MENUITEM SEPARATOR - MENUITEM "重新整理(&R)\tF5", ID_REFRESH - MENUITEM SEPARATOR - MENUITEM "更新資料庫(&B)\tCtrl+F5", ID_RESETDB - END -END - IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 265 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "設定"

3 months, 3 weeks

[reactos] 04/09: [RAPPS] Separate the banner-like resource strings from the other ones.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=39867020f7e9efdb85b03… commit 39867020f7e9efdb85b033d0745f2f346026339e Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Sep 15 22:53:51 2024 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Sep 18 12:31:45 2024 +0200 [RAPPS] Separate the banner-like resource strings from the other ones. --- base/applications/rapps/include/resource.h | 69 ++++++++++++++++-------------- base/applications/rapps/lang/bg-BG.rc | 8 +++- base/applications/rapps/lang/cs-CZ.rc | 8 +++- base/applications/rapps/lang/de-DE.rc | 8 +++- base/applications/rapps/lang/en-US.rc | 8 +++- base/applications/rapps/lang/es-ES.rc | 8 +++- base/applications/rapps/lang/et-EE.rc | 8 +++- base/applications/rapps/lang/fr-FR.rc | 8 +++- base/applications/rapps/lang/he-IL.rc | 8 +++- base/applications/rapps/lang/hu-HU.rc | 8 +++- base/applications/rapps/lang/id-ID.rc | 8 +++- base/applications/rapps/lang/it-IT.rc | 8 +++- base/applications/rapps/lang/ja-JP.rc | 8 +++- base/applications/rapps/lang/no-NO.rc | 8 +++- base/applications/rapps/lang/pl-PL.rc | 8 +++- base/applications/rapps/lang/pt-BR.rc | 8 +++- base/applications/rapps/lang/pt-PT.rc | 8 +++- base/applications/rapps/lang/ro-RO.rc | 8 +++- base/applications/rapps/lang/ru-RU.rc | 8 +++- base/applications/rapps/lang/sk-SK.rc | 8 +++- base/applications/rapps/lang/sq-AL.rc | 8 +++- base/applications/rapps/lang/sv-SE.rc | 8 +++- base/applications/rapps/lang/tr-TR.rc | 8 +++- base/applications/rapps/lang/uk-UA.rc | 8 +++- base/applications/rapps/lang/zh-CN.rc | 8 +++- base/applications/rapps/lang/zh-HK.rc | 8 +++- base/applications/rapps/lang/zh-TW.rc | 8 +++- 27 files changed, 192 insertions(+), 85 deletions(-) diff --git a/base/applications/rapps/include/resource.h b/base/applications/rapps/include/resource.h index 2d846f8661e..fe7f056b8cb 100644 --- a/base/applications/rapps/include/resource.h +++ b/base/applications/rapps/include/resource.h @@ -88,40 +88,43 @@ /* Messages */ #define ID_ACTIVATE_APPWIZ 600 -/* Strings */ +/* Banners */ #define IDS_APPTITLE 100 -#define IDS_SEARCH_TEXT 101 -#define IDS_APPS_COUNT 102 -#define IDS_WELCOME_TITLE 103 -#define IDS_WELCOME_TEXT 104 -#define IDS_WELCOME_URL 105 -#define IDS_INSTALLED 106 -#define IDS_AVAILABLEFORINST 107 -#define IDS_UPDATES 108 -#define IDS_APPLICATIONS 109 -#define IDS_CHOOSE_FOLDER_TEXT 110 -#define IDS_CHOOSE_FOLDER_ERROR 111 -#define IDS_URL_INVALID 112 -#define IDS_APP_REG_REMOVE 113 -#define IDS_INFORMATION 114 -#define IDS_UNABLE_TO_REMOVE 115 -#define IDS_UNABLE_TO_DOWNLOAD 116 -#define IDS_UNABLE_TO_DOWNLOAD2 117 -#define IDS_UNABLE_TO_QUERY_CERT 118 -#define IDS_INTEG_CHECK_TITLE 119 -#define IDS_INTEG_CHECK_FAIL 120 -#define IDS_INTERRUPTED_DOWNLOAD 121 -#define IDS_UNABLE_TO_WRITE 122 -#define IDS_INSTALL_SELECTED 123 -#define IDS_UNABLE_TO_INSTALL 124 -#define IDS_SELECTEDFORINST 125 -#define IDS_MISMATCH_CERT_INFO 126 -#define IDS_UNABLE_PATH 127 -#define IDS_APP_AUTHORS 128 -#define IDS_APP_DISPLAY_DETAILS 129 -#define IDS_APP_DISPLAY_LIST 130 -#define IDS_APP_DISPLAY_TILE 131 -#define IDS_NO_SEARCH_RESULTS 132 +#define IDS_APP_AUTHORS 101 +#define IDS_WELCOME_TITLE 102 +#define IDS_WELCOME_TEXT 103 +#define IDS_WELCOME_URL 104 + +/* Strings */ +#define IDS_SEARCH_TEXT 110 +#define IDS_APPS_COUNT 111 +// 112 - Reserved +#define IDS_INSTALLED 113 +#define IDS_AVAILABLEFORINST 114 +#define IDS_UPDATES 115 +#define IDS_APPLICATIONS 116 +#define IDS_CHOOSE_FOLDER_TEXT 117 +#define IDS_CHOOSE_FOLDER_ERROR 118 +#define IDS_URL_INVALID 119 +#define IDS_APP_REG_REMOVE 120 +#define IDS_INFORMATION 121 +#define IDS_UNABLE_TO_REMOVE 122 +#define IDS_UNABLE_TO_DOWNLOAD 123 +#define IDS_UNABLE_TO_DOWNLOAD2 124 +#define IDS_UNABLE_TO_QUERY_CERT 125 +#define IDS_INTEG_CHECK_TITLE 126 +#define IDS_INTEG_CHECK_FAIL 127 +#define IDS_INTERRUPTED_DOWNLOAD 128 +#define IDS_UNABLE_TO_WRITE 129 +#define IDS_INSTALL_SELECTED 130 +#define IDS_UNABLE_TO_INSTALL 131 +#define IDS_SELECTEDFORINST 132 +#define IDS_MISMATCH_CERT_INFO 133 +#define IDS_UNABLE_PATH 134 +#define IDS_APP_DISPLAY_DETAILS 135 +#define IDS_APP_DISPLAY_LIST 136 +#define IDS_APP_DISPLAY_TILE 137 +#define IDS_NO_SEARCH_RESULTS 138 /* Tooltips */ #define IDS_TOOLTIP_INSTALL 200 diff --git a/base/applications/rapps/lang/bg-BG.rc b/base/applications/rapps/lang/bg-BG.rc index 915bf2ea818..cee645c6a78 100644 --- a/base/applications/rapps/lang/bg-BG.rc +++ b/base/applications/rapps/lang/bg-BG.rc @@ -188,11 +188,15 @@ STRINGTABLE BEGIN IDS_APPTITLE "Управителят за приложения на РеактОС" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" - IDS_SEARCH_TEXT "Търсене" - IDS_APPS_COUNT "Брой приложения: %d; Selected: %d" IDS_WELCOME_TITLE "Управителят на приложенията на РеактОС ви приветства" IDS_WELCOME_TEXT "Изберете раздел от лявата страна, след което изберете приложение за слагане или премахване.\nСтраницата на РеактОС: " IDS_WELCOME_URL "https://reactos.org" +END + +STRINGTABLE +BEGIN + IDS_SEARCH_TEXT "Търсене…" + IDS_APPS_COUNT "Брой приложения: %d; Selected: %d" IDS_INSTALLED "Сложено" IDS_AVAILABLEFORINST "Налично за слагане" IDS_UPDATES "Обновления" diff --git a/base/applications/rapps/lang/cs-CZ.rc b/base/applications/rapps/lang/cs-CZ.rc index 4c510924493..3c48c0dab0b 100644 --- a/base/applications/rapps/lang/cs-CZ.rc +++ b/base/applications/rapps/lang/cs-CZ.rc @@ -189,11 +189,15 @@ STRINGTABLE BEGIN IDS_APPTITLE "ReactOS Správce aplikací" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" - IDS_SEARCH_TEXT "Hledat…" - IDS_APPS_COUNT "Počet aplikací: %d; Vybráno: %d" IDS_WELCOME_TITLE "Vítejte v ReactOS Správci aplikací!\n\n" IDS_WELCOME_TEXT "Na levé straně zvolte kategorii, pak vpravo zvolte aplikaci, která bude nainstalována nebo odinstalována.\nWebová stránka ReactOS: " IDS_WELCOME_URL "https://reactos.org" +END + +STRINGTABLE +BEGIN + IDS_SEARCH_TEXT "Hledat…" + IDS_APPS_COUNT "Počet aplikací: %d; Vybráno: %d" IDS_INSTALLED "Nainstalováno" IDS_AVAILABLEFORINST "Lze instalovat" IDS_UPDATES "Aktualizace" diff --git a/base/applications/rapps/lang/de-DE.rc b/base/applications/rapps/lang/de-DE.rc index c7a2a34a601..b03152c053c 100644 --- a/base/applications/rapps/lang/de-DE.rc +++ b/base/applications/rapps/lang/de-DE.rc @@ -191,11 +191,15 @@ STRINGTABLE BEGIN IDS_APPTITLE "ReactOS-Anwendungsmanager" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" - IDS_SEARCH_TEXT "Suche…" - IDS_APPS_COUNT "Anzahl der Anwendungen: %d, ausgewählt: %d" IDS_WELCOME_TITLE "Willkommen im ReactOS-Anwendungsmanager!\n\n" IDS_WELCOME_TEXT "Wählen Sie links eine Kategorie und dann eine Anwendung um sie zu installieren oder zu deinstallieren.\nReactOS-Webseite: " IDS_WELCOME_URL "https://reactos.org" +END + +STRINGTABLE +BEGIN + IDS_SEARCH_TEXT "Suche…" + IDS_APPS_COUNT "Anzahl der Anwendungen: %d, ausgewählt: %d" IDS_INSTALLED "Installiert" IDS_AVAILABLEFORINST "Zur Installation verfügbar" IDS_UPDATES "Aktualisierungen" diff --git a/base/applications/rapps/lang/en-US.rc b/base/applications/rapps/lang/en-US.rc index 70c7eb4106f..1f0af2d1106 100644 --- a/base/applications/rapps/lang/en-US.rc +++ b/base/applications/rapps/lang/en-US.rc @@ -191,11 +191,15 @@ STRINGTABLE BEGIN IDS_APPTITLE "ReactOS Applications Manager" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" - IDS_SEARCH_TEXT "Search…" - IDS_APPS_COUNT "Applications count: %d; Selected: %d" IDS_WELCOME_TITLE "Welcome to ReactOS Applications Manager!\n\n" IDS_WELCOME_TEXT "Choose a category on the left, then choose an application to install or uninstall.\nReactOS Web Site: " IDS_WELCOME_URL "https://reactos.org" +END + +STRINGTABLE +BEGIN + IDS_SEARCH_TEXT "Search…" + IDS_APPS_COUNT "Applications count: %d; Selected: %d" IDS_INSTALLED "Installed" IDS_AVAILABLEFORINST "Available for installation" IDS_UPDATES "Updates" diff --git a/base/applications/rapps/lang/es-ES.rc b/base/applications/rapps/lang/es-ES.rc index de4c4351959..9655bf1c2c4 100644 --- a/base/applications/rapps/lang/es-ES.rc +++ b/base/applications/rapps/lang/es-ES.rc @@ -190,11 +190,15 @@ STRINGTABLE BEGIN IDS_APPTITLE "Administrador de aplicaciones de ReactOS" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" - IDS_SEARCH_TEXT "Buscar…" - IDS_APPS_COUNT "Nº de aplicaciones: %d; Selecionadas: %d" IDS_WELCOME_TITLE "Bienvenido al Administrador de aplicaciones de ReactOS.\n\n" IDS_WELCOME_TEXT "Seleccione una categoría a la izquierda, para más tarde seleccionar la aplicación a instalar o desinstalar.\nWeb de ReactOS: " IDS_WELCOME_URL "https://reactos.org" +END + +STRINGTABLE +BEGIN + IDS_SEARCH_TEXT "Buscar…" + IDS_APPS_COUNT "Nº de aplicaciones: %d; Selecionadas: %d" IDS_INSTALLED "Instaladas" IDS_AVAILABLEFORINST "Disponible para su instalación" IDS_UPDATES "Actualizaciones" diff --git a/base/applications/rapps/lang/et-EE.rc b/base/applications/rapps/lang/et-EE.rc index 8314f0e1bb7..0342ce892f0 100644 --- a/base/applications/rapps/lang/et-EE.rc +++ b/base/applications/rapps/lang/et-EE.rc @@ -188,11 +188,15 @@ STRINGTABLE BEGIN IDS_APPTITLE "ReactOS'i Rakenduste Haldur" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" - IDS_SEARCH_TEXT "Otsi…" - IDS_APPS_COUNT "Rakenduste arv: %d; Valitud: %d" IDS_WELCOME_TITLE "Tere tulemast ReactOS'i Rakenduste Haldurisse!\n\n" IDS_WELCOME_TEXT "Vali vasakult teema, siis vali paremalt rakendusi mida soovid installida või desinstallida.\nReactOS'i veebileht: " IDS_WELCOME_URL "https://reactos.org" +END + +STRINGTABLE +BEGIN + IDS_SEARCH_TEXT "Otsi…" + IDS_APPS_COUNT "Rakenduste arv: %d; Valitud: %d" IDS_INSTALLED "Installitud" IDS_AVAILABLEFORINST "Installimiseks saadaval" IDS_UPDATES "Uuendused" diff --git a/base/applications/rapps/lang/fr-FR.rc b/base/applications/rapps/lang/fr-FR.rc index 8a82db86abb..0369b803096 100644 --- a/base/applications/rapps/lang/fr-FR.rc +++ b/base/applications/rapps/lang/fr-FR.rc @@ -191,11 +191,15 @@ STRINGTABLE BEGIN IDS_APPTITLE "Gestionnaire d'applications ReactOS" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" - IDS_SEARCH_TEXT "Chercher…" - IDS_APPS_COUNT "Nombre d'applications : %d ; Sélectionnées : %d" IDS_WELCOME_TITLE "Bienvenue dans ReactOS Applications Manager !\n\n" IDS_WELCOME_TEXT "Choisissez une catégorie à gauche, ensuite choisissez une application à installer ou désinstaller.\nSite internet de ReactOS : " IDS_WELCOME_URL "https://reactos.org" +END + +STRINGTABLE +BEGIN + IDS_SEARCH_TEXT "Chercher…" + IDS_APPS_COUNT "Nombre d'applications : %d ; Sélectionnées : %d" IDS_INSTALLED "Installé" IDS_AVAILABLEFORINST "Disponible pour installation" IDS_UPDATES "Mises à jour" diff --git a/base/applications/rapps/lang/he-IL.rc b/base/applications/rapps/lang/he-IL.rc index f175a433da8..c63c0fe612d 100644 --- a/base/applications/rapps/lang/he-IL.rc +++ b/base/applications/rapps/lang/he-IL.rc @@ -193,11 +193,15 @@ STRINGTABLE BEGIN IDS_APPTITLE "מנהל היישומים של ReactOS" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" - IDS_SEARCH_TEXT "חיפוש…" - IDS_APPS_COUNT "ספירת יישומים: %d; Selected: %d" IDS_WELCOME_TITLE "ברוכים הבאים למנהל היישומים של ReactOS!\n\n" IDS_WELCOME_TEXT "בחר קטגוריה בצד שמאל, לאחר מכן בחר יישום להתקנה או להסרה.\nהאתר של ReactOS: " IDS_WELCOME_URL "https://reactos.org" +END + +STRINGTABLE +BEGIN + IDS_SEARCH_TEXT "חיפוש…" + IDS_APPS_COUNT "ספירת יישומים: %d; Selected: %d" IDS_INSTALLED "מותקן" IDS_AVAILABLEFORINST "זמין להתקנה" IDS_UPDATES "עדכונים" diff --git a/base/applications/rapps/lang/hu-HU.rc b/base/applications/rapps/lang/hu-HU.rc index d9bb387e3a5..8ddad88d669 100644 --- a/base/applications/rapps/lang/hu-HU.rc +++ b/base/applications/rapps/lang/hu-HU.rc @@ -188,11 +188,15 @@ STRINGTABLE BEGIN IDS_APPTITLE "ReactOS Alkalmazáskezelő" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" - IDS_SEARCH_TEXT "Keresés…" - IDS_APPS_COUNT "Alkalmazások száma: %d; Kijelölve: %d" IDS_WELCOME_TITLE "Üdvözöljük a ReactOS Alkalmazáskezelőben!\n\n" IDS_WELCOME_TEXT "Bal oldalon válasszon kategóriát, majd válasszon egy telepíteni vagy eltávolítani kívánt alkalmazást.\nReactOS weboldal: " IDS_WELCOME_URL "https://reactos.org" +END + +STRINGTABLE +BEGIN + IDS_SEARCH_TEXT "Keresés…" + IDS_APPS_COUNT "Alkalmazások száma: %d; Kijelölve: %d" IDS_INSTALLED "Telepített" IDS_AVAILABLEFORINST "Telepíthető alkalmazások" IDS_UPDATES "Frissítések" diff --git a/base/applications/rapps/lang/id-ID.rc b/base/applications/rapps/lang/id-ID.rc index b82d8449084..09e47eeb3b7 100644 --- a/base/applications/rapps/lang/id-ID.rc +++ b/base/applications/rapps/lang/id-ID.rc @@ -188,11 +188,15 @@ STRINGTABLE BEGIN IDS_APPTITLE "Manajer Aplikasi ReactOS" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" - IDS_SEARCH_TEXT "Cari…" - IDS_APPS_COUNT "Jumlah aplikasi: %d; Terpilih: %d" IDS_WELCOME_TITLE "Selamat datang di Manajer Aplikasi ReactOS!\n\n" IDS_WELCOME_TEXT "pilih kategori di sisi kiri, kemudian pilih aplikasi untuk dipasang atau dibongkar.\nSitus Web ReactOS: " IDS_WELCOME_URL "https://reactos.org" +END + +STRINGTABLE +BEGIN + IDS_SEARCH_TEXT "Cari…" + IDS_APPS_COUNT "Jumlah aplikasi: %d; Terpilih: %d" IDS_INSTALLED "Terpasang" IDS_AVAILABLEFORINST "Tersedia untuk pemasangan" IDS_UPDATES "Pembaruan" diff --git a/base/applications/rapps/lang/it-IT.rc b/base/applications/rapps/lang/it-IT.rc index 2cdf3388d01..0a96a880df6 100644 --- a/base/applications/rapps/lang/it-IT.rc +++ b/base/applications/rapps/lang/it-IT.rc @@ -190,11 +190,15 @@ STRINGTABLE BEGIN IDS_APPTITLE "ReactOS Gestione applicazioni" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" - IDS_SEARCH_TEXT "Cerca…" - IDS_APPS_COUNT "Numero applicazioni: %d; Selezionate: %d" IDS_WELCOME_TITLE "Benvenuto!\n\n" IDS_WELCOME_TEXT "Scegliere una categoria a sinistra, poi scegliere una applicazione da installare o disinstallare.\nReactOS Web Site: " IDS_WELCOME_URL "https://reactos.org" +END + +STRINGTABLE +BEGIN + IDS_SEARCH_TEXT "Cerca…" + IDS_APPS_COUNT "Numero applicazioni: %d; Selezionate: %d" IDS_INSTALLED "Installato" IDS_AVAILABLEFORINST "Disponibile per l'installazione" IDS_UPDATES "Aggiornamenti" diff --git a/base/applications/rapps/lang/ja-JP.rc b/base/applications/rapps/lang/ja-JP.rc index d9745dd181a..56d49dee106 100644 --- a/base/applications/rapps/lang/ja-JP.rc +++ b/base/applications/rapps/lang/ja-JP.rc @@ -190,11 +190,15 @@ STRINGTABLE BEGIN IDS_APPTITLE "ReactOS アプリマネージャ" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" - IDS_SEARCH_TEXT "検索..." - IDS_APPS_COUNT "アプリ数: %d; Selected: %d" IDS_WELCOME_TITLE "ReactOS アプリマネージャへようこそ!\n\n" IDS_WELCOME_TEXT "左側からカテゴリを選択し、インストールまたはアンインストールするアプリを選んでください。\nReactOS ウェブサイト: " IDS_WELCOME_URL "https://reactos.org" +END + +STRINGTABLE +BEGIN + IDS_SEARCH_TEXT "検索..." + IDS_APPS_COUNT "アプリ数: %d; Selected: %d" IDS_INSTALLED "インストール済み" IDS_AVAILABLEFORINST "インストール可能" IDS_UPDATES "更新" diff --git a/base/applications/rapps/lang/no-NO.rc b/base/applications/rapps/lang/no-NO.rc index 2e5904af9f6..93acc280c95 100644 --- a/base/applications/rapps/lang/no-NO.rc +++ b/base/applications/rapps/lang/no-NO.rc @@ -188,11 +188,15 @@ STRINGTABLE BEGIN IDS_APPTITLE "ReactOS programbehandler" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" - IDS_SEARCH_TEXT "Søk…" - IDS_APPS_COUNT "Program oppsummering: %d; Selected: %d" IDS_WELCOME_TITLE "Velkommen til ReactOS programbehandler!\n\n" IDS_WELCOME_TEXT "Velg en kategori til venstre, og velg et program for installere eller avinstallere programvaren.\nReactOS internettside: " IDS_WELCOME_URL "https://reactos.org" +END + +STRINGTABLE +BEGIN + IDS_SEARCH_TEXT "Søk…" + IDS_APPS_COUNT "Program oppsummering: %d; Selected: %d" IDS_INSTALLED "Installert" IDS_AVAILABLEFORINST "Tilgjengelig for installasjon" IDS_UPDATES "Oppdateringer" diff --git a/base/applications/rapps/lang/pl-PL.rc b/base/applications/rapps/lang/pl-PL.rc index 34f45470f1d..3bc806e1cea 100644 --- a/base/applications/rapps/lang/pl-PL.rc +++ b/base/applications/rapps/lang/pl-PL.rc @@ -190,11 +190,15 @@ STRINGTABLE BEGIN IDS_APPTITLE "Menedżer aplikacji ReactOS" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" - IDS_SEARCH_TEXT "Szukaj…" - IDS_APPS_COUNT "Liczba aplikacji: %d; Wybranych: %d" IDS_WELCOME_TITLE "Witamy w Menedżerze aplikacji ReactOS!\n\n" IDS_WELCOME_TEXT "Z listy po lewej wybierz kategorię, a następnie aplikację, by ją zainstalować lub odinstalować.\nStrona projektu ReactOS: " IDS_WELCOME_URL "https://reactos.org" +END + +STRINGTABLE +BEGIN + IDS_SEARCH_TEXT "Szukaj…" + IDS_APPS_COUNT "Liczba aplikacji: %d; Wybranych: %d" IDS_INSTALLED "Zainstalowane" IDS_AVAILABLEFORINST "Dostępne" IDS_UPDATES "Uaktualnienia" diff --git a/base/applications/rapps/lang/pt-BR.rc b/base/applications/rapps/lang/pt-BR.rc index 3bf098fa468..6a7a285733a 100644 --- a/base/applications/rapps/lang/pt-BR.rc +++ b/base/applications/rapps/lang/pt-BR.rc @@ -188,11 +188,15 @@ STRINGTABLE BEGIN IDS_APPTITLE "Central de Aplicativos ReactOS" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" - IDS_SEARCH_TEXT "Procurar…" - IDS_APPS_COUNT "Número de aplicativos: %d; Selected: %d" IDS_WELCOME_TITLE "Bem-vindo(a) a Central de Aplicativos ReactOS!\n\n" IDS_WELCOME_TEXT "Escolha uma categoria à esquerda, então escolha um aplicativo para instalar ou desinstalar.\nWeb Site ReactOS: " IDS_WELCOME_URL "https://reactos.org" +END + +STRINGTABLE +BEGIN + IDS_SEARCH_TEXT "Procurar…" + IDS_APPS_COUNT "Número de aplicativos: %d; Selected: %d" IDS_INSTALLED "Instalado" IDS_AVAILABLEFORINST "Disponível para instalação" IDS_UPDATES "Atualizações" diff --git a/base/applications/rapps/lang/pt-PT.rc b/base/applications/rapps/lang/pt-PT.rc index 931fcd1aee9..d96d4fa49ef 100644 --- a/base/applications/rapps/lang/pt-PT.rc +++ b/base/applications/rapps/lang/pt-PT.rc @@ -188,11 +188,15 @@ STRINGTABLE BEGIN IDS_APPTITLE "Central de aplicações ReactOS" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" - IDS_SEARCH_TEXT "Procurar…" - IDS_APPS_COUNT "Número de aplicações: %d; Seleccionadas: %d" IDS_WELCOME_TITLE "Bem-vindo(a) à Central de aplicações ReactOS!\n\n" IDS_WELCOME_TEXT "Escolha uma categoria à esquerda, de seguida escolha uma aplicação para instalar ou desinstalar.\nWeb Site ReactOS: " IDS_WELCOME_URL "https://reactos.org" +END + +STRINGTABLE +BEGIN + IDS_SEARCH_TEXT "Procurar…" + IDS_APPS_COUNT "Número de aplicações: %d; Seleccionadas: %d" IDS_INSTALLED "Instalado" IDS_AVAILABLEFORINST "Disponível para instalação" IDS_UPDATES "Actualizações" diff --git a/base/applications/rapps/lang/ro-RO.rc b/base/applications/rapps/lang/ro-RO.rc index 79b1f9ad619..72ceab360fc 100644 --- a/base/applications/rapps/lang/ro-RO.rc +++ b/base/applications/rapps/lang/ro-RO.rc @@ -190,11 +190,15 @@ STRINGTABLE BEGIN IDS_APPTITLE "Managerul de aplicații ReactOS" IDS_APP_AUTHORS "Marcă înregistrată 2009 Dmitry Chapyshev" - IDS_SEARCH_TEXT "Căutare…" - IDS_APPS_COUNT "Numărul de programe: %d; Selectate: %d" IDS_WELCOME_TITLE "Bun venit la Managerul de aplicații ReactOS!\n\n" IDS_WELCOME_TEXT "Alegeți o categorie din stânga, apoi alegeți o aplicație pentru a o instala sau dezinstala.\nArdesa web ReactOS: " IDS_WELCOME_URL "https://reactos.org" +END + +STRINGTABLE +BEGIN + IDS_SEARCH_TEXT "Căutare…" + IDS_APPS_COUNT "Numărul de programe: %d; Selectate: %d" IDS_INSTALLED "Instalate" IDS_AVAILABLEFORINST "Disponibile pentru instalare" IDS_UPDATES "Actualizări" diff --git a/base/applications/rapps/lang/ru-RU.rc b/base/applications/rapps/lang/ru-RU.rc index 435301ecc8e..1091958e29d 100644 --- a/base/applications/rapps/lang/ru-RU.rc +++ b/base/applications/rapps/lang/ru-RU.rc @@ -193,11 +193,15 @@ STRINGTABLE BEGIN IDS_APPTITLE "Менеджер приложений ReactOS" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" - IDS_SEARCH_TEXT "Поиск…" - IDS_APPS_COUNT "Количество приложений: %d; Выбрано: %d" IDS_WELCOME_TITLE "Добро пожаловать в ""Менеджер приложений ReactOS""!\n\n" IDS_WELCOME_TEXT "Выберите категорию слева и приложение для установки или удаления.\nСайт ReactOS: " IDS_WELCOME_URL "https://reactos.org" +END + +STRINGTABLE +BEGIN + IDS_SEARCH_TEXT "Поиск…" + IDS_APPS_COUNT "Количество приложений: %d; Выбрано: %d" IDS_INSTALLED "Установленные" IDS_AVAILABLEFORINST "Доступно для установки" IDS_UPDATES "Обновления" diff --git a/base/applications/rapps/lang/sk-SK.rc b/base/applications/rapps/lang/sk-SK.rc index 6f1fd093754..4a6f5b59b09 100644 --- a/base/applications/rapps/lang/sk-SK.rc +++ b/base/applications/rapps/lang/sk-SK.rc @@ -188,11 +188,15 @@ STRINGTABLE BEGIN IDS_APPTITLE "Manažér aplikácií systému ReactOS" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" - IDS_SEARCH_TEXT "Hľadať…" - IDS_APPS_COUNT "Počet programov: %d; Selected: %d" IDS_WELCOME_TITLE "Víta Vás Manažér aplikácií systému ReactOS!\n\n" IDS_WELCOME_TEXT "Vyberte si kategóriu na ľavej strane, potom vyberte aplikáciu, ktorú chcete nainštalovať alebo odinštalovať.\nWebstránka projektu ReactOS: " IDS_WELCOME_URL "https://reactos.org" +END + +STRINGTABLE +BEGIN + IDS_SEARCH_TEXT "Hľadať…" + IDS_APPS_COUNT "Počet programov: %d; Selected: %d" IDS_INSTALLED "Nainštalované" IDS_AVAILABLEFORINST "Dostupné pre nainštalovanie" IDS_UPDATES "Aktualizácie" diff --git a/base/applications/rapps/lang/sq-AL.rc b/base/applications/rapps/lang/sq-AL.rc index 6d0cd45e586..29221404bdd 100644 --- a/base/applications/rapps/lang/sq-AL.rc +++ b/base/applications/rapps/lang/sq-AL.rc @@ -188,11 +188,15 @@ STRINGTABLE BEGIN IDS_APPTITLE "ReactOS Applications Manager" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" - IDS_SEARCH_TEXT "Kerko…" - IDS_APPS_COUNT "Numrimi Aplicacioneve: %d; Selected: %d" IDS_WELCOME_TITLE "Mire Se Erdhe ne ReactOS Applications Manager!\n\n" IDS_WELCOME_TEXT "Zgjidh nje kategori ne te majte, pastaj zgjidh nje aplicacion per ta instaluar ose uninstall.\nReactOS Web Site: " IDS_WELCOME_URL "https://reactos.org" +END + +STRINGTABLE +BEGIN + IDS_SEARCH_TEXT "Kerko…" + IDS_APPS_COUNT "Numrimi Aplicacioneve: %d; Selected: %d" IDS_INSTALLED "Instaluar" IDS_AVAILABLEFORINST "Te vlefshem per instalim" IDS_UPDATES "Updates" diff --git a/base/applications/rapps/lang/sv-SE.rc b/base/applications/rapps/lang/sv-SE.rc index 62d221f58b5..b8df31b5b57 100644 --- a/base/applications/rapps/lang/sv-SE.rc +++ b/base/applications/rapps/lang/sv-SE.rc @@ -188,11 +188,15 @@ STRINGTABLE BEGIN IDS_APPTITLE "ReactOS programhanterare" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" - IDS_SEARCH_TEXT "Sök…" - IDS_APPS_COUNT "Programantal: %d; Selected: %d" IDS_WELCOME_TITLE "Välkommen till ReactOS programhanterare!\n\n" IDS_WELCOME_TEXT "Välj en kategori till vänster, och sedan ett program för att installera eller avinstallera.\nReactOS Web sida: " IDS_WELCOME_URL "https://reactos.org" +END + +STRINGTABLE +BEGIN + IDS_SEARCH_TEXT "Sök…" + IDS_APPS_COUNT "Programantal: %d; Selected: %d" IDS_INSTALLED "Installerat" IDS_AVAILABLEFORINST "Tillgängliga for installation" IDS_UPDATES "Uppdateringar" diff --git a/base/applications/rapps/lang/tr-TR.rc b/base/applications/rapps/lang/tr-TR.rc index 535d93f50fc..36436dbc80e 100644 --- a/base/applications/rapps/lang/tr-TR.rc +++ b/base/applications/rapps/lang/tr-TR.rc @@ -190,11 +190,15 @@ STRINGTABLE BEGIN IDS_APPTITLE "ReactOS Uygulama Yöneticisi" IDS_APP_AUTHORS "Telif Hakkı: 2009 Dmitry Chapyshev" - IDS_SEARCH_TEXT "Ara" - IDS_APPS_COUNT "Uygulama Sayısı: %d; Seçili: %d" IDS_WELCOME_TITLE "ReactOS Uygulama Yöneticisi'ne hoş geldiniz.\n\n" IDS_WELCOME_TEXT "Solda bir kategori seçiniz, ardından kurmak ya da kaldırmak için bir uygulama seçiniz.\nReactOS'un İnternet sitesi: " IDS_WELCOME_URL "https://reactos.org" +END + +STRINGTABLE +BEGIN + IDS_SEARCH_TEXT "Ara…" + IDS_APPS_COUNT "Uygulama Sayısı: %d; Seçili: %d" IDS_INSTALLED "Kurulanlar" IDS_AVAILABLEFORINST "Kurulabilir Uygulamalar" IDS_UPDATES "Güncelleştirmeler" diff --git a/base/applications/rapps/lang/uk-UA.rc b/base/applications/rapps/lang/uk-UA.rc index 38fe3ca8ec3..b0fa045c8a3 100644 --- a/base/applications/rapps/lang/uk-UA.rc +++ b/base/applications/rapps/lang/uk-UA.rc @@ -191,11 +191,15 @@ STRINGTABLE BEGIN IDS_APPTITLE "Менеджер додатків ReactOS" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" - IDS_SEARCH_TEXT "Пошук…" - IDS_APPS_COUNT "Kількість додатків: %d; Обрано: %d" IDS_WELCOME_TITLE "Ласкаво просимо в Менеджер додатків ReactOS!\n\n" IDS_WELCOME_TEXT "Виберіть категорію зліва, а потім виберіть програми для встановлення чи видалення.\nСторінка ReactOS: " IDS_WELCOME_URL "https://reactos.org" +END + +STRINGTABLE +BEGIN + IDS_SEARCH_TEXT "Пошук…" + IDS_APPS_COUNT "Kількість додатків: %d; Обрано: %d" IDS_INSTALLED "Встановлені" IDS_AVAILABLEFORINST "Доступні для встановлення" IDS_UPDATES "Оновлення" diff --git a/base/applications/rapps/lang/zh-CN.rc b/base/applications/rapps/lang/zh-CN.rc index 9118c8ce2d7..dcbf2a42575 100644 --- a/base/applications/rapps/lang/zh-CN.rc +++ b/base/applications/rapps/lang/zh-CN.rc @@ -192,11 +192,15 @@ STRINGTABLE BEGIN IDS_APPTITLE "ReactOS 程序管理器" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" - IDS_SEARCH_TEXT "搜索…" - IDS_APPS_COUNT "程序数量：%d；已选：%d" IDS_WELCOME_TITLE "欢迎使用 ReactOS 程序管理器！\n\n" IDS_WELCOME_TEXT "从左栏选择一个类别，然后选择要安装或卸载的程序。\nReactOS 网站：" IDS_WELCOME_URL "https://reactos.org" +END + +STRINGTABLE +BEGIN + IDS_SEARCH_TEXT "搜索…" + IDS_APPS_COUNT "程序数量：%d；已选：%d" IDS_INSTALLED "已安装" IDS_AVAILABLEFORINST "可安装" IDS_UPDATES "更新" diff --git a/base/applications/rapps/lang/zh-HK.rc b/base/applications/rapps/lang/zh-HK.rc index 33366ac0cab..db9febe2394 100644 --- a/base/applications/rapps/lang/zh-HK.rc +++ b/base/applications/rapps/lang/zh-HK.rc @@ -189,11 +189,15 @@ STRINGTABLE BEGIN IDS_APPTITLE "ReactOS 程式管理員" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" - IDS_SEARCH_TEXT "搜尋..." - IDS_APPS_COUNT "程式數量：%d；已選：%d" IDS_WELCOME_TITLE "歡迎來到 ReactOS 程式管理員！\n\n" IDS_WELCOME_TEXT "從左側欄目選擇一個類別，然後選擇要安裝或解除安裝的程式。\nReactOS 網站︰" IDS_WELCOME_URL "https://reactos.org" +END + +STRINGTABLE +BEGIN + IDS_SEARCH_TEXT "搜尋..." + IDS_APPS_COUNT "程式數量：%d；已選：%d" IDS_INSTALLED "已安裝" IDS_AVAILABLEFORINST "可安裝" IDS_UPDATES "更新" diff --git a/base/applications/rapps/lang/zh-TW.rc b/base/applications/rapps/lang/zh-TW.rc index 93d2d2140c1..a53aa257086 100644 --- a/base/applications/rapps/lang/zh-TW.rc +++ b/base/applications/rapps/lang/zh-TW.rc @@ -189,11 +189,15 @@ STRINGTABLE BEGIN IDS_APPTITLE "ReactOS 程式管理員" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" - IDS_SEARCH_TEXT "搜尋..." - IDS_APPS_COUNT "程式數量：%d；已選：%d" IDS_WELCOME_TITLE "歡迎來到 ReactOS 程式管理員！\n\n" IDS_WELCOME_TEXT "從左側欄目選擇一個類別，然後選擇要安裝或解除安裝的程式。\nReactOS 網站︰" IDS_WELCOME_URL "https://reactos.org" +END + +STRINGTABLE +BEGIN + IDS_SEARCH_TEXT "搜尋..." + IDS_APPS_COUNT "程式數量：%d；已選：%d" IDS_INSTALLED "已安裝" IDS_AVAILABLEFORINST "可安裝" IDS_UPDATES "更新"

3 months, 3 weeks

[reactos] 03/09: [RAPPS] Don't show the "Description" column for installed applications.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2d0182345a245b5ddcf67… commit 2d0182345a245b5ddcf67e94f945901beac22693 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Sep 16 18:38:33 2024 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Sep 18 12:31:43 2024 +0200 [RAPPS] Don't show the "Description" column for installed applications. As it currently is, it doesn't provide much useful information. It will be re-enabled later when we support other columns ("Publisher", "Size", "Installed on", ...) and the possibility to show/hide columns. --- base/applications/rapps/appview.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/base/applications/rapps/appview.cpp b/base/applications/rapps/appview.cpp index 03a4fd436fa..76307acace6 100644 --- a/base/applications/rapps/appview.cpp +++ b/base/applications/rapps/appview.cpp @@ -1347,13 +1347,15 @@ CAppsListView::SetDisplayAppType(APPLICATION_VIEW_TYPE AppType) /* Add columns to ListView */ szText.LoadStringW(IDS_APP_NAME); - AddColumn(ColumnCount++, szText, 250, LVCFMT_LEFT); + AddColumn(ColumnCount++, szText, 368, LVCFMT_LEFT); szText.LoadStringW(IDS_APP_INST_VERSION); AddColumn(ColumnCount++, szText, 90, LVCFMT_RIGHT); +#if 0 // This column is not currently useful for installed apps. szText.LoadStringW(IDS_APP_DESCRIPTION); AddColumn(ColumnCount++, szText, 300, LVCFMT_LEFT); +#endif // Disable checkboxes ShowCheckboxes(false);

3 months, 3 weeks

[reactos] 02/09: [RAPPS] Simplify CAppsListView::SetCheckboxesVisible() into ShowCheckboxes()

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2a2df969b0ad0ff5c8fe7… commit 2a2df969b0ad0ff5c8fe72ba97aa73858a06998b Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Sep 16 22:47:42 2024 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Sep 18 12:31:43 2024 +0200 [RAPPS] Simplify CAppsListView::SetCheckboxesVisible() into ShowCheckboxes() --- base/applications/rapps/appview.cpp | 26 +++++++++----------------- base/applications/rapps/include/appview.h | 7 ++++--- 2 files changed, 13 insertions(+), 20 deletions(-) diff --git a/base/applications/rapps/appview.cpp b/base/applications/rapps/appview.cpp index fb7515d5cfc..03a4fd436fa 100644 --- a/base/applications/rapps/appview.cpp +++ b/base/applications/rapps/appview.cpp @@ -1109,19 +1109,11 @@ CAppsListView::SetWatermark(const CStringW &Text) m_Watermark = Text; } -VOID -CAppsListView::SetCheckboxesVisible(BOOL bIsVisible) +void +CAppsListView::ShowCheckboxes(bool bShow) { - if (bIsVisible) - { - SetExtendedListViewStyle(LVS_EX_CHECKBOXES | LVS_EX_FULLROWSELECT); - } - else - { - SetExtendedListViewStyle(LVS_EX_FULLROWSELECT); - } - - bHasCheckboxes = bIsVisible; + SetExtendedListViewStyle((bShow ? LVS_EX_CHECKBOXES : 0) | LVS_EX_FULLROWSELECT); + bHasCheckboxes = bShow; } VOID @@ -1254,7 +1246,7 @@ CAppsListView::Create(HWND hwndParent) if (hwnd) { - SetCheckboxesVisible(FALSE); + ShowCheckboxes(false); } #pragma push_macro("SubclassWindow") @@ -1363,8 +1355,8 @@ CAppsListView::SetDisplayAppType(APPLICATION_VIEW_TYPE AppType) szText.LoadStringW(IDS_APP_DESCRIPTION); AddColumn(ColumnCount++, szText, 300, LVCFMT_LEFT); - // disable checkboxes - SetCheckboxesVisible(FALSE); + // Disable checkboxes + ShowCheckboxes(false); break; case AppViewTypeAvailableApps: @@ -1379,8 +1371,8 @@ CAppsListView::SetDisplayAppType(APPLICATION_VIEW_TYPE AppType) szText.LoadStringW(IDS_APP_DESCRIPTION); AddColumn(ColumnCount++, szText, 300, LVCFMT_LEFT); - // enable checkboxes - SetCheckboxesVisible(TRUE); + // Enable checkboxes + ShowCheckboxes(true); break; default: diff --git a/base/applications/rapps/include/appview.h b/base/applications/rapps/include/appview.h index 46a3a583092..0c9aa29a733 100644 --- a/base/applications/rapps/include/appview.h +++ b/base/applications/rapps/include/appview.h @@ -195,7 +195,7 @@ class CAppsListView : public CUiWindow<CWindowImpl<CAppsListView, CListView>> }; BOOL bIsAscending = TRUE; - BOOL bHasCheckboxes = FALSE; + bool bHasCheckboxes = false; INT ItemCount = 0; INT CheckedItemCount = 0; @@ -224,8 +224,9 @@ class CAppsListView : public CUiWindow<CWindowImpl<CAppsListView, CListView>> VOID SetWatermark(const CStringW &Text); - VOID - SetCheckboxesVisible(BOOL bIsVisible); + + void + ShowCheckboxes(bool bShow); VOID ColumnClick(LPNMLISTVIEW pnmv);

3 months, 3 weeks

[reactos] 01/09: [RAPPS] Merge CMainToolbar::Show/HideButtonCaption() into one single function.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=385274e2dd0309bba8495… commit 385274e2dd0309bba84955d9f67dcbcb07bba066 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Mar 22 21:58:35 2024 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Sep 18 12:31:41 2024 +0200 [RAPPS] Merge CMainToolbar::Show/HideButtonCaption() into one single function. --- base/applications/rapps/appview.cpp | 20 ++++++++------------ base/applications/rapps/include/appview.h | 6 ++---- 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/base/applications/rapps/appview.cpp b/base/applications/rapps/appview.cpp index e16c0929a92..fb7515d5cfc 100644 --- a/base/applications/rapps/appview.cpp +++ b/base/applications/rapps/appview.cpp @@ -157,18 +157,14 @@ CMainToolbar::Create(HWND hwndParent) return m_hWnd; } -VOID -CMainToolbar::HideButtonCaption() -{ - DWORD dCurrentExStyle = (DWORD)SendMessageW(TB_GETEXTENDEDSTYLE, 0, 0); - SendMessageW(TB_SETEXTENDEDSTYLE, 0, dCurrentExStyle | TBSTYLE_EX_MIXEDBUTTONS); -} - -VOID -CMainToolbar::ShowButtonCaption() +void +CMainToolbar::ShowButtonCaption(bool bShow) { DWORD dCurrentExStyle = (DWORD)SendMessageW(TB_GETEXTENDEDSTYLE, 0, 0); - SendMessageW(TB_SETEXTENDEDSTYLE, 0, dCurrentExStyle & ~TBSTYLE_EX_MIXEDBUTTONS); + if (bShow) + SendMessageW(TB_SETEXTENDEDSTYLE, 0, dCurrentExStyle & ~TBSTYLE_EX_MIXEDBUTTONS); + else + SendMessageW(TB_SETEXTENDEDSTYLE, 0, dCurrentExStyle | TBSTYLE_EX_MIXEDBUTTONS); } DWORD @@ -1737,11 +1733,11 @@ CApplicationView::OnSize(HWND hwnd, WPARAM wParam, LPARAM lParam) if (dSearchbarMargin > dToolbarTreshold) { - m_Toolbar->ShowButtonCaption(); + m_Toolbar->ShowButtonCaption(true); } else if (dSearchbarMargin < dToolbarTreshold) { - m_Toolbar->HideButtonCaption(); + m_Toolbar->ShowButtonCaption(false); } RECT r = {0, 0, LOWORD(lParam), HIWORD(lParam)}; diff --git a/base/applications/rapps/include/appview.h b/base/applications/rapps/include/appview.h index debc0b2c1bb..46a3a583092 100644 --- a/base/applications/rapps/include/appview.h +++ b/base/applications/rapps/include/appview.h @@ -293,10 +293,8 @@ class CMainToolbar : public CUiWindow<CToolbar<>> HWND Create(HWND hwndParent); - VOID - HideButtonCaption(); - VOID - ShowButtonCaption(); + void + ShowButtonCaption(bool bShow); DWORD GetMaxButtonsWidth() const;

3 months, 3 weeks

[reactos] 07/07: [WIN32NT_APITEST] Fix tests for NtUserSystemParametersInfo

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e8cf32cf15b25cc0d653e… commit e8cf32cf15b25cc0d653ee898768e14dd7ba0d36 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Apr 13 15:12:38 2024 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Wed Sep 18 10:22:26 2024 +0300 [WIN32NT_APITEST] Fix tests for NtUserSystemParametersInfo --- .../rostests/apitests/win32nt/ntuser/NtUserSystemParametersInfo.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserSystemParametersInfo.c b/modules/rostests/apitests/win32nt/ntuser/NtUserSystemParametersInfo.c index 9ecef4907b4..5adb538a2aa 100644 --- a/modules/rostests/apitests/win32nt/ntuser/NtUserSystemParametersInfo.c +++ b/modules/rostests/apitests/win32nt/ntuser/NtUserSystemParametersInfo.c @@ -583,8 +583,10 @@ Test_SPI_SETDESKWALLPAPER(void) RtlInitUnicodeString(&ustrOld, szOld); /* Set no Wallpaper */ +#ifndef _M_AMD64 TEST(NtUserSystemParametersInfo(SPI_SETDESKWALLPAPER, 0, L"", 0) == 1); - TEST(NtUserSystemParametersInfo(SPI_GETDESKWALLPAPER, MAX_PATH, szNew, 0) == 1); +#endif + TEST(NtUserSystemParametersInfo(SPI_GETDESKWALLPAPER, MAX_PATH, szNew, 0) != 0); TEST(szNew[0] == 0); /* Set no Wallpaper 2 */ @@ -609,9 +611,11 @@ Test_SPI_SETDESKWALLPAPER(void) /* Get Wallpaper, too small buffer */ szNew[0] = 0; szNew[1] = 0; szNew[2] = 0; TEST(NtUserSystemParametersInfo(SPI_GETDESKWALLPAPER, 3, szNew, 0) == 1); +#if 0 // This is broken TEST(szNew[0] != 0); TEST(szNew[1] != 0); TEST(szNew[2] != 0); +#endif /* Set invalid Wallpaper */ SetLastError(0xdeadbeef);

3 months, 3 weeks

[reactos] 06/07: [WIN32NT_APITEST] Fix NtGdiCreateBitmap test on x64

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a23e8da23edebbcdc6839… commit a23e8da23edebbcdc6839a7172547b667f4493ed Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Apr 13 15:03:07 2024 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Wed Sep 18 10:22:26 2024 +0300 [WIN32NT_APITEST] Fix NtGdiCreateBitmap test on x64 --- modules/rostests/apitests/win32nt/ntgdi/NtGdiCreateBitmap.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiCreateBitmap.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiCreateBitmap.c index fee272af496..2882b0ca332 100644 --- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiCreateBitmap.c +++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiCreateBitmap.c @@ -54,10 +54,17 @@ void Test_NtGdiCreateBitmap_Params(void) ok_ptr(NtGdiCreateBitmap(1, -2, 1, 1, (BYTE*)(LONG_PTR)0x80001234), NULL); ok_long(GetLastError(), ERROR_SUCCESS); +#ifndef _WIN64 // Win64 doesn't fail here /* Test huge size */ SetLastError(ERROR_SUCCESS); ok_ptr(NtGdiCreateBitmap(100000, 100000, 1, 1, NULL), NULL); ok_long(GetLastError(), ERROR_NOT_ENOUGH_MEMORY); +#endif + + /* Test too huge size */ + SetLastError(ERROR_SUCCESS); + ok_ptr(NtGdiCreateBitmap(100000, 100000, 1, 32, NULL), NULL); + ok_long(GetLastError(), ERROR_INVALID_PARAMETER); /* Test huge size and valid bits */ SetLastError(ERROR_SUCCESS);

3 months, 3 weeks

[reactos] 05/07: [CRT_APITEST] Fix version check

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f68d8d545978cd0c3426b… commit f68d8d545978cd0c3426ba0038dd7c9131393398 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Apr 13 14:27:02 2024 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Wed Sep 18 10:22:26 2024 +0300 [CRT_APITEST] Fix version check --- modules/rostests/apitests/crt/_mbsncmp.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/rostests/apitests/crt/_mbsncmp.c b/modules/rostests/apitests/crt/_mbsncmp.c index 836f19afd85..97ca44c13d1 100644 --- a/modules/rostests/apitests/crt/_mbsncmp.c +++ b/modules/rostests/apitests/crt/_mbsncmp.c @@ -11,6 +11,8 @@ #include <pseh/pseh2.h> #include <ndk/mmfuncs.h> +ULONG g_WinVersion; + /* * cmp functions can either return 1/-1 or the actual difference between the * first two differing characters. @@ -20,7 +22,7 @@ #ifdef TEST_CRTDLL #define RETURN_DIFF 0 #else -#define RETURN_DIFF (GetVersion() >= 0x0600) +#define RETURN_DIFF (g_WinVersion >= _WIN32_WINNT_VISTA) #endif #define DIFF_RETURN(sign, absolute) (sign (RETURN_DIFF ? absolute : 1)) @@ -29,6 +31,9 @@ START_TEST(_mbsncmp) { int ret; + ULONG Version = GetVersion(); + g_WinVersion = (Version & 0xFF) << 8 | (Version & 0xFF00) >> 8; + /* Zero length always returns true */ ret = _mbsncmp(NULL, NULL, 0); ok(ret == 0, "ret = %d\n", ret);

3 months, 3 weeks

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs