KUIT adaptions for groups, checkboxes and radiobuttons

svn path=/trunk/KDE/kdebase/apps/; revision=681910

diff --git a/src/columnviewsettingspage.cpp b/src/columnviewsettingspage.cpp
index eefad6764195afea53c53f58861521a5b3f23de9..a03728ed71d1c35596042ca5d477dc3bdcbb7180 100644 (file)
--- a/src/columnviewsettingspage.cpp
+++ b/src/columnviewsettingspage.cpp
@@ -52,12 +52,12 @@ ColumnViewSettingsPage::ColumnViewSettingsPage(DolphinMainWindow* mainWindow,
     setMargin(margin);
 
     // Create 'Icon' properties
-    QGroupBox* iconSizeBox = new QGroupBox(i18n("Icon Size"), this);
+    QGroupBox* iconSizeBox = new QGroupBox(i18nc("@title:group", "Icon Size"), this);
     iconSizeBox->setSizePolicy(sizePolicy);
 
-    m_smallIconSize  = new QRadioButton(i18nc("Size", "Small"), this);
-    m_mediumIconSize = new QRadioButton(i18nc("Size", "Medium"), this);
-    m_largeIconSize  = new QRadioButton(i18nc("Size", "Large"), this);
+    m_smallIconSize  = new QRadioButton(i18nc("@option:radio Size", "Small"), this);
+    m_mediumIconSize = new QRadioButton(i18nc("@option:radio Size", "Medium"), this);
+    m_largeIconSize  = new QRadioButton(i18nc("@option:radio Size", "Large"), this);
 
     QButtonGroup* iconSizeGroup = new QButtonGroup(this);
     iconSizeGroup->addButton(m_smallIconSize);
@@ -70,7 +70,7 @@ ColumnViewSettingsPage::ColumnViewSettingsPage(DolphinMainWindow* mainWindow,
     iconSizeLayout->addWidget(m_largeIconSize);
 
     // create "Text" properties
-    QGroupBox* textBox = new QGroupBox(i18n("Text"), this);
+    QGroupBox* textBox = new QGroupBox(i18nc("@title:group", "Text"), this);
     textBox->setSizePolicy(sizePolicy);
 
     QLabel* fontLabel = new QLabel(i18n("Font:"), textBox);

diff --git a/src/detailsviewsettingspage.cpp b/src/detailsviewsettingspage.cpp
index 33ae82d3e6ae09a5c8b133935d8b3cab84761567..f88033e475bad5331b9a5b515d4a8506822f50e4 100644 (file)
--- a/src/detailsviewsettingspage.cpp
+++ b/src/detailsviewsettingspage.cpp
@@ -56,14 +56,14 @@ DetailsViewSettingsPage::DetailsViewSettingsPage(DolphinMainWindow* mainWindow,
     setMargin(margin);
 
     // create "Columns" properties
-    QGroupBox* columnsBox = new QGroupBox(i18n("Columns"), this);
+    QGroupBox* columnsBox = new QGroupBox(i18nc("@title:group", "Columns"), this);
     columnsBox->setSizePolicy(sizePolicy);
 
-    m_dateBox = new QCheckBox(i18n("Date"), this);
-    m_permissionsBox = new QCheckBox(i18n("Permissions"), this);
-    m_ownerBox = new QCheckBox(i18n("Owner"), this);
-    m_groupBox = new QCheckBox(i18n("Group"), this);
-    m_typeBox = new QCheckBox(i18n("Type"), this);
+    m_dateBox = new QCheckBox(i18nc("@option:check Columns", "Date"), this);
+    m_permissionsBox = new QCheckBox(i18nc("@option:check Columns", "Permissions"), this);
+    m_ownerBox = new QCheckBox(i18nc("@option:check Columns", "Owner"), this);
+    m_groupBox = new QCheckBox(i18nc("@option:check Columns", "Group"), this);
+    m_typeBox = new QCheckBox(i18nc("@option:check Columns", "Type"), this);
 
     QHBoxLayout* columnsLayout = new QHBoxLayout(columnsBox);
     columnsLayout->addWidget(m_dateBox);
@@ -73,12 +73,12 @@ DetailsViewSettingsPage::DetailsViewSettingsPage(DolphinMainWindow* mainWindow,
     columnsLayout->addWidget(m_typeBox);
 
     // Create "Icon" properties
-    QGroupBox* iconSizeBox = new QGroupBox(i18n("Icon Size"), this);
+    QGroupBox* iconSizeBox = new QGroupBox(i18nc("@title:group", "Icon Size"), this);
     iconSizeBox->setSizePolicy(sizePolicy);
 
-    m_smallIconSize  = new QRadioButton(i18nc("Size", "Small"), this);
-    m_mediumIconSize = new QRadioButton(i18nc("Size", "Medium"), this);
-    m_largeIconSize  = new QRadioButton(i18nc("Size", "Large"), this);
+    m_smallIconSize  = new QRadioButton(i18nc("@option:radio Size", "Small"), this);
+    m_mediumIconSize = new QRadioButton(i18nc("@option:radio Size", "Medium"), this);
+    m_largeIconSize  = new QRadioButton(i18nc("@option:radio Size", "Large"), this);
 
     QButtonGroup* iconSizeGroup = new QButtonGroup(this);
     iconSizeGroup->addButton(m_smallIconSize);
@@ -91,7 +91,7 @@ DetailsViewSettingsPage::DetailsViewSettingsPage(DolphinMainWindow* mainWindow,
     iconSizeLayout->addWidget(m_largeIconSize);
 
     // create "Text" properties
-    QGroupBox* textBox = new QGroupBox(i18n("Text"), this);
+    QGroupBox* textBox = new QGroupBox(i18nc("@title:group", "Text"), this);
     textBox->setSizePolicy(sizePolicy);
 
     QLabel* fontLabel = new QLabel(i18n("Font:"), textBox);

diff --git a/src/generalsettingspage.cpp b/src/generalsettingspage.cpp
index ccb06cd09ce034b837fbad0f88877c0fc0e4817a..85f7a00be3df35b9b1e3852946986127ba7f93f6 100644 (file)
--- a/src/generalsettingspage.cpp
+++ b/src/generalsettingspage.cpp
@@ -57,7 +57,7 @@ GeneralSettingsPage::GeneralSettingsPage(DolphinMainWindow* mainWin, QWidget* pa
     vBox->setSpacing(spacing);
 
     // create 'Home URL' editor
-    QGroupBox* homeBox = new QGroupBox(i18n("Home Folder"), vBox);
+    QGroupBox* homeBox = new QGroupBox(i18nc("@title:group", "Home Folder"), vBox);
 
     KHBox* homeUrlBox = new KHBox(homeBox);
     homeUrlBox->setSpacing(spacing);
@@ -83,12 +83,12 @@ GeneralSettingsPage::GeneralSettingsPage(DolphinMainWindow* mainWin, QWidget* pa
     homeBoxLayout->addWidget(homeUrlBox);
     homeBoxLayout->addWidget(buttonBox);
 
-    QGroupBox* startBox = new QGroupBox(i18n("Startup Settings"), vBox);
+    QGroupBox* startBox = new QGroupBox(i18nc("@title:group", "Startup Settings"), vBox);
 
     // create 'Split view', 'Editable location' and 'Filter bar' checkboxes
-    m_splitView = new QCheckBox(i18n("Split view mode"), startBox);
-    m_editableUrl = new QCheckBox(i18n("Editable location bar"), startBox);
-    m_filterBar = new QCheckBox(i18n("Show filter bar"),startBox);
+    m_splitView = new QCheckBox(i18nc("@option:check Startup Settings", "Split view mode"), startBox);
+    m_editableUrl = new QCheckBox(i18nc("@option:check Startup Settings", "Editable location bar"), startBox);
+    m_filterBar = new QCheckBox(i18nc("@option:check Startup Settings", "Show filter bar"),startBox);
 
     QVBoxLayout* startBoxLayout = new QVBoxLayout(startBox);
     startBoxLayout->addWidget(m_splitView);
@@ -99,12 +99,14 @@ GeneralSettingsPage::GeneralSettingsPage(DolphinMainWindow* mainWin, QWidget* pa
     KSharedConfig::Ptr konqConfig = KSharedConfig::openConfig("konquerorrc", KConfig::IncludeGlobals);
     const KConfigGroup trashConfig(konqConfig, "Trash");
 
-    QGroupBox* confirmBox = new QGroupBox(i18n("Ask For Confirmation When"), vBox);
+    QGroupBox* confirmBox = new QGroupBox(i18nc("@title:group", "Ask For Confirmation When"), vBox);
 
-    m_confirmMoveToTrash = new QCheckBox(i18n("Moving files or folders to trash"), confirmBox);
+    m_confirmMoveToTrash = new QCheckBox(i18nc("@option:check Ask for Confirmation When",
+                                               "Moving files or folders to trash"), confirmBox);
     m_confirmMoveToTrash->setChecked(trashConfig.readEntry("ConfirmTrash", false));
 
-    m_confirmDelete = new QCheckBox(i18n("Deleting files or folders"), confirmBox);
+    m_confirmDelete = new QCheckBox(i18nc("@option:check Ask for Confirmation When",
+                                          "Deleting files or folders"), confirmBox);
     m_confirmDelete->setChecked(trashConfig.readEntry("ConfirmDelete", true));
 
     QVBoxLayout* confirmBoxLayout = new QVBoxLayout(confirmBox);
@@ -112,7 +114,7 @@ GeneralSettingsPage::GeneralSettingsPage(DolphinMainWindow* mainWin, QWidget* pa
     confirmBoxLayout->addWidget(m_confirmDelete);
 
     // create 'Show the command 'Delete' in context menu' checkbox
-    m_showDeleteCommand = new QCheckBox(i18n("Show 'Delete' command in context menu"), vBox);
+    m_showDeleteCommand = new QCheckBox(i18nc("@option:check", "Show 'Delete' command in context menu"), vBox);
     const KSharedConfig::Ptr globalConfig = KSharedConfig::openConfig("kdeglobals", KConfig::NoGlobals);
     const KConfigGroup kdeConfig(globalConfig, "KDE");
     m_showDeleteCommand->setChecked(kdeConfig.readEntry("ShowDeleteCommand", false));

diff --git a/src/generalviewsettingspage.cpp b/src/generalviewsettingspage.cpp
index 6b484f120069b5a3b5a112e64ba4c349e1e1b031..61439d323e1eb49c1d5c68b3508b31d91bea50e0 100644 (file)
--- a/src/generalviewsettingspage.cpp
+++ b/src/generalviewsettingspage.cpp
@@ -54,17 +54,17 @@ GeneralViewSettingsPage::GeneralViewSettingsPage(DolphinMainWindow* mainWindow,
     setSpacing(spacing);
     setMargin(margin);
 
-    QGroupBox* propsBox = new QGroupBox(i18n("View Properties"), this);
+    QGroupBox* propsBox = new QGroupBox(i18nc("@title:group", "View Properties"), this);
 
-    m_localProps = new QRadioButton(i18n("Remember view properties for each folder"), propsBox);
-    m_globalProps = new QRadioButton(i18n("Use common view properties for all folders"), propsBox);
+    m_localProps = new QRadioButton(i18nc("@option:radio", "Remember view properties for each folder"), propsBox);
+    m_globalProps = new QRadioButton(i18nc("@option:radio", "Use common view properties for all folders"), propsBox);
 
     QVBoxLayout* propsBoxLayout = new QVBoxLayout(propsBox);
     propsBoxLayout->addWidget(m_localProps);
     propsBoxLayout->addWidget(m_globalProps);
 
     // create 'File Previews' box
-    QGroupBox* previewBox = new QGroupBox(i18n("File Previews"), this);
+    QGroupBox* previewBox = new QGroupBox(i18nc("@title:group", "File Previews"), this);
 
     QLabel* maxFileSize = new QLabel(i18n("Maximum file size:"), previewBox);
 

diff --git a/src/iconsizedialog.cpp b/src/iconsizedialog.cpp
index ad7cf31a2b404a809834ae0b041eaf88f1bd4e8a..c79c0f28eb587370625ee1b313e3532db54f8b66 100644 (file)
--- a/src/iconsizedialog.cpp
+++ b/src/iconsizedialog.cpp
@@ -57,7 +57,7 @@ IconSizeDialog::IconSizeDialog(QWidget* parent) :
     QHBoxLayout* topLayout = new QHBoxLayout();
 
     // create 'Icon Size' group including slider and preview
-    QGroupBox* iconSizeBox = new QGroupBox(i18n("Icon Size"), main);
+    QGroupBox* iconSizeBox = new QGroupBox(i18nc("@title:group", "Icon Size"), main);
 
     const QColor iconBackgroundColor = KColorScheme(KColorScheme::View).background();
 
@@ -82,7 +82,7 @@ IconSizeDialog::IconSizeDialog(QWidget* parent) :
     iconSizeLayout->addWidget(m_iconSizeViewer);
 
     // create 'Preview Size' group including slider and preview
-    QGroupBox* previewSizeBox = new QGroupBox(i18n("Preview Size"), main);
+    QGroupBox* previewSizeBox = new QGroupBox(i18nc("@title:group", "Preview Size"), main);
 
     KHBox* previewSizeHBox = new KHBox(previewSizeBox);
     previewSizeHBox->setSpacing(spacing);

diff --git a/src/iconsviewsettingspage.cpp b/src/iconsviewsettingspage.cpp
index c4d07f53bc0452dd09c8d11d805492e8c079862e..f2f55222c22a1413fc1647d2b05b037c50410ad2 100644 (file)
--- a/src/iconsviewsettingspage.cpp
+++ b/src/iconsviewsettingspage.cpp
@@ -65,7 +65,7 @@ IconsViewSettingsPage::IconsViewSettingsPage(DolphinMainWindow* mainWindow,
 
     // create 'Text' group for selecting the font, the number of lines
     // and the text width
-    QGroupBox* textGroup = new QGroupBox(i18n("Text"), this);
+    QGroupBox* textGroup = new QGroupBox(i18nc("@title:group", "Text"), this);
     textGroup->setSizePolicy(sizePolicy);
 
     QLabel* fontLabel = new QLabel(i18n("Font:"), textGroup);
@@ -89,7 +89,7 @@ IconsViewSettingsPage::IconsViewSettingsPage(DolphinMainWindow* mainWindow,
     textGroupLayout->addWidget(m_textWidthBox, 2, 1);
 
     // create the 'Grid' group for selecting the arrangement and the grid spacing
-    QGroupBox* gridGroup = new QGroupBox(i18n("Grid"), this);
+    QGroupBox* gridGroup = new QGroupBox(i18nc("@title:group", "Grid"), this);
     gridGroup->setSizePolicy(sizePolicy);
 
     QLabel* arrangementLabel = new QLabel(i18n("Arrangement:"), gridGroup);

diff --git a/src/viewpropertiesdialog.cpp b/src/viewpropertiesdialog.cpp
index d907bbfe79deb3d029d256a7b0a51a803b0389d6..4dc985225938ad92562b7eea535534bcb094c2bd 100644 (file)
--- a/src/viewpropertiesdialog.cpp
+++ b/src/viewpropertiesdialog.cpp
@@ -83,7 +83,7 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
     // create 'Properties' group containing view mode, sorting, sort order and show hidden files
     QWidget* propsBox = main;
     if (!useGlobalViewProps) {
-        propsBox = new QGroupBox(i18n("Properties"), main);
+        propsBox = new QGroupBox(i18nc("@title:group", "Properties"), main);
     }
 
     QLabel* viewModeLabel = new QLabel(i18n("View mode:"), propsBox);
@@ -136,13 +136,13 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
     m_additionalInfo->setCurrentIndex(addInfoIndex);
     m_additionalInfo->setEnabled(iconsViewEnabled);
 
-    m_showPreview = new QCheckBox(i18n("Show preview"), propsBox);
+    m_showPreview = new QCheckBox(i18nc("@option:check", "Show preview"), propsBox);
     m_showPreview->setChecked(m_viewProps->showPreview());
 
-    m_showInGroups = new QCheckBox(i18n("Show in Groups"), propsBox);
+    m_showInGroups = new QCheckBox(i18nc("@option:check", "Show in Groups"), propsBox);
     m_showInGroups->setChecked(m_viewProps->categorizedSorting());
 
-    m_showHiddenFiles = new QCheckBox(i18n("Show hidden files"), propsBox);
+    m_showHiddenFiles = new QCheckBox(i18nc("@option:check", "Show hidden files"), propsBox);
     m_showHiddenFiles->setChecked(m_viewProps->showHiddenFiles());
 
     QGridLayout* propsBoxLayout = new QGridLayout(propsBox);
@@ -180,12 +180,15 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
     // for each directory:
     if (!useGlobalViewProps) {
         // create 'Apply View Properties To' group
-        QGroupBox* applyBox = new QGroupBox(i18n("Apply View Properties To"), main);
+        QGroupBox* applyBox = new QGroupBox(i18nc("@title:group", "Apply View Properties To"), main);
 
-        m_applyToCurrentFolder = new QRadioButton(i18n("Current folder"), applyBox);
+        m_applyToCurrentFolder = new QRadioButton(i18nc("@option:radio Apply View Properties To",
+                                                        "Current folder"), applyBox);
         m_applyToCurrentFolder->setChecked(true);
-        m_applyToSubFolders = new QRadioButton(i18n("Current folder including all sub folders"), applyBox);
-        m_applyToAllFolders = new QRadioButton(i18n("All folders"), applyBox);
+        m_applyToSubFolders = new QRadioButton(i18nc("@option:radio Apply View Properties To",
+                                                     "Current folder including all sub folders"), applyBox);
+        m_applyToAllFolders = new QRadioButton(i18nc("@option:radio Apply View Properties To",
+                                                     "All folders"), applyBox);
 
         QButtonGroup* applyGroup = new QButtonGroup(this);
         applyGroup->addButton(m_applyToCurrentFolder);
@@ -197,7 +200,7 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
         applyBoxLayout->addWidget(m_applyToSubFolders);
         applyBoxLayout->addWidget(m_applyToAllFolders);
 
-        m_useAsDefault = new QCheckBox(i18n("Use as default for new folders"), main);
+        m_useAsDefault = new QCheckBox(i18nc("@option:check", "Use as default for new folders"), main);
 
         topLayout->addWidget(applyBox);
         topLayout->addWidget(m_useAsDefault);