summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/libs/installer/componentselectionpage_p.cpp21
-rw-r--r--src/libs/installer/componentselectionpage_p.h3
-rw-r--r--src/libs/installer/settings.cpp2
-rw-r--r--src/sdk/translations/ifw_ar.ts8
-rw-r--r--src/sdk/translations/ifw_ca.ts6
-rw-r--r--src/sdk/translations/ifw_da.ts4
-rw-r--r--src/sdk/translations/ifw_de.ts8
-rw-r--r--src/sdk/translations/ifw_es.ts8
-rw-r--r--src/sdk/translations/ifw_fr.ts8
-rw-r--r--src/sdk/translations/ifw_hr.ts4
-rw-r--r--src/sdk/translations/ifw_hu.ts8
-rw-r--r--src/sdk/translations/ifw_it.ts4
-rw-r--r--src/sdk/translations/ifw_ja.ts8
-rw-r--r--src/sdk/translations/ifw_ko.ts8
-rw-r--r--src/sdk/translations/ifw_pl.ts8
-rw-r--r--src/sdk/translations/ifw_pt.ts8
-rw-r--r--src/sdk/translations/ifw_pt_BR.ts8
-rw-r--r--src/sdk/translations/ifw_ru.ts8
-rw-r--r--src/sdk/translations/ifw_zh_CN.ts8
19 files changed, 70 insertions, 70 deletions
diff --git a/src/libs/installer/componentselectionpage_p.cpp b/src/libs/installer/componentselectionpage_p.cpp
index 84a8915a0..f24494f6f 100644
--- a/src/libs/installer/componentselectionpage_p.cpp
+++ b/src/libs/installer/componentselectionpage_p.cpp
@@ -48,7 +48,6 @@
#include <QFileDialog>
#include <QStackedLayout>
#include <QStackedWidget>
-#include <QToolBox>
#include <QLineEdit>
namespace QInstaller {
@@ -67,7 +66,7 @@ ComponentSelectionPagePrivate::ComponentSelectionPagePrivate(ComponentSelectionP
, m_updaterModel(m_core->updaterComponentModel())
, m_currentModel(m_allModel)
, m_allowCompressedRepositoryInstall(false)
- , m_toolBox(nullptr)
+ , m_tabWidget(nullptr)
, m_descriptionBaseWidget(nullptr)
, m_categoryWidget(Q_NULLPTR)
, m_categoryLayoutVisible(false)
@@ -87,8 +86,10 @@ ComponentSelectionPagePrivate::ComponentSelectionPagePrivate(ComponentSelectionP
descriptionVLayout->setObjectName(QLatin1String("DescriptionLayout"));
descriptionVLayout->setContentsMargins(0, 0, 0, 0);
- m_toolBox = new QToolBox(q);
- m_toolBox->setObjectName(QLatin1String("ToolBox"));
+ m_tabWidget = new QTabWidget(q);
+ m_tabWidget->setObjectName(QLatin1String("ComponentSelectionTabWidget"));
+ m_tabWidget->tabBar()->setObjectName(QLatin1String("ComponentSelectionTabBar"));
+ m_tabWidget->hide();
QScrollArea *descriptionScrollArea = new QScrollArea(q);
descriptionScrollArea->setWidgetResizable(true);
@@ -270,7 +271,7 @@ void ComponentSelectionPagePrivate::setupCategoryLayout()
vLayout->addWidget(m_categoryGroupBox);
vLayout->addStretch();
- m_toolBox->insertItem(1, m_categoryWidget, m_core->settings().repositoryCategoryDisplayName());
+ m_tabWidget->insertTab(1, m_categoryWidget, m_core->settings().repositoryCategoryDisplayName());
}
void ComponentSelectionPagePrivate::showCategoryLayout(bool show)
@@ -284,14 +285,14 @@ void ComponentSelectionPagePrivate::showCategoryLayout(bool show)
setupCategoryLayout();
if (show) {
m_mainGLayout->removeWidget(m_descriptionBaseWidget);
- m_toolBox->insertItem(0, m_descriptionBaseWidget, tr("Component Information"));
- m_mainGLayout->addWidget(m_toolBox, 1, 1);
+ m_tabWidget->insertTab(0, m_descriptionBaseWidget, tr("Information"));
+ m_mainGLayout->addWidget(m_tabWidget, 1, 1);
} else {
- m_toolBox->removeItem(0);
- m_mainGLayout->removeWidget(m_toolBox);
+ m_tabWidget->removeTab(0);
+ m_mainGLayout->removeWidget(m_tabWidget);
m_mainGLayout->addWidget(m_descriptionBaseWidget, 1, 1);
}
- m_toolBox->setVisible(show);
+ m_tabWidget->setVisible(show);
m_categoryLayoutVisible = show;
}
diff --git a/src/libs/installer/componentselectionpage_p.h b/src/libs/installer/componentselectionpage_p.h
index f06d376f4..a0fb286d5 100644
--- a/src/libs/installer/componentselectionpage_p.h
+++ b/src/libs/installer/componentselectionpage_p.h
@@ -48,7 +48,6 @@ class QVBoxLayout;
class QHBoxLayout;
class QGridLayout;
class QStackedLayout;
-class QToolBox;
namespace QInstaller {
@@ -99,7 +98,7 @@ private:
ComponentSelectionPage *q;
PackageManagerCore *m_core;
QTreeView *m_treeView;
- QToolBox *m_toolBox;
+ QTabWidget *m_tabWidget;
QWidget *m_descriptionBaseWidget;
QLabel *m_sizeLabel;
QLabel *m_descriptionLabel;
diff --git a/src/libs/installer/settings.cpp b/src/libs/installer/settings.cpp
index ae1adbedb..85ab0dece 100644
--- a/src/libs/installer/settings.cpp
+++ b/src/libs/installer/settings.cpp
@@ -993,7 +993,7 @@ void Settings::setSaveDefaultRepositories(bool save)
QString Settings::repositoryCategoryDisplayName() const
{
QString displayName = d->m_data.value(QLatin1String(scRepositoryCategoryDisplayName)).toString();
- return displayName.isEmpty() ? tr("Select Categories") : displayName;
+ return displayName.isEmpty() ? tr("Categories") : displayName;
}
void Settings::setRepositoryCategoryDisplayName(const QString& name)
diff --git a/src/sdk/translations/ifw_ar.ts b/src/sdk/translations/ifw_ar.ts
index 94cde4954..6b35e16f9 100644
--- a/src/sdk/translations/ifw_ar.ts
+++ b/src/sdk/translations/ifw_ar.ts
@@ -659,8 +659,8 @@
<translation>خطأ</translation>
</message>
<message>
- <source>Component Information</source>
- <translation>معلومات المكون</translation>
+ <source>Information</source>
+ <translation type="unfinished">معلومات المكون</translation>
</message>
</context>
<context>
@@ -2367,8 +2367,8 @@ or accept the elevation of access rights if being asked.</source>
<translation>لا يمكن فتح ملف الإعدادات %1 للقراءة: %2</translation>
</message>
<message>
- <source>Select Categories</source>
- <translation>حدد الاقسام</translation>
+ <source>Categories</source>
+ <translation type="unfinished">حدد الاقسام</translation>
</message>
</context>
<context>
diff --git a/src/sdk/translations/ifw_ca.ts b/src/sdk/translations/ifw_ca.ts
index 20853e60f..c32e1674a 100644
--- a/src/sdk/translations/ifw_ca.ts
+++ b/src/sdk/translations/ifw_ca.ts
@@ -941,7 +941,7 @@
<translation>Error</translation>
</message>
<message>
- <source>Component Information</source>
+ <source>Information</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -2613,8 +2613,8 @@ or accept the elevation of access rights if being asked.</source>
<translation>No s&apos;ha pogut obrir el fitxer d&apos;ajustaments %1 per a lectura: %2</translation>
</message>
<message>
- <source>Select Categories</source>
- <translation>Selecciona les categories dels paquets</translation>
+ <source>Categories</source>
+ <translation type="unfinished">Selecciona les categories dels paquets</translation>
</message>
</context>
<context>
diff --git a/src/sdk/translations/ifw_da.ts b/src/sdk/translations/ifw_da.ts
index 6b2f6ce1a..3106ec981 100644
--- a/src/sdk/translations/ifw_da.ts
+++ b/src/sdk/translations/ifw_da.ts
@@ -2574,7 +2574,7 @@ or accept the elevation of access rights if being asked.</source>
<translation>Kan ikke åbne indstillingsfilen %1 til læsning: %2</translation>
</message>
<message>
- <source>Select Categories</source>
+ <source>Categories</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -2793,7 +2793,7 @@ or accept the elevation of access rights if being asked.</source>
<translation>Fejl</translation>
</message>
<message>
- <source>Component Information</source>
+ <source>Information</source>
<translation type="unfinished"></translation>
</message>
</context>
diff --git a/src/sdk/translations/ifw_de.ts b/src/sdk/translations/ifw_de.ts
index 2ef0f358e..10efbeb66 100644
--- a/src/sdk/translations/ifw_de.ts
+++ b/src/sdk/translations/ifw_de.ts
@@ -941,8 +941,8 @@
<translation>Fehler</translation>
</message>
<message>
- <source>Component Information</source>
- <translation>Komponenteninformationen</translation>
+ <source>Information</source>
+ <translation type="unfinished">Komponenteninformationen</translation>
</message>
</context>
<context>
@@ -2622,8 +2622,8 @@ or accept the elevation of access rights if being asked.</source>
<translation>Konnte Einstellungsdatei %1 nicht zum Lesen öffnen: %2</translation>
</message>
<message>
- <source>Select Categories</source>
- <translation>Kategorien auswählen</translation>
+ <source>Categories</source>
+ <translation type="unfinished">Kategorien auswählen</translation>
</message>
</context>
<context>
diff --git a/src/sdk/translations/ifw_es.ts b/src/sdk/translations/ifw_es.ts
index f85347718..3ae4056de 100644
--- a/src/sdk/translations/ifw_es.ts
+++ b/src/sdk/translations/ifw_es.ts
@@ -2578,8 +2578,8 @@ O bien acepte la elevación de los derechos de acceso si se le pide.</translatio
<translation>No se puede abrir el archivo de configuración %1 para la lectura: %2</translation>
</message>
<message>
- <source>Select Categories</source>
- <translation>Seleccione las categorías</translation>
+ <source>Categories</source>
+ <translation type="unfinished">Seleccione las categorías</translation>
</message>
</context>
<context>
@@ -2797,8 +2797,8 @@ O bien acepte la elevación de los derechos de acceso si se le pide.</translatio
<translation>Error</translation>
</message>
<message>
- <source>Component Information</source>
- <translation>Información de componentes</translation>
+ <source>Information</source>
+ <translation type="unfinished">Información de componentes</translation>
</message>
</context>
<context>
diff --git a/src/sdk/translations/ifw_fr.ts b/src/sdk/translations/ifw_fr.ts
index 30093be81..44aa59c9b 100644
--- a/src/sdk/translations/ifw_fr.ts
+++ b/src/sdk/translations/ifw_fr.ts
@@ -2580,8 +2580,8 @@ Ou acceptez l’élévation des droits d’accès si un message vous y invite.</
<translation>Impossible d’ouvrir le fichier de paramètres %1 en lecture : %2</translation>
</message>
<message>
- <source>Select Categories</source>
- <translation>Sélectionner les catégories</translation>
+ <source>Categories</source>
+ <translation type="unfinished">Sélectionner les catégories</translation>
</message>
</context>
<context>
@@ -2799,8 +2799,8 @@ Ou acceptez l’élévation des droits d’accès si un message vous y invite.</
<translation>Erreur</translation>
</message>
<message>
- <source>Component Information</source>
- <translation>Informations sur les composants</translation>
+ <source>Information</source>
+ <translation type="unfinished">Informations sur les composants</translation>
</message>
</context>
<context>
diff --git a/src/sdk/translations/ifw_hr.ts b/src/sdk/translations/ifw_hr.ts
index 2f00004a5..a9bfa1a83 100644
--- a/src/sdk/translations/ifw_hr.ts
+++ b/src/sdk/translations/ifw_hr.ts
@@ -2318,7 +2318,7 @@ or accept the elevation of access rights if being asked.</source>
<translation>Nije moguće otvoriti datoteke postavaka %1 za učitavanje: %2</translation>
</message>
<message>
- <source>Select Categories</source>
+ <source>Categories</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -2832,7 +2832,7 @@ or accept the elevation of access rights if being asked.</source>
<translation>Greška</translation>
</message>
<message>
- <source>Component Information</source>
+ <source>Information</source>
<translation type="unfinished"></translation>
</message>
</context>
diff --git a/src/sdk/translations/ifw_hu.ts b/src/sdk/translations/ifw_hu.ts
index 7a181fb19..b98c951be 100644
--- a/src/sdk/translations/ifw_hu.ts
+++ b/src/sdk/translations/ifw_hu.ts
@@ -932,8 +932,8 @@
<translation>Szűrő</translation>
</message>
<message>
- <source>Component Information</source>
- <translation>Komponens Információ</translation>
+ <source>Information</source>
+ <translation type="unfinished">Komponens Információ</translation>
</message>
<message>
<source>Error</source>
@@ -2622,8 +2622,8 @@ a megfelelő jogokkal rendelkező felhasználóként, majd kattintson az OK gomb
<translation>Nem sikerült megnyitni &quot;%1&quot; beállítás fájlt olvasásra: %2</translation>
</message>
<message>
- <source>Select Categories</source>
- <translation>Válasszon Kategóriákat</translation>
+ <source>Categories</source>
+ <translation type="unfinished">Válasszon Kategóriákat</translation>
</message>
</context>
<context>
diff --git a/src/sdk/translations/ifw_it.ts b/src/sdk/translations/ifw_it.ts
index 0221b41bc..8021d2043 100644
--- a/src/sdk/translations/ifw_it.ts
+++ b/src/sdk/translations/ifw_it.ts
@@ -2574,7 +2574,7 @@ or accept the elevation of access rights if being asked.</source>
<translation>Impossibile aprire il file di impostazioni %1 per la lettura: %2</translation>
</message>
<message>
- <source>Select Categories</source>
+ <source>Categories</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -2793,7 +2793,7 @@ or accept the elevation of access rights if being asked.</source>
<translation>Errore</translation>
</message>
<message>
- <source>Component Information</source>
+ <source>Information</source>
<translation type="unfinished"></translation>
</message>
</context>
diff --git a/src/sdk/translations/ifw_ja.ts b/src/sdk/translations/ifw_ja.ts
index 65dc1198d..685ecdfe6 100644
--- a/src/sdk/translations/ifw_ja.ts
+++ b/src/sdk/translations/ifw_ja.ts
@@ -2564,8 +2564,8 @@ or accept the elevation of access rights if being asked.</source>
<translation>読み取り用の設定ファイル %1 を開けません: %2</translation>
</message>
<message>
- <source>Select Categories</source>
- <translation>カテゴリを選択</translation>
+ <source>Categories</source>
+ <translation type="unfinished">カテゴリを選択</translation>
</message>
</context>
<context>
@@ -2781,8 +2781,8 @@ or accept the elevation of access rights if being asked.</source>
<translation>エラー</translation>
</message>
<message>
- <source>Component Information</source>
- <translation>コンポーネント情報</translation>
+ <source>Information</source>
+ <translation type="unfinished">コンポーネント情報</translation>
</message>
</context>
<context>
diff --git a/src/sdk/translations/ifw_ko.ts b/src/sdk/translations/ifw_ko.ts
index 3db69c42b..88fbc5368 100644
--- a/src/sdk/translations/ifw_ko.ts
+++ b/src/sdk/translations/ifw_ko.ts
@@ -655,8 +655,8 @@
<translation>필터</translation>
</message>
<message>
- <source>Component Information</source>
- <translation>구성요소 정보</translation>
+ <source>Information</source>
+ <translation type="unfinished">구성요소 정보</translation>
</message>
<message>
<source>Error</source>
@@ -2322,8 +2322,8 @@ or accept the elevation of access rights if being asked.</source>
<translation>설정 파일 &quot;%1&quot;을(를) 읽기 위해 열 수 없음: %2</translation>
</message>
<message>
- <source>Select Categories</source>
- <translation>범주 선택</translation>
+ <source>Categories</source>
+ <translation type="unfinished">범주 선택</translation>
</message>
</context>
<context>
diff --git a/src/sdk/translations/ifw_pl.ts b/src/sdk/translations/ifw_pl.ts
index 427878716..7c8932e2d 100644
--- a/src/sdk/translations/ifw_pl.ts
+++ b/src/sdk/translations/ifw_pl.ts
@@ -2592,8 +2592,8 @@ or accept the elevation of access rights if being asked.</source>
<translation>Nie można otworzyć pliku ustawień %1 do odczytu: %2</translation>
</message>
<message>
- <source>Select Categories</source>
- <translation>Wybierz kategorie</translation>
+ <source>Categories</source>
+ <translation type="unfinished">Wybierz kategorie</translation>
</message>
</context>
<context>
@@ -2813,8 +2813,8 @@ or accept the elevation of access rights if being asked.</source>
<translation>Błąd</translation>
</message>
<message>
- <source>Component Information</source>
- <translation>Informacje o składnikach</translation>
+ <source>Information</source>
+ <translation type="unfinished">Informacje o składnikach</translation>
</message>
</context>
<context>
diff --git a/src/sdk/translations/ifw_pt.ts b/src/sdk/translations/ifw_pt.ts
index 8c01d5075..f1cd2fa8b 100644
--- a/src/sdk/translations/ifw_pt.ts
+++ b/src/sdk/translations/ifw_pt.ts
@@ -2288,8 +2288,8 @@ Em alternativa, pode aceitar a alteração de permissões de acesso caso seja so
<translation>Não é possível abrir o ficheiro de configurações %1 para leitura: %2</translation>
</message>
<message>
- <source>Select Categories</source>
- <translation>Selecionar categorias</translation>
+ <source>Categories</source>
+ <translation type="unfinished">Selecionar categorias</translation>
</message>
</context>
<context>
@@ -2797,8 +2797,8 @@ Em alternativa, pode aceitar a alteração de permissões de acesso caso seja so
<translation>Erro</translation>
</message>
<message>
- <source>Component Information</source>
- <translation>Informação do componente</translation>
+ <source>Information</source>
+ <translation type="unfinished">Informação do componente</translation>
</message>
</context>
<context>
diff --git a/src/sdk/translations/ifw_pt_BR.ts b/src/sdk/translations/ifw_pt_BR.ts
index 6d7b2f15e..a66faefd3 100644
--- a/src/sdk/translations/ifw_pt_BR.ts
+++ b/src/sdk/translations/ifw_pt_BR.ts
@@ -2287,8 +2287,8 @@ or accept the elevation of access rights if being asked.</source>
<translation>Não é possível abrir o arquivo de configurações %1 para leitura: %2</translation>
</message>
<message>
- <source>Select Categories</source>
- <translation>Selecionar Categorias</translation>
+ <source>Categories</source>
+ <translation type="unfinished">Selecionar Categorias</translation>
</message>
</context>
<context>
@@ -2796,8 +2796,8 @@ or accept the elevation of access rights if being asked.</source>
<translation>Erro</translation>
</message>
<message>
- <source>Component Information</source>
- <translation>Informação Componente.</translation>
+ <source>Information</source>
+ <translation type="unfinished">Informação Componente.</translation>
</message>
</context>
<context>
diff --git a/src/sdk/translations/ifw_ru.ts b/src/sdk/translations/ifw_ru.ts
index b47cf9661..99118c34c 100644
--- a/src/sdk/translations/ifw_ru.ts
+++ b/src/sdk/translations/ifw_ru.ts
@@ -946,8 +946,8 @@
<translation>Ошибка</translation>
</message>
<message>
- <source>Component Information</source>
- <translation>Сведения о компонентах</translation>
+ <source>Information</source>
+ <translation type="unfinished">Сведения о компонентах</translation>
</message>
</context>
<context>
@@ -2629,8 +2629,8 @@ or accept the elevation of access rights if being asked.</source>
<translation>Невозможно открыть файл настроек %1 на чтение: %2</translation>
</message>
<message>
- <source>Select Categories</source>
- <translation>Выберите категории пакетов</translation>
+ <source>Categories</source>
+ <translation type="unfinished">Выберите категории пакетов</translation>
</message>
</context>
<context>
diff --git a/src/sdk/translations/ifw_zh_CN.ts b/src/sdk/translations/ifw_zh_CN.ts
index 7b715f2e3..ee90ee2b2 100644
--- a/src/sdk/translations/ifw_zh_CN.ts
+++ b/src/sdk/translations/ifw_zh_CN.ts
@@ -2569,8 +2569,8 @@ or accept the elevation of access rights if being asked.</source>
<translation>无法打开设置文件 %1 进行读取:%2</translation>
</message>
<message>
- <source>Select Categories</source>
- <translation>选择类别</translation>
+ <source>Categories</source>
+ <translation type="unfinished">选择类别</translation>
</message>
</context>
<context>
@@ -2786,8 +2786,8 @@ or accept the elevation of access rights if being asked.</source>
<translation>错误</translation>
</message>
<message>
- <source>Component Information</source>
- <translation>组件信息</translation>
+ <source>Information</source>
+ <translation type="unfinished">组件信息</translation>
</message>
</context>
<context>